fix: Package name collisions

Fixes: cdk8s-team/cdk8s#273

Signed-off-by: campionfellin <campionfellin@gmail.com>

Author: campionfellin

src/compile.ts

@@ -11,6 +11,7 @@ const compilerModule = require.resolve('jsii/bin/jsii');
 export async function compile(workdir: string, options: Options) {
   const args = [ '--silence-warnings', 'reserved-word' ];
   const entrypoint = options.entrypoint ?? 'index.ts';
+  const packageName = options.packageName?.replace(/\./g, '').replace(/\//g, '') ?? 'generated';
 
   if (path.extname(entrypoint) !== '.ts') {
     throw new Error(`jsii entrypoint must be a .ts file: ${entrypoint}`);
@@ -46,9 +47,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`,

src/options.ts

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

test/__snapshots__/cli.test.ts.snap

@@ -53,11 +53,7 @@ public final class $Module extends JsiiModule {
         if (!MODULE_TYPES.containsKey(fqn)) {
             throw new ClassNotFoundException(\\"Unknown JSII type: \\" + fqn);
         }
-        String className = MODULE_TYPES.get(fqn);
-        if (!this.cache.containsKey(className)) {
-            this.cache.put(className, this.findClass(className));
-        }
-        return this.cache.get(className);
+        return this.cache.computeIfAbsent(MODULE_TYPES.get(fqn), this::findClass);
     }
 
     private Class<?> findClass(final String binaryName) {
@@ -149,7 +145,7 @@ public interface Operands extends software.amazon.jsii.JsiiSerializable {
     /**
      * A builder for {@link Operands}
      */
-    public static final class Builder implements software.amazon.jsii.Builder<Operands> {
+    public static final class Builder {
         private java.lang.Number lhs;
         private java.lang.Number rhs;
 
@@ -178,7 +174,6 @@ public interface Operands extends software.amazon.jsii.JsiiSerializable {
          * @return a new instance of {@link Operands}
          * @throws NullPointerException if any required attribute was not provided
          */
-        @Override
         public Operands build() {
             return new Jsii$Proxy(lhs, rhs);
         }
@@ -273,9 +268,9 @@ Object {
     ],
   },
   "description": "generated",
-  "fingerprint": "+fSgo9PQwFAKmX2JcaRILwTXE/p1H1bq+QKuOREAfuE=",
+  "fingerprint": "YzbxW50rbVtKyO3xyXOGChedDt8pdGdCRYTETM1PW7k=",
   "homepage": "http://generated",
-  "jsiiVersion": "1.6.0 (build 248e75b)",
+  "jsiiVersion": "1.5.0 (build 46538f8)",
   "license": "Apache-2.0",
   "name": "generated",
   "repository": Object {

test/__snapshots__/srcmak.test.ts.snap

@@ -61,6 +61,7 @@ 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',
@@ -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',