@fgv/ts-res-browser-cli 5.0.0-22 → 5.0.0-24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res-browser-cli",
-  "version": "5.0.0-22",
+  "version": "5.0.0-24",
   "description": "Command-line interface to launch ts-res-browser with specified options",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,21 +22,21 @@
   },
   "dependencies": {
     "commander": "^11.0.0",
-    "@fgv/ts-res": "5.0.0-22",
-    "@fgv/ts-utils": "5.0.0-22",
-    "@fgv/ts-json": "5.0.0-22",
-    "@fgv/ts-json-base": "5.0.0-22",
-    "@fgv/ts-res-browser": "5.0.0-22"
+    "@fgv/ts-res": "5.0.0-24",
+    "@fgv/ts-utils": "5.0.0-24",
+    "@fgv/ts-json": "5.0.0-24",
+    "@fgv/ts-json-base": "5.0.0-24",
+    "@fgv/ts-res-browser": "5.0.0-24"
   },
   "devDependencies": {
-    "@rushstack/heft": "~0.74.2",
-    "@rushstack/heft-node-rig": "~2.9.3",
+    "@rushstack/heft": "0.74.3",
+    "@rushstack/heft-node-rig": "2.9.4",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.14.9",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "typescript": "^5.8.3",
-    "@fgv/ts-utils-jest": "5.0.0-22"
+    "typescript": "5.8.3",
+    "@fgv/ts-utils-jest": "5.0.0-24"
   },
   "scripts": {
     "build": "heft build --clean",

package/src/cli.ts

@@ -1,420 +0,0 @@
-/*
- * Copyright (c) 2025 Erik Fortune
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { Command } from 'commander';
-import { Result, succeed, fail } from '@fgv/ts-utils';
-import * as TsRes from '@fgv/ts-res';
-import { promises as fs } from 'fs';
-import * as path from 'path';
-
-import { IBrowseOptions, IBrowseCommandOptions } from './options';
-import { SimpleBrowserLauncher } from './simpleBrowserLauncher';
-
-/**
- * Main CLI class for ts-res-browser-cli
- */
-export class TsResBrowserCliApp {
-  private readonly _program: Command;
-  private readonly _launcher: SimpleBrowserLauncher;
-
-  public constructor() {
-    this._program = new Command();
-    this._launcher = new SimpleBrowserLauncher();
-    this._setupCommands();
-  }
-
-  /**
-   * Runs the CLI with the provided arguments
-   */
-  public async run(argv: string[]): Promise<void> {
-    await this._program.parseAsync(argv);
-  }
-
-  /**
-   * Sets up the CLI commands and options
-   */
-  private _setupCommands(): void {
-    this._program
-      .name('ts-res-browser-cli')
-      .description('Launch ts-res-browser with specified resources and configuration')
-      .version('1.0.0');
-
-    // Default behavior (no command) - launch with options or show help
-    this._program
-      .option('-i, --input <path>', 'Input file or directory path')
-      .option(
-        '--config <name|path>',
-        'Predefined configuration name or system configuration file path (JSON, ISystemConfiguration format)'
-      )
-      .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('--resource-types <types>', 'Resource type filter (comma-separated)')
-      .option('--max-distance <number>', 'Maximum distance for language matching', parseInt)
-      .option(
-        '--reduce-qualifiers',
-        'Remove perfectly matching qualifier conditions from filtered resources',
-        false
-      )
-      .option('-v, --verbose', 'Verbose output', false)
-      .option('-q, --quiet', 'Quiet output', false)
-      .option('-p, --port <number>', 'Port for local browser instance', parseInt)
-      .option('--url <url>', 'URL of remote browser instance')
-      .option('--no-open', 'Do not open browser automatically')
-      .option('--interactive', 'Launch in interactive mode with sample data', false)
-      .option('--dev', 'Automatically start development server locally', false)
-      .option(
-        '--serve',
-        'Start server (dev in monorepo, serve in published packages) and connect automatically',
-        false
-      )
-      .action(async (options) => {
-        // If no options provided, show help
-        if (!this._hasOptions(options)) {
-          this._program.help();
-        } else {
-          await this._handleBrowseCommand(options);
-        }
-      });
-
-    // Browse command (explicit)
-    this._program
-      .command('browse')
-      .description('Launch browser with specified resources and configuration')
-      .option('-i, --input <path>', 'Input file or directory path')
-      .option(
-        '--config <name|path>',
-        'Predefined configuration name or system configuration file path (JSON, ISystemConfiguration format)'
-      )
-      .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('--resource-types <types>', 'Resource type filter (comma-separated)')
-      .option('--max-distance <number>', 'Maximum distance for language matching', parseInt)
-      .option(
-        '--reduce-qualifiers',
-        'Remove perfectly matching qualifier conditions from filtered resources',
-        false
-      )
-      .option('-v, --verbose', 'Verbose output', false)
-      .option('-q, --quiet', 'Quiet output', false)
-      .option('-p, --port <number>', 'Port for local browser instance', parseInt)
-      .option('--url <url>', 'URL of remote browser instance')
-      .option('--no-open', 'Do not open browser automatically')
-      .option('--interactive', 'Launch in interactive mode with sample data', false)
-      .option('--dev', 'Automatically start development server locally', false)
-      .option(
-        '--serve',
-        'Start server (dev in monorepo, serve in published packages) and connect automatically',
-        false
-      )
-      .action(async (options) => {
-        await this._handleBrowseCommand(options);
-      });
-
-    // Config command (similar to ts-res-cli)
-    this._program
-      .command('config')
-      .description('Manage system configurations')
-      .option('-n, --name <name>', 'Predefined configuration name to print')
-      .option('-o, --output <path>', 'Output file path to save configuration')
-      .option('--validate <path>', 'Validate a configuration file')
-      .option('--normalize <path>', 'Normalize and validate a configuration file')
-      .option(
-        '--qualifier-defaults <token>',
-        'Qualifier default values token (pipe-separated, e.g., "language=en-US,en-CA|territory=US")'
-      )
-      .option('-l, --list', 'List all available predefined configurations')
-      .action(async (options) => {
-        await this._handleConfigCommand(options);
-      });
-  }
-
-  /**
-   * Check if any meaningful options were provided
-   */
-  private _hasOptions(options: IBrowseCommandOptions): boolean {
-    return !!(
-      options.input ||
-      options.config ||
-      options.context ||
-      options.contextFilter ||
-      options.qualifierDefaults ||
-      options.resourceTypes ||
-      options.maxDistance !== undefined ||
-      options.reduceQualifiers ||
-      options.interactive ||
-      options.url ||
-      options.dev ||
-      options.serve
-    );
-  }
-
-  /**
-   * Handles the browse command
-   */
-  private async _handleBrowseCommand(options: IBrowseCommandOptions): Promise<void> {
-    const browseOptions = this._parseBrowseOptions(options);
-    if (browseOptions.isFailure()) {
-      console.error(`Error: ${browseOptions.message}`);
-      process.exit(1);
-    }
-
-    const result = await this._launcher.launch(browseOptions.value);
-    if (result.isFailure()) {
-      console.error(`Error: ${result.message}`);
-      process.exit(1);
-    }
-  }
-
-  /**
-   * Handles the config command (similar to ts-res-cli)
-   */
-  private async _handleConfigCommand(options: any): Promise<void> {
-    try {
-      // List all predefined configurations
-      if (options.list) {
-        console.log('Available predefined configurations:');
-        console.log('- default');
-        console.log('- language-priority');
-        console.log('- territory-priority');
-        console.log('- extended-example');
-        return;
-      }
-
-      // Print a specific predefined configuration
-      if (options.name) {
-        const predefinedNames: TsRes.Config.PredefinedSystemConfiguration[] = [
-          'default',
-          'language-priority',
-          'territory-priority',
-          'extended-example'
-        ];
-
-        if (!predefinedNames.includes(options.name as TsRes.Config.PredefinedSystemConfiguration)) {
-          console.error(`Error: Predefined configuration '${options.name}' not found`);
-          console.error(
-            'Available configurations: default, language-priority, territory-priority, extended-example'
-          );
-          process.exit(1);
-        }
-
-        const configResult = TsRes.Config.getPredefinedDeclaration(
-          options.name as TsRes.Config.PredefinedSystemConfiguration
-        );
-        if (configResult.isFailure()) {
-          console.error(
-            `Error: Failed to load predefined configuration '${options.name}': ${configResult.message}`
-          );
-          process.exit(1);
-        }
-
-        let config = configResult.value;
-
-        // Apply qualifier defaults if provided
-        if (options.qualifierDefaults) {
-          const tempSystemConfigResult = TsRes.Config.SystemConfiguration.create(config);
-          if (tempSystemConfigResult.isFailure()) {
-            console.error(`Error: Failed to create system configuration: ${tempSystemConfigResult.message}`);
-            process.exit(1);
-          }
-
-          const tokens = new TsRes.Qualifiers.QualifierDefaultValueTokens(
-            tempSystemConfigResult.value.qualifiers
-          );
-          const defaultsResult = tokens.qualifierDefaultValuesTokenToDecl(options.qualifierDefaults);
-          if (defaultsResult.isFailure()) {
-            console.error(`Error: Failed to parse qualifier defaults: ${defaultsResult.message}`);
-            process.exit(1);
-          }
-
-          const updatedConfigResult = TsRes.Config.updateSystemConfigurationQualifierDefaultValues(
-            config,
-            defaultsResult.value
-          );
-          if (updatedConfigResult.isFailure()) {
-            console.error(`Error: Failed to apply qualifier defaults: ${updatedConfigResult.message}`);
-            process.exit(1);
-          }
-
-          config = updatedConfigResult.value;
-        }
-
-        const output = JSON.stringify(config, null, 2);
-
-        if (options.output) {
-          const outputPath = path.resolve(options.output);
-          const outputDir = path.dirname(outputPath);
-
-          await fs.mkdir(outputDir, { recursive: true });
-          await fs.writeFile(outputPath, output, 'utf-8');
-          console.log(`Configuration saved to: ${outputPath}`);
-        } else {
-          console.log(output);
-        }
-        return;
-      }
-
-      // Validate a configuration file
-      if (options.validate) {
-        const configPath = path.resolve(options.validate);
-        const configContent = await fs.readFile(configPath, 'utf-8');
-        const configData = JSON.parse(configContent);
-
-        const configResult = TsRes.Config.Convert.systemConfiguration.convert(configData);
-        if (configResult.isFailure()) {
-          console.error(`Validation failed: ${configResult.message}`);
-          process.exit(1);
-        }
-
-        console.log(`Configuration file '${configPath}' is valid`);
-        return;
-      }
-
-      // Normalize a configuration file
-      if (options.normalize) {
-        const configPath = path.resolve(options.normalize);
-        const configContent = await fs.readFile(configPath, 'utf-8');
-        const configData = JSON.parse(configContent);
-
-        const configResult = TsRes.Config.Convert.systemConfiguration.convert(configData);
-        if (configResult.isFailure()) {
-          console.error(`Normalization failed: ${configResult.message}`);
-          process.exit(1);
-        }
-
-        let normalizedConfig = configResult.value;
-
-        // Apply qualifier defaults if provided
-        if (options.qualifierDefaults) {
-          const tempSystemConfigResult = TsRes.Config.SystemConfiguration.create(normalizedConfig);
-          if (tempSystemConfigResult.isFailure()) {
-            console.error(`Error: Failed to create system configuration: ${tempSystemConfigResult.message}`);
-            process.exit(1);
-          }
-
-          const tokens = new TsRes.Qualifiers.QualifierDefaultValueTokens(
-            tempSystemConfigResult.value.qualifiers
-          );
-          const defaultsResult = tokens.qualifierDefaultValuesTokenToDecl(options.qualifierDefaults);
-          if (defaultsResult.isFailure()) {
-            console.error(`Error: Failed to parse qualifier defaults: ${defaultsResult.message}`);
-            process.exit(1);
-          }
-
-          const updatedConfigResult = TsRes.Config.updateSystemConfigurationQualifierDefaultValues(
-            normalizedConfig,
-            defaultsResult.value
-          );
-          if (updatedConfigResult.isFailure()) {
-            console.error(`Error: Failed to apply qualifier defaults: ${updatedConfigResult.message}`);
-            process.exit(1);
-          }
-
-          normalizedConfig = updatedConfigResult.value;
-        }
-
-        const output = JSON.stringify(normalizedConfig, null, 2);
-
-        if (options.output) {
-          const outputPath = path.resolve(options.output);
-          const outputDir = path.dirname(outputPath);
-
-          await fs.mkdir(outputDir, { recursive: true });
-          await fs.writeFile(outputPath, output, 'utf-8');
-          console.log(`Normalized configuration saved to: ${outputPath}`);
-        } else {
-          console.log(output);
-        }
-        return;
-      }
-
-      // If no specific action, print default configuration
-      const defaultResult = TsRes.Config.getPredefinedDeclaration('default');
-      if (defaultResult.isFailure()) {
-        console.error(`Error: Default configuration not available`);
-        process.exit(1);
-      }
-
-      console.log(JSON.stringify(defaultResult.value, null, 2));
-    } catch (error) {
-      console.error(`Error: ${error}`);
-      process.exit(1);
-    }
-  }
-
-  /**
-   * Parses and validates browse options
-   */
-  private _parseBrowseOptions(options: IBrowseCommandOptions): Result<IBrowseOptions> {
-    try {
-      // Convert JSON context to contextFilter if provided
-      let contextFilter = options.contextFilter;
-      if (options.context && !contextFilter) {
-        try {
-          const contextObj = JSON.parse(options.context);
-          const tokens: string[] = [];
-          for (const [key, value] of Object.entries(contextObj)) {
-            tokens.push(`${key}=${value}`);
-          }
-          contextFilter = tokens.join('|');
-        } catch (error) {
-          return fail(`Invalid context JSON: ${error}`);
-        }
-      }
-
-      const browseOptions: IBrowseOptions = {
-        input: options.input,
-        config: options.config,
-        contextFilter,
-        qualifierDefaults: options.qualifierDefaults,
-        resourceTypes: options.resourceTypes,
-        maxDistance: options.maxDistance,
-        reduceQualifiers: options.reduceQualifiers || false,
-        verbose: options.verbose || false,
-        quiet: options.quiet || false,
-        port: options.port,
-        url: options.url,
-        open: options.open,
-        interactive: options.interactive || false,
-        dev: options.dev || false,
-        serve: options.serve || false
-      };
-
-      return succeed(browseOptions);
-    } catch (error) {
-      return fail(`Failed to parse options: ${error}`);
-    }
-  }
-}

package/src/index.ts

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2025 Erik Fortune
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-// Export main components
-export * from './cli';
-export * from './options';
-export * from './simpleBrowserLauncher';

package/src/options.ts

@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2025 Erik Fortune
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * Options for launching the ts-res browser
- */
-export interface IBrowseOptions {
-  /**
-   * Input file or directory path
-   */
-  input?: string;
-
-  /**
-   * System configuration file path (JSON file in ISystemConfiguration format)
-   * or predefined configuration name
-   */
-  config?: string;
-
-  /**
-   * Context filter token (pipe-separated qualifier=value pairs, e.g., 'language=en-US|territory=US')
-   */
-  contextFilter?: string;
-
-  /**
-   * Qualifier default values token (pipe-separated qualifier=value pairs, e.g., 'language=en-US,en-CA|territory=US')
-   */
-  qualifierDefaults?: string;
-
-  /**
-   * Resource types filter (comma-separated, e.g., 'json,string')
-   */
-  resourceTypes?: string;
-
-  /**
-   * Maximum distance for language matching
-   */
-  maxDistance?: number;
-
-  /**
-   * Whether to reduce qualifiers when filtering by context
-   */
-  reduceQualifiers?: boolean;
-
-  /**
-   * Whether to run in verbose mode
-   */
-  verbose?: boolean;
-
-  /**
-   * Whether to run in quiet mode
-   */
-  quiet?: boolean;
-
-  /**
-   * Port to run the development server on (for launching locally)
-   */
-  port?: number;
-
-  /**
-   * Whether to open the browser automatically
-   */
-  open?: boolean;
-
-  /**
-   * Whether to launch in interactive mode (with sample data)
-   */
-  interactive?: boolean;
-
-  /**
-   * Browser URL to launch (for remote instances)
-   */
-  url?: string;
-
-  /**
-   * Whether to automatically start the development server
-   */
-  dev?: boolean;
-
-  /**
-   * Whether to start server (dev in monorepo, serve in published packages) and connect automatically
-   */
-  serve?: boolean;
-
-  /**
-   * Whether to use ZIP loading mode (internal flag)
-   */
-  loadZip?: boolean;
-
-  /**
-   * Path to ZIP file to load (internal flag)
-   */
-  zipPath?: string;
-
-  /**
-   * Name of ZIP file to load (internal flag)
-   */
-  zipFile?: string;
-}
-
-/**
- * Command-line options for the browse command
- */
-export interface IBrowseCommandOptions {
-  input?: string;
-  config?: string;
-  context?: string;
-  contextFilter?: string;
-  qualifierDefaults?: string;
-  resourceTypes?: string;
-  maxDistance?: number;
-  reduceQualifiers?: boolean;
-  verbose?: boolean;
-  quiet?: boolean;
-  port?: number;
-  open?: boolean;
-  interactive?: boolean;
-  url?: string;
-  dev?: boolean;
-  serve?: boolean;
-}

package/src/simpleBrowserLauncher.ts

@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2025 Erik Fortune
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { exec } from 'child_process';
-import * as path from 'path';
-import * as http from 'http';
-import { Result, succeed, fail } from '@fgv/ts-utils';
-import { IBrowseOptions } from './options';
-import { zipArchiver } from './zipArchiver';
-
-/**
- * Simplified browser launcher using direct dependency on ts-res-browser
- */
-export class SimpleBrowserLauncher {
-  /**
-   * Launches the browser with the specified options
-   */
-  public async launch(options: IBrowseOptions): Promise<Result<void>> {
-    try {
-      // Validate options before proceeding
-      if (options.interactive && !options.dev && !options.serve && !options.url) {
-        return fail(
-          'Interactive mode requires either --dev/--serve to start a local server or --url to specify a remote server.\n\n' +
-            'Examples:\n' +
-            '  ts-res-browser-cli --interactive --dev\n' +
-            '  ts-res-browser-cli --interactive --serve\n' +
-            '  ts-res-browser-cli --interactive --url https://example.com/ts-res-browser'
-        );
-      }
-
-      // Check if we need to create a ZIP archive for file-based inputs
-      let zipCreated = false;
-      let finalOptions = { ...options };
-
-      if (this._shouldCreateZip(options)) {
-        if (!options.quiet) {
-          console.log('Creating ZIP archive for file-based resources...');
-        }
-
-        const zipResult = await this._createZipArchive(options);
-        if (zipResult.isFailure()) {
-          return fail(`Failed to create ZIP archive: ${zipResult.message}`);
-        }
-
-        if (!options.quiet) {
-          console.log(`ZIP archive created: ${zipResult.value.zipPath}`);
-        }
-
-        // Modify options to use ZIP loading instead of file paths
-        const zipFileName = path.basename(zipResult.value.zipPath);
-        finalOptions = {
-          ...options,
-          input: undefined,
-          config: undefined,
-          // Add ZIP loading parameters
-          loadZip: true,
-          zipFile: zipFileName,
-          zipPath: zipResult.value.zipPath
-        };
-        zipCreated = true;
-      }
-
-      // Start server if requested
-      if ((finalOptions.dev || finalOptions.serve) && !finalOptions.url) {
-        if (!finalOptions.quiet) {
-          console.log('Starting TS-RES Browser server...');
-        }
-
-        const serverResult = await this._startServer(finalOptions);
-        if (serverResult.isFailure()) {
-          return serverResult;
-        }
-      }
-
-      // Build URL with parameters
-      const url = this._buildUrl(finalOptions);
-
-      if (!finalOptions.quiet) {
-        console.log('Opening TS-RES Browser...');
-        if (zipCreated) {
-          console.log('ZIP archive created - browser will load from Downloads folder');
-        } else {
-          if (finalOptions.input) {
-            console.log(`Resource file: ${finalOptions.input}`);
-          }
-          if (finalOptions.config) {
-            console.log(`Configuration: ${finalOptions.config}`);
-          }
-        }
-        if (finalOptions.contextFilter) {
-          console.log(`Context filter: ${finalOptions.contextFilter}`);
-        }
-        console.log(`URL: ${url}`);
-      }
-
-      // Open browser if requested (default to true)
-      const shouldOpen = finalOptions.open !== false;
-      if (shouldOpen) {
-        const openResult = await this._openBrowser(url, finalOptions.verbose || false);
-        if (openResult.isFailure()) {
-          return fail(`Could not open browser: ${openResult.message}`);
-        }
-
-        if (!finalOptions.quiet) {
-          console.log('Browser opened successfully');
-        }
-      } else {
-        console.log(`Browser URL: ${url}`);
-      }
-
-      return succeed(undefined);
-    } catch (error) {
-      return fail(`Failed to launch browser: ${error}`);
-    }
-  }
-
-  /**
-   * Starts the server using ts-res-browser CLI directly
-   */
-  private async _startServer(options: IBrowseOptions): Promise<Result<void>> {
-    try {
-      // Use ts-res-browser directly from node_modules
-      const browserPath = require.resolve('@fgv/ts-res-browser/cli.js');
-      const command = `node "${browserPath}" ${options.dev ? 'dev' : 'serve'}`;
-
-      if (options.verbose) {
-        console.log(`Running: ${command}`);
-      }
-
-      return new Promise((resolve) => {
-        const child = exec(command, (error) => {
-          if (error) {
-            resolve(fail(`Failed to start server: ${error.message}`));
-          } else {
-            resolve(succeed(undefined));
-          }
-        });
-
-        // Give server time to start, then assume success
-        setTimeout(() => {
-          if (options.verbose) {
-            console.log('Server startup initiated');
-          }
-          resolve(succeed(undefined));
-        }, 2000);
-      });
-    } catch (error) {
-      return fail(`Failed to start server: ${error}`);
-    }
-  }
-
-  /**
-   * Opens the browser to the specified URL
-   */
-  private async _openBrowser(url: string, verbose: boolean): Promise<Result<void>> {
-    return new Promise((resolve) => {
-      const command =
-        process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start ""' : 'xdg-open';
-
-      exec(`${command} "${url}"`, (error) => {
-        if (error) {
-          resolve(fail(`Failed to open browser: ${error.message}`));
-        } else {
-          if (verbose) {
-            console.log(`Opened browser to: ${url}`);
-          }
-          resolve(succeed(undefined));
-        }
-      });
-    });
-  }
-
-  /**
-   * Builds the URL with query parameters based on options
-   */
-  private _buildUrl(options: IBrowseOptions): string {
-    // Use provided URL or default based on server type
-    const defaultPort = options.dev ? 3000 : 8080;
-    const baseUrl = options.url || `http://localhost:${options.port || defaultPort}`;
-    const params = new URLSearchParams();
-
-    if (options.input) {
-      params.set('input', options.input);
-    }
-
-    if (options.config) {
-      params.set('config', options.config);
-    }
-
-    if (options.contextFilter) {
-      params.set('contextFilter', options.contextFilter);
-    }
-
-    if (options.qualifierDefaults) {
-      params.set('qualifierDefaults', options.qualifierDefaults);
-    }
-
-    if (options.resourceTypes) {
-      params.set('resourceTypes', options.resourceTypes);
-    }
-
-    if (options.maxDistance !== undefined) {
-      params.set('maxDistance', options.maxDistance.toString());
-    }
-
-    if (options.reduceQualifiers) {
-      params.set('reduceQualifiers', 'true');
-    }
-
-    if (options.interactive) {
-      params.set('interactive', 'true');
-    }
-
-    if (options.loadZip) {
-      params.set('loadZip', 'true');
-    }
-
-    if (options.zipFile) {
-      params.set('zipFile', options.zipFile);
-    }
-
-    if (options.zipPath) {
-      params.set('zipPath', options.zipPath);
-    }
-
-    const queryString = params.toString();
-    return queryString ? `${baseUrl}?${queryString}` : baseUrl;
-  }
-
-  /**
-   * Determines if a ZIP archive should be created based on the options
-   */
-  private _shouldCreateZip(options: IBrowseOptions): boolean {
-    // Create ZIP if input or config are file paths (not predefined names)
-    const hasFilePath = (path: string | undefined): boolean => {
-      if (!path) return false;
-      // Check if it's a file path (contains directory separators or file extensions)
-      return path.includes('/') || path.includes('\\') || (path.includes('.') && !path.startsWith('.'));
-    };
-
-    return hasFilePath(options.input) || hasFilePath(options.config);
-  }
-
-  /**
-   * Creates a ZIP archive containing the input and config files
-   */
-  private async _createZipArchive(
-    options: IBrowseOptions
-  ): Promise<Result<{ zipPath: string; manifest: any }>> {
-    try {
-      return await zipArchiver.createArchive({
-        input: options.input,
-        config: options.config
-      });
-    } catch (error) {
-      return fail(`Failed to create ZIP archive: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  }
-}

package/src/zipArchiver.ts

@@ -1,68 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as os from 'os';
-import { Result, succeed, fail } from '@fgv/ts-utils';
-import { ZipArchive } from '@fgv/ts-res';
-
-export interface ZipArchiveOptions {
-  input?: string;
-  config?: string;
-  outputDir?: string;
-}
-
-export interface ZipArchiveResult {
-  zipPath: string;
-  manifest: ZipArchive.IZipArchiveManifest;
-}
-
-export class ZipArchiver {
-  /**
-   * Create a ZIP archive containing the specified input and config files/directories
-   */
-  async createArchive(options: ZipArchiveOptions): Promise<Result<ZipArchiveResult>> {
-    try {
-      const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-      const outputDir = options.outputDir || path.join(os.homedir(), 'Downloads');
-      const zipFileName = `ts-res-bundle-${timestamp}.zip`;
-      const zipPath = path.join(outputDir, zipFileName);
-
-      // Ensure output directory exists
-      if (!fs.existsSync(outputDir)) {
-        fs.mkdirSync(outputDir, { recursive: true });
-      }
-
-      // 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
-      });
-
-      if (createResult.isFailure()) {
-        return fail(createResult.message);
-      }
-
-      const { zipBuffer, manifest } = createResult.value;
-
-      // Write the ZIP buffer to disk
-      fs.writeFileSync(zipPath, zipBuffer);
-
-      return succeed({
-        zipPath,
-        manifest
-      });
-    } catch (error) {
-      return fail(`Failed to create ZIP archive: ${error instanceof Error ? error.message : String(error)}`);
-    }
-  }
-
-  /**
-   * Get the default downloads directory path
-   */
-  getDefaultDownloadsDir(): string {
-    return path.join(os.homedir(), 'Downloads');
-  }
-}
-
-// Export singleton instance
-export const zipArchiver = new ZipArchiver();