@ms-cloudpack/package-utilities 1.2.0 → 2.0.0

package/lib/findResolveMapEntry.d.ts

@@ -3,4 +3,8 @@ import type { PackageJson } from 'type-fest';
 /**
  * Helper which, given a definition/resolveMap/dependency name, returns the resolve map entry for the dependency.
  */
-export declare function findResolveMapEntry(definition: PackageJson, packageName: string, resolveMap: ResolveMap): ResolveMapEntry | undefined;
+export declare function findResolveMapEntry({ packageName, resolveMap, definition, }: {
+    packageName: string;
+    resolveMap: ResolveMap;
+    definition?: PackageJson;
+}): ResolveMapEntry | undefined;

package/lib/findResolveMapEntry.js

@@ -1,11 +1,14 @@
 /**
  * Helper which, given a definition/resolveMap/dependency name, returns the resolve map entry for the dependency.
  */
-export function findResolveMapEntry(definition, packageName, resolveMap) {
+export function findResolveMapEntry({ packageName, resolveMap, definition, }) {
     const resolveEntry = resolveMap[packageName];
     if (!resolveEntry) {
         return undefined;
     }
+    if (!definition) {
+        return resolveEntry;
+    }
     const scopedEntry = Object.values(resolveEntry?.scopedVersions || {}).filter((e) => !!e.requiredBy[`${definition.name}@${definition.version}`])[0];
     return scopedEntry || resolveEntry;
 }

package/lib/findResolveMapEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"findResolveMapEntry.js","sourceRoot":"","sources":["../src/findResolveMapEntry.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,mBAAmB,CACjC,UAAuB,EACvB,WAAmB,EACnB,UAAsB;IAEtB,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IAE7C,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,CAC1E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,CAClE,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,WAAW,IAAI,YAAY,CAAC;AACrC,CAAC"}
+{"version":3,"file":"findResolveMapEntry.js","sourceRoot":"","sources":["../src/findResolveMapEntry.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAClC,WAAW,EACX,UAAU,EACV,UAAU,GAKX;IACC,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IAE7C,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,YAAY,CAAC;KACrB;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,CAC1E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,CAClE,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,WAAW,IAAI,YAAY,CAAC;AACrC,CAAC"}

package/lib/findResolveMapEntry.test.js

@@ -12,7 +12,8 @@ describe('findResolveMapEntry', () => {
                 },
             },
         };
-        expect(findResolveMapEntry({ name: 'foo', version: '1.0.0' }, 'bar', resolveMap)).toEqual(resolveMap.bar);
+        const definition = { name: 'foo', version: '1.0.0' };
+        expect(findResolveMapEntry({ definition, packageName: 'bar', resolveMap })).toEqual(resolveMap.bar);
     });
     it('can find an entry with a scoped version', () => {
         const resolveMap = {
@@ -33,7 +34,8 @@ describe('findResolveMapEntry', () => {
                 requiredBy: {},
             },
         };
-        expect(findResolveMapEntry({ name: 'foo', version: '1.0.0' }, 'bar', resolveMap)).toEqual(resolveMap.bar?.scopedVersions?.['1.0.1']);
+        const definition = { name: 'foo', version: '1.0.0' };
+        expect(findResolveMapEntry({ definition, packageName: 'bar', resolveMap })).toEqual(resolveMap.bar?.scopedVersions?.['1.0.1']);
     });
     it('can return undefined for missing entries', () => {
         const resolveMap = {
@@ -46,7 +48,21 @@ describe('findResolveMapEntry', () => {
                 },
             },
         };
-        expect(findResolveMapEntry({ name: 'foo', version: '1.0.0' }, 'baz', resolveMap)).toBeUndefined();
+        const definition = { name: 'foo', version: '1.0.0' };
+        expect(findResolveMapEntry({ definition, packageName: 'baz', resolveMap })).toBeUndefined();
+    });
+    it('can find an entry without a definition', () => {
+        const resolveMap = {
+            bar: {
+                name: 'bar',
+                version: '1.0.0',
+                path: 'bar',
+                requiredBy: {
+                    foo: '1.0.0',
+                },
+            },
+        };
+        expect(findResolveMapEntry({ packageName: 'bar', resolveMap })).toEqual(resolveMap.bar);
     });
 });
 //# sourceMappingURL=findResolveMapEntry.test.js.map

package/lib/findResolveMapEntry.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"findResolveMapEntry.test.js","sourceRoot":"","sources":["../src/findResolveMapEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE;oBACV,GAAG,EAAE,OAAO;iBACb;aACF;SACF,CAAC;QAEF,MAAM,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5G,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE;oBACd,OAAO,EAAE;wBACP,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,OAAO;wBAChB,IAAI,EAAE,OAAO;wBACb,UAAU,EAAE;4BACV,WAAW,EAAE,QAAQ;yBACtB;qBACF;iBACF;gBACD,UAAU,EAAE,EAAE;aACf;SACF,CAAC;QAEF,MAAM,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CACvF,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,CAC1C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE;oBACV,GAAG,EAAE,OAAO;iBACb;aACF;SACF,CAAC;QAEF,MAAM,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACpG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"findResolveMapEntry.test.js","sourceRoot":"","sources":["../src/findResolveMapEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE;oBACV,GAAG,EAAE,OAAO;iBACb;aACF;SACF,CAAC;QAEF,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAErD,MAAM,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE;oBACd,OAAO,EAAE;wBACP,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,OAAO;wBAChB,IAAI,EAAE,OAAO;wBACb,UAAU,EAAE;4BACV,WAAW,EAAE,QAAQ;yBACtB;qBACF;iBACF;gBACD,UAAU,EAAE,EAAE;aACf;SACF,CAAC;QAEF,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAErD,MAAM,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CACjF,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,CAC1C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE;oBACV,GAAG,EAAE,OAAO;iBACb;aACF;SACF,CAAC;QAEF,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAErD,MAAM,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,UAAU,GAAe;YAC7B,GAAG,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE;oBACV,GAAG,EAAE,OAAO;iBACb;aACF;SACF,CAAC;QAEF,MAAM,CAAC,mBAAmB,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/index.d.ts

@@ -4,10 +4,9 @@ export type { ResolveMapEntry, ResolveMap } from './createResolveMap.js';
 export { findResolveMapEntry } from './findResolveMapEntry.js';
 export { flattenExportsMap } from './flattenExportsMap.js';
 export { createExportsMap } from './createExportsMap.js';
-export { addExportsMapEntry } from './addExportsMapEntry.js';
+export { addExportsMapEntry, type AddExportsMapEntryOptions } from './addExportsMapEntry.js';
 export { getExportsMap } from './getExportsMap.js';
 export { createImportMap, type ImportMap } from './createImportMap.js';
 export { resolve } from './resolve.js';
-export { resolveImportFromPackage, resolveImportFromPackagePath, type ResolveImportFromPackageOptions, } from './resolveImportFromPackagePath.js';
 export { detectModuleType, type ModuleType } from './detectModuleType.js';
 export { isExternalPackage } from './isExternalPackage.js';

package/lib/index.js

@@ -12,7 +12,6 @@ export { getExportsMap } from './getExportsMap.js';
 export { createImportMap } from './createImportMap.js';
 // Import resolution utilities
 export { resolve } from './resolve.js';
-export { resolveImportFromPackage, resolveImportFromPackagePath, } from './resolveImportFromPackagePath.js';
 // Other package utilities
 export { detectModuleType } from './detectModuleType.js';
 export { isExternalPackage } from './isExternalPackage.js';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,OAAO,EAAE,kBAAkB,EAAmC,MAAM,yBAAyB,CAAC;AAE9F,sBAAsB;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,qBAAqB;AACrB,OAAO,EAAE,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAEvE,8BAA8B;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAE7B,MAAM,mCAAmC,CAAC;AAE3C,0BAA0B;AAC1B,OAAO,EAAE,gBAAgB,EAAmB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,OAAO,EAAE,kBAAkB,EAAmC,MAAM,yBAAyB,CAAC;AAE9F,sBAAsB;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAkC,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,qBAAqB;AACrB,OAAO,EAAE,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAEvE,8BAA8B;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,0BAA0B;AAC1B,OAAO,EAAE,gBAAgB,EAAmB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC"}

package/lib/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.33.5"
+      "packageVersion": "7.33.6"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -17,7 +17,7 @@
     "@babel/traverse": "^7.16.10",
     "@ms-cloudpack/json-utilities": "^0.0.4",
     "@ms-cloudpack/package-overrides": "^0.2.0",
-    "@ms-cloudpack/path-utilities": "^1.1.0",
+    "@ms-cloudpack/path-utilities": "^1.1.1",
     "@ms-cloudpack/path-string-parsing": "^1.0.0",
     "merge": "^2.1.1",
     "resolve": "^1.22.0"
@@ -26,7 +26,7 @@
     "@ms-cloudpack/scripts": "*",
     "@ms-cloudpack/eslint-config-base": "*",
     "@types/resolve": "1.20.2",
-    "@babel/types": "7.20.0"
+    "@babel/types": "7.20.2"
   },
   "scripts": {
     "api:update": "cloudpack-scripts api-update",

package/lib/resolveImportFromPackage.test.js

@@ -1,163 +0,0 @@
-import { describe, it, expect } from '@jest/globals';
-import { resolveImportFromPackage, resolveImportFromPackagePath } from './resolveImportFromPackagePath.js';
-import { testProject2Path, testProject3Path } from '../src/testPaths.js';
-const defaultPackageDefinition = {
-    name: 'package',
-    version: '1.0.0',
-};
-describe('resolveImportFromPackagePath', () => {
-    it('can resolve a main entry', async () => {
-        expect(await resolveImportFromPackagePath(testProject2Path)).toEqual('./lib/module.js');
-    });
-    it('can resolve a source entry', async () => {
-        expect(await resolveImportFromPackagePath(testProject2Path, undefined, { preferSource: true })).toEqual('./src/module.ts');
-    });
-});
-describe('resolveImportFromPackage', () => {
-    it('can resolve a main entry', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-        }, '')).toEqual('./lib/main.js');
-    });
-    it('can resolve a main entry using a period for the importPath', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-        }, '.')).toEqual('./lib/main.js');
-    });
-    it('can resolve a main entry from a sub-package', async () => {
-        expect(await resolveImportFromPackage(testProject3Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-        }, '/core')).toEqual('./lib/core-module.js');
-    });
-    it('can fall back to a subfolder', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: 'build',
-        })).toEqual('./build/index.js');
-    });
-    it('can resolve a module entry', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-        }, '')).toEqual('./lib/module.js');
-    });
-    it('can resolve a string exports entry', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-            exports: './lib/exports.js',
-        }, '')).toEqual('./lib/exports.js');
-    });
-    it('can resolve a default string exports entry', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-            exports: {
-                default: 'lib/exports-default.js',
-            },
-        }, '')).toEqual('./lib/exports-default.js');
-    });
-    it('can resolve a default map exports entry', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-            exports: {
-                '.': './lib/exports.js',
-            },
-        }, '')).toEqual('./lib/exports.js');
-    });
-    it('can resolve a default map exports entry with default', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-            exports: {
-                '.': {
-                    default: './lib/exports-default.js',
-                },
-            },
-        }, '')).toEqual('./lib/exports-default.js');
-    });
-    it('can resolve a default map exports entry with import', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-            exports: {
-                '.': {
-                    require: './lib/exports-require.js',
-                    import: './lib/exports-import.js',
-                    default: './lib/exports-default.js',
-                },
-            },
-        }, '')).toEqual('./lib/exports-import.js');
-    });
-    it('can resolve a path mapped in the exports map', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main.js',
-            module: './lib/module.js',
-            exports: {
-                '.': {
-                    require: './lib/exports-require.js',
-                    import: './lib/exports-import.js',
-                    default: './lib/exports-default.js',
-                },
-                './lib/Button': {
-                    require: './lib/exports-button-require.js',
-                    import: './lib/exports-button-import.js',
-                    default: './lib/exports-button-default.js',
-                },
-            },
-        }, 'lib/Button')).toEqual('./lib/exports-button-import.js');
-    });
-    it('can resolve a source file exports map', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            exports: './lib/tsx.js',
-        }, '', { preferSource: true })).toEqual('./src/tsx.tsx');
-    });
-    it('can remap imports using browser overrides (preferSource)', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            browser: {
-                './lib/main.js': './lib/tsx.js',
-            },
-            main: 'lib/main.js',
-        }, '', { preferSource: true })).toEqual('./src/tsx.tsx');
-    });
-    it('can remap deep imports (preferSource)', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-        }, 'lib/tsx', { preferSource: true })).toEqual('./src/tsx.tsx');
-    });
-    it('can remap deep imports with an exports map (preferSource)', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            exports: {
-                './lib/tsx': 'lib/main.js',
-            },
-        }, 'lib/tsx', { preferSource: true })).toEqual('./src/main.ts');
-    });
-    // package example: supports color
-    it('can handle a package with only a browser entry', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            browser: './lib/main',
-        }, '')).toBe('./lib/main.js');
-    });
-    it('can treat an import path of "." like a default package import', async () => {
-        expect(await resolveImportFromPackage(testProject2Path, {
-            ...defaultPackageDefinition,
-            main: './lib/main',
-        }, '.')).toEqual('./lib/main.js');
-    });
-});
-//# sourceMappingURL=resolveImportFromPackage.test.js.map

package/lib/resolveImportFromPackage.test.js.map

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

package/lib/resolveImportFromPackagePath.d.ts

@@ -1,27 +0,0 @@
-import { PackageDefinitions } from './PackageDefinitions.js';
-import type { PackageJson } from 'type-fest';
-/**
- * Options for the resolveImportFromPackage(Path) apis.
- */
-export interface ResolveImportFromPackageOptions {
-    /**
-     * Prefer source paths over intermediate paths. For example, if the `main` entry resolves to
-     * "lib/index.js", and "src/index.tsx" exists, prefer that.
-     */
-    preferSource?: boolean;
-    /**
-     * If true, resolve the path to a physical file rather than respecting exports entries.
-     */
-    ignoreExportsMap?: boolean;
-    packages?: PackageDefinitions;
-}
-/**
- * Resolves a requested import path from a package located at the given path, returns a path relative
- * to the package, or undefined if no match was found.
- */
-export declare function resolveImportFromPackagePath(packagePath: string, requestedPath?: string, options?: ResolveImportFromPackageOptions): Promise<string | undefined>;
-/**
- * Resolves a requested import path from a package. Note that this is not a full import path, but rather
- * a path relative to the package. This is used to resolve the path to a file within a package.
- */
-export declare function resolveImportFromPackage(packagePath: string, packageDefinition: PackageJson, importPath?: string, options?: ResolveImportFromPackageOptions): Promise<string | undefined>;

package/lib/resolveImportFromPackagePath.js

@@ -1,126 +0,0 @@
-import path from 'path';
-import { intermediateToSourcePath, isFile, isFolder } from '@ms-cloudpack/path-utilities';
-import { PackageDefinitions } from './PackageDefinitions.js';
-import { getExportPathFromEntry } from './getExportPathFromEntry.js';
-import { isExternalPackage } from './isExternalPackage.js';
-import { slash, safeRelativePath } from '@ms-cloudpack/path-string-parsing';
-const defaultIndexPath = './index.js';
-/**
- * Resolves a requested import path from a package located at the given path, returns a path relative
- * to the package, or undefined if no match was found.
- */
-export async function resolveImportFromPackagePath(packagePath, requestedPath, options = {}) {
-    const { packages = PackageDefinitions.getInstance() } = options;
-    const packageDefinition = await packages.get(packagePath);
-    if (!packageDefinition) {
-        return requestedPath;
-    }
-    return resolveImportFromPackage(packagePath, packageDefinition, requestedPath, options);
-}
-/**
- * Resolves a requested import path from a package. Note that this is not a full import path, but rather
- * a path relative to the package. This is used to resolve the path to a file within a package.
- */
-export async function resolveImportFromPackage(packagePath, packageDefinition, importPath, options = {}) {
-    // Normalize import path
-    if (importPath && importPath !== '.') {
-        importPath = safeRelativePath(importPath);
-    }
-    else {
-        importPath = undefined;
-    }
-    const { packages = PackageDefinitions.getInstance() } = options;
-    const originalPackagePath = packagePath;
-    const fullRequestedPath = path.join(packagePath, importPath || '');
-    // If the requested subfolder has a package.json, treat it as a sub-package.
-    // (some npm packages have nested package.json files!)
-    if (importPath && isFolder(fullRequestedPath)) {
-        const subPackageDefinition = await packages.get(fullRequestedPath);
-        if (subPackageDefinition) {
-            packageDefinition = subPackageDefinition;
-            packagePath = fullRequestedPath;
-            importPath = undefined;
-        }
-    }
-    // Build a list of intermediate file candidates.
-    let candidates = [];
-    const { exports } = packageDefinition;
-    // If we have an exports map, this takes priority in resolution.
-    if (exports && !options.ignoreExportsMap) {
-        let exportPath;
-        if (!exportPath) {
-            exportPath = getExportPathFromEntry(exports, importPath);
-        }
-        if (exportPath) {
-            candidates.push(exportPath);
-        }
-    }
-    else {
-        // We don't have an exports map. Consider main entries.
-        if (!importPath) {
-            candidates.push(packageDefinition.module, packageDefinition.main, defaultIndexPath);
-        }
-        else {
-            candidates.push(importPath);
-        }
-        const { browser } = packageDefinition;
-        if (browser) {
-            // If the package has browser re-mappings, respect them.
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            let safeBrowser = {};
-            if (typeof browser === 'object') {
-                safeBrowser = Object.keys(browser || {}).reduce((acc, key) => {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                    acc[safeRelativePath(key)] = safeRelativePath(browser[key]);
-                    return acc;
-                }, {});
-            }
-            else if (typeof browser === 'string') {
-                safeBrowser = {
-                    [safeRelativePath(packageDefinition.module || packageDefinition.main || defaultIndexPath)]: safeRelativePath(browser),
-                };
-            }
-            // Push browser overrides into candidates.
-            candidates = candidates.reduce((p, n) => {
-                if (n) {
-                    const candidate = safeRelativePath(n);
-                    if (safeBrowser[candidate]) {
-                        p.push(safeBrowser[candidate]);
-                    }
-                    else {
-                        p.push(candidate);
-                    }
-                }
-                return p;
-            }, []);
-        }
-    }
-    // Ensure we can handle missing extensions and fall back to js
-    for (let i = 0; i < candidates.length; i++) {
-        const candidate = candidates[i];
-        if (candidate && path.extname(candidate) !== '.js') {
-            candidates.splice(i + 1, 0, candidate + '.js');
-            candidates.splice(i + 2, 0, candidate + '/index.js');
-        }
-    }
-    // (optional) Add source paths if we prefer source files to intermediate files.
-    const preferSource = options.preferSource && !isExternalPackage(packagePath);
-    if (preferSource) {
-        candidates = [
-            ...candidates.map((c) => c && intermediateToSourcePath(c, packagePath)).filter(Boolean),
-            ...candidates,
-        ];
-    }
-    // Search candidates for first match.
-    const foundPath = candidates.find((candidatePath) => candidatePath && isFile(path.join(packagePath, candidatePath)));
-    if (!foundPath && path.basename(importPath || '').indexOf('chunk-') !== 0) {
-        console.log(`Couldn't resolve import ("${packagePath}", importPath="${importPath}", preferSource=${!!preferSource}), Tried:\n${candidates
-            .map((c) => `  "${c}"`)
-            .join('\n')}`);
-    }
-    if (!foundPath) {
-        return undefined;
-    }
-    return './' + slash(path.relative(originalPackagePath, path.join(packagePath, foundPath || importPath || '')));
-}
-//# sourceMappingURL=resolveImportFromPackagePath.js.map

package/lib/resolveImportFromPackagePath.js.map

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