@effect-app/infra 0.71.1 → 0.71.2

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,13 @@
 # @effect-app/infra
 
+## 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.71.1",
+  "version": "0.71.2",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,9 +20,9 @@
     "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/schema": "0.50.1"
+    "@effect-app/infra-adapters": "0.49.2",
+    "@effect-app/schema": "0.50.1",
+    "@effect-app/prelude": "0.58.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.22.5",