prodex 1.4.6 → 1.4.7

package/dist/core/managers/cache.js

@@ -21,7 +21,7 @@ class CacheManager {
     /** Set or update a cached entry */
     static set(ns, key, val) {
         this.ns(ns).set(key, val);
-        logger_1.logger.debug(`🧩 [cache:${ns}] set ${key} → ${String(val)}`);
+        logger_1.logger.debug(`🧩 [cache:${ns}] set ${key} \n→ ${_2j(val)}`);
     }
     /** Retrieve a cached entry */
     static get(ns, key) {

package/dist/resolvers/php/bindings.js

@@ -8,9 +8,14 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const cache_1 = require("../../core/managers/cache");
 const cache_keys_1 = require("../../constants/cache-keys");
+const extract_imports_1 = require("./extract-imports");
+const logger_1 = require("../../lib/logger");
 /**
- * Scans app/Providers/*.php for `$this->app->bind()` / `singleton()` calls
- * and returns a map of Interface::class → Implementation::class (FQCN strings).
+ * Scans app/Providers/*.php for $this->app->bind() / singleton() calls
+ * and returns a map of InterfaceFQCN → ImplementationFQCN.
+ *
+ * Uses existing extractPhpImports + expandGroupedUses to correctly
+ * resolve namespaces and short class names.
  */
 function loadLaravelBindings(root) {
     const cached = cache_1.CacheManager.get(cache_keys_1.CACHE_KEYS.PHP_BINDINGS, root);
@@ -26,16 +31,27 @@ function loadLaravelBindings(root) {
         .readdirSync(providersDir)
         .filter((f) => f.endsWith(".php"))
         .map((f) => path_1.default.join(providersDir, f));
-    // $this->app->bind(Interface::class, Implementation::class)
-    // $this->app->singleton(Interface::class, Implementation::class)
-    const re = /\$this->app->(?:bind|singleton)\s*\(\s*([A-Za-z0-9_:\\\\]+)::class\s*,\s*([A-Za-z0-9_:\\\\]+)::class/g;
     for (const file of files) {
         const code = fs_1.default.readFileSync(file, "utf8");
+        // 1️⃣ Extract all imports in the provider
+        const rawImports = (0, extract_imports_1.extractPhpImports)(code);
+        const expanded = (0, extract_imports_1.expandGroupedUses)(rawImports);
+        // Build ShortName → FQCN map
+        const importMap = {};
+        for (const fqcn of expanded) {
+            const short = fqcn.split("\\").pop();
+            importMap[short] = fqcn;
+        }
+        // 2️⃣ Extract bindings (short class names only)
+        const bindRe = /\$this->app->(?:bind|singleton)\s*\(\s*([A-Za-z0-9_]+)::class\s*,\s*([A-Za-z0-9_]+)::class/g;
         let m;
-        while ((m = re.exec(code))) {
-            const iface = m[1].replace(/\\\\/g, "\\");
-            const impl = m[2].replace(/\\\\/g, "\\");
-            bindings[iface] = impl;
+        while ((m = bindRe.exec(code))) {
+            const ifaceShort = m[1];
+            const implShort = m[2];
+            const ifaceFull = importMap[ifaceShort] || ifaceShort;
+            const implFull = importMap[implShort] || implShort;
+            logger_1.logger.debug(`[laravel-bindings] ${file} => ${ifaceFull} → ${implFull}`);
+            bindings[ifaceFull] = implFull;
         }
     }
     cache_1.CacheManager.set(cache_keys_1.CACHE_KEYS.PHP_BINDINGS, root, bindings);

package/dist/resolvers/php/php-resolver.js

@@ -64,7 +64,7 @@ async function resolvePhpImports({ filePath, visited = new Set(), depth = 0, max
         let imp = imp0;
         // Respect Laravel container bindings (Interface → Implementation)
         if (phpCtx.bindings[imp]) {
-            logger_1.logger.debug("[php-resolver] binding:", imp, "→", phpCtx.bindings[imp]);
+            // logger.debug("[php-resolver] binding:", imp, "→", _2j(phpCtx.bindings[imp]));
             imp = phpCtx.bindings[imp];
         }
         // Only resolve PSR-4 mapped namespaces
@@ -109,7 +109,7 @@ async function tryResolvePhpFile(imp, fromFile, psr4) {
         cache_1.CacheManager.set(constants_1.CACHE_KEYS.PHP_FILECACHE, key, null);
         return null;
     }
-    const rel = imp.slice(nsKey.length).norm();
+    const rel = imp.replace(nsKey, "").norm();
     const tries = [path_1.default.join(psr4[nsKey], rel), path_1.default.join(psr4[nsKey], rel + ".php"), path_1.default.join(psr4[nsKey], rel, "index.php")];
     // 🔹 Run all stats concurrently
     const results = await Promise.allSettled(tries.map(async (p) => {

package/dist/shared/patterns.js

@@ -4,21 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isExcluded = isExcluded;
-exports.makeExcludeMatcher = makeExcludeMatcher;
 // File: src/shared/patterns.ts
 const micromatch_1 = __importDefault(require("micromatch"));
 const path_1 = __importDefault(require("path"));
 const _1 = require(".");
-/**
- * Returns true if a given path matches any of the provided glob patterns.
- * Equivalent to core/helpers.isExcluded().
- */
-// export function isExcluded(p: string = "", patterns: string[] = [], root = process.cwd()): boolean {
-// 	if (!patterns?.length) return false;
-// 	if (!p) return false;
-// 	const relPath = p.replaceAll("\\", "/");
-// 	return micromatch.isMatch(relPath, patterns);
-// }
 /**
  * Centralized exclusion logic.
  * Accepts namespaces, absolute paths, or relative paths
@@ -36,13 +25,3 @@ function isExcluded(p, patterns = [], root = process.cwd()) {
         norm = (0, _1.rel)(norm, root).norm();
     return micromatch_1.default.isMatch(norm, patterns);
 }
-/**
- * Builds a reusable micromatch matcher for efficiency.
- * Equivalent to php-resolver.makeExcludeMatcher().
- */
-function makeExcludeMatcher(patterns = []) {
-    if (!patterns?.length)
-        return () => false;
-    const mm = micromatch_1.default.matcher(patterns);
-    return (s) => mm(String(s).replace(/\\/g, "/"));
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prodex",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "Unified Project Indexer & Dependency Extractor for Laravel + React + Node stacks.",
   "type": "commonjs",
   "bin": {