piral-cli 0.15.0-alpha.4098 → 0.15.0-alpha.4257

package/src/apps/debug-pilet.ts

@@ -8,7 +8,6 @@ import {
   retrievePiletsInfo,
   config,
   openBrowser,
-  reorderInjectors,
   notifyServerOnline,
   setLogLevel,
   progress,
@@ -19,6 +18,8 @@ import {
   cpuCount,
   concurrentWorkers,
   normalizePublicUrl,
+  findFile,
+  createInitialKrasConfig,
 } from '../common';
 
 export interface DebugPiletOptions {
@@ -203,7 +204,6 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
 
   await hooks.onBegin?.({ options, fullBase });
   progress('Reading configuration ...');
-  const krasConfig = readKrasConfig({ port }, krasrc);
   const api = `${publicUrl}${config.piletApi.replace(/^\/+/, '')}`;
   const entryList = Array.isArray(entry) ? entry : [entry];
   const multi = entryList.length > 1 || entryList[0].indexOf('*') !== -1;
@@ -213,10 +213,6 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
   const maxListeners = Math.max(2 + allEntries.length * 2, 16);
   log('generalDebug_0003', `Found the following entries: ${allEntries.join(', ')}`);
 
-  if (krasConfig.sources === undefined) {
-    krasConfig.sources = [];
-  }
-
   if (allEntries.length === 0) {
     fail('entryFileMissing_0077');
   }
@@ -234,15 +230,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
     const dest = resolve(root, target);
     const outDir = dirname(dest);
     const outFile = basename(dest);
-    const exists = await checkExistingDirectory(mocks);
-
-    if (exists) {
-      if (krasConfig.directory === undefined) {
-        krasConfig.directory = mocks;
-      }
-
-      krasConfig.sources.push(mocks);
-    }
+    const mocksExists = await checkExistingDirectory(mocks);
 
     await hooks.beforeBuild?.({ root, publicUrl, importmap, entryModule, schemaVersion });
 
@@ -278,6 +266,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
       externals,
       piral: appPackage.name,
       bundler,
+      mocks: mocksExists ? mocks : undefined,
       root,
     };
   });
@@ -287,43 +276,32 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
 
   await hooks.beforeApp?.({ appInstanceDir, pilets });
   const appDir = appInstanceDir || (await getOrMakeAppDir(pilets[0], logLevel));
+  const appRoot = dirname(await findFile(appDir, 'package.json'));
   await hooks.afterApp?.({ appInstanceDir, pilets });
 
   Promise.all(pilets.map((p) => p.bundler.ready())).then(() => logDone(`Ready!`));
 
-  if (krasConfig.ssl === undefined) {
-    krasConfig.ssl = undefined;
-  }
-
-  if (krasConfig.map === undefined) {
-    krasConfig.map = {};
-  }
-
-  if (krasConfig.api === undefined) {
-    krasConfig.api = '/manage-mock-server';
-  }
-
-  if (krasConfig.injectors === undefined) {
-    krasConfig.injectors = defaultConfig.injectors;
-  }
-
-  const { pilet: piletInjector, ...otherInjectors } = krasConfig.injectors;
-  const injectorConfig = {
-    meta: 'debug-meta.json',
-    feed,
-    ...piletInjector,
-    active: true,
-    pilets,
-    app: appDir,
-    publicUrl,
-    handle: ['/', api],
-    api,
+  const sources = pilets.map((m) => m.mocks).filter(Boolean);
+  const krasBaseConfig = resolve(fullBase, krasrc);
+  const krasRootConfig = resolve(appRoot, krasrc);
+  const initial = createInitialKrasConfig(sources[0] || resolve(fullBase, 'mocks'), { [api]: '' }, sources, feed);
+  const required = {
+    injectors: {
+      piral: {
+        active: false,
+      },
+      pilet: {
+        active: true,
+        pilets,
+        app: appDir,
+        publicUrl,
+        handle: ['/', api],
+        api,
+      },
+    },
   };
-
-  krasConfig.map['/'] = '';
-  krasConfig.map[api] = '';
-
-  krasConfig.injectors = reorderInjectors(injectorName, injectorConfig, otherInjectors);
+  const configs = [krasBaseConfig, ...pilets.map((p) => resolve(p.root, krasrc)), krasRootConfig];
+  const krasConfig = readKrasConfig({ port, initial, required }, ...configs);
 
   log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
 

package/src/apps/debug-piral.ts

@@ -1,5 +1,5 @@
 import { dirname, join, resolve } from 'path';
-import { readKrasConfig, krasrc, buildKrasWithCli, defaultConfig } from 'kras';
+import { readKrasConfig, krasrc, buildKrasWithCli } from 'kras';
 import { callPiralDebug } from '../bundler';
 import { LogLevels } from '../types';
 import {
@@ -7,7 +7,6 @@ import {
   retrievePiralRoot,
   openBrowser,
   checkCliCompatibility,
-  reorderInjectors,
   notifyServerOnline,
   setLogLevel,
   progress,
@@ -16,6 +15,7 @@ import {
   normalizePublicUrl,
   logDone,
   getDestination,
+  createInitialKrasConfig,
 } from '../common';
 
 export interface DebugPiralOptions {
@@ -99,8 +99,6 @@ export const debugPiralDefaults: DebugPiralOptions = {
   optimizeModules: false,
 };
 
-const injectorName = resolve(__dirname, '../injectors/piral.js');
-
 export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOptions = {}) {
   const {
     entry = debugPiralDefaults.entry,
@@ -125,30 +123,9 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
   const entryFiles = await retrievePiralRoot(fullBase, entry);
   const { externals, name, root, ignored } = await retrievePiletsInfo(entryFiles);
   const dest = getDestination(entryFiles, resolve(fullBase, target));
-  const krasConfig = readKrasConfig({ port }, krasrc);
 
   await checkCliCompatibility(root);
 
-  if (krasConfig.directory === undefined) {
-    krasConfig.directory = join(dirname(entryFiles), 'mocks');
-  }
-
-  if (krasConfig.ssl === undefined) {
-    krasConfig.ssl = undefined;
-  }
-
-  if (krasConfig.map === undefined) {
-    krasConfig.map = {};
-  }
-
-  if (krasConfig.api === undefined) {
-    krasConfig.api = '/manage-mock-server';
-  }
-
-  if (krasConfig.injectors === undefined) {
-    krasConfig.injectors = defaultConfig.injectors;
-  }
-
   await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, name });
 
   const bundler = await callPiralDebug(
@@ -174,18 +151,24 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     hooks.afterBuild?.({ ...args, root, publicUrl, externals, entryFiles, name, bundler, ...dest });
   });
 
-  const { piral: piralInjector, ...otherInjectors } = krasConfig.injectors;
-  const injectorConfig = {
-    ...piralInjector,
-    feed,
-    active: true,
-    handle: ['/'],
-    publicUrl,
-    bundler,
+  const krasBaseConfig = resolve(fullBase, krasrc);
+  const krasRootConfig = resolve(root, krasrc);
+  const initial = createInitialKrasConfig(join(dirname(entryFiles), 'mocks'));
+  const required = {
+    injectors: {
+      piral: {
+        active: true,
+        handle: ['/'],
+        feed,
+        publicUrl,
+        bundler,
+      },
+      pilet: {
+        active: false,
+      },
+    },
   };
-
-  krasConfig.map['/'] = '';
-  krasConfig.injectors = reorderInjectors(injectorName, injectorConfig, otherInjectors);
+  const krasConfig = readKrasConfig({ port, initial, required }, krasBaseConfig, krasRootConfig);
 
   log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
 

package/src/apps/new-pilet.ts

@@ -5,12 +5,12 @@ import {
   SourceLanguage,
   createDirectory,
   createFileIfNotExists,
-  installPackage,
+  installNpmPackage,
   dissectPackageName,
   copyPiralFiles,
   patchPiletPackage,
   scaffoldPiletSourceFiles,
-  installDependencies,
+  installNpmDependencies,
   combinePackageRef,
   getPackageName,
   getPackageVersion,
@@ -27,10 +27,9 @@ import {
   isLinkedPackage,
   copyScaffoldingFiles,
   getPiralPath,
-  detectMonorepo,
-  bootstrapMonorepo,
   getPiletScaffoldData,
   config,
+  initNpmProject,
 } from '../common';
 
 export interface NewPiletOptions {
@@ -130,6 +129,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
 
   if (success) {
     const npmClient = await determineNpmClient(root, options.npmClient);
+    const projectName = basename(root);
 
     progress(`Scaffolding new pilet in %s ...`, root);
 
@@ -138,7 +138,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
       'package.json',
       JSON.stringify(
         {
-          name: basename(root),
+          name: projectName,
           version: '1.0.0',
           description: '',
           keywords: ['pilet'],
@@ -154,6 +154,8 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
       ),
     );
 
+    await initNpmProject(npmClient, projectName, root);
+
     if (registry !== newPiletDefaults.registry) {
       progress(`Setting up npm registry (%s) ...`, registry);
 
@@ -172,8 +174,7 @@ always-auth=true`,
       const packageRef = combinePackageRef(sourceName, sourceVersion, type);
 
       progress(`Installing npm package %s ...`, packageRef);
-
-      await installPackage(npmClient, packageRef, root, '--save-dev', '--save-exact');
+      await installNpmPackage(npmClient, packageRef, root, '--save-dev', '--save-exact');
     } else {
       progress(`Using locally available npm package %s ...`, sourceName);
     }
@@ -215,13 +216,7 @@ always-auth=true`,
 
     if (install) {
       progress(`Installing dependencies ...`);
-      const monorepoKind = await detectMonorepo(root);
-
-      if (monorepoKind === 'lerna') {
-        await bootstrapMonorepo(root);
-      } else {
-        await installDependencies(npmClient, root);
-      }
+      await installNpmDependencies(npmClient, root);
     }
 
     if (postScaffold) {

package/src/apps/new-piral.ts

@@ -1,16 +1,17 @@
 import { resolve, basename } from 'path';
+import { frameworkKeys } from '../helpers';
 import { LogLevels, Framework, NpmClientType } from '../types';
 import {
   ForceOverwrite,
   SourceLanguage,
-  installPackage,
+  installNpmPackage,
   updateExistingJson,
   getPiralPackage,
   scaffoldPiralSourceFiles,
   createDirectory,
   createFileIfNotExists,
   logDone,
-  installDependencies,
+  installNpmDependencies,
   combinePackageRef,
   setLogLevel,
   fail,
@@ -19,7 +20,9 @@ import {
   cliVersion,
   getPiralScaffoldData,
   config,
+  initNpmProject,
 } from '../common';
+import { sourceLanguageKeys } from '..';
 
 export interface NewPiralOptions {
   /**
@@ -121,6 +124,11 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const root = resolve(fullBase, target);
+
+  if (!frameworkKeys.includes(framework)) {
+    fail('generalError_0002', `The "framework" value must be one of: ${frameworkKeys.join(', ')}`);
+  }
+
   setLogLevel(logLevel);
   progress('Preparing source and target ...');
   const success = await createDirectory(root);
@@ -128,6 +136,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
   if (success) {
     const npmClient = await determineNpmClient(root, options.npmClient);
     const packageRef = combinePackageRef(framework, version, 'registry');
+    const projectName = basename(root);
 
     progress(`Creating a new Piral instance in %s ...`, root);
 
@@ -136,7 +145,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
       'package.json',
       JSON.stringify(
         {
-          name: basename(root),
+          name: projectName,
           version: '1.0.0',
           description: '',
           keywords: ['piral'],
@@ -148,6 +157,8 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
       ),
     );
 
+    await initNpmProject(npmClient, projectName, root);
+
     if (registry !== newPiralDefaults.registry) {
       progress(`Setting up npm registry (%s) ...`, registry);
 
@@ -162,7 +173,7 @@ always-auth=true`,
 
     progress(`Installing npm package ${packageRef} ...`);
 
-    await installPackage(npmClient, packageRef, root, '--save-exact');
+    await installNpmPackage(npmClient, packageRef, root, '--save-exact');
 
     progress(`Taking care of templating ...`);
 
@@ -177,7 +188,7 @@ always-auth=true`,
 
     if (install) {
       progress(`Installing dependencies ...`);
-      await installDependencies(npmClient, root);
+      await installNpmDependencies(npmClient, root);
     }
 
     logDone(`Piral instance scaffolded successfully!`);

package/src/apps/publish-pilet.ts

@@ -13,7 +13,7 @@ import {
   log,
   config,
   checkExists,
-  findTarball,
+  findNpmTarball,
   downloadFile,
   matchAnyPilet,
   retrievePiletData,
@@ -77,6 +77,11 @@ export interface PublishPiletOptions {
    */
   headers?: Record<string, string>;
 
+  /**
+   * Defines if authorization tokens can be retrieved interactively.
+   */
+  interactive?: boolean;
+
   /**
    * Sets the bundler to use for building, if any specific.
    */
@@ -104,6 +109,7 @@ export const publishPiletDefaults: PublishPiletOptions = {
   from: 'local',
   fields: {},
   headers: {},
+  interactive: false,
 };
 
 async function getFiles(
@@ -192,7 +198,7 @@ async function getFiles(
       }
       case 'npm': {
         log('generalDebug_0003', `View npm package "${sources.join('", "')}".`);
-        const allUrls = await Promise.all(sources.map((s) => findTarball(s)));
+        const allUrls = await Promise.all(sources.map((s) => findNpmTarball(s)));
         log('generalDebug_0003', `Download file from "${allUrls.join('", "')}".`);
         const allFiles = await Promise.all(allUrls.map((url) => downloadFile(url, ca)));
         return allFiles.reduce((result, files) => [...result, ...files], []);
@@ -214,6 +220,7 @@ export async function publishPilet(baseDir = process.cwd(), options: PublishPile
     fields = publishPiletDefaults.fields,
     headers = publishPiletDefaults.headers,
     mode = publishPiletDefaults.mode,
+    interactive = publishPiletDefaults.interactive,
     _ = {},
     bundlerName,
   } = options;
@@ -254,7 +261,7 @@ export async function publishPilet(baseDir = process.cwd(), options: PublishPile
 
     if (content) {
       progress(`Publishing "%s" ...`, file, url);
-      const result = await postFile(url, mode, apiKey, content, fields, headers, ca);
+      const result = await postFile(url, mode, apiKey, content, fields, headers, ca, interactive);
 
       if (result.success) {
         successfulUploads.push(file);

package/src/apps/publish-piral.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 import { publishArtifacts } from '../release';
 import { LogLevels, PiralBuildType } from '../types';
-import { setLogLevel, progress, checkExists, fail, logDone, logReset, publishPackage, matchFiles } from '../common';
+import { setLogLevel, progress, checkExists, fail, logDone, logReset, publishNpmPackage, matchFiles } from '../common';
 
 export interface PublishPiralOptions {
   /**
@@ -19,6 +19,11 @@ export interface PublishPiralOptions {
    */
   fields?: Record<string, string>;
 
+  /**
+   * Defines if authorization tokens can be retrieved interactively.
+   */
+  interactive?: boolean;
+
   /**
    * The provider to use for publishing the release artifacts.
    */
@@ -36,9 +41,15 @@ export const publishPiralDefaults: PublishPiralOptions = {
   type: 'all',
   provider: 'none',
   fields: {},
+  interactive: false,
 };
 
-async function publishEmulator(baseDir: string, source: string, args: Record<string, string> = {}) {
+async function publishEmulator(
+  baseDir: string,
+  source: string,
+  args: Record<string, string> = {},
+  interactive = false,
+) {
   const type = 'emulator';
   const directory = resolve(baseDir, source, type);
   const exists = await checkExists(directory);
@@ -58,7 +69,9 @@ async function publishEmulator(baseDir: string, source: string, args: Record<str
     p.push(`--${c}`, args[c]);
     return p;
   }, [] as Array<string>);
-  await publishPackage(directory, file, flags);
+
+  //TODO support interactive here, too?
+  await publishNpmPackage(directory, file, flags);
 }
 
 async function publishRelease(
@@ -66,6 +79,7 @@ async function publishRelease(
   source: string,
   providerName: string,
   args: Record<string, string> = {},
+  interactive = false,
 ) {
   const type = 'release';
   const directory = resolve(baseDir, source, type);
@@ -76,7 +90,7 @@ async function publishRelease(
   }
 
   const files = await matchFiles(directory, '**/*');
-  await publishArtifacts(providerName, files, args);
+  await publishArtifacts(providerName, files, args, interactive);
 }
 
 export async function publishPiral(baseDir = process.cwd(), options: PublishPiralOptions = {}) {
@@ -86,6 +100,7 @@ export async function publishPiral(baseDir = process.cwd(), options: PublishPira
     logLevel = publishPiralDefaults.logLevel,
     fields = publishPiralDefaults.fields,
     provider = publishPiralDefaults.provider,
+    interactive = publishPiralDefaults.interactive,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   setLogLevel(logLevel);
@@ -98,14 +113,14 @@ export async function publishPiral(baseDir = process.cwd(), options: PublishPira
 
   if (type !== 'release') {
     progress('Publishing emulator package ...');
-    await publishEmulator(fullBase, source, fields);
+    await publishEmulator(fullBase, source, fields, interactive);
     logDone(`Successfully published emulator.`);
     logReset();
   }
 
   if (type !== 'emulator') {
     progress('Publishing release files ...');
-    await publishRelease(fullBase, source, provider, fields);
+    await publishRelease(fullBase, source, provider, fields, interactive);
     logDone(`Successfully published release.`);
     logReset();
   }

package/src/apps/upgrade-pilet.ts

@@ -2,7 +2,7 @@ import { resolve } from 'path';
 import { LogLevels, NpmClientType } from '../types';
 import {
   readJson,
-  installPackage,
+  installNpmPackage,
   checkExistingDirectory,
   patchPiletPackage,
   copyPiralFiles,
@@ -10,7 +10,7 @@ import {
   readPiralPackage,
   getPiletsInfo,
   runScript,
-  installDependencies,
+  installNpmDependencies,
   getCurrentPackageDetails,
   checkAppShellPackage,
   setLogLevel,
@@ -22,8 +22,6 @@ import {
   ForceOverwrite,
   copyScaffoldingFiles,
   getPiralPath,
-  detectMonorepo,
-  bootstrapMonorepo,
   isMonorepoPackageRef,
   getPiletScaffoldData,
   SourceLanguage,
@@ -131,7 +129,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
     if (!monorepoRef) {
       // only install the latest if the shell does come from remote
       progress(`Updating npm package to %s ...`, packageRef);
-      await installPackage(npmClient, packageRef, root, '--no-save');
+      await installNpmPackage(npmClient, packageRef, root, '--no-save');
     }
 
     const piralInfo = await readPiralPackage(root, sourceName);
@@ -164,13 +162,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
 
     if (install) {
       progress(`Updating dependencies ...`);
-      const monorepoKind = await detectMonorepo(root);
-
-      if (monorepoKind === 'lerna') {
-        await bootstrapMonorepo(root);
-      } else {
-        await installDependencies(npmClient, root);
-      }
+      await installNpmDependencies(npmClient, root);
     }
 
     if (postUpgrade) {

package/src/apps/upgrade-piral.ts

@@ -3,7 +3,7 @@ import { LogLevels, NpmClientType } from '../types';
 import {
   readJson,
   checkExistingDirectory,
-  installDependencies,
+  installNpmDependencies,
   setLogLevel,
   progress,
   fail,
@@ -113,7 +113,7 @@ export async function upgradePiral(baseDir = process.cwd(), options: UpgradePira
 
   if (install) {
     progress(`Updating the npm packages to %s ...`, version);
-    await installDependencies(npmClient, root);
+    await installNpmDependencies(npmClient, root);
   }
 
   logDone('Piral instance upgraded successfully!');

package/src/bundler.test.ts

@@ -48,7 +48,7 @@ jest.mock('./common', () => ({
     bundler: 'parcel',
   },
   cliVersion: '1.0.0',
-  installPackage: jest.fn(),
+  installNpmPackage: jest.fn(),
   fail(msg) {
     throw new Error(msg);
   },

package/src/bundler.ts

@@ -1,7 +1,7 @@
 import { callDynamic, callStatic } from './build/bundler-calls';
 import { availableBundlers } from './helpers';
 import {
-  installPackage,
+  installNpmPackage,
   cliVersion,
   fail,
   progress,
@@ -39,7 +39,7 @@ async function installDefaultBundler(root: string) {
   const client = await determineNpmClient(root);
   log('generalDebug_0003', `Prepare to install ${selectedPackage}@${cliVersion} using "${client}" into "${root}".`);
   progress(`Installing ${selectedPackage} ...`);
-  await installPackage(client, `${selectedPackage}@${cliVersion}`, root, '--save-dev', '--save-exact');
+  await installNpmPackage(client, `${selectedPackage}@${cliVersion}`, root, '--save-dev', '--save-exact');
   log('generalDebug_0003', `Installed bundler from "${selectedPackage}".`);
 
   require('./inject').inject(selectedPackage);