@travetto/pack 8.0.0-alpha.0 → 8.0.0-alpha.2

package/README.md

@@ -97,7 +97,7 @@ Usage: pack:zip [options] [args...:string]
 Options:
   -b, --buildDir <string>              Workspace for building (default: "/tmp/<temp-folder>")
   --clean, --no-clean                  Clean workspace (default: true)
-  -o, --output <string>                Output location (default: "travetto_pack.zip")
+  -o, --output <string>                Output location (default: "<module>.zip")
   --main-scripts, --no-main-scripts    Create entry scripts (default: true)
   -f, --main-name <string>             Main name for build artifact
   -e, --entry-point <string>           Entry point (default: "@travetto/cli/support/entry.trv.ts")
@@ -139,9 +139,10 @@ Options:
   --manifest-file <string>               Manifest File Name (default: "manifest.json")
   -wr, --include-workspace-resources     Include workspace resources (default: false)
   -np, --npm-package <string>            External NPM Packages (default: [])
+  -m, --module <module>                  Module to run for
   -df, --docker-factory <string>         Docker Factory source (default: "@travetto/pack/support/pack.dockerfile.ts")
   -di, --docker-image <string>           Docker Image to extend (default: "node:25-alpine")
-  -dn, --docker-name <string>            Docker Image Name (default: "travetto_pack")
+  -dn, --docker-name <string>            Docker Image Name (default: "<module>")
   -ru, --runtime-user <string>           Docker Runtime user
   -rp, --runtime-package <string>        Docker Runtime Packages (default: [])
   -dp, --docker-port <number>            Docker Image Port (default: [])
@@ -150,7 +151,6 @@ Options:
   -dx, --docker-push                     Docker Push Tags (default: false)
   -db, --docker-build-platform <string>  Docker Build Platform
   -dr, --docker-registry <string>        Docker Registry
-  -m, --module <module>                  Module to run for
   -h, --help                             display help for command
 ```
 
@@ -273,6 +273,6 @@ echo "ENTRYPOINT [\"/app/todo-app.sh\"]" >> $DIST/Dockerfile
 echo "Building Docker Container latest"
 
 cd $DIST
-docker build -t travetto_todo-app:latest .
+docker build -t <module>:latest .
 cd $ROOT
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "8.0.0-alpha.0",
+  "version": "8.0.0-alpha.2",
   "type": "module",
   "description": "Code packing utilities",
   "keywords": [
@@ -26,16 +26,16 @@
     "directory": "module/pack"
   },
   "dependencies": {
-    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/runtime": "^8.0.0-alpha.0",
-    "@travetto/terminal": "^8.0.0-alpha.0",
+    "@travetto/runtime": "^8.0.0-alpha.1",
+    "@travetto/terminal": "^8.0.0-alpha.1",
     "rollup": "^4.59.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.0"
+    "@travetto/cli": "^8.0.0-alpha.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/cli.pack.ts

@@ -5,5 +5,5 @@ import { BasePackCommand } from './pack.base';
 /**
  * Standard pack support
  */
-@CliCommand({ with: { module: true } })
+@CliCommand()
 export class PackCommand extends BasePackCommand { }

package/support/cli.pack_docker.ts

@@ -1,19 +1,21 @@
 import path from 'node:path';
 
 import { RuntimeIndex } from '@travetto/runtime';
-import { CliCommand, CliFlag, CliUtil, type CliValidationError } from '@travetto/cli';
-import { Ignore, Required } from '@travetto/schema';
+import { CliCommand, CliFlag, CliUtil } from '@travetto/cli';
+import { Ignore, Max, Min, Required } from '@travetto/schema';
 
 import { DockerPackOperation } from './bin/docker-operation.ts';
 import { BasePackCommand, type PackOperationShape } from './pack.base';
 import type { DockerPackConfig } from '../src/types.ts';
 
 const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
+const asNumber = (input?: string): number | undefined => (!input || isNaN(+input)) ? undefined : +input;
+const asString = (input?: string): string | undefined => (input && asNumber(input)) ? input : undefined;
 
 /**
  * Standard docker support for pack
  */
-@CliCommand({ with: { module: true } })
+@CliCommand()
 export class PackDockerCommand extends BasePackCommand {
   /**  Docker Factory source */
   @CliFlag({ short: 'df', envVars: ['PACK_DOCKER_FACTORY'] })
@@ -33,6 +35,7 @@ export class PackDockerCommand extends BasePackCommand {
   dockerRuntimePackages: string[] = [];
   /**  Docker Image Port */
   @CliFlag({ short: 'dp', envVars: ['PACK_DOCKER_PORT'] })
+  @Min(1) @Max(65536)
   dockerPort: number[] = [];
 
   // Publish flags
@@ -64,36 +67,26 @@ export class PackDockerCommand extends BasePackCommand {
   @Ignore()
   defaultUserId = 2000;
 
-  async validate(): Promise<CliValidationError[] | undefined> {
-    const errs: CliValidationError[] = [];
-    if (this.dockerPort?.length) {
-      for (let i = 0; i < this.dockerPort.length; i++) {
-        if (this.dockerPort[i] < 1) {
-          errs.push({ source: 'flag', message: `dockerPort[${i}] is less than (1)` });
-        } else if (this.dockerPort[i] > 65536) {
-          errs.push({ source: 'flag', message: `dockerPort[${i}] is greater than (65536)` });
-        }
-      }
+  finalize(forHelp?: boolean): void {
+    if (forHelp) {
+      this.dockerName = '<module>';
     }
-    return errs;
-  }
 
-  preMain(): void {
     if (this.dockerFactory.startsWith('.')) {
       this.dockerFactory = RuntimeIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
     }
-    this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module || undefined);
+    this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module);
 
     // Finalize user/group and ids
     const [userOrUserId, groupOrGroupId = userOrUserId] = (this.dockerRuntimeUser ?? '').split(':');
-    const groupIsNumber = /^\d+$/.test(groupOrGroupId);
-    const userIsNumber = /^\d+$/.test(userOrUserId);
-
-    const userId = userIsNumber ? +userOrUserId : this.defaultUserId;
-    const groupId = groupIsNumber ? +groupOrGroupId : this.defaultUserId;
-    const group = (!groupIsNumber ? groupOrGroupId : undefined) || this.defaultUser;
-    const user = (!userIsNumber ? userOrUserId : undefined) || this.defaultUser;
-    this.dockerRuntime = { user, userId, group, groupId, folder: `/${this.appFolder}`, packages: this.dockerRuntimePackages };
+    this.dockerRuntime = {
+      user: asString(userOrUserId) ?? this.defaultUser,
+      userId: asNumber(userOrUserId) ?? this.defaultUserId,
+      group: asString(groupOrGroupId) ?? this.defaultUser,
+      groupId: asNumber(groupOrGroupId) ?? this.defaultUserId,
+      folder: `/${this.appFolder}`,
+      packages: this.dockerRuntimePackages
+    };
 
     if (this.dockerStageOnly) {
       if (this.dockerRegistry) {
@@ -111,10 +104,6 @@ export class PackDockerCommand extends BasePackCommand {
     }
   }
 
-  preHelp(): void {
-    this.dockerName = CliUtil.getSimpleModuleName('<module>');
-  }
-
   getOperations(): PackOperationShape<this>[] {
     return [
       ...super.getOperations(),

package/support/cli.pack_zip.ts

@@ -6,17 +6,16 @@ import { BasePackCommand, type PackOperationShape } from './pack.base';
 /**
  * Standard zip support for pack
  */
-@CliCommand({ with: { module: true } })
+@CliCommand()
 export class PackZipCommand extends BasePackCommand {
 
-  preMain(): void {
+  finalize(forHelp?: boolean): void {
+    if (forHelp) {
+      this.output = '<module>.zip';
+    }
     this.output ??= CliUtil.getSimpleModuleName('<module>.zip', this.module);
   }
 
-  preHelp(): void {
-    this.output = CliUtil.getSimpleModuleName('<module>.zip');
-  }
-
   getOperations(): PackOperationShape<this>[] {
     return [
       ...super.getOperations(),

package/support/pack.base.ts

@@ -1,7 +1,7 @@
 import os from 'node:os';
 import path from 'node:path';
 
-import { type CliCommandShape, CliFlag, type ParsedState, cliTpl } from '@travetto/cli';
+import { type CliCommandShape, CliFlag, CliModuleFlag, CliParseUtil, cliTpl } from '@travetto/cli';
 import { TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import { Terminal } from '@travetto/terminal';
 import { Ignore, Method, Required, Schema } from '@travetto/schema';
@@ -24,9 +24,6 @@ export abstract class BasePackCommand implements CliCommandShape {
       .map(file => file.import.replace(/[.][^.]+s$/, ''));
   }
 
-  @Ignore()
-  _parsed: ParsedState;
-
   /** Workspace for building */
   @CliFlag({ short: 'b', full: 'buildDir' })
   buildDirectory: string = path.resolve(os.tmpdir(), Runtime.mainSourcePath.replace(/[\/\\: ]/g, '_'));
@@ -86,7 +83,7 @@ export abstract class BasePackCommand implements CliCommandShape {
   @CliFlag({ short: 'np', full: 'npm-package', envVars: ['PACK_EXTERNAL_PACKAGES'] })
   externalDependencies: string[] = [];
 
-  @Ignore()
+  @CliModuleFlag({ short: 'm' })
   module: string;
 
   @Ignore()
@@ -144,7 +141,8 @@ export abstract class BasePackCommand implements CliCommandShape {
     this.buildDirectory = path.resolve(this.buildDirectory);
 
     // Update entry points
-    this.entryArguments = [...this.entryArguments ?? [], ...args, ...this._parsed.unknown];
+    const parsed = CliParseUtil.getState(this);
+    this.entryArguments = [...this.entryArguments ?? [], ...args, ...parsed?.unknown ?? []];
     this.module ||= Runtime.main.name;
     this.mainName ??= path.basename(this.module);
     this.mainFile = `${this.mainName}.js`;