@ms-cloudpack/package-utilities 1.2.0 → 2.0.0

package/CHANGELOG.json

@@ -2,7 +2,58 @@
   "name": "@ms-cloudpack/package-utilities",
   "entries": [
     {
-      "date": "Wed, 02 Nov 2022 08:10:59 GMT",
+      "date": "Wed, 16 Nov 2022 08:11:17 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v2.0.0",
+      "version": "2.0.0",
+      "comments": {
+        "major": [
+          {
+            "author": "dake.3601@gmail.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "589b4c2a5b784aa17faf8078e31f24e4e27b3e84",
+            "comment": "Added exclude scoped packages option to findResolveMapEntry function."
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 15 Nov 2022 08:13:12 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v1.2.1",
+      "version": "1.2.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "a71972309b615d683a5a3bac7a85c981fb6e89af",
+            "comment": "When packages have browser/main/module entries which don't exist on disk, fall back to others that might exist."
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/package-utilities",
+            "comment": "Bump @ms-cloudpack/path-utilities to v1.1.1",
+            "commit": "a71972309b615d683a5a3bac7a85c981fb6e89af"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 05 Nov 2022 08:11:41 GMT",
+      "tag": "@ms-cloudpack/package-utilities_v1.2.0",
+      "version": "1.2.0",
+      "comments": {
+        "none": [
+          {
+            "author": "email not defined",
+            "package": "@ms-cloudpack/package-utilities",
+            "commit": "12e604f31bccd24b3826c9e7390580a97dd6e4ce",
+            "comment": "Update devDependency @babel/types to v7.20.2"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 02 Nov 2022 08:11:20 GMT",
       "tag": "@ms-cloudpack/package-utilities_v1.2.0",
       "version": "1.2.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,29 @@
 # Change Log - @ms-cloudpack/package-utilities
 
-This log was last generated on Wed, 02 Nov 2022 08:10:59 GMT and should not be manually modified.
+This log was last generated on Wed, 16 Nov 2022 08:11:17 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 2.0.0
+
+Wed, 16 Nov 2022 08:11:17 GMT
+
+### Major changes
+
+- Added exclude scoped packages option to findResolveMapEntry function. (dake.3601@gmail.com)
+
+## 1.2.1
+
+Tue, 15 Nov 2022 08:13:12 GMT
+
+### Patches
+
+- When packages have browser/main/module entries which don't exist on disk, fall back to others that might exist. (dzearing@microsoft.com)
+- Bump @ms-cloudpack/path-utilities to v1.1.1
+
 ## 1.2.0
 
-Wed, 02 Nov 2022 08:10:59 GMT
+Wed, 02 Nov 2022 08:11:20 GMT
 
 ### Minor changes
 

package/lib/addExportsMapEntry.d.ts

@@ -1,13 +1,43 @@
 import type { PackageDefinitions } from './PackageDefinitions.js';
+import type { PackageJson } from 'type-fest';
 /**
- * Given an exports map and details about an import path, adds the entry.
+ * Options fo addExportsMapEntry.
  */
-export declare function addExportsMapEntry(options: {
-    exports: Record<string, Record<string, string>>;
+export interface AddExportsMapEntryOptions {
+    /**
+     * The exports map to add the entry to.
+     */
+    exports: PackageJson.Exports;
+    /**
+     * The package path to add the entry for. This is used to resolve relative paths.
+     */
     packagePath: string;
-    importPath: string;
-    entryPath?: string;
-    condition?: string;
+    /**
+     * The import path to add the entry for. This is used as the key in the exports map. Defaults
+     * to "." being the package import.
+     */
+    importPath?: string;
+    /**
+     * The relative path to the physical file location, representing the "key" in the exports map. Can be a partial
+     * location, in which case we will attempt to search for the file and associated source/d.ts files. Defaults to
+     * assuming `index.js`.
+     */
+    filePath?: string;
+    /**
+     * Optional types path. If not provided, types will be discovered for internal packages that have source files.
+     * This is useful mainly when converting the default import from a package.json that has explicit typings listed.
+     */
     typesPath?: string;
+    /**
+     * The condition to add the entry for. (Example: "import", "require", "browser", "types") Defaults to "default"
+     */
+    condition?: string;
+    /**
+     * The package definitions cache to use to resolve the file path.
+     */
     packages?: PackageDefinitions;
-}): Promise<void>;
+}
+/**
+ * Given an exports map and details about an import path, adds the entry.
+ */
+export declare function addExportsMapEntry(options: AddExportsMapEntryOptions): Promise<void>;

package/lib/addExportsMapEntry.js

@@ -1,62 +1,47 @@
-import path from 'path';
-import { isFile, sourceToIntermediatePath } from '@ms-cloudpack/path-utilities';
-import { isExternalPackage } from './isExternalPackage.js';
-import { resolveImportFromPackagePath } from './resolveImportFromPackagePath.js';
+import { findFileInPackage } from './findFileInPackage.js';
 import { safeRelativePath } from '@ms-cloudpack/path-string-parsing';
 /**
  * Given an exports map and details about an import path, adds the entry.
  */
 export async function addExportsMapEntry(options) {
-    const { exports, packages, packagePath, importPath, entryPath, typesPath, condition = 'default' } = options;
-    const isInternal = !isExternalPackage(packagePath);
-    let sourcePath;
-    let intermediatePath;
-    let resolvedTypesPath = typesPath;
-    if (isInternal) {
-        sourcePath = await resolveImportFromPackagePath(packagePath, entryPath || importPath, {
-            packages,
-            preferSource: isInternal,
-            ignoreExportsMap: true,
-        });
-        intermediatePath = sourcePath && sourceToIntermediatePath(sourcePath);
-    }
-    else {
-        intermediatePath = await resolveImportFromPackagePath(packagePath, entryPath || importPath, {
-            packages,
-            preferSource: false,
-            ignoreExportsMap: true,
-        });
-    }
-    // If at this point we haven't found what we're looking for, don't change anything.
-    if (!intermediatePath) {
-        return;
-    }
-    // Discover d.ts if available.
-    if (!resolvedTypesPath) {
-        const isTypeScriptSource = sourcePath && ['.ts', '.tsx', '.mts', '.cts'].indexOf(path.extname(sourcePath)) >= 0;
-        const potentialTypesPath = path.extname(intermediatePath) === '.js' && intermediatePath.replace('.js', '.d.ts');
-        if (potentialTypesPath &&
-            ((isInternal && isTypeScriptSource) || (!isInternal && isFile(path.join(packagePath, potentialTypesPath))))) {
-            resolvedTypesPath = potentialTypesPath;
+    const { exports, packagePath, condition = 'default' } = options;
+    const importPath = makeSafeImportKey(options.importPath || '.');
+    const { filePath, sourcePath, typesPath = options.typesPath ? safeRelativePath(options.typesPath) : undefined, } = await findFileInPackage({
+        packagePath,
+        filePath: options.filePath || options.importPath || '',
+    });
+    // Create a local for casting.
+    const localExports = exports;
+    // Only do work if a file path was provided.
+    if (filePath) {
+        let exportsEntry = (localExports[importPath] || (localExports[importPath] = {}));
+        // Promote string-based exports into objects with default conditions.
+        if (typeof exportsEntry === 'string') {
+            exportsEntry = exports[importPath] = { default: exportsEntry };
         }
+        if (typesPath) {
+            exportsEntry['types'] = typesPath;
+        }
+        if (sourcePath) {
+            exportsEntry['source'] = sourcePath;
+        }
+        // Add the entry for the condition.
+        exportsEntry[condition] = filePath;
     }
-    const safeImportPath = safeRelativePath(importPath || '.');
-    let exportSet = exports[safeImportPath];
-    // If the value of this path is a string, convert it to an object.
-    if (typeof exportSet === 'string') {
-        exportSet = exports[safeImportPath] = {
-            default: exportSet,
-        };
-    }
-    else if (!exportSet) {
-        exportSet = exports[safeImportPath] = {};
+}
+function makeSafeImportKey(key) {
+    if (!key || key === '' || key === '.') {
+        return '.';
     }
-    if (resolvedTypesPath) {
-        exportSet.types = safeRelativePath(resolvedTypesPath);
+    // if the key starts with a slash, add a dot
+    if (key.startsWith('/')) {
+        key = '.' + key;
     }
-    exportSet[condition] = intermediatePath;
-    if (sourcePath && sourcePath !== intermediatePath) {
-        exportSet.source = safeRelativePath(sourcePath);
+    // if the key doesn't start with "./", add it
+    if (!key.startsWith('./')) {
+        key = './' + key;
     }
+    // Remove the .js extension.
+    return key.replace(/\.js$/, '');
 }
 //# sourceMappingURL=addExportsMapEntry.js.map

package/lib/addExportsMapEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"addExportsMapEntry.js","sourceRoot":"","sources":["../src/addExportsMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAQxC;IACC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAC5G,MAAM,UAAU,GAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACnD,IAAI,UAA8B,CAAC;IACnC,IAAI,gBAAoC,CAAC;IACzC,IAAI,iBAAiB,GAAuB,SAAS,CAAC;IAEtD,IAAI,UAAU,EAAE;QACd,UAAU,GAAG,MAAM,4BAA4B,CAAC,WAAW,EAAE,SAAS,IAAI,UAAU,EAAE;YACpF,QAAQ;YACR,YAAY,EAAE,UAAU;YACxB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,gBAAgB,GAAG,UAAU,IAAI,wBAAwB,CAAC,UAAU,CAAC,CAAC;KACvE;SAAM;QACL,gBAAgB,GAAG,MAAM,4BAA4B,CAAC,WAAW,EAAE,SAAS,IAAI,UAAU,EAAE;YAC1F,QAAQ;YACR,YAAY,EAAE,KAAK;YACnB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACJ;IAED,mFAAmF;IACnF,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO;KACR;IAED,8BAA8B;IAC9B,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,kBAAkB,GAAG,UAAU,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC;QAChH,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,KAAK,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEhH,IACE,kBAAkB;YAClB,CAAC,CAAC,UAAU,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAC3G;YACA,iBAAiB,GAAG,kBAAkB,CAAC;SACxC;KACF;IAED,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;IAC3D,IAAI,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAExC,kEAAkE;IAClE,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACjC,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG;YACpC,OAAO,EAAE,SAAS;SACnB,CAAC;KACH;SAAM,IAAI,CAAC,SAAS,EAAE;QACrB,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;KAC1C;IAED,IAAI,iBAAiB,EAAE;QACrB,SAAS,CAAC,KAAK,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;KACvD;IAED,SAAS,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC;IAExC,IAAI,UAAU,IAAI,UAAU,KAAK,gBAAgB,EAAE;QACjD,SAAS,CAAC,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;KACjD;AACH,CAAC"}
+{"version":3,"file":"addExportsMapEntry.js","sourceRoot":"","sources":["../src/addExportsMapEntry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AA8CrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAkC;IACzE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC;IAChE,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,GAChF,GAAG,MAAM,iBAAiB,CAAC;QAC1B,WAAW;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE;KACvD,CAAC,CAAC;IAEH,8BAA8B;IAC9B,MAAM,YAAY,GAAG,OAAiD,CAAC;IAEvE,4CAA4C;IAC5C,IAAI,QAAQ,EAAE;QACZ,IAAI,YAAY,GAAG,CAAC,YAAY,CAAC,UAAU,MAAvB,YAAY,CAAC,UAAU,IAAM,EAAE,EAAC,CAAC;QAErD,qEAAqE;QACrE,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;YACpC,YAAY,GAAI,OAAkD,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;SAC5G;QAED,IAAI,SAAS,EAAE;YACb,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;SACnC;QAED,IAAI,UAAU,EAAE;YACd,YAAY,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;SACrC;QAED,mCAAmC;QACnC,YAAY,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;KACpC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,EAAE;QACrC,OAAO,GAAG,CAAC;KACZ;IAED,4CAA4C;IAC5C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvB,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;KACjB;IAED,6CAA6C;IAC7C,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACzB,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;KAClB;IAED,4BAA4B;IAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAClC,CAAC"}

package/lib/addExportsMapEntry.test.js

@@ -1,38 +1,89 @@
 import { describe, expect, it } from '@jest/globals';
 import { addExportsMapEntry } from './addExportsMapEntry.js';
-import { testProject1Path } from './testPaths.js';
 import { createTestFileStructure } from '@ms-cloudpack/test-utilities';
 import path from 'path';
-describe('addExportsMapEntry', () => {
-    it('can add an entry to an empty exports map', async () => {
+describe('await addExportsMapEntry', () => {
+    it('can ignore entries that have no physical file', async () => {
         const exportsMap = {};
+        const packagePath = await createTestFileStructure({});
         await addExportsMapEntry({
             exports: exportsMap,
-            packagePath: testProject1Path,
+            packagePath,
+            filePath: './lib/foo-sub1',
+        });
+        expect(exportsMap).toEqual({});
+    });
+    it('can add an entry with only an importPath', async () => {
+        const exportsMap = {};
+        const packagePath = await createTestFileStructure({
+            'lib/foo-sub1.js': '',
+        });
+        await addExportsMapEntry({
+            exports: exportsMap,
+            packagePath,
             importPath: './lib/foo-sub1',
         });
         expect(exportsMap).toMatchInlineSnapshot(`
       {
         "./lib/foo-sub1": {
           "default": "./lib/foo-sub1.js",
-          "source": "./src/foo-sub1.ts",
-          "types": "./lib/foo-sub1.d.ts",
         },
       }
     `);
     });
-    it('can add a non-safe import path', async () => {
+    it('can add an entry with only a file path', async () => {
         const exportsMap = {};
+        const packagePath = await createTestFileStructure({
+            'lib/foo-sub1.js': '',
+        });
         await addExportsMapEntry({
             exports: exportsMap,
-            packagePath: testProject1Path,
-            importPath: 'lib/foo-sub1',
+            packagePath,
+            filePath: './lib/foo-sub1',
         });
         expect(exportsMap).toMatchInlineSnapshot(`
       {
-        "./lib/foo-sub1": {
+        ".": {
+          "default": "./lib/foo-sub1.js",
+        },
+      }
+    `);
+    });
+    it('can add an entry with both import and file paths', async () => {
+        const exportsMap = {};
+        const packagePath = await createTestFileStructure({
+            'lib/foo-sub1.js': '',
+        });
+        await addExportsMapEntry({
+            exports: exportsMap,
+            packagePath,
+            importPath: './foo',
+            filePath: './lib/foo-sub1',
+        });
+        expect(exportsMap).toMatchInlineSnapshot(`
+      {
+        "./foo": {
+          "default": "./lib/foo-sub1.js",
+        },
+      }
+    `);
+    });
+    it('can add an entry that has source backing it', async () => {
+        const exportsMap = {};
+        const packagePath = await createTestFileStructure({
+            'src/foo-sub1.tsx': '',
+        });
+        await addExportsMapEntry({
+            exports: exportsMap,
+            packagePath,
+            importPath: '.',
+            filePath: './lib/foo-sub1',
+        });
+        expect(exportsMap).toMatchInlineSnapshot(`
+      {
+        ".": {
           "default": "./lib/foo-sub1.js",
-          "source": "./src/foo-sub1.ts",
+          "source": "./src/foo-sub1.tsx",
           "types": "./lib/foo-sub1.d.ts",
         },
       }
@@ -42,25 +93,28 @@ describe('addExportsMapEntry', () => {
         const exportsMap = {
             '.': './lib/index.js',
         };
+        const packagePath = await createTestFileStructure({
+            'src/foo.tsx': '',
+        });
         await addExportsMapEntry({
             exports: exportsMap,
-            packagePath: testProject1Path,
-            importPath: './lib/foo-sub1',
+            packagePath,
+            importPath: './lib/foo',
         });
         expect(exportsMap).toMatchInlineSnapshot(`
       {
         ".": "./lib/index.js",
-        "./lib/foo-sub1": {
-          "default": "./lib/foo-sub1.js",
-          "source": "./src/foo-sub1.ts",
-          "types": "./lib/foo-sub1.d.ts",
+        "./lib/foo": {
+          "default": "./lib/foo.js",
+          "source": "./src/foo.tsx",
+          "types": "./lib/foo.d.ts",
         },
       }
     `);
     });
     it('can add an entry to an external package like the "debug" package', async () => {
         const exportsMap = {};
-        const testPath = await createTestFileStructure({
+        const repoPath = await createTestFileStructure({
             'node_modules/debug/package.json': {
                 name: 'debug',
                 main: './src/index.js',
@@ -69,15 +123,48 @@ describe('addExportsMapEntry', () => {
             'node_modules/debug/src/index.js': '',
             'node_modules/debug/src/browser.js': '',
         });
+        const packagePath = path.join(repoPath, 'node_modules/debug');
+        await addExportsMapEntry({
+            exports: exportsMap,
+            packagePath,
+            importPath: '.',
+            filePath: './src/index.js',
+            condition: 'require',
+        });
+        await addExportsMapEntry({
+            exports: exportsMap,
+            packagePath,
+            importPath: '.',
+            filePath: './src/browser.js',
+            condition: 'browser',
+        });
+        expect(exportsMap).toMatchInlineSnapshot(`
+      {
+        ".": {
+          "browser": "./src/browser.js",
+          "require": "./src/index.js",
+        },
+      }
+    `);
+    });
+    it('can add typings specified in input', async () => {
+        const exportsMap = {};
+        const packagePath = await createTestFileStructure({
+            'index.js': '',
+            'typings/index.d.ts': '',
+        });
         await addExportsMapEntry({
             exports: exportsMap,
-            packagePath: path.join(testPath, 'node_modules/debug'),
+            packagePath,
             importPath: '.',
+            filePath: './index.js',
+            typesPath: './typings/index.d.ts',
         });
         expect(exportsMap).toMatchInlineSnapshot(`
       {
         ".": {
-          "default": "./src/browser.js",
+          "default": "./index.js",
+          "types": "./typings/index.d.ts",
         },
       }
     `);

package/lib/addExportsMapEntry.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"addExportsMapEntry.test.js","sourceRoot":"","sources":["../src/addExportsMapEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,MAAM,kBAAkB,CAAC;YACvB,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,gBAAgB;YAC7B,UAAU,EAAE,gBAAgB;SAC7B,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;KAQxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,MAAM,kBAAkB,CAAC;YACvB,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,gBAAgB;YAC7B,UAAU,EAAE,cAAc;SAC3B,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;KAQxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,UAAU,GAAY;YAC1B,GAAG,EAAE,gBAAgB;SACtB,CAAC;QAEF,MAAM,kBAAkB,CAAC;YACvB,OAAO,EAAE,UAAoD;YAC7D,WAAW,EAAE,gBAAgB;YAC7B,UAAU,EAAE,gBAAgB;SAC7B,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;KASxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,UAAU,GAA2C,EAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YAC7C,iCAAiC,EAAE;gBACjC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,kBAAkB;aAC5B;YACD,iCAAiC,EAAE,EAAE;YACrC,mCAAmC,EAAE,EAAE;SACxC,CAAC,CAAC;QAEH,MAAM,kBAAkB,CAAC;YACvB,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC;YACtD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,CAAC,qBAAqB,CAAC;;;;;;KAMxC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"addExportsMapEntry.test.js","sourceRoot":"","sources":["../src/addExportsMapEntry.test.ts"],"names":[],"mappings":"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"}

package/lib/createExportsMap.js

@@ -1,7 +1,6 @@
-import path from 'path';
-import { isFile } from '@ms-cloudpack/path-utilities';
 import { PackageDefinitions } from './PackageDefinitions.js';
 import { addExportsMapEntry } from './addExportsMapEntry.js';
+import { safeRelativePath } from '@ms-cloudpack/path-string-parsing';
 /**
  * Given a package path, generates an export map for the package.
  */
@@ -15,60 +14,43 @@ export async function createExportsMap(packagePath, options = {}) {
     if (definition.exports) {
         return definition.exports;
     }
-    const { main, module, browser } = definition;
-    const browserString = typeof browser === 'string' ? browser : undefined;
-    const rootIndex = isFile(path.join(packagePath, 'index.js')) ? './index.js' : undefined;
+    const { browser, main, module, types, typings, type } = definition;
     const exports = {};
-    const typesPath = definition.types || definition.typings;
-    const hasPackageEntry = browserString || module || main || rootIndex;
-    if (!hasPackageEntry) {
-        if (!browser) {
-            return exports;
-        }
-    }
-    else {
-        await addExportsMapEntry({
+    const typesPath = types || typings;
+    await addExportsMapEntry({
+        exports,
+        packagePath,
+        filePath: 'index.js',
+        typesPath,
+        condition: type === 'module' ? 'import' : 'default',
+    });
+    main &&
+        (await addExportsMapEntry({
             exports,
-            importPath: '.',
             packagePath,
-            condition: 'default',
-            entryPath: browserString || module || main || rootIndex,
+            filePath: main,
             typesPath,
-        });
-    }
-    if (typeof browser === 'object') {
-        // If we have an entry defined in the package, iterate through exports and update things.
-        if (hasPackageEntry) {
-            for (const mapValue of Object.values(exports)) {
-                const exportUrl = mapValue.import || mapValue.default;
-                if (browser[exportUrl]) {
-                    mapValue['browser'] = browser[exportUrl] || '';
-                }
-            }
+            condition: type === 'module' ? 'import' : 'default',
+        }));
+    module && (await addExportsMapEntry({ exports, packagePath, filePath: module, typesPath, condition: 'import' }));
+    if (browser) {
+        if (typeof definition.browser === 'string') {
+            await addExportsMapEntry({ exports, packagePath, filePath: definition.browser, condition: 'browser' });
         }
-        else {
-            // When all we have are browser entries, attempt to make exports out of them.
-            for (const [key, value] of Object.entries(browser)) {
-                if (typeof value === 'string' && path.extname(value) === '.js') {
-                    exports[makeSafeImportKey(key)] = {
-                        browser: value,
-                    };
+        else if (typeof definition.browser === 'object') {
+            for (const [key, value] of Object.entries(definition.browser)) {
+                if (value) {
+                    await addExportsMapEntry({
+                        exports,
+                        packagePath,
+                        importPath: safeRelativePath(module || main) === safeRelativePath(key) ? '.' : key,
+                        filePath: value,
+                        condition: 'browser',
+                    });
                 }
             }
         }
     }
     return exports;
 }
-function makeSafeImportKey(key) {
-    // if the key starts with a slash, add a dot
-    if (key.startsWith('/')) {
-        key = '.' + key;
-    }
-    // if the key doesn't start with "./", add it
-    if (!key.startsWith('./')) {
-        key = './' + key;
-    }
-    // Remove the .js extension.
-    return key.replace(/\.js$/, '');
-}
 //# sourceMappingURL=createExportsMap.js.map

package/lib/createExportsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createExportsMap.js","sourceRoot":"","sources":["../src/createExportsMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAmB,EACnB,UAA6C,EAAE;IAE/C,MAAM,EAAE,QAAQ,GAAG,kBAAkB,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC;IAChE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,oCAAoC,WAAW,EAAE,CAAC,CAAC;KACpE;IAED,qEAAqE;IACrE,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,OAAO,UAAU,CAAC,OAAO,CAAC;KAC3B;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IACnE,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,SAAS,GAAG,KAAK,IAAI,OAAO,CAAC;IAEnC,MAAM,kBAAkB,CAAC;QACvB,OAAO;QACP,WAAW;QACX,QAAQ,EAAE,UAAU;QACpB,SAAS;QACT,SAAS,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;KACpD,CAAC,CAAC;IACH,IAAI;QACF,CAAC,MAAM,kBAAkB,CAAC;YACxB,OAAO;YACP,WAAW;YACX,QAAQ,EAAE,IAAI;YACd,SAAS;YACT,SAAS,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACpD,CAAC,CAAC,CAAC;IACN,MAAM,IAAI,CAAC,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAEjH,IAAI,OAAO,EAAE;QACX,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE;YAC1C,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;SACxG;aAAM,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE;YACjD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC7D,IAAI,KAAK,EAAE;oBACT,MAAM,kBAAkB,CAAC;wBACvB,OAAO;wBACP,WAAW;wBACX,UAAU,EAAE,gBAAgB,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;wBAClF,QAAQ,EAAE,KAAK;wBACf,SAAS,EAAE,SAAS;qBACrB,CAAC,CAAC;iBACJ;aACF;SACF;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}