basuicn 0.2.11 → 0.3.1

package/scripts/build-registry.ts

@@ -2,6 +2,7 @@ import fs from 'fs';
 import path from 'path';
 
 const COMPONENTS_DIR = './src/components/ui';
+const HOOKS_DIR = './src/hooks';
 const OUTPUT_FILE = './registry.json';
 
 // Directories to exclude from registry (not reusable components)
@@ -110,6 +111,44 @@ const getInternalDeps = (content: string, currentDirName: string): string[] => {
   return [...internalDeps];
 };
 
+/** Collect hook files imported via `@/hooks/xxx` in any of the given source files */
+const collectHookFiles = (sourceFiles: string[]): RegistryFile[] => {
+  const seen = new Set<string>();
+  const hookFiles: RegistryFile[] = [];
+
+  for (const file of sourceFiles) {
+    let content: string;
+    try { content = fs.readFileSync(file, 'utf-8'); } catch { continue; }
+
+    const hookRegex = /from\s+['"]@\/hooks\/([^'"]+)['"]/g;
+    let match;
+    while ((match = hookRegex.exec(content)) !== null) {
+      // Normalise: strip extension if present, then try .ts and .tsx
+      const rawName = match[1].replace(/\.(ts|tsx)$/, '');
+      if (seen.has(rawName)) continue;
+
+      const candidates = [
+        path.join(HOOKS_DIR, `${rawName}.ts`),
+        path.join(HOOKS_DIR, `${rawName}.tsx`),
+        path.join(HOOKS_DIR, rawName, 'index.ts'),
+      ];
+
+      for (const candidate of candidates) {
+        if (fs.existsSync(candidate)) {
+          seen.add(rawName);
+          hookFiles.push({
+            path: candidate.replace(/\\/g, '/').replace(/^\.\//, ''),
+            content: fs.readFileSync(candidate, 'utf-8'),
+          });
+          break;
+        }
+      }
+    }
+  }
+
+  return hookFiles;
+};
+
 const buildRegistry = () => {
   console.log('Building component registry...');
 
@@ -183,21 +222,26 @@ const buildRegistry = () => {
       }
     }
 
+    // Collect any hook files this component imports from @/hooks/
+    const hookFiles = collectHookFiles(files);
+
+    const componentFiles: RegistryFile[] = files.map((f) => {
+      try {
+        return {
+          path: f.replace(/\\/g, '/').replace(/^\.\//, ''),
+          content: fs.readFileSync(f, 'utf-8'),
+        };
+      } catch (err) {
+        console.warn(`Failed to read ${f}: ${err}`);
+        return { path: f.replace(/\\/g, '/').replace(/^\.\//, ''), content: '' };
+      }
+    }).filter(f => f.content !== '');
+
     registry.components[dirName] = {
       name: dirName,
       dependencies: [...allDependencies],
       internalDependencies: [...allInternalDeps],
-      files: files.map((f) => {
-        try {
-          return {
-            path: f.replace(/\\/g, '/').replace(/^\.\//, ''),
-            content: fs.readFileSync(f, 'utf-8'),
-          };
-        } catch (err) {
-          console.warn(`Failed to read ${f}: ${err}`);
-          return { path: f.replace(/\\/g, '/').replace(/^\.\//, ''), content: '' };
-        }
-      }).filter(f => f.content !== ''),
+      files: [...componentFiles, ...hookFiles],
     };
   }
 

package/scripts/bump-version.mjs

@@ -1,22 +1,22 @@
-import fs from 'fs';
-import { execSync } from 'child_process';
-
-// Skip if triggered by a version bump commit (avoid infinite loop)
-const lastMsg = execSync('git log -1 --pretty=%s').toString().trim();
-if (lastMsg.startsWith('chore: bump version')) process.exit(0);
-
-const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
-const [major, minor, patch] = pkg.version.split('.').map(Number);
-const newVersion = `${major}.${minor}.${patch + 1}`;
-
-pkg.version = newVersion;
-fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\n');
-
-let cli = fs.readFileSync('./scripts/ui-cli.ts', 'utf-8');
-cli = cli.replace(/const VERSION = '[^']+';/, `const VERSION = '${newVersion}';`);
-fs.writeFileSync('./scripts/ui-cli.ts', cli);
-
-execSync('git add package.json scripts/ui-cli.ts');
-execSync(`git commit --no-verify -m "chore: bump version to ${newVersion}"`);
-
-console.log(`\x1b[32m✔\x1b[0m Bumped version → ${newVersion}`);
+import fs from 'fs';
+import { execSync } from 'child_process';
+
+// Skip if triggered by a version bump commit (avoid infinite loop)
+const lastMsg = execSync('git log -1 --pretty=%s').toString().trim();
+if (lastMsg.startsWith('chore: bump version')) process.exit(0);
+
+const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
+const [major, minor, patch] = pkg.version.split('.').map(Number);
+const newVersion = `${major}.${minor}.${patch + 1}`;
+
+pkg.version = newVersion;
+fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\n');
+
+let cli = fs.readFileSync('./scripts/ui-cli.ts', 'utf-8');
+cli = cli.replace(/const VERSION = '[^']+';/, `const VERSION = '${newVersion}';`);
+fs.writeFileSync('./scripts/ui-cli.ts', cli);
+
+execSync('git add package.json scripts/ui-cli.ts');
+execSync(`git commit --no-verify -m "chore: bump version to ${newVersion}"`);
+
+console.log(`\x1b[32m✔\x1b[0m Bumped version → ${newVersion}`);

package/scripts/generate-theme-css.ts

@@ -1,74 +1,74 @@
-/**
- * Syncs the default theme CSS variables from themes.ts → src/styles/index.css.
- * Run via: npm run theme:sync
- *
- * Replaces the content between:
- *   /* GENERATED:theme-start *\/
- *   /* GENERATED:theme-end *\/
- * in index.css with fresh values from themes[0].
- */
-
-import fs from 'fs';
-import path from 'path';
-import { themes } from '../src/lib/theme/themes';
-
-const CSS_PATH = path.resolve('src/styles/index.css');
-const START_MARKER = '/* GENERATED:theme-start */';
-const END_MARKER   = '/* GENERATED:theme-end */';
-
-const INDENT = '        '; // 8 spaces — matches :root { } indentation in index.css
-
-const { colors: c } = themes[0];
-const vars: [string, string][] = [
-    ['--background',              c.background],
-    ['--foreground',              c.foreground],
-    ['--primary',                 c.primary],
-    ['--primary-foreground',      c.primaryForeground],
-    ['--secondary',               c.secondary],
-    ['--secondary-foreground',    c.secondaryForeground],
-    ['--muted',                   c.muted],
-    ['--muted-foreground',        c.mutedForeground],
-    ['--accent',                  c.accent],
-    ['--accent-foreground',       c.accentForeground],
-    ['--success',                 c.success],
-    ['--success-foreground',      c.successForeground],
-    ['--warning',                 c.warning],
-    ['--warning-foreground',      c.warningForeground],
-    ['--danger',                  c.danger],
-    ['--danger-foreground',       c.dangerForeground],
-    ['--destructive',             c.danger],
-    ['--destructive-foreground',  c.dangerForeground],
-    ['--border',                  c.border],
-    ['--input',                   c.input],
-    ['--ring',                    c.ring],
-    ['--popover',                 c.popover],
-    ['--popover-foreground',      c.popoverForeground],
-];
-
-const generated = [
-    START_MARKER,
-    `${INDENT}/* Auto-generated from themes.ts — run \`npm run theme:sync\` to update */`,
-    ...vars.map(([k, v]) => `${INDENT}${k}: ${v};`),
-    `${INDENT}${END_MARKER}`,
-].join('\n');
-
-const css = fs.readFileSync(CSS_PATH, 'utf-8');
-
-const startIdx = css.indexOf(START_MARKER);
-const endIdx   = css.indexOf(END_MARKER);
-
-if (startIdx === -1 || endIdx === -1) {
-    console.error(
-        `[theme:sync] Markers not found in ${CSS_PATH}.\n` +
-        `Add these two comments inside @layer base :root { }:\n\n` +
-        `  ${START_MARKER}\n  ${END_MARKER}\n`
-    );
-    process.exit(1);
-}
-
-const before = css.slice(0, startIdx);
-const after  = css.slice(endIdx + END_MARKER.length);
-const result = before + generated + after;
-
-fs.writeFileSync(CSS_PATH, result, 'utf-8');
-console.log(`[theme:sync] Synced default theme "${themes[0].name}" → ${CSS_PATH}`);
+/**
+ * Syncs the default theme CSS variables from themes.ts → src/styles/index.css.
+ * Run via: npm run theme:sync
+ *
+ * Replaces the content between:
+ *   /* GENERATED:theme-start *\/
+ *   /* GENERATED:theme-end *\/
+ * in index.css with fresh values from themes[0].
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { themes } from '../src/lib/theme/themes';
+
+const CSS_PATH = path.resolve('src/styles/index.css');
+const START_MARKER = '/* GENERATED:theme-start */';
+const END_MARKER   = '/* GENERATED:theme-end */';
+
+const INDENT = '        '; // 8 spaces — matches :root { } indentation in index.css
+
+const { colors: c } = themes[0];
+const vars: [string, string][] = [
+    ['--background',              c.background],
+    ['--foreground',              c.foreground],
+    ['--primary',                 c.primary],
+    ['--primary-foreground',      c.primaryForeground],
+    ['--secondary',               c.secondary],
+    ['--secondary-foreground',    c.secondaryForeground],
+    ['--muted',                   c.muted],
+    ['--muted-foreground',        c.mutedForeground],
+    ['--accent',                  c.accent],
+    ['--accent-foreground',       c.accentForeground],
+    ['--success',                 c.success],
+    ['--success-foreground',      c.successForeground],
+    ['--warning',                 c.warning],
+    ['--warning-foreground',      c.warningForeground],
+    ['--danger',                  c.danger],
+    ['--danger-foreground',       c.dangerForeground],
+    ['--destructive',             c.danger],
+    ['--destructive-foreground',  c.dangerForeground],
+    ['--border',                  c.border],
+    ['--input',                   c.input],
+    ['--ring',                    c.ring],
+    ['--popover',                 c.popover],
+    ['--popover-foreground',      c.popoverForeground],
+];
+
+const generated = [
+    START_MARKER,
+    `${INDENT}/* Auto-generated from themes.ts — run \`npm run theme:sync\` to update */`,
+    ...vars.map(([k, v]) => `${INDENT}${k}: ${v};`),
+    `${INDENT}${END_MARKER}`,
+].join('\n');
+
+const css = fs.readFileSync(CSS_PATH, 'utf-8');
+
+const startIdx = css.indexOf(START_MARKER);
+const endIdx   = css.indexOf(END_MARKER);
+
+if (startIdx === -1 || endIdx === -1) {
+    console.error(
+        `[theme:sync] Markers not found in ${CSS_PATH}.\n` +
+        `Add these two comments inside @layer base :root { }:\n\n` +
+        `  ${START_MARKER}\n  ${END_MARKER}\n`
+    );
+    process.exit(1);
+}
+
+const before = css.slice(0, startIdx);
+const after  = css.slice(endIdx + END_MARKER.length);
+const result = before + generated + after;
+
+fs.writeFileSync(CSS_PATH, result, 'utf-8');
+console.log(`[theme:sync] Synced default theme "${themes[0].name}" → ${CSS_PATH}`);

package/scripts/set-version.mjs

@@ -1,31 +1,31 @@
-import fs from 'fs';
-
-const arg = process.argv[2];
-if (!arg) {
-  console.error('Usage: node scripts/set-version.mjs <version|major|minor|patch>');
-  console.error('  Examples: node scripts/set-version.mjs 1.0.0');
-  console.error('            node scripts/set-version.mjs major');
-  process.exit(1);
-}
-
-const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
-const [major, minor, patch] = pkg.version.split('.').map(Number);
-
-let newVersion;
-if (arg === 'major') newVersion = `${major + 1}.0.0`;
-else if (arg === 'minor') newVersion = `${major}.${minor + 1}.0`;
-else if (arg === 'patch') newVersion = `${major}.${minor}.${patch + 1}`;
-else if (/^\d+\.\d+\.\d+$/.test(arg)) newVersion = arg;
-else {
-  console.error(`Invalid version: "${arg}"`);
-  process.exit(1);
-}
-
-pkg.version = newVersion;
-fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\n');
-
-let cli = fs.readFileSync('./scripts/ui-cli.ts', 'utf-8');
-cli = cli.replace(/const VERSION = '[^']+';/, `const VERSION = '${newVersion}';`);
-fs.writeFileSync('./scripts/ui-cli.ts', cli);
-
-console.log(`\x1b[32m✔\x1b[0m Version set → ${newVersion}`);
+import fs from 'fs';
+
+const arg = process.argv[2];
+if (!arg) {
+  console.error('Usage: node scripts/set-version.mjs <version|major|minor|patch>');
+  console.error('  Examples: node scripts/set-version.mjs 1.0.0');
+  console.error('            node scripts/set-version.mjs major');
+  process.exit(1);
+}
+
+const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf-8'));
+const [major, minor, patch] = pkg.version.split('.').map(Number);
+
+let newVersion;
+if (arg === 'major') newVersion = `${major + 1}.0.0`;
+else if (arg === 'minor') newVersion = `${major}.${minor + 1}.0`;
+else if (arg === 'patch') newVersion = `${major}.${minor}.${patch + 1}`;
+else if (/^\d+\.\d+\.\d+$/.test(arg)) newVersion = arg;
+else {
+  console.error(`Invalid version: "${arg}"`);
+  process.exit(1);
+}
+
+pkg.version = newVersion;
+fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2) + '\n');
+
+let cli = fs.readFileSync('./scripts/ui-cli.ts', 'utf-8');
+cli = cli.replace(/const VERSION = '[^']+';/, `const VERSION = '${newVersion}';`);
+fs.writeFileSync('./scripts/ui-cli.ts', cli);
+
+console.log(`\x1b[32m✔\x1b[0m Version set → ${newVersion}`);

package/scripts/ui-cli.ts

@@ -6,7 +6,7 @@ import readline from 'readline';
 
 // ─── Constants ────────────────────────────────────────────────────────────────
 
-const VERSION = '0.2.11';
+const VERSION = '0.3.1';
 const REGISTRY_LOCAL = './registry.json';
 const REGISTRY_REMOTE = 'https://raw.githubusercontent.com/Basuicn/basuicn-core/main/registry.json';
 
@@ -685,6 +685,62 @@ const patchMainTsxComponent = (cwd: string, componentName: string) => {
     ok(`Added <${tagName}> to ${path.relative(cwd, mainPath)}.`);
 };
 
+// ─── index.ts barrel update ───────────────────────────────────────────────────
+
+const UI_INDEX_PATH = 'src/components/ui/index.ts';
+const UI_INDEX_DIR  = 'src/components/ui';
+
+/** Pick the primary .tsx component file (skip tests, stories, hooks) */
+const pickMainFile = (files: RegistryFile[]): RegistryFile | undefined =>
+    files.find(
+        (f) =>
+            f.path.startsWith(UI_INDEX_DIR + '/') &&
+            f.path.endsWith('.tsx') &&
+            !f.path.includes('.test.') &&
+            !f.path.includes('.stories.'),
+    );
+
+/** Append `export * from './dir/File';` to index.ts if not already present */
+const addToComponentIndex = (componentFiles: RegistryFile[], cwd: string) => {
+    const indexPath = path.join(cwd, UI_INDEX_PATH);
+    if (!fs.existsSync(indexPath)) return;
+
+    const mainFile = pickMainFile(componentFiles);
+    if (!mainFile) return;
+
+    const withoutExt = mainFile.path.replace(/\.tsx$/, '');
+    const relPath = './' + path.relative(UI_INDEX_DIR, withoutExt).replace(/\\/g, '/');
+    const exportLine = `export * from '${relPath}';`;
+
+    const content = fs.readFileSync(indexPath, 'utf-8');
+    if (content.includes(relPath)) return;
+
+    fs.writeFileSync(indexPath, content.trimEnd() + '\n' + exportLine + '\n');
+    ok(`Updated index.ts: added ${c.dim}${relPath}${c.reset}`);
+};
+
+/** Remove the export line from index.ts */
+const removeFromComponentIndex = (componentFiles: RegistryFile[], cwd: string) => {
+    const indexPath = path.join(cwd, UI_INDEX_PATH);
+    if (!fs.existsSync(indexPath)) return;
+
+    const mainFile = pickMainFile(componentFiles);
+    if (!mainFile) return;
+
+    const withoutExt = mainFile.path.replace(/\.tsx$/, '');
+    const relPath = './' + path.relative(UI_INDEX_DIR, withoutExt).replace(/\\/g, '/');
+
+    const content = fs.readFileSync(indexPath, 'utf-8');
+    const filtered = content
+        .split('\n')
+        .filter((line) => !line.includes(relPath))
+        .join('\n');
+
+    if (filtered === content) return;
+    fs.writeFileSync(indexPath, filtered);
+    ok(`Updated index.ts: removed ${c.dim}${relPath}${c.reset}`);
+};
+
 // ─── Component add/remove ─────────────────────────────────────────────────────
 
 const addComponent = (
@@ -738,6 +794,8 @@ const addComponent = (
         fs.writeFileSync(targetPath, content);
         ok(`Created: ${file.path}`);
     }
+
+    addToComponentIndex(component.files, cwd);
 };
 
 const removeComponent = (
@@ -772,6 +830,8 @@ const removeComponent = (
             warn(`Could not remove directory: ${err instanceof Error ? err.message : err}`);
         }
     }
+
+    removeFromComponentIndex(component.files as RegistryFile[], cwd);
 };
 
 // ─── Help texts ───────────────────────────────────────────────────────────────