piral-cli 0.15.1-beta.4903 → 0.15.1-beta.4906

package/src/commands.ts

@@ -811,7 +811,7 @@ const allCommands: Array<ToolCommand<any>> = [
     name: 'add-piral-instance-pilet',
     alias: ['add-shell-pilet', 'install-shell-pilet', 'add-app-pilet', 'with-app-pilet'],
     description: 'Adds another Piral instance to the available apps hosting the current pilet.',
-    arguments: ['[source]'],
+    arguments: ['<app> [source]'],
     flags(argv) {
       return argv
         .positional('app', {
@@ -851,7 +851,7 @@ const allCommands: Array<ToolCommand<any>> = [
     name: 'remove-piral-instance-pilet',
     alias: ['remove-shell-pilet', 'uninstall-shell-pilet', 'remove-app-pilet', 'without-app-pilet'],
     description: 'Removes an existing Piral instance from the available apps hosting the current pilet.',
-    arguments: ['[source]'],
+    arguments: ['<app> [source]'],
     flags(argv) {
       return argv
         .positional('app', {
@@ -867,6 +867,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.removePiralInstancePiletDefaults.logLevel)
+        .choices('npm-client', clientTypeKeys)
+        .describe('npm-client', 'Sets the npm client to be used for removing the Piral instance.')
+        .default('npm-client', apps.removePiralInstancePiletDefaults.npmClient)
         .string('base')
         .default('base', process.cwd())
         .describe('base', 'Sets the base directory. By default the current directory is used.');
@@ -876,6 +879,7 @@ const allCommands: Array<ToolCommand<any>> = [
         logLevel: args['log-level'] as LogLevels,
         app: args.app as string,
         source: args.source as string,
+        npmClient: args['npm-client'] as NpmClientType,
       });
     },
   },

package/src/common/clients/lerna.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'path';
 import { log } from '../log';
-import { findFile } from '../io';
+import { findFile, readJson, writeJson } from '../io';
 import { runCommand } from '../scripts';
 import { MemoryStream } from '../MemoryStream';
 
@@ -37,10 +37,34 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
   return ms.value;
 }
 
+export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  // at the moment not supported by Lerna directly
+  // workaround is to manipulate the package.json directly and bootstrap again...
+  const packageData = await readJson(target, 'package.json');
+
+  if (packageData.dependencies && packageRef in packageData.dependencies) {
+    packageData.dependencies[packageRef] = undefined;
+  }
+
+  if (packageData.devDependencies && packageRef in packageData.devDependencies) {
+    packageData.devDependencies[packageRef] = undefined;
+  }
+
+  if (packageData.peerDependencies && packageRef in packageData.peerDependencies) {
+    packageData.peerDependencies[packageRef] = undefined;
+  }
+
+  await writeJson(target, 'package.json', packageData, true);
+  await runLernaProcess(['bootstrap'], target, ms);
+  log('generalDebug_0003', `Lerna bootstrap (after remove) package result: ${ms.value}`);
+  return ms.value;
+}
+
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runLernaProcess(['add', packageRef, ...convert(flags)], target, ms);
-  log('generalDebug_0003', `Lerna install package result: ${ms.value}`);
+  log('generalDebug_0003', `Lerna add package result: ${ms.value}`);
   return ms.value;
 }
 

package/src/common/clients/npm.ts

@@ -21,6 +21,13 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
   return ms.value;
 }
 
+export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runNpmProcess(['uninstall', packageRef, ...flags], target, ms);
+  log('generalDebug_0003', `npm uninstall package result: ${ms.value}`);
+  return ms.value;
+}
+
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);

package/src/common/clients/pnp.ts

@@ -37,10 +37,17 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
   return ms.value;
 }
 
+export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
+  log('generalDebug_0003', `Yarn PnP remove package result: ${ms.value}`);
+  return ms.value;
+}
+
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
-  log('generalDebug_0003', `Yarn PnP install package result: ${ms.value}`);
+  log('generalDebug_0003', `Yarn PnP add package result: ${ms.value}`);
   return ms.value;
 }
 

package/src/common/clients/pnpm.ts

@@ -33,10 +33,17 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
   return ms.value;
 }
 
+export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runPnpmProcess(['remove', packageRef, ...convert(flags)], target, ms);
+  log('generalDebug_0003', `Pnpm remove package result: ${ms.value}`);
+  return ms.value;
+}
+
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
-  log('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
+  log('generalDebug_0003', `Pnpm add package result: ${ms.value}`);
   return ms.value;
 }
 

package/src/common/clients/rush.ts

@@ -40,10 +40,17 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
   return ms.value;
 }
 
+export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runRushProcess(['remove', packageRef, ...convert(flags)], target, ms);
+  log('generalDebug_0003', `Rush remove package result: ${ms.value}`);
+  return ms.value;
+}
+
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
-  log('generalDebug_0003', `Rush install package result: ${ms.value}`);
+  log('generalDebug_0003', `Rush add package result: ${ms.value}`);
   return ms.value;
 }
 

package/src/common/clients/yarn.ts

@@ -37,10 +37,17 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
   return ms.value;
 }
 
+export async function uninstallPackage(packageRef: string, target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runYarnProcess(['remove', packageRef, ...convert(flags)], target, ms);
+  log('generalDebug_0003', `Yarn Classic remove package result: ${ms.value}`);
+  return ms.value;
+}
+
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
-  log('generalDebug_0003', `Yarn Classic install package result: ${ms.value}`);
+  log('generalDebug_0003', `Yarn Classic add package result: ${ms.value}`);
   return ms.value;
 }
 

package/src/common/injectors.ts

@@ -2,16 +2,14 @@ import { resolve } from 'path';
 import { liveIcon, settingsIcon } from './emoji';
 import { logInfo, log, logReset } from './log';
 import { chalk } from '../external';
-import { Bundler } from '../types';
 
-export function notifyServerOnline(bundlers: Array<Bundler>, path: string, api: string | false) {
+export function notifyServerOnline(path: string, api: string | false) {
   return (svc: any) => {
     log('generalDebug_0003', `The kras server for debugging is online!`);
     const address = `${svc.protocol}://localhost:${chalk.green(svc.port)}`;
     logInfo(`${liveIcon} Running at ${chalk.bold(address + path)}`);
     logInfo(`${settingsIcon} Manage via ${chalk.bold(address + api)}`);
     logReset();
-    bundlers.forEach((bundler) => bundler.start());
   };
 }
 

package/src/common/io.ts

@@ -209,14 +209,17 @@ export async function matchAnyPilet(baseDir: string, patterns: Array<string>) {
     matches.push(path);
   };
   const nameOfPackageJson = 'package.json';
+  const nameOfPiletJson = 'pilet.json';
   const exts = preferences.map((s) => s.substring(1)).join(',');
   const allPatterns = patterns.reduce<Array<AnyPattern>>((agg, curr) => {
     const patterns = [];
 
     if (/[a-zA-Z0-9\-\*]$/.test(curr) && !preferences.find((ext) => curr.endsWith(ext))) {
-      patterns.push(curr, `${curr}.{${exts}}`, `${curr}/${nameOfPackageJson}`);
+      patterns.push(curr, `${curr}.{${exts}}`, `${curr}/${nameOfPackageJson}`, `${curr}/${nameOfPiletJson}`);
     } else if (curr.endsWith('/')) {
-      patterns.push(`${curr}index.{${exts}}`, `${curr}${nameOfPackageJson}`);
+      patterns.push(`${curr}index.{${exts}}`, `${curr}${nameOfPackageJson}`, `${curr}${nameOfPiletJson}`);
+    } else if (curr === '.' || curr === '..') {
+      patterns.push(`${curr}/index.{${exts}}`, `${curr}/${nameOfPackageJson}`, `${curr}/${nameOfPiletJson}`);
     } else {
       patterns.push(curr);
     }

package/src/common/npm.ts

@@ -146,6 +146,24 @@ export async function installNpmPackageFromOptionalRegistry(
   }
 }
 
+export async function uninstallNpmPackage(
+  client: NpmClientType,
+  packageRef: string,
+  target = '.',
+  ...flags: Array<string>
+): Promise<string> {
+  try {
+    const { uninstallPackage } = clients[client];
+    return await uninstallPackage(packageRef, target, ...flags);
+  } catch (ex) {
+    log(
+      'generalError_0002',
+      `Could not uninstall the package "${packageRef}" using ${client}. Make sure ${client} is correctly installed and accessible: ${ex}`,
+    );
+    throw ex;
+  }
+}
+
 export async function installNpmPackage(
   client: NpmClientType,
   packageRef: string,

package/src/common/parallel.ts

@@ -1,7 +1,7 @@
 export async function concurrentWorkers<T, R>(
   items: Array<T>,
   concurrency: number,
-  worker: (item: T) => Promise<R>,
+  worker: (item: T, index: number) => Promise<R>,
 ): Promise<Array<R>> {
   const maxItems = items.length;
   const results: Array<R> = new Array(maxItems);
@@ -12,7 +12,7 @@ export async function concurrentWorkers<T, R>(
       while (offset < maxItems) {
         const i = offset++;
         const item = items[i];
-        results[i] = await worker(item);
+        results[i] = await worker(item, i);
       }
     }),
   );