piral-cli 1.8.3-beta.7915 → 1.8.3-beta.7916
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/apps/upgrade-pilet.js +1 -1
- package/lib/apps/upgrade-pilet.js.map +1 -1
- package/lib/common/npm.d.ts +4 -2
- package/lib/common/npm.js +30 -7
- package/lib/common/npm.js.map +1 -1
- package/lib/common/shell.js +1 -1
- package/lib/common/shell.js.map +1 -1
- package/lib/rules/pilet-uses-latest-piral.js +2 -1
- package/lib/rules/pilet-uses-latest-piral.js.map +1 -1
- package/lib/types/internal.d.ts +4 -0
- package/lib/types/public.d.ts +1 -1
- package/package.json +2 -2
- package/src/apps/upgrade-pilet.ts +1 -1
- package/src/common/npm.test.ts +23 -12
- package/src/common/npm.ts +31 -7
- package/src/common/shell.ts +1 -1
- package/src/rules/pilet-uses-latest-piral.ts +3 -2
- package/src/types/internal.ts +4 -0
- package/src/types/public.ts +1 -1
|
@@ -50,7 +50,7 @@ async function upgradePilet(baseDir = process.cwd(), options = {}) {
|
|
|
50
50
|
if (!currentVersion || typeof currentVersion !== 'string') {
|
|
51
51
|
(0, common_1.fail)('invalidPiralReference_0043');
|
|
52
52
|
}
|
|
53
|
-
const monorepoRef = await (0, common_1.isMonorepoPackageRef)(sourceName,
|
|
53
|
+
const monorepoRef = await (0, common_1.isMonorepoPackageRef)(sourceName, npmClient);
|
|
54
54
|
const [packageRef] = await (0, common_1.getCurrentPackageDetails)(fullBase, sourceName, currentVersion, version, root);
|
|
55
55
|
const originalFiles = await (0, common_1.getFileStats)(root, sourceName);
|
|
56
56
|
if (!monorepoRef) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-pilet.js","sourceRoot":"","sources":["../../src/apps/upgrade-pilet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upgrade-pilet.js","sourceRoot":"","sources":["../../src/apps/upgrade-pilet.ts"],"names":[],"mappings":"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"}
|
package/lib/common/npm.d.ts
CHANGED
|
@@ -3,9 +3,10 @@ import { PackageType, NpmClientType, NpmClient } from '../types';
|
|
|
3
3
|
* For details about how this works consult issue
|
|
4
4
|
* https://github.com/smapiot/piral/issues/203
|
|
5
5
|
* @param root The project's root directory.
|
|
6
|
+
* @param selected The proposed ("selected") npm client.
|
|
6
7
|
*/
|
|
7
8
|
export declare function determineNpmClient(root: string, selected?: NpmClientType): Promise<NpmClient>;
|
|
8
|
-
export declare function isMonorepoPackageRef(refName: string,
|
|
9
|
+
export declare function isMonorepoPackageRef(refName: string, client: NpmClient): Promise<boolean>;
|
|
9
10
|
export declare function installNpmDependencies(client: NpmClient, target?: string): Promise<string>;
|
|
10
11
|
export declare function installNpmPackageFromOptionalRegistry(packageRef: string, target: string, registry: string): Promise<void>;
|
|
11
12
|
export declare function uninstallNpmPackage(client: NpmClient, packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
|
|
@@ -34,8 +35,9 @@ export declare function makeFilePath(basePath: string, fullName: string): string
|
|
|
34
35
|
* ]
|
|
35
36
|
* @param baseDir The base directory of the current operation.
|
|
36
37
|
* @param fullName The provided package name.
|
|
38
|
+
* @param client The used npm client.
|
|
37
39
|
*/
|
|
38
|
-
export declare function dissectPackageName(baseDir: string, fullName: string): Promise<[string, string, boolean, PackageType]>;
|
|
40
|
+
export declare function dissectPackageName(baseDir: string, fullName: string, client: NpmClient): Promise<[string, string, boolean, PackageType]>;
|
|
39
41
|
/**
|
|
40
42
|
* Looks at the current package name / version and
|
|
41
43
|
* normalizes it resulting in the following tuple:
|
package/lib/common/npm.js
CHANGED
|
@@ -119,10 +119,18 @@ async function determineDirectClient(root) {
|
|
|
119
119
|
(0, log_1.log)('generalDebug_0003', 'Using the fallback "npm" client.');
|
|
120
120
|
return 'npm';
|
|
121
121
|
}
|
|
122
|
+
async function getMonorepo(root, client) {
|
|
123
|
+
const [path, retrieved] = await detectMonorepoRoot(root);
|
|
124
|
+
if (path && retrieved === client) {
|
|
125
|
+
return path;
|
|
126
|
+
}
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
122
129
|
/**
|
|
123
130
|
* For details about how this works consult issue
|
|
124
131
|
* https://github.com/smapiot/piral/issues/203
|
|
125
132
|
* @param root The project's root directory.
|
|
133
|
+
* @param selected The proposed ("selected") npm client.
|
|
126
134
|
*/
|
|
127
135
|
async function determineNpmClient(root, selected) {
|
|
128
136
|
if (!selected || !helpers_1.clientTypeKeys.includes(selected)) {
|
|
@@ -131,12 +139,14 @@ async function determineNpmClient(root, selected) {
|
|
|
131
139
|
return {
|
|
132
140
|
direct,
|
|
133
141
|
wrapper,
|
|
142
|
+
monorepo: await getMonorepo(root, wrapper || direct),
|
|
134
143
|
};
|
|
135
144
|
}
|
|
136
145
|
else if ((0, npm_clients_1.isDirectClient)(selected)) {
|
|
137
146
|
return {
|
|
138
147
|
proposed: selected,
|
|
139
148
|
direct: selected,
|
|
149
|
+
monorepo: await getMonorepo(root, selected),
|
|
140
150
|
};
|
|
141
151
|
}
|
|
142
152
|
else {
|
|
@@ -144,14 +154,15 @@ async function determineNpmClient(root, selected) {
|
|
|
144
154
|
proposed: selected,
|
|
145
155
|
direct: await determineDirectClient(root),
|
|
146
156
|
wrapper: selected,
|
|
157
|
+
monorepo: await getMonorepo(root, selected),
|
|
147
158
|
};
|
|
148
159
|
}
|
|
149
160
|
}
|
|
150
|
-
async function isMonorepoPackageRef(refName,
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
const
|
|
154
|
-
return await
|
|
161
|
+
async function isMonorepoPackageRef(refName, client) {
|
|
162
|
+
if (client.monorepo) {
|
|
163
|
+
const clientName = client.wrapper || client.direct;
|
|
164
|
+
const clientApi = npm_clients_1.clients[clientName];
|
|
165
|
+
return await clientApi.isProject(client.monorepo, refName);
|
|
155
166
|
}
|
|
156
167
|
return false;
|
|
157
168
|
}
|
|
@@ -292,8 +303,9 @@ function makeFilePath(basePath, fullName) {
|
|
|
292
303
|
* ]
|
|
293
304
|
* @param baseDir The base directory of the current operation.
|
|
294
305
|
* @param fullName The provided package name.
|
|
306
|
+
* @param client The used npm client.
|
|
295
307
|
*/
|
|
296
|
-
async function dissectPackageName(baseDir, fullName) {
|
|
308
|
+
async function dissectPackageName(baseDir, fullName, client) {
|
|
297
309
|
if (isGitPackage(fullName)) {
|
|
298
310
|
const gitUrl = makeGitUrl(fullName);
|
|
299
311
|
return [gitUrl, 'latest', false, 'git'];
|
|
@@ -313,6 +325,9 @@ async function dissectPackageName(baseDir, fullName) {
|
|
|
313
325
|
}
|
|
314
326
|
return [fullPath, 'latest', false, 'file'];
|
|
315
327
|
}
|
|
328
|
+
else if (await isMonorepoPackageRef(fullName, client)) {
|
|
329
|
+
return [fullName, '*', false, 'monorepo'];
|
|
330
|
+
}
|
|
316
331
|
else {
|
|
317
332
|
const index = fullName.indexOf('@', 1);
|
|
318
333
|
const type = 'registry';
|
|
@@ -389,7 +404,10 @@ function findPackageRoot(pck, baseDir) {
|
|
|
389
404
|
return tryResolvePackage(`${pck}/${constants_1.packageJson}`, baseDir);
|
|
390
405
|
}
|
|
391
406
|
function isLinkedPackage(name, type, hadVersion, target) {
|
|
392
|
-
if (type === '
|
|
407
|
+
if (type === 'monorepo') {
|
|
408
|
+
return true;
|
|
409
|
+
}
|
|
410
|
+
else if (type === 'registry' && !hadVersion) {
|
|
393
411
|
const root = findPackageRoot(name, target);
|
|
394
412
|
return typeof root === 'string';
|
|
395
413
|
}
|
|
@@ -423,8 +441,11 @@ async function getPackageName(root, name, type) {
|
|
|
423
441
|
const pj = await (0, io_1.readJson)(root, constants_1.packageJson);
|
|
424
442
|
const dd = pj.devDependencies || {};
|
|
425
443
|
return Object.keys(dd).filter((dep) => dd[dep] === name)[0];
|
|
444
|
+
case 'monorepo':
|
|
426
445
|
case 'registry':
|
|
427
446
|
return name;
|
|
447
|
+
case 'remote':
|
|
448
|
+
throw new Error('Cannot get the package name for a remote package!');
|
|
428
449
|
}
|
|
429
450
|
}
|
|
430
451
|
function getFilePackageVersion(sourceName, root) {
|
|
@@ -436,6 +457,8 @@ function getGitPackageVersion(sourceName) {
|
|
|
436
457
|
}
|
|
437
458
|
function getPackageVersion(hadVersion, sourceName, sourceVersion, type, root) {
|
|
438
459
|
switch (type) {
|
|
460
|
+
case 'monorepo':
|
|
461
|
+
return sourceVersion;
|
|
439
462
|
case 'registry':
|
|
440
463
|
return hadVersion && sourceVersion;
|
|
441
464
|
case 'file':
|
package/lib/common/npm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
|
package/lib/common/shell.js
CHANGED
|
@@ -43,7 +43,7 @@ async function setupPiralInstance(sourceName, type, hadVersion, rootDir, sourceV
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
async function installPiralInstance(usedSource, baseDir, rootDir, npmClient, agent, selected) {
|
|
46
|
-
const [sourceName, sourceVersion, hadVersion, type] = await (0, npm_2.dissectPackageName)(baseDir, usedSource);
|
|
46
|
+
const [sourceName, sourceVersion, hadVersion, type] = await (0, npm_2.dissectPackageName)(baseDir, usedSource, npmClient);
|
|
47
47
|
if (type === 'remote') {
|
|
48
48
|
const emulator = await (0, website_1.scaffoldFromEmulatorWebsite)(rootDir, sourceName, agent);
|
|
49
49
|
const packageName = emulator.name;
|
package/lib/common/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":";;AAqDA,oDAyBC;AA7ED,+BAAiC;AACjC,2CAAqD;AACrD,6BAA+D;AAC/D,uCAAwD;AACxD,+BAA6E;AAC7E,+BAA+E;AAG/E,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,OAAe,EAAE,UAAgC;IAC9F,MAAM,UAAU,GAAG,MAAM,IAAA,aAAQ,EAAC,MAAM,EAAE,qBAAS,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG;QACjB,GAAG,UAAU;QACb,cAAc,EAAE;YACd,GAAG,UAAU,CAAC,cAAc;YAC5B,CAAC,OAAO,CAAC,EAAE,UAAU;SACtB;KACF,CAAC;IACF,MAAM,IAAA,cAAS,EAAC,MAAM,EAAE,qBAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACrD,MAAM,IAAA,uBAAkB,EAAC,MAAM,EAAE,uBAAW,EAAE;QAC5C,SAAS,EAAE;YACT,OAAO,EAAE,CAAC,OAAO,CAAC;SACnB;KACF,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,UAAkB,EAClB,IAAiB,EACjB,UAAmB,EACnB,OAAe,EACf,aAAqB,EACrB,SAAoB;IAEpB,IAAI,CAAC,IAAA,qBAAe,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC;QAC5D,MAAM,UAAU,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAEtE,IAAA,cAAQ,EAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;QACtD,MAAM,IAAA,uBAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,MAAM,IAAA,oBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;SAAM,CAAC;QACN,IAAA,cAAQ,EAAC,4CAA4C,EAAE,UAAU,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,IAAA,uBAAkB,EAAC,OAAO,EAAE,uBAAW,EAAE;YAC7C,eAAe,EAAE;gBACf,CAAC,WAAW,CAAC,EAAE,cAAc;aAC9B;SACF,CAAC,CAAC;QACH,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,SAAoB,EACpB,KAAY,EACZ,QAAkB;IAElB,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,8 @@ async function default_1(context, options = 'suggest') {
|
|
|
11
11
|
const demanded = (context.devDependencies && context.devDependencies[name]) || '';
|
|
12
12
|
const isfixed = demanded.startsWith('git+') || demanded.startsWith('file:');
|
|
13
13
|
if (!isfixed) {
|
|
14
|
-
const
|
|
14
|
+
const npmClient = await (0, common_1.determineNpmClient)(context.root);
|
|
15
|
+
const isMonorepoRef = await (0, common_1.isMonorepoPackageRef)(name, npmClient);
|
|
15
16
|
// either we are not in a monorepo or the app shell is not part of the monorepo
|
|
16
17
|
if (!isMonorepoRef) {
|
|
17
18
|
const latestVersion = await (0, common_1.findLatestVersion)(name).catch((err) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet-uses-latest-piral.js","sourceRoot":"","sources":["../../src/rules/pilet-uses-latest-piral.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"pilet-uses-latest-piral.js","sourceRoot":"","sources":["../../src/rules/pilet-uses-latest-piral.ts"],"names":[],"mappings":";;AAQA,4BAgCC;AAxCD,sCAAwF;AAKxF;;GAEG;AACY,KAAK,oBAAW,OAAyB,EAAE,UAAmB,SAAS;IACpF,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QACrD,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAClF,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAE5E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAElE,+EAA+E;YAC/E,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAiB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAChE,OAAO,CAAC,OAAO,CAAC;yBACD,IAAI,8BAA8B,GAAG;WACnD,CAAC,CAAC;oBACH,OAAO,OAAO,CAAC;gBACjB,CAAC,CAAC,CAAC;gBAEH,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;oBAC9B,MAAM,MAAM,GAAG,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;oBACxE,MAAM,CACJ;yBACa,IAAI;iBACZ,aAAa;iBACb,OAAO;GACrB,CACQ,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/lib/types/internal.d.ts
CHANGED
package/lib/types/public.d.ts
CHANGED
|
@@ -226,7 +226,7 @@ export type PiletPublishSource = 'local' | 'npm' | 'remote';
|
|
|
226
226
|
export type PiralBuildType = 'all' | 'release' | 'emulator' | 'emulator-package' | 'emulator-sources' | 'emulator-website';
|
|
227
227
|
export type PiralPublishType = 'release' | 'emulator';
|
|
228
228
|
export type PiletBuildType = 'default' | 'standalone' | 'manifest';
|
|
229
|
-
export type PackageType = 'registry' | 'file' | 'git' | 'remote';
|
|
229
|
+
export type PackageType = 'registry' | 'monorepo' | 'file' | 'git' | 'remote';
|
|
230
230
|
export type NpmDirectClientType = 'npm' | 'yarn' | 'pnp' | 'pnpm' | 'bun';
|
|
231
231
|
export type NpmWapperClientType = 'lerna' | 'rush';
|
|
232
232
|
export type NpmClientType = NpmDirectClientType | NpmWapperClientType;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "1.8.3-beta.
|
|
3
|
+
"version": "1.8.3-beta.7916",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"open": "^10",
|
|
79
79
|
"typescript": "^5"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "43f9a1f40e3e6d2de09de5c40b9ab2424ddbc818"
|
|
82
82
|
}
|
|
@@ -150,7 +150,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
|
|
|
150
150
|
fail('invalidPiralReference_0043');
|
|
151
151
|
}
|
|
152
152
|
|
|
153
|
-
const monorepoRef = await isMonorepoPackageRef(sourceName,
|
|
153
|
+
const monorepoRef = await isMonorepoPackageRef(sourceName, npmClient);
|
|
154
154
|
const [packageRef] = await getCurrentPackageDetails(fullBase, sourceName, currentVersion, version, root);
|
|
155
155
|
const originalFiles = await getFileStats(root, sourceName);
|
|
156
156
|
|
package/src/common/npm.test.ts
CHANGED
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
isGitPackage,
|
|
24
24
|
makeExternals,
|
|
25
25
|
findPackageRoot,
|
|
26
|
+
determineNpmClient,
|
|
26
27
|
} from './npm';
|
|
27
28
|
|
|
28
29
|
vitest.mock('child_process');
|
|
@@ -112,7 +113,8 @@ describe('npm Module', () => {
|
|
|
112
113
|
|
|
113
114
|
it('dissects a fully qualified name with latest correctly', async () => {
|
|
114
115
|
wrongCase = false;
|
|
115
|
-
const
|
|
116
|
+
const client = await determineNpmClient(process.cwd());
|
|
117
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'foo@latest', client);
|
|
116
118
|
expect(hadVersion).toBe(true);
|
|
117
119
|
expect(version).toBe('latest');
|
|
118
120
|
expect(name).toBe('foo');
|
|
@@ -121,7 +123,8 @@ describe('npm Module', () => {
|
|
|
121
123
|
|
|
122
124
|
it('dissects a fully qualified name with a specific version correctly', async () => {
|
|
123
125
|
wrongCase = false;
|
|
124
|
-
const
|
|
126
|
+
const client = await determineNpmClient(process.cwd());
|
|
127
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'foo@1.2.3', client);
|
|
125
128
|
expect(hadVersion).toBe(true);
|
|
126
129
|
expect(version).toBe('1.2.3');
|
|
127
130
|
expect(name).toBe('foo');
|
|
@@ -130,7 +133,8 @@ describe('npm Module', () => {
|
|
|
130
133
|
|
|
131
134
|
it('dissects a simple name correctly', async () => {
|
|
132
135
|
wrongCase = false;
|
|
133
|
-
const
|
|
136
|
+
const client = await determineNpmClient(process.cwd());
|
|
137
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'foo', client);
|
|
134
138
|
expect(hadVersion).toBe(false);
|
|
135
139
|
expect(version).toBe('latest');
|
|
136
140
|
expect(name).toBe('foo');
|
|
@@ -139,7 +143,8 @@ describe('npm Module', () => {
|
|
|
139
143
|
|
|
140
144
|
it('dissects a relative file name correctly', async () => {
|
|
141
145
|
wrongCase = false;
|
|
142
|
-
const
|
|
146
|
+
const client = await determineNpmClient(process.cwd());
|
|
147
|
+
const [name, version, hadVersion, type] = await dissectPackageName('/home/yolo', '../foo/bar', client);
|
|
143
148
|
expect(hadVersion).toBe(false);
|
|
144
149
|
expect(version).toBe('latest');
|
|
145
150
|
expect(name).toBe(resolve('/home/yolo', '../foo/bar'));
|
|
@@ -148,7 +153,8 @@ describe('npm Module', () => {
|
|
|
148
153
|
|
|
149
154
|
it('dissects an absolute file name correctly', async () => {
|
|
150
155
|
wrongCase = false;
|
|
151
|
-
const
|
|
156
|
+
const client = await determineNpmClient(process.cwd());
|
|
157
|
+
const [name, version, hadVersion, type] = await dissectPackageName('/home/yolo', '/foo/bar', client);
|
|
152
158
|
expect(hadVersion).toBe(false);
|
|
153
159
|
expect(version).toBe('latest');
|
|
154
160
|
expect(name).toBe(resolve('/home/yolo', '/foo/bar'));
|
|
@@ -157,7 +163,8 @@ describe('npm Module', () => {
|
|
|
157
163
|
|
|
158
164
|
it('dissects a git SSH repo name correctly', async () => {
|
|
159
165
|
wrongCase = false;
|
|
160
|
-
const
|
|
166
|
+
const client = await determineNpmClient(process.cwd());
|
|
167
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'ssh://foo-bar.com/foo.git', client);
|
|
161
168
|
expect(hadVersion).toBe(false);
|
|
162
169
|
expect(version).toBe('latest');
|
|
163
170
|
expect(name).toBe('git+ssh://foo-bar.com/foo.git');
|
|
@@ -166,7 +173,8 @@ describe('npm Module', () => {
|
|
|
166
173
|
|
|
167
174
|
it('dissects a git HTTPS repo name correctly', async () => {
|
|
168
175
|
wrongCase = false;
|
|
169
|
-
const
|
|
176
|
+
const client = await determineNpmClient(process.cwd());
|
|
177
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'https://foo-bar.com/foo.git', client);
|
|
170
178
|
expect(hadVersion).toBe(false);
|
|
171
179
|
expect(version).toBe('latest');
|
|
172
180
|
expect(name).toBe('git+https://foo-bar.com/foo.git');
|
|
@@ -175,7 +183,8 @@ describe('npm Module', () => {
|
|
|
175
183
|
|
|
176
184
|
it('dissects a scoped name correctly', async () => {
|
|
177
185
|
wrongCase = false;
|
|
178
|
-
const
|
|
186
|
+
const client = await determineNpmClient(process.cwd());
|
|
187
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), '@foo/bar', client);
|
|
179
188
|
expect(hadVersion).toBe(false);
|
|
180
189
|
expect(version).toBe('latest');
|
|
181
190
|
expect(name).toBe('@foo/bar');
|
|
@@ -184,7 +193,8 @@ describe('npm Module', () => {
|
|
|
184
193
|
|
|
185
194
|
it('dissects a scoped fully qualified name with latest correctly', async () => {
|
|
186
195
|
wrongCase = false;
|
|
187
|
-
const
|
|
196
|
+
const client = await determineNpmClient(process.cwd());
|
|
197
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), '@foo/bar@latest', client);
|
|
188
198
|
expect(hadVersion).toBe(true);
|
|
189
199
|
expect(version).toBe('latest');
|
|
190
200
|
expect(name).toBe('@foo/bar');
|
|
@@ -193,7 +203,8 @@ describe('npm Module', () => {
|
|
|
193
203
|
|
|
194
204
|
it('dissects a scoped fully qualified name with a specific version correctly', async () => {
|
|
195
205
|
wrongCase = false;
|
|
196
|
-
const
|
|
206
|
+
const client = await determineNpmClient(process.cwd());
|
|
207
|
+
const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), '@foo/bar@^1.x', client);
|
|
197
208
|
expect(hadVersion).toBe(true);
|
|
198
209
|
expect(version).toBe('^1.x');
|
|
199
210
|
expect(name).toBe('@foo/bar');
|
|
@@ -271,9 +282,9 @@ describe('npm Module', () => {
|
|
|
271
282
|
|
|
272
283
|
it('uses npm to verify whether a particular package is included in monorepo package', async () => {
|
|
273
284
|
wrongCase = false;
|
|
274
|
-
await isMonorepoPackageRef('npm', './').then((result) => expect(result).toBeTruthy());
|
|
285
|
+
await isMonorepoPackageRef('npm', await determineNpmClient('./')).then((result) => expect(result).toBeTruthy());
|
|
275
286
|
wrongCase = true;
|
|
276
|
-
await isMonorepoPackageRef('npm', './').then((result) => expect(result).toBeFalsy());
|
|
287
|
+
await isMonorepoPackageRef('npm', await determineNpmClient('./')).then((result) => expect(result).toBeFalsy());
|
|
277
288
|
});
|
|
278
289
|
|
|
279
290
|
it('verifies whether lerna bootstrap ran', async () => {
|
package/src/common/npm.ts
CHANGED
|
@@ -120,10 +120,21 @@ async function determineDirectClient(root: string): Promise<NpmDirectClientType>
|
|
|
120
120
|
return 'npm';
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
+
async function getMonorepo(root: string, client: NpmClientType): Promise<string> {
|
|
124
|
+
const [path, retrieved] = await detectMonorepoRoot(root);
|
|
125
|
+
|
|
126
|
+
if (path && retrieved === client) {
|
|
127
|
+
return path;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
|
|
123
133
|
/**
|
|
124
134
|
* For details about how this works consult issue
|
|
125
135
|
* https://github.com/smapiot/piral/issues/203
|
|
126
136
|
* @param root The project's root directory.
|
|
137
|
+
* @param selected The proposed ("selected") npm client.
|
|
127
138
|
*/
|
|
128
139
|
export async function determineNpmClient(root: string, selected?: NpmClientType): Promise<NpmClient> {
|
|
129
140
|
if (!selected || !clientTypeKeys.includes(selected)) {
|
|
@@ -132,27 +143,29 @@ export async function determineNpmClient(root: string, selected?: NpmClientType)
|
|
|
132
143
|
return {
|
|
133
144
|
direct,
|
|
134
145
|
wrapper,
|
|
146
|
+
monorepo: await getMonorepo(root, wrapper || direct),
|
|
135
147
|
};
|
|
136
148
|
} else if (isDirectClient(selected)) {
|
|
137
149
|
return {
|
|
138
150
|
proposed: selected,
|
|
139
151
|
direct: selected,
|
|
152
|
+
monorepo: await getMonorepo(root, selected),
|
|
140
153
|
};
|
|
141
154
|
} else {
|
|
142
155
|
return {
|
|
143
156
|
proposed: selected,
|
|
144
157
|
direct: await determineDirectClient(root),
|
|
145
158
|
wrapper: selected,
|
|
159
|
+
monorepo: await getMonorepo(root, selected),
|
|
146
160
|
};
|
|
147
161
|
}
|
|
148
162
|
}
|
|
149
163
|
|
|
150
|
-
export async function isMonorepoPackageRef(refName: string,
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
return await c.isProject(monorepoRoot, refName);
|
|
164
|
+
export async function isMonorepoPackageRef(refName: string, client: NpmClient): Promise<boolean> {
|
|
165
|
+
if (client.monorepo) {
|
|
166
|
+
const clientName = client.wrapper || client.direct;
|
|
167
|
+
const clientApi = clients[clientName];
|
|
168
|
+
return await clientApi.isProject(client.monorepo, refName);
|
|
156
169
|
}
|
|
157
170
|
|
|
158
171
|
return false;
|
|
@@ -350,10 +363,12 @@ export function makeFilePath(basePath: string, fullName: string) {
|
|
|
350
363
|
* ]
|
|
351
364
|
* @param baseDir The base directory of the current operation.
|
|
352
365
|
* @param fullName The provided package name.
|
|
366
|
+
* @param client The used npm client.
|
|
353
367
|
*/
|
|
354
368
|
export async function dissectPackageName(
|
|
355
369
|
baseDir: string,
|
|
356
370
|
fullName: string,
|
|
371
|
+
client: NpmClient,
|
|
357
372
|
): Promise<[string, string, boolean, PackageType]> {
|
|
358
373
|
if (isGitPackage(fullName)) {
|
|
359
374
|
const gitUrl = makeGitUrl(fullName);
|
|
@@ -375,6 +390,8 @@ export async function dissectPackageName(
|
|
|
375
390
|
}
|
|
376
391
|
|
|
377
392
|
return [fullPath, 'latest', false, 'file'];
|
|
393
|
+
} else if (await isMonorepoPackageRef(fullName, client)) {
|
|
394
|
+
return [fullName, '*', false, 'monorepo'];
|
|
378
395
|
} else {
|
|
379
396
|
const index = fullName.indexOf('@', 1);
|
|
380
397
|
const type = 'registry';
|
|
@@ -466,7 +483,9 @@ export function findPackageRoot(pck: string, baseDir: string) {
|
|
|
466
483
|
}
|
|
467
484
|
|
|
468
485
|
export function isLinkedPackage(name: string, type: PackageType, hadVersion: boolean, target: string) {
|
|
469
|
-
if (type === '
|
|
486
|
+
if (type === 'monorepo') {
|
|
487
|
+
return true;
|
|
488
|
+
} else if (type === 'registry' && !hadVersion) {
|
|
470
489
|
const root = findPackageRoot(name, target);
|
|
471
490
|
return typeof root === 'string';
|
|
472
491
|
}
|
|
@@ -506,8 +525,11 @@ export async function getPackageName(root: string, name: string, type: PackageTy
|
|
|
506
525
|
const pj = await readJson(root, packageJson);
|
|
507
526
|
const dd = pj.devDependencies || {};
|
|
508
527
|
return Object.keys(dd).filter((dep) => dd[dep] === name)[0];
|
|
528
|
+
case 'monorepo':
|
|
509
529
|
case 'registry':
|
|
510
530
|
return name;
|
|
531
|
+
case 'remote':
|
|
532
|
+
throw new Error('Cannot get the package name for a remote package!');
|
|
511
533
|
}
|
|
512
534
|
}
|
|
513
535
|
|
|
@@ -528,6 +550,8 @@ export function getPackageVersion(
|
|
|
528
550
|
root: string,
|
|
529
551
|
) {
|
|
530
552
|
switch (type) {
|
|
553
|
+
case 'monorepo':
|
|
554
|
+
return sourceVersion;
|
|
531
555
|
case 'registry':
|
|
532
556
|
return hadVersion && sourceVersion;
|
|
533
557
|
case 'file':
|
package/src/common/shell.ts
CHANGED
|
@@ -59,7 +59,7 @@ export async function installPiralInstance(
|
|
|
59
59
|
agent: Agent,
|
|
60
60
|
selected?: boolean,
|
|
61
61
|
): Promise<string> {
|
|
62
|
-
const [sourceName, sourceVersion, hadVersion, type] = await dissectPackageName(baseDir, usedSource);
|
|
62
|
+
const [sourceName, sourceVersion, hadVersion, type] = await dissectPackageName(baseDir, usedSource, npmClient);
|
|
63
63
|
|
|
64
64
|
if (type === 'remote') {
|
|
65
65
|
const emulator = await scaffoldFromEmulatorWebsite(rootDir, sourceName, agent);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isMonorepoPackageRef, findLatestVersion } from '../common';
|
|
1
|
+
import { isMonorepoPackageRef, findLatestVersion, determineNpmClient } from '../common';
|
|
2
2
|
import { PiletRuleContext } from '../types';
|
|
3
3
|
|
|
4
4
|
export type Options = 'suggest' | 'required' | 'ignore';
|
|
@@ -13,7 +13,8 @@ export default async function (context: PiletRuleContext, options: Options = 'su
|
|
|
13
13
|
const isfixed = demanded.startsWith('git+') || demanded.startsWith('file:');
|
|
14
14
|
|
|
15
15
|
if (!isfixed) {
|
|
16
|
-
const
|
|
16
|
+
const npmClient = await determineNpmClient(context.root);
|
|
17
|
+
const isMonorepoRef = await isMonorepoPackageRef(name, npmClient);
|
|
17
18
|
|
|
18
19
|
// either we are not in a monorepo or the app shell is not part of the monorepo
|
|
19
20
|
if (!isMonorepoRef) {
|
package/src/types/internal.ts
CHANGED
package/src/types/public.ts
CHANGED
|
@@ -274,7 +274,7 @@ export type PiralPublishType = 'release' | 'emulator';
|
|
|
274
274
|
|
|
275
275
|
export type PiletBuildType = 'default' | 'standalone' | 'manifest';
|
|
276
276
|
|
|
277
|
-
export type PackageType = 'registry' | 'file' | 'git' | 'remote';
|
|
277
|
+
export type PackageType = 'registry' | 'monorepo' | 'file' | 'git' | 'remote';
|
|
278
278
|
|
|
279
279
|
export type NpmDirectClientType = 'npm' | 'yarn' | 'pnp' | 'pnpm' | 'bun';
|
|
280
280
|
|