fix: Package name collisions

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npx projen@0.3.4
+      - run: npx projen@0.3.5
       - run: yarn install --frozen-lockfile
       - run: yarn build
       - name: Anti-tamper check

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npx projen@0.3.4
+      - run: npx projen@0.3.5
       - run: yarn install --frozen-lockfile
       - run: yarn build
       - name: Anti-tamper check

.projenrc.js

@@ -16,8 +16,8 @@ const project = new TypeScriptLibraryProject({
     '@types/fs-extra': Semver.caret('8.1.0'),
   },
   dependencies: {
-    'jsii': Semver.caret('1.5.0'),
-    'jsii-pacmak': Semver.caret('1.5.0'),
+    'jsii': Semver.caret('1.9.0'),
+    'jsii-pacmak': Semver.caret('1.9.0'),
     'fs-extra': Semver.caret('9.0.0'),
     'ncp': Semver.caret('2.0.0'),
     'yargs': Semver.caret('11.1.1'),

package.json

@@ -12,7 +12,7 @@
   },
   "scripts": {
     "projen": "node .projenrc.js && yarn install",
-    "projen:upgrade": "yarn upgrade projen && yarn projen",
+    "projen:upgrade": "yarn upgrade -L projen && yarn projen",
     "test": "yarn eslint && jest --passWithNoTests",
     "bump": "standard-version",
     "release": "yarn bump && git push --follow-tags origin master",
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@types/ncp": "^2.0.4",
     "@types/fs-extra": "^8.1.0",
-    "projen": "^0.3.4",
+    "projen": "^0.3.5",
     "standard-version": "^8.0.1",
     "typescript": "^3.9.5",
     "@typescript-eslint/eslint-plugin": "^2.31.0",
@@ -49,8 +49,8 @@
   },
   "peerDependencies": {},
   "dependencies": {
-    "jsii": "^1.5.0",
-    "jsii-pacmak": "^1.5.0",
+    "jsii": "^1.9.0",
+    "jsii-pacmak": "^1.9.0",
     "fs-extra": "^9.0.0",
     "ncp": "^2.0.0",
     "yargs": "^11.1.1"

src/compile.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import { exec } from './util';
 import { Options } from './options';
+import * as crypto from 'crypto';
 
 const compilerModule = require.resolve('jsii/bin/jsii');
 
@@ -23,6 +24,8 @@ export async function compile(workdir: string, options: Options) {
   // path to entrypoint without extension
   const basepath = path.join(path.dirname(entrypoint), path.basename(entrypoint, '.ts'));
 
+  const packageName = options.packageName?.replace(/\./g, '').replace(/\//g, '') ?? crypto.createHash('sha256').update(basepath, 'utf8').digest('hex');
+
   // jsii modules to include
   const moduleDirs = options.deps ?? [];
 
@@ -46,9 +49,8 @@ export async function compile(workdir: string, options: Options) {
     }
   }
 
-
   const pkg = {
-    name: 'generated',
+    name: packageName,
     version: '0.0.0',
     author: 'generated@generated.com',
     main: `${basepath}.js`,
@@ -66,7 +68,7 @@ export async function compile(workdir: string, options: Options) {
   if (options.python) {
     targets.python = {
       distName: 'generated',
-      module: options.python.moduleName,
+      module: options.python.moduleName.replace(/-/g, '_'),
     };
   }
 

src/options.ts

@@ -18,6 +18,12 @@ export interface Options {
    */
   jsii?: JsiiOutputOptions;
 
+  /**
+   * Package name
+   * @default - hash of the basepath to the module
+   */
+  packageName?: string
+
   /**
    * Produce python code.
    * @default - python is not generated

src/srcmak.ts

@@ -32,7 +32,7 @@ export async function srcmak(srcdir: string, options: Options = { }) {
 
     // extract code based on selected languages
     if (options.python) {
-      const reldir = options.python.moduleName.replace(/\./g, '/'); // jsii replaces "." with "/"
+      const reldir = options.python.moduleName.replace(/\./g, '/').replace(/-/g, '_'); // jsii replaces "." with "/"
       const source = path.resolve(path.join(workdir, 'dist/python/src', reldir));
       const target = path.join(options.python.outdir, reldir);
       await fs.move(source, target, { overwrite: true });

test/__snapshots__/srcmak.test.ts.snap

@@ -45,7 +45,7 @@ public final class $Module extends JsiiModule {
     private final Map<String, Class<?>> cache = new HashMap<>();
 
     public $Module() {
-        super(\\"generated\\", \\"0.0.0\\", $Module.class, \\"generated@0.0.0.jsii.tgz\\");
+        super(\\"javapackage\\", \\"0.0.0\\", $Module.class, \\"javapackage@0.0.0.jsii.tgz\\");
     }
 
     @Override
@@ -73,7 +73,7 @@ public final class $Module extends JsiiModule {
   "src/main/java/hello/world/Hello.java": "package hello.world;
 
 
-@software.amazon.jsii.Jsii(module = hello.world.$Module.class, fqn = \\"generated.Hello\\")
+@software.amazon.jsii.Jsii(module = hello.world.$Module.class, fqn = \\"javapackage.Hello\\")
 public class Hello extends software.amazon.jsii.JsiiObject {
 
     protected Hello(final software.amazon.jsii.JsiiObjectRef objRef) {
@@ -97,7 +97,7 @@ public class Hello extends software.amazon.jsii.JsiiObject {
   "src/main/java/hello/world/Operands.java": "package hello.world;
 
 
-@software.amazon.jsii.Jsii(module = hello.world.$Module.class, fqn = \\"generated.Operands\\")
+@software.amazon.jsii.Jsii(module = hello.world.$Module.class, fqn = \\"javapackage.Operands\\")
 @software.amazon.jsii.Jsii.Proxy(Operands.Jsii$Proxy.class)
 public interface Operands extends software.amazon.jsii.JsiiSerializable {
 
@@ -194,7 +194,7 @@ public interface Operands extends software.amazon.jsii.JsiiSerializable {
             data.set(\\"rhs\\", om.valueToTree(this.getRhs()));
 
             final com.fasterxml.jackson.databind.node.ObjectNode struct = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode();
-            struct.set(\\"fqn\\", om.valueToTree(\\"generated.Operands\\"));
+            struct.set(\\"fqn\\", om.valueToTree(\\"javapackage.Operands\\"));
             struct.set(\\"data\\", data);
 
             final com.fasterxml.jackson.databind.node.ObjectNode obj = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode();
@@ -223,9 +223,16 @@ public interface Operands extends software.amazon.jsii.JsiiSerializable {
     }
 }
 ",
-  "src/main/resources/hello/world/$Module.txt": "generated.Hello=hello.world.Hello
-generated.Operands=hello.world.Operands
+  "src/main/resources/hello/world/$Module.txt": "javapackage.Hello=hello.world.Hello
+javapackage.Operands=hello.world.Operands
 ",
+  "src/main/resources/hello/world/javapackage@0.0.0.jsii.tgz": "��ko�H�����K���&@J�Hw�
&�B ��ʏ�Yb���5�T��?1��.m�:F����˳��qU�Q5Q�8f��1 IR�R֭T��5��I�\\\\�I@'�R�����x��T��|\\"c������� ���G�\`s��f���*G�騨;���Q�B��
+�>��3��B�@L����!
ӱ:Q�(�BF�ȱ��9��=(�RqE�=DY�A.֋��^�eU�V�՝���:\\",d�'���E)B%F�ȧ�u���y��Z�Zk5L�d �VC�oI*�R\\"B�D�-�J�3�����B�L��s�Xz�:!�I���c�<�c�e9�'�Z1]Lg�!���TD���'gNLYl2��TƐ�Y�:�_�3I)0����0J�=b��[ eAo9�ěB.óвg���h0�������_�,�\`��jŧ6�H7��/d$����i���cfu�%I�[5�����)�8�%m�/1qܼ�3�ߴ�^��<���6�>/iM�(a�n۠��RlC�LB��gk��e-��(��� 
+��S����tC�jl�z���Wbx������J�'�W�r�k�g��1N!���qض=�jV�'/��}�e��{�Y����˄���ʋ������n��⾇k4�H01愇�޹�==����ǡy7�f�q�6M�>U��.>�������u�H,�o]m�� N7�|�����x����{r��/���g��1$@����h 8g�S����h�:��]A���8��
+߄�jy(JN�|�F՛p$Ll�a!�΄h5�P���\\"c'�6�_��\\"d_�C8�ls'��
+��yX(�~��Q]��	�{qܴ0��0O���!���P����vy8h��~�S����m���c<�W%�<z*�İ>��z�}�w���R�W���uY��,�Wj}�mi����
+�����'KL���j��m̂��3�߹;����^�stq��;�swv�;��\`�uqzk��+�5�oy�sw%u���>]���Yp?�����?=���%�o��q���=λ��Y��������1h�����\\\\�_(cWS����i*�^Eo�}��!]K�����y�׀�7l]�H�i�۽ѰY��֣�5G�k������eЬ�]���AC7
+_m]֔fU��mKs]�!M}Ь&c��t���t��]�7�Ӛ�e�zXkZc�y�8<M��i�	��H����[��H���=_i%rR�%���4�O�_e��y�7�n�9�xܒx0����\`�CH�Rv��e���!���?�	���O�o϶F�ai����h���+>�L\\\\�!�I}�\\\\;g]�fS�fw���֙A�f���i�K[?���jgs�%�u������Y*�75�VJ�y��6�����}�Em�E���1��[��6���|-���\\\\^��{r����?��ZH{JB�ታE����&?���e�b�*]0T�	k��T�Nv�[;d[���'�7/��� ",
 }
 `;
 
@@ -237,26 +244,26 @@ Object {
       "author",
     ],
   },
-  "description": "generated",
-  "fingerprint": "cNtb65kyZQOiBulmzr+bs6dCGdv4uhea1tFTkbRGJTw=",
+  "description": "1bc04b5291c26a46d918139138b992d2de976d6851d0893b0476b85bfbdfc6e6",
+  "fingerprint": "6oK+Fme17BaQrSRFIR9SO8fcGINzbxpouGPKqn9MAhs=",
   "homepage": "http://generated",
-  "jsiiVersion": "1.6.0 (build 248e75b)",
+  "jsiiVersion": "1.9.0 (build 5c646d5)",
   "license": "Apache-2.0",
-  "name": "generated",
+  "name": "1bc04b5291c26a46d918139138b992d2de976d6851d0893b0476b85bfbdfc6e6",
   "repository": Object {
     "type": "git",
     "url": "http://generated",
   },
   "schema": "jsii/0.10.0",
   "targets": Object {
     "js": Object {
-      "npm": "generated",
+      "npm": "1bc04b5291c26a46d918139138b992d2de976d6851d0893b0476b85bfbdfc6e6",
     },
   },
   "types": Object {
-    "generated.Foo": Object {
-      "assembly": "generated",
-      "fqn": "generated.Foo",
+    "1bc04b5291c26a46d918139138b992d2de976d6851d0893b0476b85bfbdfc6e6.Foo": Object {
+      "assembly": "1bc04b5291c26a46d918139138b992d2de976d6851d0893b0476b85bfbdfc6e6",
+      "fqn": "1bc04b5291c26a46d918139138b992d2de976d6851d0893b0476b85bfbdfc6e6.Foo",
       "initializer": Object {},
       "kind": "class",
       "locationInModule": Object {
@@ -300,7 +307,7 @@ import publication
 from ._jsii import *
 
 
-class Hello(metaclass=jsii.JSIIMeta, jsii_type=\\"generated.Hello\\"):
+class Hello(metaclass=jsii.JSIIMeta, jsii_type=\\"pythonpackage.Hello\\"):
     def __init__(self) -> None:
         jsii.create(Hello, self, [])
 
@@ -315,25 +322,29 @@ class Hello(metaclass=jsii.JSIIMeta, jsii_type=\\"generated.Hello\\"):
         return jsii.invoke(self, \\"add\\", [ops])
 
 
-@jsii.data_type(jsii_type=\\"generated.Operands\\", jsii_struct_bases=[], name_mapping={'lhs': 'lhs', 'rhs': 'rhs'})
-class Operands():
+@jsii.data_type(
+    jsii_type=\\"pythonpackage.Operands\\",
+    jsii_struct_bases=[],
+    name_mapping={\\"lhs\\": \\"lhs\\", \\"rhs\\": \\"rhs\\"},
+)
+class Operands:
     def __init__(self, *, lhs: jsii.Number, rhs: jsii.Number) -> None:
         \\"\\"\\"
         :param lhs: -
         :param rhs: -
         \\"\\"\\"
         self._values = {
-            'lhs': lhs,
-            'rhs': rhs,
+            \\"lhs\\": lhs,
+            \\"rhs\\": rhs,
         }
 
     @builtins.property
     def lhs(self) -> jsii.Number:
-        return self._values.get('lhs')
+        return self._values.get(\\"lhs\\")
 
     @builtins.property
     def rhs(self) -> jsii.Number:
-        return self._values.get('rhs')
+        return self._values.get(\\"rhs\\")
 
     def __eq__(self, rhs) -> bool:
         return isinstance(rhs, self.__class__) and rhs._values == self._values
@@ -342,7 +353,9 @@ class Operands():
         return not (rhs == self)
 
     def __repr__(self) -> str:
-        return 'Operands(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items())
+        return \\"Operands(%s)\\" % \\", \\".join(
+            k + \\"=\\" + repr(v) for k, v in self._values.items()
+        )
 
 
 __all__ = [
@@ -362,14 +375,29 @@ import jsii
 import jsii.compat
 import publication
 
-__jsii_assembly__ = jsii.JSIIAssembly.load(\\"generated\\", \\"0.0.0\\", __name__[0:-6], \\"generated@0.0.0.jsii.tgz\\")
+__jsii_assembly__ = jsii.JSIIAssembly.load(
+    \\"pythonpackage\\", \\"0.0.0\\", __name__[0:-6], \\"pythonpackage@0.0.0.jsii.tgz\\"
+)
 
 __all__ = [
     \\"__jsii_assembly__\\",
 ]
 
 publication.publish()
 ",
+  "my_python_module/submodule/_jsii/pythonpackage@0.0.0.jsii.tgz": "��ko�H�����K���6��D�������TE�z����5�T����<]Ҫ���ݙ��Ύ��ih��p.;f��y�$�T(��

+y�(��K�,�J�I��(yx��>�3�QP����o�3� j>7]*���fc��#�\`�ql����ȵţ���f@�w4]�_��f���	�z
9^w+�tm�3@��{'�\\\\*0����)[��$��}bB�
+%��.����X}!&�S�J1*1k�{.#ܥ��<�b/�X�Sk�����ZHj�����H�0a�V�ǫq��g��!K�1j}�Aoo��RW@ۮ�[����w�Z����H
+�^�qC�l[������u+��Ո����S_2Ji�C8�,2�Q.RĄ8F�Y iEo�H�IuZ���J�Db��
+r�)vx~4���(V���x���kc��X�maM�!
+��ź&�V�$i�j���W�4
+(wcC�m�7��޶�p����^yn�h�~�yh�uCo��O���=Jl�id���:�⃲V�d�JO��+�c��\\"�и�4�S?~R;1O8�{
+��{e'���Zyԅ5N�#�B���[�G8b�>�tk�+��z�m����&��ܻ?���Z���)�}n�$�p�}3]���M��+�3��;��D>0��Z�T�W�����Y�:�f�Dy�{?�w�j�<�ޜ��E�WU�,�Pn;t���d<^��ż�]�+��7�k��� ���$��̕>ƈg
+�S~��<�rv$�ww�-ё�]�j���%,ޝf��qy'�	S��t���7!^��1o�
+y��O�@��,�e�}4�4t������4���!0ק�4σ�qӽ<_�'0�ρ(����uNu��R�Me8hε~�W����ڴ��̂1��r&�����|/�Uz׺R�B�J���ed�-��~дt��k�4
+�����'KL�e5*�n�p�՜wnj���Y����tn���M��W�5\`�qyц��J�����ܴ��}���p�u�	�x-���sX;ߠ��&��w%
�6��S�:�w&�f'P�괧Ơ9��R�B_�cOW���V?��z�������=N�B�мUnF_���a�5��~���z����^7�W��}���^�t�\`دM@�ו@k�Jj�(������$�)��dl�Fe����V��(�]�{L�ؔ���n��zm2��S�(�s7u�;����N��ڽ@m$rR�%������PPd���SP	y��;�����㆜� ��t��/�B���z4�&�-���/���/����3�������,m=�\\"m�8���17�
+;FR�>���׳y�As���IKаS����� 4V������;v���̓Z2Iɼ*�
+�a���?��6��aLϷ1�ŏ��C�_x�c��yH���g@\\\\S	i�AH>��aM�f��P�����&��c�*M00T}�~'��w���C^�^��'�/�~9M",
   "my_python_module/submodule/py.typed": "
 ",
 }

test/srcmak.test.ts

@@ -61,9 +61,10 @@ test('python + different entrypoint + submodule', async () => {
     await mkdtemp(async target => {
       await srcmak(source, {
         entrypoint: 'different/entry.ts',
+        packageName: 'python.package',
         python: {
           outdir: target,
-          moduleName: 'my_python_module.submodule',
+          moduleName: 'my-python_module.submodule',
         },
       });
 
@@ -96,6 +97,7 @@ test('java + different entrypoint', async () => {
     await mkdtemp(async target => {
       await srcmak(source, {
         entrypoint: 'different/entry.ts',
+        packageName: 'java.package',
         java: {
           outdir: target,
           package: 'hello.world',