prodex 1.4.6 → 1.4.8

package/dist/cli/cli-input.js

@@ -9,6 +9,27 @@ const path_1 = __importDefault(require("path"));
 const package_json_1 = __importDefault(require("../../package.json"));
 const fs_1 = __importDefault(require("fs"));
 const flags_1 = require("../constants/flags");
+function extractShortcutTokens(argv) {
+    const cleaned = [];
+    const shortcuts = [];
+    let shortcutAll = false;
+    for (const arg of argv) {
+        if (arg === "@") {
+            shortcutAll = true;
+            continue;
+        }
+        if (arg?.startsWith("@")) {
+            const name = arg.slice(1).trim();
+            if (!name)
+                shortcutAll = true;
+            else
+                shortcuts.push(name);
+            continue;
+        }
+        cleaned.push(arg);
+    }
+    return { argv: cleaned, shortcutAll, shortcuts };
+}
 /**
  * Unified CLI parser powered by Sade and FLAG_MAP.
  * Returns { root, flags, warnings, errors }.
@@ -18,23 +39,34 @@ function parseCliInput(argv = process.argv) {
         console.log(`prodex v${package_json_1.default.version}`);
         process.exit(0);
     }
+    const extracted = extractShortcutTokens(argv);
+    const argvCleaned = extracted.argv;
     const program = (0, sade_1.default)("prodex [root]");
     registerFlags(program);
     let parsed = { rootArg: "", root: undefined, flags: {} };
     program.action((root, opts) => {
-        let lroot = root;
         const cwd = process.cwd();
-        if (root?.startsWith("@")) {
-            opts.shortcut = root.slice(1).trim();
-            lroot = undefined;
-        }
         parsed = {
-            rootArg: lroot,
-            root: lroot ? path_1.default.resolve(cwd, lroot) : cwd,
+            rootArg: root,
+            root: root ? path_1.default.resolve(cwd, root) : cwd,
             flags: { ...opts },
         };
     });
-    program.parse(argv);
+    program.parse(argvCleaned);
+    // Merge shortcut tokens (@a @b @c / @) with existing --shortcut usage.
+    const fromTokens = extracted.shortcuts;
+    const shortcutAll = extracted.shortcutAll;
+    const fromFlag = typeof parsed.flags.shortcut === "string" ? parsed.flags.shortcut.trim() : "";
+    const selected = [...fromTokens, ...(fromFlag ? [fromFlag] : [])].filter(Boolean);
+    const uniq = Array.from(new Set(selected));
+    if (shortcutAll)
+        parsed.flags.shortcutAll = true;
+    if (uniq.length)
+        parsed.flags.shortcuts = uniq;
+    if (!shortcutAll && uniq.length === 1)
+        parsed.flags.shortcut = uniq[0];
+    else if (uniq.length > 1 || shortcutAll)
+        delete parsed.flags.shortcut;
     const warnings = [];
     const errors = [];
     parsed.flags = normalizeFlags(parsed.flags, warnings, errors);
@@ -43,14 +75,12 @@ function parseCliInput(argv = process.argv) {
 }
 function registerFlags(program) {
     for (const [key, meta] of Object.entries(flags_1.FLAG_MAP)) {
-        const short = meta.short ? `-${meta.short}, ` : "";
-        const long = `--${key}`;
-        const desc = meta.description;
-        const defaultVal = meta.type === "boolean" ? false : undefined;
-        program.option(`${short}${long}`, desc, defaultVal);
+        //@ts-ignore
+        const alias = meta.alias ? `-${meta.alias},` : "";
+        //@ts-ignore
+        program.option(`${alias}--${key}`, meta.desc);
     }
 }
-/** Convert flag values to correct types based on FLAG_MAP metadata. */
 function normalizeFlags(flags, warnings, errors) {
     for (const [key, meta] of Object.entries(flags_1.FLAG_MAP)) {
         const raw = flags[key];
@@ -72,6 +102,10 @@ function normalizeFlags(flags, warnings, errors) {
                     .filter(Boolean);
                 break;
             }
+            case "boolean": {
+                flags[key] = Boolean(raw);
+                break;
+            }
             default: {
                 if (meta.type === "string")
                     flags[key] = String(raw);
@@ -85,7 +119,7 @@ function validateArgs(parsed, warnings, errors) {
     const { rootArg } = parsed;
     if (rootArg) {
         if (!fs_1.default.existsSync(parsed.root)) {
-            errors.push(`Invalid path argument: "${rootArg}" does not exist.`);
+            errors.push(`Invalid path "${rootArg}"`);
         }
         else if (!fs_1.default.statSync(parsed.root).isDirectory()) {
             errors.push(`Path argument "${rootArg}" is not a directory.`);

package/dist/constants/render-constants.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MD_FOOTER = exports.TEXT_HEADERS = exports.LANG_MAP = void 0;
+exports.MD_HEADER = exports.MD_FOOTER = exports.TEXT_HEADERS = exports.LANG_MAP = void 0;
 const package_json_1 = __importDefault(require("../../package.json"));
 exports.LANG_MAP = {
     "": "js",
@@ -22,3 +22,4 @@ exports.TEXT_HEADERS = {
     regionEnd: "##endregion",
 };
 exports.MD_FOOTER = ["\n---", "*Generated with [Prodex](https://github.com/emxhive/prodex) — Codebase decoded.*", `<!-- PRODEx v${package_json_1.default.version} | ${new Date().toISOString()} -->`].join("\n");
+exports.MD_HEADER = "*Generated by [Prodex](https://github.com/emxhive/prodex#readme)*";

package/dist/core/combine.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCombine = runCombine;
 const picker_1 = require("../cli/picker");
 const summary_1 = require("../cli/summary");
-const cache_keys_1 = require("../constants/cache-keys");
+const constants_1 = require("../constants");
 const cache_1 = require("./managers/cache");
 const config_1 = require("./managers/config");
 const logger_1 = require("../lib/logger");
@@ -49,7 +49,7 @@ async function resolveEntries(showUi, cfg) {
  * 🧩 Persist discovered aliases (if any)
  */
 function persistAliases() {
-    const aliases = cache_1.CacheManager.dump(cache_keys_1.CACHE_KEYS.ALIASES);
+    const aliases = cache_1.CacheManager.dump(constants_1.CACHE_KEYS.ALIASES);
     if (Object.keys(aliases).length) {
         config_1.ConfigManager.persist({ resolve: { aliases } });
     }

package/dist/core/dependency.js

@@ -10,6 +10,7 @@ const config_1 = require("../constants/config");
 const helpers_1 = require("./helpers");
 const logger_1 = require("../lib/logger");
 const collections_1 = require("../shared/collections");
+const fs_1 = __importDefault(require("fs"));
 /**
  * 🧩 followChain()
  * Traverses all dependencies starting from the given entry files.
@@ -67,9 +68,31 @@ async function followChain(entryFiles, cfg) {
  * 🧩 applyIncludes()
  * Scans and appends additional files defined in config.resolve.include.
  */
+// src/core/dependency.ts
+// (existing imports stay)
 async function applyIncludes(cfg, files) {
     const { resolve, root } = cfg;
-    const scan = await (0, helpers_1.globScan)(resolve.include, { cwd: root });
-    logger_1.logger.debug("APPLY_include", _2j(scan));
-    return (0, collections_1.unique)([...files, ...scan.files]);
+    const absFiles = [];
+    const patterns = [];
+    for (const raw of resolve.include) {
+        const p = String(raw ?? "").trim();
+        if (!p)
+            continue;
+        const norm = p.norm(); // uses your polyfill (slashes -> "/")
+        // absolute *file* paths bypass globScan (and its ignores)
+        if (path_1.default.isAbsolute(norm)) {
+            try {
+                if (fs_1.default.statSync(norm).isFile()) {
+                    absFiles.push(path_1.default.resolve(norm));
+                    continue;
+                }
+            }
+            catch {
+                // doesn't exist / can't stat → treat as pattern
+            }
+        }
+        patterns.push(norm);
+    }
+    const scan = await (0, helpers_1.globScan)(patterns, { cwd: root });
+    return (0, collections_1.unique)([...files, ...absFiles, ...scan.files]);
 }

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/core/managers/config.js

@@ -58,7 +58,10 @@ class ConfigManager {
                 def.apply(cfg, val);
         }
         const hasFiles = Array.isArray(flags.files) ? flags.files.length > 0 : !!flags.files;
-        if (hasFiles && !flags.include)
+        const hasInclude = Array.isArray(flags.include) ? flags.include.length > 0 : !!flags.include;
+        if (hasInclude && !hasFiles)
+            cfg.entry.files = [];
+        if (hasFiles && !hasInclude)
             cfg.resolve.include = [];
         if (flags.shortcut && cfg.shortcuts && cfg.shortcuts[flags.shortcut])
             return this.applyShortcuts(cfg, flags);

package/dist/core/output.js

@@ -11,7 +11,6 @@ const renderers_1 = require("./renderers");
 const logger_1 = require("../lib/logger");
 const utils_1 = require("../lib/utils");
 const questions_1 = require("../lib/questions");
-const render_constants_1 = require("../constants/render-constants");
 const config_1 = require("../constants/config");
 /**
  * 🧩 produceOutput()
@@ -20,7 +19,6 @@ const config_1 = require("../constants/config");
  */
 async function produceOutput({ name, files, cfg, showUi }) {
     const { output: { format, versioned, dir }, } = cfg;
-    ;
     // 1️⃣ Determine base filename
     let outputBase = name;
     if (showUi) {
@@ -42,7 +40,10 @@ async function produceOutput({ name, files, cfg, showUi }) {
     // 4️⃣ Prepare and write content
     const outputPath = path_1.default.join(dir, `${outputBase}.${format}`);
     const sorted = [...files].sort((a, b) => a.localeCompare(b));
-    const content = format === "txt" ? [(0, renderers_1.tocTxt)(sorted), ...sorted.map(renderers_1.renderTxt)].join("") : [(0, renderers_1.tocMd)(sorted), ...sorted.map((f, i) => (0, renderers_1.renderMd)(f, i)), render_constants_1.MD_FOOTER].join("\n");
+    //[tocMd(sorted), ...sorted.map((f, i) => renderMd(f, i)), MD_FOOTER].join("\n")
+    const content = format === "txt"
+        ? [(0, renderers_1.tocTxt)(sorted), ...sorted.map(renderers_1.renderTxt)].join("")
+        : (0, renderers_1.renderTraceMd)(sorted).content;
     fs_1.default.writeFileSync(outputPath, content, "utf8");
     return outputPath;
 }

package/dist/core/renderers.js

@@ -3,41 +3,174 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderTraceMd = renderTraceMd;
 exports.tocMd = tocMd;
 exports.renderMd = renderMd;
 exports.tocTxt = tocTxt;
 exports.renderTxt = renderTxt;
 const path_1 = __importDefault(require("path"));
-const io_1 = require("../shared/io");
-const io_2 = require("../shared/io");
-const render_constants_1 = require("../constants/render-constants");
+const shared_1 = require("../shared");
+const shared_2 = require("../shared");
+const constants_1 = require("../constants");
 /**
- * Generate Markdown Table of Contents with anchors
+ * renderTraceMd()
+ * Builds the full markdown document AND computes:
+ * - listing start/end lines
+ * - each file section start/end lines (in the final output)
  */
-function tocMd(files) {
+// src/core/renderers.ts
+function renderTraceMd(files) {
     const count = files.length;
-    const items = files.map((f, i) => `- [${(0, io_2.rel)(f)}](#${i + 1})`).join("\n");
-    return ["# Index ", `\nIncluded Source Files (${count})`, items, "", "---"].join("\n");
+    // Render sections once (content of each file)
+    const sections = files.map((f, i) => renderMd(f, i));
+    // 1) Build a FIRST PASS doc with placeholder TOC (no line ranges)
+    const pass1Toc = buildToc({
+        files,
+        count,
+        listingStart: 0,
+        listingEnd: 0,
+        trace: null,
+        withRanges: false,
+    });
+    const pass1Content = [pass1Toc, ...sections, constants_1.MD_FOOTER].join("\n");
+    // 2) Analyze the FINAL STRING (pass 1) to get real line indexes
+    const pass1Analysis = analyzeTrace(pass1Content, count);
+    // 3) Build pass 2 TOC including listing range + per-file ranges
+    const pass2Toc = buildToc({
+        files,
+        count,
+        listingStart: pass1Analysis.listingStart,
+        listingEnd: pass1Analysis.listingEnd,
+        trace: pass1Analysis.trace,
+        withRanges: true,
+    });
+    const pass2Content = [pass2Toc, ...sections, constants_1.MD_FOOTER].join("\n");
+    // 4) Re-analyze pass 2 content (should be identical; extra safety)
+    const pass2Analysis = analyzeTrace(pass2Content, count);
+    // If anything drifted (it really shouldn’t), trust pass 2’s analysis.
+    // Rebuilding again would still not change line counts, so this is stable.
+    return {
+        content: pass2Content,
+        trace: pass2Analysis.trace,
+        listingStart: pass2Analysis.listingStart,
+        listingEnd: pass2Analysis.listingEnd,
+    };
+}
+const rangeText = (start, end) => ` L${start}-L${end}`;
+function buildToc(opts) {
+    const { files, count, listingStart, listingEnd, trace, withRanges } = opts;
+    const tocHead = [
+        `# Index ${withRanges ? rangeText(listingStart, listingEnd) : ""} `,
+        "",
+        constants_1.MD_HEADER,
+        "",
+        `Included Source Files: ${count}`,
+    ];
+    const items = files.map((f, i) => {
+        const rp = (0, shared_2.rel)(f);
+        if (!withRanges || !trace)
+            return `- [${rp}](#${i + 1})`;
+        const t = trace[i];
+        return `- [${rp}](#${i + 1}) ${rangeText(t.startLine, t.endLine)}`;
+    });
+    const tocTail = ["", "---"];
+    return [...tocHead, ...items, ...tocTail].join("\n");
 }
 /**
- * Render each file section with invisible anchors
+ * Analyze the already-generated markdown to compute:
+ * - listing start/end lines
+ * - each section start/end line (per file index)
+ *
+ * All line numbers are 1-based.
  */
-function renderMd(p, i) {
-    const rp = (0, io_2.rel)(p);
-    const ext = path_1.default.extname(p).toLowerCase();
-    const lang = render_constants_1.LANG_MAP[ext] || "txt";
-    const code = (0, io_1.readFileSafe)(p).trimEnd();
-    return [`---\n#### ${i + 1}`, "\n", "` File: " + rp + "`  [↑ Back to top](#index)", "", "```" + lang, code, "```", ""].join("\n");
+function analyzeTrace(content, count) {
+    const lines = content.split("\n");
+    // --- Listing range ---
+    const includedIdx = lines.findIndex((l) => /^Included Source Files\b/.test(l.trim()));
+    // listing begins on the next line after the header
+    const listingStart = includedIdx >= 0 ? includedIdx + 2 : 0; // 1-based
+    const listingEnd = count ? listingStart + count - 1 : listingStart;
+    // --- Footer start (exclude footer from last file range) ---
+    let footerMarkerIdx = lines.findIndex((l) => l.includes("<!-- PRODEx v"));
+    if (footerMarkerIdx < 0)
+        footerMarkerIdx = lines.findIndex((l) => l.includes("*Generated with [Prodex]"));
+    let footerStartIdx = footerMarkerIdx >= 0 ? footerMarkerIdx : lines.length; // 0-based
+    if (footerStartIdx > 0 && lines[footerStartIdx - 1].trim() === "---")
+        footerStartIdx = footerStartIdx - 1;
+    // --- Section markers: find "#### N" lines ---
+    const markerLineIdxByN = new Map();
+    for (let i = 0; i < lines.length; i++) {
+        const m = lines[i].trim().match(/^####\s+(\d+)\s*$/);
+        if (!m)
+            continue;
+        const n = Number(m[1]);
+        if (!Number.isFinite(n))
+            continue;
+        if (n < 1 || n > count)
+            continue;
+        if (!markerLineIdxByN.has(n))
+            markerLineIdxByN.set(n, i);
+    }
+    // Compute each section's start idx (prefer the preceding "---" line if present)
+    const startIdxs = [];
+    for (let n = 1; n <= count; n++) {
+        const markerIdx = markerLineIdxByN.get(n);
+        if (markerIdx == null) {
+            // Fallback: if marker missing, make it non-crashy.
+            // Put start at footerStart (it'll produce tiny/empty ranges rather than exploding).
+            startIdxs.push(footerStartIdx);
+            continue;
+        }
+        const maybeStart = markerIdx > 0 && lines[markerIdx - 1].trim() === "---" ? markerIdx - 1 : markerIdx;
+        startIdxs.push(maybeStart);
+    }
+    // Compute end idx using next section start, or footer start
+    const trace = [];
+    for (let i = 0; i < count; i++) {
+        const startIdx = startIdxs[i];
+        const nextStartIdx = i < count - 1 ? startIdxs[i + 1] : footerStartIdx;
+        const endIdx = Math.max(startIdx, nextStartIdx - 1);
+        trace.push({
+            file: "", // filled by caller if needed; TOC uses rel(files[i]) anyway
+            anchor: i + 1,
+            startLine: startIdx + 1,
+            endLine: endIdx + 1,
+        });
+    }
+    return { listingStart, listingEnd, trace };
 }
 /**
- * TXT version (unchanged)
+ * Existing functions kept as-is.
+ * (renderMd is used by renderTraceMd above)
  */
+function tocMd(files) {
+    const count = files.length;
+    const items = files.map((f, i) => `- [${(0, shared_2.rel)(f)}](#${i + 1})`).join("\n");
+    return ["# Index ", `\nIncluded Source Files (${count})`, items, "", "---"].join("\n");
+}
+function renderMd(p, i) {
+    const rp = (0, shared_2.rel)(p);
+    const ext = path_1.default.extname(p).toLowerCase();
+    const lang = constants_1.LANG_MAP[ext] || "txt";
+    const code = (0, shared_1.readFileSafe)(p).trimEnd();
+    return [
+        `---\n#### ${i + 1}`,
+        "\n",
+        "` File: " + rp + "`  [↑ Back to top](#index)",
+        "",
+        "```" + lang,
+        code,
+        "```",
+        "",
+    ].join("\n");
+}
+// TXT versions unchanged
 function tocTxt(files) {
     const sorted = [...files].sort((a, b) => a.localeCompare(b));
-    return ["##==== Combined Scope ====", ...sorted.map((f) => "## - " + (0, io_2.rel)(f))].join("\n") + "\n\n";
+    return ["##==== Combined Scope ====", ...sorted.map((f) => "## - " + (0, shared_2.rel)(f))].join("\n") + "\n\n";
 }
 function renderTxt(p) {
-    const relPath = (0, io_2.rel)(p);
-    const code = (0, io_1.readFileSafe)(p);
+    const relPath = (0, shared_2.rel)(p);
+    const code = (0, shared_1.readFileSafe)(p);
     return ["##==== path: " + relPath + " ====", "##region " + relPath, code, "##endregion", ""].join("\n");
 }

package/dist/index.js

@@ -44,12 +44,51 @@ async function startProdex(args = process.argv) {
         return (0, init_1.initProdex)();
     const { root, flags } = (0, cli_input_1.parseCliInput)(args);
     const userConfig = config_1.ConfigManager.load(root);
-    const config = config_1.ConfigManager.merge(userConfig, flags, root);
-    (0, store_1.setGlobals)(config, flags);
+    // Determine which shortcut runs to execute (order irrelevant).
+    const selected = [];
+    if (flags.shortcutAll) {
+        selected.push(...Object.keys(userConfig.shortcuts ?? {}));
+    }
+    else if (Array.isArray(flags.shortcuts) && flags.shortcuts.length) {
+        selected.push(...flags.shortcuts);
+    }
+    else if (flags.shortcut) {
+        selected.push(flags.shortcut);
+    }
+    const shortcutRuns = Array.from(new Set(selected.map((s) => String(s).trim()).filter(Boolean))).sort();
+    await Promise.resolve().then(() => __importStar(require("./lib/polyfills")));
+    // Multi-run mode (shortcuts)
+    if (shortcutRuns.length) {
+        for (const shortcut of shortcutRuns) {
+            const runFlags = {
+                ...flags,
+                shortcut,
+                shortcuts: undefined,
+                shortcutAll: false,
+            };
+            const config = config_1.ConfigManager.merge(userConfig, runFlags, root);
+            (0, store_1.setGlobals)(config, runFlags);
+            const opts = {
+                showUi: false,
+                // Avoid output collisions when running multiple shortcuts.
+                cliName: config.name ?? shortcut,
+            };
+            await (0, combine_1.runCombine)({ cfg: config, opts });
+        }
+        return;
+    }
+    // If "@" was used but no shortcuts exist, fall back to a normal single run.
+    const baseFlags = flags.shortcutAll ? { ...flags, shortcutAll: false } : flags;
+    const config = config_1.ConfigManager.merge(userConfig, baseFlags, root);
+    (0, store_1.setGlobals)(config, baseFlags);
     const opts = {
-        showUi: !flags.ci && !flags?.files?.length && config?.entry?.ui?.enablePicker && !flags.shortcut,
+        showUi: !baseFlags.ci &&
+            !baseFlags?.files?.length &&
+            config?.entry?.ui?.enablePicker &&
+            !baseFlags.shortcut &&
+            !baseFlags.shortcuts?.length &&
+            !baseFlags.shortcutAll,
         cliName: config.name,
     };
-    await Promise.resolve().then(() => __importStar(require("./lib/polyfills")));
     await (0, combine_1.runCombine)({ cfg: config, opts });
 }

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/extract-imports.js

@@ -10,10 +10,7 @@ exports.expandGroupedUses = expandGroupedUses;
  */
 function extractPhpImports(code) {
     const out = new Set();
-    const patterns = [
-        /\b(?:require|include|require_once|include_once)\s*\(?['"]([^'"]+)['"]\)?/g,
-        /\buse\s+([A-Z][\w\\]+(?:\s*{[^}]+})?)/g,
-    ];
+    const patterns = [/\b(?:require|include|require_once|include_once)\s*\(?['"]([^'"]+)['"]\)?/g, /\buse\s+([A-Z][\w\\]+(?:\s*{[^}]+})?)/g];
     for (const r of patterns) {
         let m;
         while ((m = r.exec(code))) {
@@ -22,6 +19,23 @@ function extractPhpImports(code) {
                 out.add(val);
         }
     }
+    // Detect short class names
+    const shortClassPatterns = [/\bnew\s+([A-Z][A-Za-z0-9_]*)\b/g, /\b([A-Z][A-Za-z0-9_]*)::class\b/g, /\b([A-Z][A-Za-z0-9_]*)::[A-Za-z_]/g, /:\s*([A-Z][A-Za-z0-9_]*)\b/g];
+    // Direct matches
+    for (const r of shortClassPatterns) {
+        let m;
+        while ((m = r.exec(code)))
+            out.add(m[1]);
+    }
+    // Type-hinted parameters in function signatures
+    let m;
+    const paramPattern = /\(([^)]*)\)/g;
+    while ((m = paramPattern.exec(code))) {
+        const block = m[1];
+        const types = block.match(/\b([A-Z][A-Za-z0-9_]*)\b/g);
+        if (types)
+            types.forEach((t) => out.add(t));
+    }
     return out;
 }
 /**

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

@@ -16,22 +16,6 @@ const constants_1 = require("../../constants");
 const cache_1 = require("../../core/managers/cache");
 const collections_1 = require("../../shared/collections");
 const promises_1 = __importDefault(require("fs/promises")); // (add near the top if not present)
-/** Ensure we have a PHP resolver context for the current root */
-function buildPhpCtx(root, prev) {
-    if (prev?.kind === "php")
-        return prev;
-    const psr4 = (0, psr4_1.resolvePsr4)(root);
-    const nsKeys = Object.keys(psr4).sort((a, b) => b.length - a.length);
-    const bindings = (0, bindings_1.loadLaravelBindings)(root);
-    return { kind: "php", psr4, nsKeys, bindings };
-}
-/** Namespace prefix check */
-function startsWithAnyNamespace(imp, nsKeys) {
-    for (const k of nsKeys)
-        if (imp.startsWith(k))
-            return true;
-    return false;
-}
 /**
  * Typed PHP resolver (aligned with JS resolver signature).
  * - Uses global config via getConfig()
@@ -52,6 +36,8 @@ async function resolvePhpImports({ filePath, visited = new Set(), depth = 0, max
     const code = (0, shared_1.readFileSafe)(filePath);
     if (!code)
         return (0, collections_1.emptyResult)(visited);
+    const nsMatch = code.match(/\bnamespace\s+([^;]+);/);
+    const currentNamespace = nsMatch ? nsMatch[1].trim() : null;
     // Context + exclusions
     const phpCtx = buildPhpCtx(ROOT, ctx);
     // Parse imports (expand grouped `use` syntax)
@@ -62,15 +48,21 @@ async function resolvePhpImports({ filePath, visited = new Set(), depth = 0, max
     const filesOut = [];
     for (const imp0 of imports) {
         let imp = imp0;
+        if (!imp || typeof imp !== "string")
+            continue;
+        // Fully-qualified check
+        const isFullyQualified = imp.includes("\\") || imp.startsWith("\\");
+        if (!isFullyQualified && currentNamespace) {
+            imp = `${currentNamespace}\\${imp}`;
+        }
         // 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
         if (!startsWithAnyNamespace(imp, phpCtx.nsKeys))
             continue;
-        // if (isExcluded(imp, excludePatterns, ROOT)) continue;
         // Resolve namespace → file path (sync helper retained)
         const resolvedPath = await tryResolvePhpFile(imp, filePath, phpCtx.psr4);
         // Exclusion check after final resolution
@@ -109,7 +101,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) => {
@@ -126,3 +118,19 @@ async function tryResolvePhpFile(imp, fromFile, psr4) {
     cache_1.CacheManager.set(constants_1.CACHE_KEYS.PHP_FILECACHE, key, resolved);
     return resolved;
 }
+/** Ensure we have a PHP resolver context for the current root */
+function buildPhpCtx(root, prev) {
+    if (prev?.kind === "php")
+        return prev;
+    const psr4 = (0, psr4_1.resolvePsr4)(root);
+    const nsKeys = Object.keys(psr4).sort((a, b) => b.length - a.length);
+    const bindings = (0, bindings_1.loadLaravelBindings)(root);
+    return { kind: "php", psr4, nsKeys, bindings };
+}
+/** Namespace prefix check */
+function startsWithAnyNamespace(imp, nsKeys) {
+    for (const k of nsKeys)
+        if (imp.startsWith(k))
+            return true;
+    return false;
+}

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.8",
   "description": "Unified Project Indexer & Dependency Extractor for Laravel + React + Node stacks.",
   "type": "commonjs",
   "bin": {