piral-cli 1.3.0-beta.6017 → 1.3.0-beta.6050
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/lib/common/importmap.d.ts +2 -2
- package/lib/common/importmap.js +29 -11
- package/lib/common/importmap.js.map +1 -1
- package/lib/common/pack.js +27 -11
- package/lib/common/pack.js.map +1 -1
- package/lib/common/package.js +1 -1
- package/lib/common/package.js.map +1 -1
- package/lib/types/internal.d.ts +2 -1
- package/lib/types/public.d.ts +1 -0
- package/package.json +2 -2
- package/src/common/importmap.test.ts +194 -0
- package/src/common/importmap.ts +32 -7
- package/src/common/pack.test.ts +1 -0
- package/src/common/pack.ts +30 -18
- package/src/common/package.ts +1 -1
- package/src/types/internal.ts +2 -1
- package/src/types/public.ts +2 -0
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { SharedDependency } from '../types';
|
|
2
|
-
export declare function readImportmap(dir: string, packageDetails: any, inherited?: boolean): Promise<Array<SharedDependency>>;
|
|
1
|
+
import { SharedDependency, ImportmapVersions } from '../types';
|
|
2
|
+
export declare function readImportmap(dir: string, packageDetails: any, inherited?: boolean, versionBehavior?: ImportmapVersions): Promise<Array<SharedDependency>>;
|
package/lib/common/importmap.js
CHANGED
|
@@ -30,6 +30,14 @@ function addLocalDependencies(dependencies, realIdentifier, identifier, version,
|
|
|
30
30
|
isAsync,
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
|
+
function getAnyPatch(version) {
|
|
34
|
+
const [major, minor] = version.split('.');
|
|
35
|
+
return `${major}.${minor}.x`;
|
|
36
|
+
}
|
|
37
|
+
function getMatchMajor(version) {
|
|
38
|
+
const [major] = version.split('.');
|
|
39
|
+
return `${major}.x`;
|
|
40
|
+
}
|
|
33
41
|
function getDependencyDetails(depName) {
|
|
34
42
|
const name = depName.replace(/\?+$/, '');
|
|
35
43
|
const isAsync = depName.endsWith('?');
|
|
@@ -39,7 +47,7 @@ function getDependencyDetails(depName) {
|
|
|
39
47
|
const assetName = (id.startsWith('@') ? id.substring(1) : id).replace(/[\/\.]/g, '-').replace(/(\-)+/, '-');
|
|
40
48
|
return [assetName, id, version, isAsync];
|
|
41
49
|
}
|
|
42
|
-
function getLocalDependencyVersion(packageJson, depName, versionSpec) {
|
|
50
|
+
function getLocalDependencyVersion(packageJson, depName, versionSpec, versionBehavior) {
|
|
43
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
52
|
const packageDir = (0, path_1.dirname)(packageJson);
|
|
45
53
|
const packageFile = (0, path_1.basename)(packageJson);
|
|
@@ -53,7 +61,17 @@ function getLocalDependencyVersion(packageJson, depName, versionSpec) {
|
|
|
53
61
|
}
|
|
54
62
|
return [details.name, details.version, versionSpec];
|
|
55
63
|
}
|
|
56
|
-
|
|
64
|
+
switch (versionBehavior) {
|
|
65
|
+
case 'all':
|
|
66
|
+
return [details.name, details.version, '*'];
|
|
67
|
+
case 'match-major':
|
|
68
|
+
return [details.name, details.version, getMatchMajor(details.version)];
|
|
69
|
+
case 'any-patch':
|
|
70
|
+
return [details.name, details.version, getAnyPatch(details.version)];
|
|
71
|
+
case 'exact':
|
|
72
|
+
default:
|
|
73
|
+
return [details.name, details.version, details.version];
|
|
74
|
+
}
|
|
57
75
|
});
|
|
58
76
|
}
|
|
59
77
|
function getInheritedDependencies(inheritedImport, dir) {
|
|
@@ -62,20 +80,20 @@ function getInheritedDependencies(inheritedImport, dir) {
|
|
|
62
80
|
if (packageJson) {
|
|
63
81
|
const packageDir = (0, path_1.dirname)(packageJson);
|
|
64
82
|
const packageDetails = yield (0, io_1.readJson)(packageDir, 'package.json');
|
|
65
|
-
return readImportmap(packageDir, packageDetails, true);
|
|
83
|
+
return readImportmap(packageDir, packageDetails, true, 'exact');
|
|
66
84
|
}
|
|
67
85
|
else {
|
|
68
86
|
const directImportmap = (0, npm_1.tryResolvePackage)(inheritedImport, dir);
|
|
69
87
|
if (directImportmap) {
|
|
70
88
|
const baseDir = (0, path_1.dirname)(directImportmap);
|
|
71
89
|
const content = yield (0, io_1.readJson)(baseDir, (0, path_1.basename)(directImportmap));
|
|
72
|
-
return yield resolveImportmap(baseDir, content);
|
|
90
|
+
return yield resolveImportmap(baseDir, content, 'exact');
|
|
73
91
|
}
|
|
74
92
|
}
|
|
75
93
|
return [];
|
|
76
94
|
});
|
|
77
95
|
}
|
|
78
|
-
function resolveImportmap(dir, importmap) {
|
|
96
|
+
function resolveImportmap(dir, importmap, versionBehavior) {
|
|
79
97
|
return __awaiter(this, void 0, void 0, function* () {
|
|
80
98
|
const dependencies = [];
|
|
81
99
|
const sharedImports = importmap === null || importmap === void 0 ? void 0 : importmap.imports;
|
|
@@ -104,7 +122,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
104
122
|
const entry = (0, npm_1.tryResolvePackage)(identifier, dir);
|
|
105
123
|
if (entry) {
|
|
106
124
|
const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
107
|
-
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
|
|
125
|
+
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec, versionBehavior);
|
|
108
126
|
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName, isAsync);
|
|
109
127
|
}
|
|
110
128
|
else {
|
|
@@ -115,7 +133,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
115
133
|
const entry = (0, npm_1.tryResolvePackage)(url, dir);
|
|
116
134
|
if (entry) {
|
|
117
135
|
const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
118
|
-
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
|
|
136
|
+
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec, versionBehavior);
|
|
119
137
|
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName, isAsync);
|
|
120
138
|
}
|
|
121
139
|
else {
|
|
@@ -132,7 +150,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
132
150
|
: yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
133
151
|
const packageJsonExists = yield (0, io_1.checkExists)(packageJson);
|
|
134
152
|
if (packageJsonExists) {
|
|
135
|
-
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec);
|
|
153
|
+
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec, versionBehavior);
|
|
136
154
|
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry, assetName, isAsync);
|
|
137
155
|
}
|
|
138
156
|
else if (isDirectory) {
|
|
@@ -177,7 +195,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
177
195
|
return dependencies;
|
|
178
196
|
});
|
|
179
197
|
}
|
|
180
|
-
function readImportmap(dir, packageDetails, inherited = false) {
|
|
198
|
+
function readImportmap(dir, packageDetails, inherited = false, versionBehavior = 'exact') {
|
|
181
199
|
var _a, _b;
|
|
182
200
|
return __awaiter(this, void 0, void 0, function* () {
|
|
183
201
|
const importmap = packageDetails.importmap;
|
|
@@ -188,7 +206,7 @@ function readImportmap(dir, packageDetails, inherited = false) {
|
|
|
188
206
|
(0, log_1.fail)('importMapFileNotFound_0028', dir, importmap);
|
|
189
207
|
}
|
|
190
208
|
const baseDir = (0, path_1.dirname)((0, path_1.resolve)(dir, importmap));
|
|
191
|
-
return yield resolveImportmap(baseDir, content);
|
|
209
|
+
return yield resolveImportmap(baseDir, content, versionBehavior);
|
|
192
210
|
}
|
|
193
211
|
else if (typeof importmap === 'undefined' && inherited) {
|
|
194
212
|
// Fall back to sharedDependencies or pilets.external if available
|
|
@@ -204,7 +222,7 @@ function readImportmap(dir, packageDetails, inherited = false) {
|
|
|
204
222
|
}));
|
|
205
223
|
}
|
|
206
224
|
}
|
|
207
|
-
return yield resolveImportmap(dir, importmap);
|
|
225
|
+
return yield resolveImportmap(dir, importmap, versionBehavior);
|
|
208
226
|
});
|
|
209
227
|
}
|
|
210
228
|
exports.readImportmap = readImportmap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA8D;AAC9D,+BAAkC;AAClC,uCAAgD;AAChD,iCAAqC;AACrC,6BAAkF;AAClF,+BAA0C;AAG1C,MAAM,cAAc,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAExC,SAAS,oBAAoB,CAC3B,YAAqC,EACrC,cAAsB,EACtB,UAAkB,EAClB,OAAe,EACf,cAAsB,EACtB,KAAa,EACb,SAAiB,EACjB,OAAgB;IAEhB,MAAM,KAAK,GAAG,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;IAEzE,YAAY,CAAC,IAAI,CAAC;QAChB,EAAE,EAAE,GAAG,UAAU,IAAI,OAAO,EAAE;QAC9B,SAAS,EAAE,GAAG,UAAU,IAAI,cAAc,EAAE;QAC5C,KAAK;QACL,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,GAAG,SAAS,KAAK;QACtB,IAAI,EAAE,OAAO;QACb,KAAK;QACL,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAe;IAEf,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvD,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,MAAM,SAAS,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC5G,OAAO,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,SAAe,yBAAyB,CACtC,WAAmB,EACnB,OAAe,EACf,WAAmB;;
|
|
1
|
+
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
|
package/lib/common/pack.js
CHANGED
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.createPiletPackage = void 0;
|
|
13
|
-
const os_1 = require("os");
|
|
14
13
|
const path_1 = require("path");
|
|
15
14
|
const archive_1 = require("./archive");
|
|
16
15
|
const utils_1 = require("./utils");
|
|
@@ -29,6 +28,25 @@ function getPiletContentDir(root, packageData) {
|
|
|
29
28
|
return root;
|
|
30
29
|
});
|
|
31
30
|
}
|
|
31
|
+
function getUniqueFiles(files) {
|
|
32
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
const result = [];
|
|
34
|
+
for (const file of files) {
|
|
35
|
+
const isDirectory = yield (0, io_1.checkIsDirectory)(file);
|
|
36
|
+
if (isDirectory) {
|
|
37
|
+
const names = yield (0, io_1.getFileNames)(file);
|
|
38
|
+
const subFiles = names.map((name) => (0, path_1.resolve)(file, name));
|
|
39
|
+
const items = yield getUniqueFiles(subFiles);
|
|
40
|
+
const unique = items.filter((m) => (0, utils_1.onlyUniqueFiles)(m, result.length, result));
|
|
41
|
+
result.push(...unique);
|
|
42
|
+
}
|
|
43
|
+
else if ((0, utils_1.onlyUniqueFiles)(file, result.length, result)) {
|
|
44
|
+
result.push(file);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return result;
|
|
48
|
+
});
|
|
49
|
+
}
|
|
32
50
|
function createPiletPackage(baseDir, source, target) {
|
|
33
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
52
|
const root = (0, path_1.resolve)(baseDir, source);
|
|
@@ -56,23 +74,21 @@ function createPiletPackage(baseDir, source, target) {
|
|
|
56
74
|
const files = [(0, path_1.resolve)(root, 'package.json'), content];
|
|
57
75
|
const readme = (0, path_1.resolve)(root, 'README.md');
|
|
58
76
|
if (Array.isArray(pckg.files)) {
|
|
59
|
-
|
|
77
|
+
const additionalFiles = pckg.files
|
|
78
|
+
.filter((f) => typeof f === 'string')
|
|
79
|
+
.map((f) => (0, path_1.resolve)(root, f));
|
|
80
|
+
files.push(...additionalFiles);
|
|
60
81
|
}
|
|
61
82
|
if (yield (0, io_1.checkExists)(readme)) {
|
|
62
83
|
files.push(readme);
|
|
63
84
|
}
|
|
64
|
-
|
|
65
|
-
const
|
|
66
|
-
const uniqueFiles = files.filter(utils_1.onlyUniqueFiles);
|
|
67
|
-
(0, log_1.log)('generalDebug_0003', `Creating package with content from "${content}" ...`);
|
|
68
|
-
yield Promise.all(uniqueFiles.map((file) => (0, io_1.copy)(file, (0, path_1.resolve)(cwd, (0, path_1.relative)(root, file)))));
|
|
85
|
+
(0, log_1.log)('generalDebug_0003', `Reading out unique files from "${content}" ...`);
|
|
86
|
+
const uniqueFiles = yield getUniqueFiles(files);
|
|
69
87
|
(0, log_1.log)('generalDebug_0003', `Creating directory if not exist for "${file}" ...`);
|
|
70
88
|
yield (0, io_1.createDirectory)((0, path_1.dirname)(file));
|
|
71
89
|
(0, log_1.log)('generalDebug_0003', `Creating compressed archive at "${file}" relative to "${root}" ...`);
|
|
72
|
-
yield (0, archive_1.createTgz)(file,
|
|
73
|
-
(0, log_1.log)('generalDebug_0003', `Successfully created package from "${
|
|
74
|
-
yield (0, io_1.removeDirectory)(cwd);
|
|
75
|
-
(0, log_1.log)('generalDebug_0003', `Packed file "${file}".`);
|
|
90
|
+
yield (0, archive_1.createTgz)(file, root, uniqueFiles.map((file) => (0, path_1.relative)(root, file)));
|
|
91
|
+
(0, log_1.log)('generalDebug_0003', `Successfully created package "${file}" from "${root}".`);
|
|
76
92
|
return file;
|
|
77
93
|
});
|
|
78
94
|
}
|
package/lib/common/pack.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/common/pack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/common/pack.ts"],"names":[],"mappings":"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"}
|
package/lib/common/package.js
CHANGED
|
@@ -628,7 +628,7 @@ function retrievePiletData(target, app) {
|
|
|
628
628
|
appPort,
|
|
629
629
|
});
|
|
630
630
|
}
|
|
631
|
-
const importmap = yield (0, importmap_1.readImportmap)(root, piletPackage);
|
|
631
|
+
const importmap = yield (0, importmap_1.readImportmap)(root, piletPackage, undefined, piletDefinition === null || piletDefinition === void 0 ? void 0 : piletDefinition.importmapVersions);
|
|
632
632
|
return {
|
|
633
633
|
dependencies: piletPackage.dependencies || {},
|
|
634
634
|
devDependencies: piletPackage.devDependencies || {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
|
package/lib/types/internal.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { LogLevels } from './common';
|
|
3
|
-
import type { PiletSchemaVersion } from './public';
|
|
3
|
+
import type { ImportmapVersions, PiletSchemaVersion } from './public';
|
|
4
4
|
/**
|
|
5
5
|
* Shape of the pilet.json
|
|
6
6
|
*/
|
|
7
7
|
export interface PiletDefinition {
|
|
8
8
|
schemaVersion?: PiletSchemaVersion;
|
|
9
|
+
importmapVersions?: ImportmapVersions;
|
|
9
10
|
piralInstances?: Record<string, {
|
|
10
11
|
selected?: boolean;
|
|
11
12
|
port?: number;
|
package/lib/types/public.d.ts
CHANGED
|
@@ -191,6 +191,7 @@ export interface BundlerDefinition {
|
|
|
191
191
|
debugPilet: DebugPiletBundlerDefinition;
|
|
192
192
|
buildPilet: BuildPiletBundlerDefinition;
|
|
193
193
|
}
|
|
194
|
+
export type ImportmapVersions = 'all' | 'match-major' | 'any-patch' | 'exact';
|
|
194
195
|
export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2' | 'v3';
|
|
195
196
|
export type SourceLanguage = 'js' | 'ts';
|
|
196
197
|
export type PiletPublishScheme = 'none' | 'digest' | 'bearer' | 'basic';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "1.3.0-beta.
|
|
3
|
+
"version": "1.3.0-beta.6050",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -81,5 +81,5 @@
|
|
|
81
81
|
"typescript": "^5.0.0",
|
|
82
82
|
"yargs": "^15.0.0"
|
|
83
83
|
},
|
|
84
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "e146a30bb1c871b86706e2f88d7bc14ee80f6d1d"
|
|
85
85
|
}
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
import { readImportmap } from './importmap';
|
|
2
|
+
|
|
3
|
+
jest.mock('./npm', () => ({
|
|
4
|
+
tryResolvePackage(id, dir) {
|
|
5
|
+
return `${dir}/${id}/index.js`;
|
|
6
|
+
},
|
|
7
|
+
}));
|
|
8
|
+
|
|
9
|
+
const mockPackages = {
|
|
10
|
+
'/data/foo': {
|
|
11
|
+
name: 'foo',
|
|
12
|
+
version: '1.2.3',
|
|
13
|
+
},
|
|
14
|
+
'/data/bar': {
|
|
15
|
+
name: 'bar',
|
|
16
|
+
version: '1.0.0',
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
jest.mock('./io', () => ({
|
|
21
|
+
checkIsDirectory() {},
|
|
22
|
+
getHash() {},
|
|
23
|
+
readJson(dir) {
|
|
24
|
+
return mockPackages[dir];
|
|
25
|
+
},
|
|
26
|
+
findFile(dir, file) {
|
|
27
|
+
return `${dir}/${file}`;
|
|
28
|
+
},
|
|
29
|
+
checkExists() {
|
|
30
|
+
return true;
|
|
31
|
+
},
|
|
32
|
+
}));
|
|
33
|
+
|
|
34
|
+
describe('Importmap', () => {
|
|
35
|
+
it('reads empty one from package.json', async () => {
|
|
36
|
+
const deps = await readImportmap(
|
|
37
|
+
'/data',
|
|
38
|
+
{
|
|
39
|
+
importmap: {},
|
|
40
|
+
},
|
|
41
|
+
false,
|
|
42
|
+
);
|
|
43
|
+
expect(deps).toEqual([]);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it('reads fully qualified local dependency', async () => {
|
|
47
|
+
const deps = await readImportmap(
|
|
48
|
+
'/data',
|
|
49
|
+
{
|
|
50
|
+
importmap: {
|
|
51
|
+
imports: {
|
|
52
|
+
'foo@1.2.3': 'foo',
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
false,
|
|
57
|
+
);
|
|
58
|
+
expect(deps).toEqual([
|
|
59
|
+
{
|
|
60
|
+
alias: undefined,
|
|
61
|
+
entry: '/data/foo/index.js',
|
|
62
|
+
id: 'foo@1.2.3',
|
|
63
|
+
isAsync: false,
|
|
64
|
+
name: 'foo',
|
|
65
|
+
ref: 'foo.js',
|
|
66
|
+
requireId: 'foo@1.2.3',
|
|
67
|
+
type: 'local',
|
|
68
|
+
},
|
|
69
|
+
]);
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
it('reads fully qualified local dependency with implied exact version', async () => {
|
|
73
|
+
const deps = await readImportmap(
|
|
74
|
+
'/data',
|
|
75
|
+
{
|
|
76
|
+
importmap: {
|
|
77
|
+
imports: {
|
|
78
|
+
foo: 'foo',
|
|
79
|
+
},
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
false,
|
|
83
|
+
);
|
|
84
|
+
expect(deps).toEqual([
|
|
85
|
+
{
|
|
86
|
+
alias: undefined,
|
|
87
|
+
entry: '/data/foo/index.js',
|
|
88
|
+
id: 'foo@1.2.3',
|
|
89
|
+
isAsync: false,
|
|
90
|
+
name: 'foo',
|
|
91
|
+
ref: 'foo.js',
|
|
92
|
+
requireId: 'foo@1.2.3',
|
|
93
|
+
type: 'local',
|
|
94
|
+
},
|
|
95
|
+
]);
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it('reads fully qualified local dependency with implied match major version', async () => {
|
|
99
|
+
const deps = await readImportmap(
|
|
100
|
+
'/data',
|
|
101
|
+
{
|
|
102
|
+
importmap: {
|
|
103
|
+
imports: {
|
|
104
|
+
foo: 'foo',
|
|
105
|
+
},
|
|
106
|
+
},
|
|
107
|
+
},
|
|
108
|
+
false,
|
|
109
|
+
'match-major',
|
|
110
|
+
);
|
|
111
|
+
expect(deps).toEqual([
|
|
112
|
+
{
|
|
113
|
+
alias: undefined,
|
|
114
|
+
entry: '/data/foo/index.js',
|
|
115
|
+
id: 'foo@1.2.3',
|
|
116
|
+
isAsync: false,
|
|
117
|
+
name: 'foo',
|
|
118
|
+
ref: 'foo.js',
|
|
119
|
+
requireId: 'foo@1.x',
|
|
120
|
+
type: 'local',
|
|
121
|
+
},
|
|
122
|
+
]);
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
it('reads fully qualified local dependency with implied match major patch', async () => {
|
|
126
|
+
const deps = await readImportmap(
|
|
127
|
+
'/data',
|
|
128
|
+
{
|
|
129
|
+
importmap: {
|
|
130
|
+
imports: {
|
|
131
|
+
foo: 'foo',
|
|
132
|
+
},
|
|
133
|
+
},
|
|
134
|
+
},
|
|
135
|
+
false,
|
|
136
|
+
'any-patch',
|
|
137
|
+
);
|
|
138
|
+
expect(deps).toEqual([
|
|
139
|
+
{
|
|
140
|
+
alias: undefined,
|
|
141
|
+
entry: '/data/foo/index.js',
|
|
142
|
+
id: 'foo@1.2.3',
|
|
143
|
+
isAsync: false,
|
|
144
|
+
name: 'foo',
|
|
145
|
+
ref: 'foo.js',
|
|
146
|
+
requireId: 'foo@1.2.x',
|
|
147
|
+
type: 'local',
|
|
148
|
+
},
|
|
149
|
+
]);
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
it('reads fully qualified local dependency with implied any match', async () => {
|
|
153
|
+
const deps = await readImportmap(
|
|
154
|
+
'/data',
|
|
155
|
+
{
|
|
156
|
+
importmap: {
|
|
157
|
+
imports: {
|
|
158
|
+
foo: 'foo',
|
|
159
|
+
},
|
|
160
|
+
},
|
|
161
|
+
},
|
|
162
|
+
false,
|
|
163
|
+
'all',
|
|
164
|
+
);
|
|
165
|
+
expect(deps).toEqual([
|
|
166
|
+
{
|
|
167
|
+
alias: undefined,
|
|
168
|
+
entry: '/data/foo/index.js',
|
|
169
|
+
id: 'foo@1.2.3',
|
|
170
|
+
isAsync: false,
|
|
171
|
+
name: 'foo',
|
|
172
|
+
ref: 'foo.js',
|
|
173
|
+
requireId: 'foo@*',
|
|
174
|
+
type: 'local',
|
|
175
|
+
},
|
|
176
|
+
]);
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
it('fails when the local version does not match the desired version', async () => {
|
|
180
|
+
await expect(
|
|
181
|
+
readImportmap(
|
|
182
|
+
'/data',
|
|
183
|
+
{
|
|
184
|
+
importmap: {
|
|
185
|
+
imports: {
|
|
186
|
+
'bar@^2.0.0': '',
|
|
187
|
+
},
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
false,
|
|
191
|
+
),
|
|
192
|
+
).rejects.toThrow();
|
|
193
|
+
});
|
|
194
|
+
});
|
package/src/common/importmap.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { satisfies, validate } from './version';
|
|
|
4
4
|
import { computeHash } from './hash';
|
|
5
5
|
import { getHash, readJson, findFile, checkExists, checkIsDirectory } from './io';
|
|
6
6
|
import { tryResolvePackage } from './npm';
|
|
7
|
-
import { SharedDependency, Importmap } from '../types';
|
|
7
|
+
import { SharedDependency, Importmap, ImportmapVersions } from '../types';
|
|
8
8
|
|
|
9
9
|
const shorthandsUrls = ['', '.', '...'];
|
|
10
10
|
|
|
@@ -32,6 +32,16 @@ function addLocalDependencies(
|
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
function getAnyPatch(version: string) {
|
|
36
|
+
const [major, minor] = version.split('.');
|
|
37
|
+
return `${major}.${minor}.x`;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function getMatchMajor(version: string) {
|
|
41
|
+
const [major] = version.split('.');
|
|
42
|
+
return `${major}.x`;
|
|
43
|
+
}
|
|
44
|
+
|
|
35
45
|
function getDependencyDetails(
|
|
36
46
|
depName: string,
|
|
37
47
|
): [assetName: string, identifier: string, versionSpec: string, isAsync: boolean] {
|
|
@@ -48,6 +58,7 @@ async function getLocalDependencyVersion(
|
|
|
48
58
|
packageJson: string,
|
|
49
59
|
depName: string,
|
|
50
60
|
versionSpec: string,
|
|
61
|
+
versionBehavior: ImportmapVersions,
|
|
51
62
|
): Promise<[realIdentifier: string, offeredVersion: string, requiredVersion: string]> {
|
|
52
63
|
const packageDir = dirname(packageJson);
|
|
53
64
|
const packageFile = basename(packageJson);
|
|
@@ -65,7 +76,17 @@ async function getLocalDependencyVersion(
|
|
|
65
76
|
return [details.name, details.version, versionSpec];
|
|
66
77
|
}
|
|
67
78
|
|
|
68
|
-
|
|
79
|
+
switch (versionBehavior) {
|
|
80
|
+
case 'all':
|
|
81
|
+
return [details.name, details.version, '*'];
|
|
82
|
+
case 'match-major':
|
|
83
|
+
return [details.name, details.version, getMatchMajor(details.version)];
|
|
84
|
+
case 'any-patch':
|
|
85
|
+
return [details.name, details.version, getAnyPatch(details.version)];
|
|
86
|
+
case 'exact':
|
|
87
|
+
default:
|
|
88
|
+
return [details.name, details.version, details.version];
|
|
89
|
+
}
|
|
69
90
|
}
|
|
70
91
|
|
|
71
92
|
async function getInheritedDependencies(inheritedImport: string, dir: string): Promise<Array<SharedDependency>> {
|
|
@@ -74,21 +95,21 @@ async function getInheritedDependencies(inheritedImport: string, dir: string): P
|
|
|
74
95
|
if (packageJson) {
|
|
75
96
|
const packageDir = dirname(packageJson);
|
|
76
97
|
const packageDetails = await readJson(packageDir, 'package.json');
|
|
77
|
-
return readImportmap(packageDir, packageDetails, true);
|
|
98
|
+
return readImportmap(packageDir, packageDetails, true, 'exact');
|
|
78
99
|
} else {
|
|
79
100
|
const directImportmap = tryResolvePackage(inheritedImport, dir);
|
|
80
101
|
|
|
81
102
|
if (directImportmap) {
|
|
82
103
|
const baseDir = dirname(directImportmap);
|
|
83
104
|
const content = await readJson(baseDir, basename(directImportmap));
|
|
84
|
-
return await resolveImportmap(baseDir, content);
|
|
105
|
+
return await resolveImportmap(baseDir, content, 'exact');
|
|
85
106
|
}
|
|
86
107
|
}
|
|
87
108
|
|
|
88
109
|
return [];
|
|
89
110
|
}
|
|
90
111
|
|
|
91
|
-
async function resolveImportmap(dir: string, importmap: Importmap): Promise<Array<SharedDependency>> {
|
|
112
|
+
async function resolveImportmap(dir: string, importmap: Importmap, versionBehavior: ImportmapVersions): Promise<Array<SharedDependency>> {
|
|
92
113
|
const dependencies: Array<SharedDependency> = [];
|
|
93
114
|
const sharedImports = importmap?.imports;
|
|
94
115
|
const inheritedImports = importmap?.inherit;
|
|
@@ -122,6 +143,7 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
|
|
|
122
143
|
packageJson,
|
|
123
144
|
depName,
|
|
124
145
|
versionSpec,
|
|
146
|
+
versionBehavior,
|
|
125
147
|
);
|
|
126
148
|
|
|
127
149
|
addLocalDependencies(
|
|
@@ -146,6 +168,7 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
|
|
|
146
168
|
packageJson,
|
|
147
169
|
depName,
|
|
148
170
|
versionSpec,
|
|
171
|
+
versionBehavior,
|
|
149
172
|
);
|
|
150
173
|
|
|
151
174
|
addLocalDependencies(
|
|
@@ -177,6 +200,7 @@ async function resolveImportmap(dir: string, importmap: Importmap): Promise<Arra
|
|
|
177
200
|
packageJson,
|
|
178
201
|
depName,
|
|
179
202
|
versionSpec,
|
|
203
|
+
versionBehavior,
|
|
180
204
|
);
|
|
181
205
|
|
|
182
206
|
addLocalDependencies(
|
|
@@ -241,6 +265,7 @@ export async function readImportmap(
|
|
|
241
265
|
dir: string,
|
|
242
266
|
packageDetails: any,
|
|
243
267
|
inherited = false,
|
|
268
|
+
versionBehavior: ImportmapVersions = 'exact',
|
|
244
269
|
): Promise<Array<SharedDependency>> {
|
|
245
270
|
const importmap = packageDetails.importmap;
|
|
246
271
|
|
|
@@ -253,7 +278,7 @@ export async function readImportmap(
|
|
|
253
278
|
}
|
|
254
279
|
|
|
255
280
|
const baseDir = dirname(resolve(dir, importmap));
|
|
256
|
-
return await resolveImportmap(baseDir, content);
|
|
281
|
+
return await resolveImportmap(baseDir, content, versionBehavior);
|
|
257
282
|
} else if (typeof importmap === 'undefined' && inherited) {
|
|
258
283
|
// Fall back to sharedDependencies or pilets.external if available
|
|
259
284
|
const shared: Array<string> = packageDetails.sharedDependencies ?? packageDetails.pilets?.externals;
|
|
@@ -270,5 +295,5 @@ export async function readImportmap(
|
|
|
270
295
|
}
|
|
271
296
|
}
|
|
272
297
|
|
|
273
|
-
return await resolveImportmap(dir, importmap);
|
|
298
|
+
return await resolveImportmap(dir, importmap, versionBehavior);
|
|
274
299
|
}
|
package/src/common/pack.test.ts
CHANGED
|
@@ -6,6 +6,7 @@ let json: any = {};
|
|
|
6
6
|
jest.mock('./io', () => ({
|
|
7
7
|
readJson: jest.fn(() => json),
|
|
8
8
|
removeDirectory: jest.fn(() => Promise.resolve()),
|
|
9
|
+
checkIsDirectory: jest.fn(() => false),
|
|
9
10
|
makeTempDir: jest.fn(() => Promise.resolve('')),
|
|
10
11
|
copy: jest.fn(() => Promise.resolve()),
|
|
11
12
|
checkExists: jest.fn(() => Promise.resolve(true)),
|
package/src/common/pack.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { resolve, relative, join, dirname, basename } from 'path';
|
|
1
|
+
import { resolve, relative, dirname, basename } from 'path';
|
|
3
2
|
import { createTgz } from './archive';
|
|
4
3
|
import { onlyUniqueFiles } from './utils';
|
|
5
4
|
import { log, progress, fail } from './log';
|
|
6
|
-
import { readJson,
|
|
5
|
+
import { readJson, checkExists, createDirectory, checkIsDirectory, getFileNames } from './io';
|
|
7
6
|
import { getPossiblePiletMainPaths } from './inspect';
|
|
8
7
|
|
|
9
8
|
async function getPiletContentDir(root: string, packageData: any) {
|
|
@@ -20,6 +19,26 @@ async function getPiletContentDir(root: string, packageData: any) {
|
|
|
20
19
|
return root;
|
|
21
20
|
}
|
|
22
21
|
|
|
22
|
+
async function getUniqueFiles(files: Array<string>) {
|
|
23
|
+
const result: Array<string> = [];
|
|
24
|
+
|
|
25
|
+
for (const file of files) {
|
|
26
|
+
const isDirectory = await checkIsDirectory(file);
|
|
27
|
+
|
|
28
|
+
if (isDirectory) {
|
|
29
|
+
const names = await getFileNames(file);
|
|
30
|
+
const subFiles = names.map((name) => resolve(file, name));
|
|
31
|
+
const items = await getUniqueFiles(subFiles);
|
|
32
|
+
const unique = items.filter((m) => onlyUniqueFiles(m, result.length, result));
|
|
33
|
+
result.push(...unique);
|
|
34
|
+
} else if (onlyUniqueFiles(file, result.length, result)) {
|
|
35
|
+
result.push(file);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
return result;
|
|
40
|
+
}
|
|
41
|
+
|
|
23
42
|
export async function createPiletPackage(baseDir: string, source: string, target: string) {
|
|
24
43
|
const root = resolve(baseDir, source);
|
|
25
44
|
const dest = resolve(baseDir, target);
|
|
@@ -53,36 +72,29 @@ export async function createPiletPackage(baseDir: string, source: string, target
|
|
|
53
72
|
const readme = resolve(root, 'README.md');
|
|
54
73
|
|
|
55
74
|
if (Array.isArray(pckg.files)) {
|
|
56
|
-
|
|
75
|
+
const additionalFiles = pckg.files
|
|
76
|
+
.filter((f: string) => typeof f === 'string')
|
|
77
|
+
.map((f: string) => resolve(root, f));
|
|
78
|
+
files.push(...additionalFiles);
|
|
57
79
|
}
|
|
58
80
|
|
|
59
81
|
if (await checkExists(readme)) {
|
|
60
82
|
files.push(readme);
|
|
61
83
|
}
|
|
62
84
|
|
|
63
|
-
|
|
64
|
-
const
|
|
65
|
-
const uniqueFiles = files.filter(onlyUniqueFiles);
|
|
66
|
-
log('generalDebug_0003', `Creating package with content from "${content}" ...`);
|
|
67
|
-
|
|
68
|
-
await Promise.all(uniqueFiles.map((file) => copy(file, resolve(cwd, relative(root, file)))));
|
|
85
|
+
log('generalDebug_0003', `Reading out unique files from "${content}" ...`);
|
|
86
|
+
const uniqueFiles = await getUniqueFiles(files);
|
|
69
87
|
|
|
70
88
|
log('generalDebug_0003', `Creating directory if not exist for "${file}" ...`);
|
|
71
|
-
|
|
72
89
|
await createDirectory(dirname(file));
|
|
73
90
|
|
|
74
91
|
log('generalDebug_0003', `Creating compressed archive at "${file}" relative to "${root}" ...`);
|
|
75
|
-
|
|
76
92
|
await createTgz(
|
|
77
93
|
file,
|
|
78
|
-
|
|
94
|
+
root,
|
|
79
95
|
uniqueFiles.map((file) => relative(root, file)),
|
|
80
96
|
);
|
|
81
97
|
|
|
82
|
-
log('generalDebug_0003', `Successfully created package from "${
|
|
83
|
-
|
|
84
|
-
await removeDirectory(cwd);
|
|
85
|
-
|
|
86
|
-
log('generalDebug_0003', `Packed file "${file}".`);
|
|
98
|
+
log('generalDebug_0003', `Successfully created package "${file}" from "${root}".`);
|
|
87
99
|
return file;
|
|
88
100
|
}
|
package/src/common/package.ts
CHANGED
|
@@ -807,7 +807,7 @@ export async function retrievePiletData(target: string, app?: string) {
|
|
|
807
807
|
});
|
|
808
808
|
}
|
|
809
809
|
|
|
810
|
-
const importmap = await readImportmap(root, piletPackage);
|
|
810
|
+
const importmap = await readImportmap(root, piletPackage, undefined, piletDefinition?.importmapVersions);
|
|
811
811
|
|
|
812
812
|
return {
|
|
813
813
|
dependencies: piletPackage.dependencies || {},
|
package/src/types/internal.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import type { LogLevels } from './common';
|
|
2
|
-
import type { PiletSchemaVersion } from './public';
|
|
2
|
+
import type { ImportmapVersions, PiletSchemaVersion } from './public';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Shape of the pilet.json
|
|
6
6
|
*/
|
|
7
7
|
export interface PiletDefinition {
|
|
8
8
|
schemaVersion?: PiletSchemaVersion;
|
|
9
|
+
importmapVersions?: ImportmapVersions;
|
|
9
10
|
piralInstances?: Record<
|
|
10
11
|
string,
|
|
11
12
|
{
|
package/src/types/public.ts
CHANGED
|
@@ -219,6 +219,8 @@ export interface BundlerDefinition {
|
|
|
219
219
|
buildPilet: BuildPiletBundlerDefinition;
|
|
220
220
|
}
|
|
221
221
|
|
|
222
|
+
export type ImportmapVersions = 'all' | 'match-major' | 'any-patch' | 'exact';
|
|
223
|
+
|
|
222
224
|
export type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2' | 'v3';
|
|
223
225
|
|
|
224
226
|
export type SourceLanguage = 'js' | 'ts';
|