piral-cli 1.8.1 → 1.8.2-beta.7851

package/lib/types/public.d.ts

@@ -1,5 +1,5 @@
-import { Argv, Arguments } from 'yargs';
-import { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
+import type { Argv, Arguments } from 'yargs';
+import type { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
 export type FlagType = 'string' | 'number' | 'boolean' | 'object';
 export interface Flag {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "1.8.1",
+  "version": "1.8.2-beta.7851",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -54,7 +54,7 @@
     "@types/mime": "^4",
     "@types/node": "^18",
     "@types/rc": "^1",
-    "@types/yargs": "^17",
+    "@types/yargs": "^15",
     "axios": "^1",
     "chalk": "^5",
     "enhanced-resolve": "^5",
@@ -68,15 +68,15 @@
     "ora": "^8",
     "rc": "^1",
     "rimraf": "^6",
-    "tar": "^7"
+    "tar": "^7",
+    "yargs": "^15"
   },
   "dependencies": {
     "css-conflict-inspector": "^0.2",
     "dets": "^0.16.7",
     "kras": "^1",
     "open": "^10",
-    "typescript": "^5",
-    "yargs": "^17"
+    "typescript": "^5"
   },
-  "gitHead": "77a33ee784435d771d31b752240babe2a692b6aa"
+  "gitHead": "fa0dcf704b6146a1ceb6daa2787540365030e943"
 }

package/src/cli.ts

@@ -1,7 +1,6 @@
-import yargs from 'yargs';
-import { detailed } from 'yargs-parser';
 import { caterpillerIcon, zapIcon, butterflyIcon, cliName, cliVersion } from './common';
 import { runQuestionnaireFor } from './questionnaire';
+import { yargs, detailed } from './external';
 import { ToolCommand } from './types';
 
 let argv = yargs;

package/src/common/pack.test.ts

@@ -22,25 +22,19 @@ describe('Pack Module', () => {
   it('createPilePackage without package json', async () => {
     json = null;
     expect.assertions(1);
-    await expect(createPiletPackage('./', '', '')).rejects.toEqual(
-      Error('[0020] No valid package.json could be found.'),
-    );
+    await expect(createPiletPackage('./', '', '')).rejects.toThrow('[0020] No valid package.json could be found.');
   });
 
   it('createPilePackage without package json name', async () => {
     json = {};
     expect.assertions(1);
-    await expect(createPiletPackage('./', '', '')).rejects.toEqual(
-      Error('[0021] Cannot pack the pilet - missing name.'),
-    );
+    await expect(createPiletPackage('./', '', '')).rejects.toThrow('[0021] Cannot pack the pilet - missing name.');
   });
 
   it('createPilePackage without package json version', async () => {
     json = { name: 'Test' };
     expect.assertions(1);
-    await expect(createPiletPackage('./', '', '')).rejects.toEqual(
-      Error('[0022] Cannot pack the pilet - missing version.'),
-    );
+    await expect(createPiletPackage('./', '', '')).rejects.toThrow('[0022] Cannot pack the pilet - missing version.');
   });
 
   it('createPilePackage source = target', async () => {

package/src/common/package.test.ts

@@ -135,18 +135,11 @@ describe('CLI package module', () => {
   it(
     'retrievePiletData error cases',
     async () => {
-      await retrievePiletData('foo', '').catch((err) =>
-        expect(err).toStrictEqual(Error('[0012] No Piral instances have been provided.')),
+      await expect(retrievePiletData('foo', 'bar')).rejects.toThrow(
+        '[0010] The defined Piral instance ("bar") could not be found.',
       );
-
-      await retrievePiletData('foo', 'bar').catch((err) =>
-        expect(err).toStrictEqual(Error('[0010] The defined Piral instance ("bar") could not be found.')),
-      );
-
-      await retrievePiletData('/foo', 'sample-piral').catch((err) =>
-        expect(err).toStrictEqual(
-          Error('[0075] Cannot find the "package.json". You need a valid package.json for your pilet.'),
-        ),
+      await expect(retrievePiletData('/foo', 'sample-piral')).rejects.toThrow(
+        '[0075] Cannot find the "package.json". You need a valid package.json for your pilet.',
       );
     },
     testOptions,

package/src/common/rules.test.ts

@@ -12,7 +12,7 @@ describe('Rules Module', () => {
     const runException = () => {
       ruleSummary(['Error!'], []);
     };
-    expect(runException).toThrow(Error('[0080] Validation failed. Found 1 error(s).'));
+    expect(runException).toThrow('[0080] Validation failed. Found 1 error(s).');
 
     let consoleSpy = vitest.spyOn(process.stderr, 'write');
     ruleSummary([], []);

package/src/external/index.ts

@@ -1,5 +1,7 @@
 import * as jju from 'jju';
 import * as tar from 'tar';
+import yargs from 'yargs';
+import { detailed } from 'yargs-parser';
 import glob from 'glob';
 import FormData from 'form-data';
 import rc = require('rc');
@@ -34,4 +36,6 @@ export {
   getPort,
   jju,
   getModulePath,
+  yargs,
+  detailed,
 };

package/src/types/public.ts

@@ -1,5 +1,5 @@
-import { Argv, Arguments } from 'yargs';
-import { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
+import type { Argv, Arguments } from 'yargs';
+import type { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
 
 export type FlagType = 'string' | 'number' | 'boolean' | 'object';