@ms-cloudpack/package-utilities 0.4.0 → 0.5.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 +88 -1
- package/CHANGELOG.md +28 -2
- package/lib/createImportMap.d.ts +2 -2
- package/lib/createImportMap.js +3 -2
- package/lib/createImportMap.js.map +1 -1
- package/lib/createImportMap.test.js.map +1 -1
- package/lib/createResolveMap.js +3 -3
- package/lib/createResolveMap.js.map +1 -1
- package/lib/evaluateImportsFromEntries.js +2 -2
- package/lib/evaluateImportsFromEntries.js.map +1 -1
- package/lib/getExportPathFromEntry.d.ts +2 -2
- package/lib/getExportPathFromEntry.js +15 -9
- package/lib/getExportPathFromEntry.js.map +1 -1
- package/lib/getExportPathFromEntry.test.js +8 -6
- package/lib/getExportPathFromEntry.test.js.map +1 -1
- package/lib/getInstalledPackages.d.ts +2 -2
- package/lib/getInstalledPackages.js +4 -4
- package/lib/getInstalledPackages.js.map +1 -1
- package/lib/getPackageDefinition.d.ts +3 -19
- package/lib/getPackageDefinition.js +5 -4
- package/lib/getPackageDefinition.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js.map +1 -1
- package/lib/resolveImportFromPackage.test.js +18 -24
- package/lib/resolveImportFromPackage.test.js.map +1 -1
- package/lib/resolveImportFromPackagePath.d.ts +3 -3
- package/lib/resolveImportFromPackagePath.js +28 -34
- package/lib/resolveImportFromPackagePath.js.map +1 -1
- package/lib/resolvePackageEntries.d.ts +2 -2
- package/lib/resolvePackageEntries.js +2 -2
- package/lib/resolvePackageEntries.js.map +1 -1
- package/lib/tsdoc-metadata.json +11 -0
- package/package.json +5 -3
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,94 @@
|
|
|
2
2
|
"name": "@ms-cloudpack/package-utilities",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Tue, 02 Aug 2022 20:04:01 GMT",
|
|
6
|
+
"tag": "@ms-cloudpack/package-utilities_v0.5.1",
|
|
7
|
+
"version": "0.5.1",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "renovate@whitesourcesoftware.com",
|
|
12
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
13
|
+
"commit": "2067bfc6ac5b5c388490e9cf83f272035602d9d0",
|
|
14
|
+
"comment": "Update babel monorepo to v7.18.10"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Wed, 29 Jun 2022 02:39:15 GMT",
|
|
21
|
+
"tag": "@ms-cloudpack/package-utilities_v0.5.0",
|
|
22
|
+
"version": "0.5.0",
|
|
23
|
+
"comments": {
|
|
24
|
+
"none": [
|
|
25
|
+
{
|
|
26
|
+
"author": "renovate@whitesourcesoftware.com",
|
|
27
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
28
|
+
"commit": "1c1e55233833b23205c5ddcd7c65694f9ec54707",
|
|
29
|
+
"comment": "Update babel monorepo"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Wed, 08 Jun 2022 20:07:00 GMT",
|
|
36
|
+
"tag": "@ms-cloudpack/package-utilities_v0.5.0",
|
|
37
|
+
"version": "0.5.0",
|
|
38
|
+
"comments": {
|
|
39
|
+
"minor": [
|
|
40
|
+
{
|
|
41
|
+
"author": "dzearing@microsoft.com",
|
|
42
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
43
|
+
"commit": "0e78dd2f1cf4d366f04d52d54996418c4febcfb6",
|
|
44
|
+
"comment": "Moving to type-fest for package.json typings. Updated a number of APIs to reflect changes."
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
"author": "beachball",
|
|
48
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
49
|
+
"comment": "Bump @ms-cloudpack/package-overrides to v0.0.2",
|
|
50
|
+
"commit": "0e78dd2f1cf4d366f04d52d54996418c4febcfb6"
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
"author": "beachball",
|
|
54
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
55
|
+
"comment": "Bump @ms-cloudpack/path-utilities to v0.3.1",
|
|
56
|
+
"commit": "0e78dd2f1cf4d366f04d52d54996418c4febcfb6"
|
|
57
|
+
}
|
|
58
|
+
]
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
"date": "Fri, 03 Jun 2022 21:51:54 GMT",
|
|
63
|
+
"tag": "@ms-cloudpack/package-utilities_v0.4.1",
|
|
64
|
+
"version": "0.4.1",
|
|
65
|
+
"comments": {
|
|
66
|
+
"none": [
|
|
67
|
+
{
|
|
68
|
+
"author": "bot@renovateapp.com",
|
|
69
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
70
|
+
"commit": "11b9afd08b8b36df3f88d56d2469186e2ede9796",
|
|
71
|
+
"comment": "Update dev dependency @babel/types to v7.18.4"
|
|
72
|
+
}
|
|
73
|
+
]
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
"date": "Thu, 26 May 2022 02:50:21 GMT",
|
|
78
|
+
"tag": "@ms-cloudpack/package-utilities_v0.4.1",
|
|
79
|
+
"version": "0.4.1",
|
|
80
|
+
"comments": {
|
|
81
|
+
"patch": [
|
|
82
|
+
{
|
|
83
|
+
"author": "bot@renovateapp.com",
|
|
84
|
+
"package": "@ms-cloudpack/package-utilities",
|
|
85
|
+
"commit": "b50a4c1bf77e6c76ee8e148650ef2173df4a0ae2",
|
|
86
|
+
"comment": "Update babel monorepo to v7.18.2"
|
|
87
|
+
}
|
|
88
|
+
]
|
|
89
|
+
}
|
|
90
|
+
},
|
|
91
|
+
{
|
|
92
|
+
"date": "Wed, 25 May 2022 21:40:45 GMT",
|
|
6
93
|
"tag": "@ms-cloudpack/package-utilities_v0.4.0",
|
|
7
94
|
"version": "0.4.0",
|
|
8
95
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,38 @@
|
|
|
1
1
|
# Change Log - @ms-cloudpack/package-utilities
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Tue, 02 Aug 2022 20:04:01 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.5.1
|
|
8
|
+
|
|
9
|
+
Tue, 02 Aug 2022 20:04:01 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Update babel monorepo to v7.18.10 (renovate@whitesourcesoftware.com)
|
|
14
|
+
|
|
15
|
+
## 0.5.0
|
|
16
|
+
|
|
17
|
+
Wed, 08 Jun 2022 20:07:00 GMT
|
|
18
|
+
|
|
19
|
+
### Minor changes
|
|
20
|
+
|
|
21
|
+
- Moving to type-fest for package.json typings. Updated a number of APIs to reflect changes. (dzearing@microsoft.com)
|
|
22
|
+
- Bump @ms-cloudpack/package-overrides to v0.0.2
|
|
23
|
+
- Bump @ms-cloudpack/path-utilities to v0.3.1
|
|
24
|
+
|
|
25
|
+
## 0.4.1
|
|
26
|
+
|
|
27
|
+
Thu, 26 May 2022 02:50:21 GMT
|
|
28
|
+
|
|
29
|
+
### Patches
|
|
30
|
+
|
|
31
|
+
- Update babel monorepo to v7.18.2 (bot@renovateapp.com)
|
|
32
|
+
|
|
7
33
|
## 0.4.0
|
|
8
34
|
|
|
9
|
-
Wed, 25 May 2022 21:40:
|
|
35
|
+
Wed, 25 May 2022 21:40:45 GMT
|
|
10
36
|
|
|
11
37
|
### Minor changes
|
|
12
38
|
|
package/lib/createImportMap.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ResolveMap } from './createResolveMap.js';
|
|
2
|
-
import {
|
|
2
|
+
import type { PackageJson } from 'type-fest';
|
|
3
3
|
export interface ImportMap {
|
|
4
4
|
imports: Record<string, string>;
|
|
5
5
|
scopes?: Record<string, Record<string, string>>;
|
|
6
6
|
}
|
|
7
|
-
export declare function createImportMap(resolveMap: ResolveMap, bundleServerUrl: string, packageDefinitions?: Record<string,
|
|
7
|
+
export declare function createImportMap(resolveMap: ResolveMap, bundleServerUrl: string, packageDefinitions?: Record<string, PackageJson>): Promise<ImportMap>;
|
package/lib/createImportMap.js
CHANGED
|
@@ -26,10 +26,11 @@ async function getImportMapFromEntry(entry, bundleServerUrl, packageDefinitions)
|
|
|
26
26
|
const importMap = {};
|
|
27
27
|
const definition = packageDefinitions?.[entry.path] || (await getPackageDefinition(entry.path, true));
|
|
28
28
|
if (definition) {
|
|
29
|
+
const { name = '' } = definition;
|
|
29
30
|
const baseUrl = `${bundleServerUrl}/${definition.name}@${definition.version}/`;
|
|
30
31
|
if (definition.exports) {
|
|
31
32
|
for (const [exportKey, exportEntry] of Object.entries(definition.exports)) {
|
|
32
|
-
const importAlias = slash(path.join(
|
|
33
|
+
const importAlias = slash(path.join(name, exportKey));
|
|
33
34
|
if (!importMap[importAlias]) {
|
|
34
35
|
const exportPath = getExportPathFromEntry(exportEntry);
|
|
35
36
|
if (exportPath) {
|
|
@@ -39,7 +40,7 @@ async function getImportMapFromEntry(entry, bundleServerUrl, packageDefinitions)
|
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
else {
|
|
42
|
-
importMap[
|
|
43
|
+
importMap[name] = new URL(definition.module || definition.main || 'index.js', baseUrl).href;
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
return importMap;
|
|
@@ -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,
|
|
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;oBACjD,MAAM,aAAa,GAAG,GAAG,eAAe,IAAI,YAAY,GAAG,CAAC;oBAC5D,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,qBAAqB,CAC3D,WAAW,EACX,eAAe,EACf,kBAAkB,CACnB,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createImportMap.test.js","sourceRoot":"","sources":["../src/createImportMap.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvD,MAAM,eAAe,GAAG,wBAAwB,CAAC;AACjD,MAAM,oBAAoB,GAAoB,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;AAE9G,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,UAAU,GAAe;YAC7B,CAAC,EAAE,oBAAoB;SACxB,CAAC;QACF,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"createImportMap.test.js","sourceRoot":"","sources":["../src/createImportMap.test.ts"],"names":[],"mappings":"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"}
|
package/lib/createResolveMap.js
CHANGED
|
@@ -10,14 +10,14 @@ export async function createResolveMap(options) {
|
|
|
10
10
|
const packagePath = pathsToVisit.shift();
|
|
11
11
|
if (packagePath) {
|
|
12
12
|
const definition = await getPackageDefinition(packagePath, true);
|
|
13
|
-
if (definition) {
|
|
13
|
+
if (definition && definition.name && definition.version) {
|
|
14
14
|
const packageId = `${definition.name}@${definition.version}`;
|
|
15
15
|
const namedEntries = (allEntries[_a = definition.name] ?? (allEntries[_a] = {}));
|
|
16
16
|
namedEntries[_b = definition.version] ?? (namedEntries[_b] = createMapEntry(definition, packagePath));
|
|
17
17
|
for (const depName of Object.keys(definition?.dependencies || {})) {
|
|
18
18
|
const dependencyPath = findPackagePath(depName, packagePath);
|
|
19
19
|
const dependencyDefinition = await getPackageDefinition(dependencyPath, true);
|
|
20
|
-
if (dependencyDefinition) {
|
|
20
|
+
if (dependencyDefinition && dependencyDefinition.name && dependencyDefinition.version) {
|
|
21
21
|
const dependencyNamedEntries = (allEntries[_c = dependencyDefinition.name] ?? (allEntries[_c] = {}));
|
|
22
22
|
const dependencyEntry = (dependencyNamedEntries[_d = dependencyDefinition.version] ?? (dependencyNamedEntries[_d] = createMapEntry(dependencyDefinition, dependencyPath)));
|
|
23
23
|
dependencyEntry.requiredBy.add(packageId);
|
|
@@ -52,7 +52,7 @@ export async function createResolveMap(options) {
|
|
|
52
52
|
return resolveMap;
|
|
53
53
|
}
|
|
54
54
|
function createMapEntry(packageDefinition, packagePath) {
|
|
55
|
-
const { name, version } = packageDefinition;
|
|
55
|
+
const { name = '', version = '' } = packageDefinition;
|
|
56
56
|
return {
|
|
57
57
|
name,
|
|
58
58
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../src/createResolveMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"createResolveMap.js","sourceRoot":"","sources":["../src/createResolveMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -129,8 +129,8 @@ export async function evaluateImportsFromEntries(entries, resolveMap, allExports
|
|
|
129
129
|
count: 0,
|
|
130
130
|
};
|
|
131
131
|
}
|
|
132
|
-
if (fs.existsSync(fullPath)) {
|
|
133
|
-
importDefinition.import =
|
|
132
|
+
if (fullPath && fs.existsSync(fullPath)) {
|
|
133
|
+
importDefinition.import = relativeImportPath;
|
|
134
134
|
addEntry(fullPath);
|
|
135
135
|
}
|
|
136
136
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluateImportsFromEntries.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"evaluateImportsFromEntries.js","sourceRoot":"","sources":["../src/evaluateImportsFromEntries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
2
|
/**
|
|
3
3
|
* Given an export map entry, return the esm entry string value. (Parses arrays, maps, has a fallback system.)
|
|
4
4
|
*/
|
|
5
|
-
export declare function getExportPathFromEntry(exportEntry:
|
|
5
|
+
export declare function getExportPathFromEntry(exportEntry: PackageJson['exports'], importPath?: string, conditions?: string[]): string | undefined;
|
|
@@ -1,27 +1,33 @@
|
|
|
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) {
|
|
4
|
+
export function getExportPathFromEntry(exportEntry, importPath = '.', conditions = ['browser', 'import', 'default']) {
|
|
5
5
|
let exportPath = undefined;
|
|
6
6
|
if (exportEntry) {
|
|
7
7
|
if (typeof exportEntry === 'string') {
|
|
8
|
-
|
|
8
|
+
return exportEntry;
|
|
9
9
|
}
|
|
10
10
|
else if (typeof exportEntry === 'object') {
|
|
11
11
|
if (Array.isArray(exportEntry)) {
|
|
12
|
-
for (const
|
|
13
|
-
|
|
14
|
-
if (
|
|
15
|
-
exportPath
|
|
16
|
-
break;
|
|
12
|
+
for (const item of exportEntry) {
|
|
13
|
+
exportPath = getExportPathFromEntry(item, importPath, conditions);
|
|
14
|
+
if (exportPath) {
|
|
15
|
+
return exportPath;
|
|
17
16
|
}
|
|
18
17
|
}
|
|
19
18
|
}
|
|
20
19
|
else {
|
|
21
|
-
|
|
20
|
+
for (const [key, value] of Object.entries(exportEntry)) {
|
|
21
|
+
if (conditions.includes(key) || key === importPath) {
|
|
22
|
+
exportPath = getExportPathFromEntry(value, importPath, conditions);
|
|
23
|
+
if (exportPath) {
|
|
24
|
+
return exportPath;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
22
28
|
}
|
|
23
29
|
}
|
|
24
30
|
}
|
|
25
|
-
return
|
|
31
|
+
return undefined;
|
|
26
32
|
}
|
|
27
33
|
//# sourceMappingURL=getExportPathFromEntry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportPathFromEntry.js","sourceRoot":"","sources":["../src/getExportPathFromEntry.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,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,SAAS,CAAC;IAE7C,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"}
|
|
@@ -24,13 +24,15 @@ describe('getExportPathFromEntry', () => {
|
|
|
24
24
|
require: 'require',
|
|
25
25
|
})).toEqual('default');
|
|
26
26
|
});
|
|
27
|
-
it('
|
|
28
|
-
expect(getExportPathFromEntry(
|
|
29
|
-
{
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
it('can find a specific path entry', () => {
|
|
28
|
+
expect(getExportPathFromEntry({
|
|
29
|
+
'.': {
|
|
30
|
+
import: './lib/index.js',
|
|
31
|
+
},
|
|
32
|
+
'./foo': {
|
|
33
|
+
import: './lib/foo.js',
|
|
32
34
|
},
|
|
33
|
-
|
|
35
|
+
}, './foo')).toEqual('./lib/foo.js');
|
|
34
36
|
});
|
|
35
37
|
});
|
|
36
38
|
//# sourceMappingURL=getExportPathFromEntry.test.js.map
|
|
@@ -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,
|
|
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,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
2
|
export declare type PackageReference = {
|
|
3
3
|
name: string;
|
|
4
4
|
version: string;
|
|
@@ -41,4 +41,4 @@ export declare type InstalledPackagesResult = {
|
|
|
41
41
|
* }
|
|
42
42
|
*
|
|
43
43
|
*/
|
|
44
|
-
export declare function getInstalledPackages(appPaths: string | string[], installedPackages?: InstalledPackagesResult['installedPackages'], ancestors?: PackageReference[], visited?: Record<string,
|
|
44
|
+
export declare function getInstalledPackages(appPaths: string | string[], installedPackages?: InstalledPackagesResult['installedPackages'], ancestors?: PackageReference[], visited?: Record<string, PackageJson>): Promise<InstalledPackagesResult>;
|
|
@@ -26,7 +26,7 @@ export async function getInstalledPackages(appPaths, installedPackages = {}, anc
|
|
|
26
26
|
appPaths = Array.isArray(appPaths) ? appPaths : [appPaths];
|
|
27
27
|
for (const appPath of appPaths) {
|
|
28
28
|
const definition = await getPackageDefinition(appPath, true);
|
|
29
|
-
if (definition?.dependencies) {
|
|
29
|
+
if (definition?.dependencies && definition.name && definition.version) {
|
|
30
30
|
for (const [dependencyName, requiredVersion] of Object.entries(definition.dependencies)) {
|
|
31
31
|
// Grab the path to the dependency.
|
|
32
32
|
const dependencyPath = await resolve(dependencyName, appPath);
|
|
@@ -36,7 +36,7 @@ export async function getInstalledPackages(appPaths, installedPackages = {}, anc
|
|
|
36
36
|
if (!dependencyDefinition) {
|
|
37
37
|
throw new Error(`Unable to resolve dependency at path "${dependencyPath}"`);
|
|
38
38
|
}
|
|
39
|
-
const { version: dependencyVersion } = dependencyDefinition;
|
|
39
|
+
const { version: dependencyVersion = '' } = dependencyDefinition;
|
|
40
40
|
// Ensure that the entry in the results is initialized.
|
|
41
41
|
installedPackages[dependencyName] = installedPackages[dependencyName] || {};
|
|
42
42
|
installedPackages[dependencyName][dependencyVersion] = installedPackages[dependencyName][dependencyVersion] || {
|
|
@@ -56,8 +56,8 @@ export async function getInstalledPackages(appPaths, installedPackages = {}, anc
|
|
|
56
56
|
await getInstalledPackages(dependencyPath, installedPackages, [
|
|
57
57
|
...ancestors,
|
|
58
58
|
{
|
|
59
|
-
name:
|
|
60
|
-
version:
|
|
59
|
+
name: dependencyName,
|
|
60
|
+
version: dependencyVersion,
|
|
61
61
|
},
|
|
62
62
|
], visited);
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInstalledPackages.js","sourceRoot":"","sources":["../src/getInstalledPackages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getInstalledPackages.js","sourceRoot":"","sources":["../src/getInstalledPackages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
} | ExportsEntry[];
|
|
4
|
-
export declare type PackageDefinition = {
|
|
5
|
-
name: string;
|
|
6
|
-
version: string;
|
|
7
|
-
main?: string;
|
|
8
|
-
module?: string;
|
|
9
|
-
exports?: ExportsEntry;
|
|
10
|
-
/**
|
|
11
|
-
* @deprecated - Don't use this.
|
|
12
|
-
*/
|
|
13
|
-
browser?: string | Record<string, string>;
|
|
14
|
-
scripts?: Record<string, string>;
|
|
15
|
-
dependencies?: Record<string, string>;
|
|
16
|
-
devDependencies?: Record<string, string>;
|
|
17
|
-
};
|
|
18
|
-
export declare function getPackageDefinition(appPath: string, useCache?: boolean): Promise<PackageDefinition | undefined>;
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
|
+
export declare function getPackageDefinition(appPath: string, useCache?: boolean): Promise<PackageJson | undefined>;
|
|
19
3
|
/**
|
|
20
4
|
* Updates a package definition and the cache we use for them.
|
|
21
5
|
*/
|
|
22
|
-
export declare function updatePackageDefinition(appPath: string, definition:
|
|
6
|
+
export declare function updatePackageDefinition(appPath: string, definition: PackageJson): Promise<void>;
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
1
|
import path from 'path';
|
|
3
|
-
|
|
2
|
+
import { applyOverrides } from '@ms-cloudpack/package-overrides';
|
|
3
|
+
import { readJson, writeJson } from '@ms-cloudpack/json-utilities';
|
|
4
4
|
const defs = {};
|
|
5
5
|
export async function getPackageDefinition(appPath, useCache) {
|
|
6
6
|
if (appPath) {
|
|
7
7
|
try {
|
|
8
8
|
return (defs[appPath] =
|
|
9
|
-
(useCache && defs[appPath]) ||
|
|
9
|
+
(useCache && defs[appPath]) ||
|
|
10
|
+
applyOverrides((await readJson(path.join(appPath, 'package.json')))));
|
|
10
11
|
}
|
|
11
12
|
catch (e) {
|
|
12
13
|
/* no-op */
|
|
@@ -19,7 +20,7 @@ export async function getPackageDefinition(appPath, useCache) {
|
|
|
19
20
|
*/
|
|
20
21
|
export async function updatePackageDefinition(appPath, definition) {
|
|
21
22
|
if (appPath) {
|
|
22
|
-
await
|
|
23
|
+
await writeJson(path.join(appPath, 'package.json'), definition);
|
|
23
24
|
defs[appPath] = definition;
|
|
24
25
|
}
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPackageDefinition.js","sourceRoot":"","sources":["../src/getPackageDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"getPackageDefinition.js","sourceRoot":"","sources":["../src/getPackageDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGnE,MAAM,IAAI,GAAgC,EAAE,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAe,EAAE,QAAkB;IAC5E,IAAI,OAAO,EAAE;QACX,IAAI;YACF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;gBACnB,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC3B,cAAc,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAgB,CAAC,CAAC,CAAC;SACxF;QAAC,OAAO,CAAC,EAAE;YACV,WAAW;SACZ;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAe,EAAE,UAAuB;IACpF,IAAI,OAAO,EAAE;QACX,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC;KAC5B;AACH,CAAC"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { createResolveMap, type ResolveMapEntry, type ResolveMap } from './createResolveMap.js';
|
|
2
2
|
export { type InstalledPackagesResult } from './getInstalledPackages.js';
|
|
3
3
|
export { evaluateImportsFromEntries } from './evaluateImportsFromEntries.js';
|
|
4
|
-
export { getPackageDefinition
|
|
4
|
+
export { getPackageDefinition } from './getPackageDefinition.js';
|
|
5
5
|
export { resolve } from './resolve.js';
|
|
6
6
|
export { resolveImportFromPackage, resolveImportFromPackagePath, type ResolveImportFromPackageOptions, } from './resolveImportFromPackagePath.js';
|
|
7
7
|
export { detectModuleType, type ModuleType } from './detectModuleType.js';
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAyC,MAAM,uBAAuB,CAAC;AAEhG,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAyC,MAAM,uBAAuB,CAAC;AAEhG,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAmB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAkB,MAAM,sBAAsB,CAAC"}
|
|
@@ -6,10 +6,10 @@ const defaultPackageDefinition = {
|
|
|
6
6
|
};
|
|
7
7
|
describe('resolveImportFromPackagePath', () => {
|
|
8
8
|
it('can resolve a main entry', async () => {
|
|
9
|
-
expect(await resolveImportFromPackagePath(testProject2Path)).toEqual('lib/module.js');
|
|
9
|
+
expect(await resolveImportFromPackagePath(testProject2Path)).toEqual('./lib/module.js');
|
|
10
10
|
});
|
|
11
11
|
it('can resolve a source entry', async () => {
|
|
12
|
-
expect(await resolveImportFromPackagePath(testProject2Path, undefined, { preferSource: true })).toEqual('src/module.ts');
|
|
12
|
+
expect(await resolveImportFromPackagePath(testProject2Path, undefined, { preferSource: true })).toEqual('./src/module.ts');
|
|
13
13
|
});
|
|
14
14
|
});
|
|
15
15
|
describe('resolveImportFromPackage', () => {
|
|
@@ -17,26 +17,20 @@ describe('resolveImportFromPackage', () => {
|
|
|
17
17
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
18
18
|
...defaultPackageDefinition,
|
|
19
19
|
main: './lib/main.js',
|
|
20
|
-
}, '')).toEqual('lib/main.js');
|
|
21
|
-
});
|
|
22
|
-
it('can resolve a main entry', async () => {
|
|
23
|
-
expect(await resolveImportFromPackage(testProject2Path, {
|
|
24
|
-
...defaultPackageDefinition,
|
|
25
|
-
main: './lib/main.js',
|
|
26
|
-
}, '')).toEqual('lib/main.js');
|
|
20
|
+
}, '')).toEqual('./lib/main.js');
|
|
27
21
|
});
|
|
28
22
|
it('can fall back to a subfolder', async () => {
|
|
29
23
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
30
24
|
...defaultPackageDefinition,
|
|
31
25
|
main: 'build',
|
|
32
|
-
})).toEqual('build/index.js');
|
|
26
|
+
})).toEqual('./build/index.js');
|
|
33
27
|
});
|
|
34
28
|
it('can resolve a module entry', async () => {
|
|
35
29
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
36
30
|
...defaultPackageDefinition,
|
|
37
31
|
main: './lib/main.js',
|
|
38
32
|
module: './lib/module.js',
|
|
39
|
-
}, '')).toEqual('lib/module.js');
|
|
33
|
+
}, '')).toEqual('./lib/module.js');
|
|
40
34
|
});
|
|
41
35
|
it('can resolve a string exports entry', async () => {
|
|
42
36
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -44,7 +38,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
44
38
|
main: './lib/main.js',
|
|
45
39
|
module: './lib/module.js',
|
|
46
40
|
exports: './lib/exports.js',
|
|
47
|
-
}, '')).toEqual('lib/exports.js');
|
|
41
|
+
}, '')).toEqual('./lib/exports.js');
|
|
48
42
|
});
|
|
49
43
|
it('can resolve a default string exports entry', async () => {
|
|
50
44
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -54,7 +48,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
54
48
|
exports: {
|
|
55
49
|
default: 'lib/exports-default.js',
|
|
56
50
|
},
|
|
57
|
-
}, '')).toEqual('lib/exports-default.js');
|
|
51
|
+
}, '')).toEqual('./lib/exports-default.js');
|
|
58
52
|
});
|
|
59
53
|
it('can resolve a default map exports entry', async () => {
|
|
60
54
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -64,7 +58,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
64
58
|
exports: {
|
|
65
59
|
'.': './lib/exports.js',
|
|
66
60
|
},
|
|
67
|
-
}, '')).toEqual('lib/exports.js');
|
|
61
|
+
}, '')).toEqual('./lib/exports.js');
|
|
68
62
|
});
|
|
69
63
|
it('can resolve a default map exports entry with default', async () => {
|
|
70
64
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -76,7 +70,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
76
70
|
default: './lib/exports-default.js',
|
|
77
71
|
},
|
|
78
72
|
},
|
|
79
|
-
}, '')).toEqual('lib/exports-default.js');
|
|
73
|
+
}, '')).toEqual('./lib/exports-default.js');
|
|
80
74
|
});
|
|
81
75
|
it('can resolve a default map exports entry with import', async () => {
|
|
82
76
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -90,7 +84,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
90
84
|
default: './lib/exports-default.js',
|
|
91
85
|
},
|
|
92
86
|
},
|
|
93
|
-
}, '')).toEqual('lib/exports-import.js');
|
|
87
|
+
}, '')).toEqual('./lib/exports-import.js');
|
|
94
88
|
});
|
|
95
89
|
it('can resolve a path mapped in the exports map', async () => {
|
|
96
90
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -109,13 +103,13 @@ describe('resolveImportFromPackage', () => {
|
|
|
109
103
|
default: './lib/exports-button-default.js',
|
|
110
104
|
},
|
|
111
105
|
},
|
|
112
|
-
}, 'lib/Button')).toEqual('lib/exports-button-import.js');
|
|
106
|
+
}, 'lib/Button')).toEqual('./lib/exports-button-import.js');
|
|
113
107
|
});
|
|
114
108
|
it('can resolve a source file exports map', async () => {
|
|
115
109
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
116
110
|
...defaultPackageDefinition,
|
|
117
111
|
exports: './lib/tsx.js',
|
|
118
|
-
}, '', { preferSource: true })).toEqual('src/tsx.tsx');
|
|
112
|
+
}, '', { preferSource: true })).toEqual('./src/tsx.tsx');
|
|
119
113
|
});
|
|
120
114
|
it('can remap imports using browser overrides', async () => {
|
|
121
115
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -124,7 +118,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
124
118
|
'lib/main.js': './lib/tsx.js',
|
|
125
119
|
},
|
|
126
120
|
main: 'lib/main.js',
|
|
127
|
-
}, '')).toEqual('lib/tsx.js');
|
|
121
|
+
}, '')).toEqual('./lib/tsx.js');
|
|
128
122
|
});
|
|
129
123
|
it('can remap imports using browser overrides (preferSource)', async () => {
|
|
130
124
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -133,12 +127,12 @@ describe('resolveImportFromPackage', () => {
|
|
|
133
127
|
'./lib/main.js': './lib/tsx.js',
|
|
134
128
|
},
|
|
135
129
|
main: 'lib/main.js',
|
|
136
|
-
}, '', { preferSource: true })).toEqual('src/tsx.tsx');
|
|
130
|
+
}, '', { preferSource: true })).toEqual('./src/tsx.tsx');
|
|
137
131
|
});
|
|
138
132
|
it('can remap deep imports (preferSource)', async () => {
|
|
139
133
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
140
134
|
...defaultPackageDefinition,
|
|
141
|
-
}, 'lib/tsx', { preferSource: true })).toEqual('src/tsx.tsx');
|
|
135
|
+
}, 'lib/tsx', { preferSource: true })).toEqual('./src/tsx.tsx');
|
|
142
136
|
});
|
|
143
137
|
it('can remap deep imports with an exports map (preferSource)', async () => {
|
|
144
138
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
@@ -146,7 +140,7 @@ describe('resolveImportFromPackage', () => {
|
|
|
146
140
|
exports: {
|
|
147
141
|
'./lib/tsx': 'lib/main.js',
|
|
148
142
|
},
|
|
149
|
-
}, 'lib/tsx', { preferSource: true })).toEqual('src/main.ts');
|
|
143
|
+
}, 'lib/tsx', { preferSource: true })).toEqual('./src/main.ts');
|
|
150
144
|
});
|
|
151
145
|
// package example: github.com/form-data/form-data
|
|
152
146
|
it('can remap imports using browser overrides (no extension, browser string)', async () => {
|
|
@@ -154,14 +148,14 @@ describe('resolveImportFromPackage', () => {
|
|
|
154
148
|
...defaultPackageDefinition,
|
|
155
149
|
browser: './lib/tsx',
|
|
156
150
|
main: 'lib/main',
|
|
157
|
-
}, '')).toEqual('lib/tsx.js');
|
|
151
|
+
}, '')).toEqual('./lib/tsx.js');
|
|
158
152
|
});
|
|
159
153
|
// package example: supports color
|
|
160
154
|
it('can handle a package with only a browser entry', async () => {
|
|
161
155
|
expect(await resolveImportFromPackage(testProject2Path, {
|
|
162
156
|
...defaultPackageDefinition,
|
|
163
157
|
browser: './lib/main',
|
|
164
|
-
}, '')).toEqual('lib/main.js');
|
|
158
|
+
}, '')).toEqual('./lib/main.js');
|
|
165
159
|
});
|
|
166
160
|
});
|
|
167
161
|
//# sourceMappingURL=resolveImportFromPackage.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveImportFromPackage.test.js","sourceRoot":"","sources":["../src/resolveImportFromPackage.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveImportFromPackage.test.js","sourceRoot":"","sources":["../src/resolveImportFromPackage.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
2
|
/**
|
|
3
3
|
* Options for the resolveImportFromPackage(Path) apis.
|
|
4
4
|
*/
|
|
@@ -13,9 +13,9 @@ export interface ResolveImportFromPackageOptions {
|
|
|
13
13
|
* Resolves a requested import path from a package located at the given path. Gives prescedence
|
|
14
14
|
* to browser/esm options. This may change in a future iteration.
|
|
15
15
|
*/
|
|
16
|
-
export declare function resolveImportFromPackagePath(packagePath: string, requestedPath?: string, options?: ResolveImportFromPackageOptions): Promise<string>;
|
|
16
|
+
export declare function resolveImportFromPackagePath(packagePath: string, requestedPath?: string, options?: ResolveImportFromPackageOptions): Promise<string | undefined>;
|
|
17
17
|
/**
|
|
18
18
|
* Resolves a requested import path from a package located at the given path. Gives precedence
|
|
19
19
|
* to browser/esm options. This may change in a future iteration.
|
|
20
20
|
*/
|
|
21
|
-
export declare function resolveImportFromPackage(packagePath: string, packageDefinition:
|
|
21
|
+
export declare function resolveImportFromPackage(packagePath: string, packageDefinition: PackageJson, importPath?: string, options?: ResolveImportFromPackageOptions): Promise<string>;
|
|
@@ -7,7 +7,7 @@ import { isExternalPackage } from './isExternalPackage.js';
|
|
|
7
7
|
* Resolves a requested import path from a package located at the given path. Gives prescedence
|
|
8
8
|
* to browser/esm options. This may change in a future iteration.
|
|
9
9
|
*/
|
|
10
|
-
export async function resolveImportFromPackagePath(packagePath, requestedPath
|
|
10
|
+
export async function resolveImportFromPackagePath(packagePath, requestedPath, options = {}) {
|
|
11
11
|
const packageDefinition = await getPackageDefinition(packagePath);
|
|
12
12
|
if (!packageDefinition) {
|
|
13
13
|
console.log(`Couldn't load definition for "${packagePath}"`);
|
|
@@ -19,55 +19,48 @@ export async function resolveImportFromPackagePath(packagePath, requestedPath =
|
|
|
19
19
|
* Resolves a requested import path from a package located at the given path. Gives precedence
|
|
20
20
|
* to browser/esm options. This may change in a future iteration.
|
|
21
21
|
*/
|
|
22
|
-
export async function resolveImportFromPackage(packagePath, packageDefinition, importPath
|
|
22
|
+
export async function resolveImportFromPackage(packagePath, packageDefinition, importPath, options = {}) {
|
|
23
23
|
const originalPackagePath = packagePath;
|
|
24
|
-
const fullRequestedPath = path.join(packagePath, importPath);
|
|
24
|
+
const fullRequestedPath = path.join(packagePath, importPath || '');
|
|
25
25
|
// If the requested subfolder has a package.json, treat it as a sub-package. (some npm packages have nested package.jsons!)
|
|
26
26
|
if (importPath && isFolder(fullRequestedPath)) {
|
|
27
27
|
const subPackageDefinition = await getPackageDefinition(fullRequestedPath);
|
|
28
28
|
if (subPackageDefinition) {
|
|
29
29
|
packageDefinition = subPackageDefinition;
|
|
30
30
|
packagePath = fullRequestedPath;
|
|
31
|
-
importPath = '';
|
|
32
31
|
}
|
|
33
32
|
}
|
|
34
|
-
//
|
|
35
|
-
if (importPath
|
|
36
|
-
importPath =
|
|
33
|
+
// Normalize path
|
|
34
|
+
if (importPath) {
|
|
35
|
+
importPath = './' + slash(path.normalize(importPath || ''));
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
importPath = undefined;
|
|
37
39
|
}
|
|
38
40
|
// Build a list of intermediate file candidates.
|
|
39
41
|
let candidates = [];
|
|
40
42
|
const { exports } = packageDefinition;
|
|
41
43
|
// If we have an exports map, this takes priority in resolution.
|
|
42
44
|
if (exports) {
|
|
43
|
-
|
|
44
|
-
if (
|
|
45
|
-
|
|
46
|
-
candidates.push(exports);
|
|
47
|
-
}
|
|
45
|
+
const exportPath = getExportPathFromEntry(exports, importPath);
|
|
46
|
+
if (exportPath) {
|
|
47
|
+
candidates.push(exportPath);
|
|
48
48
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
candidates.push(
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
if (!importPath) {
|
|
52
|
+
candidates.push(packageDefinition.module);
|
|
53
|
+
candidates.push(packageDefinition.main);
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
candidates.push(
|
|
56
|
+
candidates.push(importPath);
|
|
57
|
+
}
|
|
58
|
+
// Fallback to index.js
|
|
59
|
+
if (!packageDefinition.main && !packageDefinition.module && !importPath) {
|
|
60
|
+
candidates.push('index.js');
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
|
-
|
|
60
|
-
candidates.push(packageDefinition.module);
|
|
61
|
-
candidates.push(packageDefinition.main);
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
candidates.push(importPath);
|
|
65
|
-
}
|
|
66
|
-
// Fallback to index.js
|
|
67
|
-
if (!packageDefinition.main && !packageDefinition.module && !importPath) {
|
|
68
|
-
candidates.push('index.js');
|
|
69
|
-
}
|
|
70
|
-
// If the package has browser remappings, respect them.
|
|
63
|
+
// If the package has browser re-mappings, respect them.
|
|
71
64
|
// eslint-disable-next-line etc/no-deprecated
|
|
72
65
|
let { browser } = packageDefinition;
|
|
73
66
|
// If the browser entry is a string, convert it into an object.
|
|
@@ -85,8 +78,9 @@ export async function resolveImportFromPackage(packagePath, packageDefinition, i
|
|
|
85
78
|
for (const browserMapping of Object.keys(browser)) {
|
|
86
79
|
for (let i = 0; i < candidates.length; i++) {
|
|
87
80
|
const candidateEntry = candidates[i];
|
|
88
|
-
|
|
89
|
-
|
|
81
|
+
const mappingEntry = browser[browserMapping];
|
|
82
|
+
if (mappingEntry && candidateEntry && path.relative(browserMapping, candidateEntry) === '') {
|
|
83
|
+
candidates[i] = mappingEntry;
|
|
90
84
|
}
|
|
91
85
|
}
|
|
92
86
|
}
|
|
@@ -109,11 +103,11 @@ export async function resolveImportFromPackage(packagePath, packageDefinition, i
|
|
|
109
103
|
}
|
|
110
104
|
// Search candidates for first match.
|
|
111
105
|
const foundPath = candidates.find((candidatePath) => candidatePath && isFile(path.join(packagePath, candidatePath)));
|
|
112
|
-
if (!foundPath && path.basename(importPath).indexOf('chunk-') !== 0) {
|
|
106
|
+
if (!foundPath && path.basename(importPath || '').indexOf('chunk-') !== 0) {
|
|
113
107
|
console.log(`Couldn't resolve import ("${packagePath}", importPath="${importPath}", preferSource=${!!preferSource}), Tried:\n${candidates
|
|
114
108
|
.map((c) => ' "' + c + '"')
|
|
115
109
|
.join('\n')}`);
|
|
116
110
|
}
|
|
117
|
-
return slash(path.relative(originalPackagePath, path.join(packagePath, foundPath || importPath)));
|
|
111
|
+
return './' + slash(path.relative(originalPackagePath, path.join(packagePath, foundPath || importPath || '')));
|
|
118
112
|
}
|
|
119
113
|
//# sourceMappingURL=resolveImportFromPackagePath.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"resolveImportFromPackagePath.js","sourceRoot":"","sources":["../src/resolveImportFromPackagePath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare function resolvePackageEntries(packageDefinition:
|
|
1
|
+
import type { PackageJson } from 'type-fest';
|
|
2
|
+
export declare function resolvePackageEntries(packageDefinition: PackageJson): string[];
|
|
@@ -11,7 +11,7 @@ export function resolvePackageEntries(packageDefinition) {
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
|
-
const defaultEntryPath = packageDefinition.module || packageDefinition.main;
|
|
14
|
+
const defaultEntryPath = packageDefinition.module || packageDefinition.main || './index.js';
|
|
15
15
|
if (defaultEntryPath) {
|
|
16
16
|
entries.add(defaultEntryPath);
|
|
17
17
|
}
|
|
@@ -25,7 +25,7 @@ export function resolvePackageEntries(packageDefinition) {
|
|
|
25
25
|
break;
|
|
26
26
|
case 'object':
|
|
27
27
|
for (const [fromPath, toPath] of Object.entries(browser)) {
|
|
28
|
-
if (entries.has(fromPath)) {
|
|
28
|
+
if (entries.has(fromPath) && toPath) {
|
|
29
29
|
entries.add(toPath);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvePackageEntries.js","sourceRoot":"","sources":["../src/resolvePackageEntries.ts"],"names":[],"mappings":"
|
|
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;IAElC,2CAA2C;IAC3C,IAAI,iBAAiB,CAAC,OAAO,EAAE;QAC7B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;YAC5D,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAEhD,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aACxB;SACF;KACF;SAAM;QACL,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,IAAI,iBAAiB,CAAC,IAAI,IAAI,YAAY,CAAC;QAC5F,IAAI,gBAAgB,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;SAC/B;KACF;IAED,+CAA+C;IAC/C,6CAA6C;IAC7C,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC;IAC1C,QAAQ,OAAO,OAAO,EAAE;QACtB,KAAK,QAAQ;YACX,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,MAAM;QAER,KAAK,QAAQ;YACX,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE;oBACnC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBACrB;aACF;YAED,MAAM;KACT;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
// This file is read by tools that parse documentation comments conforming to the TSDoc standard.
|
|
2
|
+
// It should be published with your NPM package. It should not be tracked by Git.
|
|
3
|
+
{
|
|
4
|
+
"tsdocVersion": "0.12",
|
|
5
|
+
"toolPackages": [
|
|
6
|
+
{
|
|
7
|
+
"packageName": "@microsoft/api-extractor",
|
|
8
|
+
"packageVersion": "7.28.7"
|
|
9
|
+
}
|
|
10
|
+
]
|
|
11
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/package-utilities",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.1",
|
|
4
4
|
"description": "Utilities for resolving/parsing packages and their imports.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -15,14 +15,16 @@
|
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@babel/parser": "^7.16.12",
|
|
17
17
|
"@babel/traverse": "^7.16.10",
|
|
18
|
-
"@ms-cloudpack/
|
|
18
|
+
"@ms-cloudpack/json-utilities": "^0.0.3",
|
|
19
|
+
"@ms-cloudpack/package-overrides": "^0.0.2",
|
|
20
|
+
"@ms-cloudpack/path-utilities": "^0.3.1",
|
|
19
21
|
"resolve": "^1.22.0"
|
|
20
22
|
},
|
|
21
23
|
"devDependencies": {
|
|
22
24
|
"@ms-cloudpack/scripts": "*",
|
|
23
25
|
"@ms-cloudpack/eslint-config-base": "*",
|
|
24
26
|
"@types/resolve": "1.20.2",
|
|
25
|
-
"@babel/types": "7.18.
|
|
27
|
+
"@babel/types": "7.18.10"
|
|
26
28
|
},
|
|
27
29
|
"scripts": {
|
|
28
30
|
"api:update": "cloudpack-scripts api-update",
|