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

package/src/apps/debug-piral.ts

@@ -159,12 +159,12 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
       hooks.afterBuild?.({ ...args, root, publicUrl, externals, entryFiles, piralInstances, bundler, ...dest });
     });
 
+    bundler.start();
+
     const krasBaseConfig = resolve(fullBase, krasrc);
     const krasRootConfig = resolve(root, krasrc);
     const mocks = join(targetDir, 'mocks');
     const baseMocks = resolve(fullBase, 'mocks');
-
-
     const mocksExist = await checkExistingDirectory(mocks);
     const sources = [mocksExist ? mocks : undefined].filter(Boolean);
     const initial = createInitialKrasConfig(baseMocks, sources);
@@ -187,8 +187,9 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
 
     const krasServer = buildKrasWithCli(krasConfig);
+    krasServer.setMaxListeners(16);
     krasServer.removeAllListeners('open');
-    krasServer.on('open', notifyServerOnline([bundler], publicUrl, krasConfig.api));
+    krasServer.on('open', notifyServerOnline(publicUrl, krasConfig.api));
 
     await hooks.beforeOnline?.({ krasServer, krasConfig, open, port, publicUrl });
     await krasServer.start();

package/src/apps/remove-piral-instance-pilet.ts

@@ -1,6 +1,6 @@
 import { dirname, resolve } from 'path';
-import { setLogLevel, progress, log, matchAnyPilet, findFile, readJson, writeJson, logDone, findPiletRoot } from '../common';
-import { LogLevels } from '../types';
+import { setLogLevel, progress, log, matchAnyPilet, findFile, readJson, writeJson, logDone, findPiletRoot, determineNpmClient, uninstallNpmPackage } from '../common';
+import { LogLevels, NpmClientType } from '../types';
 
 export interface RemovePiralInstancePiletOptions {
   /**
@@ -17,16 +17,24 @@ export interface RemovePiralInstancePiletOptions {
    * Sets the source directory for adding the Piral instance.
    */
   source?: string;
+
+  /**
+   * The npm client to be used when scaffolding.
+   * @example 'yarn'
+   */
+  npmClient?: NpmClientType;
 }
 
 export const removePiralInstancePiletDefaults: RemovePiralInstancePiletOptions = {
   logLevel: LogLevels.info,
   app: undefined,
   source: '.',
+  npmClient: undefined,
 };
 
 export async function removePiralInstancePilet(baseDir = process.cwd(), options: RemovePiralInstancePiletOptions = {}) {
   const {
+    npmClient: defaultNpmClient = removePiralInstancePiletDefaults.npmClient,
     logLevel = removePiralInstancePiletDefaults.logLevel,
     source = removePiralInstancePiletDefaults.source,
     app = removePiralInstancePiletDefaults.app,
@@ -35,33 +43,18 @@ export async function removePiralInstancePilet(baseDir = process.cwd(), options:
   setLogLevel(logLevel);
   progress('Reading configuration ...');
 
+  const npmClient = await determineNpmClient(fullBase, defaultNpmClient);
   const allEntries = await matchAnyPilet(fullBase, [source]);
 
   const tasks = allEntries.map(async (entryModule) => {
     const targetDir = dirname(entryModule);
     const piletJson = 'pilet.json';
-    const packageJson = 'package.json';
     const piletJsonPath = await findFile(targetDir, piletJson);
 
     if (piletJsonPath) {
       const piletJsonDir = dirname(piletJsonPath);
       const oldContent = await readJson(piletJsonDir, piletJson);
       const root = await findPiletRoot(piletJsonDir);
-      const packageData = await readJson(root, packageJson);
-
-      if ('dependencies' in packageData && app in packageData.dependencies) {
-        packageData.dependencies[app] = undefined;
-      }
-
-      if ('devDependencies' in packageData && app in packageData.devDependencies) {
-        packageData.devDependencies[app] = undefined;
-      }
-
-      if ('peerDependencies' in packageData && app in packageData.peerDependencies) {
-        packageData.peerDependencies[app] = undefined;
-      }
-
-      await writeJson(root, packageJson, packageData, true);
 
       if ('piralInstances' in oldContent && app in oldContent.piralInstances) {
         const newContent = {
@@ -74,6 +67,8 @@ export async function removePiralInstancePilet(baseDir = process.cwd(), options:
 
         await writeJson(piletJsonDir, piletJson, newContent, true);
       }
+
+      await uninstallNpmPackage(npmClient, app, root);
     } else {
       log('piletJsonNotAvailable_0180', targetDir);
     }

package/src/build/bundler-calls.ts

@@ -10,6 +10,7 @@ type BundleListener = (args: any) => void;
 
 function createBundler(cwd: string, ps: ChildProcess, args: any) {
   let promise = Promise.resolve();
+  let started = false;
   const listeners: Array<BundleListener> = [];
   const bundle: BundleDetails = {
     dir: cwd,
@@ -28,10 +29,13 @@ function createBundler(cwd: string, ps: ChildProcess, args: any) {
   const bundler = {
     bundle,
     start() {
-      ps.send({
-        type: 'bundle',
-        ...args,
-      });
+      if (!started) {
+        started = true;
+        ps.send({
+          type: 'bundle',
+          ...args,
+        });
+      }
     },
     on(cb: BundleListener) {
       listeners.push(cb);

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,
@@ -372,13 +390,13 @@ export function tryResolvePackage(name: string, baseDir: string = undefined) {
   return path;
 }
 
-export function findPackageRoot(pck: string, baseDir: string = undefined) {
+export function findPackageRoot(pck: string, baseDir: string) {
   return tryResolvePackage(`${pck}/package.json`, baseDir);
 }
 
-export function isLinkedPackage(name: string, type: PackageType, hadVersion: boolean) {
+export function isLinkedPackage(name: string, type: PackageType, hadVersion: boolean, target: string) {
   if (type === 'registry' && !hadVersion) {
-    const root = findPackageRoot(name);
+    const root = findPackageRoot(name, target);
     return typeof root === 'string';
   }
 

package/src/common/package.ts

@@ -196,6 +196,7 @@ function findPiralInstances(
         const relPath = appPackage && appPackage.app;
         appPackage.app = relPath && resolve(root, relPath);
         appPackage.root = root;
+        appPackage.port = piletDefinition?.piralInstances?.[proposedApp]?.port ?? 0;
         return appPackage;
       }
 
@@ -763,6 +764,7 @@ export async function retrievePiletData(target: string, app?: string) {
   for (const appPackage of appPackages) {
     const appFile: string = appPackage?.app;
     const appRoot: string = appPackage?.root;
+    const appPort = appPackage?.port;
 
     if (!appFile || !appRoot) {
       fail('appInstanceInvalid_0011');
@@ -774,6 +776,7 @@ export async function retrievePiletData(target: string, app?: string) {
       appFile,
       appRoot,
       emulator,
+      appPort,
     });
   }
 

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);
       }
     }),
   );

package/src/common/shell.ts

@@ -16,7 +16,7 @@ export async function installPiralInstance(
   npmClient: NpmClientType,
 ): Promise<[name: string, version: string]> {
   const [sourceName, sourceVersion, hadVersion, type] = await dissectPackageName(baseDir, usedSource);
-  const isLocal = isLinkedPackage(sourceName, type, hadVersion);
+  const isLocal = isLinkedPackage(sourceName, type, hadVersion, rootDir);
 
   if (!isLocal) {
     const packageRef = combinePackageRef(sourceName, sourceVersion, type);

package/src/external/resolve.ts

@@ -1,7 +1,7 @@
 import * as fs from 'graceful-fs';
 import { ResolverFactory, CachedInputFileSystem } from 'enhanced-resolve';
 
-const nodeFileSystem = new CachedInputFileSystem(fs, 4000);
+const nodeFileSystem = new CachedInputFileSystem(fs, 100);
 
 const nodeContext = {
   environments: ['node+es3+es5+process+native'],

package/src/types/common.ts

@@ -38,12 +38,14 @@ export interface PiralPackageData extends PackageData {
 export interface PiralInstancePackageData extends PiralPackageData {
   root: string;
   app: string;
+  port: number;
 }
 
 export interface AppDefinition {
   appPackage: PiralInstancePackageData;
   appFile: string;
   appRoot: string;
+  appPort: number;
   emulator: boolean;
 }
 

package/src/types/internal.ts

@@ -8,6 +8,7 @@ export interface PiletDefinition {
     string,
     {
       selected?: boolean;
+      port?: number;
     }
   >;
 }