piral-cli 0.14.20 → 0.14.21

package/src/apps/new-pilet.ts

@@ -101,7 +101,7 @@ export const newPiletDefaults: NewPiletOptions = {
   forceOverwrite: ForceOverwrite.no,
   language: config.language,
   install: true,
-  template: 'default',
+  template: undefined,
   logLevel: LogLevels.info,
   npmClient: config.npmClient,
   bundlerName: 'none',
@@ -184,7 +184,7 @@ always-auth=true`,
 
     const isEmulator = checkAppShellPackage(piralInfo);
 
-    const { preScaffold, postScaffold, files } = getPiletsInfo(piralInfo);
+    const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
 
     if (preScaffold) {
       progress(`Running preScaffold script ...`);
@@ -195,7 +195,8 @@ always-auth=true`,
     progress(`Taking care of templating ...`);
 
     const data = getPiletScaffoldData(language, root, packageName, variables);
-    await scaffoldPiletSourceFiles(template, registry, data, forceOverwrite);
+    const chosenTemplate = template || preSelectedTemplate || 'default';
+    await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
 
     if (isEmulator) {
       // in the emulator case we get the files (and files_once) from the contained tarballs

package/src/build/bundler-calls.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'path';
 import { fork, ChildProcess } from 'child_process';
-import { Bundler, BundleDetails, BaseBundleParameters } from '../types';
+import type { Bundler, BundleDetails, BaseBundleParameters } from '../types';
 
 function getPath(name: string) {
   return resolve(__dirname, '..', '..', 'lib', 'build', `run-${name}.js`);

package/src/build/run-build-pilet.ts

@@ -1,5 +1,5 @@
-import type { PiletSchemaVersion, LogLevels, SharedDependency, PiletBuildHandler } from '../types';
 import { setStandardEnvs } from '../common';
+import type { PiletSchemaVersion, LogLevels, SharedDependency, PiletBuildHandler } from '../types';
 
 let handler: PiletBuildHandler;
 

package/src/build/run-build-piral.ts

@@ -1,5 +1,5 @@
-import type { PiralBuildHandler, LogLevels } from '../types';
 import { setStandardEnvs } from '../common';
+import type { PiralBuildHandler, LogLevels } from '../types';
 
 let handler: PiralBuildHandler;
 

package/src/build/run-debug-mono-piral.ts

@@ -1,6 +1,6 @@
-import type { LogLevels, PiralBuildHandler } from '../types';
-import { setStandardEnvs, progress, logReset } from '../common';
 import { resolve } from 'path';
+import { setStandardEnvs, progress, logReset } from '../common';
+import type { LogLevels, PiralBuildHandler } from '../types';
 
 let handler: PiralBuildHandler;
 

package/src/build/run-debug-pilet.ts

@@ -1,3 +1,4 @@
+import { setStandardEnvs } from '../common';
 import type {
   PiletSchemaVersion,
   LogLevels,
@@ -5,8 +6,6 @@ import type {
   BundleHandlerResponse,
   PiletBuildHandler,
 } from '../types';
-import { setStandardEnvs } from '../common';
-import { resolve } from 'path';
 
 let handler: PiletBuildHandler;
 let bundler: BundleHandlerResponse;
@@ -15,6 +14,7 @@ function run(
   root: string,
   targetDir: string,
   outDir: string,
+  outFile: string,
   piral: string,
   externals: Array<string>,
   importmap: Array<SharedDependency>,
@@ -63,11 +63,11 @@ process.on('message', async (msg) => {
 
         break;
       case 'start':
-        const dist = resolve(root, 'dist');
         bundler = await run(
           root,
           msg.targetDir,
-          dist,
+          msg.outDir,
+          msg.outFile,
           msg.piral,
           msg.externals,
           msg.importmap,
@@ -100,7 +100,7 @@ process.on('message', async (msg) => {
 
           process.send({
             type: 'done',
-            outDir: dist,
+            outDir: msg.outDir,
           });
         }
 

package/src/build/run-debug-piral.ts

@@ -1,6 +1,6 @@
-import type { BundleHandlerResponse, LogLevels, PiralBuildHandler } from '../types';
-import { setStandardEnvs } from '../common';
 import { resolve } from 'path';
+import { setStandardEnvs } from '../common';
+import type { BundleHandlerResponse, LogLevels, PiralBuildHandler } from '../types';
 
 let handler: PiralBuildHandler;
 let bundler: BundleHandlerResponse;

package/src/commands.ts

@@ -400,6 +400,12 @@ 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)
@@ -437,6 +443,8 @@ const allCommands: Array<ToolCommand<any>> = [
     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,
@@ -469,6 +477,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .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)
@@ -512,6 +523,7 @@ 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,

package/src/common/clients/npm.ts

@@ -24,10 +24,18 @@ export async function unpackPackage(packageRef: string, target = '.', ...flags:
 }
 
 export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
-  const ms = new MemoryStream();
-  await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
-  log('generalDebug_0003', `npm install package result: ${ms.value}`);
-  return ms.value;
+  try {
+    const ms = new MemoryStream();
+    await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
+    log('generalDebug_0003', `npm install package result: ${ms.value}`);
+    return ms.value;
+  } catch (ex) {
+    log(
+      'generalError_0002',
+      `Could not install the package "${packageRef}" using npm. Make sure npm is correctly installed and accessible: ${ex}`,
+    );
+    throw ex;
+  }
 }
 
 export async function createPackage(target = '.', ...flags: Array<string>) {

package/src/common/clients/pnpm.ts

@@ -29,8 +29,16 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
 }
 
 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}`);
-  return ms.value;
+  try {
+    const ms = new MemoryStream();
+    await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
+    log('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
+    return ms.value;
+  } catch (ex) {
+    log(
+      'generalError_0002',
+      `Could not install the package "${packageRef}" using Pnpm. Make sure Pnpm is correctly installed and accessible: ${ex}`,
+    );
+    throw ex;
+  }
 }

package/src/common/clients/yarn.ts

@@ -33,8 +33,16 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
 }
 
 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 install package result: ${ms.value}`);
-  return ms.value;
+  try {
+    const ms = new MemoryStream();
+    await runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
+    log('generalDebug_0003', `Yarn install package result: ${ms.value}`);
+    return ms.value;
+  } catch (ex) {
+    log(
+      'generalError_0002',
+      `Could not install the package "${packageRef}" using Yarn. Make sure Yarn@1 is correctly installed and accessible: ${ex}`,
+    );
+    throw ex;
+  }
 }

package/src/common/package.test.ts

@@ -29,6 +29,7 @@ describe('CLI package module', () => {
   it('getPiletsInfo returns pilets information about provided piralInfo', () => {
     const emptyPiletsInfo = {
       files: [],
+      template: 'default',
       externals: [],
       scripts: {},
       validators: {},
@@ -45,6 +46,7 @@ describe('CLI package module', () => {
     const piralInfo = {
       pilets: {
         files: ['foo.tgz', 'foo2.tgz'],
+        template: 'default',
         externals: [],
         scripts: {},
         validators: {},

package/src/common/package.ts

@@ -347,6 +347,7 @@ export function getPiletsInfo(piralInfo: any): PiletsInfo {
     files = [],
     externals = [],
     scripts = {},
+    template = 'default',
     validators = {},
     devDependencies = {},
     preScaffold = '',
@@ -360,6 +361,7 @@ export function getPiletsInfo(piralInfo: any): PiletsInfo {
     files,
     externals,
     scripts,
+    template,
     validators,
     devDependencies,
     preScaffold,

package/src/common/scaffold.ts

@@ -38,6 +38,7 @@ async function getTemplateFiles(
   } else {
     await installPackage(templatePackageName, __dirname, '--registry', registry);
   }
+
   const templateRunner = getTemplatePackage(templatePackageName);
 
   if (typeof templateRunner === 'function') {

package/src/injectors/pilet.ts

@@ -19,6 +19,7 @@ interface Pilet {
 
 export interface PiletInjectorConfig extends KrasInjectorConfig {
   pilets: Array<Pilet>;
+  publicUrl: string;
   meta: string;
   api: string;
   app: string;
@@ -74,6 +75,7 @@ async function loadFeed(feed: string) {
 export default class PiletInjector implements KrasInjector {
   public config: PiletInjectorConfig;
   private piletApi: string;
+  private indexPath: string;
 
   constructor(options: PiletInjectorConfig, config: KrasConfiguration, core: EventEmitter) {
     this.config = options;
@@ -82,7 +84,8 @@ export default class PiletInjector implements KrasInjector {
       ? options.api
       : `${config.ssl ? 'https' : 'http'}://${host}:${config.port}${options.api}`;
 
-    const { pilets, api } = options;
+    const { pilets, api, publicUrl } = options;
+    this.indexPath = `${publicUrl}index.html`;
     const cbs = {};
 
     core.on('user-connected', (e) => {
@@ -210,26 +213,30 @@ export default class PiletInjector implements KrasInjector {
   }
 
   handle(req: KrasRequest): KrasResponse {
-    const { app, api } = this.config;
-    const path = req.url.substring(1).split('?')[0];
+    const { app, api, publicUrl } = this.config;
 
     if (!req.target) {
-      const target = join(app, path);
+      if (req.url.startsWith(publicUrl)) {
+        const path = req.url.substring(publicUrl.length).split('?')[0];
+        const target = join(app, path);
 
-      if (existsSync(target) && statSync(target).isFile()) {
-        if (req.url === '/index.html') {
-          return this.sendIndexFile(target, req.url);
+        if (existsSync(target) && statSync(target).isFile()) {
+          if (req.url === this.indexPath) {
+            return this.sendIndexFile(target, req.url);
+          } else {
+            return this.sendFile(target, req.url);
+          }
+        } else if (req.url !== this.indexPath) {
+          return this.handle({
+            ...req,
+            url: this.indexPath,
+          });
         }
-        return this.sendFile(target, req.url);
-      } else if (req.url !== '/index.html') {
-        return this.handle({
-          ...req,
-          url: '/index.html',
-        });
-      } else {
-        return undefined;
       }
+
+      return undefined;
     } else if (req.target === api) {
+      const path = req.url.substring(1).split('?')[0];
       return this.sendResponse(path, req.url);
     }
   }

package/src/types/common.ts

@@ -55,6 +55,7 @@ export interface TemplateFileLocation {
 
 export interface PiletsInfo {
   files: Array<string | TemplateFileLocation>;
+  template: string;
   externals: Array<string>;
   devDependencies: Record<string, string | true>;
   scripts: Record<string, string>;

package/src/types/public.ts

@@ -103,6 +103,8 @@ export interface DebugPiletParameters extends BaseBundleParameters {
   externals: Array<string>;
   importmap: Array<SharedDependency>;
   targetDir: string;
+  outFile: string;
+  outDir: string;
   entryModule: string;
   logLevel: LogLevels;
   version: PiletSchemaVersion;