@travetto/pack 5.0.0-rc.1 → 5.0.0-rc.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.10",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,12 +29,12 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^5.0.0-rc.1",
-    "@travetto/terminal": "^5.0.0-rc.0",
-    "rollup": "^4.18.0"
+    "@travetto/runtime": "^5.0.0-rc.10",
+    "@travetto/terminal": "^5.0.0-rc.10",
+    "rollup": "^4.20.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.11"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config-util.ts

@@ -74,7 +74,7 @@ export class PackConfigUtil {
   }
 
   /**
-   * Docker app files copied and permissioned
+   * Docker app files copied with proper permissions
    */
   static dockerAppFiles(cfg: DockerPackConfig): string {
     const { user, group, folder } = cfg.dockerRuntime;

package/support/bin/docker-operation.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { RuntimeIndex } from '@travetto/manifest';
+import { Runtime } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
 
 import { ActiveShellCommand } from './shell';
@@ -22,8 +22,13 @@ export class DockerPackOperation {
     // Read os before writing
     cfg.dockerRuntime.os = await PackUtil.runCommand(
       ['docker', 'run', '--entrypoint', '/bin/sh', cfg.dockerImage, '-c', 'cat /etc/*release*']
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    ).then(out => out.match(/\b(?:debian|alpine|centos)\b/i)?.[0].toLowerCase() as 'alpine' ?? 'unknown');
+    ).then(out => {
+      const found = out.match(/\b(?:debian|alpine|centos)\b/i)?.[0].toLowerCase();
+      switch (found) {
+        case 'debian': case 'alpine': case 'centos': return found;
+        default: return 'unknown';
+      }
+    });
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Detected Image OS' }} ${{ param: cfg.dockerImage }} as ${{ param: cfg.dockerRuntime.os }}`);
   }
 
@@ -32,12 +37,7 @@ export class DockerPackOperation {
    */
   static async* writeDockerFile(cfg: DockerPackConfig): AsyncIterable<string[]> {
     const dockerFile = path.resolve(cfg.buildDir, 'Dockerfile');
-
-    const factory = RuntimeIndex.getFromImport(cfg.dockerFactory);
-    if (!factory) {
-      throw new Error(`Unable to resolve docker factory at ${cfg.dockerFactory}`);
-    }
-    const mod: DockerPackFactoryModule = await import(factory.import);
+    const mod = await Runtime.importFrom<DockerPackFactoryModule>(cfg.dockerFactory);
     const content = (await mod.factory(cfg)).trim();
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Generating Docker File' }} ${{ path: dockerFile }} ${{ param: cfg.dockerFactory }}`);

package/support/bin/operation.ts

@@ -1,9 +1,8 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { RuntimeIndex } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
-import { Env, RuntimeContext } from '@travetto/base';
+import { Env, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 import { CommonPackConfig } from '../../src/types';
 import { PackUtil } from './util';
@@ -67,7 +66,7 @@ export class PackOperation {
         ['BUNDLE_SOURCEMAP', cfg.sourcemap],
         ['BUNDLE_SOURCES', cfg.includeSources],
         ['BUNDLE_OUTPUT', cfg.buildDir],
-        ['BUNDLE_FORMAT', RuntimeContext.workspace.type],
+        ['BUNDLE_FORMAT', Runtime.workspace.type],
         ['BUNDLE_ENV_FILE', cfg.envFile]
       ] as const)
         .filter(x => x[1] === false || x[1])
@@ -100,7 +99,7 @@ export class PackOperation {
    */
   static async * writePackageJson(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const file = 'package.json';
-    const pkg = { type: RuntimeContext.workspace.type, main: cfg.mainFile };
+    const pkg = { type: Runtime.workspace.type, main: cfg.mainFile };
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing' }} ${{ path: file }}`);
 
@@ -189,7 +188,7 @@ export class PackOperation {
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over workspace resources' }}`);
 
     const dest = path.resolve(cfg.buildDir, cfg.workspaceResourceFolder);
-    const src = RuntimeContext.workspaceRelative('resources');
+    const src = Runtime.workspaceRelative('resources');
 
     if (cfg.ejectFile) {
       yield ActiveShellCommand.copyRecursive(src, dest, true);
@@ -204,7 +203,7 @@ export class PackOperation {
   static async * copyResources(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const resources = {
       count: RuntimeIndex.mainModule.files.resources?.length ?? 0,
-      src: path.resolve(RuntimeContext.mainSourcePath, 'resources'),
+      src: path.resolve(Runtime.mainSourcePath, 'resources'),
       dest: path.resolve(cfg.buildDir, 'resources')
     };
 

package/support/bin/util.ts

@@ -2,8 +2,7 @@ import fs from 'node:fs/promises';
 import { spawn, SpawnOptions } from 'node:child_process';
 import path from 'node:path';
 
-import { RuntimeIndex } from '@travetto/manifest';
-import { AppError, ExecUtil } from '@travetto/base';
+import { AppError, ExecUtil, RuntimeIndex } from '@travetto/runtime';
 
 import { ActiveShellCommand } from './shell';
 
@@ -30,7 +29,7 @@ export class PackUtil {
       }
       await fs.mkdir(final, { recursive: true });
       await fs.cp(src, final, { recursive: true });
-    } catch (err) {
+    } catch {
       if (!ignoreFailure) {
         throw new Error(`Failed to copy ${src} to ${dest}`);
       }

package/support/cli.pack.ts

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

package/support/cli.pack_docker.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { RuntimeIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/runtime';
 import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
 import { Ignore, Required } from '@travetto/schema';
 
@@ -13,7 +13,7 @@ const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
 /**
  * Standard docker support for pack
  */
-@CliCommand({ addModule: true })
+@CliCommand({ with: { module: true } })
 export class PackDockerCommand extends BasePackCommand {
   @CliFlag({ desc: 'Docker Factory source', short: 'df', envVars: ['PACK_DOCKER_FACTORY'] })
   dockerFactory = '@travetto/pack/support/pack.dockerfile';

package/support/cli.pack_zip.ts

@@ -6,7 +6,7 @@ import { BasePackCommand, PackOperationShape } from './pack.base';
 /**
  * Standard zip support for pack
  */
-@CliCommand({ addModule: true })
+@CliCommand({ with: { module: true } })
 export class PackZipCommand extends BasePackCommand {
 
   preMain(): void {

package/support/pack.base.ts

@@ -2,8 +2,7 @@ import os from 'node:os';
 import path from 'node:path';
 
 import { CliCommandShape, CliFlag, ParsedState, cliTpl } from '@travetto/cli';
-import { RuntimeIndex } from '@travetto/manifest';
-import { TimeUtil, RuntimeContext } from '@travetto/base';
+import { TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import { Terminal } from '@travetto/terminal';
 import { Ignore, Required, Schema } from '@travetto/schema';
 
@@ -28,7 +27,7 @@ export abstract class BasePackCommand implements CliCommandShape {
   _parsed: ParsedState;
 
   @CliFlag({ desc: 'Workspace for building', short: 'b' })
-  buildDir: string = path.resolve(os.tmpdir(), RuntimeContext.mainSourcePath.replace(/[\/\\: ]/g, '_'));
+  buildDir: string = path.resolve(os.tmpdir(), Runtime.mainSourcePath.replace(/[\/\\: ]/g, '_'));
 
   @CliFlag({ desc: 'Clean workspace' })
   clean = true;
@@ -117,7 +116,7 @@ export abstract class BasePackCommand implements CliCommandShape {
 
     // Update entry points
     this.entryArguments = [...this.entryArguments ?? [], ...args, ...this._parsed.unknown];
-    this.module ||= RuntimeContext.main.name;
+    this.module ||= Runtime.main.name;
     this.mainName ??= path.basename(this.module);
     this.mainFile = `${this.mainName}.js`;
 

package/support/rollup/config.ts

@@ -3,8 +3,9 @@ import path from 'node:path';
 import type { OutputOptions } from 'rollup';
 import type terser from '@rollup/plugin-terser';
 
-import { type ManifestModule, ManifestModuleUtil, type NodeModuleType, RuntimeIndex } from '@travetto/manifest';
-import { EnvProp, RuntimeContext } from '@travetto/base';
+import { type ManifestModule, ManifestModuleUtil, type NodeModuleType } from '@travetto/manifest';
+import { EnvProp, Runtime, RuntimeIndex } from '@travetto/runtime';
+
 import { CoreRollupConfig } from '../../src/types';
 
 function getFilesFromModule(m: ManifestModule): string[] {
@@ -17,19 +18,26 @@ function getFilesFromModule(m: ManifestModule): string[] {
   ]
     .filter(([, t]) => t === 'ts' || t === 'js' || t === 'json')
     .filter(f => (f[3] ?? 'std') === 'std') // Only include standard files
-    .map(([f]) => ManifestModuleUtil.sourceToOutputExt(path.resolve(m.outputFolder, f)));
+    .map(([f]) => ManifestModuleUtil.withOutputExtension(path.resolve(m.outputFolder, f)));
+}
+
+function getFormat(value: string = 'commonjs'): NodeModuleType {
+  switch (value) {
+    case 'module':
+    case 'commonjs': return value;
+    default: return 'commonjs';
+  }
 }
 
 export function getOutput(): OutputOptions {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  const format = (process.env.BUNDLE_FORMAT ?? 'commonjs') as NodeModuleType;
+  const format = getFormat(process.env.BUNDLE_FORMAT);
   const dir = process.env.BUNDLE_OUTPUT!;
   const mainFile = process.env.BUNDLE_MAIN_FILE!;
   return {
     format,
     interop: format === 'commonjs' ? 'auto' : undefined,
     sourcemapPathTransform: (src, map): string =>
-      RuntimeContext.stripWorkspacePath(path.resolve(path.dirname(map), src)),
+      Runtime.stripWorkspacePath(path.resolve(path.dirname(map), src)),
     sourcemap: new EnvProp('BUNDLE_SOURCEMAP').bool ?? false,
     sourcemapExcludeSources: !(new EnvProp('BUNDLE_SOURCES').bool ?? false),
     compact: new EnvProp('BUNDLE_COMPRESS').bool ?? true,

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

@@ -1,7 +1,7 @@
 import { readFileSync } from 'node:fs';
 import { Plugin } from 'rollup';
 
-import { RuntimeIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/runtime';
 
 import { CoreRollupConfig } from '../../src/types';