@effect-app/infra 0.71.1 → 0.72.0

package/.cache/effect/095519d034161945a8d2616a506d3e7f35a9b3d868814f44c747429c60fc4e7f.hash

@@ -1 +1 @@
-729fbfce8447aab0d20f43120934adeec554c00c92004a20c37bc18f20fe1a5d
+3fdb756675565f3f5e5cdb6e2680f07a60ced261a3790df2cdfc23a21d160956

package/.cache/effect/134218688132dfbdea493cbe1f26e73449f2759121df35ddd5448346b59c9a8d.content

@@ -1,6 +1,8 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
+import * as tsplus_module_2 from "@effect/data/Either";
+import * as tsplus_module_3 from "@effect/io/Logger";
 import { InvalidStateError } from "../../errors.js";
-import { checkDuplicatePaths } from "./makeJsonSchema.js";
+import { checkPaths } from "./makeJsonSchema.js";
 const path = { path: "/securities/:id/search/:id2", method: "get" };
 const equalPaths = [
     "/securities/:idt/search/:id2",
@@ -9,8 +11,9 @@ const equalPaths = [
 ]
     .map((path) => ({ path, method: "get" }));
 const differentPaths = [
-    "/securities/:id/search/",
     "/securities/search/:id2",
+    "/securities/:id/search/",
+    "/securities/:id/search/:id2",
     "/securities/:id/:id2/search/:id3"
 ]
     .map((path) => ({ path, method: "get" }))
@@ -18,8 +21,23 @@ const differentPaths = [
     "/securities/:idt/search/:id2"
 ]
     .map((path) => ({ path, method: "post" })));
-test("works", () => {
-    expect(checkDuplicatePaths([path, ...differentPaths])).toStrictEqual(tsplus_module_1.succeed([path, ...differentPaths]));
-    equalPaths.forEach((p) => expect(checkDuplicatePaths([path, p])).toStrictEqual(tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`))));
+test("works", async () => {
+    expect(await tsplus_module_1.runPromise((checkPaths(differentPaths)))).toStrictEqual(differentPaths);
+    for (const p of equalPaths) {
+        expect(await tsplus_module_1.runPromiseEither(checkPaths([path, p]))).toStrictEqual(tsplus_module_2.left(new InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`)));
+    }
+    expect(await tsplus_module_1.runPromiseEither(checkPaths(["a/:p1/c/:p2", "a/b"].map((path) => ({ path, method: "get" })))))
+        .toStrictEqual(tsplus_module_2.left(new InvalidStateError(`Path /a/b/ is shadowed by /a/:p1/`)));
+    expect(await tsplus_module_1.runPromiseEither(checkPaths(["a/:p1/c/:p2", "a/:p111/c/d"].map((path) => ({ path, method: "get" })))))
+        .toStrictEqual(tsplus_module_2.left(new InvalidStateError(`Path /a/:p1/c/d/ is shadowed by /a/:p1/c/:p2/`)));
+});
+test("log shadowing", async () => {
+    const arr = [];
+    const paths = ["a/b", "a/:p"].map((path) => ({ path, method: "get" }));
+    const CustomLogger = tsplus_module_3.make((_, __, message) => {
+        arr.push(message);
+    });
+    await tsplus_module_1.runPromise(tsplus_module_1.provideLayer(checkPaths(paths), tsplus_module_3.replace(tsplus_module_3.defaultLogger, CustomLogger)));
+    expect(arr).toStrictEqual([`Path /a/:p/ is partially shadowed by /a/b/`]);
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZUpzb25TY2hlbWEudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDbkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFFekQsTUFBTSxJQUFJLEdBQUcsRUFBRSxJQUFJLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFBO0FBRW5FLE1BQU0sVUFBVSxHQUFHO0lBQ2pCLDhCQUE4QjtJQUM5Qiw4QkFBOEI7SUFDOUIsK0JBQStCO0NBQ2hDO0tBQ0UsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFFM0MsTUFBTSxjQUFjLEdBR2Q7SUFDSix5QkFBeUI7SUFDekIseUJBQXlCO0lBQ3pCLGtDQUFrQztDQUNuQztLQUNFLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztLQUN4QyxNQUFNLENBQUM7SUFDTiw4QkFBOEI7Q0FDL0I7S0FDRSxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBRS9DLElBQUksQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFO0lBQ2pCLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsd0JBQWUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFL0csVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3ZCLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUNsRCxxQkFBWSxJQUFJLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxhQUFhLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQ3RGLENBQ0YsQ0FBQTtBQUNILENBQUMsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW52YWxpZFN0YXRlRXJyb3IgfSBmcm9tIFwiLi4vLi4vZXJyb3JzLmpzXCJcbmltcG9ydCB7IGNoZWNrRHVwbGljYXRlUGF0aHMgfSBmcm9tIFwiLi9tYWtlSnNvblNjaGVtYS5qc1wiXG5cbmNvbnN0IHBhdGggPSB7IHBhdGg6IFwiL3NlY3VyaXRpZXMvOmlkL3NlYXJjaC86aWQyXCIsIG1ldGhvZDogXCJnZXRcIiB9XG5cbmNvbnN0IGVxdWFsUGF0aHMgPSBbXG4gIFwiL3NlY3VyaXRpZXMvOmlkdC9zZWFyY2gvOmlkMlwiLFxuICBcIi9zZWN1cml0aWVzLzppZC9zZWFyY2gvOmlkMnRcIixcbiAgXCIvc2VjdXJpdGllcy86aWR0L3NlYXJjaC86aWQydFwiXG5dXG4gIC5tYXAoKHBhdGgpID0+ICh7IHBhdGgsIG1ldGhvZDogXCJnZXRcIiB9KSlcblxuY29uc3QgZGlmZmVyZW50UGF0aHM6IHtcbiAgcGF0aDogc3RyaW5nXG4gIG1ldGhvZDogc3RyaW5nXG59W10gPSBbXG4gIFwiL3NlY3VyaXRpZXMvOmlkL3NlYXJjaC9cIixcbiAgXCIvc2VjdXJpdGllcy9zZWFyY2gvOmlkMlwiLFxuICBcIi9zZWN1cml0aWVzLzppZC86aWQyL3NlYXJjaC86aWQzXCJcbl1cbiAgLm1hcCgocGF0aCkgPT4gKHsgcGF0aCwgbWV0aG9kOiBcImdldFwiIH0pKVxuICAuY29uY2F0KFtcbiAgICBcIi9zZWN1cml0aWVzLzppZHQvc2VhcmNoLzppZDJcIlxuICBdXG4gICAgLm1hcCgocGF0aCkgPT4gKHsgcGF0aCwgbWV0aG9kOiBcInBvc3RcIiB9KSkpXG5cbnRlc3QoXCJ3b3Jrc1wiLCAoKSA9PiB7XG4gIGV4cGVjdChjaGVja0R1cGxpY2F0ZVBhdGhzKFtwYXRoLCAuLi5kaWZmZXJlbnRQYXRoc10pKS50b1N0cmljdEVxdWFsKEVmZmVjdC5zdWNjZWVkKFtwYXRoLCAuLi5kaWZmZXJlbnRQYXRoc10pKVxuXG4gIGVxdWFsUGF0aHMuZm9yRWFjaCgocCkgPT5cbiAgICBleHBlY3QoY2hlY2tEdXBsaWNhdGVQYXRocyhbcGF0aCwgcF0pKS50b1N0cmljdEVxdWFsKFxuICAgICAgRWZmZWN0LmZhaWwobmV3IEludmFsaWRTdGF0ZUVycm9yKGBEdXBsaWNhdGUgbWV0aG9kICR7cC5tZXRob2R9IGZvciBwYXRoICR7cC5wYXRofWApKVxuICAgIClcbiAgKVxufSlcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZUpzb25TY2hlbWEudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFFaEQsTUFBTSxJQUFJLEdBQUcsRUFBRSxJQUFJLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFBO0FBRW5FLE1BQU0sVUFBVSxHQUFHO0lBQ2pCLDhCQUE4QjtJQUM5Qiw4QkFBOEI7SUFDOUIsK0JBQStCO0NBQ2hDO0tBQ0UsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFFM0MsTUFBTSxjQUFjLEdBR2Q7SUFDSix5QkFBeUI7SUFDekIseUJBQXlCO0lBQ3pCLDZCQUE2QjtJQUM3QixrQ0FBa0M7Q0FDbkM7S0FDRSxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7S0FDeEMsTUFBTSxDQUFDO0lBQ04sOEJBQThCO0NBQy9CO0tBQ0UsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUUvQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssSUFBSSxFQUFFO0lBQ3ZCLE1BQU0sQ0FBQyxpQ0FBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFXLENBQUMsQ0FBQyxhQUFhLENBQUMsY0FBYyxDQUFDLENBQUE7SUFFbkYsS0FBSyxNQUFNLENBQUMsSUFBSSxVQUFVLEVBQUU7UUFDMUIsTUFBTSxDQUFDLHVDQUFNLFVBQVUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFpQixDQUFDLENBQUMsYUFBYSxDQUNoRSxxQkFBWSxJQUFJLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxhQUFhLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQ3RGLENBQUE7S0FDRjtJQUVELE1BQU0sQ0FBQyx1Q0FBTSxVQUFVLENBQUMsQ0FBQyxhQUFhLEVBQUUsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBaUIsQ0FBQztTQUN2RyxhQUFhLENBQ1oscUJBQVksSUFBSSxpQkFBaUIsQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDLENBQ3hFLENBQUE7SUFFSCxNQUFNLENBQUMsdUNBQU0sVUFBVSxDQUFDLENBQUMsYUFBYSxFQUFFLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQWlCLENBQUM7U0FDL0csYUFBYSxDQUNaLHFCQUFZLElBQUksaUJBQWlCLENBQUMsK0NBQStDLENBQUMsQ0FBQyxDQUNwRixDQUFBO0FBQ0wsQ0FBQyxDQUFDLENBQUE7QUFFRixJQUFJLENBQUMsZUFBZSxFQUFFLEtBQUssSUFBSSxFQUFFO0lBQy9CLE1BQU0sR0FBRyxHQUFhLEVBQUUsQ0FBQTtJQUN4QixNQUFNLEtBQUssR0FBRyxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUV0RSxNQUFNLFlBQVksR0FBRyxxQkFBMEIsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFO1FBQ2hFLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDbkIsQ0FBQyxDQUFDLENBQUE7SUFFRixpQ0FBTSw2QkFBQSxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQ1AsdURBQXFDLFlBQVksQ0FBQyxDQUFDLENBQ3RELENBQUE7SUFFYixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsNENBQTRDLENBQUMsQ0FBQyxDQUFBO0FBQzNFLENBQUMsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW52YWxpZFN0YXRlRXJyb3IgfSBmcm9tIFwiLi4vLi4vZXJyb3JzLmpzXCJcbmltcG9ydCB7IGNoZWNrUGF0aHMgfSBmcm9tIFwiLi9tYWtlSnNvblNjaGVtYS5qc1wiXG5cbmNvbnN0IHBhdGggPSB7IHBhdGg6IFwiL3NlY3VyaXRpZXMvOmlkL3NlYXJjaC86aWQyXCIsIG1ldGhvZDogXCJnZXRcIiB9XG5cbmNvbnN0IGVxdWFsUGF0aHMgPSBbXG4gIFwiL3NlY3VyaXRpZXMvOmlkdC9zZWFyY2gvOmlkMlwiLFxuICBcIi9zZWN1cml0aWVzLzppZC9zZWFyY2gvOmlkMnRcIixcbiAgXCIvc2VjdXJpdGllcy86aWR0L3NlYXJjaC86aWQydFwiXG5dXG4gIC5tYXAoKHBhdGgpID0+ICh7IHBhdGgsIG1ldGhvZDogXCJnZXRcIiB9KSlcblxuY29uc3QgZGlmZmVyZW50UGF0aHM6IHtcbiAgcGF0aDogc3RyaW5nXG4gIG1ldGhvZDogc3RyaW5nXG59W10gPSBbXG4gIFwiL3NlY3VyaXRpZXMvc2VhcmNoLzppZDJcIixcbiAgXCIvc2VjdXJpdGllcy86aWQvc2VhcmNoL1wiLFxuICBcIi9zZWN1cml0aWVzLzppZC9zZWFyY2gvOmlkMlwiLFxuICBcIi9zZWN1cml0aWVzLzppZC86aWQyL3NlYXJjaC86aWQzXCJcbl1cbiAgLm1hcCgocGF0aCkgPT4gKHsgcGF0aCwgbWV0aG9kOiBcImdldFwiIH0pKVxuICAuY29uY2F0KFtcbiAgICBcIi9zZWN1cml0aWVzLzppZHQvc2VhcmNoLzppZDJcIlxuICBdXG4gICAgLm1hcCgocGF0aCkgPT4gKHsgcGF0aCwgbWV0aG9kOiBcInBvc3RcIiB9KSkpXG5cbnRlc3QoXCJ3b3Jrc1wiLCBhc3luYyAoKSA9PiB7XG4gIGV4cGVjdChhd2FpdCAoY2hlY2tQYXRocyhkaWZmZXJlbnRQYXRocykpLnJ1blByb21pc2UpLnRvU3RyaWN0RXF1YWwoZGlmZmVyZW50UGF0aHMpXG5cbiAgZm9yIChjb25zdCBwIG9mIGVxdWFsUGF0aHMpIHtcbiAgICBleHBlY3QoYXdhaXQgY2hlY2tQYXRocyhbcGF0aCwgcF0pLnJ1blByb21pc2VFaXRoZXIpLnRvU3RyaWN0RXF1YWwoXG4gICAgICBFaXRoZXIubGVmdChuZXcgSW52YWxpZFN0YXRlRXJyb3IoYER1cGxpY2F0ZSBtZXRob2QgJHtwLm1ldGhvZH0gZm9yIHBhdGggJHtwLnBhdGh9YCkpXG4gICAgKVxuICB9XG5cbiAgZXhwZWN0KGF3YWl0IGNoZWNrUGF0aHMoW1wiYS86cDEvYy86cDJcIiwgXCJhL2JcIl0ubWFwKChwYXRoKSA9PiAoeyBwYXRoLCBtZXRob2Q6IFwiZ2V0XCIgfSkpKS5ydW5Qcm9taXNlRWl0aGVyKVxuICAgIC50b1N0cmljdEVxdWFsKFxuICAgICAgRWl0aGVyLmxlZnQobmV3IEludmFsaWRTdGF0ZUVycm9yKGBQYXRoIC9hL2IvIGlzIHNoYWRvd2VkIGJ5IC9hLzpwMS9gKSlcbiAgICApXG5cbiAgZXhwZWN0KGF3YWl0IGNoZWNrUGF0aHMoW1wiYS86cDEvYy86cDJcIiwgXCJhLzpwMTExL2MvZFwiXS5tYXAoKHBhdGgpID0+ICh7IHBhdGgsIG1ldGhvZDogXCJnZXRcIiB9KSkpLnJ1blByb21pc2VFaXRoZXIpXG4gICAgLnRvU3RyaWN0RXF1YWwoXG4gICAgICBFaXRoZXIubGVmdChuZXcgSW52YWxpZFN0YXRlRXJyb3IoYFBhdGggL2EvOnAxL2MvZC8gaXMgc2hhZG93ZWQgYnkgL2EvOnAxL2MvOnAyL2ApKVxuICAgIClcbn0pXG5cbnRlc3QoXCJsb2cgc2hhZG93aW5nXCIsIGFzeW5jICgpID0+IHtcbiAgY29uc3QgYXJyOiBzdHJpbmdbXSA9IFtdXG4gIGNvbnN0IHBhdGhzID0gW1wiYS9iXCIsIFwiYS86cFwiXS5tYXAoKHBhdGgpID0+ICh7IHBhdGgsIG1ldGhvZDogXCJnZXRcIiB9KSlcblxuICBjb25zdCBDdXN0b21Mb2dnZXIgPSBMb2dnZXIubWFrZTxzdHJpbmcsIHZvaWQ+KChfLCBfXywgbWVzc2FnZSkgPT4ge1xuICAgIGFyci5wdXNoKG1lc3NhZ2UpXG4gIH0pXG5cbiAgYXdhaXQgY2hlY2tQYXRocyhwYXRocylcbiAgICAucHJvdmlkZUxheWVyKExvZ2dlci5yZXBsYWNlKExvZ2dlci5kZWZhdWx0TG9nZ2VyLCBDdXN0b21Mb2dnZXIpKVxuICAgIC5ydW5Qcm9taXNlXG5cbiAgZXhwZWN0KGFycikudG9TdHJpY3RFcXVhbChbYFBhdGggL2EvOnAvIGlzIHBhcnRpYWxseSBzaGFkb3dlZCBieSAvYS9iL2BdKVxufSlcbiJdfQ==

package/.cache/effect/134218688132dfbdea493cbe1f26e73449f2759121df35ddd5448346b59c9a8d.hash

@@ -1 +1 @@
-51caa33f7ddc350183a9d903d3b8b4c3f4a7e3faa600faec37ba6e76db2d090b
+227326c96d8f8db11aa5dd8162cb906e55a27b00a9069640a822be51cb025b58

package/.cache/effect/14eb9da4ca6d22162888c7fdb7f39ab772d2a2dc6625db6031ecdb32ac89158f.content

@@ -5,57 +5,92 @@ import * as tsplus_module_3 from "@effect-app/core/_ext/Iterable";
 import { InvalidStateError } from "../../errors.js";
 import * as RS from "./schema/routing.js";
 const rx = /:(\w+)/g;
-export function checkDuplicatePaths(paths) {
-    const methods = Symbol("methods");
-    const pathMethods = { [methods]: [] };
-    const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
-    for (const path of paths) {
-        const matches = [...path.path.matchAll(regex)]
-            .map((match) => match[1]
-            ? { _tag: "resource", value: match[1] }
-            : { _tag: "param", value: match[2] });
-        let pathNavigator = pathMethods;
-        for (let i = 0; i < matches.length;) {
-            const match = matches[i];
-            switch (match._tag) {
-                case "resource": {
-                    if (!(match.value in (pathNavigator))) {
-                        ;
-                        (pathNavigator)[match.value] = { [methods]: [] };
-                    }
-                    pathNavigator = (pathNavigator)[match.value];
-                    i++;
-                    break;
+class PathsTree {
+    methods;
+    params;
+    subpaths;
+    path;
+    constructor(path) {
+        this.methods = [];
+        this.params = {};
+        this.subpaths = {};
+        this.path = path;
+    }
+}
+function checkShadowing(pathNavigator, match) {
+    return tsplus_module_1.gen(function* ($) {
+        switch (match._tag) {
+            case "resource": {
+                // check shadowing: if 'a/:param' comes before 'a/b', then 'a/b' is shadowed
+                if (pathNavigator.params[1]) {
+                    return yield* $(tsplus_module_1.fail(new InvalidStateError(`Path ${pathNavigator.path}${match.value}/ is shadowed by ${pathNavigator.params[1].path}`)));
                 }
-                case "param": {
-                    let numberOfParams = 1;
-                    while (i < matches.length && matches[i + 1]?._tag === "param") {
-                        numberOfParams++;
+                break;
+            }
+            case "param": {
+                // check shadowing: if 'a/b' comes before 'a/:param', then 'a/"param' is partially shadowed
+                const subpaths = Object.getOwnPropertyNames(pathNavigator.subpaths);
+                if (subpaths.length > 0) {
+                    yield* $(tsplus_module_1.all(subpaths.map((s) => tsplus_module_1.logInfo(`Path ${pathNavigator.path}:${match.value}/ is partially shadowed by ${pathNavigator.subpaths[s].path}`))));
+                }
+                break;
+            }
+        }
+    });
+}
+export function checkPaths(paths) {
+    return tsplus_module_1.gen(function* ($) {
+        const pathMethods = new PathsTree("/");
+        const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
+        for (const path of paths) {
+            const matches = [...path.path.matchAll(regex)]
+                .map((match) => match[1]
+                ? { _tag: "resource", value: match[1] }
+                : { _tag: "param", value: match[2] });
+            let pathNavigator = pathMethods;
+            for (let i = 0; i < matches.length;) {
+                const match = matches[i];
+                yield* $(checkShadowing(pathNavigator, match));
+                switch (match._tag) {
+                    case "resource": {
+                        if (!(match.value in pathNavigator.subpaths)) {
+                            pathNavigator.subpaths[match.value] = new PathsTree(`${pathNavigator.path}${match.value}/`);
+                        }
+                        pathNavigator = pathNavigator.subpaths[match.value];
                         i++;
+                        break;
                     }
-                    if (!(numberOfParams in pathNavigator)) {
-                        ;
-                        (pathNavigator)[numberOfParams] = { [methods]: [] };
+                    case "param": {
+                        const paramsNames = [match.value];
+                        let numberOfParams = 1;
+                        while (i < matches.length && matches[i + 1]?._tag === "param") {
+                            numberOfParams++;
+                            i++;
+                            paramsNames.push(match.value);
+                        }
+                        if (!(numberOfParams in pathNavigator.params)) {
+                            pathNavigator.params[numberOfParams] = new PathsTree(`${pathNavigator.path}:${paramsNames.join("/:")}/`);
+                        }
+                        pathNavigator = pathNavigator.params[numberOfParams];
+                        i++;
+                        break;
                     }
-                    pathNavigator = (pathNavigator)[numberOfParams];
-                    i++;
-                    break;
                 }
             }
+            if (pathNavigator.methods.includes(path.method)) {
+                // throw duplicate path-method error
+                return yield* $(tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`)));
+            }
+            pathNavigator.methods.push(path.method);
         }
-        if (pathNavigator[methods].includes(path.method)) {
-            // throw duplicate path-method error
-            return tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
-        }
-        pathNavigator[methods].push(path.method);
-    }
-    return tsplus_module_1.succeed(paths);
+        return paths;
+    });
 }
 /**
  * Work in progress JSONSchema generator.
  */
 export function makeJsonSchema(r) {
-    return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkDuplicatePaths), (e) => {
+    return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkPaths), (e) => {
         const map = ({ method, path, responses, ...rest }) => ({
             [method]: {
                 ...rest,
@@ -84,4 +119,4 @@ class Response {
         this.type = type;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeJsonSchema.js","sourceRoot":"","sources":["../../../_src/api/express/makeJsonSchema.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport { InvalidStateError } from \"../../errors.js\"\nimport * as RS from \"./schema/routing.js\"\n\ntype Methods = \"GET\" | \"PUT\" | \"POST\" | \"PATCH\" | \"DELETE\"\n\nconst rx = /:(\\w+)/g\n\ntype _A<C> = C extends ReadonlyArray<infer A> ? A : never\n\nexport function checkDuplicatePaths<T extends { path: string; method: string }>(\n  paths: readonly T[]\n): Effect<never, InvalidStateError, readonly T[]> {\n  const methods = Symbol(\"methods\")\n  interface PathMethods {\n    [key: string | number]: this | undefined\n    [methods]: string[]\n  }\n  const pathMethods: PathMethods = { [methods]: [] }\n  const regex = /(?:^|\\/)([^/:\\n]+)|:(\\w+)/g\n\n  for (const path of paths) {\n    const matches = [...path.path.matchAll(regex)]\n      .map((match) =>\n        match[1]\n          ? { _tag: \"resource\", value: match[1] } as const\n          : { _tag: \"param\", value: match[2]! } as const\n      )\n\n    let pathNavigator: PathMethods | string[] = pathMethods\n    for (let i = 0; i < matches.length;) {\n      const match = matches[i]!\n      switch (match._tag) {\n        case \"resource\": {\n          if (!(match.value in (pathNavigator))) {\n            ;(pathNavigator)[match.value] = { [methods]: [] }\n          }\n          pathNavigator = (pathNavigator)[match.value]!\n          i++\n          break\n        }\n        case \"param\": {\n          let numberOfParams = 1\n          while (i < matches.length && matches[i + 1]?._tag === \"param\") {\n            numberOfParams++\n            i++\n          }\n\n          if (!(numberOfParams in pathNavigator)) {\n            ;(pathNavigator)[numberOfParams] = { [methods]: [] }\n          }\n          pathNavigator = (pathNavigator)[numberOfParams]!\n          i++\n          break\n        }\n      }\n    }\n\n    if (pathNavigator[methods].includes(path.method)) {\n      // throw duplicate path-method error\n      return Effect.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`))\n    }\n    pathNavigator[methods].push(path.method)\n  }\n\n  return Effect.succeed(paths)\n}\n\n/**\n * Work in progress JSONSchema generator.\n */\nexport function makeJsonSchema(r: Iterable<RS.RouteDescriptorAny>) {\n  return Chunk\n    .fromIterable(r)\n    .forEachEffect(RS.makeFromSchema)\n    .flatMap(checkDuplicatePaths)\n    .map((e) => {\n      const map = ({ method, path, responses, ...rest }: _A<typeof e>) => ({\n        [method]: {\n          ...rest,\n          responses: (responses as Array<any>).reduce(\n            (prev, cur) => {\n              prev[cur.statusCode] = cur.type\n              return prev\n            },\n            {} as Record<Response[\"statusCode\"], Response[\"type\"]>\n          )\n        }\n      })\n      return e.reduce(\n        (prev, e) => {\n          const path = e.path.split(\"?\")[0].replace(rx, (_a, b) => `{${b}}`)\n          prev[path] = {\n            ...prev[path],\n            ...map(e) as any\n          }\n          return prev\n        },\n        {} as Record<string, Record<Methods, ReturnType<typeof map>>>\n      )\n    })\n}\n\nclass Response {\n  constructor(\n    public readonly statusCode: number,\n    public readonly type: any // string | JSONSchema | SubSchema\n  ) {}\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeJsonSchema.js","sourceRoot":"","sources":["../../../_src/api/express/makeJsonSchema.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport { InvalidStateError } from \"../../errors.js\"\nimport * as RS from \"./schema/routing.js\"\n\ntype Methods = \"GET\" | \"PUT\" | \"POST\" | \"PATCH\" | \"DELETE\"\n\nconst rx = /:(\\w+)/g\n\ntype _A<C> = C extends ReadonlyArray<infer A> ? A : never\n\nclass PathsTree {\n  public readonly methods: string[]\n  public readonly params: { [key: number]: PathsTree | undefined }\n  public readonly subpaths: { [key: string]: PathsTree | undefined }\n  public readonly path: string\n\n  constructor(path: string) {\n    this.methods = []\n    this.params = {}\n    this.subpaths = {}\n    this.path = path\n  }\n}\n\ninterface Match {\n  _tag: \"resource\" | \"param\"\n  value: string\n}\n\nfunction checkShadowing(\n  pathNavigator: PathsTree,\n  match: Match\n) {\n  return Effect.gen(function*($) {\n    switch (match._tag) {\n      case \"resource\": {\n        // check shadowing: if 'a/:param' comes before 'a/b', then 'a/b' is shadowed\n        if (pathNavigator.params[1]) {\n          return yield* $(Effect.fail(\n            new InvalidStateError(\n              `Path ${pathNavigator.path}${match.value}/ is shadowed by ${pathNavigator.params[1].path}`\n            )\n          ))\n        }\n        break\n      }\n      case \"param\": {\n        // check shadowing: if 'a/b' comes before 'a/:param', then 'a/\"param' is partially shadowed\n        const subpaths = Object.getOwnPropertyNames(pathNavigator.subpaths)\n        if (subpaths.length > 0) {\n          yield* $(Effect.all(subpaths.map((s) =>\n            Effect.logInfo(\n              `Path ${pathNavigator.path}:${match.value}/ is partially shadowed by ${pathNavigator.subpaths[s]!.path}`\n            )\n          )))\n        }\n        break\n      }\n    }\n  })\n}\n\nexport function checkPaths<T extends { path: string; method: string }>(\n  paths: readonly T[]\n) {\n  return Effect.gen(function*($) {\n    const pathMethods: PathsTree = new PathsTree(\"/\")\n    const regex = /(?:^|\\/)([^/:\\n]+)|:(\\w+)/g\n    for (const path of paths) {\n      const matches = [...path.path.matchAll(regex)]\n        .map((match) =>\n          match[1]\n            ? { _tag: \"resource\", value: match[1] } as const\n            : { _tag: \"param\", value: match[2]! } as const\n        )\n\n      let pathNavigator = pathMethods\n      for (let i = 0; i < matches.length;) {\n        const match = matches[i]!\n\n        yield* $(checkShadowing(pathNavigator, match))\n\n        switch (match._tag) {\n          case \"resource\": {\n            if (!(match.value in pathNavigator.subpaths)) {\n              pathNavigator.subpaths[match.value] = new PathsTree(`${pathNavigator.path}${match.value}/`)\n            }\n\n            pathNavigator = pathNavigator.subpaths[match.value]!\n            i++\n            break\n          }\n          case \"param\": {\n            const paramsNames = [match.value]\n            let numberOfParams = 1\n            while (i < matches.length && matches[i + 1]?._tag === \"param\") {\n              numberOfParams++\n              i++\n              paramsNames.push(match.value)\n            }\n\n            if (!(numberOfParams in pathNavigator.params)) {\n              pathNavigator.params[numberOfParams] = new PathsTree(\n                `${pathNavigator.path}:${paramsNames.join(\"/:\")}/`\n              )\n            }\n            pathNavigator = pathNavigator.params[numberOfParams]!\n            i++\n            break\n          }\n        }\n      }\n\n      if (pathNavigator.methods.includes(path.method)) {\n        // throw duplicate path-method error\n        return yield* $(Effect.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`)))\n      }\n      pathNavigator.methods.push(path.method)\n    }\n\n    return paths\n  })\n}\n\n/**\n * Work in progress JSONSchema generator.\n */\nexport function makeJsonSchema(r: Iterable<RS.RouteDescriptorAny>) {\n  return Chunk\n    .fromIterable(r)\n    .forEachEffect(RS.makeFromSchema)\n    .flatMap(checkPaths)\n    .map((e) => {\n      const map = ({ method, path, responses, ...rest }: _A<typeof e>) => ({\n        [method]: {\n          ...rest,\n          responses: (responses as Array<any>).reduce(\n            (prev, cur) => {\n              prev[cur.statusCode] = cur.type\n              return prev\n            },\n            {} as Record<Response[\"statusCode\"], Response[\"type\"]>\n          )\n        }\n      })\n      return e.reduce(\n        (prev, e) => {\n          const path = e.path.split(\"?\")[0].replace(rx, (_a, b) => `{${b}}`)\n          prev[path] = {\n            ...prev[path],\n            ...map(e) as any\n          }\n          return prev\n        },\n        {} as Record<string, Record<Methods, ReturnType<typeof map>>>\n      )\n    })\n}\n\nclass Response {\n  constructor(\n    public readonly statusCode: number,\n    public readonly type: any // string | JSONSchema | SubSchema\n  ) {}\n}\n"]}

package/.cache/effect/14eb9da4ca6d22162888c7fdb7f39ab772d2a2dc6625db6031ecdb32ac89158f.hash

@@ -1 +1 @@
-ba6a347ea34d0d5aa6071e101901f8b111f733afb9b3c2044266e0fcefb3e739
+b8406b30e5dc86e8886d361354e8ded840ddf37986c569803276d119c900733c

package/.cache/effect/49c1bd9ec26e6df78b994d8df0bfe21b119803fa4aa46349bf4679fd0f1e7cda.hash

@@ -1 +1 @@
-a79d32c41e44e9290a704b7e4f1ca9ae312c07758fb77ebabd596b3cc2df2d32
+cc2e90554066973e1b31534d5490d33b59233503ebcbafddd5483cecb7c817dd

package/.cache/effect/58d4ccde8bd2db7829706db5bebd01b99900ee83f0f6a8413b53d17cbd69f510.hash

@@ -1 +1 @@
-38b975ae211b2450e8c9edd72dee956ed9adb66753c32b48d2dc5402a71f6151
+6c73d6a53dba8e2732209764f5233c88f81e895dc2e244202cf05253b7fe38f0

package/.cache/effect/72a5a16a6b62b63cd71719c833091128207d7e6c823cb32293549b3dd58c451b.hash

@@ -1 +1 @@
-593762639c0db53e885b59cf5027fef3ea801fffde8e31e3ebfd06cc019eb7ba
+b4b12945fbdaa4d1e98b8a2095ca4363f267e0909cdb70da478a35926e8fbba5

package/.cache/effect/f38adf43700dab905456a534a0690eaf882cff2cd576c731f23d6d14a3c3d659.hash

@@ -1 +1 @@
-069ab60ec62e1f17676f3c02a28683e1c2d5d3f2cc0b221bd354b24252f169d5
+86abfcd3894752fc7211a2479161a1f24bc7df3ef89aaa7c2ff967fc7b5c673b

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @effect-app/infra
 
+## 0.72.0
+
+### Minor Changes
+
+- b6af4d2f: enhance shadowing paths check
+
+## 0.71.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @effect-app/prelude@0.58.2
+  - @effect-app/infra-adapters@0.49.2
+
 ## 0.71.1
 
 ### Patch Changes

package/_cjs/api/express/makeJsonSchema.cjs

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkDuplicatePaths = checkDuplicatePaths;
+exports.checkPaths = checkPaths;
 exports.makeJsonSchema = makeJsonSchema;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("@effect/data/Chunk"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect/data/Chunk"));
 var _errors = require("../../errors.cjs");
 var RS = _interopRequireWildcard(require("./schema/routing.cjs"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -15,68 +15,95 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 const rx = /:(\w+)/g;
-function checkDuplicatePaths(paths) {
-  const methods = Symbol("methods");
-  const pathMethods = {
-    [methods]: []
-  };
-  const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
-  for (const path of paths) {
-    const matches = [...path.path.matchAll(regex)].map(match => match[1] ? {
-      _tag: "resource",
-      value: match[1]
-    } : {
-      _tag: "param",
-      value: match[2]
-    });
-    let pathNavigator = pathMethods;
-    for (let i = 0; i < matches.length;) {
-      const match = matches[i];
-      switch (match._tag) {
-        case "resource":
-          {
-            if (!(match.value in pathNavigator)) {
-              ;
-              pathNavigator[match.value] = {
-                [methods]: []
-              };
-            }
-            pathNavigator = pathNavigator[match.value];
-            i++;
-            break;
+class PathsTree {
+  constructor(path) {
+    this.methods = [];
+    this.params = {};
+    this.subpaths = {};
+    this.path = path;
+  }
+}
+function checkShadowing(pathNavigator, match) {
+  return tsplus_module_1.gen(function* ($) {
+    switch (match._tag) {
+      case "resource":
+        {
+          // check shadowing: if 'a/:param' comes before 'a/b', then 'a/b' is shadowed
+          if (pathNavigator.params[1]) {
+            return yield* $(tsplus_module_1.fail(new _errors.InvalidStateError(`Path ${pathNavigator.path}${match.value}/ is shadowed by ${pathNavigator.params[1].path}`)));
           }
-        case "param":
-          {
-            let numberOfParams = 1;
-            while (i < matches.length && matches[i + 1]?._tag === "param") {
-              numberOfParams++;
+          break;
+        }
+      case "param":
+        {
+          // check shadowing: if 'a/b' comes before 'a/:param', then 'a/"param' is partially shadowed
+          const subpaths = Object.getOwnPropertyNames(pathNavigator.subpaths);
+          if (subpaths.length > 0) {
+            yield* $(tsplus_module_2.ext_forEach(subpaths, s => tsplus_module_1.logInfo(`Path ${pathNavigator.path}:${match.value}/ is partially shadowed by ${pathNavigator.subpaths[s].path}`)));
+          }
+          break;
+        }
+    }
+  });
+}
+function checkPaths(paths) {
+  return tsplus_module_1.gen(function* ($) {
+    const pathMethods = new PathsTree("/");
+    const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
+    for (const path of paths) {
+      const matches = [...path.path.matchAll(regex)].map(match => match[1] ? {
+        _tag: "resource",
+        value: match[1]
+      } : {
+        _tag: "param",
+        value: match[2]
+      });
+      let pathNavigator = pathMethods;
+      for (let i = 0; i < matches.length;) {
+        const match = matches[i];
+        yield* $(checkShadowing(pathNavigator, match));
+        switch (match._tag) {
+          case "resource":
+            {
+              if (!(match.value in pathNavigator.subpaths)) {
+                pathNavigator.subpaths[match.value] = new PathsTree(`${pathNavigator.path}${match.value}/`);
+              }
+              pathNavigator = pathNavigator.subpaths[match.value];
               i++;
+              break;
             }
-            if (!(numberOfParams in pathNavigator)) {
-              ;
-              pathNavigator[numberOfParams] = {
-                [methods]: []
-              };
+          case "param":
+            {
+              const paramsNames = [match.value];
+              let numberOfParams = 1;
+              while (i < matches.length && matches[i + 1]?._tag === "param") {
+                numberOfParams++;
+                i++;
+                paramsNames.push(matches[i].value);
+              }
+              if (!(numberOfParams in pathNavigator.params)) {
+                pathNavigator.params[numberOfParams] = new PathsTree(`${pathNavigator.path}:${paramsNames.join("/:")}/`);
+              }
+              pathNavigator = pathNavigator.params[numberOfParams];
+              i++;
+              break;
             }
-            pathNavigator = pathNavigator[numberOfParams];
-            i++;
-            break;
-          }
+        }
       }
+      if (pathNavigator.methods.includes(path.method)) {
+        // throw duplicate path-method error
+        return yield* $(tsplus_module_1.fail(new _errors.InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`)));
+      }
+      pathNavigator.methods.push(path.method);
     }
-    if (pathNavigator[methods].includes(path.method)) {
-      // throw duplicate path-method error
-      return tsplus_module_1.fail(new _errors.InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
-    }
-    pathNavigator[methods].push(path.method);
-  }
-  return tsplus_module_1.succeed(paths);
+    return paths;
+  });
 }
 /**
  * Work in progress JSONSchema generator.
  */
 function makeJsonSchema(r) {
-  return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkDuplicatePaths), e => {
+  return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_2.ext_forEach(tsplus_module_3.fromIterable(r), RS.makeFromSchema), checkPaths), e => {
     const map = ({
       method,
       path,

package/_cjs/api/express/makeJsonSchema.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"makeJsonSchema.cjs","names":["_errors","require","RS","_interopRequireWildcard","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","rx","checkDuplicatePaths","paths","methods","Symbol","pathMethods","regex","path","matches","matchAll","map","match","_tag","value","pathNavigator","i","length","numberOfParams","includes","method","tsplus_module_1","fail","InvalidStateError","push","succeed","makeJsonSchema","r","flatMap","tsplus_module_3","ext_forEach","tsplus_module_2","fromIterable","makeFromSchema","e","responses","rest","reduce","prev","cur","statusCode","type","split","replace","_a","b","Response","constructor"],"sources":["../../../_src/api/express/makeJsonSchema.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"makeJsonSchema.cjs","names":["_errors","require","RS","_interopRequireWildcard","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","rx","PathsTree","constructor","path","methods","params","subpaths","checkShadowing","pathNavigator","match","tsplus_module_1","gen","$","_tag","fail","InvalidStateError","value","getOwnPropertyNames","length","tsplus_module_2","ext_forEach","s","logInfo","checkPaths","paths","pathMethods","regex","matches","matchAll","map","i","paramsNames","numberOfParams","push","join","includes","method","makeJsonSchema","r","flatMap","tsplus_module_3","fromIterable","makeFromSchema","e","responses","rest","reduce","prev","cur","statusCode","type","split","replace","_a","b","Response"],"sources":["../../../_src/api/express/makeJsonSchema.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/express/makeJsonSchema.test.cjs

@@ -1,6 +1,8 @@
 "use strict";
 
 var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect/data/Either"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect/io/Logger"));
 var _errors = require("../../errors.cjs");
 var _makeJsonSchema = require("./makeJsonSchema.cjs");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -13,15 +15,37 @@ const equalPaths = ["/securities/:idt/search/:id2", "/securities/:id/search/:id2
   path,
   method: "get"
 }));
-const differentPaths = ["/securities/:id/search/", "/securities/search/:id2", "/securities/:id/:id2/search/:id3"].map(path => ({
+const differentPaths = ["/securities/search/:id2", "/securities/:id/search/", "/securities/:id/search/:id2", "/securities/:id/:id2/search/:id3"].map(path => ({
   path,
   method: "get"
 })).concat(["/securities/:idt/search/:id2"].map(path => ({
   path,
   method: "post"
 })));
-test("works", () => {
-  expect((0, _makeJsonSchema.checkDuplicatePaths)([path, ...differentPaths])).toStrictEqual(tsplus_module_1.succeed([path, ...differentPaths]));
-  equalPaths.forEach(p => expect((0, _makeJsonSchema.checkDuplicatePaths)([path, p])).toStrictEqual(tsplus_module_1.fail(new _errors.InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`))));
+test("works", async () => {
+  expect(await tsplus_module_1.runPromise((0, _makeJsonSchema.checkPaths)(differentPaths))).toStrictEqual(differentPaths);
+  for (const p of equalPaths) {
+    expect(await tsplus_module_1.runPromiseEither((0, _makeJsonSchema.checkPaths)([path, p]))).toStrictEqual(tsplus_module_2.left(new _errors.InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`)));
+  }
+  expect(await tsplus_module_1.runPromiseEither((0, _makeJsonSchema.checkPaths)(["a/:p1/c/:p2", "a/b"].map(path => ({
+    path,
+    method: "get"
+  }))))).toStrictEqual(tsplus_module_2.left(new _errors.InvalidStateError(`Path /a/b/ is shadowed by /a/:p1/`)));
+  expect(await tsplus_module_1.runPromiseEither((0, _makeJsonSchema.checkPaths)(["a/:p1/c/:p2", "a/:p111/c/d"].map(path => ({
+    path,
+    method: "get"
+  }))))).toStrictEqual(tsplus_module_2.left(new _errors.InvalidStateError(`Path /a/:p1/c/d/ is shadowed by /a/:p1/c/:p2/`)));
+});
+test("log shadowing", async () => {
+  const arr = [];
+  const paths = ["a/b", "a/:p"].map(path => ({
+    path,
+    method: "get"
+  }));
+  const CustomLogger = tsplus_module_3.make((_, __, message) => {
+    arr.push(message);
+  });
+  await tsplus_module_1.runPromise(tsplus_module_1.provideLayer((0, _makeJsonSchema.checkPaths)(paths), tsplus_module_3.replace(tsplus_module_3.defaultLogger, CustomLogger)));
+  expect(arr).toStrictEqual([`Path /a/:p/ is partially shadowed by /a/b/`]);
 });
 //# sourceMappingURL=makeJsonSchema.test.cjs.map

package/_cjs/api/express/makeJsonSchema.test.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"makeJsonSchema.test.cjs","names":["_errors","require","_makeJsonSchema","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","path","method","equalPaths","map","differentPaths","concat","test","expect","checkDuplicatePaths","toStrictEqual","tsplus_module_1","succeed","forEach","p","fail","InvalidStateError"],"sources":["../../../_src/api/express/makeJsonSchema.test.ts"],"sourcesContent":[null],"mappings":";;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAAyD,SAAAE,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAI,wBAAAC,GAAA,EAAAL,WAAA,SAAAA,WAAA,IAAAK,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAT,wBAAA,CAAAC,WAAA,OAAAQ,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAEzD,MAAMW,IAAI,GAAG;EAAEA,IAAI,EAAE,6BAA6B;EAAEC,MAAM,EAAE;AAAK,CAAE;AAEnE,MAAMC,UAAU,GAAG,CACjB,8BAA8B,EAC9B,8BAA8B,EAC9B,+BAA+B,CAChC,CACEC,GAAG,CAAEH,IAAI,KAAM;EAAEA,IAAI;EAAEC,MAAM,EAAE;AAAK,CAAE,CAAC,CAAC;AAE3C,MAAMG,cAAc,GAGd,CACJ,yBAAyB,EACzB,yBAAyB,EACzB,kCAAkC,CACnC,CACED,GAAG,CAAEH,IAAI,KAAM;EAAEA,IAAI;EAAEC,MAAM,EAAE;AAAK,CAAE,CAAC,CAAC,CACxCI,MAAM,CAAC,CACN,8BAA8B,CAC/B,CACEF,GAAG,CAAEH,IAAI,KAAM;EAAEA,IAAI;EAAEC,MAAM,EAAE;AAAM,CAAE,CAAC,CAAC,CAAC;AAE/CK,IAAI,CAAC,OAAO,EAAE,MAAK;EACjBC,MAAM,CAAC,IAAAC,mCAAmB,EAAC,CAACR,IAAI,EAAE,GAAGI,cAAc,CAAC,CAAC,CAAC,CAACK,aAAa,CAACC,eAAA,CAAAC,OAAA,CAAe,CAACX,IAAI,EAAE,GAAGI,cAAc,CAAC,CAAC,CAAC;EAE/GF,UAAU,CAACU,OAAO,CAAEC,CAAC,IACnBN,MAAM,CAAC,IAAAC,mCAAmB,EAAC,CAACR,IAAI,EAAEa,CAAC,CAAC,CAAC,CAAC,CAACJ,aAAa,CAClDC,eAAA,CAAAI,IAAA,CAAY,IAAIC,yBAAiB,CAAC,oBAAoBF,CAAC,CAACZ,MAAM,aAAaY,CAAC,CAACb,IAAI,EAAE,CAAC,CAAC,CACtF,CACF;AACH,CAAC,CAAC"}
+{"version":3,"file":"makeJsonSchema.test.cjs","names":["_errors","require","_makeJsonSchema","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","path","method","equalPaths","map","differentPaths","concat","test","expect","tsplus_module_1","runPromise","checkPaths","toStrictEqual","p","runPromiseEither","tsplus_module_2","left","InvalidStateError","arr","paths","CustomLogger","tsplus_module_3","make","_","__","message","push","provideLayer","replace","defaultLogger"],"sources":["../../../_src/api/express/makeJsonSchema.test.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/api/express/makeJsonSchema.test.ts

@@ -1,5 +1,5 @@
 import { InvalidStateError } from "../../errors.js"
-import { checkDuplicatePaths } from "./makeJsonSchema.js"
+import { checkPaths } from "./makeJsonSchema.js"
 
 const path = { path: "/securities/:id/search/:id2", method: "get" }
 
@@ -14,8 +14,9 @@ const differentPaths: {
   path: string
   method: string
 }[] = [
-  "/securities/:id/search/",
   "/securities/search/:id2",
+  "/securities/:id/search/",
+  "/securities/:id/search/:id2",
   "/securities/:id/:id2/search/:id3"
 ]
   .map((path) => ({ path, method: "get" }))
@@ -24,12 +25,37 @@ const differentPaths: {
   ]
     .map((path) => ({ path, method: "post" })))
 
-test("works", () => {
-  expect(checkDuplicatePaths([path, ...differentPaths])).toStrictEqual(Effect.succeed([path, ...differentPaths]))
+test("works", async () => {
+  expect(await (checkPaths(differentPaths)).runPromise).toStrictEqual(differentPaths)
+
+  for (const p of equalPaths) {
+    expect(await checkPaths([path, p]).runPromiseEither).toStrictEqual(
+      Either.left(new InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`))
+    )
+  }
+
+  expect(await checkPaths(["a/:p1/c/:p2", "a/b"].map((path) => ({ path, method: "get" }))).runPromiseEither)
+    .toStrictEqual(
+      Either.left(new InvalidStateError(`Path /a/b/ is shadowed by /a/:p1/`))
+    )
 
-  equalPaths.forEach((p) =>
-    expect(checkDuplicatePaths([path, p])).toStrictEqual(
-      Effect.fail(new InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`))
+  expect(await checkPaths(["a/:p1/c/:p2", "a/:p111/c/d"].map((path) => ({ path, method: "get" }))).runPromiseEither)
+    .toStrictEqual(
+      Either.left(new InvalidStateError(`Path /a/:p1/c/d/ is shadowed by /a/:p1/c/:p2/`))
     )
-  )
+})
+
+test("log shadowing", async () => {
+  const arr: string[] = []
+  const paths = ["a/b", "a/:p"].map((path) => ({ path, method: "get" }))
+
+  const CustomLogger = Logger.make<string, void>((_, __, message) => {
+    arr.push(message)
+  })
+
+  await checkPaths(paths)
+    .provideLayer(Logger.replace(Logger.defaultLogger, CustomLogger))
+    .runPromise
+
+  expect(arr).toStrictEqual([`Path /a/:p/ is partially shadowed by /a/b/`])
 })

package/_src/api/express/makeJsonSchema.ts

@@ -9,62 +9,118 @@ const rx = /:(\w+)/g
 
 type _A<C> = C extends ReadonlyArray<infer A> ? A : never
 
-export function checkDuplicatePaths<T extends { path: string; method: string }>(
-  paths: readonly T[]
-): Effect<never, InvalidStateError, readonly T[]> {
-  const methods = Symbol("methods")
-  interface PathMethods {
-    [key: string | number]: this | undefined
-    [methods]: string[]
+class PathsTree {
+  public readonly methods: string[]
+  public readonly params: { [key: number]: PathsTree | undefined }
+  public readonly subpaths: { [key: string]: PathsTree | undefined }
+  public readonly path: string
+
+  constructor(path: string) {
+    this.methods = []
+    this.params = {}
+    this.subpaths = {}
+    this.path = path
   }
-  const pathMethods: PathMethods = { [methods]: [] }
-  const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g
-
-  for (const path of paths) {
-    const matches = [...path.path.matchAll(regex)]
-      .map((match) =>
-        match[1]
-          ? { _tag: "resource", value: match[1] } as const
-          : { _tag: "param", value: match[2]! } as const
-      )
+}
 
-    let pathNavigator: PathMethods | string[] = pathMethods
-    for (let i = 0; i < matches.length;) {
-      const match = matches[i]!
-      switch (match._tag) {
-        case "resource": {
-          if (!(match.value in (pathNavigator))) {
-            ;(pathNavigator)[match.value] = { [methods]: [] }
-          }
-          pathNavigator = (pathNavigator)[match.value]!
-          i++
-          break
+interface Match {
+  _tag: "resource" | "param"
+  value: string
+}
+
+function checkShadowing(
+  pathNavigator: PathsTree,
+  match: Match
+) {
+  return Effect.gen(function*($) {
+    switch (match._tag) {
+      case "resource": {
+        // check shadowing: if 'a/:param' comes before 'a/b', then 'a/b' is shadowed
+        if (pathNavigator.params[1]) {
+          return yield* $(Effect.fail(
+            new InvalidStateError(
+              `Path ${pathNavigator.path}${match.value}/ is shadowed by ${pathNavigator.params[1].path}`
+            )
+          ))
+        }
+        break
+      }
+      case "param": {
+        // check shadowing: if 'a/b' comes before 'a/:param', then 'a/"param' is partially shadowed
+        const subpaths = Object.getOwnPropertyNames(pathNavigator.subpaths)
+        if (subpaths.length > 0) {
+          yield* $(subpaths.forEachEffect((s) =>
+            Effect.logInfo(
+              `Path ${pathNavigator.path}:${match.value}/ is partially shadowed by ${pathNavigator.subpaths[s]!.path}`
+            )
+          ))
         }
-        case "param": {
-          let numberOfParams = 1
-          while (i < matches.length && matches[i + 1]?._tag === "param") {
-            numberOfParams++
+        break
+      }
+    }
+  })
+}
+
+export function checkPaths<T extends { path: string; method: string }>(
+  paths: readonly T[]
+) {
+  return Effect.gen(function*($) {
+    const pathMethods: PathsTree = new PathsTree("/")
+    const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g
+    for (const path of paths) {
+      const matches = [...path.path.matchAll(regex)]
+        .map((match) =>
+          match[1]
+            ? { _tag: "resource", value: match[1] } as const
+            : { _tag: "param", value: match[2]! } as const
+        )
+
+      let pathNavigator = pathMethods
+      for (let i = 0; i < matches.length;) {
+        const match = matches[i]!
+
+        yield* $(checkShadowing(pathNavigator, match))
+
+        switch (match._tag) {
+          case "resource": {
+            if (!(match.value in pathNavigator.subpaths)) {
+              pathNavigator.subpaths[match.value] = new PathsTree(`${pathNavigator.path}${match.value}/`)
+            }
+
+            pathNavigator = pathNavigator.subpaths[match.value]!
             i++
+            break
           }
+          case "param": {
+            const paramsNames = [match.value]
+            let numberOfParams = 1
+            while (i < matches.length && matches[i + 1]?._tag === "param") {
+              numberOfParams++
+              i++
+              paramsNames.push(matches[i]!.value)
+            }
 
-          if (!(numberOfParams in pathNavigator)) {
-            ;(pathNavigator)[numberOfParams] = { [methods]: [] }
+            if (!(numberOfParams in pathNavigator.params)) {
+              pathNavigator.params[numberOfParams] = new PathsTree(
+                `${pathNavigator.path}:${paramsNames.join("/:")}/`
+              )
+            }
+            pathNavigator = pathNavigator.params[numberOfParams]!
+            i++
+            break
           }
-          pathNavigator = (pathNavigator)[numberOfParams]!
-          i++
-          break
         }
       }
-    }
 
-    if (pathNavigator[methods].includes(path.method)) {
-      // throw duplicate path-method error
-      return Effect.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`))
+      if (pathNavigator.methods.includes(path.method)) {
+        // throw duplicate path-method error
+        return yield* $(Effect.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`)))
+      }
+      pathNavigator.methods.push(path.method)
     }
-    pathNavigator[methods].push(path.method)
-  }
 
-  return Effect.succeed(paths)
+    return paths
+  })
 }
 
 /**
@@ -74,7 +130,7 @@ export function makeJsonSchema(r: Iterable<RS.RouteDescriptorAny>) {
   return Chunk
     .fromIterable(r)
     .forEachEffect(RS.makeFromSchema)
-    .flatMap(checkDuplicatePaths)
+    .flatMap(checkPaths)
     .map((e) => {
       const map = ({ method, path, responses, ...rest }: _A<typeof e>) => ({
         [method]: {

package/dist/api/express/makeJsonSchema.d.ts

@@ -1,11 +1,10 @@
-import { Effect } from "@effect/io/Effect";
 import { InvalidStateError } from "../../errors.js";
 import * as RS from "./schema/routing.js";
 type Methods = "GET" | "PUT" | "POST" | "PATCH" | "DELETE";
-export declare function checkDuplicatePaths<T extends {
+export declare function checkPaths<T extends {
     path: string;
     method: string;
-}>(paths: readonly T[]): Effect<never, InvalidStateError, readonly T[]>;
+}>(paths: readonly T[]): import("@effect/io/Effect").Effect<never, InvalidStateError, readonly T[]>;
 /**
  * Work in progress JSONSchema generator.
  */

package/dist/api/express/makeJsonSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeJsonSchema.d.ts","sourceRoot":"","sources":["../../../_src/api/express/makeJsonSchema.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAEzC,KAAK,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;AAM1D,wBAAgB,mBAAmB,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC5E,KAAK,EAAE,SAAS,CAAC,EAAE,GAClB,MAAM,CAAC,KAAK,EAAE,iBAAiB,EAAE,SAAS,CAAC,EAAE,CAAC,CAsDhD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;KA8BhE"}
+{"version":3,"file":"makeJsonSchema.d.ts","sourceRoot":"","sources":["../../../_src/api/express/makeJsonSchema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAEzC,KAAK,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;AA0D1D,wBAAgB,UAAU,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACnE,KAAK,EAAE,SAAS,CAAC,EAAE,8EA2DpB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;KA8BhE"}

package/dist/api/express/makeJsonSchema.js

@@ -1,61 +1,92 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@effect/data/Chunk";
-import * as tsplus_module_3 from "@effect-app/core/_ext/Iterable";
+import * as tsplus_module_2 from "@effect-app/core/_ext/Iterable";
+import * as tsplus_module_3 from "@effect/data/Chunk";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { InvalidStateError } from "../../errors.js";
 import * as RS from "./schema/routing.js";
 const rx = /:(\w+)/g;
-export function checkDuplicatePaths(paths) {
-    const methods = Symbol("methods");
-    const pathMethods = { [methods]: [] };
-    const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
-    for (const path of paths) {
-        const matches = [...path.path.matchAll(regex)]
-            .map((match) => match[1]
-            ? { _tag: "resource", value: match[1] }
-            : { _tag: "param", value: match[2] });
-        let pathNavigator = pathMethods;
-        for (let i = 0; i < matches.length;) {
-            const match = matches[i];
-            switch (match._tag) {
-                case "resource": {
-                    if (!(match.value in (pathNavigator))) {
-                        ;
-                        (pathNavigator)[match.value] = { [methods]: [] };
-                    }
-                    pathNavigator = (pathNavigator)[match.value];
-                    i++;
-                    break;
+class PathsTree {
+    constructor(path) {
+        this.methods = [];
+        this.params = {};
+        this.subpaths = {};
+        this.path = path;
+    }
+}
+function checkShadowing(pathNavigator, match) {
+    return tsplus_module_1.gen(function* ($) {
+        switch (match._tag) {
+            case "resource": {
+                // check shadowing: if 'a/:param' comes before 'a/b', then 'a/b' is shadowed
+                if (pathNavigator.params[1]) {
+                    return yield* $(tsplus_module_1.fail(new InvalidStateError(`Path ${pathNavigator.path}${match.value}/ is shadowed by ${pathNavigator.params[1].path}`)));
                 }
-                case "param": {
-                    let numberOfParams = 1;
-                    while (i < matches.length && matches[i + 1]?._tag === "param") {
-                        numberOfParams++;
+                break;
+            }
+            case "param": {
+                // check shadowing: if 'a/b' comes before 'a/:param', then 'a/"param' is partially shadowed
+                const subpaths = Object.getOwnPropertyNames(pathNavigator.subpaths);
+                if (subpaths.length > 0) {
+                    yield* $(tsplus_module_2.ext_forEach(subpaths, (s) => tsplus_module_1.logInfo(`Path ${pathNavigator.path}:${match.value}/ is partially shadowed by ${pathNavigator.subpaths[s].path}`)));
+                }
+                break;
+            }
+        }
+    });
+}
+export function checkPaths(paths) {
+    return tsplus_module_1.gen(function* ($) {
+        const pathMethods = new PathsTree("/");
+        const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
+        for (const path of paths) {
+            const matches = [...path.path.matchAll(regex)]
+                .map((match) => match[1]
+                ? { _tag: "resource", value: match[1] }
+                : { _tag: "param", value: match[2] });
+            let pathNavigator = pathMethods;
+            for (let i = 0; i < matches.length;) {
+                const match = matches[i];
+                yield* $(checkShadowing(pathNavigator, match));
+                switch (match._tag) {
+                    case "resource": {
+                        if (!(match.value in pathNavigator.subpaths)) {
+                            pathNavigator.subpaths[match.value] = new PathsTree(`${pathNavigator.path}${match.value}/`);
+                        }
+                        pathNavigator = pathNavigator.subpaths[match.value];
                         i++;
+                        break;
                     }
-                    if (!(numberOfParams in pathNavigator)) {
-                        ;
-                        (pathNavigator)[numberOfParams] = { [methods]: [] };
+                    case "param": {
+                        const paramsNames = [match.value];
+                        let numberOfParams = 1;
+                        while (i < matches.length && matches[i + 1]?._tag === "param") {
+                            numberOfParams++;
+                            i++;
+                            paramsNames.push(matches[i].value);
+                        }
+                        if (!(numberOfParams in pathNavigator.params)) {
+                            pathNavigator.params[numberOfParams] = new PathsTree(`${pathNavigator.path}:${paramsNames.join("/:")}/`);
+                        }
+                        pathNavigator = pathNavigator.params[numberOfParams];
+                        i++;
+                        break;
                     }
-                    pathNavigator = (pathNavigator)[numberOfParams];
-                    i++;
-                    break;
                 }
             }
+            if (pathNavigator.methods.includes(path.method)) {
+                // throw duplicate path-method error
+                return yield* $(tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`)));
+            }
+            pathNavigator.methods.push(path.method);
         }
-        if (pathNavigator[methods].includes(path.method)) {
-            // throw duplicate path-method error
-            return tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
-        }
-        pathNavigator[methods].push(path.method);
-    }
-    return tsplus_module_1.succeed(paths);
+        return paths;
+    });
 }
 /**
  * Work in progress JSONSchema generator.
  */
 export function makeJsonSchema(r) {
-    return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkDuplicatePaths), (e) => {
+    return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_2.ext_forEach(tsplus_module_3.fromIterable(r), RS.makeFromSchema), checkPaths), (e) => {
         const map = ({ method, path, responses, ...rest }) => ({
             [method]: {
                 ...rest,
@@ -82,4 +113,4 @@ class Response {
         this.type = type;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL2FwaS9leHByZXNzL21ha2VKc29uU2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVEQUF1RDtBQUV2RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUNuRCxPQUFPLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBSXpDLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQTtBQUlwQixNQUFNLFVBQVUsbUJBQW1CLENBQ2pDLEtBQW1CO0lBRW5CLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUtqQyxNQUFNLFdBQVcsR0FBZ0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFBO0lBQ2xELE1BQU0sS0FBSyxHQUFHLDRCQUE0QixDQUFBO0lBRTFDLEtBQUssTUFBTSxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3hCLE1BQU0sT0FBTyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQzthQUMzQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNiLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDTixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQVc7WUFDaEQsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBRSxFQUFXLENBQ2pELENBQUE7UUFFSCxJQUFJLGFBQWEsR0FBMkIsV0FBVyxDQUFBO1FBQ3ZELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHO1lBQ25DLE1BQU0sS0FBSyxHQUFHLE9BQU8s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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL2FwaS9leHByZXNzL21ha2VKc29uU2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVEQUF1RDtBQUV2RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUNuRCxPQUFPLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBSXpDLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQTtBQUlwQixNQUFNLFNBQVM7SUFNYixZQUFZLElBQVk7UUFDdEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxFQUFFLENBQUE7UUFDakIsSUFBSSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDaEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUE7UUFDbEIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUE7SUFDbEIsQ0FBQztDQUNGO0FBT0QsU0FBUyxjQUFjLENBQ3JCLGFBQXdCLEVBQ3hCLEtBQVk7SUFFWixPQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsUUFBUSxLQUFLLENBQUMsSUFBSSxFQUFFO1lBQ2xCLEtBQUssVUFBVSxDQUFDLENBQUM7Z0JBQ2YsNEVBQTRFO2dCQUM1RSxJQUFJLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUU7b0JBQzNCLE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHFCQUNkLElBQUksaUJBQWlCLENBQ25CLFFBQVEsYUFBYSxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsS0FBSyxvQkFBb0IsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FDM0YsQ0FDRixDQUFDLENBQUE7aUJBQ0g7Z0JBQ0QsTUFBSzthQUNOO1lBQ0QsS0FBSyxPQUFPLENBQUMsQ0FBQztnQkFDWiwyRkFBMkY7Z0JBQzNGLE1BQU0sUUFBUSxH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

package/dist/api/express/makeOpenApiSpecs.d.ts

@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
         version: string;
     };
     tags: never[];
-    paths: Record<string, Record<"PATCH" | "GET" | "POST" | "PUT" | "DELETE", {
+    paths: Record<string, Record<"GET" | "PUT" | "POST" | "PATCH" | "DELETE", {
         [x: string]: {
             responses: any;
             tags: readonly string[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.71.1",
+  "version": "0.72.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,8 +20,8 @@
     "pure-rand": "^6.0.2",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.56.1",
-    "@effect-app/prelude": "0.58.1",
-    "@effect-app/infra-adapters": "0.49.1",
+    "@effect-app/infra-adapters": "0.49.2",
+    "@effect-app/prelude": "0.58.2",
     "@effect-app/schema": "0.50.1"
   },
   "devDependencies": {