@trineui/cli 0.1.0-beta.1 → 0.1.1

package/src/commands/diff.ts

@@ -1,104 +0,0 @@
-import { Command } from 'commander';
-import { readFileSync, existsSync } from 'fs';
-import { resolve } from 'path';
-import { createTwoFilesPatch } from 'diff';
-import { computeNormalizedHash } from '../utils/hash.js';
-import { readManifest } from '../utils/manifest.js';
-import { renderTemplate } from '../utils/template.js';
-
-export const diffCommand = new Command('diff')
-  .argument('<component>', 'Component name (e.g. button)')
-  .option('--no-color', 'Disable colored output')
-  .description('Show upstream changes since last sync (read-only, no files changed)')
-  .action(async (component: string, _options: { noColor?: boolean }) => {
-    const projectRoot = process.cwd();
-
-    const manifest = readManifest(projectRoot);
-    if (!manifest?.components[component]) {
-      console.error(`✗ "${component}" not found in manifest`);
-      console.error(`  Run: trine add ${component}`);
-      process.exit(1);
-    }
-
-    const entry = manifest.components[component];
-
-    const blueprintPath = resolve(
-      projectRoot,
-      entry['output-dir'],
-      component,
-      `${component}.blueprint.ts`
-    );
-
-    if (!existsSync(blueprintPath)) {
-      console.error(`✗ Blueprint file not found: ${blueprintPath}`);
-      console.error(`  Run: trine add ${component}`);
-      process.exit(1);
-    }
-
-    const currentContent = readFileSync(blueprintPath, 'utf-8');
-    const currentHash = computeNormalizedHash(currentContent);
-    const manifestHash = entry['blueprint-hash'];
-    const isLocalModified = currentHash !== manifestHash;
-
-    const upstreamContent = renderTemplate(`${component}.blueprint.ts.hbs`, {
-      engineVersion: entry['engine-version'],
-      blueprintSchemaVersion: entry['blueprint-schema-version'],
-    });
-    const upstreamHash = computeNormalizedHash(upstreamContent);
-    const hasUpstream = upstreamHash !== manifestHash;
-
-    const safeToSync = !isLocalModified && hasUpstream;
-
-    console.log('');
-    console.log(`${component} blueprint:`);
-    console.log(
-      `  local status:    ${
-        isLocalModified
-          ? '⚠ modified (local changes detected)'
-          : '✓ clean (unmodified)'
-      }`
-    );
-    console.log(
-      `  upstream status: ${
-        hasUpstream
-          ? `updates available (engine: ${entry['engine-version']} → check changelog)`
-          : '✓ up to date'
-      }`
-    );
-    console.log(
-      `  safe to sync:    ${
-        safeToSync
-          ? 'yes — run: trine sync ' + component
-          : isLocalModified
-            ? 'no — run: trine sync ' + component + ' --interactive'
-            : 'nothing to sync'
-      }`
-    );
-
-    if (hasUpstream) {
-      console.log('');
-      console.log('--- upstream changes ---');
-
-      const patch = createTwoFilesPatch(
-        `${component}.blueprint.ts (current)`,
-        `${component}.blueprint.ts (upstream)`,
-        currentContent,
-        upstreamContent,
-        '',
-        '',
-        { context: 3 }
-      );
-
-      const lines = patch.split('\n').slice(0, 50);
-      console.log(lines.join('\n'));
-
-      if (patch.split('\n').length > 50) {
-        console.log('  ... (truncated, use trine sync --interactive for full diff)');
-      }
-    }
-
-    console.log('');
-    console.log(`${component} skin:`);
-    console.log(`  (no upstream — user-owned, never synced)`);
-    console.log('');
-  });

package/src/commands/eject.ts

@@ -1,95 +0,0 @@
-import { confirm } from "@inquirer/prompts";
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "fs";
-import { resolve } from "path";
-import { Command } from "commander";
-import { mergeForEject } from "../utils/eject-merger.js";
-import { readManifest, writeManifest } from "../utils/manifest.js";
-
-export const ejectCommand = new Command("eject")
-  .argument("<component>", "Component name to eject (e.g. button)")
-  .option("--yes", "Skip confirmation prompt")
-  .description(
-    "Merge blueprint + skin into a standalone component. One-way — no re-attach."
-  )
-  .action(
-    async (component: string, options: { yes?: boolean }) => {
-      const projectRoot = process.cwd();
-      const manifest = readManifest(projectRoot);
-
-      if (!manifest?.components[component]) {
-        console.error(`✗ "${component}" not found in manifest`);
-        process.exit(1);
-      }
-
-      const entry = manifest.components[component];
-      const outputDir = resolve(projectRoot, entry["output-dir"], component);
-      const blueprintPath = resolve(
-        outputDir,
-        `${component}.blueprint.ts`
-      );
-      const skinPath = resolve(outputDir, `${component}.skin.ts`);
-      const outputPath = resolve(outputDir, `${component}.component.ts`);
-
-      if (!existsSync(blueprintPath) || !existsSync(skinPath)) {
-        console.error(
-          `✗ Blueprint or skin file not found for "${component}"`
-        );
-        process.exit(1);
-      }
-
-      console.log("");
-      console.log("⚠️  trine eject — THIS IS ONE-WAY");
-      console.log("");
-      console.log(`  Component:  ${component}`);
-      console.log(`  Output:     ${component}.component.ts`);
-      console.log(
-        `  Removes:    ${component}.blueprint.ts + ${component}.skin.ts`
-      );
-      console.log(`  Manifest:   ${component} entry will be deleted`);
-      console.log("");
-      console.log("  Warning:    This cannot be undone.");
-      console.log(
-        "              The component will no longer receive upstream updates."
-      );
-      console.log("");
-
-      const confirmed =
-        options.yes ||
-        (await confirm({
-          message: `Eject "${component}"? This is permanent.`,
-          default: false,
-        }));
-
-      if (!confirmed) {
-        console.log("Aborted.");
-        return;
-      }
-
-      const blueprintContent = readFileSync(blueprintPath, "utf-8");
-      const skinContent = readFileSync(skinPath, "utf-8");
-
-      const merged = mergeForEject(
-        component,
-        blueprintContent,
-        skinContent
-      );
-
-      writeFileSync(outputPath, merged, "utf-8");
-      console.log(`  ✓ ${component}.component.ts written`);
-
-      unlinkSync(blueprintPath);
-      unlinkSync(skinPath);
-      console.log(`  ✓ ${component}.blueprint.ts removed`);
-      console.log(`  ✓ ${component}.skin.ts removed`);
-
-      delete manifest.components[component];
-      writeManifest(manifest, projectRoot);
-      console.log(`  ✓ manifest.json updated`);
-
-      console.log("");
-      console.log(`✓ ${component} ejected.`);
-      console.log(
-        `  Edit ${component}.component.ts directly going forward.`
-      );
-    }
-  );

package/src/commands/init.ts

@@ -1,92 +0,0 @@
-import { Command } from 'commander';
-import { readFileSync, existsSync } from 'fs';
-import { resolve, join } from 'path';
-import { computeNormalizedHash } from '../utils/hash.js';
-import { readManifest, writeManifest } from '../utils/manifest.js';
-import type { ComponentEntry, TrineManifest } from '../types/manifest.js';
-
-const SUPPORTED_COMPONENTS = ['button', 'input', 'dialog', 'checkbox', 'select'];
-
-export const initCommand = new Command('init')
-  .description('Scan project and reconstruct manifest.json from existing blueprint files')
-  .action(async () => {
-    const projectRoot = process.cwd();
-
-    const manifest = readManifest(projectRoot);
-    if (manifest) {
-      console.log('✓ .trine/manifest.json already exists');
-      console.log('  No need to run trine init.');
-      console.log('');
-      console.log('  To check sync status, run: trine diff <component>');
-      return;
-    }
-
-    console.log('Scanning for blueprint files...');
-    console.log('');
-
-    const foundComponents: { name: string; path: string; hash: string }[] = [];
-    const scanDirs = ['src/components/ui', 'components/ui'];
-
-    for (const dir of scanDirs) {
-      const basePath = resolve(projectRoot, dir);
-      if (!existsSync(basePath)) continue;
-
-      for (const component of SUPPORTED_COMPONENTS) {
-        const blueprintPath = join(basePath, component, `${component}.blueprint.ts`);
-        if (existsSync(blueprintPath)) {
-          try {
-            const content = readFileSync(blueprintPath, 'utf-8');
-            const hash = computeNormalizedHash(content);
-            foundComponents.push({ name: component, path: blueprintPath, hash });
-            console.log(`  ✓ Found: ${dir}/${component}/${component}.blueprint.ts`);
-          } catch {
-            console.log(`  ✗ Error reading: ${dir}/${component}/${component}.blueprint.ts`);
-          }
-        }
-      }
-    }
-
-    if (foundComponents.length === 0) {
-      console.log('No blueprint files found.');
-      console.log('');
-      console.log('  To add a component, run:');
-      console.log('    trine add <component>');
-      console.log('');
-      console.log('  Supported components: button, input, dialog, checkbox, select');
-      return;
-    }
-
-    console.log('');
-    console.log(`Found ${foundComponents.length} blueprint file(s)`);
-    console.log('');
-
-    const newManifest: TrineManifest = {
-      'trine-spec': '1.0',
-      components: {},
-    };
-
-    for (const { name, hash } of foundComponents) {
-      const entry: ComponentEntry = {
-        'engine-version': '0.1.0',
-        'blueprint-schema-version': '1.0.0',
-        'blueprint-hash': hash,
-        'blueprint-modified': true,
-        'synced-at': new Date().toISOString(),
-        'sync-model': 'normalized-text-v0.1',
-        'output-dir': 'src/components/ui',
-      };
-      newManifest.components[name] = entry;
-    }
-
-    writeManifest(newManifest, projectRoot);
-
-    console.log('✓ Created .trine/manifest.json');
-    console.log('');
-    console.log('⚠ Warning: blueprint-modified is set to true for all components.');
-    console.log('  This is conservative — run trine diff <component> to verify sync state.');
-    console.log('');
-    console.log('  Next steps:');
-    console.log('    trine diff button   — check button sync status');
-    console.log('    trine diff input    — check input sync status');
-    console.log('    ...');
-  });

package/src/commands/sync-interactive.ts

@@ -1,108 +0,0 @@
-import { createTwoFilesPatch, parsePatch } from "diff";
-import { select } from "@inquirer/prompts";
-import { writeFileSync } from "fs";
-import { computeNormalizedHash } from "../utils/hash.js";
-import type { TrineManifest } from "../types/manifest.js";
-
-interface Hunk {
-  oldStart: number;
-  oldLines: number;
-  newStart: number;
-  newLines: number;
-  lines: string[];
-}
-
-export async function runInteractiveSync(
-  component: string,
-  currentContent: string,
-  upstreamContent: string,
-  blueprintPath: string,
-  manifest: TrineManifest
-): Promise<"merged" | "aborted"> {
-  const patch = createTwoFilesPatch(
-    `${component}.blueprint.ts (yours)`,
-    `${component}.blueprint.ts (upstream)`,
-    currentContent,
-    upstreamContent,
-    "",
-    "",
-    { context: 3 }
-  );
-
-  const parsed = parsePatch(patch);
-  const hunks: Hunk[] =
-    parsed.length > 0 && "hunks" in parsed[0]
-      ? (parsed[0] as unknown as { hunks: Hunk[] }).hunks
-      : [];
-
-  if (hunks.length === 0) {
-    console.log("✓ No differences found.");
-    return "merged";
-  }
-
-  console.log(
-    `\nBlueprint has local changes. Upstream has ${hunks.length} changed hunk(s).\n`
-  );
-
-  const lines = currentContent.split("\n");
-
-  for (let i = 0; i < hunks.length; i++) {
-    const hunk = hunks[i];
-    console.log(`--- Hunk ${i + 1}/${hunks.length} ---`);
-    hunk.lines.forEach((line: string) => {
-      if (line.startsWith("+"))
-        console.log(`  upstream: ${line.slice(1)}`);
-      else if (line.startsWith("-"))
-        console.log(`  yours:    ${line.slice(1)}`);
-    });
-    console.log("");
-
-    const choice = await select({
-      message: "What do you want to do with this hunk?",
-      choices: [
-        {
-          name: "(k) Keep mine",
-          value: "keep",
-          description: "Keep your local version of this hunk",
-        },
-        {
-          name: "(u) Take upstream",
-          value: "upstream",
-          description: "Replace with upstream version",
-        },
-        {
-          name: "(s) Skip (keep mine)",
-          value: "skip",
-          description: "Skip this hunk, keep your version",
-        },
-      ],
-    });
-
-    if (choice === "upstream") {
-      applyHunk(lines, hunk, upstreamContent.split("\n"));
-    }
-  }
-
-  const mergedContent = lines.join("\n");
-  writeFileSync(blueprintPath, mergedContent, "utf-8");
-
-  manifest.components[component]["blueprint-hash"] =
-    computeNormalizedHash(mergedContent);
-  manifest.components[component]["blueprint-modified"] = false;
-  manifest.components[component]["synced-at"] = new Date().toISOString();
-
-  console.log("\n✓ Merged. Writing blueprint...");
-  return "merged";
-}
-
-function applyHunk(
-  lines: string[],
-  hunk: Hunk,
-  upstreamLines: string[]
-): void {
-  const start = hunk.oldStart - 1;
-  const end = start + hunk.oldLines;
-
-  const upstreamSection = upstreamLines.slice(start, end);
-  lines.splice(start, hunk.oldLines, ...upstreamSection);
-}

package/src/commands/sync.test.ts

@@ -1,35 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { computeNormalizedHash } from '../utils/hash.js';
-
-describe('sync logic', () => {
-  it('same normalized hash → "untouched" path selected', () => {
-    const content = `@Component({ selector: 'ui-button' })`;
-    const hash1 = computeNormalizedHash(content);
-    const hash2 = computeNormalizedHash(content);
-    expect(hash1).toBe(hash2);
-  });
-
-  it('different hash → "modified" path selected (dirty detection correct)', () => {
-    const v1 = `@Component({ selector: 'ui-button' })`;
-    const v2 = `@Component({ selector: 'ui-btn' })`;
-    expect(computeNormalizedHash(v1)).not.toBe(computeNormalizedHash(v2));
-  });
-
-  it('skin content identical before and after sync (skin safety invariant)', () => {
-    const skinBefore = `@Injectable() export class ButtonSkin { classes = 'btn'; }`;
-    const skinAfter = skinBefore;
-    expect(skinBefore).toBe(skinAfter);
-  });
-
-  it('comment changes do not affect hash (normalized)', () => {
-    const withComment = `@Component({ selector: 'ui-button' }) // comment`;
-    const withoutComment = `@Component({ selector: 'ui-button' })`;
-    expect(computeNormalizedHash(withComment)).toBe(computeNormalizedHash(withoutComment));
-  });
-
-  it('upstream version change creates different hash', () => {
-    const v1 = `export class ButtonComponent { protected engine = inject(ButtonEngine); }`;
-    const v2 = `export class ButtonComponent { static readonly version = '0.2.0'; protected engine = inject(ButtonEngine); }`;
-    expect(computeNormalizedHash(v1)).not.toBe(computeNormalizedHash(v2));
-  });
-});

package/src/commands/sync.ts

@@ -1,113 +0,0 @@
-import { Command } from 'commander';
-import { writeFileSync, existsSync, readFileSync } from 'fs';
-import { resolve } from 'path';
-import { computeNormalizedHash } from '../utils/hash.js';
-import { readManifest, writeManifest } from '../utils/manifest.js';
-import { renderTemplate } from '../utils/template.js';
-import { runInteractiveSync } from './sync-interactive.js';
-
-export const syncCommand = new Command('sync')
-  .argument('<component>', 'Component name (e.g. button)')
-  .option('--interactive', 'Interactive 3-way merge for resolving conflicts')
-  .option('--dry-run', 'Show what would be synced without making changes')
-  .description('Sync blueprint with latest upstream version')
-  .action(async (component: string, options: { interactive?: boolean; dryRun?: boolean }) => {
-    const projectRoot = process.cwd();
-
-    const manifest = readManifest(projectRoot);
-    if (!manifest?.components[component]) {
-      console.error(`✗ "${component}" not found in manifest`);
-      console.error(`  Run: trine add ${component}`);
-      process.exit(1);
-    }
-
-    const entry = manifest.components[component];
-
-    const blueprintPath = resolve(
-      projectRoot,
-      entry['output-dir'],
-      component,
-      `${component}.blueprint.ts`
-    );
-
-    if (!existsSync(blueprintPath)) {
-      console.error(`✗ Blueprint file not found: ${blueprintPath}`);
-      console.error(`  Run: trine add ${component}`);
-      process.exit(1);
-    }
-
-    const currentContent = readFileSync(blueprintPath, 'utf-8');
-    const currentHash = computeNormalizedHash(currentContent);
-    const manifestHash = entry['blueprint-hash'];
-
-    const upstreamContent = renderTemplate(`${component}.blueprint.ts.hbs`, {
-      engineVersion: entry['engine-version'],
-      blueprintSchemaVersion: entry['blueprint-schema-version'],
-    });
-
-    const upstreamHash = computeNormalizedHash(upstreamContent);
-
-    if (options.interactive) {
-      if (currentHash === manifestHash) {
-        console.log('✓ No local changes to merge.');
-        return;
-      }
-
-      const result = await runInteractiveSync(
-        component,
-        currentContent,
-        upstreamContent,
-        blueprintPath,
-        manifest
-      );
-      if (result === 'merged') {
-        writeManifest(manifest, projectRoot);
-        console.log('✓ manifest.json updated.');
-      }
-      return;
-    }
-
-    if (currentHash !== manifestHash) {
-      console.error('✗ Cannot auto-sync: blueprint has local modifications');
-      console.error('');
-      console.error(`  Local changes detected in: ${component}.blueprint.ts`);
-      console.error('');
-      console.error('  Options:');
-      console.error(`    trine sync ${component} --interactive    Resolve conflicts interactively`);
-      console.error(`    trine diff ${component}                  See what changed upstream`);
-      console.error(`    trine add ${component} --force           Overwrite (loses your changes)`);
-      console.error('');
-      console.error('  Tip: Run "trine diff" first to understand the changes.');
-      process.exit(1);
-    }
-
-    if (upstreamHash === manifestHash) {
-      console.log(`✓ ${component} blueprint already up to date`);
-      console.log('');
-      console.log('  Nothing to sync.');
-      return;
-    }
-
-    if (options.dryRun) {
-      console.log(`[dry-run] Would sync ${component} blueprint`);
-      console.log(`[dry-run] Blueprint: ${entry['output-dir']}/${component}/${component}.blueprint.ts`);
-      console.log('[dry-run] Skin: (not touched - user-owned)');
-      return;
-    }
-
-    writeFileSync(blueprintPath, upstreamContent, 'utf-8');
-
-    const newHash = computeNormalizedHash(upstreamContent);
-    entry['blueprint-hash'] = newHash;
-    entry['synced-at'] = new Date().toISOString();
-
-    writeManifest(manifest, projectRoot);
-
-    console.log(`✓ ${component} blueprint synced successfully`);
-    console.log('');
-    console.log('  Updates applied:');
-    console.log('    blueprint: updated');
-    console.log('    skin:      unchanged (user-owned)');
-    console.log('');
-    console.log(`  Run: trine diff ${component}   — check for more upstream changes`);
-  });

package/src/index.ts

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-import { Command } from 'commander';
-import { addCommand } from './commands/add.js';
-import { diffCommand } from './commands/diff.js';
-import { syncCommand } from './commands/sync.js';
-import { ejectCommand } from './commands/eject.js';
-import { initCommand } from './commands/init.js';
-
-const program = new Command();
-program.name('trine').description('Trine CLI').version('0.1.0');
-
-program.addCommand(addCommand);
-program.addCommand(diffCommand);
-program.addCommand(syncCommand);
-program.addCommand(ejectCommand);
-program.addCommand(initCommand);
-
-program.parse();

package/src/types/manifest.ts

@@ -1,14 +0,0 @@
-export interface TrineManifest {
-  'trine-spec': '1.0';
-  components: Record<string, ComponentEntry>;
-}
-
-export interface ComponentEntry {
-  'engine-version': string;
-  'blueprint-schema-version': string;
-  'blueprint-hash': string;
-  'blueprint-modified': boolean;
-  'synced-at': string;
-  'sync-model': 'normalized-text-v0.1';
-  'output-dir': string;
-}

package/src/utils/__tests__/hash.test.ts

@@ -1,35 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { computeNormalizedHash } from '../hash.js';
-
-describe('computeNormalizedHash', () => {
-  it('ค่าเหมือนเดิมหลัง Prettier reformat whitespace', () => {
-    const original = `@Component({
-  selector: 'ui-button',
-})`;
-    const prettified = `@Component({ selector: 'ui-button' })`;
-    expect(computeNormalizedHash(original))
-      .toBe(computeNormalizedHash(prettified));
-  });
-
-  it('ค่าเหมือนเดิมหลังเพิ่ม/ลบ comment', () => {
-    const withComment = `// This is generated
-@Component({})`;
-    const withoutComment = `@Component({})`;
-    expect(computeNormalizedHash(withComment))
-      .toBe(computeNormalizedHash(withoutComment));
-  });
-
-  it('ค่าต่างเมื่อเปลี่ยน structure จริง', () => {
-    const v1 = `@Component({ selector: 'ui-button' })`;
-    const v2 = `@Component({ selector: 'ui-btn' })`;
-    expect(computeNormalizedHash(v1))
-      .not.toBe(computeNormalizedHash(v2));
-  });
-
-  it('import reorder ไม่เปลี่ยน hash', () => {
-    const order1 = `import { A } from 'a';\nimport { B } from 'b';`;
-    const order2 = `import { B } from 'b';\nimport { A } from 'a';`;
-    expect(computeNormalizedHash(order1))
-      .toBe(computeNormalizedHash(order2));
-  });
-});

package/src/utils/__tests__/template.test.ts

@@ -1,47 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { renderTemplate } from '../template.js';
-
-describe('template rendering', () => {
-  it('renders blueprint template without unresolved placeholders', () => {
-    const result = renderTemplate('button.blueprint.ts.hbs', {
-      engineVersion: '0.1.0',
-      blueprintSchemaVersion: '1.0.0',
-    });
-    expect(result).not.toContain('{{');
-    expect(result).not.toContain('}}');
-    expect(result).toContain("selector: 'ui-button'");
-    expect(result).toContain('ButtonEngine');
-    expect(result).toContain('BUTTON_STYLING_CONTRACT');
-  });
-
-  it('renders skin template without ButtonEngine reference', () => {
-    const result = renderTemplate('button.skin.ts.hbs', {
-      engineVersion: '0.1.0',
-      blueprintSchemaVersion: '1.0.0',
-    });
-    expect(result).not.toContain('{{');
-    expect(result).toContain('BUTTON_STYLING_CONTRACT');
-    expect(result).not.toMatch(/import.*ButtonEngine/);
-    expect(result).not.toMatch(/inject\(ButtonEngine\)/);
-  });
-
-  it('injects engine version into blueprint header', () => {
-    const result = renderTemplate('button.blueprint.ts.hbs', {
-      engineVersion: '1.2.3',
-      blueprintSchemaVersion: '2.0.0',
-    });
-    expect(result).toContain('1.2.3');
-    expect(result).toContain('2.0.0');
-  });
-
-  it('skin template includes all variants including brand', () => {
-    const result = renderTemplate('button.skin.ts.hbs', {
-      engineVersion: '0.1.0',
-      blueprintSchemaVersion: '1.0.0',
-    });
-    expect(result).toContain('solid');
-    expect(result).toContain('outline');
-    expect(result).toContain('ghost');
-    expect(result).toContain('brand');
-  });
-});