piral-cli 1.3.1-beta.6123 → 1.3.1-beta.6133

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/messages.d.ts CHANGED
@@ -453,7 +453,7 @@ export declare function packageVersionInvalid_0024(version: string): QuickMessag
453
453
  * The best way, however, is to look at the used version and adjust the specifier to be correct again.
454
454
  * Alternatively, change the used version to satisfy the constraint again.
455
455
  */
456
- export declare function importMapVersionSpecNotSatisfied_0025(depName: string, version: string): QuickMessage;
456
+ export declare function importMapVersionSpecNotSatisfied_0025(depName: string, availableVersion: string, specVersion: string): QuickMessage;
457
457
  /**
458
458
  * @kind Error
459
459
  *
package/lib/messages.js CHANGED
@@ -496,8 +496,12 @@ exports.packageVersionInvalid_0024 = packageVersionInvalid_0024;
496
496
  * The best way, however, is to look at the used version and adjust the specifier to be correct again.
497
497
  * Alternatively, change the used version to satisfy the constraint again.
498
498
  */
499
- function importMapVersionSpecNotSatisfied_0025(depName, version) {
500
- return [types_1.LogLevels.error, '0025', `The dependency "${depName}" in only available in version "${version}".`];
499
+ function importMapVersionSpecNotSatisfied_0025(depName, availableVersion, specVersion) {
500
+ return [
501
+ types_1.LogLevels.error,
502
+ '0025',
503
+ `The dependency "${depName}" is locally installed in version "${availableVersion}", but specified as "${specVersion}".`,
504
+ ];
501
505
  }
502
506
  exports.importMapVersionSpecNotSatisfied_0025 = importMapVersionSpecNotSatisfied_0025;
503
507
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"messages.js","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messages.js","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"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"}
@@ -2,5 +2,7 @@ import { PiletRuleContext } from '../types';
2
2
  export type Options = 'ignore' | 'active' | 'only-used';
3
3
  /**
4
4
  * Checks that "externals" dependencies have been specified in "peerDependencies".
5
+ * This is legacy and only used if no importmap has been specified.
6
+ * Importmap inherited dependencies are auto-checked.
5
7
  */
6
8
  export default function (context: PiletRuleContext, options?: Options): Promise<void>;
@@ -22,6 +22,8 @@ Received: Missing "${missingNames.join('", "')}".
22
22
  }
23
23
  /**
24
24
  * Checks that "externals" dependencies have been specified in "peerDependencies".
25
+ * This is legacy and only used if no importmap has been specified.
26
+ * Importmap inherited dependencies are auto-checked.
25
27
  */
26
28
  function default_1(context, options = 'ignore') {
27
29
  return __awaiter(this, void 0, void 0, function* () {
@@ -1 +1 @@
1
- {"version":3,"file":"pilet-has-externals-as-peers.js","sourceRoot":"","sources":["../../src/rules/pilet-has-externals-as-peers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pilet-has-externals-as-peers.js","sourceRoot":"","sources":["../../src/rules/pilet-has-externals-as-peers.ts"],"names":[],"mappings":"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"}
@@ -29,5 +29,5 @@ var LogLevels;
29
29
  * timestamps.
30
30
  */
31
31
  LogLevels[LogLevels["debug"] = 5] = "debug";
32
- })(LogLevels = exports.LogLevels || (exports.LogLevels = {}));
32
+ })(LogLevels || (exports.LogLevels = LogLevels = {}));
33
33
  //# sourceMappingURL=common.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":";;;AAoDA,IAAY,SA2BX;AA3BD,WAAY,SAAS;IACnB;;OAEG;IACH,iDAAY,CAAA;IACZ;;OAEG;IACH,2CAAS,CAAA;IACT;;OAEG;IACH,+CAAW,CAAA;IACX;;OAEG;IACH,yCAAQ,CAAA;IACR;;;OAGG;IACH,+CAAW,CAAA;IACX;;;OAGG;IACH,2CAAS,CAAA;AACX,CAAC,EA3BW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QA2BpB"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":";;;AAoDA,IAAY,SA2BX;AA3BD,WAAY,SAAS;IACnB;;OAEG;IACH,iDAAY,CAAA;IACZ;;OAEG;IACH,2CAAS,CAAA;IACT;;OAEG;IACH,+CAAW,CAAA;IACX;;OAEG;IACH,yCAAQ,CAAA;IACR;;;OAGG;IACH,+CAAW,CAAA;IACX;;;OAGG;IACH,2CAAS,CAAA;AACX,CAAC,EA3BW,SAAS,yBAAT,SAAS,QA2BpB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "1.3.1-beta.6123",
3
+ "version": "1.3.1-beta.6133",
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": "6d081fe76dd372ae5f77051095576e1c69657eb7"
84
+ "gitHead": "753b70c9eb69d73f0277952e22100ab16a3cfd43"
85
85
  }
@@ -61,28 +61,20 @@ jest.mock('./io', () => ({
61
61
 
62
62
  describe('Importmap', () => {
63
63
  it('reads empty one from package.json', async () => {
64
- const deps = await readImportmap(
65
- '/data',
66
- {
67
- importmap: {},
68
- },
69
- false,
70
- );
64
+ const deps = await readImportmap('/data', {
65
+ importmap: {},
66
+ });
71
67
  expect(deps).toEqual([]);
72
68
  });
73
69
 
74
70
  it('reads fully qualified local dependency', async () => {
75
- const deps = await readImportmap(
76
- '/data',
77
- {
78
- importmap: {
79
- imports: {
80
- 'foo@1.2.3': 'foo',
81
- },
71
+ const deps = await readImportmap('/data', {
72
+ importmap: {
73
+ imports: {
74
+ 'foo@1.2.3': 'foo',
82
75
  },
83
76
  },
84
- false,
85
- );
77
+ });
86
78
  expect(deps).toEqual([
87
79
  {
88
80
  alias: undefined,
@@ -98,17 +90,13 @@ describe('Importmap', () => {
98
90
  });
99
91
 
100
92
  it('reads fully qualified local dependency with implied exact version', async () => {
101
- const deps = await readImportmap(
102
- '/data',
103
- {
104
- importmap: {
105
- imports: {
106
- foo: 'foo',
107
- },
93
+ const deps = await readImportmap('/data', {
94
+ importmap: {
95
+ imports: {
96
+ foo: 'foo',
108
97
  },
109
98
  },
110
- false,
111
- );
99
+ });
112
100
  expect(deps).toEqual([
113
101
  {
114
102
  alias: undefined,
@@ -133,7 +121,6 @@ describe('Importmap', () => {
133
121
  },
134
122
  },
135
123
  },
136
- false,
137
124
  'match-major',
138
125
  );
139
126
  expect(deps).toEqual([
@@ -160,7 +147,6 @@ describe('Importmap', () => {
160
147
  },
161
148
  },
162
149
  },
163
- false,
164
150
  'any-patch',
165
151
  );
166
152
  expect(deps).toEqual([
@@ -187,7 +173,6 @@ describe('Importmap', () => {
187
173
  },
188
174
  },
189
175
  },
190
- false,
191
176
  'all',
192
177
  );
193
178
  expect(deps).toEqual([
@@ -206,47 +191,35 @@ describe('Importmap', () => {
206
191
 
207
192
  it('fails when the local version does not match the desired version', async () => {
208
193
  await expect(
209
- readImportmap(
210
- '/data',
211
- {
212
- importmap: {
213
- imports: {
214
- 'bar@^2.0.0': '',
215
- },
194
+ readImportmap('/data', {
195
+ importmap: {
196
+ imports: {
197
+ 'bar@^2.0.0': '',
216
198
  },
217
199
  },
218
- false,
219
- ),
200
+ }),
220
201
  ).rejects.toThrow();
221
202
  });
222
203
 
223
204
  it('fails when the explicitly shared package is not installed', async () => {
224
205
  await expect(
225
- readImportmap(
226
- '/data',
227
- {
228
- importmap: {
229
- imports: {
230
- 'qxz': '',
231
- },
206
+ readImportmap('/data', {
207
+ importmap: {
208
+ imports: {
209
+ qxz: '',
232
210
  },
233
211
  },
234
- false,
235
- ),
212
+ }),
236
213
  ).rejects.toThrow();
237
214
  });
238
215
 
239
216
  it('accepts an importmap with valid resolvable inherited deps', async () => {
240
- const deps = await readImportmap(
241
- '/data',
242
- {
243
- importmap: {
244
- imports: {},
245
- inherit: ['app1'],
246
- },
217
+ const deps = await readImportmap('/data', {
218
+ importmap: {
219
+ imports: {},
220
+ inherit: ['app1'],
247
221
  },
248
- false,
249
- );
222
+ });
250
223
  expect(deps).toEqual([
251
224
  {
252
225
  alias: undefined,
@@ -263,16 +236,12 @@ describe('Importmap', () => {
263
236
  });
264
237
 
265
238
  it('accepts an importmap with valid but unresolvable inherited deps', async () => {
266
- const deps = await readImportmap(
267
- '/data',
268
- {
269
- importmap: {
270
- imports: {},
271
- inherit: ['app2'],
272
- },
239
+ const deps = await readImportmap('/data', {
240
+ importmap: {
241
+ imports: {},
242
+ inherit: ['app2'],
273
243
  },
274
- false,
275
- );
244
+ });
276
245
  expect(deps).toEqual([]);
277
246
  });
278
247
  });
@@ -42,16 +42,28 @@ function getMatchMajor(version: string) {
42
42
  return `^${major}.0.0`;
43
43
  }
44
44
 
45
+ function makeAssetName(id: string) {
46
+ return (id.startsWith('@') ? id.substring(1) : id).replace(/[\/\.]/g, '-').replace(/(\-)+/, '-');
47
+ }
48
+
45
49
  function getDependencyDetails(
46
50
  depName: string,
51
+ availableSpecs: Record<string, string>,
47
52
  ): [assetName: string, identifier: string, versionSpec: string, isAsync: boolean] {
48
53
  const name = depName.replace(/\?+$/, '');
49
54
  const isAsync = depName.endsWith('?');
50
55
  const sep = name.indexOf('@', 1);
51
- const version = sep > 0 ? name.substring(sep + 1) : '';
52
- const id = sep > 0 ? name.substring(0, sep) : name;
53
- const assetName = (id.startsWith('@') ? id.substring(1) : id).replace(/[\/\.]/g, '-').replace(/(\-)+/, '-');
54
- return [assetName, id, version, isAsync];
56
+
57
+ if (sep > 0) {
58
+ const id = name.substring(0, sep);
59
+ const version = name.substring(sep + 1);
60
+ const assetName = makeAssetName(id);
61
+ return [assetName, id, version, isAsync];
62
+ } else {
63
+ const version = availableSpecs[name] || '';
64
+ const assetName = makeAssetName(name);
65
+ return [assetName, name, version, isAsync];
66
+ }
55
67
  }
56
68
 
57
69
  async function getLocalDependencyVersion(
@@ -70,7 +82,7 @@ async function getLocalDependencyVersion(
70
82
  }
71
83
 
72
84
  if (!satisfies(details.version, versionSpec)) {
73
- fail('importMapVersionSpecNotSatisfied_0025', depName, details.version);
85
+ fail('importMapVersionSpecNotSatisfied_0025', depName, details.version, versionSpec);
74
86
  }
75
87
 
76
88
  return [details.name, details.version, versionSpec];
@@ -89,13 +101,17 @@ async function getLocalDependencyVersion(
89
101
  }
90
102
  }
91
103
 
92
- async function getInheritedDependencies(inheritedImport: string, dir: string): Promise<Array<SharedDependency>> {
104
+ async function getInheritedDependencies(
105
+ inheritedImport: string,
106
+ dir: string,
107
+ excludedDependencies: Array<string>,
108
+ ): Promise<Array<SharedDependency>> {
93
109
  const packageJson = tryResolvePackage(`${inheritedImport}/package.json`, dir);
94
110
 
95
111
  if (packageJson) {
96
112
  const packageDir = dirname(packageJson);
97
113
  const packageDetails = await readJson(packageDir, 'package.json');
98
- return await readImportmap(packageDir, packageDetails, true, 'exact');
114
+ return await consumeImportmap(packageDir, packageDetails, true, 'exact', excludedDependencies);
99
115
  } else {
100
116
  const directImportmap = tryResolvePackage(inheritedImport, dir);
101
117
 
@@ -103,6 +119,8 @@ async function getInheritedDependencies(inheritedImport: string, dir: string): P
103
119
  const baseDir = dirname(directImportmap);
104
120
  const content = await readJson(baseDir, basename(directImportmap));
105
121
  return await resolveImportmap(baseDir, content, {
122
+ availableSpecs: {},
123
+ excludedDependencies,
106
124
  ignoreFailure: true,
107
125
  versionBehavior: 'exact',
108
126
  });
@@ -113,6 +131,8 @@ async function getInheritedDependencies(inheritedImport: string, dir: string): P
113
131
  }
114
132
 
115
133
  interface ImportmapResolutionOptions {
134
+ availableSpecs: Record<string, string>;
135
+ excludedDependencies: Array<string>;
116
136
  versionBehavior: ImportmapVersions;
117
137
  ignoreFailure: boolean;
118
138
  }
@@ -126,20 +146,24 @@ async function resolveImportmap(
126
146
  const sharedImports = importmap?.imports;
127
147
  const inheritedImports = importmap?.inherit;
128
148
  const excludedImports = importmap?.exclude;
129
- const onUnresolved = (entry: string) => {
149
+
150
+ const onUnresolved = (name: string, version: string) => {
130
151
  if (options.ignoreFailure) {
131
- log('skipUnresolvedDependency_0054', entry);
152
+ const id = version ? `${name}@${version}` : name;
153
+ log('skipUnresolvedDependency_0054', id);
132
154
  } else {
133
- fail('importMapReferenceNotFound_0027', dir, entry);
155
+ fail('importMapReferenceNotFound_0027', dir, name);
134
156
  }
135
157
  };
136
158
 
137
159
  if (typeof sharedImports === 'object' && sharedImports) {
138
160
  for (const depName of Object.keys(sharedImports)) {
139
161
  const url = sharedImports[depName];
140
- const [assetName, identifier, versionSpec, isAsync] = getDependencyDetails(depName);
162
+ const [assetName, identifier, versionSpec, isAsync] = getDependencyDetails(depName, options.availableSpecs);
141
163
 
142
- if (typeof url !== 'string') {
164
+ if (options.excludedDependencies.includes(identifier)) {
165
+ continue;
166
+ } else if (typeof url !== 'string') {
143
167
  log('generalInfo_0000', `The value of "${depName}" in the importmap is not a string and will be ignored.`);
144
168
  } else if (/^https?:\/\//.test(url)) {
145
169
  const hash = computeHash(url).substring(0, 7);
@@ -176,7 +200,7 @@ async function resolveImportmap(
176
200
  isAsync,
177
201
  );
178
202
  } else {
179
- onUnresolved(identifier);
203
+ onUnresolved(identifier, versionSpec);
180
204
  }
181
205
  } else if (!url.startsWith('.') && !isAbsolute(url)) {
182
206
  const entry = tryResolvePackage(url, dir);
@@ -201,7 +225,7 @@ async function resolveImportmap(
201
225
  isAsync,
202
226
  );
203
227
  } else {
204
- onUnresolved(url);
228
+ onUnresolved(url, versionSpec);
205
229
  }
206
230
  } else {
207
231
  const entry = resolve(dir, url);
@@ -233,7 +257,7 @@ async function resolveImportmap(
233
257
  isAsync,
234
258
  );
235
259
  } else if (isDirectory) {
236
- onUnresolved(entry);
260
+ onUnresolved(entry, versionSpec);
237
261
  } else {
238
262
  const hash = await getHash(entry);
239
263
 
@@ -248,21 +272,20 @@ async function resolveImportmap(
248
272
  });
249
273
  }
250
274
  } else {
251
- onUnresolved(url);
275
+ onUnresolved(url, versionSpec);
252
276
  }
253
277
  }
254
278
  }
255
279
  }
256
280
 
257
281
  if (Array.isArray(inheritedImports)) {
282
+ const includedImports = [...options.excludedDependencies, ...dependencies.map((m) => m.name)];
283
+ const excluded = Array.isArray(excludedImports) ? [...includedImports, ...excludedImports] : includedImports;
284
+
258
285
  for (const inheritedImport of inheritedImports) {
259
- const otherDependencies = await getInheritedDependencies(inheritedImport, dir);
286
+ const otherDependencies = await getInheritedDependencies(inheritedImport, dir, excluded);
260
287
 
261
288
  for (const dependency of otherDependencies) {
262
- if (Array.isArray(excludedImports) && excludedImports.includes(dependency.name)) {
263
- continue;
264
- }
265
-
266
289
  const entry = dependencies.find((dep) => dep.name === dependency.name);
267
290
 
268
291
  if (!entry) {
@@ -279,14 +302,15 @@ async function resolveImportmap(
279
302
 
280
303
  return dependencies;
281
304
  }
282
-
283
- export async function readImportmap(
305
+ async function consumeImportmap(
284
306
  dir: string,
285
307
  packageDetails: any,
286
- inherited = false,
287
- versionBehavior: ImportmapVersions = 'exact',
308
+ inherited: boolean,
309
+ versionBehavior: ImportmapVersions,
310
+ excludedDependencies: Array<string>,
288
311
  ): Promise<Array<SharedDependency>> {
289
312
  const importmap = packageDetails.importmap;
313
+ const availableSpecs = inherited ? packageDetails.devDependencies : {};
290
314
 
291
315
  if (typeof importmap === 'string') {
292
316
  const notFound = {};
@@ -298,7 +322,9 @@ export async function readImportmap(
298
322
 
299
323
  const baseDir = dirname(resolve(dir, importmap));
300
324
  return await resolveImportmap(baseDir, content, {
325
+ availableSpecs,
301
326
  ignoreFailure: inherited,
327
+ excludedDependencies,
302
328
  versionBehavior,
303
329
  });
304
330
  } else if (typeof importmap === 'undefined' && inherited) {
@@ -318,7 +344,17 @@ export async function readImportmap(
318
344
  }
319
345
 
320
346
  return await resolveImportmap(dir, importmap, {
347
+ availableSpecs,
348
+ excludedDependencies,
321
349
  ignoreFailure: inherited,
322
350
  versionBehavior,
323
351
  });
324
352
  }
353
+
354
+ export function readImportmap(
355
+ dir: string,
356
+ packageDetails: any,
357
+ versionBehavior: ImportmapVersions = 'exact',
358
+ ): Promise<Array<SharedDependency>> {
359
+ return consumeImportmap(dir, packageDetails, false, versionBehavior, []);
360
+ }
@@ -819,7 +819,7 @@ export async function retrievePiletData(target: string, app?: string) {
819
819
  });
820
820
  }
821
821
 
822
- const importmap = await readImportmap(root, piletPackage, undefined, piletDefinition?.importmapVersions);
822
+ const importmap = await readImportmap(root, piletPackage, piletDefinition?.importmapVersions);
823
823
 
824
824
  return {
825
825
  dependencies: piletPackage.dependencies || {},
package/src/messages.ts CHANGED
@@ -493,8 +493,16 @@ export function packageVersionInvalid_0024(version: string): QuickMessage {
493
493
  * The best way, however, is to look at the used version and adjust the specifier to be correct again.
494
494
  * Alternatively, change the used version to satisfy the constraint again.
495
495
  */
496
- export function importMapVersionSpecNotSatisfied_0025(depName: string, version: string): QuickMessage {
497
- return [LogLevels.error, '0025', `The dependency "${depName}" in only available in version "${version}".`];
496
+ export function importMapVersionSpecNotSatisfied_0025(
497
+ depName: string,
498
+ availableVersion: string,
499
+ specVersion: string,
500
+ ): QuickMessage {
501
+ return [
502
+ LogLevels.error,
503
+ '0025',
504
+ `The dependency "${depName}" is locally installed in version "${availableVersion}", but specified as "${specVersion}".`,
505
+ ];
498
506
  }
499
507
 
500
508
  /**
@@ -1313,8 +1321,8 @@ export function cannotResolveDependency_0053(names: Array<string>, rootDir: stri
1313
1321
  * When a pilet is built all the inherited (i.e., centrally shared) dependencies will be resolved. In case
1314
1322
  * you did not install one of these dependencies a short info will be shown. This acts as a reminder that
1315
1323
  * you could install more dependencies - without any runtime cost.
1316
- *
1317
- * Note that even though shared dependencies are available at runtime in any case they will might be
1324
+ *
1325
+ * Note that even though shared dependencies are available at runtime in any case they will might be
1318
1326
  * for building your pilet. Therefore, if you plan to use shared dependencies please install them in your
1319
1327
  * pilet's repository.
1320
1328
  *
@@ -18,6 +18,8 @@ Received: Missing "${missingNames.join('", "')}".
18
18
 
19
19
  /**
20
20
  * Checks that "externals" dependencies have been specified in "peerDependencies".
21
+ * This is legacy and only used if no importmap has been specified.
22
+ * Importmap inherited dependencies are auto-checked.
21
23
  */
22
24
  export default async function (context: PiletRuleContext, options: Options = 'ignore') {
23
25
  // only check if options are not set to ignore and if importmap feature is not used