piral-cli 1.0.0-pre.2217 → 1.0.0

package/src/commands.ts

@@ -1,19 +1,19 @@
 import * as apps from './apps';
 import {
+  piletBuildTypeKeys,
   availableBundlers,
   availableReleaseProviders,
   forceOverwriteKeys,
   keyOfForceOverwrite,
   valueOfForceOverwrite,
-  keyOfPiletLanguage,
-  piletLanguageKeys,
-  valueOfPiletLanguage,
+  sourceLanguageKeys,
   frameworkKeys,
   clientTypeKeys,
   schemaKeys,
   fromKeys,
   bundlerKeys,
-  buildTypeKeys,
+  piralBuildTypeKeys,
+  publishModeKeys,
 } from './helpers';
 import {
   ToolCommand,
@@ -23,6 +23,9 @@ import {
   PiralBuildType,
   PiletPublishSource,
   PiletSchemaVersion,
+  PiletBuildType,
+  PiletPublishScheme,
+  SourceLanguage,
 } from './types';
 
 function specializeCommand(commands: Array<ToolCommand<any>>, command: ToolCommand<any>, suffix: string) {
@@ -58,9 +61,12 @@ const allCommands: Array<ToolCommand<any>> = [
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source root directory or index.html file for collecting all the information.',
+          describe: 'Sets the source Piral instance path for collecting all the information.',
           default: apps.debugPiralDefaults.entry,
         })
+        .string('target')
+        .describe('target', 'Sets the target directory or file of bundling.')
+        .default('target', apps.debugPiralDefaults.target)
         .number('port')
         .describe('port', 'Sets the port of the local development server.')
         .default('port', apps.debugPiralDefaults.port)
@@ -76,12 +82,17 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('hmr')
         .describe('hmr', 'Activates Hot Module Reloading (HMR).')
         .default('hmr', apps.debugPiralDefaults.hmr)
+        .string('krasrc')
+        .describe('krasrc', 'Sets a config file for overwriting the default kras options.')
+        .default('krasrc', apps.debugPiralDefaults.krasrc)
         .boolean('optimize-modules')
         .describe('optimize-modules', 'Also includes the node modules for target transpilation.')
         .default('optimize-modules', apps.debugPiralDefaults.optimizeModules)
         .choices('bundler', availableBundlers)
         .describe('bundler', 'Sets the bundler to use.')
         .default('bundler', availableBundlers[0])
+        .string('feed')
+        .describe('feed', 'Sets the URL of a pilet feed for including remote pilets.')
         .string('base')
         .default('base', process.cwd())
         .describe('base', 'Sets the base directory. By default the current directory is used.');
@@ -89,13 +100,17 @@ const allCommands: Array<ToolCommand<any>> = [
     run(args) {
       return apps.debugPiral(args.base as string, {
         entry: args.source as string,
+        target: args.target as string,
         port: args.port as number,
         hmr: args.hmr as boolean,
+        krasrc: args.krasrc as string,
         optimizeModules: args['optimize-modules'] as boolean,
         publicUrl: args['public-url'] as string,
         bundlerName: args.bundler as string,
         logLevel: args['log-level'] as LogLevels,
         open: args.open as boolean,
+        hooks: args.hooks as object,
+        feed: args.feed as string,
         _: args,
       });
     },
@@ -110,14 +125,14 @@ const allCommands: Array<ToolCommand<any>> = [
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source root directory or index.html file for collecting all the information.',
+          describe: 'Sets the source Piral instance path for collecting all the information.',
           default: apps.buildPiralDefaults.entry,
         })
         .string('target')
         .describe('target', 'Sets the target directory or file of bundling.')
         .default('target', apps.buildPiralDefaults.target)
         .string('public-url')
-        .describe('public-url', 'Sets the public URL (path) of the bundle.')
+        .describe('public-url', 'Sets the public URL (path) of the bundle. Only for release output.')
         .default('public-url', apps.buildPiralDefaults.publicUrl)
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
@@ -131,8 +146,14 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('source-maps')
         .describe('source-maps', 'Create associated source maps for the bundles.')
         .default('source-maps', apps.buildPiralDefaults.sourceMaps)
+        .boolean('watch')
+        .describe('watch', 'Continuously re-builds while watching the source files.')
+        .default('watch', apps.buildPiralDefaults.watch)
         .boolean('subdir')
-        .describe('subdir', `Places the build's output in an appropriate subdirectory (e.g., "emulator"). Ignored for "--all".`)
+        .describe(
+          'subdir',
+          `Places the build's output in an appropriate subdirectory (e.g., "emulator"). Ignored for "--all".`,
+        )
         .default('subdir', apps.buildPiralDefaults.subdir)
         .boolean('content-hash')
         .describe('content-hash', 'Appends the hash to the side-bundle files.')
@@ -140,7 +161,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('optimize-modules')
         .describe('optimize-modules', 'Also includes the node modules for target transpilation.')
         .default('optimize-modules', apps.buildPiralDefaults.optimizeModules)
-        .choices('type', buildTypeKeys)
+        .choices('type', piralBuildTypeKeys)
         .describe('type', 'Selects the target type of the build. "all" builds all target types.')
         .default('type', apps.buildPiralDefaults.type)
         .choices('bundler', availableBundlers)
@@ -161,9 +182,11 @@ const allCommands: Array<ToolCommand<any>> = [
         subdir: args.subdir as boolean,
         contentHash: args['content-hash'] as boolean,
         sourceMaps: args['source-maps'] as boolean,
+        watch: args.watch as boolean,
         optimizeModules: args['optimize-modules'] as boolean,
         logLevel: args['log-level'] as LogLevels,
         type: args.type as PiralBuildType,
+        hooks: args.hooks as object,
         _: args,
       });
     },
@@ -183,15 +206,18 @@ const allCommands: Array<ToolCommand<any>> = [
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.publishPiralDefaults.logLevel)
-        .choices('type', buildTypeKeys)
+        .choices('type', piralBuildTypeKeys)
         .describe('type', 'Selects the target type to publish. "all" publishes all target types.')
         .default('type', apps.publishPiralDefaults.type)
         .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)
         .string('base')
         .default('base', process.cwd())
         .describe('base', 'Sets the base directory. By default the current directory is used.');
@@ -202,20 +228,21 @@ 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,
       });
     },
   },
   {
     name: 'declaration-piral',
     alias: ['declare-piral', 'declaration-portal', 'declare-portal'],
-    description: 'Creates the declaration file for a Piral instance.',
+    description: 'Creates the TypeScript declaration file (index.d.ts) for a Piral instance.',
     arguments: ['[source]'],
     flags(argv) {
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source root directory or index.html file for collecting all the information.',
+          describe: 'Sets the source Piral instance path for collecting all the information.',
           default: apps.declarationPiralDefaults.entry,
         })
         .string('target')
@@ -225,7 +252,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.declarationPiralDefaults.logLevel)
         .choices('force-overwrite', forceOverwriteKeys)
-        .describe('force-overwrite', 'Determines if files should be overwritten by the declaration.')
+        .describe('force-overwrite', 'Determines if files should be overwritten by the command.')
         .default('force-overwrite', keyOfForceOverwrite(apps.declarationPiralDefaults.forceOverwrite))
         .string('base')
         .default('base', process.cwd())
@@ -260,28 +287,34 @@ const allCommands: Array<ToolCommand<any>> = [
         .describe('framework', 'Sets the framework/library level to use.')
         .default('framework', apps.newPiralDefaults.framework)
         .boolean('install')
-        .describe('install', 'Already performs the installation of its NPM dependencies.')
+        .describe('install', 'Already performs the installation of its npm dependencies.')
         .default('install', apps.newPiralDefaults.install)
+        .alias('install', 'package-install')
         .string('registry')
         .describe('registry', 'Sets the package registry to use for resolving the dependencies.')
         .default('registry', apps.newPiralDefaults.registry)
+        .alias('registry', 'package-registry')
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.newPiralDefaults.logLevel)
         .string('tag')
-        .describe('tag', 'Sets the tag or version of the package to install. By default, this uses the version of the CLI.')
+        .describe(
+          'tag',
+          'Sets the tag or version of the package to install. By default, this uses the version of the CLI.',
+        )
         .default('tag', apps.newPiralDefaults.version)
+        .alias('tag', 'piral-version')
         .choices('force-overwrite', forceOverwriteKeys)
         .describe('force-overwrite', 'Determines if files should be overwritten by the installation.')
         .default('force-overwrite', keyOfForceOverwrite(apps.newPiralDefaults.forceOverwrite))
-        .choices('language', piletLanguageKeys)
+        .choices('language', sourceLanguageKeys)
         .describe('language', 'Determines the programming language for the new Piral instance.')
-        .default('language', keyOfPiletLanguage(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)
         .choices('npm-client', clientTypeKeys)
-        .describe('npm-client', 'Sets the NPM client to be used when scaffolding.')
+        .describe('npm-client', 'Sets the npm client to be used when scaffolding.')
         .default('npm-client', apps.newPiralDefaults.npmClient)
         .choices('bundler', bundlerKeys)
         .describe('bundler', 'Sets the default bundler to install.')
@@ -291,7 +324,10 @@ const allCommands: Array<ToolCommand<any>> = [
         .default('vars', apps.newPiralDefaults.variables)
         .string('base')
         .default('base', process.cwd())
-        .describe('base', 'Sets the base directory. By default the current directory is used.');
+        .describe('base', 'Sets the base directory. By default the current directory is used.')
+        .string('name')
+        .describe('name', 'Sets the name for the new Piral app.')
+        .default('name', apps.newPiralDefaults.name);
     },
     run(args) {
       return apps.newPiral(args.base as string, {
@@ -301,13 +337,14 @@ const allCommands: Array<ToolCommand<any>> = [
         version: args.tag as string,
         registry: args.registry as string,
         forceOverwrite: valueOfForceOverwrite(args['force-overwrite'] as string),
-        language: valueOfPiletLanguage(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,
         npmClient: args['npm-client'] as NpmClientType,
         bundlerName: args.bundler as string,
         variables: args.vars as Record<string, string>,
+        name: args['name'] as string,
       });
     },
   },
@@ -330,10 +367,11 @@ const allCommands: Array<ToolCommand<any>> = [
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.upgradePiralDefaults.logLevel)
         .boolean('install')
-        .describe('install', 'Already performs the update of its NPM dependencies.')
+        .describe('install', 'Already performs the update of its npm dependencies.')
         .default('install', apps.upgradePiralDefaults.install)
+        .alias('install', 'package-install')
         .choices('npm-client', clientTypeKeys)
-        .describe('npm-client', 'Sets the NPM client to be used when upgrading.')
+        .describe('npm-client', 'Sets the npm client to be used when upgrading.')
         .default('npm-client', apps.upgradePiralDefaults.npmClient)
         .string('base')
         .default('base', process.cwd())
@@ -358,7 +396,7 @@ const allCommands: Array<ToolCommand<any>> = [
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source root directory or index.html file for collecting all the information.',
+          describe: 'Sets the source Piral instance path for collecting all the information.',
           default: apps.validatePiralDefaults.entry,
         })
         .number('log-level')
@@ -388,18 +426,30 @@ const allCommands: Array<ToolCommand<any>> = [
           describe: 'Sets the source file containing the pilet root module.',
           default: apps.debugPiletDefaults.entry,
         })
+        .string('target')
+        .describe('target', 'Sets the target directory or file of bundling.')
+        .default('target', apps.debugPiletDefaults.target)
+        .string('public-url')
+        .describe('public-url', 'Sets the public URL (path) of the application.')
+        .default('public-url', apps.debugPiletDefaults.publicUrl)
         .number('port')
         .describe('port', 'Sets the port of the local development server.')
         .default('port', apps.debugPiletDefaults.port)
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.debugPiletDefaults.logLevel)
+        .number('concurrency')
+        .describe('concurrency', 'Sets the maximum number of concurrent build jobs.')
+        .default('concurrency', apps.debugPiletDefaults.concurrency)
         .boolean('open')
         .describe('open', 'Opens the pilet directly in the browser.')
         .default('open', apps.debugPiletDefaults.open)
         .boolean('hmr')
         .describe('hmr', 'Activates Hot Module Reloading (HMR).')
         .default('hmr', apps.debugPiletDefaults.hmr)
+        .string('krasrc')
+        .describe('krasrc', 'Sets a config file for overwriting the default kras options.')
+        .default('krasrc', apps.debugPiletDefaults.krasrc)
         .boolean('optimize-modules')
         .describe('optimize-modules', 'Also includes the node modules for target transpilation.')
         .default('optimize-modules', apps.debugPiletDefaults.optimizeModules)
@@ -411,24 +461,32 @@ const allCommands: Array<ToolCommand<any>> = [
         .default('bundler', availableBundlers[0])
         .string('app')
         .describe('app', 'Sets the name of the Piral instance.')
+        .string('app-dir')
+        .describe('app-dir', 'Sets the path to a custom Piral instance for serving.')
+        .string('feed')
+        .describe('feed', 'Sets the URL of a pilet feed for including remote pilets.')
         .string('base')
         .default('base', process.cwd())
-        .describe('base', 'Sets the base directory. By default the current directory is used.')
-        .string('feed')
-        .describe('feed', 'Sets the URL of a pilet feed for including remote pilets.');
+        .describe('base', 'Sets the base directory. By default the current directory is used.');
     },
     run(args) {
       return apps.debugPilet(args.base as string, {
         entry: args.source as string,
+        target: args.target as string,
+        publicUrl: args['public-url'] as string,
         port: args.port as number,
         hmr: args.hmr as boolean,
         bundlerName: args.bundler as string,
+        krasrc: args.krasrc as string,
         optimizeModules: args['optimize-modules'] as boolean,
+        appInstanceDir: args['app-dir'] as string,
         app: args.app as string,
         logLevel: args['log-level'] as LogLevels,
         open: args.open as boolean,
         schemaVersion: args.schema as PiletSchemaVersion,
+        concurrency: args.concurrency as number,
         feed: args.feed as string,
+        hooks: args.hooks as object,
         _: args,
       });
     },
@@ -443,24 +501,36 @@ const allCommands: Array<ToolCommand<any>> = [
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source index.tsx file for collecting all the information.',
+          describe: 'Sets the source pilet path for collecting all the information.',
           default: apps.buildPiletDefaults.entry,
         })
         .string('target')
         .describe('target', 'Sets the target file of bundling.')
         .default('target', apps.buildPiletDefaults.target)
+        .string('public-url')
+        .describe('public-url', 'Sets the public URL (path) of the application.')
+        .default('public-url', apps.buildPiletDefaults.publicUrl)
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.buildPiletDefaults.logLevel)
+        .number('concurrency')
+        .describe('concurrency', 'Sets the maximum number of concurrent build jobs.')
+        .default('concurrency', apps.buildPiletDefaults.concurrency)
         .boolean('source-maps')
         .describe('source-maps', 'Creates source maps for the bundles.')
         .default('source-maps', apps.buildPiletDefaults.sourceMaps)
+        .boolean('watch')
+        .describe('watch', 'Continuously re-builds while watching the source files.')
+        .default('watch', apps.buildPiletDefaults.watch)
         .boolean('fresh')
         .describe('fresh', 'Performs a fresh build by removing the target directory first.')
         .default('fresh', apps.buildPiletDefaults.fresh)
         .boolean('minify')
         .describe('minify', 'Performs minification or other post-bundle transformations.')
         .default('minify', apps.buildPiletDefaults.minify)
+        .boolean('declaration')
+        .describe('declaration', 'Creates a declaration file for the pilet.')
+        .default('declaration', apps.buildPiletDefaults.declaration)
         .boolean('content-hash')
         .describe('content-hash', 'Appends the hash to the side-bundle files.')
         .default('content-hash', apps.buildPiletDefaults.contentHash)
@@ -473,6 +543,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .choices('bundler', availableBundlers)
         .describe('bundler', 'Sets the bundler to use.')
         .default('bundler', availableBundlers[0])
+        .choices('type', piletBuildTypeKeys)
+        .describe('type', 'Selects the target type of the build.')
+        .default('type', apps.buildPiletDefaults.type)
         .string('app')
         .describe('app', 'Sets the name of the Piral instance.')
         .string('base')
@@ -483,15 +556,21 @@ const allCommands: Array<ToolCommand<any>> = [
       return apps.buildPilet(args.base as string, {
         entry: args.source as string,
         target: args.target as string,
+        publicUrl: args['public-url'] as string,
         minify: args.minify as boolean,
         contentHash: args['content-hash'] as boolean,
         bundlerName: args.bundler as string,
+        declaration: args.declaration as boolean,
         sourceMaps: args['source-maps'] as boolean,
+        watch: args.watch as boolean,
         optimizeModules: args['optimize-modules'] as boolean,
+        type: args.type as PiletBuildType,
         fresh: args.fresh as boolean,
         logLevel: args['log-level'] as LogLevels,
         schemaVersion: args.schema as PiletSchemaVersion,
+        concurrency: args.concurrency as number,
         app: args.app as string,
+        hooks: args.hooks as object,
         _: args,
       });
     },
@@ -505,7 +584,7 @@ const allCommands: Array<ToolCommand<any>> = [
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source package.json file for creating the package.',
+          describe: 'Sets the source pilet path for creating the package.',
           default: apps.packPiletDefaults.source,
         })
         .string('target')
@@ -536,8 +615,7 @@ const allCommands: Array<ToolCommand<any>> = [
       return argv
         .positional('source', {
           type: 'string',
-          describe: 'Sets the source previously packed *.tgz bundle to publish.',
-          default: apps.publishPiletDefaults.source,
+          describe: 'Sets the source of either the previously packed *.tgz bundle or the pilet root module to publish.',
         })
         .string('url')
         .describe('url', 'Sets the explicit URL where to publish the pilet to.')
@@ -557,16 +635,28 @@ const allCommands: Array<ToolCommand<any>> = [
         .choices('schema', schemaKeys)
         .describe('schema', 'Sets the schema to be used when making a fresh build of the pilet.')
         .default('schema', apps.publishPiletDefaults.schemaVersion)
+        .choices('mode', publishModeKeys)
+        .describe('mode', 'Sets the authorization mode to use.')
+        .default('mode', apps.publishPiletDefaults.mode)
+        .alias('mode', 'auth-mode')
+        .choices('bundler', availableBundlers)
+        .describe('bundler', 'Sets the bundler to use.')
+        .default('bundler', availableBundlers[0])
         .choices('from', fromKeys)
         .describe('from', 'Sets the type of the source to use for publishing.')
         .default('from', apps.publishPiletDefaults.from)
         .option('fields', undefined)
         .describe('fields', 'Sets additional fields to be included in the feed service request.')
         .default('fields', apps.publishPiletDefaults.fields)
+        .option('headers', undefined)
+        .describe('headers', 'Sets additional headers to be included in the feed service request.')
+        .default('headers', apps.publishPiletDefaults.headers)
+        .boolean('interactive')
+        .describe('interactive', 'Defines if authorization tokens can be retrieved interactively.')
+        .default('interactive', apps.publishPiletDefaults.interactive)
         .string('base')
         .default('base', process.cwd())
-        .describe('base', 'Sets the base directory. By default the current directory is used.')
-        .demandOption('url');
+        .describe('base', 'Sets the base directory. By default the current directory is used.');
     },
     run(args) {
       return apps.publishPilet(args.base as string, {
@@ -575,10 +665,15 @@ const allCommands: Array<ToolCommand<any>> = [
         url: args.url as string,
         logLevel: args['log-level'] as LogLevels,
         cert: args['ca-cert'] as string,
+        bundlerName: args.bundler as string,
         fresh: args.fresh as boolean,
         from: args.from as PiletPublishSource,
         schemaVersion: args.schema as PiletSchemaVersion,
         fields: args.fields as Record<string, string>,
+        headers: args.headers as Record<string, string>,
+        mode: args.mode as PiletPublishScheme,
+        interactive: args.interactive as boolean,
+        _: args,
       });
     },
   },
@@ -602,23 +697,25 @@ const allCommands: Array<ToolCommand<any>> = [
         .string('registry')
         .describe('registry', 'Sets the package registry to use for resolving the specified Piral app.')
         .default('registry', apps.newPiletDefaults.registry)
+        .alias('registry', 'package-registry')
         .boolean('install')
-        .describe('install', 'Already performs the installation of its NPM dependencies.')
+        .describe('install', 'Already performs the installation of its npm dependencies.')
         .default('install', apps.newPiletDefaults.install)
+        .alias('install', 'package-install')
         .choices('force-overwrite', forceOverwriteKeys)
         .describe('force-overwrite', 'Determines if files should be overwritten by the scaffolding.')
         .default('force-overwrite', keyOfForceOverwrite(apps.newPiletDefaults.forceOverwrite))
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.newPiletDefaults.logLevel)
-        .choices('language', piletLanguageKeys)
+        .choices('language', sourceLanguageKeys)
         .describe('language', 'Determines the programming language for the new pilet.')
-        .default('language', keyOfPiletLanguage(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)
         .choices('npm-client', clientTypeKeys)
-        .describe('npm-client', 'Sets the NPM client to be used when scaffolding.')
+        .describe('npm-client', 'Sets the npm client to be used when scaffolding.')
         .default('npm-client', apps.newPiletDefaults.npmClient)
         .choices('bundler', bundlerKeys)
         .describe('bundler', 'Sets the default bundler to install.')
@@ -628,7 +725,10 @@ const allCommands: Array<ToolCommand<any>> = [
         .default('vars', apps.newPiletDefaults.variables)
         .string('base')
         .default('base', process.cwd())
-        .describe('base', 'Sets the base directory. By default the current directory is used.');
+        .describe('base', 'Sets the base directory. By default the current directory is used.')
+        .string('name')
+        .describe('name', 'Sets the name for the new Pilet.')
+        .default('name', apps.newPiletDefaults.name);
     },
     run(args) {
       return apps.newPilet(args.base as string, {
@@ -636,13 +736,14 @@ const allCommands: Array<ToolCommand<any>> = [
         source: args.source as string,
         registry: args.registry as string,
         forceOverwrite: valueOfForceOverwrite(args['force-overwrite'] as string),
-        language: valueOfPiletLanguage(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,
         npmClient: args['npm-client'] as NpmClientType,
         bundlerName: args.bundler as string,
         variables: args.vars as Record<string, string>,
+        name: args['name'] as string,
       });
     },
   },
@@ -665,14 +766,18 @@ const allCommands: Array<ToolCommand<any>> = [
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.upgradePiletDefaults.logLevel)
         .boolean('install')
-        .describe('install', 'Already performs the update of its NPM dependencies.')
+        .describe('install', 'Already performs the update of its npm dependencies.')
         .default('install', apps.upgradePiletDefaults.install)
+        .alias('install', 'package-install')
         .choices('force-overwrite', forceOverwriteKeys)
         .describe('force-overwrite', 'Determines if files should be overwritten by the upgrading process.')
         .default('force-overwrite', keyOfForceOverwrite(apps.upgradePiletDefaults.forceOverwrite))
         .choices('npm-client', clientTypeKeys)
-        .describe('npm-client', 'Sets the NPM client to be used when upgrading.')
+        .describe('npm-client', 'Sets the npm client to be used when upgrading.')
         .default('npm-client', apps.upgradePiletDefaults.npmClient)
+        .option('vars', undefined)
+        .describe('vars', 'Sets additional variables to be used when scaffolding.')
+        .default('vars', apps.upgradePiletDefaults.variables)
         .string('base')
         .default('base', process.cwd())
         .describe('base', 'Sets the base directory. By default the current directory is used.');
@@ -685,6 +790,7 @@ const allCommands: Array<ToolCommand<any>> = [
         forceOverwrite: valueOfForceOverwrite(args['force-overwrite'] as string),
         install: args.install as boolean,
         npmClient: args['npm-client'] as NpmClientType,
+        variables: args.vars as Record<string, string>,
       });
     },
   },
@@ -717,6 +823,129 @@ 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: ['<app> [source]'],
+    flags(argv) {
+      return argv
+        .positional('app', {
+          type: 'string',
+          describe: 'Sets the name of the Piral instance to be added.',
+          default: apps.addPiralInstancePiletDefaults.app,
+        })
+        .positional('source', {
+          type: 'string',
+          describe: 'Sets the source pilet path where the Piral instance should be added.',
+          default: apps.addPiralInstancePiletDefaults.source,
+        })
+        .number('log-level')
+        .describe('log-level', 'Sets the log level to use (1-5).')
+        .default('log-level', apps.addPiralInstancePiletDefaults.logLevel)
+        .choices('npm-client', clientTypeKeys)
+        .describe('npm-client', 'Sets the npm client to be used for adding the Piral instance.')
+        .default('npm-client', apps.addPiralInstancePiletDefaults.npmClient)
+        .boolean('selected')
+        .describe('selected', 'Defines if the provided Piral instance should be selected initially.')
+        .default('selected', apps.addPiralInstancePiletDefaults.selected)
+        .string('base')
+        .default('base', process.cwd())
+        .describe('base', 'Sets the base directory. By default the current directory is used.');
+    },
+    run(args) {
+      return apps.addPiralInstancePilet(args.base as string, {
+        logLevel: args['log-level'] as LogLevels,
+        selected: args.selected as boolean,
+        npmClient: args['npm-client'] as NpmClientType,
+        app: args.app as string,
+        source: args.source as string,
+      });
+    },
+  },
+  {
+    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: ['<app> [source]'],
+    flags(argv) {
+      return argv
+        .positional('app', {
+          type: 'string',
+          describe: 'Sets the name of the Piral instance to be removed.',
+          default: apps.removePiralInstancePiletDefaults.app,
+        })
+        .positional('source', {
+          type: 'string',
+          describe: 'Sets the source pilet path where the Piral instance should be removed.',
+          default: apps.removePiralInstancePiletDefaults.source,
+        })
+        .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.');
+    },
+    run(args) {
+      return apps.removePiralInstancePilet(args.base as string, {
+        logLevel: args['log-level'] as LogLevels,
+        app: args.app as string,
+        source: args.source as string,
+        npmClient: args['npm-client'] as NpmClientType,
+      });
+    },
+  },
+  {
+    name: 'run-emulator-piral',
+    alias: ['start-emulator-piral', 'dev-emulator-portal'],
+    description: 'Starts a Piral instance emulator.',
+    arguments: ['[source]'],
+    // "any" due to https://github.com/microsoft/TypeScript/issues/28663 [artifical N = 50]
+    flags(argv: any) {
+      return argv
+        .positional('source', {
+          type: 'string',
+          describe: 'Sets the source Piral instance emulator package name.',
+          default: apps.runEmulatorPiralDefaults.app,
+        })
+        .number('port')
+        .describe('port', 'Sets the port of the local development server.')
+        .default('port', apps.runEmulatorPiralDefaults.port)
+        .string('registry')
+        .describe('registry', 'Sets the package registry to use for resolving the emulator.')
+        .default('registry', apps.runEmulatorPiralDefaults.registry)
+        .alias('registry', 'package-registry')
+        .number('log-level')
+        .describe('log-level', 'Sets the log level to use (1-5).')
+        .default('log-level', apps.runEmulatorPiralDefaults.logLevel)
+        .choices('npm-client', clientTypeKeys)
+        .describe('npm-client', 'Sets the npm client to be used when installing the emulator.')
+        .default('npm-client', apps.runEmulatorPiralDefaults.npmClient)
+        .boolean('open')
+        .describe('open', 'Opens the Piral instance directly in the browser.')
+        .default('open', apps.runEmulatorPiralDefaults.open)
+        .string('feed')
+        .describe('feed', 'Sets the URL of a pilet feed for including remote pilets.')
+        .string('base')
+        .default('base', process.cwd())
+        .describe('base', 'Sets the base directory. By default the current directory is used.');
+    },
+    run(args) {
+      return apps.runEmulatorPiral(args.base as string, {
+        port: args.port as number,
+        app: args.source as string,
+        npmClient: args['npm-client'] as NpmClientType,
+        registry: args.registry as string,
+        logLevel: args['log-level'] as LogLevels,
+        open: args.open as boolean,
+        feed: args.feed as string,
+      });
+    },
+  },
 ];
 
 class Commands implements ListCommands {