jsii 5.8.23-dev.0 → 5.8.23-dev.10

package/lib/assembler.d.ts

@@ -204,6 +204,10 @@ export declare class Assembler implements Emitter {
      * not output position
      */
     private validateTypesAgainstPositions;
+    /**
+     * Make sure that no 2 submodules are emitting into the same target namespaces
+     */
+    private validateSubmoduleConfigs;
 }
 export interface AssemblerOptions {
     /**

package/lib/assembler.js

@@ -140,6 +140,7 @@ class Assembler {
         }
         this.callDeferredsInOrder();
         this.validateTypesAgainstPositions();
+        this.validateSubmoduleConfigs();
         // Skip emitting if any diagnostic message is an error
         if (this._diagnostics.find((diag) => diag.category === ts.DiagnosticCategory.Error) != null) {
             LOG.debug('Skipping emit due to errors.');
@@ -171,6 +172,7 @@ class Assembler {
             bundled: this.projectInfo.bundleDependencies,
             types: Object.fromEntries(this._types),
             submodules: noEmptyDict(toSubmoduleDeclarations(this.mySubmodules())),
+            // Force this into shape
             targets: this.projectInfo.targets,
             metadata: {
                 ...this.projectInfo.metadata,
@@ -554,8 +556,16 @@ class Assembler {
             };
         }
         function loadSubmoduleTargetConfig(submoduleMain) {
-            const jsiirc = path.resolve(submoduleMain, '..', '.jsiirc.json');
-            if (!fs.existsSync(jsiirc)) {
+            const dirname = path.dirname(submoduleMain);
+            const basenameWithoutExtension = path.basename(submoduleMain).replace(/\.ts$/, '');
+            let jsiirc;
+            if (basenameWithoutExtension === 'index') {
+                jsiirc = path.resolve(submoduleMain, '..', '.jsiirc.json');
+            }
+            else {
+                jsiirc = path.resolve(dirname, `.${basenameWithoutExtension}.jsiirc.json`);
+            }
+            if (!jsiirc || !fs.existsSync(jsiirc)) {
                 return undefined;
             }
             const data = JSON.parse(fs.readFileSync(jsiirc, 'utf-8'));
@@ -2028,6 +2038,48 @@ class Assembler {
             });
         }
     }
+    /**
+     * Make sure that no 2 submodules are emitting into the same target namespaces
+     */
+    validateSubmoduleConfigs() {
+        const self = this;
+        const dotNetnamespaces = {};
+        const javaPackages = {};
+        const pythonModules = {};
+        const goPackages = {};
+        for (const submodule of this._submodules.values()) {
+            const targets = submodule.targets;
+            if (targets?.dotnet?.namespace) {
+                accumList(dotNetnamespaces, targets.dotnet.namespace, submodule.fqn);
+            }
+            if (targets?.java?.package) {
+                accumList(javaPackages, targets.java.package, submodule.fqn);
+            }
+            if (targets?.python?.module) {
+                accumList(pythonModules, targets.python.module, submodule.fqn);
+            }
+            if (targets?.go?.packageName) {
+                accumList(goPackages, targets.go.packageName, submodule.fqn);
+            }
+        }
+        maybeError('dotnet', dotNetnamespaces);
+        maybeError('java', javaPackages);
+        maybeError('python', pythonModules);
+        maybeError('go', goPackages);
+        function accumList(set, key, value) {
+            if (!set[key]) {
+                set[key] = [];
+            }
+            set[key].push(value);
+        }
+        function maybeError(language, set) {
+            for (const [namespace, modules] of Object.entries(set)) {
+                if (modules.length > 1) {
+                    self._diagnostics.push(jsii_diagnostic_1.JsiiDiagnostic.JSII_4010_SUBMODULE_NAMESPACE_CONFLICT.create(undefined, language, namespace, modules));
+                }
+            }
+        }
+    }
 }
 exports.Assembler = Assembler;
 function _fingerprint(assembly) {