@ms-cloudpack/package-utilities 12.2.2 → 12.2.3

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 export { PackageDefinitions } from './packageDefinitions/PackageDefinitions.js';
 export { MockPackageDefinitions } from './packageDefinitions/MockPackageDefinitions.js';
 export { createResolveMap } from './resolveMap/createResolveMap.js';
+export { createLinkResolveMap } from './resolveMap/createLinkResolveMap.js';
 export { findResolveMapEntry } from './resolveMap/findResolveMapEntry.js';
 export type { DiffResolveMapsChanges, DiffResolveMapsStats } from './resolveMap/diffResolveMaps.js';
 export { diffResolveMaps } from './resolveMap/diffResolveMaps.js';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAGxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,YAAY,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAG9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,GAC7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAG/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAGxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,YAAY,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAG9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,GAC7B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAG/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC"}

package/lib/index.js

@@ -3,6 +3,7 @@ export { PackageDefinitions } from './packageDefinitions/PackageDefinitions.js';
 export { MockPackageDefinitions } from './packageDefinitions/MockPackageDefinitions.js';
 // ResolveMaps
 export { createResolveMap } from './resolveMap/createResolveMap.js';
+export { createLinkResolveMap } from './resolveMap/createLinkResolveMap.js';
 export { findResolveMapEntry } from './resolveMap/findResolveMapEntry.js';
 export { diffResolveMaps } from './resolveMap/diffResolveMaps.js';
 export { ensureResolveMapEntry } from './resolveMap/ensureResolveMapEntry.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,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAExF,cAAc;AACd,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAkC,MAAM,oCAAoC,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,0BAA0B;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EACL,iBAAiB,GAGlB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,qFAAqF;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC","sourcesContent":["// Package definition parsing\nexport { PackageDefinitions } from './packageDefinitions/PackageDefinitions.js';\nexport { MockPackageDefinitions } from './packageDefinitions/MockPackageDefinitions.js';\n\n// ResolveMaps\nexport { createResolveMap } from './resolveMap/createResolveMap.js';\nexport { findResolveMapEntry } from './resolveMap/findResolveMapEntry.js';\nexport type { DiffResolveMapsChanges, DiffResolveMapsStats } from './resolveMap/diffResolveMaps.js';\nexport { diffResolveMaps } from './resolveMap/diffResolveMaps.js';\nexport { ensureResolveMapEntry } from './resolveMap/ensureResolveMapEntry.js';\n\n// ExportsMap parsing and creation\nexport { flattenExportsMap } from './exportsMap/flattenExportsMap.js';\nexport { addExportsMapEntry, type AddExportsMapEntryOptions } from './exportsMap/addExportsMapEntry.js';\nexport { getExportsMap } from './exportsMap/getExportsMap.js';\nexport { getSourceEntry } from './exportsMap/getSourceEntry.js';\n\n// Other package utilities\nexport { detectModuleType } from './detectModuleType.js';\nexport {\n  findFileInPackage,\n  type FindFileInPackageOptions,\n  type FindFileInPackageResult,\n} from './findFileInPackage/findFileInPackage.js';\nexport { getVersion, getDisplayVersion } from './packageJson/getVersion.js';\nexport { getDependencies } from './packageJson/getDependencies.js';\nexport { getUnusedDependencies } from './packageJson/getUnusedDependencies.js';\n\n// Object utilities which could be moved to a separate package if we add more of them\nexport { mergeArrayDefaults } from './object/mergeArrayDefaults.js';\nexport { mergeObjects } from './object/mergeObjects.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,6BAA6B;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AAExF,cAAc;AACd,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,kCAAkC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAkC,MAAM,oCAAoC,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAEhE,0BAA0B;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EACL,iBAAiB,GAGlB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,qFAAqF;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC","sourcesContent":["// Package definition parsing\nexport { PackageDefinitions } from './packageDefinitions/PackageDefinitions.js';\nexport { MockPackageDefinitions } from './packageDefinitions/MockPackageDefinitions.js';\n\n// ResolveMaps\nexport { createResolveMap } from './resolveMap/createResolveMap.js';\nexport { createLinkResolveMap } from './resolveMap/createLinkResolveMap.js';\nexport { findResolveMapEntry } from './resolveMap/findResolveMapEntry.js';\nexport type { DiffResolveMapsChanges, DiffResolveMapsStats } from './resolveMap/diffResolveMaps.js';\nexport { diffResolveMaps } from './resolveMap/diffResolveMaps.js';\nexport { ensureResolveMapEntry } from './resolveMap/ensureResolveMapEntry.js';\n\n// ExportsMap parsing and creation\nexport { flattenExportsMap } from './exportsMap/flattenExportsMap.js';\nexport { addExportsMapEntry, type AddExportsMapEntryOptions } from './exportsMap/addExportsMapEntry.js';\nexport { getExportsMap } from './exportsMap/getExportsMap.js';\nexport { getSourceEntry } from './exportsMap/getSourceEntry.js';\n\n// Other package utilities\nexport { detectModuleType } from './detectModuleType.js';\nexport {\n  findFileInPackage,\n  type FindFileInPackageOptions,\n  type FindFileInPackageResult,\n} from './findFileInPackage/findFileInPackage.js';\nexport { getVersion, getDisplayVersion } from './packageJson/getVersion.js';\nexport { getDependencies } from './packageJson/getDependencies.js';\nexport { getUnusedDependencies } from './packageJson/getUnusedDependencies.js';\n\n// Object utilities which could be moved to a separate package if we add more of them\nexport { mergeArrayDefaults } from './object/mergeArrayDefaults.js';\nexport { mergeObjects } from './object/mergeObjects.js';\n"]}

package/lib/resolveMap/createHelpers/convertToLinkResolveMap.d.ts

@@ -0,0 +1,9 @@
+import type { ResolveMap } from '@ms-cloudpack/common-types';
+import type { PackageMap } from './types/PackageMap.js';
+/**
+ * Given a PackageMap returns a ResolveMap.
+ */
+export declare function convertToLinkResolveMap(options: {
+    appMap: PackageMap;
+}): ResolveMap;
+//# sourceMappingURL=convertToLinkResolveMap.d.ts.map

package/lib/resolveMap/createHelpers/convertToLinkResolveMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertToLinkResolveMap.d.ts","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/convertToLinkResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAoBnF"}

package/lib/resolveMap/createHelpers/convertToLinkResolveMap.js

@@ -0,0 +1,22 @@
+import { entrySorter } from './entrySorter.js';
+/**
+ * Given a PackageMap returns a ResolveMap.
+ */
+export function convertToLinkResolveMap(options) {
+    const { appMap } = options;
+    const resolveMap = {};
+    for (const [packageName, packageEntries] of Object.entries(appMap)) {
+        const sortedPackageEntries = Object.values(packageEntries).sort(entrySorter);
+        // Get the sorted package entries based on the most to least requiredBy references. This
+        // ends up reducing the size of the resolve map by minimizing scoped cases.
+        if (sortedPackageEntries.length) {
+            const entry = (resolveMap[packageName] = sortedPackageEntries[0]);
+            // Update scoped versions (version to resolve map entry)
+            if (sortedPackageEntries.length > 1) {
+                entry.scopedVersions = Object.fromEntries(sortedPackageEntries.slice(1).map((e) => [e.version, e]));
+            }
+        }
+    }
+    return resolveMap;
+}
+//# sourceMappingURL=convertToLinkResolveMap.js.map

package/lib/resolveMap/createHelpers/convertToLinkResolveMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertToLinkResolveMap.js","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/convertToLinkResolveMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAA+B;IACrE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,UAAU,GAAe,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnE,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE7E,wFAAwF;QACxF,2EAA2E;QAC3E,IAAI,oBAAoB,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YAElE,wDAAwD;YACxD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACtG,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import type { ResolveMap } from '@ms-cloudpack/common-types';\nimport { entrySorter } from './entrySorter.js';\nimport type { PackageMap } from './types/PackageMap.js';\n\n/**\n * Given a PackageMap returns a ResolveMap.\n */\nexport function convertToLinkResolveMap(options: { appMap: PackageMap }): ResolveMap {\n  const { appMap } = options;\n  const resolveMap: ResolveMap = {};\n\n  for (const [packageName, packageEntries] of Object.entries(appMap)) {\n    const sortedPackageEntries = Object.values(packageEntries).sort(entrySorter);\n\n    // Get the sorted package entries based on the most to least requiredBy references. This\n    // ends up reducing the size of the resolve map by minimizing scoped cases.\n    if (sortedPackageEntries.length) {\n      const entry = (resolveMap[packageName] = sortedPackageEntries[0]);\n\n      // Update scoped versions (version to resolve map entry)\n      if (sortedPackageEntries.length > 1) {\n        entry.scopedVersions = Object.fromEntries(sortedPackageEntries.slice(1).map((e) => [e.version, e]));\n      }\n    }\n  }\n\n  return resolveMap;\n}\n"]}

package/lib/resolveMap/createHelpers/flattenResolveMap.d.ts

@@ -0,0 +1,11 @@
+import type { ResolveMap } from '@ms-cloudpack/common-types';
+import type { PackageMap } from './types/PackageMap.js';
+/**
+ * Flatten a ResolveMap into a PackageMap.
+ * This is useful for converting a ResolveMap into a format that can be easily consumed by other parts of the system.
+ * The main entry is added to the package map, and any scoped versions are added as well.
+ */
+export declare function flattenResolveMap(options: {
+    resolveMap: ResolveMap;
+}): PackageMap;
+//# sourceMappingURL=flattenResolveMap.d.ts.map

package/lib/resolveMap/createHelpers/flattenResolveMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flattenResolveMap.d.ts","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/flattenResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAqBjF"}

package/lib/resolveMap/createHelpers/flattenResolveMap.js

@@ -0,0 +1,23 @@
+/**
+ * Flatten a ResolveMap into a PackageMap.
+ * This is useful for converting a ResolveMap into a format that can be easily consumed by other parts of the system.
+ * The main entry is added to the package map, and any scoped versions are added as well.
+ */
+export function flattenResolveMap(options) {
+    const { resolveMap } = options;
+    const packageMap = {};
+    for (const [packageName, entry] of Object.entries(resolveMap)) {
+        // Initialize the package entry if it doesn't exist
+        packageMap[packageName] ??= {};
+        // Add the main entry
+        const { scopedVersions, ...entryWithoutScopedVersions } = entry;
+        // Remove scopedVersions from the main entry to avoid redundancy
+        packageMap[packageName][entry.version] = { ...entryWithoutScopedVersions };
+        // Add any scoped versions
+        for (const [version, scopedEntry] of Object.entries(scopedVersions || {})) {
+            packageMap[packageName][version] = { ...scopedEntry };
+        }
+    }
+    return packageMap;
+}
+//# sourceMappingURL=flattenResolveMap.js.map

package/lib/resolveMap/createHelpers/flattenResolveMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flattenResolveMap.js","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/flattenResolveMap.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAmC;IACnE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,MAAM,UAAU,GAAe,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,mDAAmD;QACnD,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAE/B,qBAAqB;QACrB,MAAM,EAAE,cAAc,EAAE,GAAG,0BAA0B,EAAE,GAAG,KAAK,CAAC;QAEhE,gEAAgE;QAChE,UAAU,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,0BAA0B,EAAE,CAAC;QAE3E,0BAA0B;QAC1B,KAAK,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,CAAC;YAC1E,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;QACxD,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import type { ResolveMap } from '@ms-cloudpack/common-types';\nimport type { PackageMap } from './types/PackageMap.js';\n\n/**\n * Flatten a ResolveMap into a PackageMap.\n * This is useful for converting a ResolveMap into a format that can be easily consumed by other parts of the system.\n * The main entry is added to the package map, and any scoped versions are added as well.\n */\nexport function flattenResolveMap(options: { resolveMap: ResolveMap }): PackageMap {\n  const { resolveMap } = options;\n  const packageMap: PackageMap = {};\n\n  for (const [packageName, entry] of Object.entries(resolveMap)) {\n    // Initialize the package entry if it doesn't exist\n    packageMap[packageName] ??= {};\n\n    // Add the main entry\n    const { scopedVersions, ...entryWithoutScopedVersions } = entry;\n\n    // Remove scopedVersions from the main entry to avoid redundancy\n    packageMap[packageName][entry.version] = { ...entryWithoutScopedVersions };\n\n    // Add any scoped versions\n    for (const [version, scopedEntry] of Object.entries(scopedVersions || {})) {\n      packageMap[packageName][version] = { ...scopedEntry };\n    }\n  }\n\n  return packageMap;\n}\n"]}

package/lib/resolveMap/createHelpers/linkPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linkPath.d.ts","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/linkPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAMxD,OAAO,KAAK,EAAE,UAAU,EAAmB,uBAAuB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIpH;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC;CAC5C,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,IAAI,CAAC,CA4Gf"}
+{"version":3,"file":"linkPath.d.ts","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/linkPath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAMxD,OAAO,KAAK,EAAE,UAAU,EAAmB,uBAAuB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAKpH;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC;CAC5C,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,IAAI,CAAC,CA8Gf"}

package/lib/resolveMap/createHelpers/linkPath.js

@@ -5,17 +5,20 @@ import { parseRequiredBy } from './parseRequiredBy.js';
 import { slash } from '@ms-cloudpack/path-string-parsing';
 import { dedupeLinkedPackages } from './dedupeLinkedPackages.js';
 import { findProjectRoot } from '@ms-cloudpack/path-utilities';
+import { flattenResolveMap } from './flattenResolveMap.js';
 /**
  * Find packages from `linkedPath` and add them to the `appMap`.
  */
 export async function linkPath(options, context) {
     const { linkedPath, appMap, appRootPath, appRepoDefinition } = options;
     const linkedRootPath = linkedPath.rootPath || findProjectRoot(linkedPath.path, { noPackageRoot: true });
-    const linkMap = await findPackagesFromPath({
-        searchPaths: [linkedPath.path],
-        discoverPackages: true,
-        rootPath: linkedRootPath,
-    }, context);
+    const linkMap = linkedPath?.remote
+        ? flattenResolveMap({ resolveMap: linkedPath.remote.resolveMap })
+        : await findPackagesFromPath({
+            searchPaths: [linkedPath.path],
+            discoverPackages: true,
+            rootPath: linkedRootPath,
+        }, context);
     const entriesToLink = [];
     const { path, ignoredPackages = [], includeAll } = linkedPath;
     const resolutions = linkedPath.ignoreResolutions ? undefined : appRepoDefinition?.resolutions;

package/lib/resolveMap/createHelpers/linkPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"linkPath.js","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/linkPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageMap } from './types/PackageMap.js';\nimport { addLinkedEntryDependencies } from './addLinkedEntryDependencies.js';\nimport { detachEntry } from './detachEntry.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { LinkedPath, ResolveMapEntry, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';\nimport { dedupeLinkedPackages } from './dedupeLinkedPackages.js';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\n\n/**\n * Find packages from `linkedPath` and add them to the `appMap`.\n */\nexport async function linkPath(\n  options: {\n    linkedPath: LinkedPath;\n    appMap: PackageMap;\n    appRootPath: string | undefined;\n    appRepoDefinition: PackageJson | undefined;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<void> {\n  const { linkedPath, appMap, appRootPath, appRepoDefinition } = options;\n\n  const linkedRootPath = linkedPath.rootPath || findProjectRoot(linkedPath.path, { noPackageRoot: true });\n\n  const linkMap = await findPackagesFromPath(\n    {\n      searchPaths: [linkedPath.path],\n      discoverPackages: true,\n      rootPath: linkedRootPath,\n    },\n    context,\n  );\n  const entriesToLink: ResolveMapEntry[] = [];\n  const { path, ignoredPackages = [], includeAll } = linkedPath;\n  const resolutions = linkedPath.ignoreResolutions ? undefined : appRepoDefinition?.resolutions;\n\n  // Iterate through the linkMap, looking for internal packages to link to the appMap.\n  for (const [packageName, packageVersions] of Object.entries(linkMap)) {\n    const appEntries = Object.values(appMap[packageName] || {});\n\n    if (!appEntries.length) {\n      continue;\n    }\n\n    const linkedEntries = Object.values(packageVersions);\n    const linkedEntry = linkedEntries.length === 1 ? linkedEntries[0] : undefined;\n\n    // For linked dependencies, we don't want multiple versions referenced. Remove them\n    // all and add them in a second pass.\n    if (\n      linkedEntry &&\n      !linkedEntry.isExternal &&\n      ignoredPackages.indexOf(packageName) === -1 &&\n      (includeAll || isContainedInPath(linkedEntry.path, path))\n    ) {\n      // Linked packages use an asterisk for the version description. This keeps it semver compatible with\n      // anything.\n      linkedEntry.version += '-linked';\n      linkedEntry.isLinked = true;\n\n      entriesToLink.push(linkedEntry);\n    }\n  }\n\n  // We now have a list of paths to link. Iterate through them, add them to the appMap,\n  // and ensure their dependencies are satisfied.\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    linkedEntry.requiredBy = {};\n    for (const entry of existingEntries) {\n      for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {\n        const requiredByName = parseRequiredBy(requiredById).name;\n        const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];\n        const requiredByKey = linkedParentEntry?.isLinked\n          ? (`${linkedParentEntry.name}@${linkedParentEntry.version}` as const)\n          : requiredById;\n        linkedEntry.requiredBy[requiredByKey as `${string}@${string}`] = requirement;\n      }\n    }\n  }\n\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    // We need to detach all existing entries from the appMap, along with their dependencies. Note - detaching just means that\n    // we disconnect the entry from its parent and children. If the children have no other parents, we disconnect them as well\n    // and recurse through their children.\n    for (const existingEntry of existingEntries) {\n      detachEntry({ appMap, entry: existingEntry });\n    }\n\n    // Attach the linked entry to the parents' dependencies.\n    for (const requiredById of Object.keys(linkedEntry.requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      let requiredByEntry = appMap[requiredByName][requiredByVersion];\n\n      // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry\n      // in the app map. Fall back to the first entry.\n      requiredByEntry ??= Object.values(appMap[requiredByName])[0];\n\n      requiredByEntry.dependencies[name] = linkedEntry.version;\n    }\n\n    // Add the linked entry\n    appMap[linkedEntry.name] = { [linkedEntry.version]: linkedEntry };\n  }\n\n  const allDuplicates = [];\n\n  // Once all linked entries have been added, ensure their dependencies are resolved.\n  for (const linkedEntry of entriesToLink) {\n    const { duplicates } = await addLinkedEntryDependencies(\n      { linkedEntry, appMap: appMap, linkMap, resolutions },\n      context,\n    );\n    allDuplicates.push(...duplicates);\n  }\n\n  if (linkedPath.resolveStrategy !== 'duplicate') {\n    await dedupeLinkedPackages(\n      { appMap, allDuplicates: new Set(allDuplicates), rootPath: appRootPath, remotePath: linkedPath.path },\n      context,\n    );\n  }\n}\n\nfunction isContainedInPath(path: string, basePath: string): boolean {\n  path = normalizePath(path);\n  basePath = normalizePath(basePath);\n\n  return path.startsWith(basePath);\n}\n\nfunction normalizePath(path: string): string {\n  let normalizedPath = slash(path);\n\n  if (!normalizedPath.endsWith('/')) {\n    normalizedPath += '/';\n  }\n\n  return normalizedPath;\n}\n"]}
+{"version":3,"file":"linkPath.js","sourceRoot":"","sources":["../../../src/resolveMap/createHelpers/linkPath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageMap } from './types/PackageMap.js';\nimport { addLinkedEntryDependencies } from './addLinkedEntryDependencies.js';\nimport { detachEntry } from './detachEntry.js';\nimport { findPackagesFromPath } from './findPackagesFromPath.js';\nimport { parseRequiredBy } from './parseRequiredBy.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { LinkedPath, ResolveMapEntry, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';\nimport { dedupeLinkedPackages } from './dedupeLinkedPackages.js';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { flattenResolveMap } from './flattenResolveMap.js';\n\n/**\n * Find packages from `linkedPath` and add them to the `appMap`.\n */\nexport async function linkPath(\n  options: {\n    linkedPath: LinkedPath;\n    appMap: PackageMap;\n    appRootPath: string | undefined;\n    appRepoDefinition: PackageJson | undefined;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<void> {\n  const { linkedPath, appMap, appRootPath, appRepoDefinition } = options;\n\n  const linkedRootPath = linkedPath.rootPath || findProjectRoot(linkedPath.path, { noPackageRoot: true });\n\n  const linkMap = linkedPath?.remote\n    ? flattenResolveMap({ resolveMap: linkedPath.remote.resolveMap })\n    : await findPackagesFromPath(\n        {\n          searchPaths: [linkedPath.path],\n          discoverPackages: true,\n          rootPath: linkedRootPath,\n        },\n        context,\n      );\n  const entriesToLink: ResolveMapEntry[] = [];\n  const { path, ignoredPackages = [], includeAll } = linkedPath;\n  const resolutions = linkedPath.ignoreResolutions ? undefined : appRepoDefinition?.resolutions;\n\n  // Iterate through the linkMap, looking for internal packages to link to the appMap.\n  for (const [packageName, packageVersions] of Object.entries(linkMap)) {\n    const appEntries = Object.values(appMap[packageName] || {});\n\n    if (!appEntries.length) {\n      continue;\n    }\n\n    const linkedEntries = Object.values(packageVersions);\n    const linkedEntry = linkedEntries.length === 1 ? linkedEntries[0] : undefined;\n\n    // For linked dependencies, we don't want multiple versions referenced. Remove them\n    // all and add them in a second pass.\n    if (\n      linkedEntry &&\n      !linkedEntry.isExternal &&\n      ignoredPackages.indexOf(packageName) === -1 &&\n      (includeAll || isContainedInPath(linkedEntry.path, path))\n    ) {\n      // Linked packages use an asterisk for the version description. This keeps it semver compatible with\n      // anything.\n      linkedEntry.version += '-linked';\n      linkedEntry.isLinked = true;\n\n      entriesToLink.push(linkedEntry);\n    }\n  }\n\n  // We now have a list of paths to link. Iterate through them, add them to the appMap,\n  // and ensure their dependencies are satisfied.\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    linkedEntry.requiredBy = {};\n    for (const entry of existingEntries) {\n      for (const [requiredById, requirement] of Object.entries(entry.requiredBy)) {\n        const requiredByName = parseRequiredBy(requiredById).name;\n        const linkedParentEntry = Object.values(linkMap[requiredByName] || {})[0];\n        const requiredByKey = linkedParentEntry?.isLinked\n          ? (`${linkedParentEntry.name}@${linkedParentEntry.version}` as const)\n          : requiredById;\n        linkedEntry.requiredBy[requiredByKey as `${string}@${string}`] = requirement;\n      }\n    }\n  }\n\n  for (const linkedEntry of entriesToLink) {\n    const { name } = linkedEntry;\n    const existingEntries = Object.values(appMap[name]);\n\n    // We need to detach all existing entries from the appMap, along with their dependencies. Note - detaching just means that\n    // we disconnect the entry from its parent and children. If the children have no other parents, we disconnect them as well\n    // and recurse through their children.\n    for (const existingEntry of existingEntries) {\n      detachEntry({ appMap, entry: existingEntry });\n    }\n\n    // Attach the linked entry to the parents' dependencies.\n    for (const requiredById of Object.keys(linkedEntry.requiredBy)) {\n      const { name: requiredByName, version: requiredByVersion } = parseRequiredBy(requiredById);\n      let requiredByEntry = appMap[requiredByName][requiredByVersion];\n\n      // If we can't find the requiredBy entry, it likely means that the entry was already replaced with a linked entry\n      // in the app map. Fall back to the first entry.\n      requiredByEntry ??= Object.values(appMap[requiredByName])[0];\n\n      requiredByEntry.dependencies[name] = linkedEntry.version;\n    }\n\n    // Add the linked entry\n    appMap[linkedEntry.name] = { [linkedEntry.version]: linkedEntry };\n  }\n\n  const allDuplicates = [];\n\n  // Once all linked entries have been added, ensure their dependencies are resolved.\n  for (const linkedEntry of entriesToLink) {\n    const { duplicates } = await addLinkedEntryDependencies(\n      { linkedEntry, appMap: appMap, linkMap, resolutions },\n      context,\n    );\n    allDuplicates.push(...duplicates);\n  }\n\n  if (linkedPath.resolveStrategy !== 'duplicate') {\n    await dedupeLinkedPackages(\n      { appMap, allDuplicates: new Set(allDuplicates), rootPath: appRootPath, remotePath: linkedPath.path },\n      context,\n    );\n  }\n}\n\nfunction isContainedInPath(path: string, basePath: string): boolean {\n  path = normalizePath(path);\n  basePath = normalizePath(basePath);\n\n  return path.startsWith(basePath);\n}\n\nfunction normalizePath(path: string): string {\n  let normalizedPath = slash(path);\n\n  if (!normalizedPath.endsWith('/')) {\n    normalizedPath += '/';\n  }\n\n  return normalizedPath;\n}\n"]}

package/lib/resolveMap/createLinkResolveMap.d.ts

@@ -0,0 +1,21 @@
+import type { PackageDefinitionsCache, ResolveMap } from '@ms-cloudpack/common-types';
+/**
+ * Create a link resolve map for a given `appPath`.
+ * 1. Discover through the dependency tree to build a map of all packages and their dependencies.
+ * 2. For each dependency, sort the versions by the number of packages that depend on that version.
+ *    The most popular version will be considered the "default", to reduce the size of scoped versions.
+ */
+export declare function createLinkResolveMap(options: {
+    /** Path to the app whose dependencies we want to resolve. */
+    appPath: string;
+    /** Any additional packages whose dependencies we want to resolve. */
+    additionalPaths?: string[];
+    /**
+     * Where to stop looking for packages (mainly used for testing).
+     * If not specified, will look for the project/git root of the `appPath`.
+     */
+    rootPath?: string;
+}, context: {
+    packages: PackageDefinitionsCache;
+}): Promise<ResolveMap>;
+//# sourceMappingURL=createLinkResolveMap.d.ts.map

package/lib/resolveMap/createLinkResolveMap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createLinkResolveMap.d.ts","sourceRoot":"","sources":["../../src/resolveMap/createLinkResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAKtF;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAEhB,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,UAAU,CAAC,CAgBrB"}

package/lib/resolveMap/createLinkResolveMap.js

@@ -0,0 +1,21 @@
+import { findProjectRoot } from '@ms-cloudpack/path-utilities';
+import { findPackagesFromPath } from './createHelpers/findPackagesFromPath.js';
+import { convertToLinkResolveMap } from './createHelpers/convertToLinkResolveMap.js';
+/**
+ * Create a link resolve map for a given `appPath`.
+ * 1. Discover through the dependency tree to build a map of all packages and their dependencies.
+ * 2. For each dependency, sort the versions by the number of packages that depend on that version.
+ *    The most popular version will be considered the "default", to reduce the size of scoped versions.
+ */
+export async function createLinkResolveMap(options, context) {
+    const { appPath, additionalPaths = [] } = options;
+    const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });
+    // First we discover the dependencies for the app.
+    const appMap = await findPackagesFromPath({
+        searchPaths: [appPath, ...additionalPaths],
+        discoverPackages: true,
+        rootPath,
+    }, context);
+    return convertToLinkResolveMap({ appMap });
+}
+//# sourceMappingURL=createLinkResolveMap.js.map

package/lib/resolveMap/createLinkResolveMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createLinkResolveMap.js","sourceRoot":"","sources":["../../src/resolveMap/createLinkResolveMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAErF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAYC,EACD,OAEC;IAED,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAElD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvF,kDAAkD;IAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACvC;QACE,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC;QAC1C,gBAAgB,EAAE,IAAI;QACtB,QAAQ;KACT,EACD,OAAO,CACR,CAAC;IAEF,OAAO,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7C,CAAC","sourcesContent":["import type { PackageDefinitionsCache, ResolveMap } from '@ms-cloudpack/common-types';\nimport { findProjectRoot } from '@ms-cloudpack/path-utilities';\nimport { findPackagesFromPath } from './createHelpers/findPackagesFromPath.js';\nimport { convertToLinkResolveMap } from './createHelpers/convertToLinkResolveMap.js';\n\n/**\n * Create a link resolve map for a given `appPath`.\n * 1. Discover through the dependency tree to build a map of all packages and their dependencies.\n * 2. For each dependency, sort the versions by the number of packages that depend on that version.\n *    The most popular version will be considered the \"default\", to reduce the size of scoped versions.\n */\nexport async function createLinkResolveMap(\n  options: {\n    /** Path to the app whose dependencies we want to resolve. */\n    appPath: string;\n\n    /** Any additional packages whose dependencies we want to resolve. */\n    additionalPaths?: string[];\n\n    /**\n     * Where to stop looking for packages (mainly used for testing).\n     * If not specified, will look for the project/git root of the `appPath`.\n     */\n    rootPath?: string;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n  },\n): Promise<ResolveMap> {\n  const { appPath, additionalPaths = [] } = options;\n\n  const rootPath = options.rootPath || findProjectRoot(appPath, { noPackageRoot: true });\n\n  // First we discover the dependencies for the app.\n  const appMap = await findPackagesFromPath(\n    {\n      searchPaths: [appPath, ...additionalPaths],\n      discoverPackages: true,\n      rootPath,\n    },\n    context,\n  );\n\n  return convertToLinkResolveMap({ appMap });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/package-utilities",
-  "version": "12.2.2",
+  "version": "12.2.3",
   "description": "Utilities for resolving/parsing packages and their imports.",
   "license": "MIT",
   "type": "module",
@@ -14,10 +14,10 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.24.14",
+    "@ms-cloudpack/common-types": "^0.24.15",
     "@ms-cloudpack/json-utilities": "^0.1.10",
     "@ms-cloudpack/path-string-parsing": "^1.2.7",
-    "@ms-cloudpack/path-utilities": "^3.0.11",
+    "@ms-cloudpack/path-utilities": "^3.0.12",
     "@ms-cloudpack/task-reporter": "^0.16.1",
     "acorn": "^8.11.2",
     "acorn-walk": "^8.2.1",