wireweaver 0.1.1 → 0.1.2

package/dist/vite-plugin.cjs

@@ -395,7 +395,8 @@ function discoverInterfaceImplementations(root, extraScanDirs = []) {
   scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, false);
   for (const dir of extraScanDirs) {
     const packageRoot = findPackageRoot(dir);
-    scanSourceFilesForImplementations(dir, implementations, allClassHeritage, beanReturnTypes, true, packageRoot);
+    const componentNames = collectComponentClassNames(dir);
+    scanSourceFilesForImplementations(dir, implementations, allClassHeritage, beanReturnTypes, true, packageRoot, componentNames);
   }
   for (const typeName of beanReturnTypes) {
     const entries = allClassHeritage.get(typeName);
@@ -411,7 +412,7 @@ function discoverInterfaceImplementations(root, extraScanDirs = []) {
   }
   return implementations;
 }
-function scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, allowNodeModules, packageRoot) {
+function scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, allowNodeModules, packageRoot, componentNames = /* @__PURE__ */ new Set()) {
   for (const sourceFile of getScanSourceFiles(root, allowNodeModules)) {
     import_typescript.default.forEachChild(sourceFile, (node) => {
       if (import_typescript.default.isClassDeclaration(node) && node.name) {
@@ -426,7 +427,7 @@ function scanSourceFilesForImplementations(root, implementations, allClassHerita
               heritageEntries.push({ interfaceName, filePath: sourceFile.fileName, importSpecifier });
               allClassHeritage.set(node.name.text, heritageEntries);
             }
-            if (!hasServiceDecorator(node)) continue;
+            if (!hasServiceDecorator(node) && !componentNames.has(node.name.text)) continue;
             const existing = implementations.get(interfaceName) ?? [];
             if (existing.some((impl) => impl.className === node.name.text && normalizeFilePath(impl.filePath) === normalizeFilePath(sourceFile.fileName))) {
               continue;
@@ -537,14 +538,17 @@ function buildImportInsertions(code, sourceFile, importsToInject, sideEffectImpo
     if (unresolved.length === 0) continue;
     const existing = findImportByModule(sourceFile, importPath);
     if (existing && existing.importClause?.namedBindings && import_typescript.default.isNamedImports(existing.importClause.namedBindings)) {
-      const existingNames = new Set(existing.importClause.namedBindings.elements.map((element) => element.name.text));
+      const namedImports = existing.importClause.namedBindings;
+      const existingNames = new Set(namedImports.elements.map((element) => element.name.text));
       const missing = unresolved.filter((name) => !existingNames.has(name));
       if (missing.length === 0) continue;
-      const namedImports = existing.importClause.namedBindings;
+      const hasElements = namedImports.elements.length > 0;
+      const insertionPoint2 = namedImports.getEnd() - 1;
+      const prefix = hasElements ? ", " : "";
       replacements.push({
-        start: namedImports.getStart(sourceFile) + 1,
-        end: namedImports.getEnd() - 1,
-        text: `${[...existingNames, ...missing].sort().join(", ")}`
+        start: insertionPoint2,
+        end: insertionPoint2,
+        text: `${prefix}${missing.sort().join(", ")}`
       });
       continue;
     }
@@ -651,6 +655,51 @@ function resolveExtraScanDirs(root, extraScanDirs) {
   if (!extraScanDirs || extraScanDirs.length === 0) return [];
   return extraScanDirs.map((dir) => (0, import_node_path.isAbsolute)(dir) ? dir : (0, import_node_path.resolve)(root, dir));
 }
+function collectComponentClassNames(dir) {
+  const names = /* @__PURE__ */ new Set();
+  const stage3 = /_([A-Za-z_$][\w$]*)_decorators\s*=\s*\[([^\]]*)\]/g;
+  const legacy = /__decorate\(\s*\[([^\]]*?)\]\s*,\s*([A-Za-z_$][\w$]*)/g;
+  function containsComponentDecorator(decoratorList) {
+    return /\b(Component|Service)\s*\(/.test(decoratorList);
+  }
+  function walk(current) {
+    let entries;
+    try {
+      entries = (0, import_node_fs.readdirSync)(current);
+    } catch {
+      return;
+    }
+    for (const name of entries) {
+      const fullPath = (0, import_node_path.join)(current, name);
+      let isDir = false;
+      try {
+        isDir = (0, import_node_fs.statSync)(fullPath).isDirectory();
+      } catch {
+        continue;
+      }
+      if (isDir) {
+        if (name === "node_modules") continue;
+        walk(fullPath);
+        continue;
+      }
+      if (!/\.(js|cjs|mjs)$/.test(name)) continue;
+      let content;
+      try {
+        content = (0, import_node_fs.readFileSync)(fullPath, "utf-8");
+      } catch {
+        continue;
+      }
+      for (const match of content.matchAll(stage3)) {
+        if (containsComponentDecorator(match[2])) names.add(match[1]);
+      }
+      for (const match of content.matchAll(legacy)) {
+        if (containsComponentDecorator(match[1])) names.add(match[2]);
+      }
+    }
+  }
+  walk(dir);
+  return names;
+}
 function findPackageRoot(startDir) {
   let current = startDir;
   while (true) {

package/dist/vite-plugin.js

@@ -358,7 +358,8 @@ function discoverInterfaceImplementations(root, extraScanDirs = []) {
   scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, false);
   for (const dir of extraScanDirs) {
     const packageRoot = findPackageRoot(dir);
-    scanSourceFilesForImplementations(dir, implementations, allClassHeritage, beanReturnTypes, true, packageRoot);
+    const componentNames = collectComponentClassNames(dir);
+    scanSourceFilesForImplementations(dir, implementations, allClassHeritage, beanReturnTypes, true, packageRoot, componentNames);
   }
   for (const typeName of beanReturnTypes) {
     const entries = allClassHeritage.get(typeName);
@@ -374,7 +375,7 @@ function discoverInterfaceImplementations(root, extraScanDirs = []) {
   }
   return implementations;
 }
-function scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, allowNodeModules, packageRoot) {
+function scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, allowNodeModules, packageRoot, componentNames = /* @__PURE__ */ new Set()) {
   for (const sourceFile of getScanSourceFiles(root, allowNodeModules)) {
     ts.forEachChild(sourceFile, (node) => {
       if (ts.isClassDeclaration(node) && node.name) {
@@ -389,7 +390,7 @@ function scanSourceFilesForImplementations(root, implementations, allClassHerita
               heritageEntries.push({ interfaceName, filePath: sourceFile.fileName, importSpecifier });
               allClassHeritage.set(node.name.text, heritageEntries);
             }
-            if (!hasServiceDecorator(node)) continue;
+            if (!hasServiceDecorator(node) && !componentNames.has(node.name.text)) continue;
             const existing = implementations.get(interfaceName) ?? [];
             if (existing.some((impl) => impl.className === node.name.text && normalizeFilePath(impl.filePath) === normalizeFilePath(sourceFile.fileName))) {
               continue;
@@ -500,14 +501,17 @@ function buildImportInsertions(code, sourceFile, importsToInject, sideEffectImpo
     if (unresolved.length === 0) continue;
     const existing = findImportByModule(sourceFile, importPath);
     if (existing && existing.importClause?.namedBindings && ts.isNamedImports(existing.importClause.namedBindings)) {
-      const existingNames = new Set(existing.importClause.namedBindings.elements.map((element) => element.name.text));
+      const namedImports = existing.importClause.namedBindings;
+      const existingNames = new Set(namedImports.elements.map((element) => element.name.text));
       const missing = unresolved.filter((name) => !existingNames.has(name));
       if (missing.length === 0) continue;
-      const namedImports = existing.importClause.namedBindings;
+      const hasElements = namedImports.elements.length > 0;
+      const insertionPoint2 = namedImports.getEnd() - 1;
+      const prefix = hasElements ? ", " : "";
       replacements.push({
-        start: namedImports.getStart(sourceFile) + 1,
-        end: namedImports.getEnd() - 1,
-        text: `${[...existingNames, ...missing].sort().join(", ")}`
+        start: insertionPoint2,
+        end: insertionPoint2,
+        text: `${prefix}${missing.sort().join(", ")}`
       });
       continue;
     }
@@ -614,6 +618,51 @@ function resolveExtraScanDirs(root, extraScanDirs) {
   if (!extraScanDirs || extraScanDirs.length === 0) return [];
   return extraScanDirs.map((dir) => isAbsolute(dir) ? dir : resolvePath(root, dir));
 }
+function collectComponentClassNames(dir) {
+  const names = /* @__PURE__ */ new Set();
+  const stage3 = /_([A-Za-z_$][\w$]*)_decorators\s*=\s*\[([^\]]*)\]/g;
+  const legacy = /__decorate\(\s*\[([^\]]*?)\]\s*,\s*([A-Za-z_$][\w$]*)/g;
+  function containsComponentDecorator(decoratorList) {
+    return /\b(Component|Service)\s*\(/.test(decoratorList);
+  }
+  function walk(current) {
+    let entries;
+    try {
+      entries = readdirSync(current);
+    } catch {
+      return;
+    }
+    for (const name of entries) {
+      const fullPath = joinPath(current, name);
+      let isDir = false;
+      try {
+        isDir = statSync(fullPath).isDirectory();
+      } catch {
+        continue;
+      }
+      if (isDir) {
+        if (name === "node_modules") continue;
+        walk(fullPath);
+        continue;
+      }
+      if (!/\.(js|cjs|mjs)$/.test(name)) continue;
+      let content;
+      try {
+        content = readFileSync(fullPath, "utf-8");
+      } catch {
+        continue;
+      }
+      for (const match of content.matchAll(stage3)) {
+        if (containsComponentDecorator(match[2])) names.add(match[1]);
+      }
+      for (const match of content.matchAll(legacy)) {
+        if (containsComponentDecorator(match[1])) names.add(match[2]);
+      }
+    }
+  }
+  walk(dir);
+  return names;
+}
 function findPackageRoot(startDir) {
   let current = startDir;
   while (true) {

package/package.json

@@ -2,7 +2,7 @@
 	"name": "wireweaver",
 	"description": "A lightweight TypeScript Dependency Injection Library",
 	"productName": "WireWeaver",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"type": "module",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",