@animus-ui/extract 0.1.0-next.30 → 0.1.0-next.31

package/dist/discover-packages.d.ts

@@ -1,9 +1,12 @@
 /**
- * Extract external DS package names from a system entry file's import declarations.
+ * Extract external DS package names from `.includes([...])` calls in the system file.
  *
- * Reads the file at `systemFilePath`, regex-extracts all `from '...'` / `from "..."`
- * import specifiers, filters out relative imports, the system framework package,
- * and known non-DS packages. Returns normalized package names (subpaths stripped).
+ * Reads the system file source, finds `.includes([identifier, ...])` calls in the
+ * builder chain, traces each identifier back to its import declaration, and returns
+ * the import specifiers. This is the authoritative mechanism — only packages explicitly
+ * declared via `.includes()` are treated as external DS dependencies.
+ *
+ * Falls back to empty array if no `.includes()` call is found.
  */
 export declare function extractSystemFilePackages(systemFilePath: string): string[];
 //# sourceMappingURL=discover-packages.d.ts.map

package/dist/discover-packages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discover-packages.d.ts","sourceRoot":"","sources":["../pipeline/discover-packages.ts"],"names":[],"mappings":"AAsBA;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAoC1E"}
+{"version":3,"file":"discover-packages.d.ts","sourceRoot":"","sources":["../pipeline/discover-packages.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAyE1E"}

package/dist/index.mjs

@@ -6,29 +6,14 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
 //#region pipeline/discover-packages.ts
 /**
-* Known non-DS packages that should never be treated as external DS dependencies.
-*/
-const KNOWN_SKIP = new Set([
-	"react",
-	"react-dom",
-	"react/jsx-runtime",
-	"react/jsx-dev-runtime",
-	"next",
-	"next/image",
-	"next/link",
-	"next/router",
-	"next/navigation",
-	"vite",
-	"lodash",
-	"lodash-es"
-]);
-const KNOWN_SKIP_PREFIXES = ["@types/", "node:"];
-/**
-* Extract external DS package names from a system entry file's import declarations.
+* Extract external DS package names from `.includes([...])` calls in the system file.
 *
-* Reads the file at `systemFilePath`, regex-extracts all `from '...'` / `from "..."`
-* import specifiers, filters out relative imports, the system framework package,
-* and known non-DS packages. Returns normalized package names (subpaths stripped).
+* Reads the system file source, finds `.includes([identifier, ...])` calls in the
+* builder chain, traces each identifier back to its import declaration, and returns
+* the import specifiers. This is the authoritative mechanism — only packages explicitly
+* declared via `.includes()` are treated as external DS dependencies.
+*
+* Falls back to empty array if no `.includes()` call is found.
 */
 function extractSystemFilePackages(systemFilePath) {
 	let source;
@@ -37,17 +22,37 @@ function extractSystemFilePackages(systemFilePath) {
 	} catch {
 		return [];
 	}
-	const importRegex = /^\s*import\s.*from\s+['"]([^'"]+)['"]/gm;
+	const includesRegex = /\.includes\(\s*\[([^\]]*)\]\s*\)/gs;
+	const identifiers = /* @__PURE__ */ new Set();
+	let includesMatch;
+	while ((includesMatch = includesRegex.exec(source)) !== null) {
+		const inner = includesMatch[1];
+		for (const token of inner.split(",")) {
+			const id = token.trim();
+			if (id && /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(id)) identifiers.add(id);
+		}
+	}
+	if (identifiers.size === 0) return [];
+	const importMap = /* @__PURE__ */ new Map();
+	const importRegex = /^\s*import\s+(?:([a-zA-Z_$][a-zA-Z0-9_$]*)\s*,\s*)?(?:\{([^}]*)\}|([a-zA-Z_$][a-zA-Z0-9_$]*))\s+from\s+['"]([^'"]+)['"]/gm;
+	let importMatch;
+	while ((importMatch = importRegex.exec(source)) !== null) {
+		const [, comboDefault, namedImports, defaultImport, specifier] = importMatch;
+		if (comboDefault) importMap.set(comboDefault, specifier);
+		if (defaultImport) importMap.set(defaultImport, specifier);
+		if (namedImports) for (const binding of namedImports.split(",")) {
+			const parts = binding.trim().split(/\s+as\s+/);
+			const localName = (parts[1] || parts[0]).trim();
+			if (localName) importMap.set(localName, specifier);
+		}
+	}
 	const packages = /* @__PURE__ */ new Set();
-	let match;
-	while ((match = importRegex.exec(source)) !== null) {
-		const specifier = match[1];
-		if (specifier.startsWith(".")) continue;
-		const pkgName = specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0];
-		if (pkgName === "@animus-ui/system") continue;
-		if (KNOWN_SKIP.has(specifier) || KNOWN_SKIP.has(pkgName)) continue;
-		if (KNOWN_SKIP_PREFIXES.some((p) => specifier.startsWith(p))) continue;
-		packages.add(pkgName);
+	for (const id of identifiers) {
+		const specifier = importMap.get(id);
+		if (specifier && !specifier.startsWith(".")) {
+			const pkgName = specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0];
+			packages.add(pkgName);
+		}
 	}
 	return Array.from(packages);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animus-ui/extract",
-  "version": "0.1.0-next.30",
+  "version": "0.1.0-next.31",
   "description": "Animus static CSS extraction pipeline (Rust/NAPI)",
   "author": "codecaaron <airrobb@gmail.com>",
   "license": "MIT",
@@ -44,9 +44,9 @@
     "build:pipeline": "tsdown && tsc -p tsconfig.build.json"
   },
   "optionalDependencies": {
-    "@animus-ui/extract-darwin-arm64": "0.1.0-next.30",
-    "@animus-ui/extract-linux-x64-gnu": "0.1.0-next.30",
-    "@animus-ui/extract-linux-arm64-gnu": "0.1.0-next.30"
+    "@animus-ui/extract-darwin-arm64": "0.1.0-next.31",
+    "@animus-ui/extract-linux-x64-gnu": "0.1.0-next.31",
+    "@animus-ui/extract-linux-arm64-gnu": "0.1.0-next.31"
   },
   "devDependencies": {
     "@animus-ui/system": "workspace:*",