portapack 0.3.1 → 0.3.3

package/jest.config.ts

@@ -36,9 +36,9 @@ const config: Config = {
       'ts-jest',
       {
         // useESM: false, // Explicitly false or remove this line entirely
-        tsconfig: './tsconfig.jest.json' // Ensure this tsconfig targets CommonJS
-      }
-    ]
+        tsconfig: './tsconfig.jest.json', // Ensure this tsconfig targets CommonJS
+      },
+    ],
   },
   /**
    * Treat `.ts` files as ESM modules.
@@ -54,7 +54,7 @@ const config: Config = {
     // Keep absolute path alias
     '^portapack(.*)$': '<rootDir>/src$1',
     // Mock path support
-    '^__mocks__/(.*)$': '<rootDir>/__mocks__/$1'
+    '^__mocks__/(.*)$': '<rootDir>/__mocks__/$1',
   },
 
   /**
@@ -65,7 +65,7 @@ const config: Config = {
     '!src/**/*.d.ts',
     '!src/**/*.test.ts',
     '!src/types.ts',
-    '!src/cli/cli-entry.ts'
+    '!src/cli/cli-entry.ts',
   ],
 
   /**
@@ -93,10 +93,7 @@ const config: Config = {
   /**
    * Type-ahead filters for watch mode
    */
-  watchPlugins: [
-    'jest-watch-typeahead/filename',
-    'jest-watch-typeahead/testname'
-  ],
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
 
   /**
    * Don't error if no tests found (for initial development)
@@ -106,9 +103,7 @@ const config: Config = {
   /**
    * Ignore specific paths in watch mode
    */
-  watchPathIgnorePatterns: [
-    path.join('<rootDir>', 'tests', '__fixtures__', 'output')
-  ],
+  watchPathIgnorePatterns: [path.join('<rootDir>', 'tests', '__fixtures__', 'output')],
 
   /**
    * Mock implementations
@@ -131,4 +126,4 @@ const config: Config = {
   errorOnDeprecated: true,
 };
 
-export default config;
+export default config;

package/nodemon.json

@@ -1,11 +1,6 @@
 {
-    "watch": ["src"],
-    "ext": "ts,tsx",
-    "ignore": [
-      "src/**/*.spec.ts",
-      "src/**/*.test.ts",
-      "dist",
-      "node_modules"
-    ],
-    "exec": "npm run docs:api"
-  }
+  "watch": ["src"],
+  "ext": "ts,tsx",
+  "ignore": ["src/**/*.spec.ts", "src/**/*.test.ts", "dist", "node_modules"],
+  "exec": "npm run docs:api"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portapack",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "📦 A tool to bundle and minify HTML and all its dependencies into a single portable file.",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,13 +45,10 @@
     "portable",
     "minify",
     "packer",
-    "assets",
     "cli",
     "offline",
-    "webapp",
     "static-site",
-    "bundle",
-    "recursive"
+    "bundle"
   ],
   "author": "Manic.agency",
   "license": "MIT",

package/src/cli/cli-entry.ts

@@ -19,10 +19,10 @@ if (require.main === module) {
       if (stderr) process.stderr.write(stderr);
       process.exit(Number(exitCode));
     })
-    .catch((err) => {
+    .catch(err => {
       console.error('💥 Unhandled CLI error:', err);
       process.exit(1);
     });
 }
 
-export { startCLI };
+export { startCLI };

package/src/cli/cli.ts

@@ -7,6 +7,7 @@
 
 import fs from 'fs';
 import path from 'path';
+
 // Use standard require for core modules in CJS context if needed
 // const path = require('path');
 // const fs = require('fs');
@@ -23,17 +24,16 @@ import type { CLIResult, BundleOptions, BundleMetadata, CLIOptions } from '../ty
  */
 function getPackageJson(): Record<string, any> {
   try {
-    // FIX: Use require.resolve which works in CommonJS to find the package path
-    // It resolves relative to the location of this file or the node_modules structure
     // Assumes 'portapack' is the package name defined in package.json
     // We need the package.json itself, so resolve 'portapack/package.json'
     // Use __dirname if available in CJS context, otherwise try relative from cwd as fallback
-    const searchPath = typeof __dirname !== 'undefined' ? path.join(__dirname, '..', '..') : process.cwd();
+    const searchPath =
+      typeof __dirname !== 'undefined' ? path.join(__dirname, '..', '..') : process.cwd();
     const pkgJsonPath = require.resolve('portapack/package.json', { paths: [searchPath] });
     return require(pkgJsonPath); // Use require directly to load JSON
   } catch (err) {
-     console.error("Warning: Could not dynamically load package.json for version.", err); // Log error for debugging
-     return { version: '0.0.0-unknown' };
+    console.error('Warning: Could not dynamically load package.json for version.', err); // Log error for debugging
+    return { version: '0.0.0-unknown' };
   }
 }
 
@@ -54,16 +54,21 @@ export async function runCli(argv: string[] = process.argv): Promise<CLIResult>
   const originalWarn = console.warn;
 
   const restoreConsole = () => {
-      console.log = originalLog;
-      console.error = originalErr;
-      console.warn = originalWarn;
+    console.log = originalLog;
+    console.error = originalErr;
+    console.warn = originalWarn;
   };
 
-  console.log = (...args) => { stdout += args.join(' ') + '\n'; };
-  console.error = (...args) => { stderr += args.join(' ') + '\n'; };
-  console.warn = (...args) => { stderr += args.join(' ') + '\n'; };
+  console.log = (...args) => {
+    stdout += args.join(' ') + '\n';
+  };
+  console.error = (...args) => {
+    stderr += args.join(' ') + '\n';
+  };
+  console.warn = (...args) => {
+    stderr += args.join(' ') + '\n';
+  };
 
-  // FIX: Use the correct type CLIOptions which includes 'input'
   let cliOptions: CLIOptions | undefined;
   try {
     // Get the fully parsed options object which includes 'input'
@@ -83,7 +88,9 @@ export async function runCli(argv: string[] = process.argv): Promise<CLIResult>
 
     // Use path.basename and handle potential extension removal carefully
     const inputBasename = path.basename(cliOptions.input);
-    const outputDefaultBase = inputBasename.includes('.') ? inputBasename.substring(0, inputBasename.lastIndexOf('.')) : inputBasename;
+    const outputDefaultBase = inputBasename.includes('.')
+      ? inputBasename.substring(0, inputBasename.lastIndexOf('.'))
+      : inputBasename;
     // Use the parsed output option or generate default
     const outputPath = cliOptions.output ?? `${outputDefaultBase || 'output'}.packed.html`;
 
@@ -105,7 +112,6 @@ export async function runCli(argv: string[] = process.argv): Promise<CLIResult>
       return { stdout, stderr, exitCode: 0 };
     }
 
-    // FIX: Call pack with input as the first argument, and the rest of the options as the second.
     // The cliOptions object should be compatible with PackOptions expected by pack.
     const result = await pack(cliOptions.input, cliOptions);
 
@@ -129,7 +135,6 @@ export async function runCli(argv: string[] = process.argv): Promise<CLIResult>
         console.warn(`  - ${err}`);
       }
     }
-
   } catch (err: any) {
     console.error(`\n💥 Error: ${err?.message || 'Unknown failure'}`);
     // Check verbose flag on the correct variable
@@ -147,4 +152,4 @@ export async function runCli(argv: string[] = process.argv): Promise<CLIResult>
 /**
  * Default exportable main runner for CLI invocation.
  */
-export const main = runCli;
+export const main = runCli;

package/src/cli/options.ts

@@ -9,7 +9,6 @@ import { Command, Option } from 'commander';
 // Ensure CLIOptions is imported correctly if defined in types.ts
 import { LogLevel, type LogLevelName, type CLIOptions } from '../types';
 
-
 // Define valid choices for the --log-level option
 const logLevels: LogLevelName[] = ['debug', 'info', 'warn', 'error', 'silent', 'none'];
 
@@ -21,10 +20,10 @@ const logLevels: LogLevelName[] = ['debug', 'info', 'warn', 'error', 'silent', '
  * @returns {boolean | number} True if flag only/invalid number, otherwise the parsed depth.
  */
 function parseRecursiveValue(val: string | undefined): boolean | number {
-    if (val === undefined) return true; // Flag only
-    const parsed = parseInt(val, 10);
-    // Invalid number (NaN) or negative depth treated as simple boolean 'true'
-    return isNaN(parsed) || parsed < 0 ? true : parsed;
+  if (val === undefined) return true; // Flag only
+  const parsed = parseInt(val, 10);
+  // Invalid number (NaN) or negative depth treated as simple boolean 'true'
+  return isNaN(parsed) || parsed < 0 ? true : parsed;
 }
 
 /**
@@ -38,114 +37,129 @@ function parseRecursiveValue(val: string | undefined): boolean | number {
  * @throws {Error} Throws errors if Commander encounters parsing/validation issues.
  */
 export function parseOptions(argv: string[] = process.argv): CLIOptions {
-    const program = new Command();
-
-    program
-        .name('portapack')
-        .version('0.0.0') // Version updated dynamically by cli.ts
-        .description('📦 Bundle HTML and its dependencies into a portable file')
-        .argument('[input]', 'Input HTML file or URL')
-        .option('-o, --output <file>', 'Output file path')
-        .option('-m, --minify', 'Enable all minification (HTML, CSS, JS)') // Presence enables default true below
-        .option('--no-minify', 'Disable all minification') // Global disable flag
-        .option('--no-minify-html', 'Disable HTML minification')
-        .option('--no-minify-css', 'Disable CSS minification')
-        .option('--no-minify-js', 'Disable JavaScript minification')
-        .option('-e, --embed-assets', 'Embed assets as data URIs') // Presence enables default true below
-        .option('--no-embed-assets', 'Keep asset links relative/absolute') // Disable flag
-        .option('-r, --recursive [depth]', 'Recursively crawl site (optional depth)', parseRecursiveValue)
-        .option('--max-depth <n>', 'Set max depth for recursive crawl (alias for -r <n>)', parseInt)
-        .option('-b, --base-url <url>', 'Base URL for resolving relative links')
-        .option('-d, --dry-run', 'Run without writing output file')
-        .option('-v, --verbose', 'Enable verbose (debug) logging')
-        .addOption(new Option('--log-level <level>', 'Set logging level')
-            .choices(logLevels));
-
-    // Prevent commander from exiting on error during tests (optional)
-    // program.exitOverride();
-
-    program.parse(argv);
-
-    // Raw options object from Commander's parsing
-    const opts = program.opts<CLIOptions>();
-    // Get the positional argument (input) if provided
-    const inputArg = program.args.length > 0 ? program.args[0] : undefined;
-
-    // --- Determine Effective LogLevel ---
-    let finalLogLevel: LogLevel;
-    const cliLogLevel = opts.logLevel as unknown as LogLevelName | undefined; // Commander stores choice string
-    if (cliLogLevel) {
-        // Map string choice to LogLevel enum value
-        switch (cliLogLevel) {
-            case 'debug': finalLogLevel = LogLevel.DEBUG; break;
-            case 'info': finalLogLevel = LogLevel.INFO; break;
-            case 'warn': finalLogLevel = LogLevel.WARN; break;
-            case 'error': finalLogLevel = LogLevel.ERROR; break;
-            case 'silent': case 'none': finalLogLevel = LogLevel.NONE; break;
-            default: finalLogLevel = LogLevel.INFO; // Fallback, though choices() should prevent this
-        }
-    } else if (opts.verbose) {
-        // --verbose is shorthand for debug level if --log-level not set
+  const program = new Command();
+
+  program
+    .name('portapack')
+    .version('0.0.0') // Version updated dynamically by cli.ts
+    .description('📦 Bundle HTML and its dependencies into a portable file')
+    .argument('[input]', 'Input HTML file or URL')
+    .option('-o, --output <file>', 'Output file path')
+    .option('-m, --minify', 'Enable all minification (HTML, CSS, JS)') // Presence enables default true below
+    .option('--no-minify', 'Disable all minification') // Global disable flag
+    .option('--no-minify-html', 'Disable HTML minification')
+    .option('--no-minify-css', 'Disable CSS minification')
+    .option('--no-minify-js', 'Disable JavaScript minification')
+    .option('-e, --embed-assets', 'Embed assets as data URIs') // Presence enables default true below
+    .option('--no-embed-assets', 'Keep asset links relative/absolute') // Disable flag
+    .option(
+      '-r, --recursive [depth]',
+      'Recursively crawl site (optional depth)',
+      parseRecursiveValue
+    )
+    .option('--max-depth <n>', 'Set max depth for recursive crawl (alias for -r <n>)', parseInt)
+    .option('-b, --base-url <url>', 'Base URL for resolving relative links')
+    .option('-d, --dry-run', 'Run without writing output file')
+    .option('-v, --verbose', 'Enable verbose (debug) logging')
+    .addOption(new Option('--log-level <level>', 'Set logging level').choices(logLevels));
+
+  // Prevent commander from exiting on error during tests (optional)
+  // program.exitOverride();
+
+  program.parse(argv);
+
+  // Raw options object from Commander's parsing
+  const opts = program.opts<CLIOptions>();
+  // Get the positional argument (input) if provided
+  const inputArg = program.args.length > 0 ? program.args[0] : undefined;
+
+  // --- Determine Effective LogLevel ---
+  let finalLogLevel: LogLevel;
+  const cliLogLevel = opts.logLevel as unknown as LogLevelName | undefined; // Commander stores choice string
+  if (cliLogLevel) {
+    // Map string choice to LogLevel enum value
+    switch (cliLogLevel) {
+      case 'debug':
         finalLogLevel = LogLevel.DEBUG;
-    } else {
-        // Default log level
+        break;
+      case 'info':
         finalLogLevel = LogLevel.INFO;
+        break;
+      case 'warn':
+        finalLogLevel = LogLevel.WARN;
+        break;
+      case 'error':
+        finalLogLevel = LogLevel.ERROR;
+        break;
+      case 'silent':
+      case 'none':
+        finalLogLevel = LogLevel.NONE;
+        break;
+      default:
+        finalLogLevel = LogLevel.INFO; // Fallback, though choices() should prevent this
     }
-
-    // --- Handle Embedding ---
-    // Default is true. --no-embed-assets flag sets opts.embedAssets to false.
-    // Check argv directly to ensure --no- wins regardless of order.
-    let embedAssets = true; // Start with default
-    if (argv.includes('--no-embed-assets')) {
-         embedAssets = false; // Explicit negation flag takes precedence
-    } else if (opts.embedAssets === true) {
-         embedAssets = true; // Positive flag enables it if negation wasn't present
-    }
-    // If neither flag is present, it remains the default 'true'.
-
-    // --- Handle Minification ---
-    // Default to true unless specifically disabled by --no-minify-<type>
-    let minifyHtml = opts.minifyHtml !== false;
-    let minifyCss = opts.minifyCss !== false;
-    let minifyJs = opts.minifyJs !== false;
-
-    // Global --no-minify flag overrides all individual settings
-    // Commander sets opts.minify to false if --no-minify is used.
-    if (opts.minify === false) {
-        minifyHtml = false;
-        minifyCss = false;
-        minifyJs = false;
-    }
-    // Note: Positive flags (-m or individual --minify-<type>) don't need extra handling
-    // as the initial state is true, and negations correctly turn them off.
-
-    // --- Handle Recursive/MaxDepth ---
-    // Start with the value parsed from -r/--recursive
-    let recursiveOpt = opts.recursive;
-    // If --max-depth was provided and is a valid non-negative number, it overrides -r
-    if (opts.maxDepth !== undefined && !isNaN(opts.maxDepth) && opts.maxDepth >= 0) {
-        recursiveOpt = opts.maxDepth;
-    }
-
-    // Return the final structured options object
-    return {
-        // Pass through directly parsed options
-        baseUrl: opts.baseUrl,
-        dryRun: opts.dryRun ?? false, // Ensure boolean, default false
-        output: opts.output,
-        verbose: opts.verbose ?? false, // Ensure boolean, default false
-
-        // Set calculated/processed options
-        input: inputArg,
-        logLevel: finalLogLevel,
-        recursive: recursiveOpt, // Final calculated value for recursion
-        embedAssets: embedAssets, // Final calculated value
-        minifyHtml: minifyHtml,   // Final calculated value
-        minifyCss: minifyCss,     // Final calculated value
-        minifyJs: minifyJs,       // Final calculated value
-
-        // Exclude intermediate commander properties like:
-        // minify, logLevel (string version), maxDepth,
-        // minifyHtml, minifyCss, minifyJs (commander's raw boolean flags)
-    };
-}
+  } else if (opts.verbose) {
+    // --verbose is shorthand for debug level if --log-level not set
+    finalLogLevel = LogLevel.DEBUG;
+  } else {
+    // Default log level
+    finalLogLevel = LogLevel.INFO;
+  }
+
+  // --- Handle Embedding ---
+  // Default is true. --no-embed-assets flag sets opts.embedAssets to false.
+  // Check argv directly to ensure --no- wins regardless of order.
+  let embedAssets = true; // Start with default
+  if (argv.includes('--no-embed-assets')) {
+    embedAssets = false; // Explicit negation flag takes precedence
+  } else if (opts.embedAssets === true) {
+    embedAssets = true; // Positive flag enables it if negation wasn't present
+  }
+  // If neither flag is present, it remains the default 'true'.
+
+  // --- Handle Minification ---
+  // Default to true unless specifically disabled by --no-minify-<type>
+  let minifyHtml = opts.minifyHtml !== false;
+  let minifyCss = opts.minifyCss !== false;
+  let minifyJs = opts.minifyJs !== false;
+
+  // Global --no-minify flag overrides all individual settings
+  // Commander sets opts.minify to false if --no-minify is used.
+  if (opts.minify === false) {
+    minifyHtml = false;
+    minifyCss = false;
+    minifyJs = false;
+  }
+  // Note: Positive flags (-m or individual --minify-<type>) don't need extra handling
+  // as the initial state is true, and negations correctly turn them off.
+
+  // --- Handle Recursive/MaxDepth ---
+  // Start with the value parsed from -r/--recursive
+  let recursiveOpt = opts.recursive;
+  // If --max-depth was provided and is a valid non-negative number, it overrides -r
+  if (opts.maxDepth !== undefined && !isNaN(opts.maxDepth) && opts.maxDepth >= 0) {
+    recursiveOpt = opts.maxDepth;
+  }
+
+  // Return the final structured options object
+  return {
+    // Pass through directly parsed options
+    baseUrl: opts.baseUrl,
+    dryRun: opts.dryRun ?? false, // Ensure boolean, default false
+    output: opts.output,
+    verbose: opts.verbose ?? false, // Ensure boolean, default false
+
+    // Set calculated/processed options
+    input: inputArg,
+    logLevel: finalLogLevel,
+    recursive: recursiveOpt, // Final calculated value for recursion
+    embedAssets: embedAssets, // Final calculated value
+    minifyHtml: minifyHtml, // Final calculated value
+    minifyCss: minifyCss, // Final calculated value
+    minifyJs: minifyJs, // Final calculated value
+
+    // Exclude intermediate commander properties like:
+    // minify, logLevel (string version), maxDepth,
+    // minifyHtml, minifyCss, minifyJs (commander's raw boolean flags)
+  };
+}