@ms-cloudpack/package-utilities 0.13.1 → 0.15.0

package/lib/resolveImportFromPackagePath.js

@@ -3,88 +3,96 @@ import { intermediateToSourcePath, isFile, isFolder, slash } from '@ms-cloudpack
 import { PackageDefinitions } from './PackageDefinitions.js';
 import { getExportPathFromEntry } from './getExportPathFromEntry.js';
 import { isExternalPackage } from './isExternalPackage.js';
-const definitions = PackageDefinitions.getInstance();
+import { safeRelativePath } from './safeRelativePath.js';
+const defaultIndexPath = './index.js';
 /**
- * Resolves a requested import path from a package located at the given path. Gives precedence
- * to browser/esm options, but will fall back to discover exact path matches, and will fall back
- * to source paths (lib to src translation) if the option is provided.
+ * 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 packageDefinition = await definitions.get(packagePath);
+    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 located at the given path. Gives precedence
- * to browser/esm options. This may change in a future iteration.
+ * 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 = {}) {
-    // If the caller passes a period in for the import path, assume it's a package import.
-    if (importPath === '.') {
+    // 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.jsons!)
+    // 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 definitions.get(fullRequestedPath);
+        const subPackageDefinition = await packages.get(fullRequestedPath);
         if (subPackageDefinition) {
             packageDefinition = subPackageDefinition;
             packagePath = fullRequestedPath;
             importPath = undefined;
         }
     }
-    // Normalize path
-    if (importPath) {
-        importPath = './' + slash(path.normalize(importPath || ''));
-    }
-    else {
-        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) {
-        const exportPath = getExportPathFromEntry(exports, importPath);
+    if (exports && !options.ignoreExportsMap) {
+        let exportPath;
+        if (!exportPath) {
+            exportPath = getExportPathFromEntry(exports, importPath);
+        }
         if (exportPath) {
             candidates.push(exportPath);
         }
     }
-    if (!importPath) {
-        candidates.push(packageDefinition.module);
-        candidates.push(packageDefinition.main);
-    }
     else {
-        candidates.push(importPath);
-    }
-    // Fallback to index.js
-    if (!packageDefinition.main && !packageDefinition.module && !importPath) {
-        candidates.push('index.js');
-    }
-    // If the package has browser re-mappings, respect them.
-    let { browser } = packageDefinition;
-    // If the browser entry is a string, convert it into an object.
-    if (typeof browser === 'string') {
-        const mainOrModule = packageDefinition.module || packageDefinition.main;
-        if (mainOrModule) {
-            browser = { [mainOrModule]: browser };
+        // We don't have an exports map. Consider main entries.
+        if (!importPath) {
+            candidates.push(packageDefinition.module, packageDefinition.main, defaultIndexPath);
         }
         else {
-            candidates.push(packageDefinition.browser);
+            candidates.push(importPath);
         }
-    }
-    if (typeof browser === 'object') {
-        for (const browserMapping of Object.keys(browser)) {
-            for (let i = 0; i < candidates.length; i++) {
-                const candidateEntry = candidates[i];
-                const mappingEntry = browser[browserMapping];
-                if (mappingEntry && candidateEntry && path.relative(browserMapping, candidateEntry) === '') {
-                    candidates[i] = mappingEntry;
-                }
+        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
@@ -110,6 +118,9 @@ export async function resolveImportFromPackage(packagePath, packageDefinition, i
             .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 +1 @@
-{"version":3,"file":"resolveImportFromPackagePath.js","sourceRoot":"","sources":["../src/resolveImportFromPackagePath.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolveImportFromPackagePath.js","sourceRoot":"","sources":["../src/resolveImportFromPackagePath.ts"],"names":[],"mappings":"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"}

package/lib/resolvePackageEntries.d.ts

@@ -1,2 +1,8 @@
-import type { PackageJson } from 'type-fest';
-export declare function resolvePackageEntries(packageDefinition: PackageJson): string[];
+import type { PackageDefinitions } from './PackageDefinitions.js';
+/**
+ * Given a package path, reads the exports from the package.json and returns a flattened array of entry files
+ * for bundling.
+ */
+export declare function resolvePackageEntries(packagePath: string, options?: {
+    packages?: PackageDefinitions;
+}): Promise<string[]>;

package/lib/resolvePackageEntries.js

@@ -1,40 +1,11 @@
-import { getExportPathFromEntry } from './getExportPathFromEntry.js';
-import { cleanEntry } from './cleanEntry.js';
-export function resolvePackageEntries(packageDefinition) {
-    const entries = new Set();
-    const { browser, exports } = packageDefinition;
-    // if exports are available, leverage them.
-    if (exports) {
-        if (typeof exports === 'object') {
-            for (const [key, entry] of Object.entries(exports)) {
-                if (key.indexOf('*') < 0) {
-                    const entryPath = getExportPathFromEntry(entry);
-                    if (entryPath) {
-                        entries.add(cleanEntry(entryPath));
-                    }
-                }
-            }
-        }
-        else if (typeof exports === 'string') {
-            entries.add(cleanEntry(exports));
-        }
-    }
-    else if (typeof browser === 'string') {
-        entries.add(browser);
-    }
-    else {
-        const defaultEntryPath = packageDefinition.module || packageDefinition.main || './index.js';
-        if (defaultEntryPath) {
-            entries.add(cleanEntry(defaultEntryPath));
-        }
-    }
-    if (typeof browser === 'object') {
-        for (const [fromPath, toPath] of Object.entries(browser)) {
-            if (entries.has(fromPath) && toPath) {
-                entries.add(cleanEntry(toPath));
-            }
-        }
-    }
+import { getExportsMap } from './getExportsMap.js';
+import { flattenExportsMap } from './flattenExportsMap.js';
+/**
+ * Given a package path, reads the exports from the package.json and returns a flattened array of entry files
+ * for bundling.
+ */
+export async function resolvePackageEntries(packagePath, options = {}) {
+    const entries = new Set(Object.values(flattenExportsMap(await getExportsMap(packagePath, options))));
     return Array.from(entries);
 }
 //# sourceMappingURL=resolvePackageEntries.js.map

package/lib/resolvePackageEntries.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePackageEntries.js","sourceRoot":"","sources":["../src/resolvePackageEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,UAAU,qBAAqB,CAAC,iBAA8B;IAClE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;IAE/C,2CAA2C;IAC3C,IAAI,OAAO,EAAE;QACX,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAClD,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACxB,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAEhD,IAAI,SAAS,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;qBACpC;iBACF;aACF;SACF;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YACtC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;SAClC;KACF;SAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QACtC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KACtB;SAAM;QACL,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,IAAI,iBAAiB,CAAC,IAAI,IAAI,YAAY,CAAC;QAE5F,IAAI,gBAAgB,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC3C;KACF;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACxD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE;gBACnC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aACjC;SACF;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"resolvePackageEntries.js","sourceRoot":"","sources":["../src/resolvePackageEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB,EACnB,UAEI,EAAE;IAEN,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7G,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC"}

package/lib/resolvePackageEntries.test.js

@@ -1,102 +1,101 @@
 import { describe, it, expect } from '@jest/globals';
 import { PackageDefinitions } from './PackageDefinitions.js';
 import { resolvePackageEntries } from './resolvePackageEntries.js';
-import { testNodeFetchPath } from './testPaths.js';
-const defaultPackage = {
-    name: 'default',
-    version: '1.0.0',
-};
 describe('resolvePackageEntries', () => {
-    it('can resolve an exports map (default)', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            exports: {
-                '.': {
-                    default: './lib/index.js',
+    it('can resolve an exports map (default)', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                exports: {
+                    '.': {
+                        default: './lib/index.js',
+                    },
                 },
             },
-        })).toEqual(['./lib/index.js']);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./lib/index.js']);
     });
-    it('can resolve an exports map (import)', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            exports: {
-                '.': {
-                    import: './lib/index.js',
+    it('can resolve an exports map (import)', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                exports: {
+                    '.': {
+                        import: './lib/index.js',
+                    },
                 },
             },
-        })).toEqual(['./lib/index.js']);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./lib/index.js']);
     });
-    it('can resolve an exports map (string)', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            exports: {
-                '.': './lib/index.js',
+    it('can resolve an exports map (string)', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                exports: {
+                    '.': './lib/index.js',
+                },
             },
-        })).toEqual(['./lib/index.js']);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./lib/index.js']);
     });
-    it('can resolve an exports map (no source)', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            exports: {
-                '.': {
-                    types: './lib/index.d.ts',
-                    source: './lib/index.ts',
+    it('can resolve an exports map (multiple)', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                exports: {
+                    '.': './lib/index.js',
+                    './foo': './lib/foo.js',
                 },
             },
-        })).toEqual([]);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual([
+            './lib/index.js',
+            './lib/foo.js',
+        ]);
     });
-    it('can resolve an exports map (multiple)', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            exports: {
-                '.': './lib/index.js',
-                './foo': './lib/foo.js',
+    it('can prefer module over main', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                main: 'main.js',
+                module: 'module.js',
             },
-        })).toEqual(['./lib/index.js', './lib/foo.js']);
-    });
-    it('can prefer module over main', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            module: './lib/module.js',
-            main: './lib/main.js',
-        })).toEqual(['./lib/module.js']);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./module.js']);
     });
-    it('can fall back to main', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            main: './lib/main.js',
-        })).toEqual(['./lib/main.js']);
-    });
-    it('can dedupe redundant entries', () => {
-        expect(resolvePackageEntries({
-            ...defaultPackage,
-            exports: {
-                '.': './lib/index.js',
-                './foo': './lib/index.js',
+    it('can fall back to main', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                main: 'main.js',
             },
-        })).toEqual(['./lib/index.js']);
-    });
-    it('can resolve node-fetch entries', async () => {
-        expect(resolvePackageEntries((await PackageDefinitions.getInstance().get(testNodeFetchPath)))).toEqual(['./browser.js']);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./main.js']);
     });
-    it('can resolve an entry without an extension', () => {
-        expect(resolvePackageEntries({
-            main: 'index',
-        })).toEqual(['./index.js']);
+    it('can dedupe redundant entries', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                exports: {
+                    '.': './lib/index.js',
+                    './foo': './lib/index.js',
+                },
+            },
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./lib/index.js']);
     });
-    it('ignores entries with astrisks', () => {
-        expect(resolvePackageEntries({
-            exports: {
-                '.': './lib/index.js',
-                './foo/*': './lib/foo.js',
+    it('can resolve an entry without an extension', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                main: 'main',
             },
-        })).toEqual(['./lib/index.js']);
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./main.js']);
     });
-    it('can handle entries with exports as string', () => {
-        expect(resolvePackageEntries({
-            exports: './lib/index.js',
-        })).toEqual(['./lib/index.js']);
+    it('ignores entries with trailing slashes', async () => {
+        const packages = new PackageDefinitions({
+            'node_modules/default': {
+                exports: {
+                    '.': './lib/index.js',
+                    './': './',
+                },
+            },
+        });
+        expect(await resolvePackageEntries('node_modules/default', { packages })).toEqual(['./lib/index.js']);
     });
 });
 //# sourceMappingURL=resolvePackageEntries.test.js.map

package/lib/resolvePackageEntries.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePackageEntries.test.js","sourceRoot":"","sources":["../src/resolvePackageEntries.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolvePackageEntries.test.js","sourceRoot":"","sources":["../src/resolvePackageEntries.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,OAAO,EAAE;oBACP,GAAG,EAAE;wBACH,OAAO,EAAE,gBAAgB;qBAC1B;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,OAAO,EAAE;oBACP,GAAG,EAAE;wBACH,MAAM,EAAE,gBAAgB;qBACzB;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;iBACtB;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;oBACrB,OAAO,EAAE,cAAc;iBACxB;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAChF,gBAAgB;YAChB,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,WAAW;aACpB;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IACrG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,IAAI,EAAE,SAAS;aAChB;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;oBACrB,OAAO,EAAE,gBAAgB;iBAC1B;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IACnG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC;YACtC,sBAAsB,EAAE;gBACtB,OAAO,EAAE;oBACP,GAAG,EAAE,gBAAgB;oBACrB,IAAI,EAAE,IAAI;iBACX;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,qBAAqB,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/safeRelativePath.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Ensures the give relative path starts with a ./
+ */
+export declare function safeRelativePath(originalPath: string | undefined): string;

package/lib/safeRelativePath.js

@@ -0,0 +1,19 @@
+import { slash } from '@ms-cloudpack/path-utilities';
+/**
+ * Ensures the give relative path starts with a ./
+ */
+export function safeRelativePath(originalPath) {
+    if (!originalPath) {
+        return '.';
+    }
+    // Ensure we have the right slashes.
+    originalPath = slash(originalPath);
+    if (originalPath.startsWith('/')) {
+        return '.' + originalPath;
+    }
+    else if (originalPath.startsWith('./')) {
+        return originalPath;
+    }
+    return `./${originalPath}`;
+}
+//# sourceMappingURL=safeRelativePath.js.map

package/lib/safeRelativePath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"safeRelativePath.js","sourceRoot":"","sources":["../src/safeRelativePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,YAAgC;IAC/D,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,GAAG,CAAC;KACZ;IAED,oCAAoC;IACpC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IAEnC,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChC,OAAO,GAAG,GAAG,YAAY,CAAC;KAC3B;SAAM,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACxC,OAAO,YAAY,CAAC;KACrB;IAED,OAAO,KAAK,YAAY,EAAE,CAAC;AAC7B,CAAC"}

package/lib/safeRelativePath.test.d.ts

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

package/lib/safeRelativePath.test.js

@@ -0,0 +1,17 @@
+import { describe, it, expect } from '@jest/globals';
+import { safeRelativePath } from './safeRelativePath.js';
+describe('safeRelativePath', () => {
+    it('can handle undefined', () => {
+        expect(safeRelativePath(undefined)).toEqual('.');
+    });
+    it('can handle an absolute path', () => {
+        expect(safeRelativePath('/foo/bar')).toEqual('./foo/bar');
+    });
+    it('can handle a relative path', () => {
+        expect(safeRelativePath('./foo/bar')).toEqual('./foo/bar');
+    });
+    it('can handle a relative path without a leading slash', () => {
+        expect(safeRelativePath('foo/bar')).toEqual('./foo/bar');
+    });
+});
+//# sourceMappingURL=safeRelativePath.test.js.map

package/lib/safeRelativePath.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"safeRelativePath.test.js","sourceRoot":"","sources":["../src/safeRelativePath.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACpC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/tsdoc-metadata.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "0.13.1",
+  "version": "0.15.0",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -24,7 +24,7 @@
     "@ms-cloudpack/scripts": "*",
     "@ms-cloudpack/eslint-config-base": "*",
     "@types/resolve": "1.20.2",
-    "@babel/types": "7.19.3"
+    "@babel/types": "7.19.4"
   },
   "scripts": {
     "api:update": "cloudpack-scripts api-update",

package/lib/evaluateImportsFromEntries.d.ts

@@ -1,31 +0,0 @@
-import type { ResolveMap } from './createResolveMap.js';
-declare type PackageExports = {
-    [packageName: string]: {
-        [version: string]: {
-            [importPath: string]: {
-                count: number;
-                import: string | undefined;
-            };
-        };
-    };
-};
-export interface EvaluateImportsFromEntriesStats {
-    parsedSourceFiles: number;
-    parseErrors: string[];
-    uniqueImports: number;
-    uniquePackages: number;
-    unresolvedPackages: {
-        name: string;
-        from: string;
-    }[];
-    unresolvedPackageImports: {
-        name: string;
-        path: string;
-        from: string;
-    }[];
-}
-export declare function evaluateImportsFromEntries(entries: string[], resolveMap?: ResolveMap, allExports?: PackageExports): Promise<{
-    exports: PackageExports;
-    stats: EvaluateImportsFromEntriesStats;
-}>;
-export {};