@ms-cloudpack/package-utilities 0.5.0 → 0.6.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.
- package/CHANGELOG.json +61 -1
- package/CHANGELOG.md +29 -2
- package/README.md +3 -0
- package/lib/createImportMap.js +5 -2
- package/lib/createImportMap.js.map +1 -1
- package/lib/createImportMap.test.js +1 -1
- package/lib/createResolveMap.d.ts +3 -4
- package/lib/createResolveMap.js +52 -29
- package/lib/createResolveMap.js.map +1 -1
- package/lib/createResolveMap.test.js +236 -9
- package/lib/createResolveMap.test.js.map +1 -1
- package/lib/detectModuleType.js +8 -1
- package/lib/detectModuleType.js.map +1 -1
- package/lib/detectModuleType.test.js +7 -1
- package/lib/detectModuleType.test.js.map +1 -1
- package/lib/evaluateImportsFromEntries.js +0 -2
- package/lib/evaluateImportsFromEntries.js.map +1 -1
- package/lib/evaluateImportsFromEntries.test.js +30 -1
- package/lib/evaluateImportsFromEntries.test.js.map +1 -1
- package/lib/findPackagePath.d.ts +1 -1
- package/lib/findPackagePath.js +13 -5
- package/lib/findPackagePath.js.map +1 -1
- package/lib/getExportPathFromEntry.js +1 -1
- package/lib/getExportPathFromEntry.js.map +1 -1
- package/lib/getExportPathFromEntry.test.js +7 -0
- package/lib/getExportPathFromEntry.test.js.map +1 -1
- package/lib/resolve.d.ts +6 -0
- package/lib/resolve.js +6 -0
- package/lib/resolve.js.map +1 -1
- package/lib/resolve.test.js +1 -1
- package/lib/resolveImportFromPackagePath.js +0 -1
- package/lib/resolveImportFromPackagePath.js.map +1 -1
- package/lib/resolvePackageEntries.js +11 -15
- package/lib/resolvePackageEntries.js.map +1 -1
- package/lib/resolvePackageEntries.test.js +7 -0
- package/lib/resolvePackageEntries.test.js.map +1 -1
- package/lib/testPaths.d.ts +8 -0
- package/lib/testPaths.js +8 -0
- package/lib/testPaths.js.map +1 -1
- package/lib/tsdoc-metadata.json +1 -1
- package/package.json +2 -2
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,67 @@
|
|
|
2
2
|
"name": "@ms-cloudpack/package-utilities",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Fri, 12 Aug 2022 08:12:22 GMT",
|
|
6
|
+
"tag": "@ms-cloudpack/package-utilities_v0.6.1",
|
|
7
|
+
"version": "0.6.1",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "dzearing@microsoft.com",
|
|
12
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
13
|
+
"commit": "06b0e23a9cff634baf090a7310f9af625ca3922e",
|
|
14
|
+
"comment": "* evaluateImportsFromEntries: removing console logging\n* getExportPathFromEntry: adding \"module\" to the default list of conditions to use when deriving entry paths.\n* resolveImportFromPackagePath: removing console logging\n* resolvePackageEntries: if the browser entry is a string, resolve that over main or module."
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Fri, 05 Aug 2022 08:12:21 GMT",
|
|
21
|
+
"tag": "@ms-cloudpack/package-utilities_v0.6.0",
|
|
22
|
+
"version": "0.6.0",
|
|
23
|
+
"comments": {
|
|
24
|
+
"minor": [
|
|
25
|
+
{
|
|
26
|
+
"author": "dzearing@microsoft.com",
|
|
27
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
28
|
+
"commit": "8aaedf79e1b7b0b33f19ab560f233bc9bd27b5e5",
|
|
29
|
+
"comment": "Tweaking a variety of API surface to prep for ori integration. Lots of improvements to how we resolve modules, lots of tests added."
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Tue, 02 Aug 2022 20:04:16 GMT",
|
|
36
|
+
"tag": "@ms-cloudpack/package-utilities_v0.5.1",
|
|
37
|
+
"version": "0.5.1",
|
|
38
|
+
"comments": {
|
|
39
|
+
"patch": [
|
|
40
|
+
{
|
|
41
|
+
"author": "renovate@whitesourcesoftware.com",
|
|
42
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
43
|
+
"commit": "2067bfc6ac5b5c388490e9cf83f272035602d9d0",
|
|
44
|
+
"comment": "Update babel monorepo to v7.18.10"
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
"date": "Wed, 29 Jun 2022 02:39:15 GMT",
|
|
51
|
+
"tag": "@ms-cloudpack/package-utilities_v0.5.0",
|
|
52
|
+
"version": "0.5.0",
|
|
53
|
+
"comments": {
|
|
54
|
+
"none": [
|
|
55
|
+
{
|
|
56
|
+
"author": "renovate@whitesourcesoftware.com",
|
|
57
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
58
|
+
"commit": "1c1e55233833b23205c5ddcd7c65694f9ec54707",
|
|
59
|
+
"comment": "Update babel monorepo"
|
|
60
|
+
}
|
|
61
|
+
]
|
|
62
|
+
}
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
"date": "Wed, 08 Jun 2022 20:07:00 GMT",
|
|
6
66
|
"tag": "@ms-cloudpack/package-utilities_v0.5.0",
|
|
7
67
|
"version": "0.5.0",
|
|
8
68
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,39 @@
|
|
|
1
1
|
# Change Log - @ms-cloudpack/package-utilities
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Fri, 12 Aug 2022 08:12:22 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.6.1
|
|
8
|
+
|
|
9
|
+
Fri, 12 Aug 2022 08:12:22 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- * evaluateImportsFromEntries: removing console logging
|
|
14
|
+
* getExportPathFromEntry: adding "module" to the default list of conditions to use when deriving entry paths.
|
|
15
|
+
* resolveImportFromPackagePath: removing console logging
|
|
16
|
+
* resolvePackageEntries: if the browser entry is a string, resolve that over main or module. (dzearing@microsoft.com)
|
|
17
|
+
|
|
18
|
+
## 0.6.0
|
|
19
|
+
|
|
20
|
+
Fri, 05 Aug 2022 08:12:21 GMT
|
|
21
|
+
|
|
22
|
+
### Minor changes
|
|
23
|
+
|
|
24
|
+
- Tweaking a variety of API surface to prep for ori integration. Lots of improvements to how we resolve modules, lots of tests added. (dzearing@microsoft.com)
|
|
25
|
+
|
|
26
|
+
## 0.5.1
|
|
27
|
+
|
|
28
|
+
Tue, 02 Aug 2022 20:04:16 GMT
|
|
29
|
+
|
|
30
|
+
### Patches
|
|
31
|
+
|
|
32
|
+
- Update babel monorepo to v7.18.10 (renovate@whitesourcesoftware.com)
|
|
33
|
+
|
|
7
34
|
## 0.5.0
|
|
8
35
|
|
|
9
|
-
Wed, 08 Jun 2022 20:
|
|
36
|
+
Wed, 08 Jun 2022 20:07:00 GMT
|
|
10
37
|
|
|
11
38
|
### Minor changes
|
|
12
39
|
|
package/README.md
ADDED
package/lib/createImportMap.js
CHANGED
|
@@ -13,9 +13,12 @@ export async function createImportMap(resolveMap, bundleServerUrl, packageDefini
|
|
|
13
13
|
// Initialize scopes
|
|
14
14
|
importMap.scopes ?? (importMap.scopes = {});
|
|
15
15
|
for (const scopedEntry of Object.values(resolveEntry.scopedVersions)) {
|
|
16
|
-
for (const requiredById of scopedEntry.requiredBy) {
|
|
16
|
+
for (const requiredById of Object.keys(scopedEntry.requiredBy)) {
|
|
17
17
|
const requiredByUrl = `${bundleServerUrl}/${requiredById}/`;
|
|
18
|
-
importMap.scopes[requiredByUrl] =
|
|
18
|
+
importMap.scopes[requiredByUrl] = {
|
|
19
|
+
...importMap.scopes[requiredByUrl],
|
|
20
|
+
...(await getImportMapFromEntry(scopedEntry, bundleServerUrl, packageDefinitions)),
|
|
21
|
+
};
|
|
19
22
|
}
|
|
20
23
|
}
|
|
21
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQ9B,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAhB,SAAS,CAAC,MAAM,GAAK,EAAE,EAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"createImportMap.js","sourceRoot":"","sources":["../src/createImportMap.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAQ9B,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QACpD,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,cAAc,EAAE;YAC/B,oBAAoB;YACpB,SAAS,CAAC,MAAM,KAAhB,SAAS,CAAC,MAAM,GAAK,EAAE,EAAC;YAExB,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;gBACpE,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE;oBAC9D,MAAM,aAAa,GAAG,GAAG,eAAe,IAAI,YAAY,GAAG,CAAC;oBAE5D,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG;wBAChC,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC;wBAClC,GAAG,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE,eAAe,EAAE,kBAAkB,CAAC,CAAC;qBACnF,CAAC;iBACH;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAsB,EACtB,eAAuB,EACvB,kBAAgD;IAEhD,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtG,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;QACjC,MAAM,OAAO,GAAG,GAAG,eAAe,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC;QAE/E,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACzE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBAEtD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;oBAC3B,MAAM,UAAU,GAAuB,sBAAsB,CAAC,WAAW,CAAC,CAAC;oBAE3E,IAAI,UAAU,EAAE;wBACd,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;qBAC5D;iBACF;aACF;SACF;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;SAC7F;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createImportMap } from './createImportMap.js';
|
|
2
2
|
const bundleServerUrl = 'http://localhost:12345';
|
|
3
|
-
const basicResolveMapEntry = { name: 'a', version: '1.0.0', path: 'path/a', requiredBy:
|
|
3
|
+
const basicResolveMapEntry = { name: 'a', version: '1.0.0', path: 'path/a', requiredBy: {} };
|
|
4
4
|
describe('createImportMap', () => {
|
|
5
5
|
it('can translate a package with no entries', async () => {
|
|
6
6
|
const resolveMap = {
|
|
@@ -3,16 +3,15 @@ export declare type ResolveMapEntry = {
|
|
|
3
3
|
name: string;
|
|
4
4
|
version: string;
|
|
5
5
|
path: string;
|
|
6
|
-
requiredBy: string
|
|
6
|
+
requiredBy: Record<string, string>;
|
|
7
7
|
scopedVersions?: {
|
|
8
8
|
[version: string]: ResolveMapEntry;
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
|
-
export declare type PartialResolveMapEntry = Omit<ResolveMapEntry, 'requiredBy'> & {
|
|
12
|
-
requiredBy: Set<string>;
|
|
13
|
-
};
|
|
14
11
|
export declare type ResolveMap = Record<string, ResolveMapEntry>;
|
|
15
12
|
export declare function createResolveMap(options: {
|
|
16
13
|
appPath: string;
|
|
17
14
|
additionalPaths?: string[];
|
|
15
|
+
gitRootPath?: string;
|
|
16
|
+
strictVersioning?: boolean;
|
|
18
17
|
}): Promise<ResolveMap>;
|
package/lib/createResolveMap.js
CHANGED
|
@@ -1,29 +1,46 @@
|
|
|
1
1
|
import { getPackageDefinition } from './getPackageDefinition.js';
|
|
2
2
|
import { findPackagePath } from './findPackagePath.js';
|
|
3
|
+
import fs from 'fs';
|
|
4
|
+
const { realpath } = fs.promises;
|
|
3
5
|
export async function createResolveMap(options) {
|
|
4
6
|
var _a, _b, _c, _d;
|
|
5
|
-
const { appPath, additionalPaths = [] } = options;
|
|
7
|
+
const { appPath, additionalPaths = [], gitRootPath, strictVersioning } = options;
|
|
6
8
|
const visitedPaths = new Set([appPath, ...additionalPaths]);
|
|
7
|
-
const pathsToVisit = [appPath, ...additionalPaths];
|
|
8
9
|
const allEntries = {};
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
10
|
+
const appDefinition = await getPackageDefinition(appPath, true);
|
|
11
|
+
const appId = `${appDefinition?.name}@${appDefinition?.version}`;
|
|
12
|
+
if (!appDefinition) {
|
|
13
|
+
throw new Error(`Could not find package.json for ${appPath}`);
|
|
14
|
+
}
|
|
15
|
+
for (const rootPath of [appPath, ...additionalPaths]) {
|
|
16
|
+
const pathsToVisit = [rootPath];
|
|
17
|
+
while (pathsToVisit.length) {
|
|
18
|
+
let packagePath = pathsToVisit.shift();
|
|
19
|
+
if (packagePath) {
|
|
20
|
+
packagePath = await realpath(packagePath);
|
|
21
|
+
const definition = await getPackageDefinition(packagePath, true);
|
|
22
|
+
if (definition && definition.name && definition.version) {
|
|
23
|
+
const packageId = `${definition.name}@${definition.version}`;
|
|
24
|
+
const namedEntries = (allEntries[_a = definition.name] ?? (allEntries[_a] = {}));
|
|
25
|
+
namedEntries[_b = definition.version] ?? (namedEntries[_b] = createMapEntry(definition, packagePath));
|
|
26
|
+
const packageDependencies = [
|
|
27
|
+
...Object.keys(definition?.dependencies || {}),
|
|
28
|
+
...Object.keys(definition?.peerDependencies || {}),
|
|
29
|
+
];
|
|
30
|
+
for (const depName of packageDependencies) {
|
|
31
|
+
const requiredVersion = definition?.dependencies?.[depName] || definition?.peerDependencies?.[depName];
|
|
32
|
+
const dependencyPath = await findPackagePath(depName, strictVersioning ? requiredVersion : undefined, packagePath, gitRootPath, !!definition?.peerDependencies?.[depName]);
|
|
33
|
+
if (dependencyPath) {
|
|
34
|
+
const dependencyDefinition = await getPackageDefinition(dependencyPath, true);
|
|
35
|
+
if (dependencyDefinition?.name && dependencyDefinition.version) {
|
|
36
|
+
const dependencyNamedEntries = (allEntries[_c = dependencyDefinition.name] ?? (allEntries[_c] = {}));
|
|
37
|
+
const dependencyEntry = (dependencyNamedEntries[_d = dependencyDefinition.version] ?? (dependencyNamedEntries[_d] = createMapEntry(dependencyDefinition, dependencyPath)));
|
|
38
|
+
dependencyEntry.requiredBy[packageId] = requiredVersion;
|
|
39
|
+
if (!visitedPaths.has(dependencyPath)) {
|
|
40
|
+
visitedPaths.add(dependencyPath);
|
|
41
|
+
pathsToVisit.push(dependencyPath);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
27
44
|
}
|
|
28
45
|
}
|
|
29
46
|
}
|
|
@@ -35,18 +52,24 @@ export async function createResolveMap(options) {
|
|
|
35
52
|
const resolveMap = {};
|
|
36
53
|
for (const [name, versions] of Object.entries(allEntries)) {
|
|
37
54
|
const [dominantVersion, ...otherVersions] = Object.keys(versions).sort((a, b) => {
|
|
38
|
-
|
|
55
|
+
if (versions[a].requiredBy[appId]) {
|
|
56
|
+
return -1;
|
|
57
|
+
}
|
|
58
|
+
if (versions[b].requiredBy[appId]) {
|
|
59
|
+
return 1;
|
|
60
|
+
}
|
|
61
|
+
// If both are transient to the app, sort by the number of dependencies.
|
|
62
|
+
const aDependentCount = Object.keys(versions[a].requiredBy).length;
|
|
63
|
+
const bDependentCount = Object.keys(versions[b].requiredBy).length;
|
|
64
|
+
return aDependentCount > bDependentCount ? -1 : 1;
|
|
39
65
|
});
|
|
40
66
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
41
67
|
const entry = (resolveMap[name] = allEntries[name][dominantVersion]);
|
|
42
|
-
entry.requiredBy = Array.from(entry.requiredBy);
|
|
43
68
|
if (otherVersions?.length) {
|
|
44
|
-
entry.scopedVersions = {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
scopedEntry.requiredBy = Array.from(scopedEntry.requiredBy);
|
|
49
|
-
}
|
|
69
|
+
entry.scopedVersions = otherVersions.reduce((scopedVersions, version) => {
|
|
70
|
+
scopedVersions[version] = allEntries[name][version];
|
|
71
|
+
return scopedVersions;
|
|
72
|
+
}, {});
|
|
50
73
|
}
|
|
51
74
|
}
|
|
52
75
|
return resolveMap;
|
|
@@ -57,7 +80,7 @@ function createMapEntry(packageDefinition, packagePath) {
|
|
|
57
80
|
name,
|
|
58
81
|
version,
|
|
59
82
|
path: packagePath,
|
|
60
|
-
requiredBy:
|
|
83
|
+
requiredBy: {},
|
|
61
84
|
};
|
|
62
85
|
}
|
|
63
86
|
//# sourceMappingURL=createResolveMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../src/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../src/createResolveMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,36 +2,263 @@ import { slash } from '@ms-cloudpack/path-utilities';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { createResolveMap } from './createResolveMap.js';
|
|
4
4
|
import { filterJson } from './filterJson.js';
|
|
5
|
-
import { testProject1Path } from '../src/testPaths.js';
|
|
6
|
-
|
|
5
|
+
import { testProject1Path, testProjectFluentPath, testRepoPath, testUninstalledProjectPath, testWithReact16Path, testWithReact17Path, testWithUnmetDependenciesPath, testWithUnmetPeerDependenciesPath, } from '../src/testPaths.js';
|
|
6
|
+
import os from 'os';
|
|
7
|
+
import { v4 as uuid } from 'uuid';
|
|
8
|
+
import fsExtra from 'fs-extra';
|
|
9
|
+
import fs from 'fs';
|
|
10
|
+
import { writeJson } from '@ms-cloudpack/json-utilities';
|
|
11
|
+
import { fileURLToPath } from 'url';
|
|
12
|
+
const { ensureDir, rmdir } = fsExtra;
|
|
13
|
+
const { realpath } = fs.promises;
|
|
14
|
+
const createResolveMapSafe = async (options) => {
|
|
15
|
+
const resolveMap = await createResolveMap(options);
|
|
16
|
+
return filterJson(resolveMap, 'path', (oldPath) => {
|
|
17
|
+
return slash(path.relative(options.appPath, oldPath));
|
|
18
|
+
});
|
|
19
|
+
};
|
|
20
|
+
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
|
21
|
+
let tempFolderPath;
|
|
22
|
+
/*
|
|
23
|
+
* Helper which builds a temporary app install directory given a recursive array of [name, version, deps] recursive tuples.
|
|
24
|
+
*/
|
|
25
|
+
const constructDependencies = async (dependency, appPath = tempFolderPath) => {
|
|
26
|
+
const [name, version, deps] = dependency;
|
|
27
|
+
await ensureDir(appPath);
|
|
28
|
+
await writeJson(path.join(appPath, 'package.json'), {
|
|
29
|
+
name,
|
|
30
|
+
version,
|
|
31
|
+
dependencies: deps?.reduce((acc, [name, version]) => ({ ...acc, [name]: version }), {}),
|
|
32
|
+
});
|
|
33
|
+
if (deps) {
|
|
34
|
+
for (const dep of deps) {
|
|
35
|
+
await constructDependencies(dep, path.join(appPath, 'node_modules', dep[0]));
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return appPath;
|
|
39
|
+
};
|
|
7
40
|
describe('createResolveMap', () => {
|
|
41
|
+
beforeEach(async () => {
|
|
42
|
+
tempFolderPath = path.join(os.tmpdir(), uuid());
|
|
43
|
+
await ensureDir(tempFolderPath);
|
|
44
|
+
tempFolderPath = await realpath(tempFolderPath);
|
|
45
|
+
});
|
|
46
|
+
afterEach(async () => {
|
|
47
|
+
await rmdir(tempFolderPath, { recursive: true });
|
|
48
|
+
});
|
|
8
49
|
it('can create a resolve map', async () => {
|
|
9
50
|
expect(await createResolveMapSafe({ appPath: testProject1Path })).toMatchInlineSnapshot(`
|
|
10
51
|
Object {
|
|
11
52
|
"b": Object {
|
|
12
53
|
"name": "b",
|
|
13
54
|
"path": "node_modules/b",
|
|
14
|
-
"requiredBy":
|
|
15
|
-
"test-project-1@0.0.1",
|
|
16
|
-
|
|
55
|
+
"requiredBy": Object {
|
|
56
|
+
"test-project-1@0.0.1": "^1.0.0",
|
|
57
|
+
},
|
|
17
58
|
"version": "1.0.0",
|
|
18
59
|
},
|
|
19
60
|
"c": Object {
|
|
20
61
|
"name": "c",
|
|
21
62
|
"path": "node_modules/c",
|
|
22
|
-
"requiredBy":
|
|
23
|
-
"test-project-1@0.0.1",
|
|
24
|
-
|
|
63
|
+
"requiredBy": Object {
|
|
64
|
+
"test-project-1@0.0.1": "^1.0.0",
|
|
65
|
+
},
|
|
25
66
|
"version": "1.0.0",
|
|
26
67
|
},
|
|
27
68
|
"test-project-1": Object {
|
|
28
69
|
"name": "test-project-1",
|
|
29
70
|
"path": "",
|
|
30
|
-
"requiredBy":
|
|
71
|
+
"requiredBy": Object {},
|
|
31
72
|
"version": "0.0.1",
|
|
32
73
|
},
|
|
33
74
|
}
|
|
34
75
|
`);
|
|
35
76
|
});
|
|
77
|
+
it('can create a resolve map for a project with a fluent package', async () => {
|
|
78
|
+
expect(await createResolveMapSafe({ appPath: testProjectFluentPath })).toMatchInlineSnapshot(`
|
|
79
|
+
Object {
|
|
80
|
+
"@fluentui/react": Object {
|
|
81
|
+
"name": "@fluentui/react",
|
|
82
|
+
"path": "node_modules/@fluentui/react",
|
|
83
|
+
"requiredBy": Object {
|
|
84
|
+
"test-project-fluent@1.0.0": "^8.42.0",
|
|
85
|
+
},
|
|
86
|
+
"version": "8.82.1",
|
|
87
|
+
},
|
|
88
|
+
"@fluentui/theme": Object {
|
|
89
|
+
"name": "@fluentui/theme",
|
|
90
|
+
"path": "node_modules/@fluentui/theme",
|
|
91
|
+
"requiredBy": Object {
|
|
92
|
+
"@fluentui/react@8.82.1": "^2.6.7",
|
|
93
|
+
},
|
|
94
|
+
"version": "2.6.7",
|
|
95
|
+
},
|
|
96
|
+
"@fluentui/utilities": Object {
|
|
97
|
+
"name": "@fluentui/utilities",
|
|
98
|
+
"path": "node_modules/@fluentui/utilities",
|
|
99
|
+
"requiredBy": Object {
|
|
100
|
+
"@fluentui/react@8.82.1": "^8.9.0",
|
|
101
|
+
"@fluentui/theme@2.6.7": "^8.9.0",
|
|
102
|
+
},
|
|
103
|
+
"version": "8.9.0",
|
|
104
|
+
},
|
|
105
|
+
"test-project-fluent": Object {
|
|
106
|
+
"name": "test-project-fluent",
|
|
107
|
+
"path": "",
|
|
108
|
+
"requiredBy": Object {},
|
|
109
|
+
"version": "1.0.0",
|
|
110
|
+
},
|
|
111
|
+
}
|
|
112
|
+
`);
|
|
113
|
+
});
|
|
114
|
+
it('prefers react 18 when most depend on it', async () => {
|
|
115
|
+
expect(await createResolveMapSafe({
|
|
116
|
+
appPath: await constructDependencies([
|
|
117
|
+
'testApp',
|
|
118
|
+
'1.0.0',
|
|
119
|
+
[
|
|
120
|
+
['library-a', '1.0.0', [['react', '17.0.0']]],
|
|
121
|
+
['library-b', '1.0.0', [['react', '18.0.0']]],
|
|
122
|
+
['react', '18.0.0'],
|
|
123
|
+
],
|
|
124
|
+
]),
|
|
125
|
+
})).toMatchInlineSnapshot(`
|
|
126
|
+
Object {
|
|
127
|
+
"library-a": Object {
|
|
128
|
+
"name": "library-a",
|
|
129
|
+
"path": "node_modules/library-a",
|
|
130
|
+
"requiredBy": Object {
|
|
131
|
+
"testApp@1.0.0": "1.0.0",
|
|
132
|
+
},
|
|
133
|
+
"version": "1.0.0",
|
|
134
|
+
},
|
|
135
|
+
"library-b": Object {
|
|
136
|
+
"name": "library-b",
|
|
137
|
+
"path": "node_modules/library-b",
|
|
138
|
+
"requiredBy": Object {
|
|
139
|
+
"testApp@1.0.0": "1.0.0",
|
|
140
|
+
},
|
|
141
|
+
"version": "1.0.0",
|
|
142
|
+
},
|
|
143
|
+
"react": Object {
|
|
144
|
+
"name": "react",
|
|
145
|
+
"path": "node_modules/react",
|
|
146
|
+
"requiredBy": Object {
|
|
147
|
+
"library-b@1.0.0": "18.0.0",
|
|
148
|
+
"testApp@1.0.0": "18.0.0",
|
|
149
|
+
},
|
|
150
|
+
"scopedVersions": Object {
|
|
151
|
+
"17.0.0": Object {
|
|
152
|
+
"name": "react",
|
|
153
|
+
"path": "node_modules/library-a/node_modules/react",
|
|
154
|
+
"requiredBy": Object {
|
|
155
|
+
"library-a@1.0.0": "17.0.0",
|
|
156
|
+
},
|
|
157
|
+
"version": "17.0.0",
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
"version": "18.0.0",
|
|
161
|
+
},
|
|
162
|
+
"testApp": Object {
|
|
163
|
+
"name": "testApp",
|
|
164
|
+
"path": "",
|
|
165
|
+
"requiredBy": Object {},
|
|
166
|
+
"version": "1.0.0",
|
|
167
|
+
},
|
|
168
|
+
}
|
|
169
|
+
`);
|
|
170
|
+
});
|
|
171
|
+
it('prefers react 17 because it is most used transient dependency', async () => {
|
|
172
|
+
const resolveMap = await createResolveMapSafe({
|
|
173
|
+
appPath: await constructDependencies([
|
|
174
|
+
'testApp',
|
|
175
|
+
'1.0.0',
|
|
176
|
+
[
|
|
177
|
+
['library-a', '1.0.0', [['react', '17.0.0', []]]],
|
|
178
|
+
['library-b', '1.0.0', [['react', '17.0.0', []]]],
|
|
179
|
+
['library-c', '1.0.0', [['react', '18.0.0', []]]],
|
|
180
|
+
],
|
|
181
|
+
]),
|
|
182
|
+
});
|
|
183
|
+
expect(resolveMap['react'].version).toBe('17.0.0');
|
|
184
|
+
});
|
|
185
|
+
it('prefers react 18 because it is an app dependency', async () => {
|
|
186
|
+
const resolveMap = await createResolveMapSafe({
|
|
187
|
+
appPath: await constructDependencies([
|
|
188
|
+
'testApp',
|
|
189
|
+
'1.0.0',
|
|
190
|
+
[
|
|
191
|
+
['library-a', '1.0.0', [['react', '17.0.0', []]]],
|
|
192
|
+
['library-b', '1.0.0', [['react', '17.0.0', []]]],
|
|
193
|
+
['react', '18.0.0', []],
|
|
194
|
+
],
|
|
195
|
+
]),
|
|
196
|
+
});
|
|
197
|
+
expect(resolveMap['react'].version).toBe('18.0.0');
|
|
198
|
+
});
|
|
199
|
+
it('can support monorepo scenarios and resolve the repo react version', async () => {
|
|
200
|
+
expect(await createResolveMapSafe({
|
|
201
|
+
appPath: path.join(testRepoPath, 'packages/app-with-installed-react'),
|
|
202
|
+
gitRootPath: testRepoPath,
|
|
203
|
+
})).toMatchInlineSnapshot(`
|
|
204
|
+
Object {
|
|
205
|
+
"app-with-installed-react": Object {
|
|
206
|
+
"name": "app-with-installed-react",
|
|
207
|
+
"path": "",
|
|
208
|
+
"requiredBy": Object {},
|
|
209
|
+
"version": "1.0.0",
|
|
210
|
+
},
|
|
211
|
+
"react": Object {
|
|
212
|
+
"name": "react",
|
|
213
|
+
"path": "../../node_modules/react",
|
|
214
|
+
"requiredBy": Object {
|
|
215
|
+
"app-with-installed-react@1.0.0": "999.0.0",
|
|
216
|
+
},
|
|
217
|
+
"version": "999.0.0",
|
|
218
|
+
},
|
|
219
|
+
}
|
|
220
|
+
`);
|
|
221
|
+
});
|
|
222
|
+
it('can throw when the monorepo is missing a semver required version of react using strict versioning checks', async () => {
|
|
223
|
+
expect(createResolveMapSafe({
|
|
224
|
+
appPath: path.join(testRepoPath, 'packages/app-with-missing-react'),
|
|
225
|
+
gitRootPath: testRepoPath,
|
|
226
|
+
strictVersioning: true,
|
|
227
|
+
})).rejects.toBeTruthy();
|
|
228
|
+
});
|
|
229
|
+
it(`can throw an error if a dependency is missing`, async () => {
|
|
230
|
+
expect(createResolveMapSafe({
|
|
231
|
+
appPath: testUninstalledProjectPath,
|
|
232
|
+
gitRootPath: testUninstalledProjectPath,
|
|
233
|
+
})).rejects.toBeTruthy();
|
|
234
|
+
});
|
|
235
|
+
it(`can throw an error if appPath doesn't exist`, async () => {
|
|
236
|
+
expect(createResolveMapSafe({ appPath: path.join(testUninstalledProjectPath, 'does-not-exist') })).rejects.toBeTruthy();
|
|
237
|
+
});
|
|
238
|
+
it(`can throw an error if appPath exists but is missing package.json`, () => {
|
|
239
|
+
expect(createResolveMapSafe({ appPath: currentPath })).rejects.toBeTruthy();
|
|
240
|
+
});
|
|
241
|
+
// In this test, react-dom has a peer dependency on react, and should be listed in requiredBy. Otherwise
|
|
242
|
+
// when react-dom imports react, it will use the app's version (which is not what we want.)
|
|
243
|
+
it(`can prefer react 16 but scope react 17`, async () => {
|
|
244
|
+
expect(await createResolveMapSafe({ appPath: testWithReact16Path, additionalPaths: [testWithReact17Path] })).toMatchSnapshot();
|
|
245
|
+
});
|
|
246
|
+
it(`can prefer react 17 but scope react 16`, async () => {
|
|
247
|
+
expect(await createResolveMapSafe({ appPath: testWithReact17Path, additionalPaths: [testWithReact16Path] })).toMatchSnapshot();
|
|
248
|
+
});
|
|
249
|
+
// it(`can prefer app dependencies that align with library semver requirements`, () => { });
|
|
250
|
+
it(`can fail with an unmet dependency`, () => {
|
|
251
|
+
expect(createResolveMapSafe({
|
|
252
|
+
appPath: testWithUnmetDependenciesPath,
|
|
253
|
+
gitRootPath: testWithUnmetDependenciesPath,
|
|
254
|
+
})).rejects.toBeTruthy();
|
|
255
|
+
});
|
|
256
|
+
// Because repos depend on things which have unmet peers, we have to avoid failing when we can't resolve them.
|
|
257
|
+
it(`can succeed with unmet peer dependencies`, async () => {
|
|
258
|
+
expect(await createResolveMapSafe({
|
|
259
|
+
appPath: testWithUnmetPeerDependenciesPath,
|
|
260
|
+
gitRootPath: testWithUnmetPeerDependenciesPath,
|
|
261
|
+
})).toMatchSnapshot();
|
|
262
|
+
});
|
|
36
263
|
});
|
|
37
264
|
//# sourceMappingURL=createResolveMap.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createResolveMap.test.js","sourceRoot":"","sources":["../src/createResolveMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"createResolveMap.test.js","sourceRoot":"","sources":["../src/createResolveMap.test.ts"],"names":[],"mappings":"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"}
|
package/lib/detectModuleType.js
CHANGED
|
@@ -24,6 +24,13 @@ export async function detectModuleTypeFromSource(source) {
|
|
|
24
24
|
* @returns "esm" | "cjs" | undefined
|
|
25
25
|
*/
|
|
26
26
|
export async function detectModuleType(filePath) {
|
|
27
|
-
|
|
27
|
+
let source;
|
|
28
|
+
try {
|
|
29
|
+
source = await (await readFile(filePath, 'utf8')).toString();
|
|
30
|
+
}
|
|
31
|
+
catch (e) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
return await detectModuleTypeFromSource(removeComments(source));
|
|
28
35
|
}
|
|
29
36
|
//# sourceMappingURL=detectModuleType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detectModuleType.js","sourceRoot":"","sources":["../src/detectModuleType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,SAAS,cAAc,CAAC,MAAc;IACpC,kDAAkD;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB;AACjF,CAAC;AAID;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAc;IAC7D,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvC,IACE,OAAO,CAAC,KAAK,CACX,wGAAwG,CACzG,EACD;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE;QAClE,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IACrD,
|
|
1
|
+
{"version":3,"file":"detectModuleType.js","sourceRoot":"","sources":["../src/detectModuleType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,SAAS,cAAc,CAAC,MAAc;IACpC,kDAAkD;IAClD,OAAO,MAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,iBAAiB;AACjF,CAAC;AAID;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,MAAc;IAC7D,IAAI,MAA8B,CAAC;IAEnC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvC,IACE,OAAO,CAAC,KAAK,CACX,wGAAwG,CACzG,EACD;QACA,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,EAAE;QAClE,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IACrD,IAAI,MAAc,CAAC;IAEnB,IAAI;QACF,MAAM,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC9D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,MAAM,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { fileURLToPath } from 'url';
|
|
2
|
+
import { detectModuleType, detectModuleTypeFromSource } from './detectModuleType.js';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
const currentPath = path.dirname(fileURLToPath(import.meta.url));
|
|
2
5
|
describe('detectModuleTypeFromSource', () => {
|
|
3
6
|
it('can detect imports mean esm', async () => {
|
|
4
7
|
expect(await detectModuleTypeFromSource(`import react from 'react';`)).toBe('esm');
|
|
@@ -18,5 +21,8 @@ describe('detectModuleTypeFromSource', () => {
|
|
|
18
21
|
it('can detect no modules', async () => {
|
|
19
22
|
expect(await detectModuleTypeFromSource(`const hello = 'hello';`)).toBeUndefined();
|
|
20
23
|
});
|
|
24
|
+
it('can return undefined for missing source', async () => {
|
|
25
|
+
expect(await detectModuleType(path.join(currentPath, 'does-not-exist.js'))).toBeUndefined();
|
|
26
|
+
});
|
|
21
27
|
});
|
|
22
28
|
//# sourceMappingURL=detectModuleType.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detectModuleType.test.js","sourceRoot":"","sources":["../src/detectModuleType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"detectModuleType.test.js","sourceRoot":"","sources":["../src/detectModuleType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,2BAA2B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,CAAC,MAAM,0BAA0B,CAAC,8BAA8B,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,MAAM,0BAA0B,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,CAAC,MAAM,0BAA0B,CAAC,0DAA0D,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,CAAC,MAAM,0BAA0B,CAAC,wBAAwB,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -43,7 +43,6 @@ export async function evaluateImportsFromEntries(entries, resolveMap, allExports
|
|
|
43
43
|
// Skip entry file paths we've already visited.
|
|
44
44
|
while (entriesToEvaluate.length) {
|
|
45
45
|
const entry = entriesToEvaluate.shift();
|
|
46
|
-
console.log(`${entriesToEvaluate.length}: Adding ${entry}`);
|
|
47
46
|
if (visitedPaths.has(entry)) {
|
|
48
47
|
continue;
|
|
49
48
|
}
|
|
@@ -145,7 +144,6 @@ export async function evaluateImportsFromEntries(entries, resolveMap, allExports
|
|
|
145
144
|
// Not a package. Traverse source if needed.
|
|
146
145
|
const relativeSourcePath = resolveSource(path.resolve(path.dirname(entry), importValue));
|
|
147
146
|
if (relativeSourcePath) {
|
|
148
|
-
// console.log(`Adding ${relativeSourcePath}, "${importValue}"`);
|
|
149
147
|
addEntry(relativeSourcePath);
|
|
150
148
|
}
|
|
151
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateImportsFromEntries.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,WAAkC,MAAM,eAAe,CAAC;AAE/D,OAAO,WAA8B,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,8DAA8D;AAC9D,MAAM,QAAQ,GAAI,WAAmB,CAAC,OAAc,CAAC;AAgBrD,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAExE,SAAS,aAAa,CAAC,UAAkB;IACvC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE7C,IAAI,CAAC,WAAW,EAAE;QAChB,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE;YAClC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC,EAAE;gBACnC,OAAO,UAAU,GAAG,GAAG,CAAC;aACzB;SACF;KACF;SAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO,UAAU,CAAC;KACnB;AACH,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAiB,EACjB,UAAuB,EACvB,aAA6B,EAAE;IAE/B,MAAM,iBAAiB,GAAa,CAAC,GAAG,OAAO,CAAC,CAAC;IACjD,MAAM,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAE,EAAE;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE;YAC/E,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAClC;IACH,CAAC,CAAC;IACF,MAAM,KAAK,GAAoC;QAC7C,iBAAiB,EAAE,CAAC;QACpB,WAAW,EAAE,EAAE;QACf,aAAa,EAAE,CAAC;QAChB,cAAc,EAAE,CAAC;QACjB,kBAAkB,EAAE,EAAE;QACtB,wBAAwB,EAAE,EAAE;KAC7B,CAAC;IAEF,+CAA+C;IAC/C,OAAO,iBAAiB,CAAC,MAAM,EAAE;QAC/B,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,EAAY,CAAC;QAElD,
|
|
1
|
+
{"version":3,"file":"evaluateImportsFromEntries.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,36 @@ import { evaluateImportsFromEntries } from './evaluateImportsFromEntries.js';
|
|
|
3
3
|
import { testProject1Path } from '../src/testPaths.js';
|
|
4
4
|
describe('evaluateImportsFromEntries', () => {
|
|
5
5
|
it('can evaluate exports map', async () => {
|
|
6
|
-
expect(await evaluateImportsFromEntries([path.join(testProject1Path, 'src/index.ts')])).
|
|
6
|
+
expect(await evaluateImportsFromEntries([path.join(testProject1Path, 'src/index.ts')])).toMatchInlineSnapshot(`
|
|
7
|
+
Object {
|
|
8
|
+
"exports": Object {
|
|
9
|
+
"b": Object {
|
|
10
|
+
"1.0.0": Object {
|
|
11
|
+
".": Object {
|
|
12
|
+
"count": 1,
|
|
13
|
+
"import": "./index.js",
|
|
14
|
+
},
|
|
15
|
+
"./subpath": Object {
|
|
16
|
+
"count": 1,
|
|
17
|
+
"import": "./subpath.js",
|
|
18
|
+
},
|
|
19
|
+
"./subpath2": Object {
|
|
20
|
+
"count": 1,
|
|
21
|
+
"import": "./subpath2.js",
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
},
|
|
26
|
+
"stats": Object {
|
|
27
|
+
"parseErrors": Array [],
|
|
28
|
+
"parsedSourceFiles": 6,
|
|
29
|
+
"uniqueImports": 3,
|
|
30
|
+
"uniquePackages": 1,
|
|
31
|
+
"unresolvedPackageImports": Array [],
|
|
32
|
+
"unresolvedPackages": Array [],
|
|
33
|
+
},
|
|
34
|
+
}
|
|
35
|
+
`);
|
|
7
36
|
});
|
|
8
37
|
});
|
|
9
38
|
//# sourceMappingURL=evaluateImportsFromEntries.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateImportsFromEntries.test.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,CAAC,MAAM,0BAA0B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"evaluateImportsFromEntries.test.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,CAAC,MAAM,0BAA0B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6B7G,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/findPackagePath.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function findPackagePath(dependencyName: string, cwd: string): string
|
|
1
|
+
export declare function findPackagePath(dependencyName: string, versionRequirement: string | undefined, cwd: string, gitRootPath?: string, isOptional?: boolean): Promise<string | undefined>;
|
package/lib/findPackagePath.js
CHANGED
|
@@ -1,14 +1,22 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import fs from 'fs';
|
|
3
|
-
|
|
3
|
+
import semver from 'semver';
|
|
4
|
+
import { getPackageDefinition } from './getPackageDefinition.js';
|
|
5
|
+
const { realpath } = fs.promises;
|
|
6
|
+
export async function findPackagePath(dependencyName, versionRequirement, cwd, gitRootPath, isOptional) {
|
|
4
7
|
let packagePath = cwd;
|
|
5
|
-
|
|
8
|
+
do {
|
|
6
9
|
const resolvedPath = path.join(packagePath, 'node_modules', dependencyName);
|
|
7
|
-
|
|
8
|
-
|
|
10
|
+
const definition = await getPackageDefinition(resolvedPath, true);
|
|
11
|
+
if (definition?.version && (!versionRequirement || semver.satisfies(definition.version, versionRequirement))) {
|
|
12
|
+
return await realpath(resolvedPath);
|
|
9
13
|
}
|
|
14
|
+
// We haven't found it. Try to move up a directory.
|
|
10
15
|
packagePath = path.dirname(packagePath);
|
|
16
|
+
} while ((!gitRootPath || packagePath.length >= gitRootPath.length) && path.dirname(packagePath) !== packagePath);
|
|
17
|
+
if (!isOptional) {
|
|
18
|
+
throw new Error(`Could not resolve dependency "${dependencyName}@${versionRequirement}" from "${cwd}"`);
|
|
11
19
|
}
|
|
12
|
-
|
|
20
|
+
return undefined;
|
|
13
21
|
}
|
|
14
22
|
//# sourceMappingURL=findPackagePath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"findPackagePath.js","sourceRoot":"","sources":["../src/findPackagePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"findPackagePath.js","sourceRoot":"","sources":["../src/findPackagePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,cAAsB,EACtB,kBAAsC,EACtC,GAAW,EACX,WAAoB,EACpB,UAAoB;IAEpB,IAAI,WAAW,GAAG,GAAG,CAAC;IAEtB,GAAG;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAElE,IAAI,UAAU,EAAE,OAAO,IAAI,CAAC,CAAC,kBAAkB,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,EAAE;YAC5G,OAAO,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;SACrC;QAED,mDAAmD;QACnD,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACzC,QAAQ,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,WAAW,EAAE;IAElH,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,cAAc,IAAI,kBAAkB,WAAW,GAAG,GAAG,CAAC,CAAC;KACzG;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)
|
|
3
3
|
*/
|
|
4
|
-
export function getExportPathFromEntry(exportEntry, importPath = '.', conditions = ['browser', 'import', 'default']) {
|
|
4
|
+
export function getExportPathFromEntry(exportEntry, importPath = '.', conditions = ['browser', 'import', 'module', 'default']) {
|
|
5
5
|
let exportPath = undefined;
|
|
6
6
|
if (exportEntry) {
|
|
7
7
|
if (typeof exportEntry === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAAmC,EACnC,UAAU,GAAG,GAAG,EAChB,UAAU,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,WAAmC,EACnC,UAAU,GAAG,GAAG,EAChB,UAAU,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC;IAEvD,IAAI,UAAU,GAAG,SAAS,CAAC;IAE3B,IAAI,WAAW,EAAE;QACf,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,OAAO,WAAW,CAAC;SACpB;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBAC9B,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;oBAC9B,UAAU,GAAG,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;oBAClE,IAAI,UAAU,EAAE;wBACd,OAAO,UAAU,CAAC;qBACnB;iBACF;aACF;iBAAM;gBACL,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBACtD,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,UAAU,EAAE;wBAClD,UAAU,GAAG,sBAAsB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;wBACnE,IAAI,UAAU,EAAE;4BACd,OAAO,UAAU,CAAC;yBACnB;qBACF;iBACF;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -11,6 +11,13 @@ describe('getExportPathFromEntry', () => {
|
|
|
11
11
|
require: 'require',
|
|
12
12
|
})).toEqual('browser');
|
|
13
13
|
});
|
|
14
|
+
it('prioritizes module over others', () => {
|
|
15
|
+
expect(getExportPathFromEntry({
|
|
16
|
+
module: 'module',
|
|
17
|
+
default: 'default',
|
|
18
|
+
require: 'require',
|
|
19
|
+
})).toEqual('module');
|
|
20
|
+
});
|
|
14
21
|
it('falls back to import path if browser is missing', () => {
|
|
15
22
|
expect(getExportPathFromEntry({
|
|
16
23
|
import: 'import',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportPathFromEntry.test.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CACJ,sBAAsB,CAAC;YACrB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CACJ,sBAAsB,CACpB;YACE,GAAG,EAAE;gBACH,MAAM,EAAE,gBAAgB;aACzB;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,cAAc;aACvB;SACF,EACD,OAAO,CACR,CACF,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"getExportPathFromEntry.test.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CACJ,sBAAsB,CAAC;YACrB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,CACJ,sBAAsB,CAAC;YACrB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CACJ,sBAAsB,CAAC;YACrB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB,CAAC,CACH,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CACJ,sBAAsB,CACpB;YACE,GAAG,EAAE;gBACH,MAAM,EAAE,gBAAgB;aACzB;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,cAAc;aACvB;SACF,EACD,OAAO,CACR,CACF,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/resolve.d.ts
CHANGED
|
@@ -1 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolves a package path given the parent path.
|
|
3
|
+
* @param packageName - The package name.
|
|
4
|
+
* @param parentPath - The parent path.
|
|
5
|
+
* @returns The resolved absolute package path.
|
|
6
|
+
*/
|
|
1
7
|
export declare function resolve(packageName: string, parentPath: string): Promise<string | undefined>;
|
package/lib/resolve.js
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import resolvePackage from 'resolve';
|
|
3
|
+
/**
|
|
4
|
+
* Resolves a package path given the parent path.
|
|
5
|
+
* @param packageName - The package name.
|
|
6
|
+
* @param parentPath - The parent path.
|
|
7
|
+
* @returns The resolved absolute package path.
|
|
8
|
+
*/
|
|
3
9
|
export async function resolve(packageName, parentPath) {
|
|
4
10
|
const packageRootImport = path.join(packageName, 'package.json');
|
|
5
11
|
return new Promise((success) => {
|
package/lib/resolve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,WAAmB,EAAE,UAAkB;IACnE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAEjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI;YACF,cAAc,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;gBACxG,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE;oBACxB,OAAO,CAAC,SAAS,CAAC,CAAC;iBACpB;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,SAAS,CAAC,CAAC;SACpB;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,WAAmB,EAAE,UAAkB;IACnE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAEjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI;YACF,cAAc,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;gBACxG,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE;oBACxB,OAAO,CAAC,SAAS,CAAC,CAAC;iBACpB;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,SAAS,CAAC,CAAC;SACpB;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/lib/resolve.test.js
CHANGED
|
@@ -5,7 +5,7 @@ describe('resolve', () => {
|
|
|
5
5
|
it('finds an installed path to a package', async () => {
|
|
6
6
|
expect(await resolve('@ms-cloudpack/path-utilities', currentPath)).toContain('path-utilities');
|
|
7
7
|
});
|
|
8
|
-
it('returns undefined for
|
|
8
|
+
it('returns undefined for missing packages', async () => {
|
|
9
9
|
expect(await resolve('@ms-cloudpack/does-not-exist', currentPath)).toBeUndefined();
|
|
10
10
|
});
|
|
11
11
|
});
|
|
@@ -10,7 +10,6 @@ import { isExternalPackage } from './isExternalPackage.js';
|
|
|
10
10
|
export async function resolveImportFromPackagePath(packagePath, requestedPath, options = {}) {
|
|
11
11
|
const packageDefinition = await getPackageDefinition(packagePath);
|
|
12
12
|
if (!packageDefinition) {
|
|
13
|
-
console.log(`Couldn't load definition for "${packagePath}"`);
|
|
14
13
|
return requestedPath;
|
|
15
14
|
}
|
|
16
15
|
return resolveImportFromPackage(packagePath, packageDefinition, requestedPath, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveImportFromPackagePath.js","sourceRoot":"","sources":["../src/resolveImportFromPackagePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAc3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,WAAmB,EACnB,aAAsB,EACtB,UAA2C,EAAE;IAE7C,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,
|
|
1
|
+
{"version":3,"file":"resolveImportFromPackagePath.js","sourceRoot":"","sources":["../src/resolveImportFromPackagePath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,35 +1,31 @@
|
|
|
1
1
|
import { getExportPathFromEntry } from './getExportPathFromEntry.js';
|
|
2
2
|
export function resolvePackageEntries(packageDefinition) {
|
|
3
3
|
const entries = new Set();
|
|
4
|
+
const { browser, exports } = packageDefinition;
|
|
4
5
|
// if exports are available, leverage them.
|
|
5
|
-
if (
|
|
6
|
-
for (const entry of Object.values(
|
|
6
|
+
if (exports) {
|
|
7
|
+
for (const entry of Object.values(exports)) {
|
|
7
8
|
const entryPath = getExportPathFromEntry(entry);
|
|
8
9
|
if (entryPath) {
|
|
9
10
|
entries.add(entryPath);
|
|
10
11
|
}
|
|
11
12
|
}
|
|
12
13
|
}
|
|
14
|
+
else if (typeof browser === 'string') {
|
|
15
|
+
entries.add(browser);
|
|
16
|
+
}
|
|
13
17
|
else {
|
|
14
18
|
const defaultEntryPath = packageDefinition.module || packageDefinition.main || './index.js';
|
|
15
19
|
if (defaultEntryPath) {
|
|
16
20
|
entries.add(defaultEntryPath);
|
|
17
21
|
}
|
|
18
22
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
case 'string':
|
|
24
|
-
entries.add(browser);
|
|
25
|
-
break;
|
|
26
|
-
case 'object':
|
|
27
|
-
for (const [fromPath, toPath] of Object.entries(browser)) {
|
|
28
|
-
if (entries.has(fromPath) && toPath) {
|
|
29
|
-
entries.add(toPath);
|
|
30
|
-
}
|
|
23
|
+
if (typeof browser === 'object') {
|
|
24
|
+
for (const [fromPath, toPath] of Object.entries(browser)) {
|
|
25
|
+
if (entries.has(fromPath) && toPath) {
|
|
26
|
+
entries.add(toPath);
|
|
31
27
|
}
|
|
32
|
-
|
|
28
|
+
}
|
|
33
29
|
}
|
|
34
30
|
return Array.from(entries);
|
|
35
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvePackageEntries.js","sourceRoot":"","sources":["../src/resolvePackageEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,MAAM,UAAU,qBAAqB,CAAC,iBAA8B;IAClE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"resolvePackageEntries.js","sourceRoot":"","sources":["../src/resolvePackageEntries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,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,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YAC1C,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAEhD,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aACxB;SACF;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,gBAAgB,CAAC,CAAC;SAC/B;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,MAAM,CAAC,CAAC;aACrB;SACF;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { getPackageDefinition } from './getPackageDefinition.js';
|
|
1
2
|
import { resolvePackageEntries } from './resolvePackageEntries.js';
|
|
3
|
+
import { testNodeFetchPath } from './testPaths.js';
|
|
2
4
|
const defaultPackage = {
|
|
3
5
|
name: 'default',
|
|
4
6
|
version: '1.0.0',
|
|
@@ -74,5 +76,10 @@ describe('resolvePackageEntries', () => {
|
|
|
74
76
|
},
|
|
75
77
|
})).toEqual(['./lib/index.js']);
|
|
76
78
|
});
|
|
79
|
+
it('can resolve node-fetch entries', async () => {
|
|
80
|
+
expect(resolvePackageEntries((await getPackageDefinition(testNodeFetchPath)))).toEqual([
|
|
81
|
+
'./browser.js',
|
|
82
|
+
]);
|
|
83
|
+
});
|
|
77
84
|
});
|
|
78
85
|
//# sourceMappingURL=resolvePackageEntries.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvePackageEntries.test.js","sourceRoot":"","sources":["../src/resolvePackageEntries.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"resolvePackageEntries.test.js","sourceRoot":"","sources":["../src/resolvePackageEntries.test.ts"],"names":[],"mappings":"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"}
|
package/lib/testPaths.d.ts
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
1
|
export declare const testScenariosPath: string;
|
|
2
2
|
export declare const testProject1Path: string;
|
|
3
3
|
export declare const testProject2Path: string;
|
|
4
|
+
export declare const testProjectFluentPath: string;
|
|
5
|
+
export declare const testUninstalledProjectPath: string;
|
|
6
|
+
export declare const testRepoPath: string;
|
|
7
|
+
export declare const testWithReact16Path: string;
|
|
8
|
+
export declare const testWithReact17Path: string;
|
|
9
|
+
export declare const testWithUnmetDependenciesPath: string;
|
|
10
|
+
export declare const testWithUnmetPeerDependenciesPath: string;
|
|
11
|
+
export declare const testNodeFetchPath: string;
|
package/lib/testPaths.js
CHANGED
|
@@ -3,4 +3,12 @@ import path from 'path';
|
|
|
3
3
|
export const testScenariosPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../test-scenarios');
|
|
4
4
|
export const testProject1Path = path.resolve(testScenariosPath, 'test-project-1');
|
|
5
5
|
export const testProject2Path = path.join(testScenariosPath, 'test-project-2');
|
|
6
|
+
export const testProjectFluentPath = path.join(testScenariosPath, 'test-project-fluent');
|
|
7
|
+
export const testUninstalledProjectPath = path.join(testScenariosPath, 'test-uninstalled-project');
|
|
8
|
+
export const testRepoPath = path.join(testScenariosPath, 'test-repo');
|
|
9
|
+
export const testWithReact16Path = path.join(testScenariosPath, 'test-with-react-16');
|
|
10
|
+
export const testWithReact17Path = path.join(testScenariosPath, 'test-with-react-17');
|
|
11
|
+
export const testWithUnmetDependenciesPath = path.join(testScenariosPath, 'test-with-unmet-dependencies');
|
|
12
|
+
export const testWithUnmetPeerDependenciesPath = path.join(testScenariosPath, 'test-with-unmet-peer-dependencies');
|
|
13
|
+
export const testNodeFetchPath = path.join(testScenariosPath, 'node-fetch');
|
|
6
14
|
//# sourceMappingURL=testPaths.js.map
|
package/lib/testPaths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testPaths.js","sourceRoot":"","sources":["../src/testPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;AACjH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"testPaths.js","sourceRoot":"","sources":["../src/testPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;AACjH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;AAClF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;AACzF,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,0BAA0B,CAAC,CAAC;AACnG,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;AACtE,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;AACtF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;AACtF,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,8BAA8B,CAAC,CAAC;AAC1G,MAAM,CAAC,MAAM,iCAAiC,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,mCAAmC,CAAC,CAAC;AACnH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC"}
|
package/lib/tsdoc-metadata.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/package-utilities",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.1",
|
|
4
4
|
"description": "Utilities for resolving/parsing packages and their imports.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@ms-cloudpack/scripts": "*",
|
|
25
25
|
"@ms-cloudpack/eslint-config-base": "*",
|
|
26
26
|
"@types/resolve": "1.20.2",
|
|
27
|
-
"@babel/types": "7.18.
|
|
27
|
+
"@babel/types": "7.18.10"
|
|
28
28
|
},
|
|
29
29
|
"scripts": {
|
|
30
30
|
"api:update": "cloudpack-scripts api-update",
|