wireweaver 0.1.0 → 0.1.2

package/dist/vite-plugin.cjs

@@ -287,18 +287,74 @@ function discoverBeanRegistrations(root, implementations, extraScanDirs = []) {
   return result;
 }
 function collectBeanRegistrationsFromDir(root, implementations, result, allowNodeModules) {
-  const tsconfigPath = import_typescript.default.findConfigFile(root, import_typescript.default.sys.fileExists, "tsconfig.json");
-  if (!tsconfigPath) return;
-  const configFile = import_typescript.default.readConfigFile(tsconfigPath, import_typescript.default.sys.readFile);
-  if (configFile.error) return;
-  const parsedConfig = import_typescript.default.parseJsonConfigFileContent(configFile.config, import_typescript.default.sys, getDirName(tsconfigPath));
-  const program = import_typescript.default.createProgram({ rootNames: parsedConfig.fileNames, options: parsedConfig.options });
-  for (const sourceFile of program.getSourceFiles()) {
-    if (sourceFile.isDeclarationFile) continue;
-    if (!allowNodeModules && sourceFile.fileName.includes("/node_modules/")) continue;
+  for (const sourceFile of getScanSourceFiles(root, allowNodeModules)) {
     collectBeanRegistrationsFromFile(sourceFile, sourceFile.fileName, implementations, result);
   }
 }
+function getScanSourceFiles(root, allowNodeModules) {
+  const tsconfigPath = allowNodeModules ? findTsconfigWithin(root) : import_typescript.default.findConfigFile(root, import_typescript.default.sys.fileExists, "tsconfig.json");
+  if (tsconfigPath) {
+    const configFile = import_typescript.default.readConfigFile(tsconfigPath, import_typescript.default.sys.readFile);
+    if (configFile.error) return [];
+    const parsedConfig = import_typescript.default.parseJsonConfigFileContent(configFile.config, import_typescript.default.sys, getDirName(tsconfigPath));
+    const program = import_typescript.default.createProgram({ rootNames: parsedConfig.fileNames, options: parsedConfig.options });
+    const files = [];
+    for (const sourceFile of program.getSourceFiles()) {
+      if (!allowNodeModules && sourceFile.isDeclarationFile) continue;
+      if (!allowNodeModules && sourceFile.fileName.includes("/node_modules/")) continue;
+      files.push(sourceFile);
+    }
+    return files;
+  }
+  if (!allowNodeModules) return [];
+  return parseSourceFilesInDir(root);
+}
+function findTsconfigWithin(dir) {
+  const candidate = (0, import_node_path.join)(dir, "tsconfig.json");
+  return (0, import_node_fs.existsSync)(candidate) ? candidate : void 0;
+}
+function parseSourceFilesInDir(dir) {
+  const sourceFiles = [];
+  function walk(current) {
+    let names;
+    try {
+      names = (0, import_node_fs.readdirSync)(current);
+    } catch {
+      return;
+    }
+    for (const name of names) {
+      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 (!/\.(ts|tsx)$/.test(name)) continue;
+      try {
+        const content = (0, import_node_fs.readFileSync)(fullPath, "utf-8");
+        sourceFiles.push(
+          import_typescript.default.createSourceFile(
+            fullPath,
+            content,
+            import_typescript.default.ScriptTarget.Latest,
+            /* setParentNodes */
+            true,
+            import_typescript.default.ScriptKind.TS
+          )
+        );
+      } catch {
+      }
+    }
+  }
+  walk(dir);
+  return sourceFiles;
+}
 function collectBeanRegistrationsFromFile(sourceFile, filePath, globalImplementations, result) {
   const localImpls = discoverLocalImplementations(sourceFile, filePath);
   const typeOnlySymbols = collectTypeOnlySymbols(sourceFile);
@@ -339,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);
@@ -355,23 +412,8 @@ function discoverInterfaceImplementations(root, extraScanDirs = []) {
   }
   return implementations;
 }
-function scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, allowNodeModules, packageRoot) {
-  const tsconfigPath = import_typescript.default.findConfigFile(root, import_typescript.default.sys.fileExists, "tsconfig.json");
-  if (!tsconfigPath) return;
-  const configFile = import_typescript.default.readConfigFile(tsconfigPath, import_typescript.default.sys.readFile);
-  if (configFile.error) return;
-  const parsedConfig = import_typescript.default.parseJsonConfigFileContent(
-    configFile.config,
-    import_typescript.default.sys,
-    getDirName(tsconfigPath)
-  );
-  const program = import_typescript.default.createProgram({
-    rootNames: parsedConfig.fileNames,
-    options: parsedConfig.options
-  });
-  for (const sourceFile of program.getSourceFiles()) {
-    if (sourceFile.isDeclarationFile) continue;
-    if (!allowNodeModules && sourceFile.fileName.includes("/node_modules/")) continue;
+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) {
         const importSpecifier = packageRoot ? resolvePackageImportSpecifier(node.name.text, packageRoot) : void 0;
@@ -385,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;
@@ -496,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;
     }
@@ -610,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

@@ -2,7 +2,7 @@
 import ts from "typescript";
 import { readFile } from "fs/promises";
 import { isAbsolute, resolve as resolvePath, join as joinPath, dirname } from "path";
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "fs";
 function wireWeaverPlugin(options = {}) {
   let implementations = /* @__PURE__ */ new Map();
   let beanRegistrations = /* @__PURE__ */ new Map();
@@ -250,18 +250,74 @@ function discoverBeanRegistrations(root, implementations, extraScanDirs = []) {
   return result;
 }
 function collectBeanRegistrationsFromDir(root, implementations, result, allowNodeModules) {
-  const tsconfigPath = ts.findConfigFile(root, ts.sys.fileExists, "tsconfig.json");
-  if (!tsconfigPath) return;
-  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-  if (configFile.error) return;
-  const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, getDirName(tsconfigPath));
-  const program = ts.createProgram({ rootNames: parsedConfig.fileNames, options: parsedConfig.options });
-  for (const sourceFile of program.getSourceFiles()) {
-    if (sourceFile.isDeclarationFile) continue;
-    if (!allowNodeModules && sourceFile.fileName.includes("/node_modules/")) continue;
+  for (const sourceFile of getScanSourceFiles(root, allowNodeModules)) {
     collectBeanRegistrationsFromFile(sourceFile, sourceFile.fileName, implementations, result);
   }
 }
+function getScanSourceFiles(root, allowNodeModules) {
+  const tsconfigPath = allowNodeModules ? findTsconfigWithin(root) : ts.findConfigFile(root, ts.sys.fileExists, "tsconfig.json");
+  if (tsconfigPath) {
+    const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+    if (configFile.error) return [];
+    const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, getDirName(tsconfigPath));
+    const program = ts.createProgram({ rootNames: parsedConfig.fileNames, options: parsedConfig.options });
+    const files = [];
+    for (const sourceFile of program.getSourceFiles()) {
+      if (!allowNodeModules && sourceFile.isDeclarationFile) continue;
+      if (!allowNodeModules && sourceFile.fileName.includes("/node_modules/")) continue;
+      files.push(sourceFile);
+    }
+    return files;
+  }
+  if (!allowNodeModules) return [];
+  return parseSourceFilesInDir(root);
+}
+function findTsconfigWithin(dir) {
+  const candidate = joinPath(dir, "tsconfig.json");
+  return existsSync(candidate) ? candidate : void 0;
+}
+function parseSourceFilesInDir(dir) {
+  const sourceFiles = [];
+  function walk(current) {
+    let names;
+    try {
+      names = readdirSync(current);
+    } catch {
+      return;
+    }
+    for (const name of names) {
+      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 (!/\.(ts|tsx)$/.test(name)) continue;
+      try {
+        const content = readFileSync(fullPath, "utf-8");
+        sourceFiles.push(
+          ts.createSourceFile(
+            fullPath,
+            content,
+            ts.ScriptTarget.Latest,
+            /* setParentNodes */
+            true,
+            ts.ScriptKind.TS
+          )
+        );
+      } catch {
+      }
+    }
+  }
+  walk(dir);
+  return sourceFiles;
+}
 function collectBeanRegistrationsFromFile(sourceFile, filePath, globalImplementations, result) {
   const localImpls = discoverLocalImplementations(sourceFile, filePath);
   const typeOnlySymbols = collectTypeOnlySymbols(sourceFile);
@@ -302,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);
@@ -318,23 +375,8 @@ function discoverInterfaceImplementations(root, extraScanDirs = []) {
   }
   return implementations;
 }
-function scanSourceFilesForImplementations(root, implementations, allClassHeritage, beanReturnTypes, allowNodeModules, packageRoot) {
-  const tsconfigPath = ts.findConfigFile(root, ts.sys.fileExists, "tsconfig.json");
-  if (!tsconfigPath) return;
-  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-  if (configFile.error) return;
-  const parsedConfig = ts.parseJsonConfigFileContent(
-    configFile.config,
-    ts.sys,
-    getDirName(tsconfigPath)
-  );
-  const program = ts.createProgram({
-    rootNames: parsedConfig.fileNames,
-    options: parsedConfig.options
-  });
-  for (const sourceFile of program.getSourceFiles()) {
-    if (sourceFile.isDeclarationFile) continue;
-    if (!allowNodeModules && sourceFile.fileName.includes("/node_modules/")) continue;
+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) {
         const importSpecifier = packageRoot ? resolvePackageImportSpecifier(node.name.text, packageRoot) : void 0;
@@ -348,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;
@@ -459,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;
     }
@@ -573,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.0",
+	"version": "0.1.2",
 	"type": "module",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
@@ -24,6 +24,7 @@
 	],
 	"scripts": {
 		"build": "tsup",
+		"ver": "npm --no-git-tag-version version",
 		"build:dev": "tsc -p tsconfig.build.json",
 		"test": "vitest run"
 	},