@ms-cloudpack/package-utilities 0.7.0 → 0.9.0

package/CHANGELOG.json

@@ -2,7 +2,73 @@
   "name": "@ms-cloudpack/package-utilities",
   "entries": [
     {
-      "date": "Tue, 16 Aug 2022 08:11:49 GMT",
+      "date": "Sun, 04 Sep 2022 08:14:28 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.9.0",
+      "version": "0.9.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "33c2ca948b1ea905fa5a09f56bd443724d638fe3",
+            "comment": "Adding PackageDefinitions implementation."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 03 Sep 2022 08:15:29 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.8.1",
+      "version": "0.8.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/package-utilities",
+            "comment": "Bump @ms-cloudpack/path-utilities to v0.3.2",
+            "commit": "ec909bf967a54b174cb1d50e7e55bd4b3ed02884"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 25 Aug 2022 08:12:52 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.8.0",
+      "version": "0.8.0",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "b5fd98ff781c880bb2e368c89cdd784acd43b156",
+            "comment": "Update babel monorepo to v7.18.13"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 24 Aug 2022 08:14:41 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v0.8.0",
+      "version": "0.8.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "3ba31149f7ca723c11f75bca3cc036e93887cd25",
+            "comment": "Adding getExportsMap utility plus tests to update how importMaps are generated. Integrated into the workflow."
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/package-utilities",
+            "comment": "Bump @ms-cloudpack/package-overrides to v0.1.0",
+            "commit": "3ba31149f7ca723c11f75bca3cc036e93887cd25"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 16 Aug 2022 08:12:03 GMT",
       "tag": "@ms-cloudpack/package-utilities_v0.7.0",
       "version": "0.7.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,37 @@
 # Change Log - @ms-cloudpack/package-utilities
 
-This log was last generated on Tue, 16 Aug 2022 08:11:49 GMT and should not be manually modified.
+This log was last generated on Sun, 04 Sep 2022 08:14:28 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.9.0
+
+Sun, 04 Sep 2022 08:14:28 GMT
+
+### Minor changes
+
+- Adding PackageDefinitions implementation. (dzearing@microsoft.com)
+
+## 0.8.1
+
+Sat, 03 Sep 2022 08:15:29 GMT
+
+### Patches
+
+- Bump @ms-cloudpack/path-utilities to v0.3.2
+
+## 0.8.0
+
+Wed, 24 Aug 2022 08:14:41 GMT
+
+### Minor changes
+
+- Adding getExportsMap utility plus tests to update how importMaps are generated. Integrated into the workflow. (dzearing@microsoft.com)
+- Bump @ms-cloudpack/package-overrides to v0.1.0
+
 ## 0.7.0
 
-Tue, 16 Aug 2022 08:11:49 GMT
+Tue, 16 Aug 2022 08:12:03 GMT
 
 ### Minor changes
 

package/lib/PackageDefinitions.d.ts

@@ -0,0 +1,12 @@
+import type { PackageJson } from 'type-fest';
+export declare type PackageDefinitionTransform = (definition: PackageJson) => PackageJson | undefined;
+export declare class PackageDefinitions {
+    static getInstance(): PackageDefinitions;
+    private _cache;
+    private _transforms;
+    get(packagePath: string, options?: {
+        refresh: boolean;
+    }): Promise<PackageJson | undefined>;
+    registerTransform(callback: PackageDefinitionTransform): void;
+    clear(): void;
+}

package/lib/PackageDefinitions.js

@@ -0,0 +1,41 @@
+import path from 'path';
+import { applyOverrides } from '@ms-cloudpack/package-overrides';
+import { readJson } from '@ms-cloudpack/json-utilities';
+let _singleton;
+export class PackageDefinitions {
+    constructor() {
+        this._cache = {};
+        this._transforms = [applyOverrides];
+    }
+    static getInstance() {
+        if (!_singleton) {
+            _singleton = new PackageDefinitions();
+        }
+        return _singleton;
+    }
+    async get(packagePath, options) {
+        let existingDefinition = this._cache[packagePath];
+        if (!existingDefinition || options?.refresh) {
+            try {
+                // Load the package and apply transforms.
+                const definition = await readJson(path.join(packagePath, 'package.json'));
+                // If we have loaded a definition, apply transforms and cache/return the result.
+                if (definition) {
+                    existingDefinition = this._cache[packagePath] = this._transforms.reduce((def, transform) => transform(def) || def, definition);
+                }
+            }
+            catch (e) {
+                /* no-op */
+            }
+        }
+        return existingDefinition;
+    }
+    registerTransform(callback) {
+        this._transforms.push(callback);
+        this.clear();
+    }
+    clear() {
+        this._cache = {};
+    }
+}
+//# sourceMappingURL=PackageDefinitions.js.map

package/lib/PackageDefinitions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PackageDefinitions.js","sourceRoot":"","sources":["../src/PackageDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,IAAI,UAA0C,CAAC;AAG/C,MAAM,OAAO,kBAAkB;IAA/B;QAQU,WAAM,GAAgC,EAAE,CAAC;QACzC,gBAAW,GAAiC,CAAC,cAAc,CAAC,CAAC;IAiCvE,CAAC;IAzCC,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,IAAI,kBAAkB,EAAE,CAAC;SACvC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAKD,KAAK,CAAC,GAAG,CAAC,WAAmB,EAAE,OAA8B;QAC3D,IAAI,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAElD,IAAI,CAAC,kBAAkB,IAAI,OAAO,EAAE,OAAO,EAAE;YAC3C,IAAI;gBACF,yCAAyC;gBACzC,MAAM,UAAU,GAA4B,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;gBAEnG,gFAAgF;gBAChF,IAAI,UAAU,EAAE;oBACd,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CACrE,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,EACzC,UAAU,CACX,CAAC;iBACH;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,WAAW;aACZ;SACF;QAED,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,iBAAiB,CAAC,QAAoC;QACpD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;CACF"}

package/lib/PackageDefinitions.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/PackageDefinitions.test.js

@@ -0,0 +1,89 @@
+import { PackageDefinitions } from './PackageDefinitions.js';
+import { testProject1Path } from './testPaths.js';
+import { describe, it, expect } from '@jest/globals';
+describe('PackageDefinitions', () => {
+    it('can get a package definition', async () => {
+        const definitions = new PackageDefinitions();
+        expect(await definitions.get(testProject1Path)).toMatchInlineSnapshot(`
+      {
+        "dependencies": {
+          "b": "^1.0.0",
+          "c": "^1.0.0",
+        },
+        "exports": {
+          ".": "./lib/index.js",
+          "./foo": "./lib/foo.js",
+        },
+        "name": "test-project-1",
+        "type": "module",
+        "version": "0.0.1",
+      }
+    `);
+    });
+    it('can return undefined when the package definition is missing', async () => {
+        const definitions = new PackageDefinitions();
+        expect(await definitions.get('./missing')).toBeUndefined();
+    });
+    it('can get package definitions with transforms', async () => {
+        const definitions = new PackageDefinitions();
+        definitions.registerTransform((definition) => ({
+            ...definition,
+            name: 'transformed',
+        }));
+        expect(await definitions.get(testProject1Path)).toMatchInlineSnapshot(`
+      {
+        "dependencies": {
+          "b": "^1.0.0",
+          "c": "^1.0.0",
+        },
+        "exports": {
+          ".": "./lib/index.js",
+          "./foo": "./lib/foo.js",
+        },
+        "name": "transformed",
+        "type": "module",
+        "version": "0.0.1",
+      }
+    `);
+    });
+    it('can get package definitions with transforms and refresh', async () => {
+        const definitions = new PackageDefinitions();
+        let transformName = 'transformed';
+        let definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('test-project-1');
+        definitions.registerTransform((definition) => ({
+            ...definition,
+            name: transformName,
+        }));
+        definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('transformed');
+        transformName = 'transformed2';
+        // This should return a cached version.
+        definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('transformed');
+        // Passing in refresh:true should reset.
+        definition = await definitions.get(testProject1Path, { refresh: true });
+        expect(definition?.name).toBe('transformed2');
+    });
+    it('can get package definitions with transforms and clear', async () => {
+        const definitions = new PackageDefinitions();
+        let transformName = 'transformed';
+        let definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('test-project-1');
+        definitions.registerTransform((definition) => ({
+            ...definition,
+            name: transformName,
+        }));
+        definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('transformed');
+        transformName = 'transformed2';
+        // This should return a cached version.
+        definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('transformed');
+        // Clearing should reset.
+        definitions.clear();
+        definition = await definitions.get(testProject1Path);
+        expect(definition?.name).toBe('transformed2');
+    });
+});
+//# sourceMappingURL=PackageDefinitions.test.js.map

package/lib/PackageDefinitions.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PackageDefinitions.test.js","sourceRoot":"","sources":["../src/PackageDefinitions.test.ts"],"names":[],"mappings":"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"}

package/lib/cleanEntry.d.ts

@@ -0,0 +1 @@
+export declare function cleanEntry(entryName: string): string;

package/lib/cleanEntry.js

@@ -0,0 +1,11 @@
+import path from 'path';
+export function cleanEntry(entryName) {
+    if (path.extname(entryName) === '') {
+        entryName += '.js';
+    }
+    if (!entryName.startsWith('./')) {
+        entryName = `./${entryName}`;
+    }
+    return entryName;
+}
+//# sourceMappingURL=cleanEntry.js.map

package/lib/cleanEntry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanEntry.js","sourceRoot":"","sources":["../src/cleanEntry.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,UAAU,CAAC,SAAiB;IAC1C,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;QAClC,SAAS,IAAI,KAAK,CAAC;KACpB;IAED,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC/B,SAAS,GAAG,KAAK,SAAS,EAAE,CAAC;KAC9B;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/lib/createImportMap.js

@@ -1,9 +1,10 @@
-import path from 'path';
-import { slash } from '@ms-cloudpack/path-utilities';
 import { getPackageDefinition } from './getPackageDefinition.js';
-import { getExportPathFromEntry } from './getExportPathFromEntry.js';
 import { merge } from 'merge';
+import { getExportsMap } from './getExportsMap.js';
+import fs from 'fs';
+import path from 'path';
 export async function createImportMap(resolveMap, bundleServerUrl, packageDefinitions) {
+    var _a, _b;
     const importMap = {
         imports: {},
     };
@@ -13,12 +14,10 @@ export async function createImportMap(resolveMap, bundleServerUrl, packageDefini
             // Initialize scopes
             importMap.scopes ?? (importMap.scopes = {});
             for (const scopedEntry of Object.values(resolveEntry.scopedVersions)) {
+                const importMapForEntry = await getImportMapFromEntry(scopedEntry, bundleServerUrl, packageDefinitions);
                 for (const requiredById of Object.keys(scopedEntry.requiredBy)) {
-                    const requiredByUrl = `${bundleServerUrl}/${requiredById}/`;
-                    importMap.scopes[requiredByUrl] = {
-                        ...importMap.scopes[requiredByUrl],
-                        ...(await getImportMapFromEntry(scopedEntry, bundleServerUrl, packageDefinitions)),
-                    };
+                    const scopes = ((_a = importMap.scopes)[_b = `${bundleServerUrl}/${requiredById}/`] ?? (_a[_b] = {}));
+                    merge(scopes, importMapForEntry);
                 }
             }
         }
@@ -28,23 +27,21 @@ export async function createImportMap(resolveMap, bundleServerUrl, packageDefini
 async function getImportMapFromEntry(entry, bundleServerUrl, packageDefinitions) {
     const importMap = {};
     const definition = packageDefinitions?.[entry.path] || (await getPackageDefinition(entry.path, true));
-    if (definition) {
-        const { name = '' } = definition;
-        const baseUrl = `${bundleServerUrl}/${definition.name}@${definition.version}/`;
-        if (definition.exports) {
-            for (const [exportKey, exportEntry] of Object.entries(definition.exports)) {
-                const importAlias = slash(path.join(name, exportKey));
-                if (!importMap[importAlias]) {
-                    const exportPath = getExportPathFromEntry(exportEntry);
-                    if (exportPath) {
-                        importMap[importAlias] = new URL(exportPath, baseUrl).href;
-                    }
-                }
+    // Only add packages wtih names that aren't typings packages.
+    if (definition?.name && !definition.name.startsWith('@types/')) {
+        const exportsMap = getExportsMap(definition);
+        if (Object.keys(exportsMap).length === 0) {
+            // Best effort exports map.
+            if (fs.existsSync(path.join(entry.path, 'index.js'))) {
+                exportsMap['.'] = './index.js';
             }
         }
-        else {
-            importMap[name] = new URL(definition.module || definition.main || 'index.js', baseUrl).href;
+        const packagePrefix = `${definition.name}@${definition.version}/`;
+        const baseUrl = `${bundleServerUrl}/${packagePrefix}`;
+        for (const [exportName, exportPath] of Object.entries(exportsMap)) {
+            importMap[exportName.replace('.', definition.name)] = new URL(exportPath, baseUrl).href;
         }
+        importMap[definition.name + '/'] = baseUrl;
     }
     return importMap;
 }

package/lib/createImportMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQ9B,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAhB,SAAS,CAAC,MAAM,GAAK,EAAE,EAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE;oBAC9D,MAAM,aAAa,GAAG,GAAG,eAAe,IAAI,YAAY,GAAG,CAAC;oBAE5D,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG;wBAChC,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC;wBAClC,GAAG,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;qBACnF,CAAC;iBACH;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtG,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,OAAO,GAAG,GAAG,eAAe,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC;QAE/E,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACzE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBAEtD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;oBAC3B,MAAM,UAAU,GAAuB,sBAAsB,CAAC,WAAW,CAAC,CAAC;oBAE3E,IAAI,UAAU,EAAE;wBACd,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;qBAC5D;iBACF;aACF;SACF;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;SAC7F;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAOxB,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,eAAuB,EACvB,kBAAgD;;IAEhD,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAhB,SAAS,CAAC,MAAM,GAAK,EAAE,EAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;gBAExG,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE;oBAC9D,MAAM,MAAM,GAAG,OAAC,SAAS,CAAC,MAAM,OAAC,GAAG,eAAe,IAAI,YAAY,GAAG,eAAM,EAAE,EAAC,CAAC;oBAChF,KAAK,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;iBAClC;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtG,6DAA6D;IAC7D,IAAI,UAAU,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAC9D,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACxC,2BAA2B;YAE3B,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE;gBACpD,UAAU,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;aAChC;SACF;QACD,MAAM,aAAa,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC;QAClE,MAAM,OAAO,GAAG,GAAG,eAAe,IAAI,aAAa,EAAE,CAAC;QAEtD,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACjE,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;SACzF;QAED,SAAS,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC;KAC5C;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/lib/createImportMap.test.js

@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals';
 import { createImportMap } from './createImportMap.js';
 const bundleServerUrl = 'http://localhost:12345';
 const basicResolveMapEntry = { name: 'a', version: '1.0.0', path: 'path/a', requiredBy: {} };
@@ -13,9 +14,9 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
-          "a": "http://localhost:12345/a@1.0.0/index.js",
+      {
+        "imports": {
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -32,9 +33,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/main.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -51,9 +53,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/module.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -71,9 +74,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/module.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -92,9 +96,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/string.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -113,9 +118,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/default.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -137,9 +143,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/import.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
         },
       }
     `);
@@ -164,9 +171,10 @@ describe('createImportMap', () => {
             },
         };
         expect(await createImportMap(resolveMap, bundleServerUrl, packages)).toMatchInlineSnapshot(`
-      Object {
-        "imports": Object {
+      {
+        "imports": {
           "a": "http://localhost:12345/a@1.0.0/foo/import.js",
+          "a/": "http://localhost:12345/a@1.0.0/",
           "a/lib/Button": "http://localhost:12345/a@1.0.0/lib/Button.js",
         },
       }

package/lib/createImportMap.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"createImportMap.test.js","sourceRoot":"","sources":["../src/createImportMap.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createImportMap.test.js","sourceRoot":"","sources":["../src/createImportMap.test.ts"],"names":[],"mappings":"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"}