Resolve PSR-4 classes across ordered Composer directory mappings

Author: ngallodev

src/pipeline/pass_pkgmap.c

@@ -457,28 +457,35 @@ static void extract_psr4(yyjson_val *root, const char *section, const char *dir,
     yyjson_obj_iter iter = yyjson_obj_iter_with(psr4);
     while ((key = yyjson_obj_iter_next(&iter)) != NULL) {
         yyjson_val *val = yyjson_obj_iter_get_val(key);
-        if (!yyjson_is_str(key) || !yyjson_is_str(val)) {
+        if (!yyjson_is_str(key)) {
             continue;
         }
         const char *ns_prefix = yyjson_get_str(key);
-        const char *ns_dir = yyjson_get_str(val);
-        while (ns_dir[0] == '.' && ns_dir[SKIP_ONE] == '/') {
-            ns_dir += PAIR_LEN; /* "./src/" names src/ */
-        }
-        if (strcmp(ns_dir, ".") == 0) {
-            ns_dir = ""; /* "." names the manifest's own directory */
-        }
-        char ns_entry[PKGMAP_PATH_BUF];
-        if (dir[0]) {
-            snprintf(ns_entry, sizeof(ns_entry), "%s/%s", dir, ns_dir);
-        } else {
-            snprintf(ns_entry, sizeof(ns_entry), "%s", ns_dir);
-        }
-        size_t nelen = strlen(ns_entry);
-        if (nelen > 0 && ns_entry[nelen - SKIP_ONE] == '/') {
-            ns_entry[nelen - SKIP_ONE] = '\0';
+        size_t count = yyjson_is_arr(val) ? yyjson_arr_size(val) : 1;
+        for (size_t i = 0; i < count; i++) {
+            yyjson_val *path = yyjson_is_arr(val) ? yyjson_arr_get(val, i) : val;
+            if (!yyjson_is_str(path)) {
+                continue;
+            }
+            const char *ns_dir = yyjson_get_str(path);
+            while (ns_dir[0] == '.' && ns_dir[SKIP_ONE] == '/') {
+                ns_dir += PAIR_LEN; /* "./src/" names src/ */
+            }
+            if (strcmp(ns_dir, ".") == 0) {
+                ns_dir = ""; /* "." names the manifest's own directory */
+            }
+            char ns_entry[PKGMAP_PATH_BUF];
+            if (dir[0]) {
+                snprintf(ns_entry, sizeof(ns_entry), "%s/%s", dir, ns_dir);
+            } else {
+                snprintf(ns_entry, sizeof(ns_entry), "%s", ns_dir);
+            }
+            size_t nelen = strlen(ns_entry);
+            if (nelen > 0 && ns_entry[nelen - SKIP_ONE] == '/') {
+                ns_entry[nelen - SKIP_ONE] = '\0';
+            }
+            pkg_entries_push(entries, strdup(ns_prefix), strdup(ns_entry));
         }
-        pkg_entries_push(entries, strdup(ns_prefix), strdup(ns_entry));
     }
 }
 
@@ -1003,6 +1010,17 @@ static bool pkgmap_is_psr4_prefix(const char *pkg_name) {
     return n > 0 && pkg_name[n - SKIP_ONE] == '\\';
 }
 
+/* PSR-4 values own an ordered directory list; other package values remain QNs. */
+typedef struct psr4_dir {
+    struct psr4_dir *next;
+    char path[];
+} psr4_dir_t;
+
+static const char *pkgmap_first_path(CBMHashTable *map, const char *key) {
+    void *value = cbm_ht_get(map, key);
+    return value && pkgmap_is_psr4_prefix(key) ? ((psr4_dir_t *)value)->path : value;
+}
+
 CBMHashTable *cbm_pkgmap_build(cbm_pkg_entries_t *worker_entries, int worker_count,
                                const char *project_name) {
     /* Count total entries */
@@ -1020,28 +1038,43 @@ CBMHashTable *cbm_pkgmap_build(cbm_pkg_entries_t *worker_entries, int worker_cou
     for (int w = 0; w < worker_count; w++) {
         cbm_pkg_entries_t *we = &worker_entries[w];
         for (int i = 0; i < we->count; i++) {
-            /* Convert entry_rel to QN: project.dir.parts. A PSR-4 namespace
-             * prefix (key ends in '\\') keeps its repo-relative DIRECTORY
-             * instead: its readers map `Prefix\Sub\Class` onto a file path
-             * (<dir>/Sub/Class.php), which a dotted QN cannot express (#1186). */
-            const char *entry_rel = we->items[i].entry_rel;
-            char *qn = pkgmap_is_psr4_prefix(we->items[i].pkg_name)
-                           ? cbm_strndup(entry_rel, strlen(entry_rel))
-                           : cbm_pipeline_fqn_module(project_name, entry_rel);
-            if (!qn) {
+            const bool psr4 = pkgmap_is_psr4_prefix(we->items[i].pkg_name);
+            psr4_dir_t *dirs = psr4 ? cbm_ht_get(map, we->items[i].pkg_name) : NULL;
+            /* Other package mappings retain their existing first-wins rule. */
+            if (!psr4 && cbm_ht_has(map, we->items[i].pkg_name)) {
                 continue;
             }
-
-            /* Check for duplicate — first wins */
-            if (cbm_ht_has(map, we->items[i].pkg_name)) {
-                free(qn);
+            char *key = dirs ? NULL : strdup(we->items[i].pkg_name);
+            if (!dirs && !key) {
                 continue;
             }
-
-            /* Transfer ownership: key = strdup'd pkg_name, value = qn */
-            char *key = strdup(we->items[i].pkg_name);
-            cbm_ht_set(map, key, qn);
-            merged++;
+            const char *entry_rel = we->items[i].entry_rel;
+            void *value = NULL;
+            if (psr4) {
+                size_t len = strlen(entry_rel);
+                psr4_dir_t *node = cbm_alloc(CBM_MEM_CLASS_SEMANTIC, sizeof(*node) + len + 1);
+                if (node) {
+                    node->next = NULL;
+                    memcpy(node->path, entry_rel, len + 1);
+                }
+                value = node;
+            } else {
+                value = cbm_pipeline_fqn_module(project_name, entry_rel);
+            }
+            if (!value) {
+                free(key);
+                continue;
+            }
+            if (dirs) {
+                /* ponytail: linear append for small lists; cache a tail if large lists matter. */
+                while (dirs->next) {
+                    dirs = dirs->next;
+                }
+                dirs->next = value;
+            } else {
+                cbm_ht_set(map, key, value);
+                merged++;
+            }
         }
     }
 
@@ -1296,8 +1329,17 @@ CBMHashTable *cbm_pkgmap_build_from_repo(const char *repo_path, const cbm_file_i
 
 static void pkgmap_free_entry(const char *key, void *value, void *userdata) {
     (void)userdata;
+    if (pkgmap_is_psr4_prefix(key)) {
+        psr4_dir_t *dir = value;
+        while (dir) {
+            psr4_dir_t *next = dir->next;
+            cbm_free(CBM_MEM_CLASS_SEMANTIC, dir);
+            dir = next;
+        }
+    } else {
+        free(value);
+    }
     free((void *)key);
-    free(value);
 }
 
 void cbm_pkgmap_free(CBMHashTable *pkgmap) {
@@ -1322,7 +1364,7 @@ static char *resolve_slash_prefix(CBMHashTable *map, const char *module_path) {
             continue;
         }
         *slash = '\0';
-        const char *base_qn = (const char *)cbm_ht_get(map, buf);
+        const char *base_qn = pkgmap_first_path(map, buf);
         if (!base_qn) {
             continue;
         }
@@ -1355,7 +1397,7 @@ static char *resolve_dot_prefix(CBMHashTable *map, const char *module_path,
             continue;
         }
         *dot = '\0';
-        const char *base_qn = (const char *)cbm_ht_get(map, buf);
+        const char *base_qn = pkgmap_first_path(map, buf);
         if (!base_qn) {
             continue;
         }
@@ -1377,8 +1419,8 @@ static char *resolve_dot_prefix(CBMHashTable *map, const char *module_path,
 }
 
 /* Try backslash-based prefix matching (PHP PSR-4: App\\Controllers\\Foo).
- * The map value of a PSR-4 prefix is its repo-relative directory (see
- * cbm_pkgmap_build). Returns heap QN or NULL. */
+ * Generic module resolution uses the first mapped directory; class imports
+ * search every directory through resolve_php_psr4_class. Returns heap QN or NULL. */
 static char *resolve_backslash_prefix(CBMHashTable *map, const char *module_path,
                                       const char *project_name) {
     char *buf = strdup(module_path);
@@ -1392,7 +1434,7 @@ static char *resolve_backslash_prefix(CBMHashTable *map, const char *module_path
         *bs = '\0';
         char prefix[PKGMAP_PATH_BUF];
         snprintf(prefix, sizeof(prefix), "%s\\", buf);
-        const char *base_dir = (const char *)cbm_ht_get(map, prefix);
+        const char *base_dir = pkgmap_first_path(map, prefix);
         if (!base_dir) {
             continue;
         }
@@ -1452,7 +1494,7 @@ char *cbm_pipeline_resolve_module(const cbm_pipeline_ctx_t *ctx, const char *sou
     }
 
     /* 3. Exact lookup */
-    const char *mapped_qn = (const char *)cbm_ht_get(pkgmap, module_path);
+    const char *mapped_qn = pkgmap_first_path(pkgmap, module_path);
     if (mapped_qn) {
         return strdup(mapped_qn);
     }
@@ -2111,26 +2153,29 @@ static psr4_outcome_t resolve_php_psr4_class(const cbm_pipeline_ctx_t *ctx,
         }
         memcpy(key, name, cut);
         key[cut] = '\0';
-        const char *dir = (const char *)cbm_ht_get(pkgmap, key);
-        if (!dir) {
+        const psr4_dir_t *dirs = cbm_ht_get(pkgmap, key);
+        if (!dirs) {
             continue;
         }
         covered = true;
-        char rel[PKGMAP_PATH_BUF];
-        int w = snprintf(rel, sizeof(rel), "%s%s%s.php", dir, dir[0] ? "/" : "", name + cut);
-        if (w <= 0 || (size_t)w >= sizeof(rel)) {
-            continue;
-        }
-        for (char *c = rel; *c; c++) {
-            if (*c == '\\') {
-                *c = '/';
+        for (const psr4_dir_t *dir = dirs; dir; dir = dir->next) {
+            char rel[PKGMAP_PATH_BUF];
+            int w = snprintf(rel, sizeof(rel), "%s%s%s.php", dir->path, dir->path[0] ? "/" : "",
+                             name + cut);
+            if (w <= 0 || (size_t)w >= sizeof(rel)) {
+                continue;
+            }
+            for (char *c = rel; *c; c++) {
+                if (*c == '\\') {
+                    *c = '/';
+                }
+            }
+            const cbm_gbuf_node_t *file = psr4_file_node(ctx, rel);
+            if (file && (!source_file_qn || !file->qualified_name ||
+                         strcmp(file->qualified_name, source_file_qn) != 0)) {
+                *out = file;
+                return PSR4_RESOLVED;
             }
-        }
-        const cbm_gbuf_node_t *file = psr4_file_node(ctx, rel);
-        if (file && (!source_file_qn || !file->qualified_name ||
-                     strcmp(file->qualified_name, source_file_qn) != 0)) {
-            *out = file;
-            return PSR4_RESOLVED;
         }
     }
     return covered ? PSR4_UNRESOLVED : PSR4_NOT_APPLICABLE;

tests/test_edge_imports.c

@@ -1280,7 +1280,10 @@ static void ei_import_target_path(cbm_store_t *store, const char *project, const
         cbm_node_t target;
         memset(&target, 0, sizeof(target));
         if (cbm_store_find_node_by_id(store, edges[i].target_id, &target) == CBM_STORE_OK) {
-            snprintf(out, outsz, "%s", target.file_path ? target.file_path : "?");
+            snprintf(out, outsz, "%s",
+                     target.label && strcmp(target.label, "File") == 0 && target.file_path
+                         ? target.file_path
+                         : "?");
             cbm_node_free_fields(&target);
         }
         break;
@@ -1390,6 +1393,49 @@ TEST(ei_php_psr4_multiple_roots_longest_prefix_issue1186) {
     PASS();
 }
 
+/* Array mappings keep Composer order, including later-only files and root dirs. */
+TEST(ei_php_psr4_array_directories) {
+    static const EILangFile f[] = {
+        {"composer.json", "{\"autoload\":{\"psr-4\":{\"App\\\\\":[\"./missing/\","
+                          "\"z-first/\",42,\"a-second/\",\"third/\"]}},"
+                          "\"autoload-dev\":{\"psr-4\":{\"Tests\\\\\":[\"./absent/\",\".\"]}}}\n"},
+        {"z-first/Shared.php", EI_PHP_CLASS("App", "Shared")},
+        {"a-second/Shared.php", EI_PHP_CLASS("App", "Shared")},
+        {"a-second/Later.php", EI_PHP_CLASS("App", "Later")},
+        {"third/Last.php", EI_PHP_CLASS("App", "Last")},
+        {"z-first/Decoy.php", EI_PHP_CLASS("App", "Missing")},
+        {"Support.php", EI_PHP_CLASS("Tests", "Support")},
+        {"Consumer.php", "<?php\nnamespace Consumer;\n\n"
+                         "use App\\Shared;\nuse App\\Later;\nuse App\\Last;\n"
+                         "use App\\Missing;\nuse Tests\\Support;\n\nclass Consumer {}\n"}};
+    static const EIPhpImportExpect want[] = {
+        {"Shared", "z-first/Shared.php"}, {"Later", "a-second/Later.php"},
+        {"Last", "third/Last.php"},       {"Missing", NULL},
+        {"Support", "Support.php"},
+    };
+    ASSERT_TRUE(ei_php_imports_match(f, 8, "Consumer.php", want, 5));
+    PASS();
+}
+
+/* Each directory is relative to its own composer.json, not the repo root. */
+TEST(ei_php_psr4_array_manifest_relative) {
+    static const EILangFile f[] = {
+        {"packages/billing/composer.json",
+         "{\"autoload\":{\"psr-4\":{\"Billing\\\\\":[\"./absent/\",\"./src/\",\"backup/\"]}}}\n"},
+        {"src/Account.php", EI_PHP_CLASS("Billing", "Account")},
+        {"packages/billing/src/Account.php", EI_PHP_CLASS("Billing", "Account")},
+        {"packages/billing/backup/Account.php", EI_PHP_CLASS("Billing", "Account")},
+        {"packages/billing/backup/Ledger.php", EI_PHP_CLASS("Billing", "Ledger")},
+        {"Checkout.php", "<?php\nnamespace Consumer;\n\nuse Billing\\Account;\n"
+                         "use Billing\\Ledger;\n\nclass Checkout {}\n"}};
+    static const EIPhpImportExpect want[] = {
+        {"Account", "packages/billing/src/Account.php"},
+        {"Ledger", "packages/billing/backup/Ledger.php"},
+    };
+    ASSERT_TRUE(ei_php_imports_match(f, 6, "Checkout.php", want, 2));
+    PASS();
+}
+
 /* Control: `use function` / `use const` name a namespace member, not a class
  * file, so they must not go through PSR-4 class-file mapping (there is no
  * app/Helpers/format_money.php); they keep resolving to the declaring file. */
@@ -1517,6 +1563,8 @@ SUITE(edge_imports) {
     RUN_TEST(ei_php_psr4_class_per_file_issue1186);
     RUN_TEST(ei_php_psr4_nested_subnamespace_issue1186);
     RUN_TEST(ei_php_psr4_multiple_roots_longest_prefix_issue1186);
+    RUN_TEST(ei_php_psr4_array_directories);
+    RUN_TEST(ei_php_psr4_array_manifest_relative);
     RUN_TEST(ei_php_psr4_use_function_not_class_mapped_issue1186);
     RUN_TEST(ei_php_psr4_missing_class_file_unresolved_issue1186);
 }