@travetto/pack 3.4.6 → 3.4.8

package/README.md

@@ -235,9 +235,9 @@ echo "Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.docker
 echo "FROM node:20-alpine" > $DIST/Dockerfile
 echo "RUN which useradd && (groupadd --gid 2000 app && useradd -u 2000 -g app app) || (addgroup -g 2000 app && adduser -D -G app -u 2000 app)" >> $DIST/Dockerfile
 echo "RUN mkdir /app && chown app:app /app" >> $DIST/Dockerfile
+echo "COPY --chown=\"app:app\" . /app" >> $DIST/Dockerfile
 echo "USER app" >> $DIST/Dockerfile
 echo "WORKDIR /app" >> $DIST/Dockerfile
-echo "COPY --chown=\"app:app\" . ." >> $DIST/Dockerfile
 echo "ENTRYPOINT [\"/app/todo-app.sh\"]" >> $DIST/Dockerfile
 
 # Pulling Docker Base Image node:20-alpine 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.6",
+  "version": "3.4.8",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -32,7 +32,7 @@
     "rollup": "^4.5.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.4"
+    "@travetto/cli": "^3.4.6"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/config-util.ts

@@ -32,18 +32,16 @@ export class PackConfigUtil {
         `groupadd --gid ${gid} ${group} && useradd -u ${uid} -g ${group} ${user}`,
         `addgroup -g ${gid} ${group} && adduser -D -G ${group} -u ${uid} ${user}`
       ) : '',
-      `USER ${user}`,
     ].join('\n');
   }
 
   /**
-   * Common docker runtime folder
+   * Setup docker runtime folder
    */
   static dockerAppFolder(cfg: DockerPackConfig): string {
     const { folder, user, group } = cfg.dockerRuntime;
     return [
       `RUN mkdir ${folder} && chown ${user}:${group} ${folder}`,
-      `WORKDIR ${folder}`,
     ].join('\n');
   }
 
@@ -51,15 +49,20 @@ export class PackConfigUtil {
    * Docker app files copied and permissioned
    */
   static dockerAppFiles(cfg: DockerPackConfig): string {
-    const { user, group } = cfg.dockerRuntime;
-    return `COPY --chown="${user}:${group}" . .`;
+    const { user, group, folder } = cfg.dockerRuntime;
+    return `COPY --chown="${user}:${group}" . ${folder}`;
   }
 
   /**
    * Entrypoint creation for a docker configuration
    */
   static dockerEntrypoint(cfg: DockerPackConfig): string {
-    return `ENTRYPOINT ["${cfg.dockerRuntime.folder}/${cfg.mainName}.sh"]`;
+    const { user, folder } = cfg.dockerRuntime;
+    return [
+      `USER ${user}`,
+      `WORKDIR ${folder}`,
+      `ENTRYPOINT ["${folder}/${cfg.mainName}.sh"]`,
+    ].join('\n');
   }
   /**
    * Common docker environment setup

package/support/bin/shell.ts

@@ -8,12 +8,16 @@ const escape = (text: string): string =>
     .replaceAll('"', '\\"')
     .replaceAll('$', '\\$');
 
+const escapedArgs = (args: string[]): string[] => args.map(x =>
+  x.includes(' ') || x.includes('"') ? `'${x}'` : (x.includes("'") ? `"${x}"` : x)
+);
+
 export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
   win32: {
     var: (name: string) => `%${name}%`,
     scriptOpen: () => [],
     chdirScript: () => ['cd', '%~p0'],
-    callCommandWithAllArgs: (cmd, ...args) => [cmd, ...args, '%*'],
+    callCommandWithAllArgs: (cmd, ...args) => [cmd, ...escapedArgs(args), '%*'],
     createFile: (file, text) => [
       ['@echo', 'off'],
       ...text.map((line, i) =>
@@ -34,7 +38,7 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
     var: (name: string) => `$${name}`,
     scriptOpen: () => ['#!/bin/sh'],
     chdirScript: () => ['cd', '$(dirname "$0")'],
-    callCommandWithAllArgs: (cmd, ...args) => [cmd, ...args, '$@'],
+    callCommandWithAllArgs: (cmd, ...args) => [cmd, ...escapedArgs(args), '$@'],
     createFile: (file, text, mode) => [
       ...text.map((line, i) =>
         ['echo', `"${escape(line)}"`, i === 0 ? '>' : '>>', file]),

package/support/cli.pack_docker.ts

@@ -1,7 +1,7 @@
 import { path, RootIndex } from '@travetto/manifest';
 import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
 import { GlobalEnv } from '@travetto/base';
-import { Ignore } from '@travetto/schema';
+import { Ignore, Required } from '@travetto/schema';
 
 import { DockerPackOperation } from './bin/docker-operation';
 import { BasePackCommand, PackOperationShape } from './pack.base';
@@ -20,7 +20,8 @@ export class PackDockerCommand extends BasePackCommand {
   @CliFlag({ desc: 'Docker Image to extend ', short: 'di', envVars: ['PACK_DOCKER_IMAGE'] })
   dockerImage = `node:${GlobalEnv.nodeVersion}-alpine`;
   @CliFlag({ desc: 'Docker Image Name ', short: 'dn', envVars: ['PACK_DOCKER_IMAGE'] })
-  dockerName = CliUtil.monoRoot ? '<module>' : CliUtil.getSimpleModuleName();
+  @Required(false)
+  dockerName: string;
   @CliFlag({ desc: 'Docker Image Tag ', short: 'dt', envVars: ['PACK_DOCKER_TAGS'] })
   dockerTag: string[] = ['latest'];
   @CliFlag({ desc: 'Docker Image Port ', short: 'dp', envVars: ['PACK_DOCKER_PORT'] })
@@ -37,7 +38,7 @@ export class PackDockerCommand extends BasePackCommand {
   @Ignore()
   dockerRuntime: DockerPackConfig['dockerRuntime'];
 
-  async validate(...unknownArgs: string[]): Promise<CliValidationError[] | undefined> {
+  async validate(...args: string[]): Promise<CliValidationError[] | undefined> {
     const errs: CliValidationError[] = [];
     if (this.dockerPort?.length) {
       for (let i = 0; i < this.dockerPort.length; i++) {
@@ -51,12 +52,11 @@ export class PackDockerCommand extends BasePackCommand {
     return errs;
   }
 
-  finalize(unknownArgs: string[]): void {
-    super.finalize(unknownArgs);
+  preMain(): void {
     if (this.dockerFactory.startsWith('.')) {
       this.dockerFactory = RootIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
     }
-    this.dockerName = this.dockerName.replace('<module>', CliUtil.getSimpleModuleName(this.module ?? ''));
+    this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module || undefined);
 
     // Finalize user/group and ids
     const [userOrUid, groupOrGid = userOrUid] = (this.dockerRuntimeUserSrc ?? '').split(':');
@@ -70,6 +70,10 @@ export class PackDockerCommand extends BasePackCommand {
     this.dockerRuntime = { user, uid, group, gid, folder: `/${DEFAULT_USER}` };
   }
 
+  preHelp(): void {
+    this.dockerName = CliUtil.getSimpleModuleName('<module>');
+  }
+
   getOperations(): PackOperationShape<this>[] {
     return [
       ...super.getOperations(),

package/support/cli.pack_zip.ts

@@ -9,8 +9,12 @@ import { BasePackCommand, PackOperationShape } from './pack.base';
 @CliCommand({ addModule: true })
 export class PackZipCommand extends BasePackCommand {
 
-  initialize(): void {
-    this.output = CliUtil.monoRoot ? '<module>.zip' : `${CliUtil.getSimpleModuleName()}.zip`;
+  preMain(): void {
+    this.output ??= CliUtil.getSimpleModuleName('<module>.zip', this.module);
+  }
+
+  preHelp(): void {
+    this.output = CliUtil.getSimpleModuleName('<module>.zip');
   }
 
   getOperations(): PackOperationShape<this>[] {

package/support/pack.base.ts

@@ -1,6 +1,6 @@
 import os from 'os';
 
-import { CliCommandShape, CliFlag, cliTpl, CliUtil } from '@travetto/cli';
+import { CliCommandShape, CliFlag, CliParseUtil, cliTpl } from '@travetto/cli';
 import { path, RootIndex } from '@travetto/manifest';
 import { TimeUtil } from '@travetto/base';
 import { GlobalTerminal } from '@travetto/terminal';
@@ -23,8 +23,6 @@ export abstract class BasePackCommand implements CliCommandShape {
       .map(x => x.import.replace(/[.][^.]+s$/, ''));
   }
 
-  #unknownArgs?: string[];
-
   @CliFlag({ desc: 'Workspace for building', short: 'w' })
   workspace: string = path.resolve(os.tmpdir(), RootIndex.mainModule.sourcePath.replace(/[\/\\: ]/g, '_'));
 
@@ -91,23 +89,14 @@ export abstract class BasePackCommand implements CliCommandShape {
     }
   }
 
-  finalize(unknown: string[]): void {
-    this.#unknownArgs = unknown;
-
-    this.output = this.output?.replace('<module>', CliUtil.getSimpleModuleName(this.module ?? ''));
-
+  async main(args: string[] = []): Promise<void> {
     // Resolve all files to absolute paths
-    if (this.output) {
-      this.output = path.resolve(this.output);
-    }
-    if (this.ejectFile) {
-      this.ejectFile = path.resolve(this.ejectFile);
-    }
+    this.output = this.output ? path.resolve(this.output) : undefined!;
+    this.ejectFile = this.ejectFile ? path.resolve(this.ejectFile) : undefined;
     this.workspace = path.resolve(this.workspace);
-  }
 
-  async main(args: string[] = []): Promise<void> {
-    this.entryArguments = [...args, ...this.#unknownArgs ?? []];
+    // Update entry points
+    this.entryArguments = [...this.entryArguments ?? [], ...args, ...CliParseUtil.getState(this)?.unknown ?? []];
     this.module ||= RootIndex.mainModuleName;
     this.mainName ??= path.basename(this.module);