components-differ 1.2.2 → 1.2.3

package/src/release.ts

@@ -0,0 +1,71 @@
+import { spawnSync } from "node:child_process";
+
+type VersionBump = "patch" | "minor" | "major";
+
+function run(command: string, args: string[] = []) {
+  const full = [command, ...args].join(" ");
+  console.log(`\n$ ${full}`);
+
+  const result = spawnSync(command, args, {
+    stdio: "inherit",
+    shell: process.platform === "win32",
+  });
+
+  if (result.status !== 0) {
+    console.error(`\nCommand failed: ${full}`);
+    process.exit(result.status === null ? 1 : result.status);
+  }
+}
+
+function getVersionBumpFromArgs(): VersionBump {
+  const type = (process.argv[2] as VersionBump | undefined) ?? "patch";
+  if (!["patch", "minor", "major"].includes(type)) {
+    console.error(
+      `Invalid version bump "${type}". Use one of: patch, minor, major.`
+    );
+    process.exit(1);
+  }
+  return type;
+}
+
+function ensureCleanGit() {
+  const result = spawnSync("git", ["status", "--porcelain"], {
+    encoding: "utf8",
+  });
+
+  if (result.status !== 0) {
+    console.error("Failed to check git status.");
+    process.exit(1);
+  }
+
+  if ((result.stdout ?? "").trim().length > 0) {
+    console.error(
+      "Git working tree is not clean. Commit or stash your changes before releasing."
+    );
+    process.exit(1);
+  }
+}
+
+async function main() {
+  const bump = getVersionBumpFromArgs();
+
+  console.log("Ensuring clean git working tree...");
+  ensureCleanGit();
+
+  console.log("\nBuilding project...");
+  run("npm", ["run", "build"]);
+
+  console.log(`\nBumping version (${bump})...`);
+  run("npm", ["version", bump]);
+
+  console.log("\nPublishing to npm...");
+  run("npm", ["publish"]);
+
+  console.log("\nRelease complete.");
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
+

package/src/resolve-imports.ts

@@ -0,0 +1,121 @@
+import path from "node:path";
+import type { ComponentsConfig } from "./components.js";
+import { extractPathSpecifiers } from "./extract-imports.js";
+import type { ScannedFile } from "./git.js";
+
+const EXTENSIONS = [".tsx", ".ts", ".jsx", ".js", ".mts", ".mjs", ".cts", ".cjs"];
+const INDEX_NAMES = ["index.tsx", "index.ts", "index.jsx", "index.js"];
+
+/** Build [aliasPrefix, pathPrefix] pairs, longest first. pathPrefix is project-relative (e.g. src/lib when isSrcDir). */
+function getAliasEntries(config: ComponentsConfig & { isSrcDir?: boolean }): [string, string][] {
+  const entries: [string, string][] = [];
+  const prefix = config.isSrcDir ? "src/" : "";
+  const keys: (keyof ComponentsConfig)[] = ["components", "utils", "ui", "lib", "hooks"];
+  for (const k of keys) {
+    const v = config[k];
+    if (typeof v === "string" && v.startsWith("@/")) {
+      const pathPart = v.replace(/^@\//, "").replace(/\/$/, "");
+      entries.push([v.replace(/\/$/, ""), prefix + pathPart]);
+    }
+  }
+  entries.push(["@", config.isSrcDir ? "src" : ""]);
+  entries.sort((a, b) => b[0].length - a[0].length);
+  return entries;
+}
+
+/**
+ * Resolve a path-like import specifier to a project-relative file path.
+ * Tries common extensions and /index.*. Returns the first path that exists in projectPaths.
+ */
+function resolveSpecifier(
+  specifier: string,
+  fromFilePath: string,
+  aliasEntries: [string, string][],
+  projectPaths: Set<string>,
+  rootFallback: string,
+): string | null {
+  const normalizedFrom = fromFilePath.replace(/\\/g, "/");
+  const fromDir = path.dirname(normalizedFrom).replace(/\\/g, "/");
+
+  let candidate: string;
+
+  if (specifier.startsWith(".") || specifier.startsWith("/")) {
+    candidate = path.normalize(path.join(fromDir, specifier)).replace(/\\/g, "/");
+  } else {
+    // Alias: @/components/Button -> components/Button
+    let matched = false;
+    for (const [aliasPrefix, pathPrefix] of aliasEntries) {
+      const prefix = aliasPrefix === "@" ? "@/" : aliasPrefix.endsWith("/") ? aliasPrefix : aliasPrefix + "/";
+      if (specifier === aliasPrefix || specifier.startsWith(prefix)) {
+        const suffix = specifier.slice(prefix.length).replace(/^\//, "");
+        candidate = path.normalize(path.join(pathPrefix, suffix)).replace(/\\/g, "/");
+        matched = true;
+        break;
+      }
+    }
+    if (!matched) {
+      const suffix = specifier.replace(/^@\//, "").replace(/^~\//, "");
+      candidate = path.normalize(path.join(rootFallback, suffix)).replace(/\\/g, "/");
+    }
+  }
+
+  if (!candidate) return null;
+  if (projectPaths.has(candidate)) return candidate;
+
+  for (const ext of EXTENSIONS) {
+    const p = candidate.endsWith(ext) ? candidate : candidate + ext;
+    if (projectPaths.has(p)) return p;
+  }
+  for (const name of INDEX_NAMES) {
+    const p = candidate.endsWith("/") ? candidate + name : candidate + "/" + name;
+    if (projectPaths.has(p)) return p;
+  }
+  return null;
+}
+
+/**
+ * Expand the list of included files by recursively adding any project file
+ * that is imported (via relative or alias path) by an already-included file.
+ * Uses TypeScript/JS import syntax only.
+ */
+export function expandIncludedFiles(
+  includedFiles: ScannedFile[],
+  allProjectFiles: ScannedFile[],
+  config: ComponentsConfig & { isSrcDir?: boolean },
+): ScannedFile[] {
+  const projectPathToFile = new Map<string, ScannedFile>();
+  for (const f of allProjectFiles) {
+    const key = f.path.replace(/\\/g, "/");
+    projectPathToFile.set(key, f);
+  }
+  const projectPaths = new Set(projectPathToFile.keys());
+  const aliasEntries = getAliasEntries(config);
+  const rootFallback = config.isSrcDir ? "src" : "";
+
+  const includedPaths = new Set<string>();
+  for (const f of includedFiles) {
+    includedPaths.add(f.path.replace(/\\/g, "/"));
+  }
+
+  let added = true;
+  while (added) {
+    added = false;
+    for (const file of [...includedFiles]) {
+      const content = file.content;
+      const fromPath = file.path.replace(/\\/g, "/");
+      for (const spec of extractPathSpecifiers(content)) {
+        const resolved = resolveSpecifier(spec, fromPath, aliasEntries, projectPaths, rootFallback);
+        if (resolved && !includedPaths.has(resolved)) {
+          const scanned = projectPathToFile.get(resolved);
+          if (scanned) {
+            includedFiles.push(scanned);
+            includedPaths.add(resolved);
+            added = true;
+          }
+        }
+      }
+    }
+  }
+
+  return includedFiles;
+}

package/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "rootDir": "src",
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": false,
+    "skipLibCheck": true
+  },
+  "include": ["src"]
+}

package/dist/index.mjs

@@ -1,114 +0,0 @@
-#!/usr/bin/env node
-
-import fs from "node:fs";
-import path from "node:path";
-import { program } from "commander";
-
-import { scanForAlteredFiles, scanForFiles, hasSrcDir } from "./src/git.mjs";
-import { readComponentsManifest } from "./src/components.mjs";
-import { createDiff } from "./src/create-diff.mjs";
-import { execSync } from "node:child_process";
-
-
-program.option("-n, --name <name>").option('--init');
-program.parse();
-
-const options = program.opts();
-
-const runCommand = (command) => {
-  try {
-    execSync(command, { stdio: "inherit" });
-  } catch (error) {
-    console.error(`Failed to execute command: ${command}`);
-    process.exit(1);
-  }
-};
-
-const ensureGitignore = () => {
-  const gitignorePath = path.join(process.cwd(), ".gitignore");
-  if (!fs.existsSync(gitignorePath)) {
-    console.log(".gitignore file is missing. Creating one...");
-    const content = `
-/node_modules
-/.pnp
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/versions
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# env files (can opt-in for committing if needed)
-.env*
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
-`;
-    fs.writeFileSync(gitignorePath, content, "utf8");
-    console.log(".gitignore file created with default rules.");
-  } else {
-    console.log(".gitignore file already exists.");
-  }
-};
-
-const main = () => {
-  if (options.init) {
-    console.log("Initializing git repository for new component");
-    // Cross-platform logic
-    if (process.platform === "win32") {
-      runCommand("rmdir /s /q .git && git init && git add . && git commit -m \"Initial commit\"");
-    } else {
-      runCommand("rm -fr .git && git init && git add . && git commit -m \"Initial commit\"");
-    }
-    ensureGitignore()
-    return;
-  }
-
-  const name = options.name || path.basename(process.cwd());
-
-  const { alteredFiles, specificFiles } = scanForAlteredFiles([
-    "./package.json",
-  ]);
-  const currentFiles = scanForFiles(process.cwd());
-
-  const currentPackageJson = fs.readFileSync("./package.json", "utf-8");
-
-  const config = readComponentsManifest(process.cwd());
-  config.isSrcDir = hasSrcDir(process.cwd());
-
-  const output = createDiff({
-    name,
-    config,
-    alteredFiles,
-    currentFiles,
-    specificFiles,
-    currentPackageJson,
-  });
-
-  console.log(JSON.stringify(output, null, 2));
-};
-
-main();

package/dist/src/components.mjs

@@ -1,111 +0,0 @@
-import path from "node:path";
-import fs from "node:fs";
-
-const WHITELISTED_COMPONENTS = [
-  "accordion",
-  "alert",
-  "alert-dialog",
-  "aspect-ratio",
-  "avatar",
-  "badge",
-  "breadcrumb",
-  "button",
-  "button-group",
-  "calendar",
-  "card",
-  "carousel",
-  "chart",
-  "checkbox",
-  "collapsible",
-  "combobox",
-  "command",
-  "context-menu",
-  "data-table",
-  "date-picker",
-  "dialog",
-  "drawer",
-  "dropdown-menu",
-  "empty",
-  "field",
-  "form",
-  "hover-card",
-  "input",
-  "input-group",
-  "input-otp",
-  "item",
-  "kbd",
-  "label",
-  "menubar",
-  "native-select",
-  "navigation-menu",
-  "pagination",
-  "popover",
-  "progress",
-  "radio-group",
-  "resizable",
-  "scroll-area",
-  "select",
-  "separator",
-  "sheet",
-  "sidebar",
-  "skeleton",
-  "slider",
-  "sonner",
-  "spinner",
-  "switch",
-  "table",
-  "tabs",
-  "textarea",
-  "toast",
-  "toggle",
-  "toggle-group",
-  "tooltip",
-  "typography",
-];
-
-export function findComponentFiles(config, originalFiles) {
-  const registryDependencies = [];
-  const compDir = config.ui.replace("@/", config.isSrcDir ? "src/" : "");
-  for (const { path: filePath } of originalFiles) {
-    if (filePath.startsWith(compDir)) {
-      const fileExtension = path.extname(filePath);
-      const fileName = path.basename(filePath, fileExtension);
-      if (
-        (fileExtension === ".tsx" || fileExtension === ".jsx") &&
-        WHITELISTED_COMPONENTS.includes(fileName)
-      ) {
-        registryDependencies.push(path.basename(filePath, fileExtension));
-      }
-    }
-  }
-  return registryDependencies;
-}
-
-export function readComponentsManifest(dir) {
-  const manifestPath = path.join(dir, "./components.json");
-  if (fs.existsSync(manifestPath)) {
-    const config = JSON.parse(fs.readFileSync(manifestPath, "utf-8")).aliases;
-    return config;
-  } else {
-    console.error("Components manifest not found");
-    process.exit(1);
-  }
-}
-
-export function getAliasedPaths(config) {
-  return [
-    config.components.replace("@/", ""),
-    config.utils.replace("@/", ""),
-    config.ui.replace("@/", ""),
-    config.lib.replace("@/", ""),
-    config.hooks.replace("@/", ""),
-  ];
-}
-
-export function isBuiltinComponent(config, filePath) {
-  if (filePath.startsWith(config.ui.replace("@/", ""))) {
-    const component = path.basename(filePath, path.extname(filePath));
-    return WHITELISTED_COMPONENTS.includes(component);
-  }
-  return false;
-}

package/dist/src/create-diff.mjs

@@ -1,96 +0,0 @@
-import {
-  findComponentFiles,
-  getAliasedPaths,
-  isBuiltinComponent,
-} from "./components.mjs";
-import { parseFilePath } from "./parse-file-path.mjs";
-
-function addFile(output, config, inSrcDir, relativeFilePath, content) {
-  if (!isBuiltinComponent(config, relativeFilePath)) {
-    output.files.push(
-      parseFilePath(inSrcDir, config, `./${relativeFilePath}`, content)
-    );
-  }
-}
-
-function addDependencies(
-  output,
-  initialPackageContents,
-  currentPackageContents
-) {
-  const initialPackageJson = JSON.parse(initialPackageContents);
-  const currentPackageJson = JSON.parse(currentPackageContents);
-
-  const initialDependencies = initialPackageJson.dependencies ?? {};
-  const currentDependencies = currentPackageJson.dependencies ?? {};
-  const initialDevDependencies = initialPackageJson.devDependencies ?? {};
-  const currentDevDependencies = currentPackageJson.devDependencies ?? {};
-
-  output.dependencies = Object.keys(currentDependencies).filter(
-    (dep) => !Object.prototype.hasOwnProperty.call(initialDependencies, dep)
-  );
-  output.devDependencies = Object.keys(currentDevDependencies).filter(
-    (dep) => !Object.prototype.hasOwnProperty.call(initialDevDependencies, dep)
-  );
-}
-
-function scanWithSrcDir(output, config, alteredFiles) {
-  for (const { path, content } of alteredFiles) {
-    if (path.startsWith("src/")) {
-      addFile(output, config, true, path.replace("src/", ""), content);
-    } else {
-      addFile(output, config, false, path, content);
-    }
-  }
-}
-
-function isInAppDir(path) {
-  return path.startsWith("app/");
-}
-
-function scanWithoutSrcDir(output, config, alteredFiles) {
-  const aliasedPaths = getAliasedPaths(config);
-
-  for (const { path, content } of alteredFiles) {
-    addFile(
-      output,
-      config,
-      aliasedPaths.includes(path) || isInAppDir(path),
-      path,
-      content
-    );
-  }
-}
-
-export function createDiff({
-  name,
-  config,
-  alteredFiles,
-  specificFiles,
-  currentFiles,
-  currentPackageJson,
-}) {
-  const output = {
-    name,
-    type: "registry:block",
-    dependencies: [],
-    devDependencies: [],
-    registryDependencies: [],
-    files: [],
-    tailwind: {},
-    cssVars: {},
-    meta: {},
-  };
-
-  if (config.isSrcDir) {
-    scanWithSrcDir(output, config, alteredFiles);
-  } else {
-    scanWithoutSrcDir(output, config, alteredFiles);
-  }
-
-  output.registryDependencies = findComponentFiles(config, currentFiles);
-
-  addDependencies(output, specificFiles["./package.json"], currentPackageJson);
-
-  return output;
-}