@komaci/common-shared 242.3.3 → 242.3.6

package/build/moduleMetadata.d.ts

@@ -80,6 +80,15 @@ export declare const updateAliasForImport: (lookupName: string, referencedName:
 export declare function getImportTemplateKomaciDocByResourceName(resourceName: string, templateKomaciDocMap?: {
     [fName: string]: KomaciDocument;
 }): KomaciDocument | undefined;
+/**
+ * multiple things can import something with the same base name before we fully process ast
+ * this makes sure we get import metadata for the right namespace.
+ * @param name the import name
+ * @param namespace the namespace to insure we get from
+ * @param moduleMetadata module metadata
+ * @returns the import if we could find it
+ */
+export declare function getImportFromNamespace(name: string, namespace: string, moduleMetadata: ModuleMetadata): ImportMetadata | undefined;
 /**
  * pull all needful import metadata we can from the ast
  * for the most part, we can grab data from the komaci document for imports but sometimes
@@ -94,6 +103,14 @@ export declare function getImportTemplateKomaciDocByResourceName(resourceName: s
  * @param ast ast for the given component
  */
 export declare const collectImportMetadataFromAst: (ast: t.File, moduleMetadata: ModuleMetadata) => void;
+/**
+ * Find the other import metadata object that references the same import with a different alias
+ * @param resourceName import resource path
+ * @param importedName the name as it comes from the import, an exported name, `default` or `*`
+ * @param moduleMetadata module metadata for this component
+ * @returns the import metadata if it is found
+ */
+export declare const findOtherAlias: (resourceName: string, importedName: string, moduleMetadata: ModuleMetadata) => ImportMetadata | undefined;
 /**
  * From a given adg, collect as much metadata as possible ONLY from the komaci document
  *

package/build/moduleMetadata.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTemplateImport = exports.upliftFakePropsFromTemplate = exports.reconcileDefaultAdg = exports.isImportInvalid = exports.reconcilePrimingAdapater = exports.reconcileWireReference = exports.composeWireFunctionMetadata = exports.addTemplateUsageForAdg = exports.mapExportNamesToAdgs = exports.initalizeAdgMetadata = exports.collectImportMetadataFromAst = exports.getImportTemplateKomaciDocByResourceName = exports.updateAliasForImport = exports.addNewImportFromAst = exports.reconcileImport = exports.reconcileNamespace = exports.traverseAstImports = exports.composeImportMetadata = exports.initializeImportMetdataFromKomaciDocument = exports.initAdgMetadataObject = exports.initModuleMetadataObject = exports.NO_KOMACI_DOC_REF = void 0;
+exports.isTemplateImport = exports.upliftFakePropsFromTemplate = exports.reconcileDefaultAdg = exports.isImportInvalid = exports.reconcilePrimingAdapater = exports.reconcileWireReference = exports.composeWireFunctionMetadata = exports.addTemplateUsageForAdg = exports.mapExportNamesToAdgs = exports.initalizeAdgMetadata = exports.findOtherAlias = exports.collectImportMetadataFromAst = exports.getImportFromNamespace = exports.getImportTemplateKomaciDocByResourceName = exports.updateAliasForImport = exports.addNewImportFromAst = exports.reconcileImport = exports.reconcileNamespace = exports.traverseAstImports = exports.composeImportMetadata = exports.initializeImportMetdataFromKomaciDocument = exports.initAdgMetadataObject = exports.initModuleMetadataObject = exports.NO_KOMACI_DOC_REF = void 0;
 const allowlistNamespaces_1 = require("./allowlistNamespaces");
 const komaciDocumentIntrospection_1 = require("./komaciDocumentIntrospection");
 const types_1 = require("./types");
@@ -54,6 +54,7 @@ const initializeImportMetdataFromKomaciDocument = (doc, moduleMetadata, template
         const namespace = {
             names,
             isSupported,
+            originalNames: names,
             resourceName: importNamespace.resourceName,
             isDefaultSpecifier: names.has('default'),
             isNamespaceSpecifier: names.has('*'),
@@ -62,7 +63,10 @@ const initializeImportMetdataFromKomaciDocument = (doc, moduleMetadata, template
         for (let j = 0; j < importNamespace.names.length; j++) {
             const name = importNamespace.names[j];
             const komaciDocImportRef = `${i}/names/${j}`;
-            const importAlias = moduleMetadata.importsByName.has(name)
+            // komaci doc references to other resolvable modules aren't going to ever be referenced by name so we can hoist them with the extra namespace
+            // this prevents collisions between the resolvable module and regular import
+            const importAlias = moduleMetadata.importsByName.has(name) ||
+                importNamespace.resourceName.startsWith('@salesforce/komaci')
                 ? `${name}-${importNamespace.resourceName}`
                 : undefined;
             (0, exports.composeImportMetadata)(name, importNamespace.resourceName, isSupported, templateAdgIndex !== undefined
@@ -200,6 +204,7 @@ const reconcileNamespace = (resourceName, moduleMetadata) => {
     if (!namespace) {
         namespace = {
             names: new Set(),
+            originalNames: new Set(),
             isSupported: allowlistNamespaces_1.isLocalHtmlImportReference.exec(resourceName)
                 ? (0, allowlistNamespaces_1.isSupportedNamespace)(resourceName)
                 : (0, allowlistNamespaces_1.isNamespaceInternal)((0, allowlistNamespaces_1.getNamespaceFromImport)(resourceName)),
@@ -252,6 +257,13 @@ const addNewImportFromAst = (referencedName, namespace, moduleMetadata, original
     }
     moduleMetadata.importsByName.set(referencedName, importMetadata);
     namespace.names.add(referencedName);
+    namespace.originalNames.add(originalImportName || referencedName);
+    if (originalImportName === 'default') {
+        namespace.isDefaultSpecifier = true;
+    }
+    else if (originalImportName === '*') {
+        namespace.isNamespaceSpecifier = true;
+    }
 };
 exports.addNewImportFromAst = addNewImportFromAst;
 /**
@@ -263,13 +275,14 @@ exports.addNewImportFromAst = addNewImportFromAst;
  * @param originalImportName (optional) the original name of the import that has been aliases. undefined if no alias.
  */
 const updateAliasForImport = (lookupName, referencedName, namespace, moduleMetadata, originalImportName) => {
-    const importMetadata = moduleMetadata.importsByName.get(lookupName);
+    const importMetadata = getImportFromNamespace(lookupName, namespace.resourceName, moduleMetadata);
     if (originalImportName && referencedName !== originalImportName && importMetadata) {
         const isDefaultOrNamespace = originalImportName === '*' || originalImportName === 'default';
+        const oldAlias = importMetadata.importAlias || lookupName;
         importMetadata.importAlias = referencedName;
+        moduleMetadata.importsByName.delete(oldAlias);
         moduleMetadata.importsByName.set(referencedName, importMetadata);
-        moduleMetadata.importsByName.delete(lookupName);
-        namespace.names.delete(isDefaultOrNamespace ? originalImportName : lookupName);
+        namespace.names.delete(isDefaultOrNamespace ? originalImportName : oldAlias);
         namespace.names.add(referencedName);
         if (importMetadata.komaciDocImportRef !== exports.NO_KOMACI_DOC_REF) {
             moduleMetadata.importIndexReference.set(importMetadata.komaciDocImportRef, referencedName);
@@ -294,6 +307,22 @@ function getImportTemplateKomaciDocByResourceName(resourceName, templateKomaciDo
     return templateImportKomaciDoc;
 }
 exports.getImportTemplateKomaciDocByResourceName = getImportTemplateKomaciDocByResourceName;
+/**
+ * multiple things can import something with the same base name before we fully process ast
+ * this makes sure we get import metadata for the right namespace.
+ * @param name the import name
+ * @param namespace the namespace to insure we get from
+ * @param moduleMetadata module metadata
+ * @returns the import if we could find it
+ */
+function getImportFromNamespace(name, namespace, moduleMetadata) {
+    let importMetadata = moduleMetadata.importsByName.get(name);
+    if (importMetadata?.resourceName !== namespace) {
+        importMetadata = moduleMetadata.importsByName.get(`${name}-${namespace}`);
+    }
+    return importMetadata;
+}
+exports.getImportFromNamespace = getImportFromNamespace;
 /**
  * pull all needful import metadata we can from the ast
  * for the most part, we can grab data from the komaci document for imports but sometimes
@@ -310,15 +339,45 @@ exports.getImportTemplateKomaciDocByResourceName = getImportTemplateKomaciDocByR
 const collectImportMetadataFromAst = (ast, moduleMetadata) => {
     (0, exports.traverseAstImports)(ast, (lookupName, referencedName, resourceName, originalImportName) => {
         const namespace = (0, exports.reconcileNamespace)(resourceName, moduleMetadata);
-        if (!moduleMetadata.importsByName.has(lookupName)) {
+        const existingImportMetadata = getImportFromNamespace(lookupName, resourceName, moduleMetadata);
+        if (!namespace.originalNames.has(originalImportName || referencedName)) {
             (0, exports.addNewImportFromAst)(referencedName, namespace, moduleMetadata, originalImportName);
         }
         else {
+            const importMetadata = (0, exports.findOtherAlias)(resourceName, originalImportName || referencedName, moduleMetadata);
+            if (importMetadata) {
+                moduleMetadata.importsByName.set(referencedName, importMetadata);
+            }
+        }
+        if (existingImportMetadata &&
+            existingImportMetadata.komaciDocImportRef !== exports.NO_KOMACI_DOC_REF &&
+            (!existingImportMetadata.importAlias ||
+                existingImportMetadata.importAlias ===
+                    `${existingImportMetadata.name}-${resourceName}` ||
+                existingImportMetadata.importAlias === `namespace-${resourceName}`) &&
+            existingImportMetadata.name !== referencedName) {
             (0, exports.updateAliasForImport)(lookupName, referencedName, namespace, moduleMetadata, originalImportName);
         }
     });
 };
 exports.collectImportMetadataFromAst = collectImportMetadataFromAst;
+/**
+ * Find the other import metadata object that references the same import with a different alias
+ * @param resourceName import resource path
+ * @param importedName the name as it comes from the import, an exported name, `default` or `*`
+ * @param moduleMetadata module metadata for this component
+ * @returns the import metadata if it is found
+ */
+const findOtherAlias = (resourceName, importedName, moduleMetadata) => {
+    for (const importMetadata of moduleMetadata.importsByName.values()) {
+        if (importMetadata.resourceName === resourceName &&
+            importMetadata.name === importedName) {
+            return importMetadata;
+        }
+    }
+    return undefined;
+};
+exports.findOtherAlias = findOtherAlias;
 /**
  * From a given adg, collect as much metadata as possible ONLY from the komaci document
  *

package/build/types.d.ts

@@ -56,6 +56,8 @@ export declare type ImportDetail = {
     resourceName: string;
     /** The names of the specific things imported */
     names: Set<string>;
+    /** unique un-aliased names for all of the things imported. can include the specials like default and * */
+    originalNames: Set<string>;
     /** If this import is a namespace */
     isNamespaceSpecifier: boolean;
     /** If this import contains a default specifier */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/common-shared",
-    "version": "242.3.3",
+    "version": "242.3.6",
     "description": "Assets that are shared across Komaci commonjs packages",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -29,7 +29,7 @@
         "build/komaci-mapping.json"
     ],
     "devDependencies": {
-        "@komaci/types": "242.3.3"
+        "@komaci/types": "242.3.6"
     },
     "dependencies": {
         "@babel/core": "^7.9.0",