piral-cli 1.4.0-beta.6250 → 1.4.0-beta.6253
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/api.js +8 -17
- package/lib/api.js.map +1 -1
- package/lib/apps/add-piral-instance-pilet.js +20 -31
- package/lib/apps/add-piral-instance-pilet.js.map +1 -1
- package/lib/apps/build-pilet.js +139 -147
- package/lib/apps/build-pilet.js.map +1 -1
- package/lib/apps/build-piral.js +130 -144
- package/lib/apps/build-piral.js.map +1 -1
- package/lib/apps/debug-pilet.js +107 -119
- package/lib/apps/debug-pilet.js.map +1 -1
- package/lib/apps/debug-piral.js +62 -70
- package/lib/apps/debug-piral.js.map +1 -1
- package/lib/apps/declaration-piral.js +6 -17
- package/lib/apps/declaration-piral.js.map +1 -1
- package/lib/apps/new-pilet.js +71 -82
- package/lib/apps/new-pilet.js.map +1 -1
- package/lib/apps/new-piral.js +42 -53
- package/lib/apps/new-piral.js.map +1 -1
- package/lib/apps/pack-pilet.js +7 -18
- package/lib/apps/pack-pilet.js.map +1 -1
- package/lib/apps/publish-pilet.js +127 -141
- package/lib/apps/publish-pilet.js.map +1 -1
- package/lib/apps/publish-piral.js +48 -63
- package/lib/apps/publish-piral.js.map +1 -1
- package/lib/apps/remove-piral-instance-pilet.js +30 -35
- package/lib/apps/remove-piral-instance-pilet.js.map +1 -1
- package/lib/apps/run-emulator-piral.js +49 -61
- package/lib/apps/run-emulator-piral.js.map +1 -1
- package/lib/apps/upgrade-pilet.js +64 -76
- package/lib/apps/upgrade-pilet.js.map +1 -1
- package/lib/apps/upgrade-piral.js +31 -43
- package/lib/apps/upgrade-piral.js.map +1 -1
- package/lib/apps/validate-pilet.js +34 -45
- package/lib/apps/validate-pilet.js.map +1 -1
- package/lib/apps/validate-piral.js +29 -51
- package/lib/apps/validate-piral.js.map +1 -1
- package/lib/build/bundler-calls.js +12 -3
- package/lib/build/bundler-calls.js.map +1 -1
- package/lib/build/run-build-pilet.js +5 -14
- package/lib/build/run-build-pilet.js.map +1 -1
- package/lib/build/run-build-piral.js +5 -14
- package/lib/build/run-build-piral.js.map +1 -1
- package/lib/build/run-debug-mono-piral.js +5 -14
- package/lib/build/run-debug-mono-piral.js.map +1 -1
- package/lib/build/run-debug-pilet.js +5 -14
- package/lib/build/run-debug-pilet.js.map +1 -1
- package/lib/build/run-debug-piral.js +5 -14
- package/lib/build/run-debug-piral.js.map +1 -1
- package/lib/bundler.js +100 -127
- package/lib/bundler.js.map +1 -1
- package/lib/commands.js +5 -1
- package/lib/commands.js.map +1 -1
- package/lib/common/browser.js +13 -26
- package/lib/common/browser.js.map +1 -1
- package/lib/common/compatibility.js +10 -21
- package/lib/common/compatibility.js.map +1 -1
- package/lib/common/declaration.js +80 -101
- package/lib/common/declaration.js.map +1 -1
- package/lib/common/emulator.js +186 -182
- package/lib/common/emulator.js.map +1 -1
- package/lib/common/http.js +7 -4
- package/lib/common/http.js.map +1 -1
- package/lib/common/importmap.js +172 -187
- package/lib/common/importmap.js.map +1 -1
- package/lib/common/injectors.js +4 -1
- package/lib/common/injectors.js.map +1 -1
- package/lib/common/inspect.js +5 -2
- package/lib/common/inspect.js.map +1 -1
- package/lib/common/interactive.js +9 -15
- package/lib/common/interactive.js.map +1 -1
- package/lib/common/io.js +256 -299
- package/lib/common/io.js.map +1 -1
- package/lib/common/language.js +21 -5
- package/lib/common/language.js.map +1 -1
- package/lib/common/npm.js +193 -228
- package/lib/common/npm.js.map +1 -1
- package/lib/common/pack.js +71 -86
- package/lib/common/pack.js.map +1 -1
- package/lib/common/package.js +428 -448
- package/lib/common/package.js.map +1 -1
- package/lib/common/parallel.js +12 -23
- package/lib/common/parallel.js.map +1 -1
- package/lib/common/patcher.js +54 -71
- package/lib/common/patcher.js.map +1 -1
- package/lib/common/platform.js +1 -12
- package/lib/common/platform.js.map +1 -1
- package/lib/common/port.js +11 -24
- package/lib/common/port.js.map +1 -1
- package/lib/common/rules.js +6 -17
- package/lib/common/rules.js.map +1 -1
- package/lib/common/scaffold.js +52 -59
- package/lib/common/scaffold.js.map +1 -1
- package/lib/common/shell.js +50 -58
- package/lib/common/shell.js.map +1 -1
- package/lib/common/spec.js +1 -1
- package/lib/common/spec.js.map +1 -1
- package/lib/common/template.js +3 -14
- package/lib/common/template.js.map +1 -1
- package/lib/common/watcher.js +7 -16
- package/lib/common/watcher.js.map +1 -1
- package/lib/common/website.d.ts +5 -1
- package/lib/common/website.js +71 -57
- package/lib/common/website.js.map +1 -1
- package/lib/injectors/pilet-injector.js +138 -145
- package/lib/injectors/pilet-injector.js.map +1 -1
- package/lib/injectors/piral-injector.js +55 -67
- package/lib/injectors/piral-injector.js.map +1 -1
- package/lib/messages.d.ts +81 -0
- package/lib/messages.js +94 -1
- package/lib/messages.js.map +1 -1
- package/lib/npm-clients/bun.js +36 -60
- package/lib/npm-clients/bun.js.map +1 -1
- package/lib/npm-clients/index.js +10 -21
- package/lib/npm-clients/index.js.map +1 -1
- package/lib/npm-clients/lerna.js +48 -72
- package/lib/npm-clients/lerna.js.map +1 -1
- package/lib/npm-clients/npm.js +69 -105
- package/lib/npm-clients/npm.js.map +1 -1
- package/lib/npm-clients/pnp.js +35 -59
- package/lib/npm-clients/pnp.js.map +1 -1
- package/lib/npm-clients/pnpm.js +35 -59
- package/lib/npm-clients/pnpm.js.map +1 -1
- package/lib/npm-clients/rush.js +53 -77
- package/lib/npm-clients/rush.js.map +1 -1
- package/lib/npm-clients/yarn.js +35 -59
- package/lib/npm-clients/yarn.js.map +1 -1
- package/lib/platforms/node.js +4 -17
- package/lib/platforms/node.js.map +1 -1
- package/lib/platforms/web.js +81 -96
- package/lib/platforms/web.js.map +1 -1
- package/lib/plugin.js +56 -75
- package/lib/plugin.js.map +1 -1
- package/lib/questionnaire.js +46 -12
- package/lib/questionnaire.js.map +1 -1
- package/lib/release.js +32 -47
- package/lib/release.js.map +1 -1
- package/lib/rules/index.js +10 -23
- package/lib/rules/index.js.map +1 -1
- package/lib/rules/pilet-has-externals-as-peers.js +34 -45
- package/lib/rules/pilet-has-externals-as-peers.js.map +1 -1
- package/lib/rules/pilet-has-no-self-reference.js +16 -27
- package/lib/rules/pilet-has-no-self-reference.js.map +1 -1
- package/lib/rules/pilet-has-non-conflicting-css.js +27 -42
- package/lib/rules/pilet-has-non-conflicting-css.js.map +1 -1
- package/lib/rules/pilet-stays-small.js +20 -33
- package/lib/rules/pilet-stays-small.js.map +1 -1
- package/lib/rules/pilet-uses-latest-piral.js +17 -28
- package/lib/rules/pilet-uses-latest-piral.js.map +1 -1
- package/lib/rules/piral-has-valid-devDependencies.js +4 -1
- package/lib/rules/piral-has-valid-devDependencies.js.map +1 -1
- package/lib/runner.js +3 -12
- package/lib/runner.js.map +1 -1
- package/lib/select.js +21 -32
- package/lib/select.js.map +1 -1
- package/lib/start.js +6 -17
- package/lib/start.js.map +1 -1
- package/package.json +2 -2
- package/src/apps/build-piral.test.ts +1 -1
- package/src/common/package.ts +23 -17
- package/src/common/shell.ts +2 -1
- package/src/common/website.ts +47 -16
- package/src/injectors/pilet-injector.ts +12 -2
- package/src/messages.ts +93 -0
package/lib/common/importmap.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.readImportmap = void 0;
|
|
13
4
|
const path_1 = require("path");
|
|
@@ -57,214 +48,208 @@ function getDependencyDetails(depName, availableSpecs) {
|
|
|
57
48
|
return [assetName, name, version, isAsync];
|
|
58
49
|
}
|
|
59
50
|
}
|
|
60
|
-
function getLocalDependencyVersion(packageJson, depName, versionSpec, versionBehavior) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
if (versionSpec) {
|
|
66
|
-
|
|
67
|
-
(0, log_1.fail)('importMapVersionSpecInvalid_0026', depName);
|
|
68
|
-
}
|
|
69
|
-
if (!(0, version_1.satisfies)(details.version, versionSpec)) {
|
|
70
|
-
(0, log_1.fail)('importMapVersionSpecNotSatisfied_0025', depName, details.version, versionSpec);
|
|
71
|
-
}
|
|
72
|
-
return [details.name, details.version, versionSpec];
|
|
51
|
+
async function getLocalDependencyVersion(packageJson, depName, versionSpec, versionBehavior) {
|
|
52
|
+
const packageDir = (0, path_1.dirname)(packageJson);
|
|
53
|
+
const packageFile = (0, path_1.basename)(packageJson);
|
|
54
|
+
const details = await (0, io_1.readJson)(packageDir, packageFile);
|
|
55
|
+
if (versionSpec) {
|
|
56
|
+
if (!(0, version_1.validate)(versionSpec)) {
|
|
57
|
+
(0, log_1.fail)('importMapVersionSpecInvalid_0026', depName);
|
|
73
58
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
return [details.name, details.version, '*'];
|
|
77
|
-
case 'match-major':
|
|
78
|
-
return [details.name, details.version, getMatchMajor(details.version)];
|
|
79
|
-
case 'any-patch':
|
|
80
|
-
return [details.name, details.version, getAnyPatch(details.version)];
|
|
81
|
-
case 'exact':
|
|
82
|
-
default:
|
|
83
|
-
return [details.name, details.version, details.version];
|
|
59
|
+
if (!(0, version_1.satisfies)(details.version, versionSpec)) {
|
|
60
|
+
(0, log_1.fail)('importMapVersionSpecNotSatisfied_0025', depName, details.version, versionSpec);
|
|
84
61
|
}
|
|
85
|
-
|
|
62
|
+
return [details.name, details.version, versionSpec];
|
|
63
|
+
}
|
|
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
|
+
}
|
|
75
|
+
}
|
|
76
|
+
async function getInheritedDependencies(inheritedImport, dir, excludedDependencies, inheritanceBehavior) {
|
|
77
|
+
const packageJson = (0, npm_1.tryResolvePackage)(`${inheritedImport}/package.json`, dir);
|
|
78
|
+
if (packageJson) {
|
|
79
|
+
const packageDir = (0, path_1.dirname)(packageJson);
|
|
80
|
+
const packageDetails = await (0, io_1.readJson)(packageDir, 'package.json');
|
|
81
|
+
return await consumeImportmap(packageDir, packageDetails, true, 'exact', inheritanceBehavior, excludedDependencies);
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
const directImportmap = (0, npm_1.tryResolvePackage)(inheritedImport, dir);
|
|
85
|
+
if (directImportmap) {
|
|
86
|
+
const baseDir = (0, path_1.dirname)(directImportmap);
|
|
87
|
+
const content = await (0, io_1.readJson)(baseDir, (0, path_1.basename)(directImportmap));
|
|
88
|
+
return await resolveImportmap(baseDir, content, {
|
|
89
|
+
availableSpecs: {},
|
|
90
|
+
inheritanceBehavior,
|
|
91
|
+
excludedDependencies,
|
|
92
|
+
ignoreFailure: true,
|
|
93
|
+
versionBehavior: 'exact',
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return [];
|
|
86
98
|
}
|
|
87
|
-
function
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
99
|
+
async function resolveImportmap(dir, importmap, options) {
|
|
100
|
+
const dependencies = [];
|
|
101
|
+
const sharedImports = importmap?.imports;
|
|
102
|
+
const inheritedImports = importmap?.inherit;
|
|
103
|
+
const excludedImports = importmap?.exclude;
|
|
104
|
+
const onUnresolved = (name, version) => {
|
|
105
|
+
if (options.ignoreFailure) {
|
|
106
|
+
const id = version ? `${name}@${version}` : name;
|
|
107
|
+
(0, log_1.log)('skipUnresolvedDependency_0054', id);
|
|
94
108
|
}
|
|
95
109
|
else {
|
|
96
|
-
|
|
97
|
-
if (directImportmap) {
|
|
98
|
-
const baseDir = (0, path_1.dirname)(directImportmap);
|
|
99
|
-
const content = yield (0, io_1.readJson)(baseDir, (0, path_1.basename)(directImportmap));
|
|
100
|
-
return yield resolveImportmap(baseDir, content, {
|
|
101
|
-
availableSpecs: {},
|
|
102
|
-
inheritanceBehavior,
|
|
103
|
-
excludedDependencies,
|
|
104
|
-
ignoreFailure: true,
|
|
105
|
-
versionBehavior: 'exact',
|
|
106
|
-
});
|
|
107
|
-
}
|
|
110
|
+
(0, log_1.fail)('importMapReferenceNotFound_0027', dir, name);
|
|
108
111
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
const inheritedImports = importmap === null || importmap === void 0 ? void 0 : importmap.inherit;
|
|
117
|
-
const excludedImports = importmap === null || importmap === void 0 ? void 0 : importmap.exclude;
|
|
118
|
-
const onUnresolved = (name, version) => {
|
|
119
|
-
if (options.ignoreFailure) {
|
|
120
|
-
const id = version ? `${name}@${version}` : name;
|
|
121
|
-
(0, log_1.log)('skipUnresolvedDependency_0054', id);
|
|
112
|
+
};
|
|
113
|
+
if (typeof sharedImports === 'object' && sharedImports) {
|
|
114
|
+
for (const depName of Object.keys(sharedImports)) {
|
|
115
|
+
const url = sharedImports[depName];
|
|
116
|
+
const [assetName, identifier, versionSpec, isAsync] = getDependencyDetails(depName, options.availableSpecs);
|
|
117
|
+
if (options.excludedDependencies.includes(identifier)) {
|
|
118
|
+
continue;
|
|
122
119
|
}
|
|
123
|
-
else {
|
|
124
|
-
(0, log_1.
|
|
120
|
+
else if (typeof url !== 'string') {
|
|
121
|
+
(0, log_1.log)('generalInfo_0000', `The value of "${depName}" in the importmap is not a string and will be ignored.`);
|
|
125
122
|
}
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
123
|
+
else if (/^https?:\/\//.test(url)) {
|
|
124
|
+
const hash = (0, hash_1.computeHash)(url).substring(0, 7);
|
|
125
|
+
dependencies.push({
|
|
126
|
+
id: `${identifier}@${hash}`,
|
|
127
|
+
requireId: `${identifier}@${hash}`,
|
|
128
|
+
entry: url,
|
|
129
|
+
name: identifier,
|
|
130
|
+
ref: url,
|
|
131
|
+
type: 'remote',
|
|
132
|
+
isAsync,
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
else if (url === identifier || shorthandsUrls.includes(url)) {
|
|
136
|
+
const entry = (0, npm_1.tryResolvePackage)(identifier, dir);
|
|
137
|
+
if (entry) {
|
|
138
|
+
const packageJson = await (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
139
|
+
const [realIdentifier, version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec, options.versionBehavior);
|
|
140
|
+
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName, isAsync);
|
|
133
141
|
}
|
|
134
|
-
else
|
|
135
|
-
(
|
|
142
|
+
else {
|
|
143
|
+
onUnresolved(identifier, versionSpec);
|
|
136
144
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
ref: url,
|
|
145
|
-
type: 'remote',
|
|
146
|
-
isAsync,
|
|
147
|
-
});
|
|
145
|
+
}
|
|
146
|
+
else if (!url.startsWith('.') && !(0, path_1.isAbsolute)(url)) {
|
|
147
|
+
const entry = (0, npm_1.tryResolvePackage)(url, dir);
|
|
148
|
+
if (entry) {
|
|
149
|
+
const packageJson = await (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
150
|
+
const [realIdentifier, version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec, options.versionBehavior);
|
|
151
|
+
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName, isAsync);
|
|
148
152
|
}
|
|
149
|
-
else
|
|
150
|
-
|
|
151
|
-
if (entry) {
|
|
152
|
-
const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
153
|
-
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec, options.versionBehavior);
|
|
154
|
-
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, entry, assetName, isAsync);
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
onUnresolved(identifier, versionSpec);
|
|
158
|
-
}
|
|
153
|
+
else {
|
|
154
|
+
onUnresolved(url, versionSpec);
|
|
159
155
|
}
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
const entry = (0, path_1.resolve)(dir, url);
|
|
159
|
+
const exists = await (0, io_1.checkExists)(entry);
|
|
160
|
+
if (exists) {
|
|
161
|
+
const isDirectory = await (0, io_1.checkIsDirectory)(entry);
|
|
162
|
+
const packageJson = isDirectory
|
|
163
|
+
? (0, path_1.resolve)(entry, 'package.json')
|
|
164
|
+
: await (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
165
|
+
const packageJsonExists = await (0, io_1.checkExists)(packageJson);
|
|
166
|
+
if (packageJsonExists) {
|
|
167
|
+
const [realIdentifier, version, requireVersion] = await getLocalDependencyVersion(packageJson, depName, versionSpec, options.versionBehavior);
|
|
168
|
+
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry, assetName, isAsync);
|
|
169
|
+
}
|
|
170
|
+
else if (isDirectory) {
|
|
171
|
+
onUnresolved(entry, versionSpec);
|
|
166
172
|
}
|
|
167
173
|
else {
|
|
168
|
-
|
|
174
|
+
const hash = await (0, io_1.getHash)(entry);
|
|
175
|
+
dependencies.push({
|
|
176
|
+
id: `${identifier}@${hash}`,
|
|
177
|
+
requireId: `${identifier}@${hash}`,
|
|
178
|
+
entry,
|
|
179
|
+
name: identifier,
|
|
180
|
+
ref: `${assetName}.js`,
|
|
181
|
+
type: 'local',
|
|
182
|
+
isAsync,
|
|
183
|
+
});
|
|
169
184
|
}
|
|
170
185
|
}
|
|
171
186
|
else {
|
|
172
|
-
|
|
173
|
-
const exists = yield (0, io_1.checkExists)(entry);
|
|
174
|
-
if (exists) {
|
|
175
|
-
const isDirectory = yield (0, io_1.checkIsDirectory)(entry);
|
|
176
|
-
const packageJson = isDirectory
|
|
177
|
-
? (0, path_1.resolve)(entry, 'package.json')
|
|
178
|
-
: yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
179
|
-
const packageJsonExists = yield (0, io_1.checkExists)(packageJson);
|
|
180
|
-
if (packageJsonExists) {
|
|
181
|
-
const [realIdentifier, version, requireVersion] = yield getLocalDependencyVersion(packageJson, depName, versionSpec, options.versionBehavior);
|
|
182
|
-
addLocalDependencies(dependencies, realIdentifier, identifier, version, requireVersion, isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry, assetName, isAsync);
|
|
183
|
-
}
|
|
184
|
-
else if (isDirectory) {
|
|
185
|
-
onUnresolved(entry, versionSpec);
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
const hash = yield (0, io_1.getHash)(entry);
|
|
189
|
-
dependencies.push({
|
|
190
|
-
id: `${identifier}@${hash}`,
|
|
191
|
-
requireId: `${identifier}@${hash}`,
|
|
192
|
-
entry,
|
|
193
|
-
name: identifier,
|
|
194
|
-
ref: `${assetName}.js`,
|
|
195
|
-
type: 'local',
|
|
196
|
-
isAsync,
|
|
197
|
-
});
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
else {
|
|
201
|
-
onUnresolved(url, versionSpec);
|
|
202
|
-
}
|
|
187
|
+
onUnresolved(url, versionSpec);
|
|
203
188
|
}
|
|
204
189
|
}
|
|
205
190
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
}
|
|
191
|
+
}
|
|
192
|
+
if (Array.isArray(inheritedImports)) {
|
|
193
|
+
const includedImports = [...options.excludedDependencies, ...dependencies.map((m) => m.name)];
|
|
194
|
+
const excluded = Array.isArray(excludedImports) ? [...includedImports, ...excludedImports] : includedImports;
|
|
195
|
+
for (const inheritedImport of inheritedImports) {
|
|
196
|
+
const otherDependencies = await getInheritedDependencies(inheritedImport, dir, excluded, options.inheritanceBehavior);
|
|
197
|
+
for (const dependency of otherDependencies) {
|
|
198
|
+
const entry = dependencies.find((dep) => dep.name === dependency.name);
|
|
199
|
+
if (!entry) {
|
|
200
|
+
dependencies.push({
|
|
201
|
+
...dependency,
|
|
202
|
+
parents: [inheritedImport],
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
else if (Array.isArray(entry.parents)) {
|
|
206
|
+
entry.parents.push(inheritedImport);
|
|
219
207
|
}
|
|
220
208
|
}
|
|
221
209
|
}
|
|
222
|
-
|
|
223
|
-
|
|
210
|
+
}
|
|
211
|
+
return dependencies;
|
|
224
212
|
}
|
|
225
|
-
function consumeImportmap(dir, packageDetails, inherited, versionBehavior, mode, excludedDependencies) {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
const
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
if (content === notFound) {
|
|
236
|
-
(0, log_1.fail)('importMapFileNotFound_0028', dir, importmap);
|
|
237
|
-
}
|
|
238
|
-
const baseDir = (0, path_1.dirname)((0, path_1.resolve)(dir, importmap));
|
|
239
|
-
return yield resolveImportmap(baseDir, content, {
|
|
240
|
-
availableSpecs,
|
|
241
|
-
ignoreFailure: inherited,
|
|
242
|
-
excludedDependencies,
|
|
243
|
-
versionBehavior,
|
|
244
|
-
inheritanceBehavior,
|
|
245
|
-
});
|
|
213
|
+
async function consumeImportmap(dir, packageDetails, inherited, versionBehavior, mode, excludedDependencies) {
|
|
214
|
+
const importmap = packageDetails.importmap;
|
|
215
|
+
const appShell = inherited && mode === 'remote';
|
|
216
|
+
const availableSpecs = appShell ? packageDetails.devDependencies ?? {} : {};
|
|
217
|
+
const inheritanceBehavior = appShell ? 'host' : mode;
|
|
218
|
+
if (typeof importmap === 'string') {
|
|
219
|
+
const notFound = {};
|
|
220
|
+
const content = await (0, io_1.readJson)(dir, importmap, notFound);
|
|
221
|
+
if (content === notFound) {
|
|
222
|
+
(0, log_1.fail)('importMapFileNotFound_0028', dir, importmap);
|
|
246
223
|
}
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
const shared = (_b = packageDetails.sharedDependencies) !== null && _b !== void 0 ? _b : (_c = packageDetails.pilets) === null || _c === void 0 ? void 0 : _c.externals;
|
|
250
|
-
if (Array.isArray(shared)) {
|
|
251
|
-
return shared.map((dep) => ({
|
|
252
|
-
id: dep,
|
|
253
|
-
name: dep,
|
|
254
|
-
entry: dep,
|
|
255
|
-
type: 'local',
|
|
256
|
-
ref: undefined,
|
|
257
|
-
requireId: dep,
|
|
258
|
-
}));
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
return yield resolveImportmap(dir, importmap, {
|
|
224
|
+
const baseDir = (0, path_1.dirname)((0, path_1.resolve)(dir, importmap));
|
|
225
|
+
return await resolveImportmap(baseDir, content, {
|
|
262
226
|
availableSpecs,
|
|
263
|
-
excludedDependencies,
|
|
264
227
|
ignoreFailure: inherited,
|
|
228
|
+
excludedDependencies,
|
|
265
229
|
versionBehavior,
|
|
266
230
|
inheritanceBehavior,
|
|
267
231
|
});
|
|
232
|
+
}
|
|
233
|
+
else if (typeof importmap === 'undefined' && inherited) {
|
|
234
|
+
// Fall back to sharedDependencies or pilets.external if available
|
|
235
|
+
const shared = packageDetails.sharedDependencies ?? packageDetails.pilets?.externals;
|
|
236
|
+
if (Array.isArray(shared)) {
|
|
237
|
+
return shared.map((dep) => ({
|
|
238
|
+
id: dep,
|
|
239
|
+
name: dep,
|
|
240
|
+
entry: dep,
|
|
241
|
+
type: 'local',
|
|
242
|
+
ref: undefined,
|
|
243
|
+
requireId: dep,
|
|
244
|
+
}));
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
return await resolveImportmap(dir, importmap, {
|
|
248
|
+
availableSpecs,
|
|
249
|
+
excludedDependencies,
|
|
250
|
+
ignoreFailure: inherited,
|
|
251
|
+
versionBehavior,
|
|
252
|
+
inheritanceBehavior,
|
|
268
253
|
});
|
|
269
254
|
}
|
|
270
255
|
function readImportmap(dir, packageDetails, versionBehavior = 'exact', inheritanceBehavior = 'remote') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
|
package/lib/common/injectors.js
CHANGED
|
@@ -19,7 +19,10 @@ function createInitialKrasConfig(directory, sources = [], map = {}, feed = []) {
|
|
|
19
19
|
return {
|
|
20
20
|
api: '/manage-mock-server',
|
|
21
21
|
directory,
|
|
22
|
-
map:
|
|
22
|
+
map: {
|
|
23
|
+
'/': '',
|
|
24
|
+
...map,
|
|
25
|
+
},
|
|
23
26
|
ssl: undefined,
|
|
24
27
|
sources,
|
|
25
28
|
injectorDirs: [(0, path_1.resolve)(__dirname, '../injectors')],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"injectors.js","sourceRoot":"","sources":["../../src/common/injectors.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,mCAAiD;AACjD,+BAA+C;AAC/C,0CAAoC;AAEpC,SAAgB,kBAAkB,CAAC,IAAY,EAAE,GAAmB;IAClE,OAAO,CAAC,GAAQ,EAAE,EAAE;QAClB,IAAA,SAAG,EAAC,mBAAmB,EAAE,0CAA0C,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,QAAQ,gBAAgB,gBAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACvE,IAAA,aAAO,EAAC,GAAG,gBAAQ,eAAe,gBAAK,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAChE,IAAA,aAAO,EAAC,GAAG,oBAAY,eAAe,gBAAK,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,IAAA,cAAQ,GAAE,CAAC;IACb,CAAC,CAAC;AACJ,CAAC;AARD,gDAQC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,UAAyB,EAAE,EAC3B,MAA8B,EAAE,EAChC,OAA+B,EAAE;IAEjC,OAAO;QACL,GAAG,EAAE,qBAAqB;QAC1B,SAAS;QACT,GAAG,
|
|
1
|
+
{"version":3,"file":"injectors.js","sourceRoot":"","sources":["../../src/common/injectors.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,mCAAiD;AACjD,+BAA+C;AAC/C,0CAAoC;AAEpC,SAAgB,kBAAkB,CAAC,IAAY,EAAE,GAAmB;IAClE,OAAO,CAAC,GAAQ,EAAE,EAAE;QAClB,IAAA,SAAG,EAAC,mBAAmB,EAAE,0CAA0C,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,QAAQ,gBAAgB,gBAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACvE,IAAA,aAAO,EAAC,GAAG,gBAAQ,eAAe,gBAAK,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAChE,IAAA,aAAO,EAAC,GAAG,oBAAY,eAAe,gBAAK,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,IAAA,cAAQ,GAAE,CAAC;IACb,CAAC,CAAC;AACJ,CAAC;AARD,gDAQC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,UAAyB,EAAE,EAC3B,MAA8B,EAAE,EAChC,OAA+B,EAAE;IAEjC,OAAO;QACL,GAAG,EAAE,qBAAqB;QAC1B,SAAS;QACT,GAAG,EAAE;YACH,GAAG,EAAE,EAAE;YACP,GAAG,GAAG;SACP;QACD,GAAG,EAAE,SAAS;QACd,OAAO;QACP,YAAY,EAAE,CAAC,IAAA,cAAO,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAClD,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;aACb;YACD,GAAG,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,KAAK;aACb;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,IAAI;gBACZ,SAAS,EAAE,IAAI;aAChB;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,EAAE;aACZ;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,EAAE;gBACX,IAAI;aACL;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF;KACF,CAAC;AACJ,CAAC;AA3CD,0DA2CC"}
|
package/lib/common/inspect.js
CHANGED
|
@@ -31,8 +31,11 @@ function inspectPilet(stream) {
|
|
|
31
31
|
const path = getPiletMainPath(data, files);
|
|
32
32
|
const root = (0, path_1.dirname)(path);
|
|
33
33
|
const main = (0, path_1.basename)(path);
|
|
34
|
-
return
|
|
35
|
-
|
|
34
|
+
return {
|
|
35
|
+
...data,
|
|
36
|
+
root,
|
|
37
|
+
main,
|
|
38
|
+
};
|
|
36
39
|
});
|
|
37
40
|
}
|
|
38
41
|
exports.inspectPilet = inspectPilet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/common/inspect.ts"],"names":[],"mappings":";;;AAAA,+BAAyC;AACzC,uCAAwC;AACxC,0CAAkC;AAGlC,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,KAAmB;IACzC,MAAM,QAAQ,GAAG,GAAG,WAAW,cAAc,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAsB;IAC9D,MAAM,EAAE,IAAI,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,GAAG,IAAI,WAAW,EAAE,QAAQ,IAAI,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;AAC1G,CAAC;AAHD,8DAGC;AAED,SAAgB,gBAAgB,CAAC,IAAsB,EAAE,KAAmB;IAC1E,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,WAAW,GAAG,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpG,CAAC;AAHD,4CAGC;AAMD,SAAgB,cAAc,CAAC,MAA6B;IAC1D,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,MAA6B;IACxD,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QAC5B,
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/common/inspect.ts"],"names":[],"mappings":";;;AAAA,+BAAyC;AACzC,uCAAwC;AACxC,0CAAkC;AAGlC,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,KAAmB;IACzC,MAAM,QAAQ,GAAG,GAAG,WAAW,cAAc,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,yBAAyB,CAAC,IAAsB;IAC9D,MAAM,EAAE,IAAI,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,GAAG,IAAI,WAAW,EAAE,QAAQ,IAAI,WAAW,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;AAC1G,CAAC;AAHD,8DAGC;AAED,SAAgB,gBAAgB,CAAC,IAAsB,EAAE,KAAmB;IAC1E,MAAM,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC9C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,WAAW,GAAG,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpG,CAAC;AAHD,4CAGC;AAMD,SAAgB,cAAc,CAAC,MAA6B;IAC1D,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,MAA6B;IACxD,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QAC5B,OAAO;YACL,GAAG,IAAI;YACP,IAAI;YACJ,IAAI;SACL,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getTokenInteractively = exports.promptConfirm = exports.promptSelect = void 0;
|
|
13
4
|
const browser_1 = require("./browser");
|
|
@@ -49,10 +40,13 @@ function getTokenInteractively(url, httpsAgent) {
|
|
|
49
40
|
clientName: 'Piral CLI',
|
|
50
41
|
description: 'Authorize the Piral CLI temporarily to perform actions in your name.',
|
|
51
42
|
}, {
|
|
52
|
-
headers:
|
|
43
|
+
headers: {
|
|
44
|
+
...info_1.standardHeaders,
|
|
45
|
+
'content-type': 'application/json',
|
|
46
|
+
},
|
|
53
47
|
httpsAgent,
|
|
54
48
|
})
|
|
55
|
-
.then((res) =>
|
|
49
|
+
.then(async (res) => {
|
|
56
50
|
const { loginUrl, callbackUrl, expires } = res.data;
|
|
57
51
|
const now = new Date();
|
|
58
52
|
const then = new Date(expires);
|
|
@@ -64,13 +58,13 @@ function getTokenInteractively(url, httpsAgent) {
|
|
|
64
58
|
(0, browser_1.openBrowserAt)(loginUrl);
|
|
65
59
|
try {
|
|
66
60
|
while (true) {
|
|
67
|
-
const { data, status } =
|
|
61
|
+
const { data, status } = await external_1.axios.default.get(callbackUrl);
|
|
68
62
|
if (status === 202) {
|
|
69
|
-
|
|
63
|
+
await new Promise(resolve => setTimeout(resolve, 5000));
|
|
70
64
|
continue;
|
|
71
65
|
}
|
|
72
66
|
if (status === 200) {
|
|
73
|
-
return
|
|
67
|
+
return { ...data };
|
|
74
68
|
}
|
|
75
69
|
throw new Error(`Could not get status from interactive login endpoint.`);
|
|
76
70
|
}
|
|
@@ -81,7 +75,7 @@ function getTokenInteractively(url, httpsAgent) {
|
|
|
81
75
|
finally {
|
|
82
76
|
logResume();
|
|
83
77
|
}
|
|
84
|
-
})
|
|
78
|
+
});
|
|
85
79
|
}
|
|
86
80
|
return tokenRetrievers[url];
|
|
87
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/common/interactive.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/common/interactive.ts"],"names":[],"mappings":"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"}
|