@fgv/ts-res-cli 5.0.0-2 → 5.0.0-20

package/README.md

@@ -33,6 +33,13 @@ ts-res-compile compile \
   -o ./dist/resources.ts \
   --format ts \
   --include-metadata
+
+# Create a complete bundle with metadata and configuration
+ts-res-compile compile \
+  -i ./resources \
+  -o ./dist/resources.bundle.json \
+  --format bundle \
+  --include-metadata
 ```
 
 ### Validate Resources
@@ -66,7 +73,7 @@ Compiles resources from input to output format.
 
 **Optional Options:**
 - `-c, --context <json>` - Context filter for resources (JSON string)
-- `-f, --format <format>` - Output format (json, js, ts, binary) [default: json]
+- `-f, --format <format>` - Output format (compiled, source, js, ts, binary, bundle) [default: compiled]
 - `--debug` - Include debug information [default: false]
 - `-v, --verbose` - Verbose output [default: false]
 - `-q, --quiet` - Quiet output [default: false]
@@ -134,7 +141,8 @@ The CLI supports the following input formats:
 
 ## Output Formats
 
-### JSON (default)
+### Compiled (default)
+Compiled resource collection optimized for runtime use:
 ```json
 {
   "resources": {
@@ -145,6 +153,46 @@ The CLI supports the following input formats:
 }
 ```
 
+### Source
+Original resource collection format:
+```json
+{
+  "resources": [
+    {
+      "id": "welcome.message",
+      "resourceTypeName": "json",
+      "candidates": [
+        {
+          "json": { "text": "Welcome!" },
+          "conditions": { "language": "en" }
+        }
+      ]
+    }
+  ]
+}
+```
+
+### Bundle
+Complete resource bundle with metadata, configuration, and compiled resources:
+```json
+{
+  "metadata": {
+    "dateBuilt": "2025-01-01T00:00:00.000Z",
+    "checksum": "abc12345",
+    "version": "1.0.0",
+    "description": "Generated bundle from ts-res-cli"
+  },
+  "config": {
+    "qualifierTypes": [...],
+    "qualifiers": [...],
+    "resourceTypes": [...]
+  },
+  "compiledCollection": {
+    "resources": {...}
+  }
+}
+```
+
 ### JavaScript
 ```javascript
 module.exports = {

package/lib/cli.d.ts

@@ -28,6 +28,10 @@ export declare class TsResCliApp {
      * Handles the config command
      */
     private _handleConfigCommand;
+    /**
+     * Handles the archive command
+     */
+    private _handleArchiveCommand;
     /**
      * Parses and validates compile options
      */

package/lib/cli.js

@@ -90,7 +90,7 @@ class TsResCliApp {
             .option('-c, --context <json>', 'Context filter for resources (JSON string)')
             .option('--context-filter <token>', 'Context filter token (pipe-separated, e.g., "language=en-US|territory=US")')
             .option('--qualifier-defaults <token>', 'Qualifier default values token (pipe-separated, e.g., "language=en-US,en-CA|territory=US")')
-            .option('-f, --format <format>', 'Output format', 'compiled')
+            .option('-f, --format <format>', 'Output format (compiled, source, js, ts, binary, bundle)', 'compiled')
             .option('--debug', 'Include debug information', false)
             .option('-v, --verbose', 'Verbose output', false)
             .option('-q, --quiet', 'Quiet output', false)
@@ -142,6 +142,17 @@ class TsResCliApp {
             .action(async (options) => {
             await this._handleConfigCommand(options);
         });
+        this._program
+            .command('archive')
+            .description('Create ZIP archive of resources and configuration')
+            .option('-i, --input <path>', 'Input file or directory path')
+            .option('--config <path>', 'Configuration file path')
+            .requiredOption('-o, --output <path>', 'Output ZIP file path')
+            .option('-v, --verbose', 'Verbose output', false)
+            .option('-q, --quiet', 'Quiet output', false)
+            .action(async (options) => {
+            await this._handleArchiveCommand(options);
+        });
     }
     /**
      * Handles the compile command
@@ -413,13 +424,68 @@ class TsResCliApp {
             process.exit(1);
         }
     }
+    /**
+     * Handles the archive command
+     */
+    async _handleArchiveCommand(options) {
+        try {
+            // Import ZipArchive dynamically to avoid loading if not needed
+            const { ZipArchive } = await Promise.resolve().then(() => __importStar(require('@fgv/ts-res')));
+            if (!options.input && !options.config) {
+                console.error('Error: At least one of --input or --config must be specified');
+                process.exit(1);
+            }
+            if (!options.quiet) {
+                console.log('Creating ZIP archive...');
+                if (options.input)
+                    console.log(`Input: ${options.input}`);
+                if (options.config)
+                    console.log(`Config: ${options.config}`);
+                console.log(`Output: ${options.output}`);
+            }
+            // Create ZIP archive using the new zip-archive packlet
+            const creator = new ZipArchive.ZipArchiveCreator();
+            const createResult = await creator.createFromBuffer({
+                inputPath: options.input,
+                configPath: options.config
+            }, options.verbose
+                ? (phase, progress, message) => {
+                    console.log(`[${phase}] ${progress}% - ${message}`);
+                }
+                : undefined);
+            if (createResult.isFailure()) {
+                console.error(`Error: Failed to create ZIP archive: ${createResult.message}`);
+                process.exit(1);
+            }
+            const { zipBuffer, manifest, size } = createResult.value;
+            // Write the ZIP buffer to the specified output file
+            const fs = await Promise.resolve().then(() => __importStar(require('fs'))).then((m) => m.promises);
+            const path = await Promise.resolve().then(() => __importStar(require('path')));
+            const outputPath = path.resolve(options.output);
+            const outputDir = path.dirname(outputPath);
+            // Ensure output directory exists
+            await fs.mkdir(outputDir, { recursive: true });
+            // Write ZIP file
+            await fs.writeFile(outputPath, zipBuffer);
+            if (!options.quiet) {
+                console.log(`ZIP archive created successfully: ${outputPath}`);
+                console.log(`Archive size: ${(size / 1024).toFixed(2)} KB`);
+                console.log(`Manifest:`);
+                console.log(JSON.stringify(manifest, null, 2));
+            }
+        }
+        catch (error) {
+            console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+            process.exit(1);
+        }
+    }
     /**
      * Parses and validates compile options
      */
     _parseCompileOptions(options) {
         try {
             const format = options.format;
-            if (!['compiled', 'source', 'js', 'ts', 'binary'].includes(format)) {
+            if (!['compiled', 'source', 'js', 'ts', 'binary', 'bundle'].includes(format)) {
                 return (0, ts_utils_1.fail)(`Invalid format: ${format}`);
             }
             // Convert JSON context to contextFilter if provided

package/lib/compiler.d.ts

@@ -25,6 +25,7 @@ export interface IFilteredManager {
 export interface IResourceBlob {
     resources?: TsRes.ResourceJson.Json.IResourceCollectionDecl;
     compiledCollection?: TsRes.ResourceJson.Compiled.ICompiledResourceCollection;
+    bundle?: TsRes.Bundle.IBundle;
     metadata?: IResourceInfo;
 }
 /**
@@ -74,6 +75,10 @@ export declare class ResourceCompiler {
      * Generates a source format blob (legacy format)
      */
     private _generateSourceBlob;
+    /**
+     * Generates a bundle blob
+     */
+    private _generateBundleBlob;
     /**
      * Generates resource information
      */

package/lib/compiler.js

@@ -319,6 +319,9 @@ class ResourceCompiler {
             if (this._options.format === 'compiled') {
                 return this._generateCompiledBlob(filtered);
             }
+            else if (this._options.format === 'bundle') {
+                return this._generateBundleBlob(filtered);
+            }
             else {
                 return this._generateSourceBlob(filtered);
             }
@@ -354,6 +357,32 @@ class ResourceCompiler {
             return (0, ts_utils_1.succeed)(blob);
         });
     }
+    /**
+     * Generates a bundle blob
+     */
+    _generateBundleBlob(filtered) {
+        if (!this._systemConfiguration) {
+            return (0, ts_utils_1.fail)('System configuration is required for bundle generation');
+        }
+        // Create SystemConfiguration from the loaded configuration
+        return TsRes.Config.SystemConfiguration.create(this._systemConfiguration).onSuccess((systemConfig) => {
+            // Create bundle using BundleBuilder
+            const bundleParams = {
+                version: '1.0.0',
+                description: 'Generated bundle from ts-res-cli',
+                normalize: true // Use order-resilient normalization for consistent output
+            };
+            return TsRes.Bundle.BundleBuilder.create(filtered.manager, systemConfig, bundleParams).onSuccess((bundle) => {
+                const blob = {
+                    bundle
+                };
+                if (this._options.includeMetadata) {
+                    blob.metadata = this._generateResourceInfo(filtered);
+                }
+                return (0, ts_utils_1.succeed)(blob);
+            });
+        });
+    }
     /**
      * Generates resource information
      */
@@ -400,6 +429,11 @@ class ResourceCompiler {
                     const binaryData = blob.compiledCollection || blob;
                     content = JSON.stringify(binaryData);
                     break;
+                case 'bundle':
+                    // Bundle format outputs the complete bundle with metadata, config, and compiled resources
+                    const bundleData = this._options.includeMetadata ? blob : blob.bundle;
+                    content = JSON.stringify(bundleData, null, 2);
+                    break;
                 default:
                     return (0, ts_utils_1.fail)(`Unsupported output format: ${this._options.format}`);
             }

package/lib/options.d.ts

@@ -1,7 +1,7 @@
 /**
  * Output format options for resource compilation
  */
-export type OutputFormat = 'compiled' | 'source' | 'js' | 'ts' | 'binary';
+export type OutputFormat = 'compiled' | 'source' | 'js' | 'ts' | 'binary' | 'bundle';
 /**
  * Options for resource compilation
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res-cli",
-  "version": "5.0.0-2",
+  "version": "5.0.0-20",
   "description": "Command-line interface for ts-res resource compilation and management",
   "main": "lib/index.js",
   "bin": {
@@ -18,15 +18,15 @@
   "license": "MIT",
   "dependencies": {
     "commander": "^11.0.0",
-    "@fgv/ts-res": "5.0.0-2",
-    "@fgv/ts-utils": "5.0.0-2",
-    "@fgv/ts-json": "5.0.0-2",
-    "@fgv/ts-extras": "5.0.0-2",
-    "@fgv/ts-json-base": "5.0.0-2"
+    "@fgv/ts-res": "5.0.0-20",
+    "@fgv/ts-utils": "5.0.0-20",
+    "@fgv/ts-json": "5.0.0-20",
+    "@fgv/ts-extras": "5.0.0-20",
+    "@fgv/ts-json-base": "5.0.0-20"
   },
   "devDependencies": {
-    "@rushstack/heft": "~0.74.0",
-    "@rushstack/heft-node-rig": "~2.9.0",
+    "@rushstack/heft": "~0.74.2",
+    "@rushstack/heft-node-rig": "~2.9.3",
     "@rushstack/eslint-config": "~4.4.0",
     "@types/heft-jest": "1.0.6",
     "@types/jest": "^29.5.14",
@@ -35,9 +35,9 @@
     "@typescript-eslint/parser": "^7.14.1",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "ts-jest": "^29.4.0",
-    "typescript": "^5.7.3",
-    "@fgv/ts-utils-jest": "5.0.0-2"
+    "ts-jest": "^29.4.1",
+    "typescript": "^5.8.3",
+    "@fgv/ts-utils-jest": "5.0.0-20"
   },
   "peerDependencies": {
     "typescript": "^5.7.3"

package/src/cli.ts

@@ -86,6 +86,17 @@ interface IConfigCommandOptions {
   list?: boolean;
 }
 
+/**
+ * Command-line options for the archive command
+ */
+interface IArchiveCommandOptions {
+  input?: string;
+  config?: string;
+  output: string;
+  verbose?: boolean;
+  quiet?: boolean;
+}
+
 import { ResourceCompiler } from './compiler';
 
 /**
@@ -133,7 +144,7 @@ export class TsResCliApp {
         '--qualifier-defaults <token>',
         'Qualifier default values token (pipe-separated, e.g., "language=en-US,en-CA|territory=US")'
       )
-      .option('-f, --format <format>', 'Output format', 'compiled')
+      .option('-f, --format <format>', 'Output format (compiled, source, js, ts, binary, bundle)', 'compiled')
       .option('--debug', 'Include debug information', false)
       .option('-v, --verbose', 'Verbose output', false)
       .option('-q, --quiet', 'Quiet output', false)
@@ -221,6 +232,18 @@ export class TsResCliApp {
       .action(async (options) => {
         await this._handleConfigCommand(options);
       });
+
+    this._program
+      .command('archive')
+      .description('Create ZIP archive of resources and configuration')
+      .option('-i, --input <path>', 'Input file or directory path')
+      .option('--config <path>', 'Configuration file path')
+      .requiredOption('-o, --output <path>', 'Output ZIP file path')
+      .option('-v, --verbose', 'Verbose output', false)
+      .option('-q, --quiet', 'Quiet output', false)
+      .action(async (options) => {
+        await this._handleArchiveCommand(options);
+      });
   }
 
   /**
@@ -557,13 +580,78 @@ export class TsResCliApp {
     }
   }
 
+  /**
+   * Handles the archive command
+   */
+  private async _handleArchiveCommand(options: IArchiveCommandOptions): Promise<void> {
+    try {
+      // Import ZipArchive dynamically to avoid loading if not needed
+      const { ZipArchive } = await import('@fgv/ts-res');
+
+      if (!options.input && !options.config) {
+        console.error('Error: At least one of --input or --config must be specified');
+        process.exit(1);
+      }
+
+      if (!options.quiet) {
+        console.log('Creating ZIP archive...');
+        if (options.input) console.log(`Input: ${options.input}`);
+        if (options.config) console.log(`Config: ${options.config}`);
+        console.log(`Output: ${options.output}`);
+      }
+
+      // Create ZIP archive using the new zip-archive packlet
+      const creator = new ZipArchive.ZipArchiveCreator();
+      const createResult = await creator.createFromBuffer(
+        {
+          inputPath: options.input,
+          configPath: options.config
+        },
+        options.verbose
+          ? (phase, progress, message) => {
+              console.log(`[${phase}] ${progress}% - ${message}`);
+            }
+          : undefined
+      );
+
+      if (createResult.isFailure()) {
+        console.error(`Error: Failed to create ZIP archive: ${createResult.message}`);
+        process.exit(1);
+      }
+
+      const { zipBuffer, manifest, size } = createResult.value;
+
+      // Write the ZIP buffer to the specified output file
+      const fs = await import('fs').then((m) => m.promises);
+      const path = await import('path');
+      const outputPath = path.resolve(options.output);
+      const outputDir = path.dirname(outputPath);
+
+      // Ensure output directory exists
+      await fs.mkdir(outputDir, { recursive: true });
+
+      // Write ZIP file
+      await fs.writeFile(outputPath, zipBuffer);
+
+      if (!options.quiet) {
+        console.log(`ZIP archive created successfully: ${outputPath}`);
+        console.log(`Archive size: ${(size / 1024).toFixed(2)} KB`);
+        console.log(`Manifest:`);
+        console.log(JSON.stringify(manifest, null, 2));
+      }
+    } catch (error) {
+      console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+      process.exit(1);
+    }
+  }
+
   /**
    * Parses and validates compile options
    */
   private _parseCompileOptions(options: ICompileCommandOptions): Result<ICompileOptions> {
     try {
       const format = options.format as OutputFormat;
-      if (!['compiled', 'source', 'js', 'ts', 'binary'].includes(format)) {
+      if (!['compiled', 'source', 'js', 'ts', 'binary', 'bundle'].includes(format)) {
         return fail(`Invalid format: ${format}`);
       }
 

package/src/compiler.ts

@@ -53,6 +53,7 @@ export interface IFilteredManager {
 export interface IResourceBlob {
   resources?: TsRes.ResourceJson.Json.IResourceCollectionDecl;
   compiledCollection?: TsRes.ResourceJson.Compiled.ICompiledResourceCollection;
+  bundle?: TsRes.Bundle.IBundle;
   metadata?: IResourceInfo;
 }
 
@@ -387,6 +388,8 @@ export class ResourceCompiler {
     try {
       if (this._options.format === 'compiled') {
         return this._generateCompiledBlob(filtered);
+      } else if (this._options.format === 'bundle') {
+        return this._generateBundleBlob(filtered);
       } else {
         return this._generateSourceBlob(filtered);
       }
@@ -427,6 +430,39 @@ export class ResourceCompiler {
     });
   }
 
+  /**
+   * Generates a bundle blob
+   */
+  private _generateBundleBlob(filtered: IFilteredManager): Result<IResourceBlob> {
+    if (!this._systemConfiguration) {
+      return fail('System configuration is required for bundle generation');
+    }
+
+    // Create SystemConfiguration from the loaded configuration
+    return TsRes.Config.SystemConfiguration.create(this._systemConfiguration).onSuccess((systemConfig) => {
+      // Create bundle using BundleBuilder
+      const bundleParams: TsRes.Bundle.IBundleCreateParams = {
+        version: '1.0.0',
+        description: 'Generated bundle from ts-res-cli',
+        normalize: true // Use order-resilient normalization for consistent output
+      };
+
+      return TsRes.Bundle.BundleBuilder.create(filtered.manager, systemConfig, bundleParams).onSuccess(
+        (bundle) => {
+          const blob: IResourceBlob = {
+            bundle
+          };
+
+          if (this._options.includeMetadata) {
+            blob.metadata = this._generateResourceInfo(filtered);
+          }
+
+          return succeed(blob);
+        }
+      );
+    });
+  }
+
   /**
    * Generates resource information
    */
@@ -491,6 +527,11 @@ export class ResourceCompiler {
           const binaryData = blob.compiledCollection || blob;
           content = JSON.stringify(binaryData);
           break;
+        case 'bundle':
+          // Bundle format outputs the complete bundle with metadata, config, and compiled resources
+          const bundleData = this._options.includeMetadata ? blob : blob.bundle;
+          content = JSON.stringify(bundleData, null, 2);
+          break;
         default:
           return fail(`Unsupported output format: ${this._options.format}`);
       }

package/src/options.ts

@@ -23,7 +23,7 @@
 /**
  * Output format options for resource compilation
  */
-export type OutputFormat = 'compiled' | 'source' | 'js' | 'ts' | 'binary';
+export type OutputFormat = 'compiled' | 'source' | 'js' | 'ts' | 'binary' | 'bundle';
 
 /**
  * Options for resource compilation

package/.eslintrc.js

@@ -1,9 +0,0 @@
-// This is a workaround for https://github.com/eslint/eslint/issues/3458
-require('@rushstack/eslint-config/patch/modern-module-resolution');
-
-module.exports = {
-  extends: ['@rushstack/eslint-config/profile/node'],
-  parserOptions: {
-    tsconfigRootDir: __dirname
-  }
-};

package/.rush/temp/chunked-rush-logs/ts-res-cli.build.chunks.jsonl

@@ -1,6 +0,0 @@
-{"kind":"O","text":"Invoking: heft build --clean \n"}
-{"kind":"O","text":" ---- build started ---- \n"}
-{"kind":"O","text":"[build:typescript] Using TypeScript version 5.8.3\n"}
-{"kind":"O","text":"[build:lint] Using ESLint version 8.57.0\n"}
-{"kind":"O","text":" ---- build finished (7.653s) ---- \n"}
-{"kind":"O","text":"-------------------- Finished (7.657s) --------------------\n"}

package/.rush/temp/operation/build/log-chunks.jsonl

@@ -1,6 +0,0 @@
-{"kind":"O","text":"Invoking: heft build --clean \n"}
-{"kind":"O","text":" ---- build started ---- \n"}
-{"kind":"O","text":"[build:typescript] Using TypeScript version 5.8.3\n"}
-{"kind":"O","text":"[build:lint] Using ESLint version 8.57.0\n"}
-{"kind":"O","text":" ---- build finished (7.653s) ---- \n"}
-{"kind":"O","text":"-------------------- Finished (7.657s) --------------------\n"}

package/.rush/temp/operation/build/state.json

@@ -1,3 +0,0 @@
-{
-  "nonCachedDurationMs": 8165.2772600000035
-}