zero-query 1.1.1 → 1.2.0

package/tests/cli.test.js

@@ -1,1103 +1,1136 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-
-// ---------------------------------------------------------------------------
-// CLI bundle - stripModuleSyntax
-// ---------------------------------------------------------------------------
-
-describe('CLI - stripModuleSyntax', () => {
-  let stripModuleSyntax;
-
-  beforeEach(async () => {
-    vi.resetModules();
-    const mod = await import('../cli/commands/bundle.js');
-    stripModuleSyntax = mod.stripModuleSyntax;
-  });
-
-  // -- Import stripping ---------------------------------------------------
-
-  it('strips named import from module', () => {
-    const result = stripModuleSyntax("import { foo } from './mod.js';\nconst x = 1;");
-    expect(result.code.trim()).toBe('const x = 1;');
-  });
-
-  it('strips default import from module', () => {
-    const result = stripModuleSyntax("import foo from './mod.js';\nconst x = 1;");
-    expect(result.code.trim()).toBe('const x = 1;');
-  });
-
-  it('strips side-effect import', () => {
-    const result = stripModuleSyntax("import './mod.js';\nconst x = 1;");
-    expect(result.code.trim()).toBe('const x = 1;');
-  });
-
-  it('strips multi-line import', () => {
-    const input = "import {\n  a,\n  b,\n  c\n} from './mod.js';\nconst x = 1;";
-    const result = stripModuleSyntax(input);
-    expect(result.code.trim()).toBe('const x = 1;');
-  });
-
-  // -- export default -----------------------------------------------------
-
-  it('strips export default keyword', () => {
-    const result = stripModuleSyntax('export default function foo() {}');
-    expect(result.code.trim()).toBe('function foo() {}');
-  });
-
-  // -- export const/let/var → var -----------------------------------------
-
-  it('converts export const to var', () => {
-    const result = stripModuleSyntax('export const x = 1;');
-    expect(result.code.trim()).toBe('var x = 1;');
-  });
-
-  it('converts export let to var', () => {
-    const result = stripModuleSyntax('export let y = 2;');
-    expect(result.code.trim()).toBe('var y = 2;');
-  });
-
-  it('converts export var (keeps var)', () => {
-    const result = stripModuleSyntax('export var z = 3;');
-    expect(result.code.trim()).toBe('var z = 3;');
-  });
-
-  // -- export function → var assignment -----------------------------------
-
-  it('converts export function to var assignment', () => {
-    const result = stripModuleSyntax('export function greet(name) { return name; }');
-    expect(result.code.trim()).toBe('var greet = function greet(name) { return name; }');
-  });
-
-  it('converts export async function to var assignment', () => {
-    const result = stripModuleSyntax('export async function fetchData() {}');
-    expect(result.code.trim()).toBe('var fetchData = async function fetchData() {}');
-  });
-
-  // -- export class → var assignment --------------------------------------
-
-  it('converts export class to var assignment', () => {
-    const result = stripModuleSyntax('export class MyComponent {}');
-    expect(result.code.trim()).toBe('var MyComponent = class MyComponent {}');
-  });
-
-  // -- bare export block: export { a, b } ---------------------------------
-
-  it('converts bare exported function declarations to var', () => {
-    const input = 'function buildIndex() {}\nexport { buildIndex };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var buildIndex = function buildIndex()');
-    expect(result.code).not.toContain('export');
-    expect(result.bareExportNames).toEqual([{ local: 'buildIndex', exported: 'buildIndex' }]);
-  });
-
-  it('converts bare exported async function to var', () => {
-    const input = 'async function load() {}\nexport { load };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var load = async function load()');
-  });
-
-  it('converts bare exported const/let declarations to var', () => {
-    const input = 'const MAX = 10;\nlet count = 0;\nexport { MAX, count };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var MAX');
-    expect(result.code).toContain('var count');
-    expect(result.code).not.toContain('const MAX');
-    expect(result.code).not.toContain('let count');
-  });
-
-  it('handles multi-line bare export block', () => {
-    const input = 'function a() {}\nfunction b() {}\nexport {\n  a,\n  b\n};';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var a = function a()');
-    expect(result.code).toContain('var b = function b()');
-    expect(result.bareExportNames).toHaveLength(2);
-  });
-
-  // -- export { local as exported } aliasing ------------------------------
-
-  it('creates alias for export { local as exported }', () => {
-    const input = 'function foo() {}\nexport { foo as bar };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var foo = function foo()');
-    expect(result.code).toContain('var bar = foo;');
-    expect(result.bareExportNames).toEqual([{ local: 'foo', exported: 'bar' }]);
-  });
-
-  it('creates multiple aliases when needed', () => {
-    const input = 'function a() {}\nfunction b() {}\nexport { a as x, b as y };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var x = a;');
-    expect(result.code).toContain('var y = b;');
-  });
-
-  it('does not create alias when local equals exported', () => {
-    const input = 'function foo() {}\nexport { foo };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).not.toContain('var foo = foo;');
-  });
-
-  it('handles mix of aliased and non-aliased exports', () => {
-    const input = 'function a() {}\nfunction b() {}\nexport { a, b as c };';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var a = function a()');
-    expect(result.code).toContain('var b = function b()');
-    expect(result.code).not.toContain('var a = a;');
-    expect(result.code).toContain('var c = b;');
-  });
-
-  // -- Template literal preservation --------------------------------------
-
-  it('preserves export keyword inside template literal', () => {
-    const input = "const example = `export const x = 1;`;\nexport const y = 2;";
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('`export const x = 1;`');
-    expect(result.code).toContain('var y = 2;');
-  });
-
-  it('preserves export class inside template literal', () => {
-    const input = "const code = `export class Counter {}`;\nexport class Real {}";
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('`export class Counter {}`');
-    expect(result.code).toContain('var Real = class Real');
-  });
-
-  it('preserves nested template literal content', () => {
-    const input = "const x = `outer ${`inner export const a = 1;`} end`;\nexport const b = 2;";
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('inner export const a = 1;');
-    expect(result.code).toContain('var b = 2;');
-  });
-
-  it('handles deeply nested template literals', () => {
-    const input = "const x = `a ${y ? `b ${`c`}` : ''} d`;\nexport const z = 1;";
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('var z = 1;');
-    // Nested templates should be preserved without corruption
-    expect(result.code).toContain('`a ${');
-  });
-
-  // -- Edge cases ---------------------------------------------------------
-
-  it('returns empty bareExportNames when no bare exports', () => {
-    const result = stripModuleSyntax('export const x = 1;');
-    expect(result.bareExportNames).toEqual([]);
-  });
-
-  it('handles code with no imports or exports', () => {
-    const input = 'const x = 1;\nfunction foo() {}';
-    const result = stripModuleSyntax(input);
-    expect(result.code.trim()).toBe(input);
-    expect(result.bareExportNames).toEqual([]);
-  });
-
-  it('preserves indentation', () => {
-    const result = stripModuleSyntax('  export const x = 1;');
-    expect(result.code).toContain('  var x = 1;');
-  });
-
-  it('handles export inside string (not template)', () => {
-    const input = 'const s = "export const x = 1;";\nexport const y = 2;';
-    const result = stripModuleSyntax(input);
-    expect(result.code).toContain('"export const x = 1;"');
-    expect(result.code).toContain('var y = 2;');
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// CLI - minify ASI preservation
-// ---------------------------------------------------------------------------
-
-describe('CLI - minify ASI preservation', () => {
-  let minify;
-
-  beforeEach(async () => {
-    vi.resetModules();
-    const mod = await import('../cli/utils.js');
-    minify = mod.minify;
-  });
-
-  it('preserves newline between } and var', () => {
-    const input = 'var x = function() {}\nvar y = 1;';
-    const result = minify(input, '');
-    expect(result).toContain('}\nvar');
-    expect(result).not.toContain('}var');
-  });
-
-  it('preserves newline between } and identifier', () => {
-    const input = 'function a() {}\nfunction b() {}';
-    const result = minify(input, '');
-    expect(result).toContain('}\nfunction');
-    expect(result).not.toContain('}function');
-  });
-
-  it('preserves newline between } and const', () => {
-    const input = 'if (true) {}\nconst x = 1;';
-    const result = minify(input, '');
-    expect(result).toContain('}\nconst');
-  });
-
-  it('preserves newline between } and let', () => {
-    const input = 'if (true) {}\nlet x = 1;';
-    const result = minify(input, '');
-    expect(result).toContain('}\nlet');
-  });
-
-  it('does not add newline where none existed', () => {
-    const input = 'if(x){a()} else{b()}';
-    const result = minify(input, '');
-    // } followed by else on same line — no newline needed
-    expect(result).not.toContain('}\n');
-  });
-
-  it('handles }\\n followed by underscore-prefixed identifier', () => {
-    const input = 'var x = function() {}\n_init();';
-    const result = minify(input, '');
-    expect(result).toContain('}\n_init');
-  });
-
-  it('handles }\\n followed by $-prefixed identifier', () => {
-    const input = 'var x = function() {}\n$el.show();';
-    const result = minify(input, '');
-    expect(result).toContain('}\n$el');
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// CLI utils - stripComments
-// ---------------------------------------------------------------------------
-
-describe('CLI - stripComments', () => {
-  let stripComments;
-
-  beforeEach(async () => {
-    // Dynamic import to handle CommonJS module
-    const mod = await import('../cli/utils.js');
-    stripComments = mod.stripComments || mod.default?.stripComments;
-  });
-
-  it('strips single-line comments', () => {
-    expect(stripComments('let x = 1; // comment\nlet y = 2;')).toBe('let x = 1; \nlet y = 2;');
-  });
-
-  it('strips block comments', () => {
-    expect(stripComments('let x = /* inline comment */ 1;')).toBe('let x =  1;');
-  });
-
-  it('strips multi-line block comments', () => {
-    const input = 'a;\n/* line1\n   line2\n*/\nb;';
-    const result = stripComments(input);
-    expect(result).toBe('a;\n\nb;');
-  });
-
-  it('preserves single-quoted strings containing //', () => {
-    expect(stripComments("let x = 'http://example.com';")).toBe("let x = 'http://example.com';");
-  });
-
-  it('preserves double-quoted strings containing //', () => {
-    expect(stripComments('let x = "http://example.com";')).toBe('let x = "http://example.com";');
-  });
-
-  it('preserves template literals containing //', () => {
-    expect(stripComments('let x = `http://example.com`;')).toBe('let x = `http://example.com`;');
-  });
-
-  it('preserves template literals with ${} containing //', () => {
-    const input = 'let x = `${a}//not-a-comment`;';
-    const result = stripComments(input);
-    expect(result).toContain('//not-a-comment');
-  });
-
-  it('strips comment after string', () => {
-    expect(stripComments('let x = "hello"; // comment')).toBe('let x = "hello"; ');
-  });
-
-  it('handles escaped quotes in strings', () => {
-    expect(stripComments("let x = 'it\\'s a test'; // comment")).toBe("let x = 'it\\'s a test'; ");
-  });
-
-  it('preserves regex containing //', () => {
-    const input = 'let re = /http:\\/\\//; // comment';
-    const result = stripComments(input);
-    expect(result).toContain('/http:\\/\\//');
-    expect(result).not.toContain('// comment');
-  });
-
-  it('handles empty string', () => {
-    expect(stripComments('')).toBe('');
-  });
-
-  it('handles string with no comments', () => {
-    expect(stripComments('let x = 1;')).toBe('let x = 1;');
-  });
-
-  it('handles consecutive comments', () => {
-    const input = '// comment1\n// comment2\ncode;';
-    const result = stripComments(input);
-    expect(result).toBe('\n\ncode;');
-  });
-
-  it('handles block comment at start of file', () => {
-    expect(stripComments('/* header */\ncode;')).toBe('\ncode;');
-  });
-
-  it('handles nested template literal in ${} block', () => {
-    const input = 'let x = `outer ${`inner`} end`;';
-    const result = stripComments(input);
-    expect(result).toBe(input);
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// CLI utils - minify
-// ---------------------------------------------------------------------------
-
-describe('CLI - minify', () => {
-  let minify;
-
-  beforeEach(async () => {
-    const mod = await import('../cli/utils.js');
-    minify = mod.minify || mod.default?.minify;
-  });
-
-  it('collapses whitespace', () => {
-    const result = minify('let   x   =   1;', '/* banner */');
-    expect(result).toContain('let x=1;');
-  });
-
-  it('preserves banner', () => {
-    const result = minify('let x = 1;', '/* v1.0 */');
-    expect(result.startsWith('/* v1.0 */')).toBe(true);
-  });
-
-  it('strips comments during minification', () => {
-    const result = minify('let x = 1; // comment\nlet y = 2;', '');
-    expect(result).not.toContain('// comment');
-  });
-
-  it('preserves string content', () => {
-    const result = minify('let x = "hello   world";', '');
-    expect(result).toContain('"hello   world"');
-  });
-
-  it('preserves template literal content', () => {
-    const result = minify('let x = `hello   world`;', '');
-    expect(result).toContain('`hello   world`');
-  });
-
-  it('does not merge ++ into + +', () => {
-    const result = minify('a + +b', '');
-    expect(result).toContain('+ +');
-  });
-
-  it('does not merge -- into - -', () => {
-    const result = minify('a - -b', '');
-    expect(result).toContain('- -');
-  });
-
-  it('preserves space between keywords and identifiers', () => {
-    const result = minify('return value;', '');
-    expect(result).toContain('return value');
-  });
-
-  it('removes block comments', () => {
-    const result = minify('a /* comment */ = 1;', '');
-    expect(result).not.toContain('comment');
-  });
-
-  it('handles empty input', () => {
-    const result = minify('', '');
-    expect(result).toBe('\n');
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// CLI utils - sizeKB
-// ---------------------------------------------------------------------------
-
-describe('CLI - sizeKB', () => {
-  let sizeKB;
-
-  beforeEach(async () => {
-    const mod = await import('../cli/utils.js');
-    sizeKB = mod.sizeKB || mod.default?.sizeKB;
-  });
-
-  it('formats 1024 bytes as 1.0', () => {
-    expect(sizeKB({ length: 1024 })).toBe('1.0');
-  });
-
-  it('formats 512 bytes as 0.5', () => {
-    expect(sizeKB({ length: 512 })).toBe('0.5');
-  });
-
-  it('formats 0 bytes as 0.0', () => {
-    expect(sizeKB({ length: 0 })).toBe('0.0');
-  });
-
-  it('formats 2560 bytes as 2.5', () => {
-    expect(sizeKB({ length: 2560 })).toBe('2.5');
-  });
-
-  it('formats large size correctly', () => {
-    expect(sizeKB({ length: 102400 })).toBe('100.0');
-  });
-});
-
-
-// ---------------------------------------------------------------------------
-// CLI args - flag and option
-// ---------------------------------------------------------------------------
-
-describe('CLI - args module', () => {
-  let originalArgv;
-
-  beforeEach(() => {
-    originalArgv = [...process.argv];
-  });
-
-  afterEach(() => {
-    process.argv = originalArgv;
-    // Clear the require cache so the module re-reads argv
-    vi.resetModules();
-  });
-
-  it('flag returns true when --verbose is present', async () => {
-    process.argv = ['node', 'script', '--verbose'];
-    const mod = await import('../cli/args.js');
-    const { flag } = mod;
-    expect(flag('verbose')).toBe(true);
-  });
-
-  it('flag returns false when flag is absent', async () => {
-    process.argv = ['node', 'script'];
-    const mod = await import('../cli/args.js');
-    const { flag } = mod;
-    expect(flag('verbose')).toBe(false);
-  });
-
-  it('flag detects short flag -v', async () => {
-    process.argv = ['node', 'script', '-v'];
-    const mod = await import('../cli/args.js');
-    const { flag } = mod;
-    expect(flag('verbose', 'v')).toBe(true);
-  });
-
-  it('option reads value after --port', async () => {
-    process.argv = ['node', 'script', '--port', '8080'];
-    const mod = await import('../cli/args.js');
-    const { option } = mod;
-    expect(option('port')).toBe('8080');
-  });
-
-  it('option reads value after short -p', async () => {
-    process.argv = ['node', 'script', '-p', '3000'];
-    const mod = await import('../cli/args.js');
-    const { option } = mod;
-    expect(option('port', 'p')).toBe('3000');
-  });
-
-  it('option returns fallback when missing', async () => {
-    process.argv = ['node', 'script'];
-    const mod = await import('../cli/args.js');
-    const { option } = mod;
-    expect(option('port', 'p', '3100')).toBe('3100');
-  });
-
-  it('option returns fallback when flag has no value', async () => {
-    process.argv = ['node', 'script', '--port'];
-    const mod = await import('../cli/args.js');
-    const { option } = mod;
-    expect(option('port', 'p', '3100')).toBe('3100');
-  });
-});
-
-
-// ===========================================================================
-// showHelp
-// ===========================================================================
-
-describe('CLI - showHelp', () => {
-  it('outputs help text to console', async () => {
-    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    const showHelp = (await import('../cli/help.js')).default;
-    showHelp();
-    expect(spy).toHaveBeenCalled();
-    const text = spy.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(text).toContain('create');
-    expect(text).toContain('dev');
-    expect(text).toContain('bundle');
-    expect(text).toContain('build');
-    spy.mockRestore();
-  });
-
-  it('help text mentions port flag', async () => {
-    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    const showHelp = (await import('../cli/help.js')).default;
-    showHelp();
-    const text = spy.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(text).toContain('--port');
-    spy.mockRestore();
-  });
-});
-
-
-// ===========================================================================
-// stripComments - additional edge cases
-// ===========================================================================
-
-describe('CLI - stripComments extra', () => {
-  let stripComments;
-  beforeEach(async () => {
-    const mod = await import('../cli/utils.js');
-    stripComments = mod.stripComments;
-  });
-
-  it('handles consecutive single-line comments', () => {
-    const input = '// one\n// two\nconst x = 1;';
-    const result = stripComments(input);
-    expect(result).not.toContain('one');
-    expect(result).not.toContain('two');
-    expect(result).toContain('const x = 1');
-  });
-
-  it('preserves code after block comment', () => {
-    const input = 'a /* comment */ + b';
-    const result = stripComments(input);
-    expect(result).toContain('a');
-    expect(result).toContain('+ b');
-    expect(result).not.toContain('comment');
-  });
-
-  it('handles multiline block comment', () => {
-    const input = '/*\n line1\n line2\n*/\ncode();';
-    const result = stripComments(input);
-    expect(result).toContain('code()');
-    expect(result).not.toContain('line1');
-  });
-
-  it('does not strip // inside template expression', () => {
-    const input = '`${a // b}`';
-    const result = stripComments(input);
-    // The template should be preserved as-is
-    expect(result).toContain('`');
-  });
-
-  it('handles code with no comments', () => {
-    const input = 'const x = 1;\nconst y = 2;';
-    expect(stripComments(input)).toBe(input);
-  });
-});
-
-
-// ===========================================================================
-// minify - additional edge cases
-// ===========================================================================
-
-describe('CLI - minify extra', () => {
-  let minify;
-  beforeEach(async () => {
-    const mod = await import('../cli/utils.js');
-    minify = mod.minify;
-  });
-
-  it('preserves string content with spaces', () => {
-    const result = minify('const msg = "hello   world";', '');
-    expect(result).toContain('"hello   world"');
-  });
-
-  it('empty input returns banner only', () => {
-    const result = minify('', '/* banner */');
-    expect(result.trim()).toBe('/* banner */');
-  });
-
-  it('collapses multiple newlines', () => {
-    const result = minify('a\n\n\n\nb', '');
-    // Should not have multiple consecutive newlines in output
-    expect(result).not.toMatch(/\n\n\n/);
-  });
-
-  it('handles template literals with spaces', () => {
-    const result = minify('const x = `hello   world`;', '');
-    expect(result).toContain('`hello   world`');
-  });
-});
-
-
-// ===========================================================================
-// sizeKB - edge cases
-// ===========================================================================
-
-describe('CLI - sizeKB extra', () => {
-  let sizeKB;
-  beforeEach(async () => {
-    const mod = await import('../cli/utils.js');
-    sizeKB = mod.sizeKB;
-  });
-
-  it('zero-length buffer', () => {
-    expect(sizeKB({ length: 0 })).toBe('0.0');
-  });
-
-  it('exactly 1KB', () => {
-    expect(sizeKB({ length: 1024 })).toBe('1.0');
-  });
-
-  it('small buffer', () => {
-    expect(sizeKB({ length: 100 })).toBe('0.1');
-  });
-});
-
-
-// ===========================================================================
-// copyDirSync
-// ===========================================================================
-
-describe('CLI - copyDirSync', () => {
-  let copyDirSync;
-  const fs = require('fs');
-  const path = require('path');
-  const os = require('os');
-
-  beforeEach(async () => {
-    const mod = await import('../cli/utils.js');
-    copyDirSync = mod.copyDirSync;
-  });
-
-  it('copies directory recursively', () => {
-    const src = path.join(os.tmpdir(), 'zq-test-src-' + Date.now());
-    const dest = path.join(os.tmpdir(), 'zq-test-dest-' + Date.now());
-
-    // Create source structure
-    fs.mkdirSync(path.join(src, 'sub'), { recursive: true });
-    fs.writeFileSync(path.join(src, 'a.txt'), 'hello');
-    fs.writeFileSync(path.join(src, 'sub', 'b.txt'), 'world');
-
-    copyDirSync(src, dest);
-
-    expect(fs.existsSync(path.join(dest, 'a.txt'))).toBe(true);
-    expect(fs.readFileSync(path.join(dest, 'a.txt'), 'utf8')).toBe('hello');
-    expect(fs.existsSync(path.join(dest, 'sub', 'b.txt'))).toBe(true);
-    expect(fs.readFileSync(path.join(dest, 'sub', 'b.txt'), 'utf8')).toBe('world');
-
-    // Cleanup
-    fs.rmSync(src, { recursive: true, force: true });
-    fs.rmSync(dest, { recursive: true, force: true });
-  });
-});
-
-
-// ===========================================================================
-// flag/option - additional cases
-// ===========================================================================
-
-describe('CLI - flag/option extra', () => {
-  it('flag returns false when absent', async () => {
-    process.argv = ['node', 'script'];
-    vi.resetModules();
-    const { flag } = await import('../cli/args.js');
-    expect(flag('missing', 'm')).toBe(false);
-  });
-
-  it('option with short form', async () => {
-    process.argv = ['node', 'script', '-o', '/dist'];
-    vi.resetModules();
-    const { option } = await import('../cli/args.js');
-    expect(option('output', 'o', 'default')).toBe('/dist');
-  });
-
-  it('multiple flags', async () => {
-    process.argv = ['node', 'script', '--verbose', '--watch'];
-    vi.resetModules();
-    const { flag } = await import('../cli/args.js');
-    expect(flag('verbose', 'v')).toBe(true);
-    expect(flag('watch', 'w')).toBe(true);
-  });
-});
-
-
-// ===========================================================================
-// createProject - scaffold command
-// ===========================================================================
-
-describe('CLI - createProject', () => {
-  const fs = require('fs');
-  const path = require('path');
-  const os = require('os');
-
-  let createProject;
-
-  beforeEach(async () => {
-    vi.resetModules();
-    const mod = await import('../cli/commands/create.js');
-    createProject = mod.default || mod;
-  });
-
-  function tmpDir() {
-    const dir = path.join(os.tmpdir(), 'zq-create-' + Date.now() + '-' + Math.random().toString(36).slice(2, 8));
-    fs.mkdirSync(dir, { recursive: true });
-    return dir;
-  }
-
-  function cleanup(dir) {
-    if (fs.existsSync(dir)) fs.rmSync(dir, { recursive: true, force: true });
-  }
-
-  // -- scaffold variant directories exist --
-
-  it('default scaffold directory exists', () => {
-    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default');
-    expect(fs.existsSync(dir)).toBe(true);
-  });
-
-  it('minimal scaffold directory exists', () => {
-    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
-    expect(fs.existsSync(dir)).toBe(true);
-  });
-
-  // -- default scaffold contains expected files --
-
-  it('default scaffold has index.html', () => {
-    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'index.html');
-    expect(fs.existsSync(f)).toBe(true);
-  });
-
-  it('default scaffold has app/app.js', () => {
-    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'app', 'app.js');
-    expect(fs.existsSync(f)).toBe(true);
-  });
-
-  it('default scaffold has app/routes.js', () => {
-    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'app', 'routes.js');
-    expect(fs.existsSync(f)).toBe(true);
-  });
-
-  it('default scaffold has app/store.js', () => {
-    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'app', 'store.js');
-    expect(fs.existsSync(f)).toBe(true);
-  });
-
-  // -- minimal scaffold contains expected files --
-
-  it('minimal scaffold has index.html', () => {
-    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'index.html');
-    expect(fs.existsSync(f)).toBe(true);
-  });
-
-  it('minimal scaffold has app/app.js', () => {
-    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'app', 'app.js');
-    expect(fs.existsSync(f)).toBe(true);
-  });
-
-  it('minimal scaffold has 4 components', () => {
-    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'app', 'components');
-    const files = fs.readdirSync(dir).sort();
-    expect(files).toEqual(['about.js', 'counter.js', 'home.js', 'not-found.js']);
-  });
-
-  // -- minimal scaffold is a subset of default --
-
-  it('minimal scaffold has fewer files than default', () => {
-    function countFiles(dir) {
-      let count = 0;
-      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-        if (entry.isDirectory()) count += countFiles(path.join(dir, entry.name));
-        else count++;
-      }
-      return count;
-    }
-    const defDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default');
-    const minDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
-    expect(countFiles(minDir)).toBeLessThan(countFiles(defDir));
-  });
-
-  // -- {{NAME}} replacement --
-
-  it('scaffold templates contain {{NAME}} placeholder', () => {
-    const html = fs.readFileSync(
-      path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'index.html'), 'utf-8'
-    );
-    expect(html).toContain('{{NAME}}');
-  });
-
-  it('minimal scaffold templates contain {{NAME}} placeholder', () => {
-    const html = fs.readFileSync(
-      path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'index.html'), 'utf-8'
-    );
-    expect(html).toContain('{{NAME}}');
-  });
-
-  // -- walkDir functionality (tested via module internals) --
-
-  it('scaffolds default project into a target directory', () => {
-    const target = tmpDir();
-    const projDir = path.join(target, 'test-app');
-
-    // Simulate: process.argv for default (no --minimal)
-    process.argv = ['node', 'zquery', 'create', 'test-app'];
-    vi.resetModules();
-
-    // We can't easily call createProject because it uses process.exit.
-    // Instead, test the walkDir + copy logic directly.
-    const scaffoldDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default');
-
-    function walkDir(dir, prefix = '') {
-      const entries = [];
-      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
-        if (entry.isDirectory()) entries.push(...walkDir(path.join(dir, entry.name), rel));
-        else entries.push(rel);
-      }
-      return entries;
-    }
-
-    const files = walkDir(scaffoldDir);
-    expect(files.length).toBeGreaterThan(5);
-    expect(files).toContain('index.html');
-    expect(files).toContain('global.css');
-    expect(files).toContain('app/app.js');
-    expect(files).toContain('app/routes.js');
-    expect(files).toContain('app/store.js');
-
-    cleanup(target);
-  });
-
-  it('walkDir lists minimal scaffold files correctly', () => {
-    const scaffoldDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
-
-    function walkDir(dir, prefix = '') {
-      const entries = [];
-      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
-        if (entry.isDirectory()) entries.push(...walkDir(path.join(dir, entry.name), rel));
-        else entries.push(rel);
-      }
-      return entries;
-    }
-
-    const files = walkDir(scaffoldDir);
-    expect(files).toContain('index.html');
-    expect(files).toContain('global.css');
-    expect(files).toContain('app/app.js');
-    expect(files).toContain('app/routes.js');
-    expect(files).toContain('app/store.js');
-    expect(files).toContain('app/components/home.js');
-    expect(files).toContain('app/components/counter.js');
-    expect(files).toContain('app/components/about.js');
-    expect(files).toContain('app/components/not-found.js');
-    expect(files).toContain('assets/.gitkeep');
-  });
-
-  // -- {{NAME}} replacement in copied files --
-
-  it('replaces {{NAME}} in copied scaffold files', () => {
-    const target = tmpDir();
-    const scaffoldDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
-    const projectName = 'my-cool-app';
-
-    function walkDir(dir, prefix = '') {
-      const entries = [];
-      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
-        if (entry.isDirectory()) entries.push(...walkDir(path.join(dir, entry.name), rel));
-        else entries.push(rel);
-      }
-      return entries;
-    }
-
-    const files = walkDir(scaffoldDir);
-
-    for (const rel of files) {
-      let content = fs.readFileSync(path.join(scaffoldDir, rel), 'utf-8');
-      content = content.replace(/\{\{NAME\}\}/g, projectName);
-      const dest = path.join(target, rel);
-      fs.mkdirSync(path.dirname(dest), { recursive: true });
-      fs.writeFileSync(dest, content, 'utf-8');
-    }
-
-    const html = fs.readFileSync(path.join(target, 'index.html'), 'utf-8');
-    expect(html).toContain(projectName);
-    expect(html).not.toContain('{{NAME}}');
-
-    const appJs = fs.readFileSync(path.join(target, 'app', 'app.js'), 'utf-8');
-    expect(appJs).toContain(projectName);
-    expect(appJs).not.toContain('{{NAME}}');
-
-    cleanup(target);
-  });
-
-  // -- conflict detection --
-
-  it('conflicts array detects existing files', () => {
-    const target = tmpDir();
-    fs.writeFileSync(path.join(target, 'index.html'), 'existing');
-    fs.mkdirSync(path.join(target, 'app'), { recursive: true });
-
-    const conflicts = ['index.html', 'global.css', 'app', 'assets'].filter(f =>
-      fs.existsSync(path.join(target, f))
-    );
-
-    expect(conflicts).toContain('index.html');
-    expect(conflicts).toContain('app');
-    expect(conflicts).not.toContain('global.css');
-    expect(conflicts).not.toContain('assets');
-
-    cleanup(target);
-  });
-
-  it('no conflicts in empty directory', () => {
-    const target = tmpDir();
-
-    const conflicts = ['index.html', 'global.css', 'app', 'assets'].filter(f =>
-      fs.existsSync(path.join(target, f))
-    );
-
-    expect(conflicts).toHaveLength(0);
-
-    cleanup(target);
-  });
-
-  // -- flag parsing for --minimal --
-
-  it('--minimal flag resolves to minimal variant', async () => {
-    process.argv = ['node', 'zquery', 'create', '--minimal', 'my-app'];
-    vi.resetModules();
-    const { flag } = await import('../cli/args.js');
-    expect(flag('minimal', 'm')).toBe(true);
-  });
-
-  it('-m short flag resolves to minimal variant', async () => {
-    process.argv = ['node', 'zquery', 'create', '-m', 'my-app'];
-    vi.resetModules();
-    const { flag } = await import('../cli/args.js');
-    expect(flag('minimal', 'm')).toBe(true);
-  });
-
-  it('no flag defaults to default variant', async () => {
-    process.argv = ['node', 'zquery', 'create', 'my-app'];
-    vi.resetModules();
-    const { flag } = await import('../cli/args.js');
-    expect(flag('minimal', 'm')).toBe(false);
-  });
-
-  // -- dirArg parsing skips flags --
-
-  it('dirArg parsing skips flag args', () => {
-    const args = ['create', '--minimal', 'my-app'];
-    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
-    expect(dirArg).toBe('my-app');
-  });
-
-  it('dirArg parsing returns first positional', () => {
-    const args = ['create', 'my-app'];
-    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
-    expect(dirArg).toBe('my-app');
-  });
-
-  it('dirArg is undefined when no positional given', () => {
-    const args = ['create', '--minimal'];
-    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
-    expect(dirArg).toBeUndefined();
-  });
-
-  it('dirArg with flag after dir name', () => {
-    const args = ['create', 'my-app', '--minimal'];
-    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
-    expect(dirArg).toBe('my-app');
-  });
-
-  // -- help text mentions --minimal --
-
-  it('help text includes --minimal flag', async () => {
-    vi.resetModules();
-    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    const showHelp = (await import('../cli/help.js')).default;
-    showHelp();
-    const text = spy.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(text).toContain('--minimal');
-    spy.mockRestore();
-  });
-});
-
-
-// ===========================================================================
-// minifyTemplateLiterals - regex literal awareness
-// ===========================================================================
-
-describe('CLI - minifyTemplateLiterals regex handling', () => {
-  let minifyTemplateLiterals;
-
-  beforeEach(async () => {
-    const mod = await import('../cli/commands/bundle.js');
-    minifyTemplateLiterals = mod.minifyTemplateLiterals;
-  });
-
-  it('preserves code after regex containing backtick characters', () => {
-    // Simulates: h = h.replace(/`([^`]+)`/g, '<code>$1</code>');
-    // The backtick inside the regex must not be mistaken for a template literal.
-    const input = "h = h.replace(/\x60([^\x60]+)\x60/g, '<code>$1</code>');\nreturn h;";
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('return h');
-    expect(result).toContain('<code>$1</code>');
-  });
-
-  it('does not eat closing braces after backtick-in-regex', () => {
-    const input = [
-      "var fmt = {",
-      "  md(raw) {",
-      "    let h = raw;",
-      "    h = h.replace(/\x60([^\x60]+)\x60/g, '<code>$1</code>');",
-      "    h = h.replace(/^[\\-\\*] (.+)$/gm, '<li>$1</li>');",
-      "    return h;",
-      "  }",
-      "};",
-      "var canvas = document.getElementById('bg-canvas');",
-    ].join('\n');
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('return h;');
-    expect(result).toContain('};');
-    expect(result).toContain("getElementById('bg-canvas')");
-  });
-
-  it('handles regex with single backtick', () => {
-    const input = "x.replace(/\x60/g, \"'\");\nvar y = 1;";
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('var y = 1');
-  });
-
-  it('handles regex backtick in character class', () => {
-    const input = "x.match(/[\x60'\"]/g);\nvar z = 2;";
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('var z = 2');
-  });
-
-  it('does not confuse division operator with regex', () => {
-    // After a number or identifier, / is division, not regex start
-    const input = "var x = a / b;\nvar t = \x60hello\x60;";
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('a / b');
-    expect(result).toContain('\x60hello\x60');
-  });
-
-  it('still minifies real template literals correctly', () => {
-    const input = "var html = \x60<div>  <span>  text  </span>  </div>\x60;";
-    const result = minifyTemplateLiterals(input);
-    // Template whitespace should be collapsed
-    expect(result).not.toContain('  <span>  ');
-  });
-
-  it('handles regex after return keyword', () => {
-    const input = "return /\x60test\x60/g;\nvar after = 1;";
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('var after = 1');
-  });
-
-  it('handles regex after assignment operator', () => {
-    const input = "var re = /\x60([^\x60]+)\x60/gi;\nvar next = true;";
-    const result = minifyTemplateLiterals(input);
-    expect(result).toContain('var next = true');
-  });
-});
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+
+// ---------------------------------------------------------------------------
+// CLI bundle - stripModuleSyntax
+// ---------------------------------------------------------------------------
+
+describe('CLI - stripModuleSyntax', () => {
+  let stripModuleSyntax;
+
+  beforeEach(async () => {
+    vi.resetModules();
+    const mod = await import('../cli/commands/bundle.js');
+    stripModuleSyntax = mod.stripModuleSyntax;
+  });
+
+  // -- Import stripping ---------------------------------------------------
+
+  it('strips named import from module', () => {
+    const result = stripModuleSyntax("import { foo } from './mod.js';\nconst x = 1;");
+    expect(result.code.trim()).toBe('const x = 1;');
+  });
+
+  it('strips default import from module', () => {
+    const result = stripModuleSyntax("import foo from './mod.js';\nconst x = 1;");
+    expect(result.code.trim()).toBe('const x = 1;');
+  });
+
+  it('strips side-effect import', () => {
+    const result = stripModuleSyntax("import './mod.js';\nconst x = 1;");
+    expect(result.code.trim()).toBe('const x = 1;');
+  });
+
+  it('strips multi-line import', () => {
+    const input = "import {\n  a,\n  b,\n  c\n} from './mod.js';\nconst x = 1;";
+    const result = stripModuleSyntax(input);
+    expect(result.code.trim()).toBe('const x = 1;');
+  });
+
+  // -- export default -----------------------------------------------------
+
+  it('strips export default keyword', () => {
+    const result = stripModuleSyntax('export default function foo() {}');
+    expect(result.code.trim()).toBe('function foo() {}');
+  });
+
+  // -- export const/let/var → var -----------------------------------------
+
+  it('converts export const to var', () => {
+    const result = stripModuleSyntax('export const x = 1;');
+    expect(result.code.trim()).toBe('var x = 1;');
+  });
+
+  it('converts export let to var', () => {
+    const result = stripModuleSyntax('export let y = 2;');
+    expect(result.code.trim()).toBe('var y = 2;');
+  });
+
+  it('converts export var (keeps var)', () => {
+    const result = stripModuleSyntax('export var z = 3;');
+    expect(result.code.trim()).toBe('var z = 3;');
+  });
+
+  // -- export function → var assignment -----------------------------------
+
+  it('converts export function to var assignment', () => {
+    const result = stripModuleSyntax('export function greet(name) { return name; }');
+    expect(result.code.trim()).toBe('var greet = function greet(name) { return name; }');
+  });
+
+  it('converts export async function to var assignment', () => {
+    const result = stripModuleSyntax('export async function fetchData() {}');
+    expect(result.code.trim()).toBe('var fetchData = async function fetchData() {}');
+  });
+
+  // -- export class → var assignment --------------------------------------
+
+  it('converts export class to var assignment', () => {
+    const result = stripModuleSyntax('export class MyComponent {}');
+    expect(result.code.trim()).toBe('var MyComponent = class MyComponent {}');
+  });
+
+  // -- bare export block: export { a, b } ---------------------------------
+
+  it('converts bare exported function declarations to var', () => {
+    const input = 'function buildIndex() {}\nexport { buildIndex };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var buildIndex = function buildIndex()');
+    expect(result.code).not.toContain('export');
+    expect(result.bareExportNames).toEqual([{ local: 'buildIndex', exported: 'buildIndex' }]);
+  });
+
+  it('converts bare exported async function to var', () => {
+    const input = 'async function load() {}\nexport { load };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var load = async function load()');
+  });
+
+  it('converts bare exported const/let declarations to var', () => {
+    const input = 'const MAX = 10;\nlet count = 0;\nexport { MAX, count };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var MAX');
+    expect(result.code).toContain('var count');
+    expect(result.code).not.toContain('const MAX');
+    expect(result.code).not.toContain('let count');
+  });
+
+  it('handles multi-line bare export block', () => {
+    const input = 'function a() {}\nfunction b() {}\nexport {\n  a,\n  b\n};';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var a = function a()');
+    expect(result.code).toContain('var b = function b()');
+    expect(result.bareExportNames).toHaveLength(2);
+  });
+
+  // -- export { local as exported } aliasing ------------------------------
+
+  it('creates alias for export { local as exported }', () => {
+    const input = 'function foo() {}\nexport { foo as bar };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var foo = function foo()');
+    expect(result.code).toContain('var bar = foo;');
+    expect(result.bareExportNames).toEqual([{ local: 'foo', exported: 'bar' }]);
+  });
+
+  it('creates multiple aliases when needed', () => {
+    const input = 'function a() {}\nfunction b() {}\nexport { a as x, b as y };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var x = a;');
+    expect(result.code).toContain('var y = b;');
+  });
+
+  it('does not create alias when local equals exported', () => {
+    const input = 'function foo() {}\nexport { foo };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).not.toContain('var foo = foo;');
+  });
+
+  it('handles mix of aliased and non-aliased exports', () => {
+    const input = 'function a() {}\nfunction b() {}\nexport { a, b as c };';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var a = function a()');
+    expect(result.code).toContain('var b = function b()');
+    expect(result.code).not.toContain('var a = a;');
+    expect(result.code).toContain('var c = b;');
+  });
+
+  // -- Template literal preservation --------------------------------------
+
+  it('preserves export keyword inside template literal', () => {
+    const input = "const example = `export const x = 1;`;\nexport const y = 2;";
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('`export const x = 1;`');
+    expect(result.code).toContain('var y = 2;');
+  });
+
+  it('preserves export class inside template literal', () => {
+    const input = "const code = `export class Counter {}`;\nexport class Real {}";
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('`export class Counter {}`');
+    expect(result.code).toContain('var Real = class Real');
+  });
+
+  it('preserves nested template literal content', () => {
+    const input = "const x = `outer ${`inner export const a = 1;`} end`;\nexport const b = 2;";
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('inner export const a = 1;');
+    expect(result.code).toContain('var b = 2;');
+  });
+
+  it('handles deeply nested template literals', () => {
+    const input = "const x = `a ${y ? `b ${`c`}` : ''} d`;\nexport const z = 1;";
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('var z = 1;');
+    // Nested templates should be preserved without corruption
+    expect(result.code).toContain('`a ${');
+  });
+
+  // -- Edge cases ---------------------------------------------------------
+
+  it('returns empty bareExportNames when no bare exports', () => {
+    const result = stripModuleSyntax('export const x = 1;');
+    expect(result.bareExportNames).toEqual([]);
+  });
+
+  it('handles code with no imports or exports', () => {
+    const input = 'const x = 1;\nfunction foo() {}';
+    const result = stripModuleSyntax(input);
+    expect(result.code.trim()).toBe(input);
+    expect(result.bareExportNames).toEqual([]);
+  });
+
+  it('preserves indentation', () => {
+    const result = stripModuleSyntax('  export const x = 1;');
+    expect(result.code).toContain('  var x = 1;');
+  });
+
+  it('handles export inside string (not template)', () => {
+    const input = 'const s = "export const x = 1;";\nexport const y = 2;';
+    const result = stripModuleSyntax(input);
+    expect(result.code).toContain('"export const x = 1;"');
+    expect(result.code).toContain('var y = 2;');
+  });
+});
+
+
+// ---------------------------------------------------------------------------
+// CLI - minify ASI preservation
+// ---------------------------------------------------------------------------
+
+describe('CLI - minify ASI preservation', () => {
+  let minify;
+
+  beforeEach(async () => {
+    vi.resetModules();
+    const mod = await import('../cli/utils.js');
+    minify = mod.minify;
+  });
+
+  it('preserves newline between } and var', () => {
+    const input = 'var x = function() {}\nvar y = 1;';
+    const result = minify(input, '');
+    expect(result).toContain('}\nvar');
+    expect(result).not.toContain('}var');
+  });
+
+  it('preserves newline between } and identifier', () => {
+    const input = 'function a() {}\nfunction b() {}';
+    const result = minify(input, '');
+    expect(result).toContain('}\nfunction');
+    expect(result).not.toContain('}function');
+  });
+
+  it('preserves newline between } and const', () => {
+    const input = 'if (true) {}\nconst x = 1;';
+    const result = minify(input, '');
+    expect(result).toContain('}\nconst');
+  });
+
+  it('preserves newline between } and let', () => {
+    const input = 'if (true) {}\nlet x = 1;';
+    const result = minify(input, '');
+    expect(result).toContain('}\nlet');
+  });
+
+  it('does not add newline where none existed', () => {
+    const input = 'if(x){a()} else{b()}';
+    const result = minify(input, '');
+    // } followed by else on same line — no newline needed
+    expect(result).not.toContain('}\n');
+  });
+
+  it('handles }\\n followed by underscore-prefixed identifier', () => {
+    const input = 'var x = function() {}\n_init();';
+    const result = minify(input, '');
+    expect(result).toContain('}\n_init');
+  });
+
+  it('handles }\\n followed by $-prefixed identifier', () => {
+    const input = 'var x = function() {}\n$el.show();';
+    const result = minify(input, '');
+    expect(result).toContain('}\n$el');
+  });
+});
+
+
+// ---------------------------------------------------------------------------
+// CLI utils - stripComments
+// ---------------------------------------------------------------------------
+
+describe('CLI - stripComments', () => {
+  let stripComments;
+
+  beforeEach(async () => {
+    // Dynamic import to handle CommonJS module
+    const mod = await import('../cli/utils.js');
+    stripComments = mod.stripComments || mod.default?.stripComments;
+  });
+
+  it('strips single-line comments', () => {
+    expect(stripComments('let x = 1; // comment\nlet y = 2;')).toBe('let x = 1; \nlet y = 2;');
+  });
+
+  it('strips block comments', () => {
+    expect(stripComments('let x = /* inline comment */ 1;')).toBe('let x =  1;');
+  });
+
+  it('strips multi-line block comments', () => {
+    const input = 'a;\n/* line1\n   line2\n*/\nb;';
+    const result = stripComments(input);
+    expect(result).toBe('a;\n\nb;');
+  });
+
+  it('preserves single-quoted strings containing //', () => {
+    expect(stripComments("let x = 'http://example.com';")).toBe("let x = 'http://example.com';");
+  });
+
+  it('preserves double-quoted strings containing //', () => {
+    expect(stripComments('let x = "http://example.com";')).toBe('let x = "http://example.com";');
+  });
+
+  it('preserves template literals containing //', () => {
+    expect(stripComments('let x = `http://example.com`;')).toBe('let x = `http://example.com`;');
+  });
+
+  it('preserves template literals with ${} containing //', () => {
+    const input = 'let x = `${a}//not-a-comment`;';
+    const result = stripComments(input);
+    expect(result).toContain('//not-a-comment');
+  });
+
+  it('strips comment after string', () => {
+    expect(stripComments('let x = "hello"; // comment')).toBe('let x = "hello"; ');
+  });
+
+  it('handles escaped quotes in strings', () => {
+    expect(stripComments("let x = 'it\\'s a test'; // comment")).toBe("let x = 'it\\'s a test'; ");
+  });
+
+  it('preserves regex containing //', () => {
+    const input = 'let re = /http:\\/\\//; // comment';
+    const result = stripComments(input);
+    expect(result).toContain('/http:\\/\\//');
+    expect(result).not.toContain('// comment');
+  });
+
+  it('handles empty string', () => {
+    expect(stripComments('')).toBe('');
+  });
+
+  it('handles string with no comments', () => {
+    expect(stripComments('let x = 1;')).toBe('let x = 1;');
+  });
+
+  it('handles consecutive comments', () => {
+    const input = '// comment1\n// comment2\ncode;';
+    const result = stripComments(input);
+    expect(result).toBe('\n\ncode;');
+  });
+
+  it('handles block comment at start of file', () => {
+    expect(stripComments('/* header */\ncode;')).toBe('\ncode;');
+  });
+
+  it('handles nested template literal in ${} block', () => {
+    const input = 'let x = `outer ${`inner`} end`;';
+    const result = stripComments(input);
+    expect(result).toBe(input);
+  });
+});
+
+
+// ---------------------------------------------------------------------------
+// CLI utils - minify
+// ---------------------------------------------------------------------------
+
+describe('CLI - minify', () => {
+  let minify;
+
+  beforeEach(async () => {
+    const mod = await import('../cli/utils.js');
+    minify = mod.minify || mod.default?.minify;
+  });
+
+  it('collapses whitespace', () => {
+    const result = minify('let   x   =   1;', '/* banner */');
+    expect(result).toContain('let x=1;');
+  });
+
+  it('preserves banner', () => {
+    const result = minify('let x = 1;', '/* v1.0 */');
+    expect(result.startsWith('/* v1.0 */')).toBe(true);
+  });
+
+  it('strips comments during minification', () => {
+    const result = minify('let x = 1; // comment\nlet y = 2;', '');
+    expect(result).not.toContain('// comment');
+  });
+
+  it('preserves string content', () => {
+    const result = minify('let x = "hello   world";', '');
+    expect(result).toContain('"hello   world"');
+  });
+
+  it('preserves template literal content', () => {
+    const result = minify('let x = `hello   world`;', '');
+    expect(result).toContain('`hello   world`');
+  });
+
+  it('does not merge ++ into + +', () => {
+    const result = minify('a + +b', '');
+    expect(result).toContain('+ +');
+  });
+
+  it('does not merge -- into - -', () => {
+    const result = minify('a - -b', '');
+    expect(result).toContain('- -');
+  });
+
+  it('preserves space between keywords and identifiers', () => {
+    const result = minify('return value;', '');
+    expect(result).toContain('return value');
+  });
+
+  it('removes block comments', () => {
+    const result = minify('a /* comment */ = 1;', '');
+    expect(result).not.toContain('comment');
+  });
+
+  it('handles empty input', () => {
+    const result = minify('', '');
+    expect(result).toBe('\n');
+  });
+});
+
+
+// ---------------------------------------------------------------------------
+// CLI utils - sizeKB
+// ---------------------------------------------------------------------------
+
+describe('CLI - sizeKB', () => {
+  let sizeKB;
+
+  beforeEach(async () => {
+    const mod = await import('../cli/utils.js');
+    sizeKB = mod.sizeKB || mod.default?.sizeKB;
+  });
+
+  it('formats 1024 bytes as 1.0', () => {
+    expect(sizeKB({ length: 1024 })).toBe('1.0');
+  });
+
+  it('formats 512 bytes as 0.5', () => {
+    expect(sizeKB({ length: 512 })).toBe('0.5');
+  });
+
+  it('formats 0 bytes as 0.0', () => {
+    expect(sizeKB({ length: 0 })).toBe('0.0');
+  });
+
+  it('formats 2560 bytes as 2.5', () => {
+    expect(sizeKB({ length: 2560 })).toBe('2.5');
+  });
+
+  it('formats large size correctly', () => {
+    expect(sizeKB({ length: 102400 })).toBe('100.0');
+  });
+});
+
+
+// ---------------------------------------------------------------------------
+// CLI args - flag and option
+// ---------------------------------------------------------------------------
+
+describe('CLI - args module', () => {
+  let originalArgv;
+
+  beforeEach(() => {
+    originalArgv = [...process.argv];
+  });
+
+  afterEach(() => {
+    process.argv = originalArgv;
+    // Clear the require cache so the module re-reads argv
+    vi.resetModules();
+  });
+
+  it('flag returns true when --verbose is present', async () => {
+    process.argv = ['node', 'script', '--verbose'];
+    const mod = await import('../cli/args.js');
+    const { flag } = mod;
+    expect(flag('verbose')).toBe(true);
+  });
+
+  it('flag returns false when flag is absent', async () => {
+    process.argv = ['node', 'script'];
+    const mod = await import('../cli/args.js');
+    const { flag } = mod;
+    expect(flag('verbose')).toBe(false);
+  });
+
+  it('flag detects short flag -v', async () => {
+    process.argv = ['node', 'script', '-v'];
+    const mod = await import('../cli/args.js');
+    const { flag } = mod;
+    expect(flag('verbose', 'v')).toBe(true);
+  });
+
+  it('option reads value after --port', async () => {
+    process.argv = ['node', 'script', '--port', '8080'];
+    const mod = await import('../cli/args.js');
+    const { option } = mod;
+    expect(option('port')).toBe('8080');
+  });
+
+  it('option reads value after short -p', async () => {
+    process.argv = ['node', 'script', '-p', '3000'];
+    const mod = await import('../cli/args.js');
+    const { option } = mod;
+    expect(option('port', 'p')).toBe('3000');
+  });
+
+  it('option returns fallback when missing', async () => {
+    process.argv = ['node', 'script'];
+    const mod = await import('../cli/args.js');
+    const { option } = mod;
+    expect(option('port', 'p', '3100')).toBe('3100');
+  });
+
+  it('option returns fallback when flag has no value', async () => {
+    process.argv = ['node', 'script', '--port'];
+    const mod = await import('../cli/args.js');
+    const { option } = mod;
+    expect(option('port', 'p', '3100')).toBe('3100');
+  });
+});
+
+
+// ===========================================================================
+// showHelp
+// ===========================================================================
+
+describe('CLI - showHelp', () => {
+  it('outputs help text to console', async () => {
+    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    const showHelp = (await import('../cli/help.js')).default;
+    showHelp();
+    expect(spy).toHaveBeenCalled();
+    const text = spy.mock.calls.map(c => c.join(' ')).join('\n');
+    expect(text).toContain('create');
+    expect(text).toContain('dev');
+    expect(text).toContain('bundle');
+    expect(text).toContain('build');
+    spy.mockRestore();
+  });
+
+  it('help text mentions port flag', async () => {
+    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    const showHelp = (await import('../cli/help.js')).default;
+    showHelp();
+    const text = spy.mock.calls.map(c => c.join(' ')).join('\n');
+    expect(text).toContain('--port');
+    spy.mockRestore();
+  });
+});
+
+
+// ===========================================================================
+// stripComments - additional edge cases
+// ===========================================================================
+
+describe('CLI - stripComments extra', () => {
+  let stripComments;
+  beforeEach(async () => {
+    const mod = await import('../cli/utils.js');
+    stripComments = mod.stripComments;
+  });
+
+  it('handles consecutive single-line comments', () => {
+    const input = '// one\n// two\nconst x = 1;';
+    const result = stripComments(input);
+    expect(result).not.toContain('one');
+    expect(result).not.toContain('two');
+    expect(result).toContain('const x = 1');
+  });
+
+  it('preserves code after block comment', () => {
+    const input = 'a /* comment */ + b';
+    const result = stripComments(input);
+    expect(result).toContain('a');
+    expect(result).toContain('+ b');
+    expect(result).not.toContain('comment');
+  });
+
+  it('handles multiline block comment', () => {
+    const input = '/*\n line1\n line2\n*/\ncode();';
+    const result = stripComments(input);
+    expect(result).toContain('code()');
+    expect(result).not.toContain('line1');
+  });
+
+  it('does not strip // inside template expression', () => {
+    const input = '`${a // b}`';
+    const result = stripComments(input);
+    // The template should be preserved as-is
+    expect(result).toContain('`');
+  });
+
+  it('handles code with no comments', () => {
+    const input = 'const x = 1;\nconst y = 2;';
+    expect(stripComments(input)).toBe(input);
+  });
+});
+
+
+// ===========================================================================
+// minify - additional edge cases
+// ===========================================================================
+
+describe('CLI - minify extra', () => {
+  let minify;
+  beforeEach(async () => {
+    const mod = await import('../cli/utils.js');
+    minify = mod.minify;
+  });
+
+  it('preserves string content with spaces', () => {
+    const result = minify('const msg = "hello   world";', '');
+    expect(result).toContain('"hello   world"');
+  });
+
+  it('empty input returns banner only', () => {
+    const result = minify('', '/* banner */');
+    expect(result.trim()).toBe('/* banner */');
+  });
+
+  it('collapses multiple newlines', () => {
+    const result = minify('a\n\n\n\nb', '');
+    // Should not have multiple consecutive newlines in output
+    expect(result).not.toMatch(/\n\n\n/);
+  });
+
+  it('handles template literals with spaces', () => {
+    const result = minify('const x = `hello   world`;', '');
+    expect(result).toContain('`hello   world`');
+  });
+});
+
+
+// ===========================================================================
+// sizeKB - edge cases
+// ===========================================================================
+
+describe('CLI - sizeKB extra', () => {
+  let sizeKB;
+  beforeEach(async () => {
+    const mod = await import('../cli/utils.js');
+    sizeKB = mod.sizeKB;
+  });
+
+  it('zero-length buffer', () => {
+    expect(sizeKB({ length: 0 })).toBe('0.0');
+  });
+
+  it('exactly 1KB', () => {
+    expect(sizeKB({ length: 1024 })).toBe('1.0');
+  });
+
+  it('small buffer', () => {
+    expect(sizeKB({ length: 100 })).toBe('0.1');
+  });
+});
+
+
+// ===========================================================================
+// copyDirSync
+// ===========================================================================
+
+describe('CLI - copyDirSync', () => {
+  let copyDirSync;
+  const fs = require('fs');
+  const path = require('path');
+  const os = require('os');
+
+  beforeEach(async () => {
+    const mod = await import('../cli/utils.js');
+    copyDirSync = mod.copyDirSync;
+  });
+
+  it('copies directory recursively', () => {
+    const src = path.join(os.tmpdir(), 'zq-test-src-' + Date.now());
+    const dest = path.join(os.tmpdir(), 'zq-test-dest-' + Date.now());
+
+    // Create source structure
+    fs.mkdirSync(path.join(src, 'sub'), { recursive: true });
+    fs.writeFileSync(path.join(src, 'a.txt'), 'hello');
+    fs.writeFileSync(path.join(src, 'sub', 'b.txt'), 'world');
+
+    copyDirSync(src, dest);
+
+    expect(fs.existsSync(path.join(dest, 'a.txt'))).toBe(true);
+    expect(fs.readFileSync(path.join(dest, 'a.txt'), 'utf8')).toBe('hello');
+    expect(fs.existsSync(path.join(dest, 'sub', 'b.txt'))).toBe(true);
+    expect(fs.readFileSync(path.join(dest, 'sub', 'b.txt'), 'utf8')).toBe('world');
+
+    // Cleanup
+    fs.rmSync(src, { recursive: true, force: true });
+    fs.rmSync(dest, { recursive: true, force: true });
+  });
+});
+
+
+// ===========================================================================
+// flag/option - additional cases
+// ===========================================================================
+
+describe('CLI - flag/option extra', () => {
+  it('flag returns false when absent', async () => {
+    process.argv = ['node', 'script'];
+    vi.resetModules();
+    const { flag } = await import('../cli/args.js');
+    expect(flag('missing', 'm')).toBe(false);
+  });
+
+  it('option with short form', async () => {
+    process.argv = ['node', 'script', '-o', '/dist'];
+    vi.resetModules();
+    const { option } = await import('../cli/args.js');
+    expect(option('output', 'o', 'default')).toBe('/dist');
+  });
+
+  it('multiple flags', async () => {
+    process.argv = ['node', 'script', '--verbose', '--watch'];
+    vi.resetModules();
+    const { flag } = await import('../cli/args.js');
+    expect(flag('verbose', 'v')).toBe(true);
+    expect(flag('watch', 'w')).toBe(true);
+  });
+});
+
+
+// ===========================================================================
+// createProject - scaffold command
+// ===========================================================================
+
+describe('CLI - createProject', () => {
+  const fs = require('fs');
+  const path = require('path');
+  const os = require('os');
+
+  let createProject;
+
+  beforeEach(async () => {
+    vi.resetModules();
+    const mod = await import('../cli/commands/create.js');
+    createProject = mod.default || mod;
+  });
+
+  function tmpDir() {
+    const dir = path.join(os.tmpdir(), 'zq-create-' + Date.now() + '-' + Math.random().toString(36).slice(2, 8));
+    fs.mkdirSync(dir, { recursive: true });
+    return dir;
+  }
+
+  function cleanup(dir) {
+    if (fs.existsSync(dir)) fs.rmSync(dir, { recursive: true, force: true });
+  }
+
+  // -- scaffold variant directories exist --
+
+  it('default scaffold directory exists', () => {
+    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default');
+    expect(fs.existsSync(dir)).toBe(true);
+  });
+
+  it('minimal scaffold directory exists', () => {
+    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
+    expect(fs.existsSync(dir)).toBe(true);
+  });
+
+  it('webrtc scaffold directory exists', () => {
+    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'webrtc');
+    expect(fs.existsSync(dir)).toBe(true);
+  });
+
+  it('webrtc scaffold has index.html with {{NAME}} placeholder', () => {
+    const html = fs.readFileSync(
+      path.resolve(__dirname, '..', 'cli', 'scaffold', 'webrtc', 'index.html'), 'utf-8'
+    );
+    expect(html).toContain('{{NAME}}');
+    expect(html).toContain('video-room');
+  });
+
+  it('webrtc scaffold has app/components/video-room.js wired to LocalRoom', () => {
+    const src = fs.readFileSync(
+      path.resolve(__dirname, '..', 'cli', 'scaffold', 'webrtc', 'app', 'components', 'video-room.js'),
+      'utf-8'
+    );
+    expect(src).toContain('LocalRoom');
+    expect(src).toContain('z-stream');
+    expect(src).toContain('video-room');
+  });
+
+  it('webrtc scaffold ships a BroadcastChannel-based LocalRoom helper', () => {
+    const src = fs.readFileSync(
+      path.resolve(__dirname, '..', 'cli', 'scaffold', 'webrtc', 'app', 'lib', 'room.js'),
+      'utf-8'
+    );
+    expect(src).toContain('BroadcastChannel');
+    expect(src).toContain('class LocalRoom');
+    expect(src).toContain('$.Peer');
+  });
+
+  // -- default scaffold contains expected files --
+
+  it('default scaffold has index.html', () => {
+    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'index.html');
+    expect(fs.existsSync(f)).toBe(true);
+  });
+
+  it('default scaffold has app/app.js', () => {
+    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'app', 'app.js');
+    expect(fs.existsSync(f)).toBe(true);
+  });
+
+  it('default scaffold has app/routes.js', () => {
+    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'app', 'routes.js');
+    expect(fs.existsSync(f)).toBe(true);
+  });
+
+  it('default scaffold has app/store.js', () => {
+    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'app', 'store.js');
+    expect(fs.existsSync(f)).toBe(true);
+  });
+
+  // -- minimal scaffold contains expected files --
+
+  it('minimal scaffold has index.html', () => {
+    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'index.html');
+    expect(fs.existsSync(f)).toBe(true);
+  });
+
+  it('minimal scaffold has app/app.js', () => {
+    const f = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'app', 'app.js');
+    expect(fs.existsSync(f)).toBe(true);
+  });
+
+  it('minimal scaffold has 4 components', () => {
+    const dir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'app', 'components');
+    const files = fs.readdirSync(dir).sort();
+    expect(files).toEqual(['about.js', 'counter.js', 'home.js', 'not-found.js']);
+  });
+
+  // -- minimal scaffold is a subset of default --
+
+  it('minimal scaffold has fewer files than default', () => {
+    function countFiles(dir) {
+      let count = 0;
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        if (entry.isDirectory()) count += countFiles(path.join(dir, entry.name));
+        else count++;
+      }
+      return count;
+    }
+    const defDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default');
+    const minDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
+    expect(countFiles(minDir)).toBeLessThan(countFiles(defDir));
+  });
+
+  // -- {{NAME}} replacement --
+
+  it('scaffold templates contain {{NAME}} placeholder', () => {
+    const html = fs.readFileSync(
+      path.resolve(__dirname, '..', 'cli', 'scaffold', 'default', 'index.html'), 'utf-8'
+    );
+    expect(html).toContain('{{NAME}}');
+  });
+
+  it('minimal scaffold templates contain {{NAME}} placeholder', () => {
+    const html = fs.readFileSync(
+      path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal', 'index.html'), 'utf-8'
+    );
+    expect(html).toContain('{{NAME}}');
+  });
+
+  // -- walkDir functionality (tested via module internals) --
+
+  it('scaffolds default project into a target directory', () => {
+    const target = tmpDir();
+    const projDir = path.join(target, 'test-app');
+
+    // Simulate: process.argv for default (no --minimal)
+    process.argv = ['node', 'zquery', 'create', 'test-app'];
+    vi.resetModules();
+
+    // We can't easily call createProject because it uses process.exit.
+    // Instead, test the walkDir + copy logic directly.
+    const scaffoldDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'default');
+
+    function walkDir(dir, prefix = '') {
+      const entries = [];
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
+        if (entry.isDirectory()) entries.push(...walkDir(path.join(dir, entry.name), rel));
+        else entries.push(rel);
+      }
+      return entries;
+    }
+
+    const files = walkDir(scaffoldDir);
+    expect(files.length).toBeGreaterThan(5);
+    expect(files).toContain('index.html');
+    expect(files).toContain('global.css');
+    expect(files).toContain('app/app.js');
+    expect(files).toContain('app/routes.js');
+    expect(files).toContain('app/store.js');
+
+    cleanup(target);
+  });
+
+  it('walkDir lists minimal scaffold files correctly', () => {
+    const scaffoldDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
+
+    function walkDir(dir, prefix = '') {
+      const entries = [];
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
+        if (entry.isDirectory()) entries.push(...walkDir(path.join(dir, entry.name), rel));
+        else entries.push(rel);
+      }
+      return entries;
+    }
+
+    const files = walkDir(scaffoldDir);
+    expect(files).toContain('index.html');
+    expect(files).toContain('global.css');
+    expect(files).toContain('app/app.js');
+    expect(files).toContain('app/routes.js');
+    expect(files).toContain('app/store.js');
+    expect(files).toContain('app/components/home.js');
+    expect(files).toContain('app/components/counter.js');
+    expect(files).toContain('app/components/about.js');
+    expect(files).toContain('app/components/not-found.js');
+    expect(files).toContain('assets/.gitkeep');
+  });
+
+  // -- {{NAME}} replacement in copied files --
+
+  it('replaces {{NAME}} in copied scaffold files', () => {
+    const target = tmpDir();
+    const scaffoldDir = path.resolve(__dirname, '..', 'cli', 'scaffold', 'minimal');
+    const projectName = 'my-cool-app';
+
+    function walkDir(dir, prefix = '') {
+      const entries = [];
+      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
+        if (entry.isDirectory()) entries.push(...walkDir(path.join(dir, entry.name), rel));
+        else entries.push(rel);
+      }
+      return entries;
+    }
+
+    const files = walkDir(scaffoldDir);
+
+    for (const rel of files) {
+      let content = fs.readFileSync(path.join(scaffoldDir, rel), 'utf-8');
+      content = content.replace(/\{\{NAME\}\}/g, projectName);
+      const dest = path.join(target, rel);
+      fs.mkdirSync(path.dirname(dest), { recursive: true });
+      fs.writeFileSync(dest, content, 'utf-8');
+    }
+
+    const html = fs.readFileSync(path.join(target, 'index.html'), 'utf-8');
+    expect(html).toContain(projectName);
+    expect(html).not.toContain('{{NAME}}');
+
+    const appJs = fs.readFileSync(path.join(target, 'app', 'app.js'), 'utf-8');
+    expect(appJs).toContain(projectName);
+    expect(appJs).not.toContain('{{NAME}}');
+
+    cleanup(target);
+  });
+
+  // -- conflict detection --
+
+  it('conflicts array detects existing files', () => {
+    const target = tmpDir();
+    fs.writeFileSync(path.join(target, 'index.html'), 'existing');
+    fs.mkdirSync(path.join(target, 'app'), { recursive: true });
+
+    const conflicts = ['index.html', 'global.css', 'app', 'assets'].filter(f =>
+      fs.existsSync(path.join(target, f))
+    );
+
+    expect(conflicts).toContain('index.html');
+    expect(conflicts).toContain('app');
+    expect(conflicts).not.toContain('global.css');
+    expect(conflicts).not.toContain('assets');
+
+    cleanup(target);
+  });
+
+  it('no conflicts in empty directory', () => {
+    const target = tmpDir();
+
+    const conflicts = ['index.html', 'global.css', 'app', 'assets'].filter(f =>
+      fs.existsSync(path.join(target, f))
+    );
+
+    expect(conflicts).toHaveLength(0);
+
+    cleanup(target);
+  });
+
+  // -- flag parsing for --minimal --
+
+  it('--minimal flag resolves to minimal variant', async () => {
+    process.argv = ['node', 'zquery', 'create', '--minimal', 'my-app'];
+    vi.resetModules();
+    const { flag } = await import('../cli/args.js');
+    expect(flag('minimal', 'm')).toBe(true);
+  });
+
+  it('-m short flag resolves to minimal variant', async () => {
+    process.argv = ['node', 'zquery', 'create', '-m', 'my-app'];
+    vi.resetModules();
+    const { flag } = await import('../cli/args.js');
+    expect(flag('minimal', 'm')).toBe(true);
+  });
+
+  it('no flag defaults to default variant', async () => {
+    process.argv = ['node', 'zquery', 'create', 'my-app'];
+    vi.resetModules();
+    const { flag } = await import('../cli/args.js');
+    expect(flag('minimal', 'm')).toBe(false);
+  });
+
+  // -- dirArg parsing skips flags --
+
+  it('dirArg parsing skips flag args', () => {
+    const args = ['create', '--minimal', 'my-app'];
+    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
+    expect(dirArg).toBe('my-app');
+  });
+
+  it('dirArg parsing returns first positional', () => {
+    const args = ['create', 'my-app'];
+    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
+    expect(dirArg).toBe('my-app');
+  });
+
+  it('dirArg is undefined when no positional given', () => {
+    const args = ['create', '--minimal'];
+    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
+    expect(dirArg).toBeUndefined();
+  });
+
+  it('dirArg with flag after dir name', () => {
+    const args = ['create', 'my-app', '--minimal'];
+    const dirArg = args.slice(1).find(a => !a.startsWith('-'));
+    expect(dirArg).toBe('my-app');
+  });
+
+  // -- help text mentions --minimal --
+
+  it('help text includes --minimal flag', async () => {
+    vi.resetModules();
+    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    const showHelp = (await import('../cli/help.js')).default;
+    showHelp();
+    const text = spy.mock.calls.map(c => c.join(' ')).join('\n');
+    expect(text).toContain('--minimal');
+    spy.mockRestore();
+  });
+});
+
+
+// ===========================================================================
+// minifyTemplateLiterals - regex literal awareness
+// ===========================================================================
+
+describe('CLI - minifyTemplateLiterals regex handling', () => {
+  let minifyTemplateLiterals;
+
+  beforeEach(async () => {
+    const mod = await import('../cli/commands/bundle.js');
+    minifyTemplateLiterals = mod.minifyTemplateLiterals;
+  });
+
+  it('preserves code after regex containing backtick characters', () => {
+    // Simulates: h = h.replace(/`([^`]+)`/g, '<code>$1</code>');
+    // The backtick inside the regex must not be mistaken for a template literal.
+    const input = "h = h.replace(/\x60([^\x60]+)\x60/g, '<code>$1</code>');\nreturn h;";
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('return h');
+    expect(result).toContain('<code>$1</code>');
+  });
+
+  it('does not eat closing braces after backtick-in-regex', () => {
+    const input = [
+      "var fmt = {",
+      "  md(raw) {",
+      "    let h = raw;",
+      "    h = h.replace(/\x60([^\x60]+)\x60/g, '<code>$1</code>');",
+      "    h = h.replace(/^[\\-\\*] (.+)$/gm, '<li>$1</li>');",
+      "    return h;",
+      "  }",
+      "};",
+      "var canvas = document.getElementById('bg-canvas');",
+    ].join('\n');
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('return h;');
+    expect(result).toContain('};');
+    expect(result).toContain("getElementById('bg-canvas')");
+  });
+
+  it('handles regex with single backtick', () => {
+    const input = "x.replace(/\x60/g, \"'\");\nvar y = 1;";
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('var y = 1');
+  });
+
+  it('handles regex backtick in character class', () => {
+    const input = "x.match(/[\x60'\"]/g);\nvar z = 2;";
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('var z = 2');
+  });
+
+  it('does not confuse division operator with regex', () => {
+    // After a number or identifier, / is division, not regex start
+    const input = "var x = a / b;\nvar t = \x60hello\x60;";
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('a / b');
+    expect(result).toContain('\x60hello\x60');
+  });
+
+  it('still minifies real template literals correctly', () => {
+    const input = "var html = \x60<div>  <span>  text  </span>  </div>\x60;";
+    const result = minifyTemplateLiterals(input);
+    // Template whitespace should be collapsed
+    expect(result).not.toContain('  <span>  ');
+  });
+
+  it('handles regex after return keyword', () => {
+    const input = "return /\x60test\x60/g;\nvar after = 1;";
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('var after = 1');
+  });
+
+  it('handles regex after assignment operator', () => {
+    const input = "var re = /\x60([^\x60]+)\x60/gi;\nvar next = true;";
+    const result = minifyTemplateLiterals(input);
+    expect(result).toContain('var next = true');
+  });
+});