@effect-app/infra 0.67.0 → 0.68.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.cache/effect/095519d034161945a8d2616a506d3e7f35a9b3d868814f44c747429c60fc4e7f.hash +1 -1
- package/.cache/effect/134218688132dfbdea493cbe1f26e73449f2759121df35ddd5448346b59c9a8d.content +25 -0
- package/.cache/effect/134218688132dfbdea493cbe1f26e73449f2759121df35ddd5448346b59c9a8d.hash +1 -0
- package/.cache/effect/14eb9da4ca6d22162888c7fdb7f39ab772d2a2dc6625db6031ecdb32ac89158f.content +87 -0
- package/.cache/effect/14eb9da4ca6d22162888c7fdb7f39ab772d2a2dc6625db6031ecdb32ac89158f.hash +1 -0
- package/.cache/effect/1bfd92946b11da4292f2ed99dc0e322462b60559148f9524abc20e26f70779e1.hash +1 -1
- package/.cache/effect/49c1bd9ec26e6df78b994d8df0bfe21b119803fa4aa46349bf4679fd0f1e7cda.hash +1 -1
- package/.cache/effect/58d4ccde8bd2db7829706db5bebd01b99900ee83f0f6a8413b53d17cbd69f510.hash +1 -1
- package/.cache/effect/72a5a16a6b62b63cd71719c833091128207d7e6c823cb32293549b3dd58c451b.hash +1 -1
- package/.cache/effect/7a9c33db6aedaf00093a132c1d4e48e9d043cef05e932b8a37da24d44e224248.hash +1 -1
- package/.cache/effect/8594f0f42afc0641b00e88998000cc47382a1d07da31f4a148f7976701ca22d5.content +97 -0
- package/.cache/effect/8594f0f42afc0641b00e88998000cc47382a1d07da31f4a148f7976701ca22d5.hash +1 -0
- package/.cache/effect/c67d971634d2dc8118b40452b61c9a51620c35809be4a89982476aa80701d852.hash +1 -1
- package/.cache/effect/f38adf43700dab905456a534a0690eaf882cff2cd576c731f23d6d14a3c3d659.hash +1 -1
- package/CHANGELOG.md +15 -0
- package/_cjs/api/express/makeJsonSchema.cjs +63 -4
- package/_cjs/api/express/makeJsonSchema.cjs.map +1 -1
- package/_cjs/api/express/makeJsonSchema.test.cjs +27 -0
- package/_cjs/api/express/makeJsonSchema.test.cjs.map +1 -0
- package/_src/api/express/makeJsonSchema.test.ts +35 -0
- package/_src/api/express/makeJsonSchema.ts +60 -0
- package/dist/api/express/makeJsonSchema.d.ts +7 -1
- package/dist/api/express/makeJsonSchema.d.ts.map +1 -1
- package/dist/api/express/makeJsonSchema.js +52 -5
- package/dist/api/express/makeJsonSchema.test.d.ts.map +1 -0
- package/dist/api/express/makeOpenApiSpecs.d.ts +2 -2
- package/dist/api/writeDocs.d.ts +1 -1
- package/dist/api/writeDocs.d.ts.map +1 -1
- package/package.json +12 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
16bfaefe5a2429ca909ad25c1703bbd285431a8192a0c87f95827a21cf7cd387
|
package/.cache/effect/134218688132dfbdea493cbe1f26e73449f2759121df35ddd5448346b59c9a8d.content
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
2
|
+
import { InvalidStateError } from "../../errors.js";
|
|
3
|
+
import { checkDuplicatePaths } from "./makeJsonSchema.js";
|
|
4
|
+
const path = { path: "/securities/:id/search/:id2", method: "get" };
|
|
5
|
+
const equalPaths = [
|
|
6
|
+
"/securities/:idt/search/:id2",
|
|
7
|
+
"/securities/:id/search/:id2t",
|
|
8
|
+
"/securities/:idt/search/:id2t"
|
|
9
|
+
]
|
|
10
|
+
.map((path) => ({ path, method: "get" }));
|
|
11
|
+
const differentPaths = [
|
|
12
|
+
"/securities/:id/search/",
|
|
13
|
+
"/securities/search/:id2",
|
|
14
|
+
"/securities/:id/:id2/search/:id3"
|
|
15
|
+
]
|
|
16
|
+
.map((path) => ({ path, method: "get" }))
|
|
17
|
+
.concat([
|
|
18
|
+
"/securities/:idt/search/:id2"
|
|
19
|
+
]
|
|
20
|
+
.map((path) => ({ path, method: "post" })));
|
|
21
|
+
test("works", () => {
|
|
22
|
+
expect(checkDuplicatePaths([path, ...differentPaths])).toStrictEqual(tsplus_module_1.succeed([path, ...differentPaths]));
|
|
23
|
+
equalPaths.forEach((p) => expect(checkDuplicatePaths([path, p])).toStrictEqual(tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`))));
|
|
24
|
+
});
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEudGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZUpzb25TY2hlbWEudGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFDbkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFFekQsTUFBTSxJQUFJLEdBQUcsRUFBRSxJQUFJLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFBO0FBRW5FLE1BQU0sVUFBVSxHQUFHO0lBQ2pCLDhCQUE4QjtJQUM5Qiw4QkFBOEI7SUFDOUIsK0JBQStCO0NBQ2hDO0tBQ0UsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFFM0MsTUFBTSxjQUFjLEdBR2Q7SUFDSix5QkFBeUI7SUFDekIseUJBQXlCO0lBQ3pCLGtDQUFrQztDQUNuQztLQUNFLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztLQUN4QyxNQUFNLENBQUM7SUFDTiw4QkFBOEI7Q0FDL0I7S0FDRSxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBRS9DLElBQUksQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFO0lBQ2pCLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsd0JBQWUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFL0csVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3ZCLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUNsRCxxQkFBWSxJQUFJLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLENBQUMsTUFBTSxhQUFhLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQ3RGLENBQ0YsQ0FBQTtBQUNILENBQUMsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW52YWxpZFN0YXRlRXJyb3IgfSBmcm9tIFwiLi4vLi4vZXJyb3JzLmpzXCJcbmltcG9ydCB7IGNoZWNrRHVwbGljYXRlUGF0aHMgfSBmcm9tIFwiLi9tYWtlSnNvblNjaGVtYS5qc1wiXG5cbmNvbnN0IHBhdGggPSB7IHBhdGg6IFwiL3NlY3VyaXRpZXMvOmlkL3NlYXJjaC86aWQyXCIsIG1ldGhvZDogXCJnZXRcIiB9XG5cbmNvbnN0IGVxdWFsUGF0aHMgPSBbXG4gIFwiL3NlY3VyaXRpZXMvOmlkdC9zZWFyY2gvOmlkMlwiLFxuICBcIi9zZWN1cml0aWVzLzppZC9zZWFyY2gvOmlkMnRcIixcbiAgXCIvc2VjdXJpdGllcy86aWR0L3NlYXJjaC86aWQydFwiXG5dXG4gIC5tYXAoKHBhdGgpID0+ICh7IHBhdGgsIG1ldGhvZDogXCJnZXRcIiB9KSlcblxuY29uc3QgZGlmZmVyZW50UGF0aHM6IHtcbiAgcGF0aDogc3RyaW5nXG4gIG1ldGhvZDogc3RyaW5nXG59W10gPSBbXG4gIFwiL3NlY3VyaXRpZXMvOmlkL3NlYXJjaC9cIixcbiAgXCIvc2VjdXJpdGllcy9zZWFyY2gvOmlkMlwiLFxuICBcIi9zZWN1cml0aWVzLzppZC86aWQyL3NlYXJjaC86aWQzXCJcbl1cbiAgLm1hcCgocGF0aCkgPT4gKHsgcGF0aCwgbWV0aG9kOiBcImdldFwiIH0pKVxuICAuY29uY2F0KFtcbiAgICBcIi9zZWN1cml0aWVzLzppZHQvc2VhcmNoLzppZDJcIlxuICBdXG4gICAgLm1hcCgocGF0aCkgPT4gKHsgcGF0aCwgbWV0aG9kOiBcInBvc3RcIiB9KSkpXG5cbnRlc3QoXCJ3b3Jrc1wiLCAoKSA9PiB7XG4gIGV4cGVjdChjaGVja0R1cGxpY2F0ZVBhdGhzKFtwYXRoLCAuLi5kaWZmZXJlbnRQYXRoc10pKS50b1N0cmljdEVxdWFsKEVmZmVjdC5zdWNjZWVkKFtwYXRoLCAuLi5kaWZmZXJlbnRQYXRoc10pKVxuXG4gIGVxdWFsUGF0aHMuZm9yRWFjaCgocCkgPT5cbiAgICBleHBlY3QoY2hlY2tEdXBsaWNhdGVQYXRocyhbcGF0aCwgcF0pKS50b1N0cmljdEVxdWFsKFxuICAgICAgRWZmZWN0LmZhaWwobmV3IEludmFsaWRTdGF0ZUVycm9yKGBEdXBsaWNhdGUgbWV0aG9kICR7cC5tZXRob2R9IGZvciBwYXRoICR7cC5wYXRofWApKVxuICAgIClcbiAgKVxufSlcbiJdfQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
eeeabf23eeed55cc19be92fad9db0ad57b0af0d181bde005fe3c6a7181ab452f
|
package/.cache/effect/14eb9da4ca6d22162888c7fdb7f39ab772d2a2dc6625db6031ecdb32ac89158f.content
ADDED
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
2
|
+
import * as tsplus_module_2 from "@effect/data/Chunk";
|
|
3
|
+
import * as tsplus_module_3 from "@effect-app/core/_ext/Iterable";
|
|
4
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
5
|
+
import { InvalidStateError } from "../../errors.js";
|
|
6
|
+
import * as RS from "./schema/routing.js";
|
|
7
|
+
const rx = /:(\w+)/g;
|
|
8
|
+
export function checkDuplicatePaths(paths) {
|
|
9
|
+
const methods = Symbol("methods");
|
|
10
|
+
const pathMethods = { [methods]: [] };
|
|
11
|
+
const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
|
|
12
|
+
for (const path of paths) {
|
|
13
|
+
const matches = [...path.path.matchAll(regex)]
|
|
14
|
+
.map((match) => match[1]
|
|
15
|
+
? { _tag: "resource", value: match[1] }
|
|
16
|
+
: { _tag: "param", value: match[2] });
|
|
17
|
+
let pathNavigator = pathMethods;
|
|
18
|
+
for (let i = 0; i < matches.length;) {
|
|
19
|
+
const match = matches[i];
|
|
20
|
+
switch (match._tag) {
|
|
21
|
+
case "resource": {
|
|
22
|
+
if (!(match.value in (pathNavigator))) {
|
|
23
|
+
;
|
|
24
|
+
(pathNavigator)[match.value] = { [methods]: [] };
|
|
25
|
+
}
|
|
26
|
+
pathNavigator = (pathNavigator)[match.value];
|
|
27
|
+
i++;
|
|
28
|
+
break;
|
|
29
|
+
}
|
|
30
|
+
case "param": {
|
|
31
|
+
let numberOfParams = 1;
|
|
32
|
+
while (i < matches.length && matches[i + 1]?._tag === "param") {
|
|
33
|
+
numberOfParams++;
|
|
34
|
+
i++;
|
|
35
|
+
}
|
|
36
|
+
if (!(numberOfParams in pathNavigator)) {
|
|
37
|
+
;
|
|
38
|
+
(pathNavigator)[numberOfParams] = { [methods]: [] };
|
|
39
|
+
}
|
|
40
|
+
pathNavigator = (pathNavigator)[numberOfParams];
|
|
41
|
+
i++;
|
|
42
|
+
break;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (pathNavigator[methods].includes(path.method)) {
|
|
47
|
+
// throw duplicate path-method error
|
|
48
|
+
return tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
|
|
49
|
+
}
|
|
50
|
+
pathNavigator[methods].push(path.method);
|
|
51
|
+
}
|
|
52
|
+
return tsplus_module_1.succeed(paths);
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Work in progress JSONSchema generator.
|
|
56
|
+
*/
|
|
57
|
+
export function makeJsonSchema(r) {
|
|
58
|
+
return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkDuplicatePaths), (e) => {
|
|
59
|
+
const map = ({ method, path, responses, ...rest }) => ({
|
|
60
|
+
[method]: {
|
|
61
|
+
...rest,
|
|
62
|
+
responses: responses.reduce((prev, cur) => {
|
|
63
|
+
prev[cur.statusCode] = cur.type;
|
|
64
|
+
return prev;
|
|
65
|
+
}, {})
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
return e.reduce((prev, e) => {
|
|
69
|
+
const path = e.path.split("?")[0].replace(rx, (_a, b) => `{${b}}`);
|
|
70
|
+
prev[path] = {
|
|
71
|
+
...prev[path],
|
|
72
|
+
...map(e)
|
|
73
|
+
};
|
|
74
|
+
return prev;
|
|
75
|
+
}, {});
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
class Response {
|
|
79
|
+
statusCode;
|
|
80
|
+
type;
|
|
81
|
+
constructor(statusCode, type // string | JSONSchema | SubSchema
|
|
82
|
+
) {
|
|
83
|
+
this.statusCode = statusCode;
|
|
84
|
+
this.type = type;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
//# 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"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
8cc23346cd9bd1e663ddc1a53b36d0946bd5be2c5d457dd4fb342a3ea8f7e52e
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
83c9f6474d25a55a8363a18bec5e9e7ef2f1e57bcf59ea51051641eb430a9ee8
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
20378cb1c31dd43c775c6044789dd947cb08ce40f2804afd1623ec87cfe2e4ea
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
2ad2ca48c69fc592e81a7dea735173234df685d4464a17e30868181c4ee3959a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
35207ebdda44c6e08dd00ffc65f33a96b6b76a90f685949c026b2c702478d1fb
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
a32a40b2ee49298c8da08cd6bba7807b93ce8b451fdc3072b8065764b621a666
|
package/.cache/effect/8594f0f42afc0641b00e88998000cc47382a1d07da31f4a148f7976701ca22d5.content
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import * as tsplus_module_1 from "@effect-app/core/Option";
|
|
2
|
+
import * as tsplus_module_2 from "@effect/io/Effect";
|
|
3
|
+
import * as tsplus_module_3 from "@effect/data/Option";
|
|
4
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
5
|
+
import * as MO from "@effect-app/schema";
|
|
6
|
+
import { isObjectSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
7
|
+
import * as OpenApi from "@effect-app/infra-adapters/Openapi/index";
|
|
8
|
+
export function asRouteDescriptionAny(i) {
|
|
9
|
+
return i;
|
|
10
|
+
}
|
|
11
|
+
export function arrAsRouteDescriptionAny(arr) {
|
|
12
|
+
return arr.map(asRouteDescriptionAny);
|
|
13
|
+
}
|
|
14
|
+
export function makeRouteDescriptor(path, method, handler) {
|
|
15
|
+
return { path, method, handler, _tag: "Schema" };
|
|
16
|
+
}
|
|
17
|
+
export function makeFromSchema(e) {
|
|
18
|
+
const jsonSchema_ = OpenApi.for;
|
|
19
|
+
const jsonSchema = (r) => jsonSchema_(r);
|
|
20
|
+
const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler;
|
|
21
|
+
const r = ResponseOpenApi ?? Res_;
|
|
22
|
+
const Res = r ? MO.extractSchema(r) : MO.Void;
|
|
23
|
+
// TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
|
|
24
|
+
// TODO: use the path vs body etc serialisation also in the Client.
|
|
25
|
+
const makeReqQuerySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Query)), (_) => tsplus_module_3.match(_, () => tsplus_module_2.sync(() => tsplus_module_1.none), (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)));
|
|
26
|
+
const makeReqHeadersSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Headers)), (_) => tsplus_module_3.match(_, () => tsplus_module_2.sync(() => tsplus_module_1.none), (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)));
|
|
27
|
+
const makeReqCookieSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Cookie)), (_) => tsplus_module_3.match(_, () => tsplus_module_2.sync(() => tsplus_module_1.none), (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)));
|
|
28
|
+
const makeReqPathSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Path)), (_) => tsplus_module_3.match(_, () => tsplus_module_2.sync(() => tsplus_module_1.none), (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)));
|
|
29
|
+
const makeReqBodySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Body)), (_) => tsplus_module_3.match(_, () => tsplus_module_2.sync(() => tsplus_module_1.none), (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)));
|
|
30
|
+
// const makeReqSchema = schema(Req)
|
|
31
|
+
const makeResSchema = jsonSchema_(Res);
|
|
32
|
+
function makeParameters(inn) {
|
|
33
|
+
return (a) => {
|
|
34
|
+
return tsplus_module_3.getOrElse(tsplus_module_3.map(tsplus_module_3.flatMap(a, (o) => (isObjectSchema(o) ? tsplus_module_3.some(o) : tsplus_module_1.none)), (x) => {
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
36
|
+
return Object.keys(x.properties).map((p) => {
|
|
37
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
38
|
+
const schema = x.properties[p];
|
|
39
|
+
const required = Boolean(x.required?.includes(p));
|
|
40
|
+
return { name: p, in: inn, required, schema };
|
|
41
|
+
});
|
|
42
|
+
}), () => []);
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
return tsplus_module_2.map(tsplus_module_2.all({
|
|
46
|
+
req: jsonSchema(Req.Model),
|
|
47
|
+
reqQuery: makeReqQuerySchema,
|
|
48
|
+
reqHeaders: makeReqHeadersSchema,
|
|
49
|
+
reqBody: makeReqBodySchema,
|
|
50
|
+
reqPath: makeReqPathSchema,
|
|
51
|
+
reqCookie: makeReqCookieSchema,
|
|
52
|
+
res: makeResSchema
|
|
53
|
+
}), (_) => {
|
|
54
|
+
// console.log("$$$ REQ", _.req)
|
|
55
|
+
const isEmpty = !e.handler.Response || e.handler.Response === MO.Void;
|
|
56
|
+
return {
|
|
57
|
+
path: e.path,
|
|
58
|
+
method: e.method.toLowerCase(),
|
|
59
|
+
tags: e.info?.tags,
|
|
60
|
+
description: _.req?.description,
|
|
61
|
+
summary: _.req?.summary,
|
|
62
|
+
operationId: _.req?.title,
|
|
63
|
+
parameters: [
|
|
64
|
+
...makeParameters("path")(_.reqPath),
|
|
65
|
+
...makeParameters("query")(_.reqQuery),
|
|
66
|
+
...makeParameters("header")(_.reqHeaders),
|
|
67
|
+
...makeParameters("cookie")(_.reqCookie)
|
|
68
|
+
],
|
|
69
|
+
requestBody: tsplus_module_1.getOrUndefined(tsplus_module_3.map(_
|
|
70
|
+
.reqBody, (schema) => ({
|
|
71
|
+
content: { "application/json": { schema } }
|
|
72
|
+
}))),
|
|
73
|
+
responses: [
|
|
74
|
+
isEmpty
|
|
75
|
+
? new Response(204, { description: "Empty" })
|
|
76
|
+
: new Response(200, {
|
|
77
|
+
description: "OK",
|
|
78
|
+
content: { "application/json": { schema: _.res } }
|
|
79
|
+
}),
|
|
80
|
+
new Response(400, { description: "ValidationError" })
|
|
81
|
+
]
|
|
82
|
+
.concat(e.path.includes(":") && isEmpty
|
|
83
|
+
? [new Response(404, { description: "NotFoundError" })]
|
|
84
|
+
: [])
|
|
85
|
+
};
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
class Response {
|
|
89
|
+
statusCode;
|
|
90
|
+
type;
|
|
91
|
+
constructor(statusCode, type // string | JSONSchema | SubSchema
|
|
92
|
+
) {
|
|
93
|
+
this.statusCode = statusCode;
|
|
94
|
+
this.type = type;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../../../_src/api/express/schema/routing.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport * as MO from \"@effect-app/schema\"\nimport type { Methods } from \"@effect-app/schema\"\n\nimport type { JSONSchema, ParameterLocation, SubSchema } from \"@effect-app/infra-adapters/Openapi/atlas-plutus\"\nimport { isObjectSchema } from \"@effect-app/infra-adapters/Openapi/atlas-plutus\"\nimport * as OpenApi from \"@effect-app/infra-adapters/Openapi/index\"\nimport type { RequestHandler, RequestHandlerOptRes } from \"./requestHandler.js\"\n\nexport function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R) {\n  return i as RouteDescriptorAny\n}\n\nexport function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(\n  arr: ReadonlyArray<R>\n) {\n  return arr.map(asRouteDescriptionAny)\n}\n\nexport interface RouteDescriptor<\n  R,\n  PathA,\n  CookieA,\n  QueryA,\n  BodyA,\n  HeaderA,\n  ReqA extends PathA & QueryA & BodyA,\n  ResA,\n  Errors,\n  METHOD extends Methods = Methods\n> {\n  path: string\n  method: METHOD\n  handler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>\n  info?: {\n    tags: ReadonlyArray<string>\n  }\n}\n\nexport type RouteDescriptorAny = RouteDescriptor<\n  any,\n  any,\n  any,\n  any,\n  any,\n  any,\n  any,\n  any,\n  any\n>\n\nexport function makeRouteDescriptor<\n  R,\n  PathA,\n  CookieA,\n  QueryA,\n  BodyA,\n  HeaderA,\n  ReqA extends PathA & QueryA & BodyA,\n  ResA = void,\n  Errors = any,\n  METHOD extends Methods = Methods\n>(\n  path: string,\n  method: METHOD,\n  handler: RequestHandlerOptRes<\n    R,\n    PathA,\n    CookieA,\n    QueryA,\n    BodyA,\n    HeaderA,\n    ReqA,\n    ResA,\n    Errors\n  >\n) {\n  return { path, method, handler, _tag: \"Schema\" } as RouteDescriptor<\n    R,\n    PathA,\n    CookieA,\n    QueryA,\n    BodyA,\n    HeaderA,\n    ReqA,\n    ResA,\n    Errors,\n    METHOD\n  >\n}\n\nexport function makeFromSchema<ResA>(\n  e: RouteDescriptor<any, any, any, any, any, any, ResA, any, any>\n) {\n  const jsonSchema_ = OpenApi.for\n  const jsonSchema = <E, A>(r: MO.ReqRes<E, A>) => jsonSchema_(r)\n  const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler\n  const r = ResponseOpenApi ?? Res_\n  const Res = r ? MO.extractSchema(r) : MO.Void\n  // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)\n  // TODO: use the path vs body etc serialisation also in the Client.\n  const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap((_) =>\n    _.match(\n      () => Effect(Option.none),\n      (_) => jsonSchema(_).map(Option.some)\n    )\n  )\n  const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap((_) =>\n    _.match(\n      () => Effect(Option.none),\n      (_) => jsonSchema(_).map(Option.some)\n    )\n  )\n  const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap((_) =>\n    _.match(\n      () => Effect(Option.none),\n      (_) => jsonSchema(_).map(Option.some)\n    )\n  )\n  const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap((_) =>\n    _.match(\n      () => Effect(Option.none),\n      (_) => jsonSchema(_).map(Option.some)\n    )\n  )\n  const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap((_) =>\n    _.match(\n      () => Effect(Option.none),\n      (_) => jsonSchema(_).map(Option.some)\n    )\n  )\n  // const makeReqSchema = schema(Req)\n\n  const makeResSchema = jsonSchema_(Res as any)\n\n  function makeParameters(inn: ParameterLocation) {\n    return (a: Option<JSONSchema | SubSchema>) => {\n      return a\n        .flatMap((o) => (isObjectSchema(o) ? Option(o) : Option.none))\n        .map((x) => {\n          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n          return Object.keys(x.properties!).map((p) => {\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n            const schema = x.properties![p]\n            const required = Boolean(x.required?.includes(p))\n            return { name: p, in: inn, required, schema }\n          })\n        })\n        .getOrElse(() => [])\n    }\n  }\n\n  return Effect\n    .all({\n      req: jsonSchema(Req.Model),\n      reqQuery: makeReqQuerySchema,\n      reqHeaders: makeReqHeadersSchema,\n      reqBody: makeReqBodySchema,\n      reqPath: makeReqPathSchema,\n      reqCookie: makeReqCookieSchema,\n      res: makeResSchema\n    })\n    .map((_) => {\n      // console.log(\"$$$ REQ\", _.req)\n      const isEmpty = !e.handler.Response || e.handler.Response === MO.Void\n      return {\n        path: e.path,\n        method: e.method.toLowerCase(),\n        tags: e.info?.tags,\n        description: _.req?.description,\n        summary: _.req?.summary,\n        operationId: _.req?.title,\n        parameters: [\n          ...makeParameters(\"path\")(_.reqPath),\n          ...makeParameters(\"query\")(_.reqQuery),\n          ...makeParameters(\"header\")(_.reqHeaders),\n          ...makeParameters(\"cookie\")(_.reqCookie)\n        ],\n        requestBody: _\n          .reqBody\n          .map((schema) => ({\n            content: { \"application/json\": { schema } }\n          }))\n          .value,\n        responses: [\n          isEmpty\n            ? new Response(204, { description: \"Empty\" })\n            : new Response(200, {\n              description: \"OK\",\n              content: { \"application/json\": { schema: _.res } }\n            }),\n          new Response(400, { description: \"ValidationError\" })\n        ]\n          .concat(\n            e.path.includes(\":\") && isEmpty\n              ? [new Response(404, { description: \"NotFoundError\" })]\n              : []\n          )\n      }\n    })\n}\n\nclass Response {\n  constructor(\n    public readonly statusCode: number,\n    public readonly type: any // string | JSONSchema | SubSchema\n  ) {}\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
afd0a6760e1c0bb81d8f009c93722e5100019cd98eaaba1b82175573756e27d7
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
2e7b6be49bc3deac32bc70abcdb88dbca6696392d6f2f72d02048ceac445b558
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
acd0b034bacd357b1279f27a4bbbf4912c57d104f5a5fea36a26c9b16bc39356
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 0.68.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 4856c46c: add duplicated paths detection
|
|
8
|
+
- update packages
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
- @effect-app/core@0.54.0
|
|
14
|
+
- @effect-app/infra-adapters@0.47.0
|
|
15
|
+
- @effect-app/prelude@0.55.0
|
|
16
|
+
- @effect-app/schema@0.48.0
|
|
17
|
+
|
|
3
18
|
## 0.67.0
|
|
4
19
|
|
|
5
20
|
### Minor Changes
|
|
@@ -3,21 +3,80 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.checkDuplicatePaths = checkDuplicatePaths;
|
|
6
7
|
exports.makeJsonSchema = makeJsonSchema;
|
|
7
|
-
var tsplus_module_1 = _interopRequireWildcard(require("@effect/
|
|
8
|
-
var tsplus_module_2 = _interopRequireWildcard(require("@effect
|
|
9
|
-
var tsplus_module_3 = _interopRequireWildcard(require("@effect/
|
|
8
|
+
var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
|
|
9
|
+
var tsplus_module_2 = _interopRequireWildcard(require("@effect/data/Chunk"));
|
|
10
|
+
var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
|
|
11
|
+
var _errors = require("../../errors.cjs");
|
|
10
12
|
var RS = _interopRequireWildcard(require("./schema/routing.cjs"));
|
|
11
13
|
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); }
|
|
12
14
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
13
15
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
14
16
|
|
|
15
17
|
const rx = /:(\w+)/g;
|
|
18
|
+
function checkDuplicatePaths(paths) {
|
|
19
|
+
const methods = Symbol("methods");
|
|
20
|
+
const pathMethods = {
|
|
21
|
+
[methods]: []
|
|
22
|
+
};
|
|
23
|
+
const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
|
|
24
|
+
for (const path of paths) {
|
|
25
|
+
const matches = [...path.path.matchAll(regex)].map(match => match[1] ? {
|
|
26
|
+
_tag: "resource",
|
|
27
|
+
value: match[1]
|
|
28
|
+
} : {
|
|
29
|
+
_tag: "param",
|
|
30
|
+
value: match[2]
|
|
31
|
+
});
|
|
32
|
+
let pathNavigator = pathMethods;
|
|
33
|
+
for (let i = 0; i < matches.length;) {
|
|
34
|
+
const match = matches[i];
|
|
35
|
+
switch (match._tag) {
|
|
36
|
+
case "resource":
|
|
37
|
+
{
|
|
38
|
+
if (!(match.value in pathNavigator)) {
|
|
39
|
+
;
|
|
40
|
+
pathNavigator[match.value] = {
|
|
41
|
+
[methods]: []
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
pathNavigator = pathNavigator[match.value];
|
|
45
|
+
i++;
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
case "param":
|
|
49
|
+
{
|
|
50
|
+
let numberOfParams = 1;
|
|
51
|
+
while (i < matches.length && matches[i + 1]?._tag === "param") {
|
|
52
|
+
numberOfParams++;
|
|
53
|
+
i++;
|
|
54
|
+
}
|
|
55
|
+
if (!(numberOfParams in pathNavigator)) {
|
|
56
|
+
;
|
|
57
|
+
pathNavigator[numberOfParams] = {
|
|
58
|
+
[methods]: []
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
pathNavigator = pathNavigator[numberOfParams];
|
|
62
|
+
i++;
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (pathNavigator[methods].includes(path.method)) {
|
|
68
|
+
// throw duplicate path-method error
|
|
69
|
+
return tsplus_module_1.fail(new _errors.InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
|
|
70
|
+
}
|
|
71
|
+
pathNavigator[methods].push(path.method);
|
|
72
|
+
}
|
|
73
|
+
return tsplus_module_1.succeed(paths);
|
|
74
|
+
}
|
|
16
75
|
/**
|
|
17
76
|
* Work in progress JSONSchema generator.
|
|
18
77
|
*/
|
|
19
78
|
function makeJsonSchema(r) {
|
|
20
|
-
return
|
|
79
|
+
return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkDuplicatePaths), e => {
|
|
21
80
|
const map = ({
|
|
22
81
|
method,
|
|
23
82
|
path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeJsonSchema.cjs","names":["
|
|
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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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
|
|
4
|
+
var _errors = require("../../errors.cjs");
|
|
5
|
+
var _makeJsonSchema = require("./makeJsonSchema.cjs");
|
|
6
|
+
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); }
|
|
7
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
8
|
+
const path = {
|
|
9
|
+
path: "/securities/:id/search/:id2",
|
|
10
|
+
method: "get"
|
|
11
|
+
};
|
|
12
|
+
const equalPaths = ["/securities/:idt/search/:id2", "/securities/:id/search/:id2t", "/securities/:idt/search/:id2t"].map(path => ({
|
|
13
|
+
path,
|
|
14
|
+
method: "get"
|
|
15
|
+
}));
|
|
16
|
+
const differentPaths = ["/securities/:id/search/", "/securities/search/:id2", "/securities/:id/:id2/search/:id3"].map(path => ({
|
|
17
|
+
path,
|
|
18
|
+
method: "get"
|
|
19
|
+
})).concat(["/securities/:idt/search/:id2"].map(path => ({
|
|
20
|
+
path,
|
|
21
|
+
method: "post"
|
|
22
|
+
})));
|
|
23
|
+
test("works", () => {
|
|
24
|
+
expect((0, _makeJsonSchema.checkDuplicatePaths)([path, ...differentPaths])).toStrictEqual(tsplus_module_1.succeed([path, ...differentPaths]));
|
|
25
|
+
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}`))));
|
|
26
|
+
});
|
|
27
|
+
//# sourceMappingURL=makeJsonSchema.test.cjs.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { InvalidStateError } from "../../errors.js"
|
|
2
|
+
import { checkDuplicatePaths } from "./makeJsonSchema.js"
|
|
3
|
+
|
|
4
|
+
const path = { path: "/securities/:id/search/:id2", method: "get" }
|
|
5
|
+
|
|
6
|
+
const equalPaths = [
|
|
7
|
+
"/securities/:idt/search/:id2",
|
|
8
|
+
"/securities/:id/search/:id2t",
|
|
9
|
+
"/securities/:idt/search/:id2t"
|
|
10
|
+
]
|
|
11
|
+
.map((path) => ({ path, method: "get" }))
|
|
12
|
+
|
|
13
|
+
const differentPaths: {
|
|
14
|
+
path: string
|
|
15
|
+
method: string
|
|
16
|
+
}[] = [
|
|
17
|
+
"/securities/:id/search/",
|
|
18
|
+
"/securities/search/:id2",
|
|
19
|
+
"/securities/:id/:id2/search/:id3"
|
|
20
|
+
]
|
|
21
|
+
.map((path) => ({ path, method: "get" }))
|
|
22
|
+
.concat([
|
|
23
|
+
"/securities/:idt/search/:id2"
|
|
24
|
+
]
|
|
25
|
+
.map((path) => ({ path, method: "post" })))
|
|
26
|
+
|
|
27
|
+
test("works", () => {
|
|
28
|
+
expect(checkDuplicatePaths([path, ...differentPaths])).toStrictEqual(Effect.succeed([path, ...differentPaths]))
|
|
29
|
+
|
|
30
|
+
equalPaths.forEach((p) =>
|
|
31
|
+
expect(checkDuplicatePaths([path, p])).toStrictEqual(
|
|
32
|
+
Effect.fail(new InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`))
|
|
33
|
+
)
|
|
34
|
+
)
|
|
35
|
+
})
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
|
|
3
|
+
import { InvalidStateError } from "../../errors.js"
|
|
3
4
|
import * as RS from "./schema/routing.js"
|
|
4
5
|
|
|
5
6
|
type Methods = "GET" | "PUT" | "POST" | "PATCH" | "DELETE"
|
|
@@ -8,6 +9,64 @@ const rx = /:(\w+)/g
|
|
|
8
9
|
|
|
9
10
|
type _A<C> = C extends ReadonlyArray<infer A> ? A : never
|
|
10
11
|
|
|
12
|
+
export function checkDuplicatePaths<T extends { path: string; method: string }>(
|
|
13
|
+
paths: readonly T[]
|
|
14
|
+
): Effect<never, InvalidStateError, readonly T[]> {
|
|
15
|
+
const methods = Symbol("methods")
|
|
16
|
+
interface PathMethods {
|
|
17
|
+
[key: string | number]: this | undefined
|
|
18
|
+
[methods]: string[]
|
|
19
|
+
}
|
|
20
|
+
const pathMethods: PathMethods = { [methods]: [] }
|
|
21
|
+
const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g
|
|
22
|
+
|
|
23
|
+
for (const path of paths) {
|
|
24
|
+
const matches = [...path.path.matchAll(regex)]
|
|
25
|
+
.map((match) =>
|
|
26
|
+
match[1]
|
|
27
|
+
? { _tag: "resource", value: match[1] } as const
|
|
28
|
+
: { _tag: "param", value: match[2]! } as const
|
|
29
|
+
)
|
|
30
|
+
|
|
31
|
+
let pathNavigator: PathMethods | string[] = pathMethods
|
|
32
|
+
for (let i = 0; i < matches.length;) {
|
|
33
|
+
const match = matches[i]!
|
|
34
|
+
switch (match._tag) {
|
|
35
|
+
case "resource": {
|
|
36
|
+
if (!(match.value in (pathNavigator))) {
|
|
37
|
+
;(pathNavigator)[match.value] = { [methods]: [] }
|
|
38
|
+
}
|
|
39
|
+
pathNavigator = (pathNavigator)[match.value]!
|
|
40
|
+
i++
|
|
41
|
+
break
|
|
42
|
+
}
|
|
43
|
+
case "param": {
|
|
44
|
+
let numberOfParams = 1
|
|
45
|
+
while (i < matches.length && matches[i + 1]?._tag === "param") {
|
|
46
|
+
numberOfParams++
|
|
47
|
+
i++
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
if (!(numberOfParams in pathNavigator)) {
|
|
51
|
+
;(pathNavigator)[numberOfParams] = { [methods]: [] }
|
|
52
|
+
}
|
|
53
|
+
pathNavigator = (pathNavigator)[numberOfParams]!
|
|
54
|
+
i++
|
|
55
|
+
break
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
if (pathNavigator[methods].includes(path.method)) {
|
|
61
|
+
// throw duplicate path-method error
|
|
62
|
+
return Effect.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`))
|
|
63
|
+
}
|
|
64
|
+
pathNavigator[methods].push(path.method)
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return Effect.succeed(paths)
|
|
68
|
+
}
|
|
69
|
+
|
|
11
70
|
/**
|
|
12
71
|
* Work in progress JSONSchema generator.
|
|
13
72
|
*/
|
|
@@ -15,6 +74,7 @@ export function makeJsonSchema(r: Iterable<RS.RouteDescriptorAny>) {
|
|
|
15
74
|
return Chunk
|
|
16
75
|
.fromIterable(r)
|
|
17
76
|
.forEachEffect(RS.makeFromSchema)
|
|
77
|
+
.flatMap(checkDuplicatePaths)
|
|
18
78
|
.map((e) => {
|
|
19
79
|
const map = ({ method, path, responses, ...rest }: _A<typeof e>) => ({
|
|
20
80
|
[method]: {
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
import { Effect } from "@effect/io/Effect";
|
|
2
|
+
import { InvalidStateError } from "../../errors.js";
|
|
1
3
|
import * as RS from "./schema/routing.js";
|
|
2
4
|
type Methods = "GET" | "PUT" | "POST" | "PATCH" | "DELETE";
|
|
5
|
+
export declare function checkDuplicatePaths<T extends {
|
|
6
|
+
path: string;
|
|
7
|
+
method: string;
|
|
8
|
+
}>(paths: readonly T[]): Effect<never, InvalidStateError, readonly T[]>;
|
|
3
9
|
/**
|
|
4
10
|
* Work in progress JSONSchema generator.
|
|
5
11
|
*/
|
|
6
|
-
export declare function makeJsonSchema(r: Iterable<RS.RouteDescriptorAny>): import("@effect/io/Effect").Effect<never,
|
|
12
|
+
export declare function makeJsonSchema(r: Iterable<RS.RouteDescriptorAny>): import("@effect/io/Effect").Effect<never, InvalidStateError, Record<string, Record<Methods, {
|
|
7
13
|
[x: string]: {
|
|
8
14
|
responses: any;
|
|
9
15
|
tags: readonly string[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeJsonSchema.d.ts","sourceRoot":"","sources":["../../../_src/api/express/makeJsonSchema.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAEzC,KAAK,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAA;AAM1D;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;
|
|
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"}
|
|
@@ -1,14 +1,61 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "@effect/
|
|
2
|
-
import * as tsplus_module_2 from "@effect
|
|
3
|
-
import * as tsplus_module_3 from "@effect/
|
|
1
|
+
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
2
|
+
import * as tsplus_module_2 from "@effect/data/Chunk";
|
|
3
|
+
import * as tsplus_module_3 from "@effect-app/core/_ext/Iterable";
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
5
|
+
import { InvalidStateError } from "../../errors.js";
|
|
5
6
|
import * as RS from "./schema/routing.js";
|
|
6
7
|
const rx = /:(\w+)/g;
|
|
8
|
+
export function checkDuplicatePaths(paths) {
|
|
9
|
+
const methods = Symbol("methods");
|
|
10
|
+
const pathMethods = { [methods]: [] };
|
|
11
|
+
const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
|
|
12
|
+
for (const path of paths) {
|
|
13
|
+
const matches = [...path.path.matchAll(regex)]
|
|
14
|
+
.map((match) => match[1]
|
|
15
|
+
? { _tag: "resource", value: match[1] }
|
|
16
|
+
: { _tag: "param", value: match[2] });
|
|
17
|
+
let pathNavigator = pathMethods;
|
|
18
|
+
for (let i = 0; i < matches.length;) {
|
|
19
|
+
const match = matches[i];
|
|
20
|
+
switch (match._tag) {
|
|
21
|
+
case "resource": {
|
|
22
|
+
if (!(match.value in (pathNavigator))) {
|
|
23
|
+
;
|
|
24
|
+
(pathNavigator)[match.value] = { [methods]: [] };
|
|
25
|
+
}
|
|
26
|
+
pathNavigator = (pathNavigator)[match.value];
|
|
27
|
+
i++;
|
|
28
|
+
break;
|
|
29
|
+
}
|
|
30
|
+
case "param": {
|
|
31
|
+
let numberOfParams = 1;
|
|
32
|
+
while (i < matches.length && matches[i + 1]?._tag === "param") {
|
|
33
|
+
numberOfParams++;
|
|
34
|
+
i++;
|
|
35
|
+
}
|
|
36
|
+
if (!(numberOfParams in pathNavigator)) {
|
|
37
|
+
;
|
|
38
|
+
(pathNavigator)[numberOfParams] = { [methods]: [] };
|
|
39
|
+
}
|
|
40
|
+
pathNavigator = (pathNavigator)[numberOfParams];
|
|
41
|
+
i++;
|
|
42
|
+
break;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (pathNavigator[methods].includes(path.method)) {
|
|
47
|
+
// throw duplicate path-method error
|
|
48
|
+
return tsplus_module_1.fail(new InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
|
|
49
|
+
}
|
|
50
|
+
pathNavigator[methods].push(path.method);
|
|
51
|
+
}
|
|
52
|
+
return tsplus_module_1.succeed(paths);
|
|
53
|
+
}
|
|
7
54
|
/**
|
|
8
55
|
* Work in progress JSONSchema generator.
|
|
9
56
|
*/
|
|
10
57
|
export function makeJsonSchema(r) {
|
|
11
|
-
return
|
|
58
|
+
return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkDuplicatePaths), (e) => {
|
|
12
59
|
const map = ({ method, path, responses, ...rest }) => ({
|
|
13
60
|
[method]: {
|
|
14
61
|
...rest,
|
|
@@ -35,4 +82,4 @@ class Response {
|
|
|
35
82
|
this.type = type;
|
|
36
83
|
}
|
|
37
84
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZUpzb25TY2hlbWEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL2FwaS9leHByZXNzL21ha2VKc29uU2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVEQUF1RDtBQUV2RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUNuRCxPQUFPLEtBQUssRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBSXpDLE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQTtBQUlwQixNQUFNLFVBQVUsbUJBQW1CLENBQ2pDLEtBQW1CO0lBRW5CLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUtqQyxNQUFNLFdBQVcsR0FBZ0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFBO0lBQ2xELE1BQU0sS0FBSyxHQUFHLDRCQUE0QixDQUFBO0lBRTFDLEtBQUssTUFBTSxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3hCLE1BQU0sT0FBTyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQzthQUMzQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNiLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDTixDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQVc7WUFDaEQsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBRSxFQUFXLENBQ2pELENBQUE7UUFFSCxJQUFJLGFBQWEsR0FBMkIsV0FBVyxDQUFBO1FBQ3ZELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHO1lBQ25DLE1BQU0sS0FBSyxHQUFHLE9BQU8s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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"makeJsonSchema.test.d.ts","sourceRoot":"","sources":["../../../_src/api/express/makeJsonSchema.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type * as Plutus from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
2
2
|
import type { RouteDescriptorAny } from "./schema/routing.js";
|
|
3
|
-
export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, info: Plutus.Info): import("@effect/io/Effect").Effect<never,
|
|
3
|
+
export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, info: Plutus.Info): import("@effect/io/Effect").Effect<never, import("../../errors.js").InvalidStateError, {
|
|
4
4
|
openapi: string;
|
|
5
5
|
info: {
|
|
6
6
|
title: string;
|
|
@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
|
|
|
18
18
|
version: string;
|
|
19
19
|
};
|
|
20
20
|
tags: never[];
|
|
21
|
-
paths: Record<string, Record<"
|
|
21
|
+
paths: Record<string, Record<"PATCH" | "GET" | "POST" | "PUT" | "DELETE", {
|
|
22
22
|
[x: string]: {
|
|
23
23
|
responses: any;
|
|
24
24
|
tags: readonly string[] | undefined;
|
package/dist/api/writeDocs.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { RouteDescriptorAny } from "./express/schema/routing.js";
|
|
2
|
-
export declare function writeOpenapiDocs(rdescs: Record<string, Record<string, RouteDescriptorAny>>): import("@effect/io/Effect").Effect<never,
|
|
2
|
+
export declare function writeOpenapiDocs(rdescs: Record<string, Record<string, RouteDescriptorAny>>): import("@effect/io/Effect").Effect<never, import("../errors.js").InvalidStateError, void>;
|
|
3
3
|
//# sourceMappingURL=writeDocs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeDocs.d.ts","sourceRoot":"","sources":["../../_src/api/writeDocs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"writeDocs.d.ts","sourceRoot":"","sources":["../../_src/api/writeDocs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,6FAmB1F"}
|
package/package.json
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.68.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
7
7
|
"@azure/cosmos": "^3.17.3",
|
|
8
8
|
"@azure/service-bus": "^7.9.0",
|
|
9
9
|
"@effect/data": "^0.12.2",
|
|
10
|
-
"@effect/io": "^0.25.
|
|
10
|
+
"@effect/io": "^0.25.12",
|
|
11
11
|
"@sendgrid/helpers": "^7.7.0",
|
|
12
12
|
"@sendgrid/mail": "^7.7.0",
|
|
13
13
|
"change-case": "^4.1.2",
|
|
14
|
-
"cross-fetch": "^3.1.
|
|
14
|
+
"cross-fetch": "^3.1.6",
|
|
15
15
|
"faker": "^5.5.3",
|
|
16
|
-
"fast-check": "^3.
|
|
16
|
+
"fast-check": "^3.9.0",
|
|
17
17
|
"object-hash": "^3.0.0",
|
|
18
18
|
"path-parser": "^6.1.0",
|
|
19
19
|
"proper-lockfile": "^4.1.2",
|
|
20
20
|
"pure-rand": "^6.0.2",
|
|
21
21
|
"redlock": "^4.2.0",
|
|
22
|
-
"@effect-app/prelude": "0.
|
|
23
|
-
"@effect-app/
|
|
24
|
-
"@effect-app/
|
|
25
|
-
"@effect-app/
|
|
22
|
+
"@effect-app/prelude": "0.55.0",
|
|
23
|
+
"@effect-app/core": "0.54.0",
|
|
24
|
+
"@effect-app/infra-adapters": "0.47.0",
|
|
25
|
+
"@effect-app/schema": "0.48.0"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@babel/cli": "^7.21.5",
|
|
29
|
-
"@sentry/node": "^7.
|
|
29
|
+
"@sentry/node": "^7.52.1",
|
|
30
30
|
"@types/express": "^4.17.17",
|
|
31
|
-
"@types/node": "~20.1
|
|
31
|
+
"@types/node": "~20.2.1",
|
|
32
32
|
"@types/proper-lockfile": "^4.1.2",
|
|
33
33
|
"@types/redis": "^2.8.32",
|
|
34
34
|
"@types/redlock": "^4.0.4",
|
|
@@ -37,11 +37,11 @@
|
|
|
37
37
|
"express-jwt-authz": "^2.4.1",
|
|
38
38
|
"jwks-rsa": "2.1.4",
|
|
39
39
|
"jwt-decode": "^3.1.2",
|
|
40
|
-
"mongodb": "5.
|
|
40
|
+
"mongodb": "5.5.0",
|
|
41
41
|
"redis": "^3.1.2",
|
|
42
42
|
"ts-node": "^10.9.1",
|
|
43
43
|
"typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.176/compiler/typescript.tgz",
|
|
44
|
-
"vitest": "^0.31.
|
|
44
|
+
"vitest": "^0.31.1",
|
|
45
45
|
"@effect-app/compiler": "0.26.0"
|
|
46
46
|
},
|
|
47
47
|
"typesVersions": {
|