@travetto/pack 8.0.0-alpha.1 → 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")
@@ -142,7 +142,7 @@ Options:
   -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: [])
@@ -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.1",
+  "version": "8.0.0-alpha.2",
   "type": "module",
   "description": "Code packing utilities",
   "keywords": [
@@ -35,7 +35,7 @@
     "rollup": "^4.59.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.1"
+    "@travetto/cli": "^8.0.0-alpha.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/cli.pack_docker.ts

@@ -9,6 +9,8 @@ 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
@@ -66,26 +68,25 @@ export class PackDockerCommand extends BasePackCommand {
   defaultUserId = 2000;
 
   finalize(forHelp?: boolean): void {
-    if (this.dockerFactory.startsWith('.')) {
-      this.dockerFactory = RuntimeIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
+    if (forHelp) {
+      this.dockerName = '<module>';
     }
 
-    if (forHelp) {
-      this.dockerName = CliUtil.getSimpleModuleName('<module>');
-    } else {
-      this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module || undefined);
+    if (this.dockerFactory.startsWith('.')) {
+      this.dockerFactory = RuntimeIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
     }
+    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) {

package/support/cli.pack_zip.ts

@@ -11,10 +11,9 @@ export class PackZipCommand extends BasePackCommand {
 
   finalize(forHelp?: boolean): void {
     if (forHelp) {
-      this.output = CliUtil.getSimpleModuleName('<module>.zip');
-    } else {
-      this.output ??= CliUtil.getSimpleModuleName('<module>.zip', this.module);
+      this.output = '<module>.zip';
     }
+    this.output ??= CliUtil.getSimpleModuleName('<module>.zip', this.module);
   }
 
   getOperations(): PackOperationShape<this>[] {