piral-cli 0.14.24-beta.4157 → 0.14.24-beta.4168

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 (88) hide show
  1. package/lib/apps/new-pilet.js +5 -9
  2. package/lib/apps/new-pilet.js.map +1 -1
  3. package/lib/apps/new-piral.js +2 -2
  4. package/lib/apps/new-piral.js.map +1 -1
  5. package/lib/apps/publish-pilet.js +1 -1
  6. package/lib/apps/publish-pilet.js.map +1 -1
  7. package/lib/apps/publish-piral.js +1 -1
  8. package/lib/apps/publish-piral.js.map +1 -1
  9. package/lib/apps/upgrade-pilet.js +2 -8
  10. package/lib/apps/upgrade-pilet.js.map +1 -1
  11. package/lib/apps/upgrade-piral.js +1 -1
  12. package/lib/apps/upgrade-piral.js.map +1 -1
  13. package/lib/bundler.js +1 -1
  14. package/lib/bundler.js.map +1 -1
  15. package/lib/common/clients/index.d.ts +19 -0
  16. package/lib/common/clients/index.js +40 -0
  17. package/lib/common/clients/index.js.map +1 -0
  18. package/lib/common/clients/lerna.d.ts +4 -1
  19. package/lib/common/clients/lerna.js +40 -3
  20. package/lib/common/clients/lerna.js.map +1 -1
  21. package/lib/common/clients/npm.d.ts +3 -1
  22. package/lib/common/clients/npm.js +24 -16
  23. package/lib/common/clients/npm.js.map +1 -1
  24. package/lib/common/clients/pnpm.d.ts +2 -0
  25. package/lib/common/clients/pnpm.js +18 -11
  26. package/lib/common/clients/pnpm.js.map +1 -1
  27. package/lib/common/clients/rush.d.ts +4 -0
  28. package/lib/common/clients/rush.js +91 -0
  29. package/lib/common/clients/rush.js.map +1 -0
  30. package/lib/common/clients/yarn.d.ts +2 -0
  31. package/lib/common/clients/yarn.js +20 -13
  32. package/lib/common/clients/yarn.js.map +1 -1
  33. package/lib/common/emulator.js +1 -1
  34. package/lib/common/emulator.js.map +1 -1
  35. package/lib/common/info.d.ts +1 -0
  36. package/lib/common/info.js +2 -1
  37. package/lib/common/info.js.map +1 -1
  38. package/lib/common/inspect.js +2 -1
  39. package/lib/common/inspect.js.map +1 -1
  40. package/lib/common/npm.d.ts +7 -15
  41. package/lib/common/npm.js +69 -127
  42. package/lib/common/npm.js.map +1 -1
  43. package/lib/common/pack.js +1 -1
  44. package/lib/common/pack.js.map +1 -1
  45. package/lib/common/package.d.ts +6 -6
  46. package/lib/common/package.js +10 -1
  47. package/lib/common/package.js.map +1 -1
  48. package/lib/common/scaffold.js +2 -2
  49. package/lib/common/scaffold.js.map +1 -1
  50. package/lib/external/index.js +1982 -92
  51. package/lib/helpers.js +1 -1
  52. package/lib/helpers.js.map +1 -1
  53. package/lib/injectors/pilet.js +2 -2
  54. package/lib/injectors/pilet.js.map +1 -1
  55. package/lib/plugin.js +27 -2
  56. package/lib/plugin.js.map +1 -1
  57. package/lib/types/internal.d.ts +9 -1
  58. package/lib/types/public.d.ts +1 -1
  59. package/package.json +4 -2
  60. package/src/apps/new-pilet.ts +9 -13
  61. package/src/apps/new-piral.ts +4 -4
  62. package/src/apps/publish-pilet.ts +2 -2
  63. package/src/apps/publish-piral.ts +2 -2
  64. package/src/apps/upgrade-pilet.ts +4 -12
  65. package/src/apps/upgrade-piral.ts +2 -2
  66. package/src/bundler.test.ts +1 -1
  67. package/src/bundler.ts +2 -2
  68. package/src/common/clients/index.ts +33 -0
  69. package/src/common/clients/lerna.ts +35 -1
  70. package/src/common/clients/npm.ts +20 -15
  71. package/src/common/clients/pnpm.ts +15 -12
  72. package/src/common/clients/rush.ts +85 -0
  73. package/src/common/clients/yarn.ts +17 -14
  74. package/src/common/emulator.ts +2 -2
  75. package/src/common/info.ts +1 -0
  76. package/src/common/inspect.ts +2 -1
  77. package/src/common/npm.test.ts +51 -62
  78. package/src/common/npm.ts +82 -128
  79. package/src/common/pack.test.ts +1 -1
  80. package/src/common/pack.ts +2 -2
  81. package/src/common/package.ts +16 -7
  82. package/src/common/scaffold.ts +2 -2
  83. package/src/external/index.ts +2 -1
  84. package/src/helpers.ts +1 -1
  85. package/src/injectors/pilet.ts +3 -3
  86. package/src/plugin.ts +33 -4
  87. package/src/types/internal.ts +6 -1
  88. package/src/types/public.ts +1 -1
@@ -0,0 +1,91 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
13
+ const path_1 = require("path");
14
+ const log_1 = require("../log");
15
+ const io_1 = require("../io");
16
+ const external_1 = require("../../external");
17
+ const scripts_1 = require("../scripts");
18
+ const MemoryStream_1 = require("../MemoryStream");
19
+ // Helpers:
20
+ const rushJson = 'rush.json';
21
+ function runRushProcess(args, target, output) {
22
+ (0, log_1.log)('generalDebug_0003', 'Starting the Rush process ...');
23
+ const cwd = (0, path_1.resolve)(process.cwd(), target);
24
+ return (0, scripts_1.runCommand)('rush', args, cwd, output);
25
+ }
26
+ function convert(flags) {
27
+ return flags.map((flag) => {
28
+ switch (flag) {
29
+ case '--save-exact':
30
+ // discard as this may lead to problems
31
+ return '';
32
+ case '--save-dev':
33
+ return '--dev';
34
+ case '--no-save':
35
+ // unfortunately no
36
+ return '';
37
+ default:
38
+ return flag;
39
+ }
40
+ });
41
+ }
42
+ // Client interface functions:
43
+ function installDependencies(target = '.', ...flags) {
44
+ return __awaiter(this, void 0, void 0, function* () {
45
+ const ms = new MemoryStream_1.MemoryStream();
46
+ yield runRushProcess(['update', ...convert(flags)], target, ms);
47
+ (0, log_1.log)('generalDebug_0003', `Rush install dependencies result: ${ms.value}`);
48
+ return ms.value;
49
+ });
50
+ }
51
+ exports.installDependencies = installDependencies;
52
+ function installPackage(packageRef, target = '.', ...flags) {
53
+ return __awaiter(this, void 0, void 0, function* () {
54
+ const ms = new MemoryStream_1.MemoryStream();
55
+ yield runRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
56
+ (0, log_1.log)('generalDebug_0003', `Rush install package result: ${ms.value}`);
57
+ return ms.value;
58
+ });
59
+ }
60
+ exports.installPackage = installPackage;
61
+ function detectClient(root) {
62
+ return __awaiter(this, void 0, void 0, function* () {
63
+ return !!(yield (0, io_1.findFile)(root, rushJson));
64
+ });
65
+ }
66
+ exports.detectClient = detectClient;
67
+ function initProject(packageName, target) {
68
+ return __awaiter(this, void 0, void 0, function* () {
69
+ const rushPath = yield (0, io_1.findFile)(target, rushJson);
70
+ if (!rushPath) {
71
+ throw new Error(`Could not find the "${rushJson}" from "${target}". Sure you want to create the project in the right directory?`);
72
+ }
73
+ const rushDir = (0, path_1.dirname)(rushPath);
74
+ const rushContent = yield (0, io_1.readText)(rushDir, rushJson);
75
+ const rushData = external_1.jju.parse(rushContent);
76
+ const projectFolder = (0, path_1.relative)(rushDir, target);
77
+ if (!Array.isArray(rushData.projects)) {
78
+ rushData.projects = [];
79
+ }
80
+ rushData.projects.push({
81
+ packageName,
82
+ projectFolder,
83
+ });
84
+ yield (0, io_1.writeText)(rushDir, rushJson, external_1.jju.update(rushContent, rushData, {
85
+ mode: 'cjson',
86
+ indent: 2,
87
+ }));
88
+ });
89
+ }
90
+ exports.initProject = initProject;
91
+ //# sourceMappingURL=rush.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rush.js","sourceRoot":"","sources":["../../../src/common/clients/rush.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAkD;AAClD,gCAA6B;AAC7B,8BAAsD;AACtD,6CAAqC;AACrC,wCAAwC;AACxC,kDAA+C;AAE/C,WAAW;AACX,MAAM,QAAQ,GAAG,WAAW,CAAC;AAE7B,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,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,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,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;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,8BAA8B;AAE9B,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAChE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACtF,IAAA,SAAG,EAAC,mBAAmB,EAAE,gCAAgC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACrE,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,wCAKC;AAED,SAAsB,YAAY,CAAC,IAAY;;QAC7C,OAAO,CAAC,CAAC,CAAC,MAAM,IAAA,aAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5C,CAAC;CAAA;AAFD,oCAEC;AAED,SAAsB,WAAW,CAAC,WAAmB,EAAE,MAAc;;QACnE,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,uBAAuB,QAAQ,WAAW,MAAM,gEAAgE,CACjH,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,WAAW,GAAG,MAAM,IAAA,aAAQ,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,cAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAEhD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACrC,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;SACxB;QAED,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YACrB,WAAW;YACX,aAAa;SACd,CAAC,CAAC;QAEH,MAAM,IAAA,cAAS,EACb,OAAO,EACP,QAAQ,EACR,cAAG,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE;YAChC,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,CAAC;SACV,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AA/BD,kCA+BC"}
@@ -1,2 +1,4 @@
1
1
  export declare function installDependencies(target?: string, ...flags: Array<string>): Promise<string>;
2
2
  export declare function installPackage(packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
3
+ export declare function detectClient(root: string): Promise<boolean>;
4
+ export declare function initProject(projectName: string, target: string): Promise<void>;
@@ -9,13 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.installPackage = exports.installDependencies = void 0;
12
+ exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
13
13
  const path_1 = require("path");
14
14
  const log_1 = require("../log");
15
+ const io_1 = require("../io");
15
16
  const scripts_1 = require("../scripts");
16
17
  const MemoryStream_1 = require("../MemoryStream");
18
+ // Helpers:
17
19
  function runYarnProcess(args, target, output) {
18
- (0, log_1.log)('generalDebug_0003', 'Starting the Yarn process ...');
20
+ (0, log_1.log)('generalDebug_0003', 'Starting the Yarn@1 process ...');
19
21
  const cwd = (0, path_1.resolve)(process.cwd(), target);
20
22
  return (0, scripts_1.runCommand)('yarn', args, cwd, output);
21
23
  }
@@ -34,28 +36,33 @@ function convert(flags) {
34
36
  }
35
37
  });
36
38
  }
39
+ // Client interface functions:
37
40
  function installDependencies(target = '.', ...flags) {
38
41
  return __awaiter(this, void 0, void 0, function* () {
39
42
  const ms = new MemoryStream_1.MemoryStream();
40
43
  yield runYarnProcess(['install', ...convert(flags)], target, ms);
41
- (0, log_1.log)('generalDebug_0003', `Yarn install dependencies result: ${ms.value}`);
44
+ (0, log_1.log)('generalDebug_0003', `Yarn@1 install dependencies result: ${ms.value}`);
42
45
  return ms.value;
43
46
  });
44
47
  }
45
48
  exports.installDependencies = installDependencies;
46
49
  function installPackage(packageRef, target = '.', ...flags) {
47
50
  return __awaiter(this, void 0, void 0, function* () {
48
- try {
49
- const ms = new MemoryStream_1.MemoryStream();
50
- yield runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
51
- (0, log_1.log)('generalDebug_0003', `Yarn install package result: ${ms.value}`);
52
- return ms.value;
53
- }
54
- catch (ex) {
55
- (0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using Yarn. Make sure Yarn@1 is correctly installed and accessible: ${ex}`);
56
- throw ex;
57
- }
51
+ const ms = new MemoryStream_1.MemoryStream();
52
+ yield runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
53
+ (0, log_1.log)('generalDebug_0003', `Yarn@1 install package result: ${ms.value}`);
54
+ return ms.value;
58
55
  });
59
56
  }
60
57
  exports.installPackage = installPackage;
58
+ function detectClient(root) {
59
+ return __awaiter(this, void 0, void 0, function* () {
60
+ return !!(yield (0, io_1.findFile)(root, 'yarn.lock'));
61
+ });
62
+ }
63
+ exports.detectClient = detectClient;
64
+ function initProject(projectName, target) {
65
+ return __awaiter(this, void 0, void 0, function* () { });
66
+ }
67
+ exports.initProject = initProject;
61
68
  //# sourceMappingURL=yarn.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,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,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,cAAc;gBACjB,OAAO,SAAS,CAAC;YACnB,KAAK,YAAY;gBACf,OAAO,OAAO,CAAC;YACjB,KAAK,WAAW;gBACd,iEAAiE;gBACjE,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,IAAI;YACF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;YAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,gCAAgC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB;QAAC,OAAO,EAAE,EAAE;YACX,IAAA,SAAG,EACD,mBAAmB,EACnB,kCAAkC,UAAU,yEAAyE,EAAE,EAAE,CAC1H,CAAC;YACF,MAAM,EAAE,CAAC;SACV;IACH,CAAC;CAAA;AAbD,wCAaC"}
1
+ {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,8BAAiC;AACjC,wCAAwC;AACxC,kDAA+C;AAE/C,WAAW;AAEX,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,iCAAiC,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,cAAc;gBACjB,OAAO,SAAS,CAAC;YACnB,KAAK,YAAY;gBACf,OAAO,OAAO,CAAC;YACjB,KAAK,WAAW;gBACd,iEAAiE;gBACjE,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,8BAA8B;AAE9B,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,uCAAuC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,kCAAkC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,wCAKC;AAED,SAAsB,YAAY,CAAC,IAAY;;QAC7C,OAAO,CAAC,CAAC,CAAC,MAAM,IAAA,aAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/C,CAAC;CAAA;AAFD,oCAEC;AAED,SAAsB,WAAW,CAAC,WAAmB,EAAE,MAAc;0DAAG,CAAC;CAAA;AAAzE,kCAAyE"}
@@ -104,7 +104,7 @@ exports.createEmulatorSources = createEmulatorSources;
104
104
  function packageEmulator(rootDir) {
105
105
  return __awaiter(this, void 0, void 0, function* () {
106
106
  // finally package everything up
107
- yield (0, npm_1.createPackage)(rootDir);
107
+ yield (0, npm_1.createNpmPackage)(rootDir);
108
108
  // get all files
109
109
  const names = yield (0, io_1.getFileNames)(rootDir);
110
110
  // cleanup
@@ -1 +1 @@
1
- {"version":3,"file":"emulator.js","sourceRoot":"","sources":["../../src/common/emulator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"emulator.js","sourceRoot":"","sources":["../../src/common/emulator.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  export declare function findCompatVersion(version: string): string;
2
2
  export declare const nodeVersion: string;
3
+ export declare const cliName: any;
3
4
  export declare const cliVersion: any;
4
5
  export declare const compatVersion: string;
5
6
  export declare const repositoryUrl: any;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.cpuCount = exports.pathSeparator = exports.isWindows = exports.repositoryUrl = exports.compatVersion = exports.cliVersion = exports.nodeVersion = exports.findCompatVersion = void 0;
3
+ exports.cpuCount = exports.pathSeparator = exports.isWindows = exports.repositoryUrl = exports.compatVersion = exports.cliVersion = exports.cliName = exports.nodeVersion = exports.findCompatVersion = void 0;
4
4
  const os_1 = require("os");
5
5
  const info = require('../../package.json');
6
6
  function findCompatVersion(version) {
@@ -14,6 +14,7 @@ function findCompatVersion(version) {
14
14
  }
15
15
  exports.findCompatVersion = findCompatVersion;
16
16
  exports.nodeVersion = process.version.substring(1);
17
+ exports.cliName = info.name;
17
18
  exports.cliVersion = info.version;
18
19
  exports.compatVersion = findCompatVersion(exports.cliVersion);
19
20
  exports.repositoryUrl = info.repository.url;
@@ -1 +1 @@
1
- {"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/common/info.ts"],"names":[],"mappings":";;;AAAA,2BAA0B;AAE1B,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE3C,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,qCAAqC;IACrC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,KAAK,KAAK,GAAG,EAAE;QACjB,kEAAkE;QAClE,OAAO,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC;KAC5B;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,8CAUC;AAEY,QAAA,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC3C,QAAA,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;AAC1B,QAAA,aAAa,GAAG,iBAAiB,CAAC,kBAAU,CAAC,CAAC;AAC9C,QAAA,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;AACpC,QAAA,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AACzC,QAAA,aAAa,GAAG,iBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,QAAA,QAAQ,GAAG,IAAA,SAAI,GAAE,CAAC,MAAM,CAAC"}
1
+ {"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/common/info.ts"],"names":[],"mappings":";;;AAAA,2BAA0B;AAE1B,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE3C,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,qCAAqC;IACrC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,KAAK,KAAK,GAAG,EAAE;QACjB,kEAAkE;QAClE,OAAO,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC;KAC5B;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,8CAUC;AAEY,QAAA,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC3C,QAAA,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;AACpB,QAAA,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;AAC1B,QAAA,aAAa,GAAG,iBAAiB,CAAC,kBAAU,CAAC,CAAC;AAC9C,QAAA,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;AACpC,QAAA,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AACzC,QAAA,aAAa,GAAG,iBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,QAAA,QAAQ,GAAG,IAAA,SAAI,GAAE,CAAC,MAAM,CAAC"}
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.inspectPilet = exports.inspectPackage = void 0;
4
4
  const path_1 = require("path");
5
5
  const archive_1 = require("./archive");
6
+ const external_1 = require("../external");
6
7
  const packageRoot = 'package/';
7
8
  function getPackageJson(files) {
8
9
  const fileName = `${packageRoot}package.json`;
9
10
  const fileContent = files[fileName];
10
11
  const content = fileContent.toString('utf8');
11
- return JSON.parse(content);
12
+ return external_1.jju.parse(content);
12
13
  }
13
14
  function getPiletMainPath(data, files) {
14
15
  const paths = [
@@ -1 +1 @@
1
- {"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/common/inspect.ts"],"names":[],"mappings":";;;AAAA,+BAAyC;AACzC,uCAAwC;AAGxC,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,KAAmB;IACzC,MAAM,QAAQ,GAAG,GAAG,WAAW,cAAc,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAiB,EAAE,KAAmB;IAC9D,MAAM,KAAK,GAAG;QACZ,IAAI,CAAC,IAAI;QACT,QAAQ,IAAI,CAAC,IAAI,EAAE;QACnB,GAAG,IAAI,CAAC,IAAI,WAAW;QACvB,QAAQ,IAAI,CAAC,IAAI,WAAW;QAC5B,UAAU;QACV,eAAe;KAChB,CAAC;IACF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,WAAW,GAAG,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzG,CAAC;AAMD,SAAgB,cAAc,CAAC,MAA6B;IAC1D,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,MAA6B;IACxD,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QAC5B,uCACK,IAAI,KACP,IAAI;YACJ,IAAI,IACJ;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC"}
1
+ {"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/common/inspect.ts"],"names":[],"mappings":";;;AAAA,+BAAyC;AACzC,uCAAwC;AACxC,0CAAkC;AAGlC,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,SAAS,cAAc,CAAC,KAAmB;IACzC,MAAM,QAAQ,GAAG,GAAG,WAAW,cAAc,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAiB,EAAE,KAAmB;IAC9D,MAAM,KAAK,GAAG;QACZ,IAAI,CAAC,IAAI;QACT,QAAQ,IAAI,CAAC,IAAI,EAAE;QACnB,GAAG,IAAI,CAAC,IAAI,WAAW;QACvB,QAAQ,IAAI,CAAC,IAAI,WAAW;QAC5B,UAAU;QACV,eAAe;KAChB,CAAC;IACF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,WAAW,GAAG,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzG,CAAC;AAMD,SAAgB,cAAc,CAAC,MAA6B;IAC1D,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,MAA6B;IACxD,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QAC5B,uCACK,IAAI,KACP,IAAI;YACJ,IAAI,IACJ;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC"}
@@ -1,9 +1,4 @@
1
1
  import { PackageType, NpmClientType } from '../types';
2
- export declare function detectPnpm(root: string): Promise<unknown>;
3
- export declare function detectNpm(root: string): Promise<unknown>;
4
- export declare function detectYarn(root: string): Promise<boolean>;
5
- export declare function getLernaConfigPath(root: string): Promise<string>;
6
- export declare function getLernaNpmClient(root: string): Promise<NpmClientType>;
7
2
  /**
8
3
  * For details about how this works consult issue
9
4
  * https://github.com/smapiot/piral/issues/203
@@ -11,15 +6,12 @@ export declare function getLernaNpmClient(root: string): Promise<NpmClientType>;
11
6
  */
12
7
  export declare function determineNpmClient(root: string, selected?: NpmClientType): Promise<NpmClientType>;
13
8
  export declare function isMonorepoPackageRef(refName: string, root: string): Promise<boolean>;
14
- export declare function detectMonorepoRoot(root: string): Promise<string>;
15
- export declare type MonorepoKind = 'none' | 'lerna' | 'yarn';
16
- export declare function detectMonorepo(root: string): Promise<MonorepoKind>;
17
- export declare function bootstrapMonorepo(target?: string): any;
18
- export declare function installDependencies(client: NpmClientType, target?: string): Promise<string>;
19
- export declare function installPackage(client: NpmClientType, packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
20
- export declare function publishPackage(target?: string, file?: string, flags?: Array<string>): Promise<string>;
21
- export declare function createPackage(target?: string): Promise<string>;
22
- export declare function findTarball(packageRef: string): Promise<string>;
9
+ export declare function installNpmDependencies(client: NpmClientType, target?: string): Promise<string>;
10
+ export declare function installNpmPackage(client: NpmClientType, packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
11
+ export declare function initNpmProject(client: NpmClientType, projectName: string, target: string): Promise<void>;
12
+ export declare function publishNpmPackage(target?: string, file?: string, flags?: Array<string>): Promise<string>;
13
+ export declare function createNpmPackage(target?: string): Promise<string>;
14
+ export declare function findNpmTarball(packageRef: string): Promise<string>;
23
15
  export declare function findSpecificVersion(packageName: string, version: string): Promise<string>;
24
16
  export declare function findLatestVersion(packageName: string): Promise<string>;
25
17
  export declare function isLocalPackage(baseDir: string, fullName: string): boolean;
@@ -58,5 +50,5 @@ export declare function getPackageName(root: string, name: string, type: Package
58
50
  export declare function getFilePackageVersion(sourceName: string, root: string): string;
59
51
  export declare function getGitPackageVersion(sourceName: string): string;
60
52
  export declare function getPackageVersion(hadVersion: boolean, sourceName: string, sourceVersion: string, type: PackageType, root: string): string;
61
- export declare function makePiletExternals(dependencies: Record<string, string>, externals: Array<string>, fromEmulator: boolean, piralInfo: any): any;
53
+ export declare function makePiletExternals(dependencies: Record<string, string>, externals: Array<string>, fromEmulator: boolean, piralInfo: any): Array<string>;
62
54
  export declare function makeExternals(dependencies: Record<string, string>, externals?: Array<string>, legacy?: boolean): string[];
package/lib/common/npm.js CHANGED
@@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.makeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findTarball = exports.createPackage = exports.publishPackage = exports.installPackage = exports.installDependencies = exports.bootstrapMonorepo = exports.detectMonorepo = exports.detectMonorepoRoot = exports.isMonorepoPackageRef = exports.determineNpmClient = exports.getLernaNpmClient = exports.getLernaConfigPath = exports.detectYarn = exports.detectNpm = exports.detectPnpm = void 0;
12
+ exports.makeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findNpmTarball = exports.createNpmPackage = exports.publishNpmPackage = exports.initNpmProject = exports.installNpmPackage = exports.installNpmDependencies = exports.isMonorepoPackageRef = exports.determineNpmClient = void 0;
13
13
  const path_1 = require("path");
14
14
  const fs_1 = require("fs");
15
15
  const log_1 = require("./log");
16
+ const clients_1 = require("./clients");
16
17
  const config_1 = require("./config");
17
18
  const constants_1 = require("./constants");
18
19
  const inspect_1 = require("./inspect");
@@ -30,55 +31,26 @@ function resolveAbsPath(basePath, fullName) {
30
31
  const relPath = !prefixed ? fullName : fullName.replace(filePrefix, '');
31
32
  return (0, path_1.resolve)(basePath, relPath);
32
33
  }
33
- function detectPnpm(root) {
34
- return new Promise((res) => {
35
- (0, fs_1.access)((0, path_1.resolve)(root, 'pnpm-lock.yaml'), fs_1.constants.F_OK, (noPnpmLock) => {
36
- res(!noPnpmLock);
37
- });
38
- });
39
- }
40
- exports.detectPnpm = detectPnpm;
41
- function detectNpm(root) {
42
- return new Promise((res) => {
43
- (0, fs_1.access)((0, path_1.resolve)(root, 'package-lock.json'), fs_1.constants.F_OK, (noPackageLock) => {
44
- res(!noPackageLock);
45
- });
46
- });
47
- }
48
- exports.detectNpm = detectNpm;
49
- function detectYarn(root) {
50
- return __awaiter(this, void 0, void 0, function* () {
51
- return !!(yield (0, io_1.findFile)(root, 'yarn.lock'));
52
- });
53
- }
54
- exports.detectYarn = detectYarn;
55
- function getLernaConfigPath(root) {
56
- return __awaiter(this, void 0, void 0, function* () {
57
- (0, log_1.log)('generalDebug_0003', 'Trying to get the configuration file for Lerna ...');
58
- const file = yield (0, io_1.findFile)(root, 'lerna.json');
59
- if (file) {
60
- (0, log_1.log)('generalDebug_0003', `Found Lerna config in "${file}".`);
61
- return file;
62
- }
63
- return undefined;
64
- });
65
- }
66
- exports.getLernaConfigPath = getLernaConfigPath;
67
- function getLernaNpmClient(root) {
34
+ function detectMonorepoRoot(root) {
68
35
  return __awaiter(this, void 0, void 0, function* () {
69
- const file = yield getLernaConfigPath(root);
70
- if (file) {
71
- try {
72
- return require(file).npmClient;
36
+ let previous = root;
37
+ do {
38
+ const isMonorepo = (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'lerna.json'))) ||
39
+ (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'rush.json'))) ||
40
+ (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'pnpm-workspace.yaml')));
41
+ if (isMonorepo) {
42
+ return root;
73
43
  }
74
- catch (err) {
75
- (0, log_1.log)('generalError_0002', `Could not read lerna.json: ${err}.`);
44
+ const packageJson = yield (0, io_1.readJson)(root, 'package.json');
45
+ if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
46
+ return root;
76
47
  }
77
- }
48
+ previous = root;
49
+ root = (0, path_1.dirname)(root);
50
+ } while (root !== previous);
78
51
  return undefined;
79
52
  });
80
53
  }
81
- exports.getLernaNpmClient = getLernaNpmClient;
82
54
  /**
83
55
  * For details about how this works consult issue
84
56
  * https://github.com/smapiot/piral/issues/203
@@ -87,35 +59,32 @@ exports.getLernaNpmClient = getLernaNpmClient;
87
59
  function determineNpmClient(root, selected) {
88
60
  return __awaiter(this, void 0, void 0, function* () {
89
61
  if (!selected || !helpers_1.clientTypeKeys.includes(selected)) {
90
- (0, log_1.log)('generalDebug_0003', 'No npm client selected. Checking for lock files ...');
91
- const [hasNpm, hasYarn, hasPnpm] = yield Promise.all([detectNpm(root), detectYarn(root), detectPnpm(root)]);
92
- const found = +hasNpm + +hasYarn + +hasPnpm;
93
- (0, log_1.log)('generalDebug_0003', `Results of the lock file check: npm = ${hasNpm}, Yarn = ${hasYarn}, Pnpm = ${hasPnpm}`);
62
+ (0, log_1.log)('generalDebug_0003', 'No npm client selected. Checking for lock or config files ...');
63
+ const searchedClients = yield (0, clients_1.detectClients)(root);
64
+ const foundClients = searchedClients.filter((m) => m.result);
65
+ (0, log_1.log)('generalDebug_0003', `Results of the lock file check: ${searchedClients.map((m) => `${m.client}=${m.result}`).join(', ')}`);
94
66
  const defaultClient = config_1.config.npmClient;
95
- if (found !== 1) {
96
- const lernaClient = yield getLernaNpmClient(root);
97
- if (helpers_1.clientTypeKeys.includes(lernaClient)) {
98
- (0, log_1.log)('generalDebug_0003', `Found valid npm client via Lerna: ${lernaClient}.`);
99
- return lernaClient;
67
+ if (foundClients.length > 1) {
68
+ const wrapperClient = foundClients.find((m) => (0, clients_1.isWrapperClient)(m.client));
69
+ if (wrapperClient) {
70
+ const { client } = wrapperClient;
71
+ (0, log_1.log)('generalDebug_0003', `Found valid wrapper client via lock or config file: "${client}".`);
100
72
  }
101
73
  }
102
- else if (hasNpm) {
103
- (0, log_1.log)('generalDebug_0003', `Found valid npm client via lockfile.`);
104
- return 'npm';
105
- }
106
- else if (hasYarn) {
107
- (0, log_1.log)('generalDebug_0003', `Found valid Yarn client via lockfile.`);
108
- return 'yarn';
109
- }
110
- else if (hasPnpm) {
111
- (0, log_1.log)('generalDebug_0003', `Found valid pnpm client via lockfile.`);
112
- return 'pnpm';
74
+ if (foundClients.length > 0) {
75
+ const { client } = foundClients[0];
76
+ if (foundClients.length > 1) {
77
+ const clientStr = `"${foundClients.map((m) => m.client).join('", "')}"`;
78
+ (0, log_1.log)('generalWarning_0001', `Found multiple clients via their lock or config files: ${clientStr}.`);
79
+ }
80
+ (0, log_1.log)('generalDebug_0003', `Found valid direct client via lock or config file: "${client}".`);
81
+ return client;
113
82
  }
114
83
  if (helpers_1.clientTypeKeys.includes(defaultClient)) {
115
- (0, log_1.log)('generalDebug_0003', `Found valid Pnpm client the default client: "${defaultClient}".`);
84
+ (0, log_1.log)('generalDebug_0003', `Using the default client: "${defaultClient}".`);
116
85
  return defaultClient;
117
86
  }
118
- (0, log_1.log)('generalDebug_0003', 'Using the default npm client.');
87
+ (0, log_1.log)('generalDebug_0003', 'Using the default "npm" client.');
119
88
  return 'npm';
120
89
  }
121
90
  return selected;
@@ -125,88 +94,61 @@ exports.determineNpmClient = determineNpmClient;
125
94
  function isMonorepoPackageRef(refName, root) {
126
95
  var _a, _b, _c;
127
96
  return __awaiter(this, void 0, void 0, function* () {
128
- const c = require(`./clients/npm`);
129
97
  const newRoot = yield detectMonorepoRoot(root);
130
98
  if (newRoot) {
131
- const details = yield c.listPackage(refName, newRoot);
99
+ const { listPackage } = clients_1.clients.npm;
100
+ const details = yield listPackage(refName, newRoot);
132
101
  return (_c = (_b = (_a = details === null || details === void 0 ? void 0 : details.dependencies) === null || _a === void 0 ? void 0 : _a[refName]) === null || _b === void 0 ? void 0 : _b.extraneous) !== null && _c !== void 0 ? _c : false;
133
102
  }
134
103
  return false;
135
104
  });
136
105
  }
137
106
  exports.isMonorepoPackageRef = isMonorepoPackageRef;
138
- function detectMonorepoRoot(root) {
139
- return __awaiter(this, void 0, void 0, function* () {
140
- const file = yield getLernaConfigPath(root);
141
- if (file !== undefined) {
142
- return (0, path_1.dirname)(file);
143
- }
144
- let previous = root;
145
- do {
146
- const packageJson = yield (0, io_1.readJson)(root, 'package.json');
147
- if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
148
- return root;
149
- }
150
- previous = root;
151
- root = (0, path_1.dirname)(root);
152
- } while (root !== previous);
153
- return undefined;
154
- });
107
+ function installNpmDependencies(client, target = '.') {
108
+ const { installDependencies } = clients_1.clients[client];
109
+ return installDependencies(target);
155
110
  }
156
- exports.detectMonorepoRoot = detectMonorepoRoot;
157
- function detectMonorepo(root) {
111
+ exports.installNpmDependencies = installNpmDependencies;
112
+ function installNpmPackage(client, packageRef, target = '.', ...flags) {
158
113
  return __awaiter(this, void 0, void 0, function* () {
159
- const newRoot = yield detectMonorepoRoot(root);
160
- if (newRoot) {
161
- const file = yield getLernaConfigPath(newRoot);
162
- if (file !== undefined) {
163
- return 'lerna';
164
- }
165
- const packageJson = yield (0, io_1.readJson)(newRoot, 'package.json');
166
- if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
167
- return 'yarn';
168
- }
114
+ try {
115
+ const { installPackage } = clients_1.clients[client];
116
+ return yield installPackage(packageRef, target, ...flags);
117
+ }
118
+ catch (ex) {
119
+ (0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using ${client}. Make sure ${client} is correctly installed and accessible: ${ex}`);
120
+ throw ex;
169
121
  }
170
- return 'none';
171
122
  });
172
123
  }
173
- exports.detectMonorepo = detectMonorepo;
174
- function bootstrapMonorepo(target = '.') {
175
- const c = require(`./clients/lerna`);
176
- return c.bootstrap(target);
177
- }
178
- exports.bootstrapMonorepo = bootstrapMonorepo;
179
- function installDependencies(client, target = '.') {
180
- const c = require(`./clients/${client}`);
181
- return c.installDependencies(target);
182
- }
183
- exports.installDependencies = installDependencies;
184
- function installPackage(client, packageRef, target = '.', ...flags) {
185
- const c = require(`./clients/${client}`);
186
- return c.installPackage(packageRef, target, ...flags);
124
+ exports.installNpmPackage = installNpmPackage;
125
+ function initNpmProject(client, projectName, target) {
126
+ const { initProject } = clients_1.clients[client];
127
+ return initProject(projectName, target);
187
128
  }
188
- exports.installPackage = installPackage;
189
- function publishPackage(target = '.', file = '*.tgz', flags = []) {
190
- const c = require(`./clients/npm`);
191
- return c.publishPackage(target, file, ...flags);
129
+ exports.initNpmProject = initNpmProject;
130
+ function publishNpmPackage(target = '.', file = '*.tgz', flags = []) {
131
+ const { publishPackage } = clients_1.clients.npm;
132
+ return publishPackage(target, file, ...flags);
192
133
  }
193
- exports.publishPackage = publishPackage;
194
- function createPackage(target = '.') {
195
- const c = require(`./clients/npm`);
196
- return c.createPackage(target);
134
+ exports.publishNpmPackage = publishNpmPackage;
135
+ function createNpmPackage(target = '.') {
136
+ const { createPackage } = clients_1.clients.npm;
137
+ return createPackage(target);
197
138
  }
198
- exports.createPackage = createPackage;
199
- function findTarball(packageRef) {
200
- const c = require(`./clients/npm`);
201
- return c.findTarball(packageRef);
139
+ exports.createNpmPackage = createNpmPackage;
140
+ function findNpmTarball(packageRef) {
141
+ const { findTarball } = clients_1.clients.npm;
142
+ return findTarball(packageRef);
202
143
  }
203
- exports.findTarball = findTarball;
144
+ exports.findNpmTarball = findNpmTarball;
204
145
  function findSpecificVersion(packageName, version) {
205
- const c = require(`./clients/npm`);
206
- return c.findSpecificVersion(packageName, version);
146
+ const { findSpecificVersion } = clients_1.clients.npm;
147
+ return findSpecificVersion(packageName, version);
207
148
  }
208
149
  exports.findSpecificVersion = findSpecificVersion;
209
150
  function findLatestVersion(packageName) {
151
+ const { findSpecificVersion } = clients_1.clients.npm;
210
152
  return findSpecificVersion(packageName, 'latest');
211
153
  }
212
154
  exports.findLatestVersion = findLatestVersion;