piral-cli 1.9.0 → 1.9.1-beta.8326

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.
Files changed (23) hide show
  1. package/lib/npm-clients/bun.js +12 -9
  2. package/lib/npm-clients/bun.js.map +1 -1
  3. package/lib/npm-clients/lerna.js +9 -6
  4. package/lib/npm-clients/lerna.js.map +1 -1
  5. package/lib/npm-clients/npm.js +29 -14
  6. package/lib/npm-clients/npm.js.map +1 -1
  7. package/lib/npm-clients/pnp.js +9 -6
  8. package/lib/npm-clients/pnp.js.map +1 -1
  9. package/lib/npm-clients/pnpm.js +9 -6
  10. package/lib/npm-clients/pnpm.js.map +1 -1
  11. package/lib/npm-clients/rush.js +9 -6
  12. package/lib/npm-clients/rush.js.map +1 -1
  13. package/lib/npm-clients/yarn.js +9 -6
  14. package/lib/npm-clients/yarn.js.map +1 -1
  15. package/package.json +2 -2
  16. package/src/common/npm.test.ts +26 -8
  17. package/src/npm-clients/bun.ts +12 -10
  18. package/src/npm-clients/lerna.ts +9 -7
  19. package/src/npm-clients/npm.ts +30 -15
  20. package/src/npm-clients/pnp.ts +9 -7
  21. package/src/npm-clients/pnpm.ts +9 -7
  22. package/src/npm-clients/rush.ts +9 -7
  23. package/src/npm-clients/yarn.ts +9 -7
package/lib/npm-clients/bun.js CHANGED
@@ -16,8 +16,11 @@ const MemoryStream_1 = require("../common/MemoryStream");
16
16
  async function runBunProcess(args, target, output) {
17
17
  (0, log_1.log)('generalDebug_0003', 'Starting the Bun process ...');
18
18
  const cwd = (0, path_1.resolve)(process.cwd(), target);
19
+ return await (0, scripts_1.runCommand)('bun', args, cwd, output);
20
+ }
21
+ async function tryRunBunProcess(args, target, output) {
19
22
  try {
20
- return await (0, scripts_1.runCommand)('bun', args, cwd, output);
23
+ return await runBunProcess(args, target, output);
21
24
  }
22
25
  catch (err) {
23
26
  (0, log_1.log)('generalInfo_0000', output.value || `bun failed due to ${err}`);
@@ -42,19 +45,19 @@ function convert(flags) {
42
45
  // Client interface functions:
43
46
  async function installDependencies(target = '.', ...flags) {
44
47
  const ms = new MemoryStream_1.MemoryStream();
45
- await runBunProcess(['install', ...convert(flags)], target, ms);
48
+ await tryRunBunProcess(['install', ...convert(flags)], target, ms);
46
49
  (0, log_1.log)('generalDebug_0003', `Bun install dependencies result: ${ms.value}`);
47
50
  return ms.value;
48
51
  }
49
52
  async function uninstallPackage(packageRef, target = '.', ...flags) {
50
53
  const ms = new MemoryStream_1.MemoryStream();
51
- await runBunProcess(['remove', packageRef, ...convert(flags)], target, ms);
54
+ await tryRunBunProcess(['remove', packageRef, ...convert(flags)], target, ms);
52
55
  (0, log_1.log)('generalDebug_0003', `Bun remove package result: ${ms.value}`);
53
56
  return ms.value;
54
57
  }
55
58
  async function installPackage(packageRef, target = '.', ...flags) {
56
59
  const ms = new MemoryStream_1.MemoryStream();
57
- await runBunProcess(['add', packageRef, ...convert(flags)], target, ms);
60
+ await tryRunBunProcess(['add', packageRef, ...convert(flags)], target, ms);
58
61
  (0, log_1.log)('generalDebug_0003', `Bun add package result: ${ms.value}`);
59
62
  return ms.value;
60
63
  }
@@ -75,15 +78,15 @@ async function listProjects(target) {
75
78
  const ms = new MemoryStream_1.MemoryStream();
76
79
  try {
77
80
  await runBunProcess(['pm', 'ls', '--all'], target, ms);
81
+ (0, log_1.log)('generalDebug_0003', `Bun workspaces result: ${ms.value}`);
82
+ return ms.value
83
+ .split('\n')
84
+ .filter((m) => m.startsWith('├──'))
85
+ .map((m) => m.replace('├── ', ''));
78
86
  }
79
87
  catch (e) {
80
88
  (0, log_1.log)('generalDebug_0003', `Bun workspaces error: ${e}`);
81
89
  return {};
82
90
  }
83
- (0, log_1.log)('generalDebug_0003', `Bun workspaces result: ${ms.value}`);
84
- return ms.value
85
- .split('\n')
86
- .filter((m) => m.startsWith('├──'))
87
- .map((m) => m.replace('├── ', ''));
88
91
  }
89
92
  //# sourceMappingURL=bun.js.map
package/lib/npm-clients/bun.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bun.js","sourceRoot":"","sources":["../../src/npm-clients/bun.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bun.js","sourceRoot":"","sources":["../../src/npm-clients/bun.ts"],"names":[],"mappings":"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"}
package/lib/npm-clients/lerna.js CHANGED
@@ -16,8 +16,11 @@ const MemoryStream_1 = require("../common/MemoryStream");
16
16
  async function runLernaProcess(args, target, output) {
17
17
  (0, log_1.log)('generalDebug_0003', 'Starting the Lerna process ...');
18
18
  const cwd = (0, path_1.resolve)(process.cwd(), target);
19
+ return await (0, scripts_1.runCommand)('lerna', args, cwd, output);
20
+ }
21
+ async function tryRunLernaProcess(args, target, output) {
19
22
  try {
20
- return await (0, scripts_1.runCommand)('lerna', args, cwd, output);
23
+ return await runLernaProcess(args, target, output);
21
24
  }
22
25
  catch (err) {
23
26
  (0, log_1.log)('generalInfo_0000', output.value || `lerna failed due to ${err}`);
@@ -42,7 +45,7 @@ function convert(flags) {
42
45
  // Client interface functions:
43
46
  async function installDependencies(target = '.', ...flags) {
44
47
  const ms = new MemoryStream_1.MemoryStream();
45
- await runLernaProcess(['bootstrap', ...flags], target, ms);
48
+ await tryRunLernaProcess(['bootstrap', ...flags], target, ms);
46
49
  (0, log_1.log)('generalDebug_0003', `Lerna bootstrap result: ${ms.value}`);
47
50
  return ms.value;
48
51
  }
@@ -61,13 +64,13 @@ async function uninstallPackage(packageRef, target = '.', ...flags) {
61
64
  packageData.peerDependencies[packageRef] = undefined;
62
65
  }
63
66
  await (0, io_1.writeJson)(target, 'package.json', packageData, true);
64
- await runLernaProcess(['bootstrap'], target, ms);
67
+ await tryRunLernaProcess(['bootstrap'], target, ms);
65
68
  (0, log_1.log)('generalDebug_0003', `Lerna bootstrap (after remove) package result: ${ms.value}`);
66
69
  return ms.value;
67
70
  }
68
71
  async function installPackage(packageRef, target = '.', ...flags) {
69
72
  const ms = new MemoryStream_1.MemoryStream();
70
- await runLernaProcess(['add', packageRef, ...convert(flags)], target, ms);
73
+ await tryRunLernaProcess(['add', packageRef, ...convert(flags)], target, ms);
71
74
  (0, log_1.log)('generalDebug_0003', `Lerna add package result: ${ms.value}`);
72
75
  return ms.value;
73
76
  }
@@ -87,12 +90,12 @@ async function listProjects(target) {
87
90
  const ms = new MemoryStream_1.MemoryStream();
88
91
  try {
89
92
  await runLernaProcess(['list', '--json', '-p'], target, ms);
93
+ (0, log_1.log)('generalDebug_0003', `lerna list project result: ${ms.value}`);
94
+ return JSON.parse(ms.value);
90
95
  }
91
96
  catch (e) {
92
97
  (0, log_1.log)('generalDebug_0003', `lerna list error: ${e}`);
93
98
  return [];
94
99
  }
95
- (0, log_1.log)('generalDebug_0003', `lerna list project result: ${ms.value}`);
96
- return JSON.parse(ms.value);
97
100
  }
98
101
  //# sourceMappingURL=lerna.js.map
package/lib/npm-clients/lerna.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lerna.js","sourceRoot":"","sources":["../../src/npm-clients/lerna.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lerna.js","sourceRoot":"","sources":["../../src/npm-clients/lerna.ts"],"names":[],"mappings":"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"}
package/lib/npm-clients/npm.js CHANGED
@@ -22,8 +22,11 @@ const MemoryStream_1 = require("../common/MemoryStream");
22
22
  async function runNpmProcess(args, target, output) {
23
23
  (0, log_1.log)('generalDebug_0003', 'Starting the npm process ...');
24
24
  const cwd = (0, path_1.resolve)(process.cwd(), target);
25
+ return await (0, scripts_1.runCommand)('npm', args, cwd, output);
26
+ }
27
+ async function tryRunNpmProcess(args, target, output) {
25
28
  try {
26
- return await (0, scripts_1.runCommand)('npm', args, cwd, output);
29
+ return await runNpmProcess(args, target, output);
27
30
  }
28
31
  catch (err) {
29
32
  (0, log_1.log)('generalInfo_0000', output.value || `npm failed due to ${err}`);
@@ -33,19 +36,19 @@ async function runNpmProcess(args, target, output) {
33
36
  // Client interface functions:
34
37
  async function installDependencies(target = '.', ...flags) {
35
38
  const ms = new MemoryStream_1.MemoryStream();
36
- await runNpmProcess(['install', '--legacy-peer-deps', ...flags], target, ms);
39
+ await tryRunNpmProcess(['install', '--legacy-peer-deps', ...flags], target, ms);
37
40
  (0, log_1.log)('generalDebug_0003', `npm install dependencies result: ${ms.value}`);
38
41
  return ms.value;
39
42
  }
40
43
  async function uninstallPackage(packageRef, target = '.', ...flags) {
41
44
  const ms = new MemoryStream_1.MemoryStream();
42
- await runNpmProcess(['uninstall', packageRef, ...flags], target, ms);
45
+ await tryRunNpmProcess(['uninstall', packageRef, ...flags], target, ms);
43
46
  (0, log_1.log)('generalDebug_0003', `npm uninstall package result: ${ms.value}`);
44
47
  return ms.value;
45
48
  }
46
49
  async function installPackage(packageRef, target = '.', ...flags) {
47
50
  const ms = new MemoryStream_1.MemoryStream();
48
- await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
51
+ await tryRunNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
49
52
  (0, log_1.log)('generalDebug_0003', `npm install package result: ${ms.value}`);
50
53
  return ms.value;
51
54
  }
@@ -67,37 +70,49 @@ async function loginUser() {
67
70
  }
68
71
  async function unpackPackage(packageRef, target = '.', ...flags) {
69
72
  const ms = new MemoryStream_1.MemoryStream();
70
- await runNpmProcess(['pack', packageRef, ...flags], target, ms);
73
+ await tryRunNpmProcess(['pack', packageRef, ...flags], target, ms);
71
74
  (0, log_1.log)('generalDebug_0003', `npm (un)pack result: ${ms.value}`);
72
75
  return ms.value;
73
76
  }
74
77
  async function createPackage(target = '.', ...flags) {
75
78
  const ms = new MemoryStream_1.MemoryStream();
76
- await runNpmProcess(['pack', ...flags], target, ms);
79
+ await tryRunNpmProcess(['pack', ...flags], target, ms);
77
80
  (0, log_1.log)('generalDebug_0003', `npm pack result: ${ms.value}`);
78
81
  return ms.value;
79
82
  }
80
83
  async function publishPackage(target = '.', file = '*.tgz', ...flags) {
81
84
  const ms = new MemoryStream_1.MemoryStream();
82
- await runNpmProcess(['publish', file, ...flags], target, ms);
85
+ await tryRunNpmProcess(['publish', file, ...flags], target, ms);
83
86
  (0, log_1.log)('generalDebug_0003', `npm publish result: ${ms.value}`);
84
87
  return ms.value;
85
88
  }
86
89
  async function findSpecificVersion(packageName, version) {
87
90
  const ms = new MemoryStream_1.MemoryStream();
88
91
  try {
89
- await runNpmProcess(['show', packageName, 'version', '--tag', version], '.', ms);
90
- (0, log_1.log)('generalDebug_0003', `npm show result: ${ms.value}`);
91
- return ms.value;
92
+ if (/^[a-zA-Z]+$/.test(version)) {
93
+ // it's indeed a classic "tag" - just query and return
94
+ await runNpmProcess(['show', packageName, 'version', '--tag', version], '.', ms);
95
+ (0, log_1.log)('generalDebug_0003', `npm show result: ${ms.value}`);
96
+ return ms.value;
97
+ }
98
+ else {
99
+ // seems to be a version - list all and match
100
+ await runNpmProcess(['show', packageName, 'versions', '--json'], '.', ms);
101
+ (0, log_1.log)('generalDebug_0003', `npm show result: ${ms.value}`);
102
+ const result = JSON.parse(ms.value);
103
+ if (result.includes(version)) {
104
+ return version;
105
+ }
106
+ }
92
107
  }
93
108
  catch (ex) {
94
109
  (0, log_1.log)('generalDebug_0003', `npm show result: ${ex}`);
95
- return '';
96
110
  }
111
+ return '';
97
112
  }
98
113
  async function findTarball(packageRef, target = '.', ...flags) {
99
114
  const ms = new MemoryStream_1.MemoryStream();
100
- await runNpmProcess(['view', packageRef, 'dist.tarball', ...flags], target, ms);
115
+ await tryRunNpmProcess(['view', packageRef, 'dist.tarball', ...flags], target, ms);
101
116
  (0, log_1.log)('generalDebug_0003', `npm view packageRef result: ${ms.value}`);
102
117
  return ms.value;
103
118
  }
@@ -105,12 +120,12 @@ async function listPackage(packageRef, target = '.', ...flags) {
105
120
  const ms = new MemoryStream_1.MemoryStream();
106
121
  try {
107
122
  await runNpmProcess(['ls', packageRef, '--json', '--depth', '0', ...flags], target, ms);
123
+ (0, log_1.log)('generalDebug_0003', `npm ls packageRef result: ${ms.value}`);
124
+ return JSON.parse(ms.value);
108
125
  }
109
126
  catch (e) {
110
127
  (0, log_1.log)('generalDebug_0003', `npm ls packageRef error: ${e}`);
111
128
  return {};
112
129
  }
113
- (0, log_1.log)('generalDebug_0003', `npm ls packageRef result: ${ms.value}`);
114
- return JSON.parse(ms.value);
115
130
  }
116
131
  //# sourceMappingURL=npm.js.map
package/lib/npm-clients/npm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/npm-clients/npm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/npm-clients/npm.ts"],"names":[],"mappings":";;AAyBA,kDAKC;AAED,4CAKC;AAED,wCAKC;AAED,oCAEC;AAED,8BASC;AAED,kCAAyE;AAIzE,8BAEC;AAED,sCAKC;AAED,sCAKC;AAED,wCAKC;AAED,kDAwBC;AAED,kCAKC;AAED,kCAWC;AAtID,+BAA+B;AAC/B,uCAAoC;AACpC,qCAAwC;AACxC,+CAA+C;AAC/C,yDAAsD;AAEtD,WAAW;AAEX,KAAK,UAAU,aAAa,CAAC,IAAmB,EAAE,MAAc,EAAE,MAAqB;IACrF,IAAA,SAAG,EAAC,mBAAmB,EAAE,8BAA8B,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,MAAM,IAAA,oBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAmB,EAAE,MAAc,EAAE,MAAoB;IACvF,IAAI,CAAC;QACH,OAAO,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,SAAG,EAAC,kBAAkB,EAAE,MAAM,CAAC,KAAK,IAAI,qBAAqB,GAAG,EAAE,CAAC,CAAC;QACpE,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,8BAA8B;AAEvB,KAAK,UAAU,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChF,IAAA,SAAG,EAAC,mBAAmB,EAAE,oCAAoC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACzE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC9F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACxE,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACtE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,oBAAoB,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5F,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACpE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,OAAO,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,GAAG,CAAC;IAC3E,OAAO,CAAC,CAAC,CAAC,MAAM,IAAA,aAAQ,EAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC;AAChE,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,UAAkB;IAC9D,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,OAAO,EAAE,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC;IAE3D,IAAI,cAAc,IAAI,OAAO,cAAc,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClE,OAAO,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,WAAmB,EAAE,MAAc,IAAG,CAAC;AAEzE,gDAAgD;AAEzC,KAAK,UAAU,SAAS;IAC7B,MAAM,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC3F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACnE,IAAA,SAAG,EAAC,mBAAmB,EAAE,wBAAwB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7D,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IACvE,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACvD,IAAA,SAAG,EAAC,mBAAmB,EAAE,oBAAoB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACzD,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,MAAM,GAAG,GAAG,EAAE,IAAI,GAAG,OAAO,EAAE,GAAG,KAAoB;IACxF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,IAAA,SAAG,EAAC,mBAAmB,EAAE,uBAAuB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5D,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,WAAmB,EAAE,OAAe;IAC5E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAE9B,IAAI,CAAC;QACH,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,sDAAsD;YACtD,MAAM,aAAa,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACjF,IAAA,SAAG,EAAC,mBAAmB,EAAE,oBAAoB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACzD,OAAO,EAAE,CAAC,KAAK,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,6CAA6C;YAC7C,MAAM,aAAa,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAA,SAAG,EAAC,mBAAmB,EAAE,oBAAoB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;YAEpC,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7B,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,IAAA,SAAG,EAAC,mBAAmB,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IACzF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,gBAAgB,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACnF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACpE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IACzF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAE9B,IAAI,CAAC;QACH,MAAM,aAAa,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACxF,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,CAAC,EAAE,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
package/lib/npm-clients/pnp.js CHANGED
@@ -16,8 +16,11 @@ const MemoryStream_1 = require("../common/MemoryStream");
16
16
  async function runYarnProcess(args, target, output) {
17
17
  (0, log_1.log)('generalDebug_0003', 'Starting the Yarn PnP process ...');
18
18
  const cwd = (0, path_1.resolve)(process.cwd(), target);
19
+ return await (0, scripts_1.runCommand)('yarn', args, cwd, output);
20
+ }
21
+ async function tryRunYarnProcess(args, target, output) {
19
22
  try {
20
- return await (0, scripts_1.runCommand)('yarn', args, cwd, output);
23
+ return await runYarnProcess(args, target, output);
21
24
  }
22
25
  catch (err) {
23
26
  (0, log_1.log)('generalInfo_0000', output.value || `yarn failed due to ${err}`);
@@ -42,19 +45,19 @@ function convert(flags) {
42
45
  // Client interface functions:
43
46
  async function installDependencies(target = '.', ...flags) {
44
47
  const ms = new MemoryStream_1.MemoryStream();
45
- await runYarnProcess(['install', ...convert(flags)], target, ms);
48
+ await tryRunYarnProcess(['install', ...convert(flags)], target, ms);
46
49
  (0, log_1.log)('generalDebug_0003', `Yarn PnP install dependencies result: ${ms.value}`);
47
50
  return ms.value;
48
51
  }
49
52
  async function uninstallPackage(packageRef, target = '.', ...flags) {
50
53
  const ms = new MemoryStream_1.MemoryStream();
51
- await runYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
54
+ await tryRunYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
52
55
  (0, log_1.log)('generalDebug_0003', `Yarn PnP remove package result: ${ms.value}`);
53
56
  return ms.value;
54
57
  }
55
58
  async function installPackage(packageRef, target = '.', ...flags) {
56
59
  const ms = new MemoryStream_1.MemoryStream();
57
- await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
60
+ await tryRunYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
58
61
  (0, log_1.log)('generalDebug_0003', `Yarn PnP add package result: ${ms.value}`);
59
62
  return ms.value;
60
63
  }
@@ -74,12 +77,12 @@ async function listProjects(target) {
74
77
  const ms = new MemoryStream_1.MemoryStream();
75
78
  try {
76
79
  await runYarnProcess(['workspaces', 'info'], target, ms);
80
+ (0, log_1.log)('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
81
+ return JSON.parse(ms.value);
77
82
  }
78
83
  catch (e) {
79
84
  (0, log_1.log)('generalDebug_0003', `yarn workspaces error: ${e}`);
80
85
  return {};
81
86
  }
82
- (0, log_1.log)('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
83
- return JSON.parse(ms.value);
84
87
  }
85
88
  //# sourceMappingURL=pnp.js.map
package/lib/npm-clients/pnp.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pnp.js","sourceRoot":"","sources":["../../src/npm-clients/pnp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pnp.js","sourceRoot":"","sources":["../../src/npm-clients/pnp.ts"],"names":[],"mappings":"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"}
package/lib/npm-clients/pnpm.js CHANGED
@@ -16,8 +16,11 @@ const MemoryStream_1 = require("../common/MemoryStream");
16
16
  async function runPnpmProcess(args, target, output) {
17
17
  (0, log_1.log)('generalDebug_0003', 'Starting the Pnpm process ...');
18
18
  const cwd = (0, path_1.resolve)(process.cwd(), target);
19
+ return await (0, scripts_1.runCommand)('pnpm', args, cwd, output);
20
+ }
21
+ async function tryRunPnpmProcess(args, target, output) {
19
22
  try {
20
- return await (0, scripts_1.runCommand)('pnpm', args, cwd, output);
23
+ return await runPnpmProcess(args, target, output);
21
24
  }
22
25
  catch (err) {
23
26
  (0, log_1.log)('generalInfo_0000', output.value || `pnpm failed due to ${err}`);
@@ -38,19 +41,19 @@ function convert(flags) {
38
41
  // Client interface functions:
39
42
  async function installDependencies(target = '.', ...flags) {
40
43
  const ms = new MemoryStream_1.MemoryStream();
41
- await runPnpmProcess(['install', ...convert(flags)], target, ms);
44
+ await tryRunPnpmProcess(['install', ...convert(flags)], target, ms);
42
45
  (0, log_1.log)('generalDebug_0003', `Pnpm install dependencies result: ${ms.value}`);
43
46
  return ms.value;
44
47
  }
45
48
  async function uninstallPackage(packageRef, target = '.', ...flags) {
46
49
  const ms = new MemoryStream_1.MemoryStream();
47
- await runPnpmProcess(['remove', packageRef, ...convert(flags)], target, ms);
50
+ await tryRunPnpmProcess(['remove', packageRef, ...convert(flags)], target, ms);
48
51
  (0, log_1.log)('generalDebug_0003', `Pnpm remove package result: ${ms.value}`);
49
52
  return ms.value;
50
53
  }
51
54
  async function installPackage(packageRef, target = '.', ...flags) {
52
55
  const ms = new MemoryStream_1.MemoryStream();
53
- await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
56
+ await tryRunPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
54
57
  (0, log_1.log)('generalDebug_0003', `Pnpm add package result: ${ms.value}`);
55
58
  return ms.value;
56
59
  }
@@ -70,12 +73,12 @@ async function listProjects(target) {
70
73
  const ms = new MemoryStream_1.MemoryStream();
71
74
  try {
72
75
  await runPnpmProcess(['list', '--json', '--recursive', '--depth', '0'], target, ms);
76
+ (0, log_1.log)('generalDebug_0003', `pnpm list project result: ${ms.value}`);
77
+ return JSON.parse(ms.value);
73
78
  }
74
79
  catch (e) {
75
80
  (0, log_1.log)('generalDebug_0003', `pnpm list error: ${e}`);
76
81
  return [];
77
82
  }
78
- (0, log_1.log)('generalDebug_0003', `pnpm list project result: ${ms.value}`);
79
- return JSON.parse(ms.value);
80
83
  }
81
84
  //# sourceMappingURL=pnpm.js.map
package/lib/npm-clients/pnpm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../src/npm-clients/pnpm.ts"],"names":[],"mappings":";;AAkCA,kDAKC;AAED,4CAKC;AAED,wCAKC;AAED,oCAEC;AAED,kCAAyE;AAEzE,8BAQC;AAID,oCAYC;AArFD,+BAA+B;AAC/B,uCAAoC;AACpC,qCAAwC;AACxC,+CAA+C;AAC/C,yDAAsD;AAEtD,WAAW;AAEX,KAAK,UAAU,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAAqB;IACtF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAE3C,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,SAAG,EAAC,kBAAkB,EAAE,MAAM,CAAC,KAAK,IAAI,sBAAsB,GAAG,EAAE,CAAC,CAAC;QACrE,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,WAAW;gBACd,8DAA8D;gBAC9D,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,8BAA8B;AAEvB,KAAK,UAAU,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC9F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,cAAc,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC5E,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACpE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACjE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,OAAO,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,GAAG,CAAC;IAC3E,OAAO,CAAC,CAAC,CAAC,MAAM,IAAA,aAAQ,EAAC,IAAI,EAAE,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AACtF,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,WAAmB,EAAE,MAAc,IAAG,CAAC;AAElE,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,UAAkB;IAC9D,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IAE1C,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,KAAK,CAAC;IAC/D,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,iDAAiD;AAE1C,KAAK,UAAU,YAAY,CAAC,MAAc;IAC/C,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAE9B,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACtF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC"}
1
+ {"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../src/npm-clients/pnpm.ts"],"names":[],"mappings":"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"}
package/lib/npm-clients/rush.js CHANGED
@@ -18,8 +18,11 @@ const rushJson = 'rush.json';
18
18
  async function runRushProcess(args, target, output) {
19
19
  (0, log_1.log)('generalDebug_0003', 'Starting the Rush process ...');
20
20
  const cwd = (0, path_1.resolve)(process.cwd(), target);
21
+ return await (0, scripts_1.runCommand)('rush', args, cwd, output);
22
+ }
23
+ async function tryRunRushProcess(args, target, output) {
21
24
  try {
22
- return await (0, scripts_1.runCommand)('rush', args, cwd, output);
25
+ return await runRushProcess(args, target, output);
23
26
  }
24
27
  catch (err) {
25
28
  (0, log_1.log)('generalInfo_0000', output.value || `rush failed due to ${err}`);
@@ -45,19 +48,19 @@ function convert(flags) {
45
48
  // Client interface functions:
46
49
  async function installDependencies(target = '.', ...flags) {
47
50
  const ms = new MemoryStream_1.MemoryStream();
48
- await runRushProcess(['update', ...convert(flags)], target, ms);
51
+ await tryRunRushProcess(['update', ...convert(flags)], target, ms);
49
52
  (0, log_1.log)('generalDebug_0003', `Rush install dependencies result: ${ms.value}`);
50
53
  return ms.value;
51
54
  }
52
55
  async function uninstallPackage(packageRef, target = '.', ...flags) {
53
56
  const ms = new MemoryStream_1.MemoryStream();
54
- await runRushProcess(['remove', packageRef, ...convert(flags)], target, ms);
57
+ await tryRunRushProcess(['remove', packageRef, ...convert(flags)], target, ms);
55
58
  (0, log_1.log)('generalDebug_0003', `Rush remove package result: ${ms.value}`);
56
59
  return ms.value;
57
60
  }
58
61
  async function installPackage(packageRef, target = '.', ...flags) {
59
62
  const ms = new MemoryStream_1.MemoryStream();
60
- await runRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
63
+ await tryRunRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
61
64
  (0, log_1.log)('generalDebug_0003', `Rush add package result: ${ms.value}`);
62
65
  return ms.value;
63
66
  }
@@ -97,12 +100,12 @@ async function listProjects(target) {
97
100
  const ms = new MemoryStream_1.MemoryStream();
98
101
  try {
99
102
  await runRushProcess(['list', '--json'], target, ms);
103
+ (0, log_1.log)('generalDebug_0003', `rush list project result: ${ms.value}`);
104
+ return JSON.parse(ms.value);
100
105
  }
101
106
  catch (e) {
102
107
  (0, log_1.log)('generalDebug_0003', `rush list error: ${e}`);
103
108
  return {};
104
109
  }
105
- (0, log_1.log)('generalDebug_0003', `rush list project result: ${ms.value}`);
106
- return JSON.parse(ms.value);
107
110
  }
108
111
  //# sourceMappingURL=rush.js.map
package/lib/npm-clients/rush.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rush.js","sourceRoot":"","sources":["../../src/npm-clients/rush.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rush.js","sourceRoot":"","sources":["../../src/npm-clients/rush.ts"],"names":[],"mappings":";;AA4CA,kDAKC;AAED,4CAKC;AAED,wCAKC;AAED,oCAEC;AAED,kCA+BC;AAED,8BAQC;AAID,oCAWC;AA7HD,+BAAkD;AAClD,uCAAoC;AACpC,qCAA6D;AAC7D,+CAA+C;AAC/C,yDAAsD;AACtD,0CAAkC;AAElC,WAAW;AACX,MAAM,QAAQ,GAAG,WAAW,CAAC;AAE7B,KAAK,UAAU,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAAqB;IACtF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,MAAM,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAmB,EAAE,MAAc,EAAE,MAAoB;IACxF,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,SAAG,EAAC,kBAAkB,EAAE,MAAM,CAAC,KAAK,IAAI,sBAAsB,GAAG,EAAE,CAAC,CAAC;QACrE,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,cAAc;gBACjB,uCAAuC;gBACvC,OAAO,EAAE,CAAC;YACZ,KAAK,YAAY;gBACf,OAAO,OAAO,CAAC;YACjB,KAAK,WAAW;gBACd,mBAAmB;gBACnB,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,8BAA8B;AAEvB,KAAK,UAAU,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,iBAAiB,CAAC,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACnE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC9F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,iBAAiB,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/E,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACpE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;IAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAC9B,MAAM,iBAAiB,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACjE,OAAO,EAAE,CAAC,KAAK,CAAC;AAClB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,OAAO,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,GAAG,CAAC;IAC3E,OAAO,CAAC,CAAC,CAAC,MAAM,IAAA,aAAQ,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;AACrD,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,WAAmB,EAAE,MAAc;IACnE,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAElD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CACb,uBAAuB,QAAQ,WAAW,MAAM,gEAAgE,CACjH,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,cAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAEhD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;QACrB,WAAW;QACX,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,IAAA,cAAS,EACb,OAAO,EACP,QAAQ,EACR,cAAG,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE;QAChC,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,CAAC;KACV,CAAC,CACH,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,UAAkB;IAC9D,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;QACpE,OAAO,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,KAAK,CAAC;IACxE,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,iDAAiD;AAE1C,KAAK,UAAU,YAAY,CAAC,MAAc;IAC/C,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;IAE9B,IAAI,CAAC;QACH,MAAM,cAAc,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrD,IAAA,SAAG,EAAC,mBAAmB,EAAE,6BAA6B,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,SAAG,EAAC,mBAAmB,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAClD,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
package/lib/npm-clients/yarn.js CHANGED
@@ -16,8 +16,11 @@ const MemoryStream_1 = require("../common/MemoryStream");
16
16
  async function runYarnProcess(args, target, output) {
17
17
  (0, log_1.log)('generalDebug_0003', 'Starting the Yarn Classic process ...');
18
18
  const cwd = (0, path_1.resolve)(process.cwd(), target);
19
+ return await (0, scripts_1.runCommand)('yarn', args, cwd, output);
20
+ }
21
+ async function tryRunYarnProcess(args, target, output) {
19
22
  try {
20
- return await (0, scripts_1.runCommand)('yarn', args, cwd, output);
23
+ return await runYarnProcess(args, target, output);
21
24
  }
22
25
  catch (err) {
23
26
  (0, log_1.log)('generalInfo_0000', output.value || `yarn failed due to ${err}`);
@@ -42,19 +45,19 @@ function convert(flags) {
42
45
  // Client interface functions:
43
46
  async function installDependencies(target = '.', ...flags) {
44
47
  const ms = new MemoryStream_1.MemoryStream();
45
- await runYarnProcess(['install', ...convert(flags)], target, ms);
48
+ await tryRunYarnProcess(['install', ...convert(flags)], target, ms);
46
49
  (0, log_1.log)('generalDebug_0003', `Yarn Classic install dependencies result: ${ms.value}`);
47
50
  return ms.value;
48
51
  }
49
52
  async function uninstallPackage(packageRef, target = '.', ...flags) {
50
53
  const ms = new MemoryStream_1.MemoryStream();
51
- await runYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
54
+ await tryRunYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
52
55
  (0, log_1.log)('generalDebug_0003', `Yarn Classic remove package result: ${ms.value}`);
53
56
  return ms.value;
54
57
  }
55
58
  async function installPackage(packageRef, target = '.', ...flags) {
56
59
  const ms = new MemoryStream_1.MemoryStream();
57
- await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
60
+ await tryRunYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
58
61
  (0, log_1.log)('generalDebug_0003', `Yarn Classic add package result: ${ms.value}`);
59
62
  return ms.value;
60
63
  }
@@ -74,12 +77,12 @@ async function listProjects(target) {
74
77
  const ms = new MemoryStream_1.MemoryStream();
75
78
  try {
76
79
  await runYarnProcess(['workspaces', 'info'], target, ms);
80
+ (0, log_1.log)('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
81
+ return JSON.parse(ms.value);
77
82
  }
78
83
  catch (e) {
79
84
  (0, log_1.log)('generalDebug_0003', `yarn workspaces error: ${e}`);
80
85
  return {};
81
86
  }
82
- (0, log_1.log)('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
83
- return JSON.parse(ms.value);
84
87
  }
85
88
  //# sourceMappingURL=yarn.js.map
package/lib/npm-clients/yarn.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../src/npm-clients/yarn.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../src/npm-clients/yarn.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "1.9.0",
3
+ "version": "1.9.1-beta.8326",
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": "1c608c230ca21a20a63e93a9370377a034205c8f"
81
+ "gitHead": "33cda255f113c49c3498d82e7cc96f3a4cdb5d15"
82
82
  }
package/src/common/npm.test.ts CHANGED
@@ -57,13 +57,18 @@ vitest.mock('../external', async () => ({
57
57
  let specialCase = false;
58
58
  let shouldFind = true;
59
59
  let wrongCase = false;
60
+ let resultOverride = '';
60
61
  const jsonValueString = JSON.stringify([{ name: 'npm' }]);
61
62
  const jsonValueStringWrong = JSON.stringify([]);
62
63
 
63
64
  vitest.mock('./scripts', () => ({
64
65
  runCommand: (exe: string, args: Array<string>, cwd: string, output?: NodeJS.WritableStream) => {
65
66
  return new Promise<void>((resolve) => {
66
- output?.write(wrongCase ? jsonValueStringWrong : jsonValueString, () => {});
67
+ if (resultOverride) {
68
+ output?.write(resultOverride, () => {});
69
+ } else {
70
+ output?.write(wrongCase ? jsonValueStringWrong : jsonValueString, () => {});
71
+ }
67
72
  resolve();
68
73
  });
69
74
  },
@@ -164,7 +169,11 @@ describe('npm Module', () => {
164
169
  it('dissects a git SSH repo name correctly', async () => {
165
170
  wrongCase = false;
166
171
  const client = await determineNpmClient(process.cwd());
167
- const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'ssh://foo-bar.com/foo.git', client);
172
+ const [name, version, hadVersion, type] = await dissectPackageName(
173
+ process.cwd(),
174
+ 'ssh://foo-bar.com/foo.git',
175
+ client,
176
+ );
168
177
  expect(hadVersion).toBe(false);
169
178
  expect(version).toBe('latest');
170
179
  expect(name).toBe('git+ssh://foo-bar.com/foo.git');
@@ -174,7 +183,11 @@ describe('npm Module', () => {
174
183
  it('dissects a git HTTPS repo name correctly', async () => {
175
184
  wrongCase = false;
176
185
  const client = await determineNpmClient(process.cwd());
177
- const [name, version, hadVersion, type] = await dissectPackageName(process.cwd(), 'https://foo-bar.com/foo.git', client);
186
+ const [name, version, hadVersion, type] = await dissectPackageName(
187
+ process.cwd(),
188
+ 'https://foo-bar.com/foo.git',
189
+ client,
190
+ );
178
191
  expect(hadVersion).toBe(false);
179
192
  expect(version).toBe('latest');
180
193
  expect(name).toBe('git+https://foo-bar.com/foo.git');
@@ -336,11 +349,16 @@ describe('npm Module', () => {
336
349
  await findLatestVersion('foo').then((result) => expect(result).not.toEqual(jsonValueString));
337
350
  });
338
351
 
339
- it('find specific version', async () => {
340
- wrongCase = false;
341
- await findSpecificVersion('foo', '1.0.0').then((result) => expect(result).toEqual(jsonValueString));
342
- wrongCase = true;
343
- await findSpecificVersion('foo', '1.0.0').then((result) => expect(result).not.toEqual(jsonValueString));
352
+ it('find specific version when it exists', async () => {
353
+ resultOverride = JSON.stringify(['1.0.0']);
354
+ const result = await findSpecificVersion('foo', '1.0.0');
355
+ expect(result).toEqual('1.0.0');
356
+ });
357
+
358
+ it('find specific version when it does not exist', async () => {
359
+ resultOverride = JSON.stringify(['2.0.0']);
360
+ const result = await findSpecificVersion('foo', '1.0.0');
361
+ expect(result).toEqual('');
344
362
  });
345
363
 
346
364
  it('check if package from full file is local', () => {
package/src/npm-clients/bun.ts CHANGED
@@ -9,9 +9,12 @@ import { MemoryStream } from '../common/MemoryStream';
9
9
  async function runBunProcess(args: Array<string>, target: string, output?: MemoryStream) {
10
10
  log('generalDebug_0003', 'Starting the Bun process ...');
11
11
  const cwd = resolve(process.cwd(), target);
12
+ return await runCommand('bun', args, cwd, output);
13
+ }
12
14
 
15
+ async function tryRunBunProcess(args: Array<string>, target: string, output: MemoryStream) {
13
16
  try {
14
- return await runCommand('bun', args, cwd, output);
17
+ return await runBunProcess(args, target, output);
15
18
  } catch (err) {
16
19
  log('generalInfo_0000', output.value || `bun failed due to ${err}`);
17
20
  throw err;
@@ -38,21 +41,21 @@ function convert(flags: Array<string>) {
38
41
 
39
42
  export async function installDependencies(target = '.', ...flags: Array<string>) {
40
43
  const ms = new MemoryStream();
41
- await runBunProcess(['install', ...convert(flags)], target, ms);
44
+ await tryRunBunProcess(['install', ...convert(flags)], target, ms);
42
45
  log('generalDebug_0003', `Bun install dependencies result: ${ms.value}`);
43
46
  return ms.value;
44
47
  }
45
48
 
46
49
  export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
47
50
  const ms = new MemoryStream();
48
- await runBunProcess(['remove', packageRef, ...convert(flags)], target, ms);
51
+ await tryRunBunProcess(['remove', packageRef, ...convert(flags)], target, ms);
49
52
  log('generalDebug_0003', `Bun remove package result: ${ms.value}`);
50
53
  return ms.value;
51
54
  }
52
55
 
53
56
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
54
57
  const ms = new MemoryStream();
55
- await runBunProcess(['add', packageRef, ...convert(flags)], target, ms);
58
+ await tryRunBunProcess(['add', packageRef, ...convert(flags)], target, ms);
56
59
  log('generalDebug_0003', `Bun add package result: ${ms.value}`);
57
60
  return ms.value;
58
61
  }
@@ -81,14 +84,13 @@ export async function listProjects(target: string) {
81
84
 
82
85
  try {
83
86
  await runBunProcess(['pm', 'ls', '--all'], target, ms);
87
+ log('generalDebug_0003', `Bun workspaces result: ${ms.value}`);
88
+ return ms.value
89
+ .split('\n')
90
+ .filter((m) => m.startsWith('├──'))
91
+ .map((m) => m.replace('├── ', ''));
84
92
  } catch (e) {
85
93
  log('generalDebug_0003', `Bun workspaces error: ${e}`);
86
94
  return {};
87
95
  }
88
-
89
- log('generalDebug_0003', `Bun workspaces result: ${ms.value}`);
90
- return ms.value
91
- .split('\n')
92
- .filter((m) => m.startsWith('├──'))
93
- .map((m) => m.replace('├── ', ''));
94
96
  }
package/src/npm-clients/lerna.ts CHANGED
@@ -9,9 +9,12 @@ import { MemoryStream } from '../common/MemoryStream';
9
9
  async function runLernaProcess(args: Array<string>, target: string, output?: MemoryStream) {
10
10
  log('generalDebug_0003', 'Starting the Lerna process ...');
11
11
  const cwd = resolve(process.cwd(), target);
12
+ return await runCommand('lerna', args, cwd, output);
13
+ }
12
14
 
15
+ async function tryRunLernaProcess(args: Array<string>, target: string, output: MemoryStream) {
13
16
  try {
14
- return await runCommand('lerna', args, cwd, output);
17
+ return await runLernaProcess(args, target, output);
15
18
  } catch (err) {
16
19
  log('generalInfo_0000', output.value || `lerna failed due to ${err}`);
17
20
  throw err;
@@ -38,7 +41,7 @@ function convert(flags: Array<string>) {
38
41
 
39
42
  export async function installDependencies(target = '.', ...flags: Array<string>) {
40
43
  const ms = new MemoryStream();
41
- await runLernaProcess(['bootstrap', ...flags], target, ms);
44
+ await tryRunLernaProcess(['bootstrap', ...flags], target, ms);
42
45
  log('generalDebug_0003', `Lerna bootstrap result: ${ms.value}`);
43
46
  return ms.value;
44
47
  }
@@ -62,14 +65,14 @@ export async function uninstallPackage(packageRef: string, target = '.', ...flag
62
65
  }
63
66
 
64
67
  await writeJson(target, 'package.json', packageData, true);
65
- await runLernaProcess(['bootstrap'], target, ms);
68
+ await tryRunLernaProcess(['bootstrap'], target, ms);
66
69
  log('generalDebug_0003', `Lerna bootstrap (after remove) package result: ${ms.value}`);
67
70
  return ms.value;
68
71
  }
69
72
 
70
73
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
71
74
  const ms = new MemoryStream();
72
- await runLernaProcess(['add', packageRef, ...convert(flags)], target, ms);
75
+ await tryRunLernaProcess(['add', packageRef, ...convert(flags)], target, ms);
73
76
  log('generalDebug_0003', `Lerna add package result: ${ms.value}`);
74
77
  return ms.value;
75
78
  }
@@ -97,11 +100,10 @@ export async function listProjects(target: string) {
97
100
 
98
101
  try {
99
102
  await runLernaProcess(['list', '--json', '-p'], target, ms);
103
+ log('generalDebug_0003', `lerna list project result: ${ms.value}`);
104
+ return JSON.parse(ms.value);
100
105
  } catch (e) {
101
106
  log('generalDebug_0003', `lerna list error: ${e}`);
102
107
  return [];
103
108
  }
104
-
105
- log('generalDebug_0003', `lerna list project result: ${ms.value}`);
106
- return JSON.parse(ms.value);
107
109
  }
package/src/npm-clients/npm.ts CHANGED
@@ -9,9 +9,12 @@ import { MemoryStream } from '../common/MemoryStream';
9
9
  async function runNpmProcess(args: Array<string>, target: string, output?: MemoryStream) {
10
10
  log('generalDebug_0003', 'Starting the npm process ...');
11
11
  const cwd = resolve(process.cwd(), target);
12
+ return await runCommand('npm', args, cwd, output);
13
+ }
12
14
 
15
+ async function tryRunNpmProcess(args: Array<string>, target: string, output: MemoryStream) {
13
16
  try {
14
- return await runCommand('npm', args, cwd, output);
17
+ return await runNpmProcess(args, target, output);
15
18
  } catch (err) {
16
19
  log('generalInfo_0000', output.value || `npm failed due to ${err}`);
17
20
  throw err;
@@ -22,21 +25,21 @@ async function runNpmProcess(args: Array<string>, target: string, output?: Memor
22
25
 
23
26
  export async function installDependencies(target = '.', ...flags: Array<string>) {
24
27
  const ms = new MemoryStream();
25
- await runNpmProcess(['install', '--legacy-peer-deps', ...flags], target, ms);
28
+ await tryRunNpmProcess(['install', '--legacy-peer-deps', ...flags], target, ms);
26
29
  log('generalDebug_0003', `npm install dependencies result: ${ms.value}`);
27
30
  return ms.value;
28
31
  }
29
32
 
30
33
  export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
31
34
  const ms = new MemoryStream();
32
- await runNpmProcess(['uninstall', packageRef, ...flags], target, ms);
35
+ await tryRunNpmProcess(['uninstall', packageRef, ...flags], target, ms);
33
36
  log('generalDebug_0003', `npm uninstall package result: ${ms.value}`);
34
37
  return ms.value;
35
38
  }
36
39
 
37
40
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
38
41
  const ms = new MemoryStream();
39
- await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
42
+ await tryRunNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
40
43
  log('generalDebug_0003', `npm install package result: ${ms.value}`);
41
44
  return ms.value;
42
45
  }
@@ -66,21 +69,21 @@ export async function loginUser() {
66
69
 
67
70
  export async function unpackPackage(packageRef: string, target = '.', ...flags: Array<string>) {
68
71
  const ms = new MemoryStream();
69
- await runNpmProcess(['pack', packageRef, ...flags], target, ms);
72
+ await tryRunNpmProcess(['pack', packageRef, ...flags], target, ms);
70
73
  log('generalDebug_0003', `npm (un)pack result: ${ms.value}`);
71
74
  return ms.value;
72
75
  }
73
76
 
74
77
  export async function createPackage(target = '.', ...flags: Array<string>) {
75
78
  const ms = new MemoryStream();
76
- await runNpmProcess(['pack', ...flags], target, ms);
79
+ await tryRunNpmProcess(['pack', ...flags], target, ms);
77
80
  log('generalDebug_0003', `npm pack result: ${ms.value}`);
78
81
  return ms.value;
79
82
  }
80
83
 
81
84
  export async function publishPackage(target = '.', file = '*.tgz', ...flags: Array<string>) {
82
85
  const ms = new MemoryStream();
83
- await runNpmProcess(['publish', file, ...flags], target, ms);
86
+ await tryRunNpmProcess(['publish', file, ...flags], target, ms);
84
87
  log('generalDebug_0003', `npm publish result: ${ms.value}`);
85
88
  return ms.value;
86
89
  }
@@ -89,18 +92,31 @@ export async function findSpecificVersion(packageName: string, version: string)
89
92
  const ms = new MemoryStream();
90
93
 
91
94
  try {
92
- await runNpmProcess(['show', packageName, 'version', '--tag', version], '.', ms);
93
- log('generalDebug_0003', `npm show result: ${ms.value}`);
94
- return ms.value;
95
+ if (/^[a-zA-Z]+$/.test(version)) {
96
+ // it's indeed a classic "tag" - just query and return
97
+ await runNpmProcess(['show', packageName, 'version', '--tag', version], '.', ms);
98
+ log('generalDebug_0003', `npm show result: ${ms.value}`);
99
+ return ms.value;
100
+ } else {
101
+ // seems to be a version - list all and match
102
+ await runNpmProcess(['show', packageName, 'versions', '--json'], '.', ms);
103
+ log('generalDebug_0003', `npm show result: ${ms.value}`);
104
+ const result = JSON.parse(ms.value);
105
+
106
+ if (result.includes(version)) {
107
+ return version;
108
+ }
109
+ }
95
110
  } catch (ex) {
96
111
  log('generalDebug_0003', `npm show result: ${ex}`);
97
- return '';
98
112
  }
113
+
114
+ return '';
99
115
  }
100
116
 
101
117
  export async function findTarball(packageRef: string, target = '.', ...flags: Array<string>) {
102
118
  const ms = new MemoryStream();
103
- await runNpmProcess(['view', packageRef, 'dist.tarball', ...flags], target, ms);
119
+ await tryRunNpmProcess(['view', packageRef, 'dist.tarball', ...flags], target, ms);
104
120
  log('generalDebug_0003', `npm view packageRef result: ${ms.value}`);
105
121
  return ms.value;
106
122
  }
@@ -110,11 +126,10 @@ export async function listPackage(packageRef: string, target = '.', ...flags: Ar
110
126
 
111
127
  try {
112
128
  await runNpmProcess(['ls', packageRef, '--json', '--depth', '0', ...flags], target, ms);
129
+ log('generalDebug_0003', `npm ls packageRef result: ${ms.value}`);
130
+ return JSON.parse(ms.value);
113
131
  } catch (e) {
114
132
  log('generalDebug_0003', `npm ls packageRef error: ${e}`);
115
133
  return {};
116
134
  }
117
-
118
- log('generalDebug_0003', `npm ls packageRef result: ${ms.value}`);
119
- return JSON.parse(ms.value);
120
135
  }
package/src/npm-clients/pnp.ts CHANGED
@@ -9,9 +9,12 @@ import { MemoryStream } from '../common/MemoryStream';
9
9
  async function runYarnProcess(args: Array<string>, target: string, output?: MemoryStream) {
10
10
  log('generalDebug_0003', 'Starting the Yarn PnP process ...');
11
11
  const cwd = resolve(process.cwd(), target);
12
+ return await runCommand('yarn', args, cwd, output);
13
+ }
12
14
 
15
+ async function tryRunYarnProcess(args: Array<string>, target: string, output: MemoryStream) {
13
16
  try {
14
- return await runCommand('yarn', args, cwd, output);
17
+ return await runYarnProcess(args, target, output);
15
18
  } catch (err) {
16
19
  log('generalInfo_0000', output.value || `yarn failed due to ${err}`);
17
20
  throw err;
@@ -38,21 +41,21 @@ function convert(flags: Array<string>) {
38
41
 
39
42
  export async function installDependencies(target = '.', ...flags: Array<string>) {
40
43
  const ms = new MemoryStream();
41
- await runYarnProcess(['install', ...convert(flags)], target, ms);
44
+ await tryRunYarnProcess(['install', ...convert(flags)], target, ms);
42
45
  log('generalDebug_0003', `Yarn PnP install dependencies result: ${ms.value}`);
43
46
  return ms.value;
44
47
  }
45
48
 
46
49
  export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
47
50
  const ms = new MemoryStream();
48
- await runYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
51
+ await tryRunYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
49
52
  log('generalDebug_0003', `Yarn PnP remove package result: ${ms.value}`);
50
53
  return ms.value;
51
54
  }
52
55
 
53
56
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
54
57
  const ms = new MemoryStream();
55
- await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
58
+ await tryRunYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
56
59
  log('generalDebug_0003', `Yarn PnP add package result: ${ms.value}`);
57
60
  return ms.value;
58
61
  }
@@ -80,11 +83,10 @@ export async function listProjects(target: string) {
80
83
 
81
84
  try {
82
85
  await runYarnProcess(['workspaces', 'info'], target, ms);
86
+ log('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
87
+ return JSON.parse(ms.value);
83
88
  } catch (e) {
84
89
  log('generalDebug_0003', `yarn workspaces error: ${e}`);
85
90
  return {};
86
91
  }
87
-
88
- log('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
89
- return JSON.parse(ms.value);
90
92
  }
package/src/npm-clients/pnpm.ts CHANGED
@@ -9,9 +9,12 @@ import { MemoryStream } from '../common/MemoryStream';
9
9
  async function runPnpmProcess(args: Array<string>, target: string, output?: MemoryStream) {
10
10
  log('generalDebug_0003', 'Starting the Pnpm process ...');
11
11
  const cwd = resolve(process.cwd(), target);
12
+ return await runCommand('pnpm', args, cwd, output);
13
+ }
12
14
 
15
+ async function tryRunPnpmProcess(args: Array<string>, target: string, output: MemoryStream) {
13
16
  try {
14
- return await runCommand('pnpm', args, cwd, output);
17
+ return await runPnpmProcess(args, target, output);
15
18
  } catch (err) {
16
19
  log('generalInfo_0000', output.value || `pnpm failed due to ${err}`);
17
20
  throw err;
@@ -34,21 +37,21 @@ function convert(flags: Array<string>) {
34
37
 
35
38
  export async function installDependencies(target = '.', ...flags: Array<string>) {
36
39
  const ms = new MemoryStream();
37
- await runPnpmProcess(['install', ...convert(flags)], target, ms);
40
+ await tryRunPnpmProcess(['install', ...convert(flags)], target, ms);
38
41
  log('generalDebug_0003', `Pnpm install dependencies result: ${ms.value}`);
39
42
  return ms.value;
40
43
  }
41
44
 
42
45
  export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
43
46
  const ms = new MemoryStream();
44
- await runPnpmProcess(['remove', packageRef, ...convert(flags)], target, ms);
47
+ await tryRunPnpmProcess(['remove', packageRef, ...convert(flags)], target, ms);
45
48
  log('generalDebug_0003', `Pnpm remove package result: ${ms.value}`);
46
49
  return ms.value;
47
50
  }
48
51
 
49
52
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
50
53
  const ms = new MemoryStream();
51
- await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
54
+ await tryRunPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
52
55
  log('generalDebug_0003', `Pnpm add package result: ${ms.value}`);
53
56
  return ms.value;
54
57
  }
@@ -76,11 +79,10 @@ export async function listProjects(target: string) {
76
79
 
77
80
  try {
78
81
  await runPnpmProcess(['list', '--json', '--recursive', '--depth', '0'], target, ms);
82
+ log('generalDebug_0003', `pnpm list project result: ${ms.value}`);
83
+ return JSON.parse(ms.value);
79
84
  } catch (e) {
80
85
  log('generalDebug_0003', `pnpm list error: ${e}`);
81
86
  return [];
82
87
  }
83
-
84
- log('generalDebug_0003', `pnpm list project result: ${ms.value}`);
85
- return JSON.parse(ms.value);
86
88
  }
package/src/npm-clients/rush.ts CHANGED
@@ -11,9 +11,12 @@ const rushJson = 'rush.json';
11
11
  async function runRushProcess(args: Array<string>, target: string, output?: MemoryStream) {
12
12
  log('generalDebug_0003', 'Starting the Rush process ...');
13
13
  const cwd = resolve(process.cwd(), target);
14
+ return await runCommand('rush', args, cwd, output);
15
+ }
14
16
 
17
+ async function tryRunRushProcess(args: Array<string>, target: string, output: MemoryStream) {
15
18
  try {
16
- return await runCommand('rush', args, cwd, output);
19
+ return await runRushProcess(args, target, output);
17
20
  } catch (err) {
18
21
  log('generalInfo_0000', output.value || `rush failed due to ${err}`);
19
22
  throw err;
@@ -41,21 +44,21 @@ function convert(flags: Array<string>) {
41
44
 
42
45
  export async function installDependencies(target = '.', ...flags: Array<string>) {
43
46
  const ms = new MemoryStream();
44
- await runRushProcess(['update', ...convert(flags)], target, ms);
47
+ await tryRunRushProcess(['update', ...convert(flags)], target, ms);
45
48
  log('generalDebug_0003', `Rush install dependencies result: ${ms.value}`);
46
49
  return ms.value;
47
50
  }
48
51
 
49
52
  export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
50
53
  const ms = new MemoryStream();
51
- await runRushProcess(['remove', packageRef, ...convert(flags)], target, ms);
54
+ await tryRunRushProcess(['remove', packageRef, ...convert(flags)], target, ms);
52
55
  log('generalDebug_0003', `Rush remove package result: ${ms.value}`);
53
56
  return ms.value;
54
57
  }
55
58
 
56
59
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
57
60
  const ms = new MemoryStream();
58
- await runRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
61
+ await tryRunRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
59
62
  log('generalDebug_0003', `Rush add package result: ${ms.value}`);
60
63
  return ms.value;
61
64
  }
@@ -114,11 +117,10 @@ export async function listProjects(target: string) {
114
117
 
115
118
  try {
116
119
  await runRushProcess(['list', '--json'], target, ms);
120
+ log('generalDebug_0003', `rush list project result: ${ms.value}`);
121
+ return JSON.parse(ms.value);
117
122
  } catch (e) {
118
123
  log('generalDebug_0003', `rush list error: ${e}`);
119
124
  return {};
120
125
  }
121
-
122
- log('generalDebug_0003', `rush list project result: ${ms.value}`);
123
- return JSON.parse(ms.value);
124
126
  }
package/src/npm-clients/yarn.ts CHANGED
@@ -9,9 +9,12 @@ import { MemoryStream } from '../common/MemoryStream';
9
9
  async function runYarnProcess(args: Array<string>, target: string, output?: MemoryStream) {
10
10
  log('generalDebug_0003', 'Starting the Yarn Classic process ...');
11
11
  const cwd = resolve(process.cwd(), target);
12
+ return await runCommand('yarn', args, cwd, output);
13
+ }
12
14
 
15
+ async function tryRunYarnProcess(args: Array<string>, target: string, output: MemoryStream) {
13
16
  try {
14
- return await runCommand('yarn', args, cwd, output);
17
+ return await runYarnProcess(args, target, output);
15
18
  } catch (err) {
16
19
  log('generalInfo_0000', output.value || `yarn failed due to ${err}`);
17
20
  throw err;
@@ -38,21 +41,21 @@ function convert(flags: Array<string>) {
38
41
 
39
42
  export async function installDependencies(target = '.', ...flags: Array<string>) {
40
43
  const ms = new MemoryStream();
41
- await runYarnProcess(['install', ...convert(flags)], target, ms);
44
+ await tryRunYarnProcess(['install', ...convert(flags)], target, ms);
42
45
  log('generalDebug_0003', `Yarn Classic install dependencies result: ${ms.value}`);
43
46
  return ms.value;
44
47
  }
45
48
 
46
49
  export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
47
50
  const ms = new MemoryStream();
48
- await runYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
51
+ await tryRunYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
49
52
  log('generalDebug_0003', `Yarn Classic remove package result: ${ms.value}`);
50
53
  return ms.value;
51
54
  }
52
55
 
53
56
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
54
57
  const ms = new MemoryStream();
55
- await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
58
+ await tryRunYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
56
59
  log('generalDebug_0003', `Yarn Classic add package result: ${ms.value}`);
57
60
  return ms.value;
58
61
  }
@@ -80,11 +83,10 @@ export async function listProjects(target: string) {
80
83
 
81
84
  try {
82
85
  await runYarnProcess(['workspaces', 'info'], target, ms);
86
+ log('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
87
+ return JSON.parse(ms.value);
83
88
  } catch (e) {
84
89
  log('generalDebug_0003', `yarn workspaces error: ${e}`);
85
90
  return {};
86
91
  }
87
-
88
- log('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
89
- return JSON.parse(ms.value);
90
92
  }