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

package/lib/release.d.ts

@@ -4,4 +4,4 @@ export interface QualifiedReleaseProvider {
     action: ReleaseProvider;
 }
 export declare function setReleaseProvider(provider: QualifiedReleaseProvider): void;
-export declare function publishArtifacts(providerName: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
+export declare function publishArtifacts(providerName: string, directory: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;

package/lib/release.js

@@ -13,11 +13,21 @@ exports.publishArtifacts = exports.setReleaseProvider = void 0;
 const path_1 = require("path");
 const common_1 = require("./common");
 const helpers_1 = require("./helpers");
+function getVersion(directory) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const data = yield (0, common_1.findFile)(directory, 'package.json');
+        if (!data) {
+            (0, common_1.fail)('packageJsonNotFound_0020');
+        }
+        const { version } = require(data);
+        return version;
+    });
+}
 const providers = {
     none() {
         return Promise.resolve();
     },
-    xcopy(files, args) {
+    xcopy(_, files, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const { target } = args;
             if (!target) {
@@ -26,9 +36,26 @@ const providers = {
             yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () { return (0, common_1.copy)(file, (0, path_1.resolve)(target, (0, path_1.basename)(file))); })));
         });
     },
-    feed(files, args, interactive) {
+    feed(directory, files, args, interactive) {
         return __awaiter(this, void 0, void 0, function* () {
-            //TODO post files to Piral Feed Service
+            const { url, apiKey, scheme = 'basic', version = yield getVersion(directory) } = args;
+            if (!url) {
+                (0, common_1.fail)('publishFeedMissingUrl_0115');
+            }
+            if (!version) {
+                (0, common_1.fail)('publishFeedMissingVersion_0116');
+            }
+            const data = {
+                version,
+                type: 'custom',
+            };
+            for (const file of files) {
+                const relPath = (0, path_1.relative)(directory, file);
+                const fileName = (0, path_1.basename)(file);
+                const content = yield (0, common_1.readBinary)((0, path_1.dirname)(file), fileName);
+                data[relPath] = [content, fileName];
+            }
+            yield (0, common_1.postForm)(url, scheme, apiKey, data, {}, undefined, interactive);
         });
     },
 };
@@ -47,9 +74,9 @@ function setReleaseProvider(provider) {
     }
 }
 exports.setReleaseProvider = setReleaseProvider;
-function publishArtifacts(providerName, files, args, interactive) {
+function publishArtifacts(providerName, directory, files, args, interactive) {
     const runRelease = findReleaseProvider(providerName);
-    return runRelease(files, args, interactive);
+    return runRelease(directory, files, args, interactive);
 }
 exports.publishArtifacts = publishArtifacts;
 //# sourceMappingURL=release.js.map

package/lib/release.js.map

@@ -1 +1 @@
-{"version":3,"file":"release.js","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,qCAAsC;AACtC,uCAAsD;AAQtD,MAAM,SAAS,GAAoC;IACjD,IAAI;QACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACK,KAAK,CAAC,KAAK,EAAE,IAAI;;YACrB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YAExB,IAAI,CAAC,MAAM,EAAE;gBACX,IAAA,aAAI,EAAC,gCAAgC,CAAC,CAAC;aACxC;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE,gDAAC,OAAA,IAAA,aAAI,EAAC,IAAI,EAAE,IAAA,cAAO,EAAC,MAAM,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC,CAAC;QAC5F,CAAC;KAAA;IACK,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW;;YACjC,uCAAuC;QACzC,CAAC;KAAA;CACF,CAAC;AAEF,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAEzC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;QAClC,IAAA,aAAI,EAAC,6BAA6B,EAAE,YAAY,EAAE,mCAAyB,CAAC,CAAC;KAC9E;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,mCAAyB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;AAE1D,SAAgB,kBAAkB,CAAC,QAAkC;IACnE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;IAE3C,IAAI,CAAC,mCAAyB,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACtD,mCAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAC/C;AACH,CAAC;AAND,gDAMC;AAED,SAAgB,gBAAgB,CAC9B,YAAoB,EACpB,KAAoB,EACpB,IAA4B,EAC5B,WAAoB;IAEpB,MAAM,UAAU,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IACrD,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAC9C,CAAC;AARD,4CAQC"}
+{"version":3,"file":"release.js","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"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"}

package/lib/types/common.d.ts

@@ -39,12 +39,11 @@ export interface Bundler {
     ready(): Promise<void>;
 }
 export interface ReleaseProvider {
-    (files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
+    (directory: string, files: Array<string>, args: Record<string, string>, interactive: boolean): Promise<void>;
 }
 export interface TemplateFileLocation {
     from: string;
     to: string;
-    template?: boolean;
     deep?: boolean;
     once?: boolean;
 }

package/lib/types/public.d.ts

@@ -190,12 +190,13 @@ export interface BundlerDefinition {
     buildPilet: BuildPiletBundlerDefinition;
 }
 export declare type PiletSchemaVersion = 'none' | 'v0' | 'v1' | 'v2';
+export declare type SourceLanguage = 'js' | 'ts';
 export declare type PiletPublishScheme = 'none' | 'digest' | 'bearer' | 'basic';
 export declare type PiletPublishSource = 'local' | 'npm' | 'remote';
 export declare type PiralBuildType = 'all' | 'release' | 'emulator' | 'emulator-sources';
 export declare type PiletBuildType = 'default' | 'standalone' | 'manifest';
 export declare type PackageType = 'registry' | 'file' | 'git';
-export declare type NpmClientType = 'npm' | 'yarn' | 'pnpm' | 'lerna' | 'rush';
+export declare type NpmClientType = 'npm' | 'yarn' | 'pnp' | 'pnpm' | 'lerna' | 'rush';
 export declare type Framework = 'piral-native' | 'piral' | 'piral-core' | 'piral-base';
 export interface StandardEnvProps {
     production?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "0.15.0-alpha.4257",
+  "version": "0.15.0-alpha.4314",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -47,7 +47,6 @@
   },
   "devDependencies": {
     "@parcel/logger": "^1.11.1",
-    "@types/ejs": "^2.6.3",
     "@types/express": "^4.16.1",
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^6.0.0",
@@ -74,11 +73,10 @@
   "dependencies": {
     "chalk": "^2.4.2",
     "dets": "^0.11.1",
-    "ejs": "^3.1.7",
-    "kras": "^0.14.0",
+    "kras": "^0.14.1",
     "rimraf": "^3.0.0",
     "typescript": "^4.0.2",
     "yargs": "^15.4.1"
   },
-  "gitHead": "61f4ebc7b6c7cea553e2159b075cb761216f8e85"
+  "gitHead": "8bd59debe22a0fed137458a5295eb2ea43d9e0d3"
 }

package/src/apps/debug-pilet.ts

@@ -20,6 +20,7 @@ import {
   normalizePublicUrl,
   findFile,
   createInitialKrasConfig,
+  getAvailablePort,
 } from '../common';
 
 export interface DebugPiletOptions {
@@ -183,9 +184,9 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
   const {
     entry = debugPiletDefaults.entry,
     target = debugPiletDefaults.target,
-    port = debugPiletDefaults.port,
     open = debugPiletDefaults.open,
     hmr = debugPiletDefaults.hmr,
+    port: originalPort = debugPiletDefaults.port,
     publicUrl: originalPublicUrl = debugPiletDefaults.publicUrl,
     logLevel = debugPiletDefaults.logLevel,
     concurrency = debugPiletDefaults.concurrency,
@@ -301,6 +302,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
     },
   };
   const configs = [krasBaseConfig, ...pilets.map((p) => resolve(p.root, krasrc)), krasRootConfig];
+  const port = await getAvailablePort(originalPort);
   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

@@ -16,6 +16,7 @@ import {
   logDone,
   getDestination,
   createInitialKrasConfig,
+  getAvailablePort,
 } from '../common';
 
 export interface DebugPiralOptions {
@@ -103,9 +104,9 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
   const {
     entry = debugPiralDefaults.entry,
     target = debugPiralDefaults.target,
-    port = debugPiralDefaults.port,
     open = debugPiralDefaults.open,
     hmr = debugPiralDefaults.hmr,
+    port: originalPort = debugPiralDefaults.port,
     publicUrl: originalPublicUrl = debugPiralDefaults.publicUrl,
     logLevel = debugPiralDefaults.logLevel,
     optimizeModules = debugPiralDefaults.optimizeModules,
@@ -168,6 +169,7 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
       },
     },
   };
+  const port = await getAvailablePort(originalPort);
   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.test.ts

@@ -2,7 +2,6 @@ import { mkdtempSync, existsSync } from 'fs';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
 import { newPilet } from './new-pilet';
-import { SourceLanguage } from '../common';
 
 function createTempDir() {
   return mkdtempSync(join(tmpdir(), 'piral-tests-new-pilet-'));
@@ -69,7 +68,7 @@ describe('New Pilet Command', () => {
     jest.setTimeout(60000);
     const dir = createTempDir();
     await newPilet(dir, {
-      language: SourceLanguage.js,
+      language: 'js',
       install: false,
       source: 'piral@latest',
     });

package/src/apps/new-pilet.ts

@@ -1,8 +1,7 @@
 import { resolve, basename } from 'path';
-import { LogLevels, NpmClientType } from '../types';
+import { SourceLanguage, LogLevels, NpmClientType } from '../types';
 import {
   ForceOverwrite,
-  SourceLanguage,
   createDirectory,
   createFileIfNotExists,
   installNpmPackage,
@@ -102,7 +101,7 @@ export const newPiletDefaults: NewPiletOptions = {
   install: true,
   template: undefined,
   logLevel: LogLevels.info,
-  npmClient: config.npmClient,
+  npmClient: undefined,
   bundlerName: 'none',
   variables: {},
 };
@@ -119,6 +118,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
     logLevel = newPiletDefaults.logLevel,
     bundlerName = newPiletDefaults.bundlerName,
     variables = newPiletDefaults.variables,
+    npmClient: defaultNpmClient = newPiletDefaults.npmClient,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const root = resolve(fullBase, target);
@@ -128,7 +128,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
   const success = await createDirectory(root);
 
   if (success) {
-    const npmClient = await determineNpmClient(root, options.npmClient);
+    const npmClient = await determineNpmClient(root, defaultNpmClient);
     const projectName = basename(root);
 
     progress(`Scaffolding new pilet in %s ...`, root);

package/src/apps/new-piral.test.ts

@@ -2,7 +2,6 @@ import { mkdtempSync, existsSync } from 'fs';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
 import { newPiral } from './new-piral';
-import { SourceLanguage } from '../common';
 
 function createTempDir() {
   return mkdtempSync(join(tmpdir(), 'piral-tests-new-piral-'));
@@ -37,7 +36,7 @@ describe('New Piral Command', () => {
     jest.setTimeout(60000);
     const dir = createTempDir();
     await newPiral(dir, {
-      language: SourceLanguage.js,
+      language: 'js',
       install: false,
     });
     expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();

package/src/apps/new-piral.ts

@@ -1,9 +1,8 @@
 import { resolve, basename } from 'path';
 import { frameworkKeys } from '../helpers';
-import { LogLevels, Framework, NpmClientType } from '../types';
+import { SourceLanguage, LogLevels, Framework, NpmClientType } from '../types';
 import {
   ForceOverwrite,
-  SourceLanguage,
   installNpmPackage,
   updateExistingJson,
   getPiralPackage,
@@ -22,7 +21,6 @@ import {
   config,
   initNpmProject,
 } from '../common';
-import { sourceLanguageKeys } from '..';
 
 export interface NewPiralOptions {
   /**
@@ -102,7 +100,7 @@ export const newPiralDefaults: NewPiralOptions = {
   install: true,
   template: 'default',
   logLevel: LogLevels.info,
-  npmClient: config.npmClient,
+  npmClient: undefined,
   bundlerName: 'none',
   variables: {},
 };
@@ -121,6 +119,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
     logLevel = newPiralDefaults.logLevel,
     bundlerName = newPiralDefaults.bundlerName,
     variables = newPiralDefaults.variables,
+    npmClient: defaultNpmClient = newPiralDefaults.npmClient,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const root = resolve(fullBase, target);
@@ -134,7 +133,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
   const success = await createDirectory(root);
 
   if (success) {
-    const npmClient = await determineNpmClient(root, options.npmClient);
+    const npmClient = await determineNpmClient(root, defaultNpmClient);
     const packageRef = combinePackageRef(framework, version, 'registry');
     const projectName = basename(root);
 
@@ -177,14 +176,11 @@ always-auth=true`,
 
     progress(`Taking care of templating ...`);
 
-    await updateExistingJson(root, 'package.json', getPiralPackage(app, language, version, framework, bundlerName));
+    const data = getPiralScaffoldData(language, root, app, framework, variables);
 
-    await scaffoldPiralSourceFiles(
-      template,
-      registry,
-      getPiralScaffoldData(language, root, app, framework, variables),
-      forceOverwrite,
-    );
+    await updateExistingJson(root, 'package.json', getPiralPackage(app, data, version, bundlerName));
+
+    await scaffoldPiralSourceFiles(template, registry, data, forceOverwrite);
 
     if (install) {
       progress(`Installing dependencies ...`);

package/src/apps/publish-piral.ts

@@ -1,7 +1,17 @@
 import { resolve } from 'path';
 import { publishArtifacts } from '../release';
+import {
+  setLogLevel,
+  progress,
+  checkExists,
+  fail,
+  logDone,
+  logReset,
+  publishNpmPackage,
+  matchFiles,
+  log,
+} from '../common';
 import { LogLevels, PiralBuildType } from '../types';
-import { setLogLevel, progress, checkExists, fail, logDone, logReset, publishNpmPackage, matchFiles } from '../common';
 
 export interface PublishPiralOptions {
   /**
@@ -15,9 +25,9 @@ export interface PublishPiralOptions {
   logLevel?: LogLevels;
 
   /**
-   * The additional fields to supply for the provider.
+   * The options to supply for the provider.
    */
-  fields?: Record<string, string>;
+  opts?: Record<string, string>;
 
   /**
    * Defines if authorization tokens can be retrieved interactively.
@@ -40,7 +50,7 @@ export const publishPiralDefaults: PublishPiralOptions = {
   logLevel: LogLevels.info,
   type: 'all',
   provider: 'none',
-  fields: {},
+  opts: {},
   interactive: false,
 };
 
@@ -59,6 +69,7 @@ async function publishEmulator(
   }
 
   const files = await matchFiles(directory, '*.tgz');
+  log('generalDebug_0003', `Found ${files.length} in "${directory}": ${files.join(', ')}`);
 
   if (files.length !== 1) {
     fail('publishEmulatorFilesUnexpected_0111', directory);
@@ -70,8 +81,7 @@ async function publishEmulator(
     return p;
   }, [] as Array<string>);
 
-  //TODO support interactive here, too?
-  await publishNpmPackage(directory, file, flags);
+  await publishNpmPackage(directory, file, flags, interactive);
 }
 
 async function publishRelease(
@@ -90,7 +100,8 @@ async function publishRelease(
   }
 
   const files = await matchFiles(directory, '**/*');
-  await publishArtifacts(providerName, files, args, interactive);
+  log('generalDebug_0003', `Found ${files.length} in "${directory}": ${files.join(', ')}`);
+  await publishArtifacts(providerName, directory, files, args, interactive);
 }
 
 export async function publishPiral(baseDir = process.cwd(), options: PublishPiralOptions = {}) {
@@ -98,7 +109,7 @@ export async function publishPiral(baseDir = process.cwd(), options: PublishPira
     source = publishPiralDefaults.source,
     type = publishPiralDefaults.type,
     logLevel = publishPiralDefaults.logLevel,
-    fields = publishPiralDefaults.fields,
+    opts = publishPiralDefaults.opts,
     provider = publishPiralDefaults.provider,
     interactive = publishPiralDefaults.interactive,
   } = options;
@@ -113,14 +124,14 @@ export async function publishPiral(baseDir = process.cwd(), options: PublishPira
 
   if (type !== 'release') {
     progress('Publishing emulator package ...');
-    await publishEmulator(fullBase, source, fields, interactive);
+    await publishEmulator(fullBase, source, opts, interactive);
     logDone(`Successfully published emulator.`);
     logReset();
   }
 
   if (type !== 'emulator') {
     progress('Publishing release files ...');
-    await publishRelease(fullBase, source, provider, fields, interactive);
+    await publishRelease(fullBase, source, provider, opts, interactive);
     logDone(`Successfully published release.`);
     logReset();
   }

package/src/apps/upgrade-pilet.ts

@@ -24,7 +24,6 @@ import {
   getPiralPath,
   isMonorepoPackageRef,
   getPiletScaffoldData,
-  SourceLanguage,
 } from '../common';
 
 export interface UpgradePiletOptions {
@@ -88,6 +87,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
     logLevel = upgradePiletDefaults.logLevel,
     install = upgradePiletDefaults.install,
     variables = upgradePiletDefaults.variables,
+    npmClient: defaultNpmClient = upgradePiletDefaults.npmClient,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const root = resolve(fullBase, target);
@@ -98,13 +98,13 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
     fail('invalidPiletTarget_0040');
   }
 
-  const npmClient = await determineNpmClient(root, options.npmClient);
+  const npmClient = await determineNpmClient(root, defaultNpmClient);
   const pckg = await readJson(root, 'package.json');
   const { devDependencies = {}, dependencies = {}, piral, source } = pckg;
 
   if (piral && typeof piral === 'object') {
     const sourceName = piral.name;
-    const language = /\.jsx?$/.test(source) ? SourceLanguage.js : SourceLanguage.ts;
+    const language = /\.jsx?$/.test(source) ? 'js' : 'ts';
 
     if (!sourceName || typeof sourceName !== 'string') {
       fail('invalidPiletPackage_0042');

package/src/apps/upgrade-piral.ts

@@ -80,6 +80,7 @@ export async function upgradePiral(baseDir = process.cwd(), options: UpgradePira
     target = upgradePiralDefaults.target,
     logLevel = upgradePiralDefaults.logLevel,
     install = upgradePiralDefaults.install,
+    npmClient: defaultNpmClient = upgradePiralDefaults.npmClient,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const root = resolve(fullBase, target);
@@ -91,7 +92,7 @@ export async function upgradePiral(baseDir = process.cwd(), options: UpgradePira
     fail('packageJsonNotFound_0020');
   }
 
-  const npmClient = await determineNpmClient(root, options.npmClient);
+  const npmClient = await determineNpmClient(root, defaultNpmClient);
 
   progress(`Checking provided version ...`);
   const realVersion = await findSpecificVersion('piral-cli', version);

package/src/commands.ts

@@ -6,9 +6,7 @@ import {
   forceOverwriteKeys,
   keyOfForceOverwrite,
   valueOfForceOverwrite,
-  keyOfSourceLanguage,
   sourceLanguageKeys,
-  valueOfSourceLanguage,
   frameworkKeys,
   clientTypeKeys,
   schemaKeys,
@@ -27,6 +25,7 @@ import {
   PiletSchemaVersion,
   PiletBuildType,
   PiletPublishScheme,
+  SourceLanguage,
 } from './types';
 
 function specializeCommand(commands: Array<ToolCommand<any>>, command: ToolCommand<any>, suffix: string) {
@@ -205,9 +204,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .choices('provider', availableReleaseProviders)
         .describe('provider', 'Sets the provider for publishing the release assets.')
         .default('provider', apps.publishPiralDefaults.provider)
-        .option('fields', undefined)
-        .describe('fields', 'Sets additional fields to be included in the feed service request.')
-        .default('fields', apps.publishPiralDefaults.fields)
+        .option('opts', undefined)
+        .describe('opts', 'Sets the options to forward to the chosen provider.')
+        .default('opts', apps.publishPiralDefaults.opts)
         .boolean('interactive')
         .describe('interactive', 'Defines if authorization tokens can be retrieved interactively.')
         .default('interactive', apps.publishPiralDefaults.interactive)
@@ -221,7 +220,7 @@ const allCommands: Array<ToolCommand<any>> = [
         logLevel: args['log-level'] as LogLevels,
         type: args.type as PiralBuildType,
         provider: args.provider as string,
-        fields: args.fields as Record<string, string>,
+        opts: args.opts as Record<string, string>,
         interactive: args.interactive as boolean,
       });
     },
@@ -299,7 +298,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .default('force-overwrite', keyOfForceOverwrite(apps.newPiralDefaults.forceOverwrite))
         .choices('language', sourceLanguageKeys)
         .describe('language', 'Determines the programming language for the new Piral instance.')
-        .default('language', keyOfSourceLanguage(apps.newPiralDefaults.language))
+        .default('language', apps.newPiralDefaults.language)
         .string('template')
         .describe('template', 'Sets the boilerplate template package to be used when scaffolding.')
         .default('template', apps.newPiralDefaults.template)
@@ -324,7 +323,7 @@ const allCommands: Array<ToolCommand<any>> = [
         version: args.tag as string,
         registry: args.registry as string,
         forceOverwrite: valueOfForceOverwrite(args['force-overwrite'] as string),
-        language: valueOfSourceLanguage(args.language as string),
+        language: args.language as SourceLanguage,
         install: args.install as boolean,
         template: args.template as string,
         logLevel: args['log-level'] as LogLevels,
@@ -684,7 +683,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .default('log-level', apps.newPiletDefaults.logLevel)
         .choices('language', sourceLanguageKeys)
         .describe('language', 'Determines the programming language for the new pilet.')
-        .default('language', keyOfSourceLanguage(apps.newPiletDefaults.language))
+        .default('language', apps.newPiletDefaults.language)
         .string('template')
         .describe('template', 'Sets the boilerplate template package to be used when scaffolding.')
         .default('template', apps.newPiletDefaults.template)
@@ -707,7 +706,7 @@ const allCommands: Array<ToolCommand<any>> = [
         source: args.source as string,
         registry: args.registry as string,
         forceOverwrite: valueOfForceOverwrite(args['force-overwrite'] as string),
-        language: valueOfSourceLanguage(args.language as string),
+        language: args.language as SourceLanguage,
         logLevel: args['log-level'] as LogLevels,
         install: args.install as boolean,
         template: args.template as string,

package/src/common/clients/index.ts

@@ -1,5 +1,6 @@
 import * as lerna from './lerna';
 import * as npm from './npm';
+import * as pnp from './pnp';
 import * as pnpm from './pnpm';
 import * as rush from './rush';
 import * as yarn from './yarn';
@@ -7,6 +8,7 @@ import * as yarn from './yarn';
 export const clients = {
   lerna,
   npm,
+  pnp,
   pnpm,
   rush,
   yarn,
@@ -14,7 +16,7 @@ export const clients = {
 
 type ClientName = keyof typeof clients;
 
-const directClients = ['npm', 'yarn', 'pnpm'];
+const directClients = ['npm', 'pnp', 'yarn', 'pnpm'];
 
 export function isWrapperClient(client: ClientName) {
   return !directClients.includes(client);

package/src/common/clients/npm.ts

@@ -47,6 +47,10 @@ export async function initProject(projectName: string, target: string) {}
 
 // Functions to exclusively use from npm client:
 
+export async function loginUser() {
+  await runNpmProcess(['login'], '.');
+}
+
 export async function unpackPackage(packageRef: string, target = '.', ...flags: Array<string>) {
   const ms = new MemoryStream();
   await runNpmProcess(['pack', packageRef, ...flags], target, ms);

package/src/common/clients/pnp.ts

@@ -0,0 +1,77 @@
+import { resolve } from 'path';
+import { log } from '../log';
+import { findFile } from '../io';
+import { runCommand } from '../scripts';
+import { MemoryStream } from '../MemoryStream';
+
+// Helpers:
+
+function runYarnProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
+  log('generalDebug_0003', 'Starting the Yarn PnP process ...');
+  const cwd = resolve(process.cwd(), target);
+  return runCommand('yarn', args, cwd, output);
+}
+
+function convert(flags: Array<string>) {
+  return flags.map((flag) => {
+    switch (flag) {
+      case '--save-exact':
+        return '--exact';
+      case '--save-dev':
+        return '--dev';
+      case '--no-save':
+        // unfortunately no (https://github.com/yarnpkg/yarn/issues/1743)
+        return '';
+      default:
+        return flag;
+    }
+  });
+}
+
+// Client interface functions:
+
+export async function installDependencies(target = '.', ...flags: Array<string>) {
+  const ms = new MemoryStream();
+  await runYarnProcess(['install', ...convert(flags)], target, ms);
+  log('generalDebug_0003', `Yarn PnP install dependencies 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}`);
+  return ms.value;
+}
+
+export async function detectClient(root: string) {
+  return !!(await findFile(root, '.pnp.cjs'));
+}
+
+export async function initProject(projectName: string, target: string) {}
+
+export async function isProject(root: string, packageRef: string) {
+  const details = await listProjects(root);
+
+  if (typeof details === 'object') {
+    return typeof details?.[packageRef]?.location === 'string';
+  }
+
+  return false;
+}
+
+// Functions to exclusively use from yarn client:
+
+export async function listProjects(target: string) {
+  const ms = new MemoryStream();
+
+  try {
+    await runYarnProcess(['workspaces', 'info'], target, ms);
+  } catch (e) {
+    log('generalDebug_0003', `yarn workspaces error: ${e}`);
+    return {};
+  }
+
+  log('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
+  return JSON.parse(ms.value);
+}