@ms-cloudpack/package-utilities 13.0.2 → 13.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ModuleResolutionConfig, PackageDefinitionsCache, PackageJson, ResolveMap } from '@ms-cloudpack/common-types';
|
|
1
|
+
import type { ModuleResolutionConfig, PackageDefinitionsCache, PackageImporterContext, PackageJson, ResolveMap } from '@ms-cloudpack/common-types';
|
|
2
2
|
/**
|
|
3
3
|
* Ensure that a package is in the resolve map and return the path to the package.
|
|
4
4
|
*/
|
|
@@ -8,6 +8,7 @@ export declare function ensureResolveMapEntry(params: {
|
|
|
8
8
|
dependencyName: string;
|
|
9
9
|
resolveMap: ResolveMap;
|
|
10
10
|
appPath: string;
|
|
11
|
+
importerContext: PackageImporterContext | undefined;
|
|
11
12
|
moduleResolutionConfig?: ModuleResolutionConfig;
|
|
12
13
|
}, context: {
|
|
13
14
|
packages: PackageDefinitionsCache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureResolveMapEntry.d.ts","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,WAAW,EACX,UAAU,EACX,MAAM,4BAA4B,CAAC;AAGpC;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IACN,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"ensureResolveMapEntry.d.ts","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,WAAW,EACX,UAAU,EACX,MAAM,4BAA4B,CAAC;AAGpC;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE;IACN,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAA;CAAE,CAAC,CAkFlE"}
|
|
@@ -5,7 +5,7 @@ import { findPackage } from '../findFileInPackage/findPackage.js';
|
|
|
5
5
|
* Ensure that a package is in the resolve map and return the path to the package.
|
|
6
6
|
*/
|
|
7
7
|
export async function ensureResolveMapEntry(params, context) {
|
|
8
|
-
const { dependencyName, resolveMap, packagePath, appPath, definition, moduleResolutionConfig } = params;
|
|
8
|
+
const { dependencyName, resolveMap, packagePath, appPath, definition, importerContext, moduleResolutionConfig } = params;
|
|
9
9
|
const { packages } = context;
|
|
10
10
|
const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });
|
|
11
11
|
// If we can't find the parent entry, we can't add the dependency.
|
|
@@ -24,6 +24,7 @@ export async function ensureResolveMapEntry(params, context) {
|
|
|
24
24
|
dependencyName,
|
|
25
25
|
startPath: packagePath,
|
|
26
26
|
rootPath,
|
|
27
|
+
importerContext,
|
|
27
28
|
moduleResolutionConfig,
|
|
28
29
|
}, context);
|
|
29
30
|
dependencyPath = dependencyPackage?.packagePath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureResolveMapEntry.js","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ensureResolveMapEntry.js","sourceRoot":"","sources":["../../src/resolveMap/ensureResolveMapEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import { findProjectRoot, isExternalPackage } from '@ms-cloudpack/path-utilities';\nimport { findResolveMapEntry } from './findResolveMapEntry.js';\nimport type {\n ModuleResolutionConfig,\n PackageDefinitionsCache,\n PackageImporterContext,\n PackageJson,\n ResolveMap,\n} from '@ms-cloudpack/common-types';\nimport { findPackage } from '../findFileInPackage/findPackage.js';\n\n/**\n * Ensure that a package is in the resolve map and return the path to the package.\n */\nexport async function ensureResolveMapEntry(\n params: {\n definition: PackageJson;\n packagePath: string;\n dependencyName: string;\n resolveMap: ResolveMap;\n appPath: string;\n importerContext: PackageImporterContext | undefined;\n moduleResolutionConfig?: ModuleResolutionConfig;\n },\n context: {\n packages: PackageDefinitionsCache;\n },\n): Promise<{ dependencyPath?: string; updatedResolution: boolean }> {\n const { dependencyName, resolveMap, packagePath, appPath, definition, importerContext, moduleResolutionConfig } =\n params;\n const { packages } = context;\n\n const parentEntry = findResolveMapEntry({ packageName: definition.name, version: definition.version, resolveMap });\n\n // If we can't find the parent entry, we can't add the dependency.\n if (!parentEntry) {\n return { updatedResolution: false };\n }\n\n const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n let dependencyPath = resolveEntry?.path;\n let dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n // If the dependency is already in the resolve map and required by the parent, return the path.\n if (dependencyPath && dependencyDefinition && resolveEntry?.requiredBy[`${definition.name}@${definition.version}`]) {\n return { dependencyPath, updatedResolution: false };\n }\n\n const rootPath = findProjectRoot(appPath, { noPackageRoot: true });\n\n const dependencyPackage = await findPackage(\n {\n dependencyName,\n startPath: packagePath,\n rootPath,\n importerContext,\n moduleResolutionConfig,\n },\n context,\n );\n\n dependencyPath = dependencyPackage?.packagePath;\n dependencyDefinition = dependencyPackage?.definition;\n const version = dependencyDefinition?.version;\n\n // If we can't find the dependency, we can't add it to the resolve map.\n if (!dependencyPath || !dependencyDefinition || !version) {\n return { updatedResolution: false };\n }\n\n // Check if the dependency is already in the resolve map.\n let dependencyEntry = [resolveMap[dependencyName], ...Object.values(resolveMap[dependencyName]?.scopedVersions || {})]\n .filter(Boolean)\n .find((e) => e.version === version && e.path === dependencyPath);\n\n // If it already exists, add the requiredBy entry and return the path.\n if (dependencyEntry) {\n parentEntry.dependencies[dependencyName] = version;\n dependencyEntry.requiredBy[`${definition.name}@${definition.version}`] = version;\n // If the dependency is scoped, we have changed the resolution.\n return { dependencyPath, updatedResolution: dependencyEntry.version !== resolveMap[dependencyName].version };\n }\n\n // If it is missing from the resolve map, add it.\n dependencyEntry = {\n name: dependencyName,\n version,\n path: dependencyPath,\n dependencies: {},\n requiredBy: {\n [`${definition.name}@${definition.version}`]: version,\n },\n };\n\n if (isExternalPackage(dependencyPath)) {\n dependencyEntry.isExternal = true;\n }\n\n parentEntry.dependencies[dependencyName] = version;\n\n // Add the dependency to the resolve map.\n if (!resolveMap[dependencyName]) {\n resolveMap[dependencyName] = dependencyEntry;\n } else {\n resolveMap[dependencyName].scopedVersions ??= {};\n resolveMap[dependencyName].scopedVersions[version] = dependencyEntry;\n }\n\n return { dependencyPath, updatedResolution: true };\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/package-utilities",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.1.1",
|
|
4
4
|
"description": "Utilities for resolving/parsing packages and their imports in Cloudpack",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@ms-cloudpack/common-types": "^0.29.
|
|
17
|
+
"@ms-cloudpack/common-types": "^0.29.1",
|
|
18
18
|
"@ms-cloudpack/json-utilities": "^0.1.11",
|
|
19
19
|
"@ms-cloudpack/path-string-parsing": "^1.2.7",
|
|
20
|
-
"@ms-cloudpack/path-utilities": "^3.1.
|
|
20
|
+
"@ms-cloudpack/path-utilities": "^3.1.27",
|
|
21
21
|
"@ms-cloudpack/task-reporter": "^0.17.4",
|
|
22
22
|
"acorn": "^8.11.2",
|
|
23
23
|
"acorn-walk": "^8.2.1",
|