fix: repositoryUrl is ignored (#614)

* fix: repositoryUrl is ignored

* jsii project as well

.projenrc.ts

@@ -1,5 +1,7 @@
 import { UpgradeDependenciesSchedule } from 'projen/lib/javascript';
-import { generateCdkCommonOptions, generateCdkConstructLibraryOptions } from './projenrc/cdk-constructlibrary-options';
+import { generateCdkCommonOptions } from './projenrc/cdk-common-options';
+import { generateCdkConstructLibraryOptions } from './projenrc/cdk-construct-library-options';
+import { generateCdkJsiiOptions } from './projenrc/cdk-jsii-options';
 import { generateYarnMonorepoOptions } from './projenrc/yarn-monorepo-options';
 import { CdklabsJsiiProject } from './src';
 
@@ -34,6 +36,7 @@ project.addPeerDeps('constructs@^10.0.0');
 generateCdkCommonOptions(project);
 generateYarnMonorepoOptions(project);
 generateCdkConstructLibraryOptions(project);
+generateCdkJsiiOptions(project);
 
 // that is this package!
 project.deps.removeDependency(project.name);

projenrc/cdk-constructlibrary-options.ts → projenrc/cdk-common-options.ts

@@ -2,51 +2,7 @@ import { PrimitiveType, Property } from '@jsii/spec';
 import { typescript } from 'projen';
 import { JsiiInterface } from './jsii-extend-interface';
 
-export function generateCdkConstructLibraryOptions(project: typescript.TypeScriptProject) {
-  new JsiiInterface(project, {
-    name: 'CdkConstructLibraryOptions',
-    fqn: 'cdklabs-projen-project-types.CdkConstructLibraryOptions',
-    filePath: 'src/cdk-construct-library-options.ts',
-    extends: 'projen.awscdk.AwsCdkConstructLibraryOptions',
-    properties: [
-      ...commonOptions,
-      {
-        name: 'minNodeVersion',
-        optional: true,
-        type: { primitive: PrimitiveType.String },
-        docs: {
-          summary: 'Minimum Node.js version to require via package.json `engines` (inclusive).',
-          remarks: [
-            '',
-            'Only set this if your package will not work properly on specific (older?)',
-            'Node versions.',
-            '',
-          ].join('\n'),
-          default: '- no "engines" specified',
-        },
-      },
-      {
-        name: 'workflowNodeVersion',
-        optional: true,
-        type: { primitive: PrimitiveType.String },
-        docs: {
-          summary: 'The node version to use in GitHub workflows.',
-          default: '\'lts/*\'',
-        },
-      },
-      {
-        name: 'rosettaOptions',
-        optional: true,
-        type: { fqn: 'cdklabs-projen-project-types.RosettaOptions' },
-        docs: {
-          summary: 'Options for rosetta:extract task',
-        },
-      },
-    ],
-  });
-}
-
-const commonOptions: Property[] = [
+export const COMMON_OPTIONS: Property[] = [
   {
     name: 'private',
     optional: true,
@@ -120,6 +76,6 @@ export function generateCdkCommonOptions(project: typescript.TypeScriptProject)
   new JsiiInterface(project, {
     name: 'CdkCommonOptions',
     filePath: 'src/cdk-common-options.ts',
-    properties: commonOptions,
+    properties: COMMON_OPTIONS,
   });
-}
+}

projenrc/cdk-construct-library-options.ts

@@ -0,0 +1,62 @@
+import { PrimitiveType } from '@jsii/spec';
+import { typescript } from 'projen';
+import { COMMON_OPTIONS } from './cdk-common-options';
+import { JsiiInterface } from './jsii-extend-interface';
+
+export function generateCdkConstructLibraryOptions(project: typescript.TypeScriptProject) {
+  new JsiiInterface(project, {
+    name: 'CdkConstructLibraryOptions',
+    fqn: 'cdklabs-projen-project-types.CdkConstructLibraryOptions',
+    filePath: 'src/cdk-construct-library-options.ts',
+    extends: 'projen.awscdk.AwsCdkConstructLibraryOptions',
+    updateProps: {
+      repositoryUrl: {
+        optional: true,
+        docs: {
+          default: '- generated from org tenancy and package name',
+          deprecated: 'use `repository`',
+        },
+      },
+      repository: {
+        docs: {
+          default: '- generated from org tenancy and package name',
+        },
+      },
+    },
+    properties: [
+      ...COMMON_OPTIONS,
+      {
+        name: 'minNodeVersion',
+        optional: true,
+        type: { primitive: PrimitiveType.String },
+        docs: {
+          summary: 'Minimum Node.js version to require via package.json `engines` (inclusive).',
+          remarks: [
+            '',
+            'Only set this if your package will not work properly on specific (older?)',
+            'Node versions.',
+            '',
+          ].join('\n'),
+          default: '- no "engines" specified',
+        },
+      },
+      {
+        name: 'workflowNodeVersion',
+        optional: true,
+        type: { primitive: PrimitiveType.String },
+        docs: {
+          summary: 'The node version to use in GitHub workflows.',
+          default: '\'lts/*\'',
+        },
+      },
+      {
+        name: 'rosettaOptions',
+        optional: true,
+        type: { fqn: 'cdklabs-projen-project-types.RosettaOptions' },
+        docs: {
+          summary: 'Options for rosetta:extract task',
+        },
+      },
+    ],
+  });
+}

projenrc/cdk-jsii-options.ts

@@ -0,0 +1,28 @@
+import { typescript } from 'projen';
+import { COMMON_OPTIONS } from './cdk-common-options';
+import { JsiiInterface } from './jsii-extend-interface';
+
+export function generateCdkJsiiOptions(project: typescript.TypeScriptProject) {
+  new JsiiInterface(project, {
+    name: 'CdkJsiiProjectOptions',
+    filePath: 'src/cdk-jsii-options.ts',
+    extends: 'projen.cdk.JsiiProjectOptions',
+    updateProps: {
+      repositoryUrl: {
+        optional: true,
+        docs: {
+          default: '- generated from org tenancy and package name',
+          deprecated: 'use `repository`',
+        },
+      },
+      repository: {
+        docs: {
+          default: '- generated from org tenancy and package name',
+        },
+      },
+    },
+    properties: [
+      ...COMMON_OPTIONS,
+    ],
+  });
+}