components-differ 1.2.3 → 1.2.5

package/dist/create-diff.js

@@ -1,10 +1,8 @@
-import { findComponentFiles, getAliasedPaths, isBuiltinComponent, } from "./components.js";
+import { findComponentFiles, getAliasedPaths, } from "./components.js";
 import { parseFilePath } from "./parse-file-path.js";
 import { extractImportedPackages } from "./extract-imports.js";
 function addFile(output, config, inSrcDir, relativeFilePath, content) {
-    if (!isBuiltinComponent(config, relativeFilePath)) {
-        output.files.push(parseFilePath(inSrcDir, config, `./${relativeFilePath}`, content));
-    }
+    output.files.push(parseFilePath(inSrcDir, config, `./${relativeFilePath}`, content));
 }
 function addDependencies(output, _initialPackageContents, currentPackageContents, usedPackages) {
     const currentPackageJson = JSON.parse(currentPackageContents);

package/dist/extract-imports.js

@@ -35,8 +35,12 @@ function specifierToPackageName(specifier) {
     return slash === -1 ? s : s.slice(0, slash);
 }
 const RE_IMPORT = /(?:import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s+from\s+)?|import\s*)['"]([^'"]+)['"]|require\s*\(\s*['"]([^'"]+)['"]\s*\)|import\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
+/** Matches re-exports: export { ... } from '...', export * from '...', export Name from '...' */
+const RE_EXPORT_FROM = /export\s+(?:\{[^}]*\}|\*|\w+)\s+from\s+['"]([^'"]+)['"]/g;
+/** Matches type-only re-exports: export type { ... } from '...', export type * from '...' */
+const RE_EXPORT_TYPE_FROM = /export\s+type\s+(?:\{[^}]*\}|\*)\s+from\s+['"]([^'"]+)['"]/g;
 /**
- * Collect all package names that are imported or required in the given file content.
+ * Collect all package names that are imported, required, or re-exported in the given file content.
  */
 function extractFromContent(content) {
     const packages = new Set();
@@ -48,6 +52,20 @@ function extractFromContent(content) {
         if (pkg)
             packages.add(pkg);
     }
+    RE_EXPORT_FROM.lastIndex = 0;
+    while ((m = RE_EXPORT_FROM.exec(content)) !== null) {
+        const specifier = m[1] ?? "";
+        const pkg = specifierToPackageName(specifier);
+        if (pkg)
+            packages.add(pkg);
+    }
+    RE_EXPORT_TYPE_FROM.lastIndex = 0;
+    while ((m = RE_EXPORT_TYPE_FROM.exec(content)) !== null) {
+        const specifier = m[1] ?? "";
+        const pkg = specifierToPackageName(specifier);
+        if (pkg)
+            packages.add(pkg);
+    }
     return packages;
 }
 /**
@@ -74,8 +92,9 @@ export function isPathSpecifier(specifier) {
     return false;
 }
 /**
- * Extract all import/require specifiers that are project paths (relative or alias)
- * from file content. Used to pull in imported files into the registry.
+ * Extract all import/require and export-from specifiers that are project paths
+ * (relative or alias) from file content. Used to pull in imported and
+ * re-exported files into the registry.
  */
 export function extractPathSpecifiers(content) {
     const out = [];
@@ -86,5 +105,17 @@ export function extractPathSpecifiers(content) {
         if (isPathSpecifier(specifier))
             out.push(specifier);
     }
+    RE_EXPORT_FROM.lastIndex = 0;
+    while ((m = RE_EXPORT_FROM.exec(content)) !== null) {
+        const specifier = m[1] ?? "";
+        if (isPathSpecifier(specifier))
+            out.push(specifier);
+    }
+    RE_EXPORT_TYPE_FROM.lastIndex = 0;
+    while ((m = RE_EXPORT_TYPE_FROM.exec(content)) !== null) {
+        const specifier = m[1] ?? "";
+        if (isPathSpecifier(specifier))
+            out.push(specifier);
+    }
     return out;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "components-differ",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "CLI to generate shadcn registry items from git diffs",
   "license": "ISC",
   "type": "module",

package/src/create-diff.ts

@@ -36,11 +36,9 @@ function addFile(
   relativeFilePath: string,
   content: string,
 ): void {
-  if (!isBuiltinComponent(config, relativeFilePath)) {
-    output.files.push(
-      parseFilePath(inSrcDir, config, `./${relativeFilePath}`, content),
-    );
-  }
+  output.files.push(
+    parseFilePath(inSrcDir, config, `./${relativeFilePath}`, content),
+  );
 }
 
 function addDependencies(

package/src/extract-imports.ts

@@ -34,8 +34,16 @@ function specifierToPackageName(specifier: string): string | null {
 const RE_IMPORT =
   /(?:import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s+from\s+)?|import\s*)['"]([^'"]+)['"]|require\s*\(\s*['"]([^'"]+)['"]\s*\)|import\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
 
+/** Matches re-exports: export { ... } from '...', export * from '...', export Name from '...' */
+const RE_EXPORT_FROM =
+  /export\s+(?:\{[^}]*\}|\*|\w+)\s+from\s+['"]([^'"]+)['"]/g;
+
+/** Matches type-only re-exports: export type { ... } from '...', export type * from '...' */
+const RE_EXPORT_TYPE_FROM =
+  /export\s+type\s+(?:\{[^}]*\}|\*)\s+from\s+['"]([^'"]+)['"]/g;
+
 /**
- * Collect all package names that are imported or required in the given file content.
+ * Collect all package names that are imported, required, or re-exported in the given file content.
  */
 function extractFromContent(content: string): Set<string> {
   const packages = new Set<string>();
@@ -46,6 +54,18 @@ function extractFromContent(content: string): Set<string> {
     const pkg = specifierToPackageName(specifier);
     if (pkg) packages.add(pkg);
   }
+  RE_EXPORT_FROM.lastIndex = 0;
+  while ((m = RE_EXPORT_FROM.exec(content)) !== null) {
+    const specifier = m[1] ?? "";
+    const pkg = specifierToPackageName(specifier);
+    if (pkg) packages.add(pkg);
+  }
+  RE_EXPORT_TYPE_FROM.lastIndex = 0;
+  while ((m = RE_EXPORT_TYPE_FROM.exec(content)) !== null) {
+    const specifier = m[1] ?? "";
+    const pkg = specifierToPackageName(specifier);
+    if (pkg) packages.add(pkg);
+  }
   return packages;
 }
 
@@ -72,8 +92,9 @@ export function isPathSpecifier(specifier: string): boolean {
 }
 
 /**
- * Extract all import/require specifiers that are project paths (relative or alias)
- * from file content. Used to pull in imported files into the registry.
+ * Extract all import/require and export-from specifiers that are project paths
+ * (relative or alias) from file content. Used to pull in imported and
+ * re-exported files into the registry.
  */
 export function extractPathSpecifiers(content: string): string[] {
   const out: string[] = [];
@@ -83,5 +104,15 @@ export function extractPathSpecifiers(content: string): string[] {
     const specifier = (m[1] ?? m[2] ?? m[3]) ?? "";
     if (isPathSpecifier(specifier)) out.push(specifier);
   }
+  RE_EXPORT_FROM.lastIndex = 0;
+  while ((m = RE_EXPORT_FROM.exec(content)) !== null) {
+    const specifier = m[1] ?? "";
+    if (isPathSpecifier(specifier)) out.push(specifier);
+  }
+  RE_EXPORT_TYPE_FROM.lastIndex = 0;
+  while ((m = RE_EXPORT_TYPE_FROM.exec(content)) !== null) {
+    const specifier = m[1] ?? "";
+    if (isPathSpecifier(specifier)) out.push(specifier);
+  }
   return out;
 }