@fgv/ts-res-browser-cli 5.0.0-3 → 5.0.0-30

package/lib/zipArchiver.js

@@ -34,11 +34,11 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zipArchiver = exports.ZipArchiver = void 0;
-const archiver = __importStar(require("archiver"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const ts_utils_1 = require("@fgv/ts-utils");
+const ts_res_1 = require("@fgv/ts-res");
 class ZipArchiver {
     /**
      * Create a ZIP archive containing the specified input and config files/directories
@@ -53,79 +53,18 @@ class ZipArchiver {
             if (!fs.existsSync(outputDir)) {
                 fs.mkdirSync(outputDir, { recursive: true });
             }
-            const output = fs.createWriteStream(zipPath);
-            const archive = archiver.create('zip', {
-                zlib: { level: 6 } // Good compression level
+            // Create ZIP archive using the new zip-archive packlet
+            const creator = new ts_res_1.ZipArchive.ZipArchiveCreator();
+            const createResult = await creator.createFromBuffer({
+                inputPath: options.input,
+                configPath: options.config
             });
-            // Create manifest
-            const manifest = {
-                timestamp: new Date().toISOString()
-            };
-            // Promise to handle async archiving
-            const archivePromise = new Promise((resolve, reject) => {
-                output.on('close', () => {
-                    resolve();
-                });
-                output.on('error', (err) => {
-                    reject(err);
-                });
-                archive.on('error', (err) => {
-                    reject(err);
-                });
-            });
-            // Pipe archive data to the file
-            archive.pipe(output);
-            // Add input files/directory
-            if (options.input) {
-                const inputPath = path.resolve(options.input);
-                if (!fs.existsSync(inputPath)) {
-                    return (0, ts_utils_1.fail)(`Input path does not exist: ${inputPath}`);
-                }
-                const stats = fs.statSync(inputPath);
-                if (stats.isDirectory()) {
-                    // Add entire directory recursively, preserving structure
-                    const dirName = path.basename(inputPath);
-                    archive.directory(inputPath, `input/${dirName}`);
-                    manifest.input = {
-                        type: 'directory',
-                        originalPath: inputPath,
-                        archivePath: `input/${dirName}`
-                    };
-                }
-                else if (stats.isFile()) {
-                    // Add single file
-                    const fileName = path.basename(inputPath);
-                    archive.file(inputPath, { name: `input/${fileName}` });
-                    manifest.input = {
-                        type: 'file',
-                        originalPath: inputPath,
-                        archivePath: `input/${fileName}`
-                    };
-                }
-            }
-            // Add config file
-            if (options.config) {
-                const configPath = path.resolve(options.config);
-                if (!fs.existsSync(configPath)) {
-                    return (0, ts_utils_1.fail)(`Config file does not exist: ${configPath}`);
-                }
-                const stats = fs.statSync(configPath);
-                if (!stats.isFile()) {
-                    return (0, ts_utils_1.fail)(`Config path must be a file: ${configPath}`);
-                }
-                const fileName = path.basename(configPath);
-                archive.file(configPath, { name: `config/${fileName}` });
-                manifest.config = {
-                    type: 'file',
-                    originalPath: configPath,
-                    archivePath: `config/${fileName}`
-                };
+            if (createResult.isFailure()) {
+                return (0, ts_utils_1.fail)(createResult.message);
             }
-            // Add manifest
-            archive.append(JSON.stringify(manifest, null, 2), { name: 'manifest.json' });
-            // Finalize the archive
-            await archive.finalize();
-            await archivePromise;
+            const { zipBuffer, manifest } = createResult.value;
+            // Write the ZIP buffer to disk
+            fs.writeFileSync(zipPath, zipBuffer);
             return (0, ts_utils_1.succeed)({
                 zipPath,
                 manifest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res-browser-cli",
-  "version": "5.0.0-3",
+  "version": "5.0.0-30",
   "description": "Command-line interface to launch ts-res-browser with specified options",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,26 +22,26 @@
   },
   "dependencies": {
     "commander": "^11.0.0",
-    "archiver": "~7.0.1",
-    "@types/archiver": "~6.0.3",
-    "@fgv/ts-res": "5.0.0-3",
-    "@fgv/ts-utils": "5.0.0-3",
-    "@fgv/ts-json-base": "5.0.0-3",
-    "@fgv/ts-json": "5.0.0-3"
+    "@fgv/ts-res": "5.0.0-30",
+    "@fgv/ts-json-base": "5.0.0-30",
+    "@fgv/ts-utils": "5.0.0-30",
+    "@fgv/ts-res-browser": "5.0.0-30",
+    "@fgv/ts-json": "5.0.0-30"
   },
   "devDependencies": {
-    "@rushstack/heft": "~0.74.0",
-    "@rushstack/heft-node-rig": "~2.9.0",
+    "@rushstack/eslint-config": "4.4.0",
+    "@rushstack/heft": "0.74.4",
+    "@rushstack/heft-node-rig": "2.9.5",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.14.9",
-    "eslint": "^8.57.0",
+    "eslint": "^9.35.0",
     "jest": "^29.7.0",
-    "typescript": "^5.7.3",
-    "@fgv/ts-utils-jest": "5.0.0-3"
+    "typescript": "5.8.3",
+    "@fgv/ts-utils-jest": "5.0.0-30"
   },
   "scripts": {
     "build": "heft build --clean",
-    "test": "heft test --clean",
+    "test": "echo 'No tests configured for ts-res-browser-cli - this is a CLI launcher tool' && exit 0",
     "clean": "heft clean",
     "lint": "eslint src --ext .ts",
     "fixlint": "eslint src --ext .ts --fix"

package/.rush/temp/6fdce6325ccacda5ae840a289f20e286e54e4f4b.tar.log

@@ -1,32 +0,0 @@
-Start time: Tue Jul 22 2025 07:39:14 GMT+0000 (Coordinated Universal Time)
-Invoking "/usr/bin/tar -c -f /home/runner/work/fgv/fgv/common/temp/build-cache/6fdce6325ccacda5ae840a289f20e286e54e4f4b-875defd8b242f650.temp -z --files-from=-"
-
-======= BEGIN PROCESS INPUT ======
-.rush/temp/operation/build/all.log
-.rush/temp/operation/build/log-chunks.jsonl
-.rush/temp/operation/build/state.json
-lib/browserLauncher.d.ts
-lib/browserLauncher.d.ts.map
-lib/browserLauncher.js
-lib/browserLauncher.js.map
-lib/cli.d.ts
-lib/cli.d.ts.map
-lib/cli.js
-lib/cli.js.map
-lib/index.d.ts
-lib/index.d.ts.map
-lib/index.js
-lib/index.js.map
-lib/options.d.ts
-lib/options.d.ts.map
-lib/options.js
-lib/options.js.map
-lib/zipArchiver.d.ts
-lib/zipArchiver.d.ts.map
-lib/zipArchiver.js
-lib/zipArchiver.js.map
-======== END PROCESS INPUT =======
-======= BEGIN PROCESS OUTPUT =======
-======== END PROCESS OUTPUT ========
-
-Exited with code "0"

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

@@ -1,5 +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 finished (4.947s) ---- \n"}
-{"kind":"O","text":"-------------------- Finished (4.953s) --------------------\n"}

package/.rush/temp/operation/build/all.log

@@ -1,5 +0,0 @@
-Invoking: heft build --clean 
- ---- build started ---- 
-[build:typescript] Using TypeScript version 5.8.3
- ---- build finished (4.947s) ---- 
--------------------- Finished (4.953s) --------------------

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

@@ -1,5 +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 finished (4.947s) ---- \n"}
-{"kind":"O","text":"-------------------- Finished (4.953s) --------------------\n"}

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

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