@travetto/pack 7.1.4 → 8.0.0-alpha.1

package/README.md

@@ -139,6 +139,7 @@ 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")
@@ -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
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "7.1.4",
+  "version": "8.0.0-alpha.1",
   "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": "^7.1.4",
-    "@travetto/terminal": "^7.1.4",
-    "rollup": "^4.55.1"
+    "@travetto/runtime": "^8.0.0-alpha.1",
+    "@travetto/terminal": "^8.0.0-alpha.1",
+    "rollup": "^4.59.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.1.4"
+    "@travetto/cli": "^8.0.0-alpha.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/docker-operation.ts

@@ -82,7 +82,7 @@ export class DockerPackOperation {
       yield ActiveShellCommand.chdir(path.resolve());
     } else {
       await PackUtil.runCommand(cmd, { cwd: config.buildDirectory, stdio: [0, 'pipe', 2] });
-      const [image]: [{ Size: number }] = JSONUtil.parseSafe(await PackUtil.runCommand(['docker', 'inspect', config.dockerImage]));
+      const [image] = await PackUtil.runCommand(['docker', 'inspect', config.dockerImage]).then(JSONUtil.fromUTF8<[{ Size: number }]>);
       yield [cliTpl`${{ title: 'Built Docker Container  ' }} ${{ identifier: 'sizeMb' }}=${{ param: Math.trunc(image.Size / 2 ** 20) }}`];
     }
   }

package/support/bin/operation.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { cliTpl } from '@travetto/cli';
-import { Env, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { JSONUtil, Env, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 import type { CommonPackConfig } from '../../src/types.ts';
 import { PackUtil } from './util.ts';
@@ -107,12 +107,12 @@ export class PackOperation {
     if (config.ejectFile) {
       yield* ActiveShellCommand.createFile(
         path.resolve(config.buildDirectory, file),
-        [JSON.stringify(pkg)]
+        [JSONUtil.toUTF8(pkg)]
       );
     } else {
       await PackUtil.writeRawFile(
         path.resolve(config.buildDirectory, file),
-        [JSON.stringify(pkg, null, 2)]
+        [JSONUtil.toUTF8Pretty(pkg)]
       );
     }
   }
@@ -245,7 +245,7 @@ export class PackOperation {
     yield* PackOperation.title(config, cliTpl`${{ title: 'Compressing' }} ${{ path: config.output }}`);
 
     if (config.ejectFile) {
-      await ActiveShellCommand.mkdir(path.dirname(config.output));
+      yield ActiveShellCommand.mkdir(path.dirname(config.output));
       yield ActiveShellCommand.chdir(config.buildDirectory);
       yield ActiveShellCommand.zip(config.output);
       yield ActiveShellCommand.chdir(path.resolve());

package/support/bin/util.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import { spawn, type SpawnOptions } from 'node:child_process';
 import path from 'node:path';
 
-import { AppError, ExecUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { RuntimeError, ExecUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 import { ActiveShellCommand } from './shell.ts';
 
@@ -82,7 +82,7 @@ export class PackUtil {
 
     if (!valid) {
       process.exitCode = code;
-      throw new AppError(stderr || message || 'An unexpected error has occurred');
+      throw new RuntimeError(stderr || message || 'An unexpected error has occurred');
     }
     return stdout;
   }

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,8 +1,8 @@
 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';
@@ -13,7 +13,7 @@ const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
 /**
  * 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 +33,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,25 +65,16 @@ 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)` });
-        }
-      }
-    }
-    return errs;
-  }
-
-  preMain(): void {
+  finalize(forHelp?: boolean): void {
     if (this.dockerFactory.startsWith('.')) {
       this.dockerFactory = RuntimeIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
     }
-    this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module || undefined);
+
+    if (forHelp) {
+      this.dockerName = CliUtil.getSimpleModuleName('<module>');
+    } else {
+      this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module || undefined);
+    }
 
     // Finalize user/group and ids
     const [userOrUserId, groupOrGroupId = userOrUserId] = (this.dockerRuntimeUser ?? '').split(':');
@@ -111,10 +103,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,15 +6,15 @@ import { BasePackCommand, type PackOperationShape } from './pack.base';
 /**
  * Standard zip support for pack
  */
-@CliCommand({ with: { module: true } })
+@CliCommand()
 export class PackZipCommand extends BasePackCommand {
 
-  preMain(): void {
-    this.output ??= CliUtil.getSimpleModuleName('<module>.zip', this.module);
-  }
-
-  preHelp(): void {
-    this.output = CliUtil.getSimpleModuleName('<module>.zip');
+  finalize(forHelp?: boolean): void {
+    if (forHelp) {
+      this.output = CliUtil.getSimpleModuleName('<module>.zip');
+    } else {
+      this.output ??= CliUtil.getSimpleModuleName('<module>.zip', this.module);
+    }
   }
 
   getOperations(): PackOperationShape<this>[] {

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,13 +141,14 @@ 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`;
 
     // Collect binary dependencies
-    const dependencies = await this.getBinaryDependencies();
+    const dependencies = this.getBinaryDependencies();
     this.externalDependencies = [...this.externalDependencies, ...dependencies];
 
     const stream = this.runOperations();

package/support/rollup/rollup-travetto-sourcemaps.ts

@@ -3,12 +3,12 @@ import fs from 'node:fs/promises';
 
 import type { LoadResult, Plugin, PluginContext, SourceMapInput } from 'rollup';
 
-import { FileLoader } from '@travetto/runtime';
+import { JSONUtil, FileLoader } from '@travetto/runtime';
 
 import type { CoreRollupConfig } from '../../src/types.ts';
 
 function toString(error: unknown): string {
-  return error instanceof Error ? error.stack ?? error.toString() : JSON.stringify(error);
+  return error instanceof Error ? error.stack ?? error.toString() : JSONUtil.toUTF8(error);
 }
 // Pulled from https://github.com/Azure/azure-sdk-for-js/blob/main/common/tools/dev-tool/src/config/rollup.base.config.ts#L128
 export function travettoSourcemaps(config: CoreRollupConfig): Plugin {
@@ -30,7 +30,8 @@ export function travettoSourcemaps(config: CoreRollupConfig): Plugin {
             return null;
           }
           const loader = new FileLoader([path.dirname(id)]);
-          const map: SourceMapInput = await loader.readJSON(mapPath);
+          const map = await loader.readText(mapPath)
+            .then(JSONUtil.fromBase64<SourceMapInput>);
           return { code, map };
         }
         return { code, map: null };