@shivaedev/platform 0.4.3 → 0.5.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/CHANGELOG.md +21 -0
- package/dist/better-auth/adapter.d.ts +1 -2
- package/dist/better-auth/adapter.d.ts.map +1 -1
- package/dist/better-auth/adapter.js +2 -2
- package/dist/better-auth/adapter.js.map +1 -1
- package/dist/better-auth/relation.d.ts +15 -15
- package/dist/better-auth/relation.d.ts.map +1 -1
- package/dist/better-auth/relation.js +4 -2
- package/dist/better-auth/relation.js.map +1 -1
- package/dist/better-auth/row-adapter.d.ts.map +1 -1
- package/dist/better-auth/row-adapter.js +16 -15
- package/dist/better-auth/row-adapter.js.map +1 -1
- package/dist/better-auth/where.d.ts +16 -16
- package/dist/better-auth/where.d.ts.map +1 -1
- package/dist/better-auth/where.js +16 -8
- package/dist/better-auth/where.js.map +1 -1
- package/dist/errors/taxonomy.d.ts +2 -2
- package/dist/errors/taxonomy.js +1 -1
- package/dist/errors/taxonomy.js.map +1 -1
- package/dist/node-http/subscription-signal.d.ts +1 -11
- package/dist/node-http/subscription-signal.d.ts.map +1 -1
- package/dist/node-http/subscription-signal.js +11 -10
- package/dist/node-http/subscription-signal.js.map +1 -1
- package/dist/rpc-server/origin.d.ts +2 -2
- package/dist/rpc-server/origin.d.ts.map +1 -1
- package/dist/rpc-server/origin.js +1 -1
- package/dist/rpc-server/origin.js.map +1 -1
- package/dist/rpc-server/redact-cause.js +2 -2
- package/dist/rpc-server/redact-cause.js.map +1 -1
- package/dist/rpc-server/redact.d.ts.map +1 -1
- package/dist/rpc-server/redact.js +16 -8
- package/dist/rpc-server/redact.js.map +1 -1
- package/dist/rpc-server/sensitive.js +11 -11
- package/dist/rpc-server/sensitive.js.map +1 -1
- package/dist/rpc-server/session.d.ts +1 -1
- package/dist/rpc-server/session.d.ts.map +1 -1
- package/dist/rpc-server/session.js +6 -3
- package/dist/rpc-server/session.js.map +1 -1
- package/dist/rpc-server/tracing.d.ts.map +1 -1
- package/dist/rpc-server/tracing.js +5 -3
- package/dist/rpc-server/tracing.js.map +1 -1
- package/dist/runtime/make.d.ts.map +1 -1
- package/dist/runtime/make.js +6 -3
- package/dist/runtime/make.js.map +1 -1
- package/dist/runtime/types.d.ts +0 -1
- package/dist/runtime/types.d.ts.map +1 -1
- package/dist/testing/types.d.ts +1 -1
- package/dist/testing/types.d.ts.map +1 -1
- package/dist/testing/vitest.d.ts +1 -1
- package/dist/testing/vitest.d.ts.map +1 -1
- package/dist/testing/vitest.js +2 -2
- package/dist/testing/vitest.js.map +1 -1
- package/package.json +44 -45
- package/src/better-auth/adapter.ts +3 -4
- package/src/better-auth/relation.ts +22 -18
- package/src/better-auth/row-adapter.ts +18 -16
- package/src/better-auth/where.ts +41 -26
- package/src/errors/taxonomy.ts +1 -1
- package/src/node-http/subscription-signal.ts +17 -16
- package/src/rpc-server/origin.ts +3 -3
- package/src/rpc-server/redact-cause.ts +2 -2
- package/src/rpc-server/redact.ts +26 -10
- package/src/rpc-server/sensitive.ts +12 -12
- package/src/rpc-server/session.ts +10 -4
- package/src/rpc-server/tracing.ts +7 -3
- package/src/runtime/make.ts +9 -3
- package/src/runtime/types.ts +0 -1
- package/src/testing/types.ts +1 -1
- package/src/testing/vitest.ts +9 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/rpc-server/redact.ts"],"names":[],"mappings":"AACA,OAAO,EAAwC,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/rpc-server/redact.ts"],"names":[],"mappings":"AACA,OAAO,EAAwC,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAwDzF,eAAO,MAAM,MAAM,GAAI,OAAO,OAAO,EAAE,YAAW,YAA6B,KAAG,OAAoC,CAAC"}
|
|
@@ -3,16 +3,19 @@ import { isSensitiveKey, REDACTED, redactText } from "./sensitive.js";
|
|
|
3
3
|
const MAX_DEPTH = 8;
|
|
4
4
|
const MAX_ENTRIES = 50;
|
|
5
5
|
const binary = (value) => {
|
|
6
|
-
if (ArrayBuffer.isView(value))
|
|
6
|
+
if (ArrayBuffer.isView(value)) {
|
|
7
7
|
return `<${value.constructor.name} ${value.byteLength} bytes>`;
|
|
8
|
-
|
|
8
|
+
}
|
|
9
|
+
if (value instanceof ArrayBuffer) {
|
|
9
10
|
return `<ArrayBuffer ${value.byteLength} bytes>`;
|
|
11
|
+
}
|
|
10
12
|
return undefined;
|
|
11
13
|
};
|
|
12
14
|
const entriesOf = (value) => {
|
|
13
15
|
const entries = Object.entries(value);
|
|
14
|
-
if (!Predicate.isError(value))
|
|
16
|
+
if (!Predicate.isError(value)) {
|
|
15
17
|
return entries;
|
|
18
|
+
}
|
|
16
19
|
const shape = [
|
|
17
20
|
["name", value.name],
|
|
18
21
|
["message", value.message],
|
|
@@ -21,17 +24,22 @@ const entriesOf = (value) => {
|
|
|
21
24
|
return value.cause === undefined ? [...shape, ...entries] : [...shape, ...entries, ["cause", value.cause]];
|
|
22
25
|
};
|
|
23
26
|
const walk = (value, sensitive, depth) => {
|
|
24
|
-
if (Redacted.isRedacted(value))
|
|
27
|
+
if (Redacted.isRedacted(value)) {
|
|
25
28
|
return REDACTED;
|
|
26
|
-
|
|
29
|
+
}
|
|
30
|
+
if (Predicate.isString(value)) {
|
|
27
31
|
return redactText(value, sensitive);
|
|
28
|
-
|
|
32
|
+
}
|
|
33
|
+
if (!Predicate.isObjectOrArray(value)) {
|
|
29
34
|
return value;
|
|
35
|
+
}
|
|
30
36
|
const summary = binary(value);
|
|
31
|
-
if (summary !== undefined)
|
|
37
|
+
if (summary !== undefined) {
|
|
32
38
|
return summary;
|
|
33
|
-
|
|
39
|
+
}
|
|
40
|
+
if (depth >= MAX_DEPTH) {
|
|
34
41
|
return "<truncated>";
|
|
42
|
+
}
|
|
35
43
|
if (Array.isArray(value)) {
|
|
36
44
|
const items = value.slice(0, MAX_ENTRIES).map((item) => walk(item, sensitive, depth + 1));
|
|
37
45
|
return value.length > MAX_ENTRIES ? [...items, `<${value.length - MAX_ENTRIES} more items>`] : items;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/rpc-server/redact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAEzF,MAAM,SAAS,GAAG,CAAC,CAAC;AACpB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,MAAM,GAAG,CAAC,KAAa,EAAsB,EAAE;IACpD,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/rpc-server/redact.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,20 +23,20 @@ const SENSITIVE_PARTS = [
|
|
|
23
23
|
const SENSITIVE_WORDS = ["otp", "pin", "cvv", "cvc", "ssn", "iban"];
|
|
24
24
|
const SENSITIVE_NAMES = ["session", "pan"];
|
|
25
25
|
const wordsOf = (key) => key
|
|
26
|
-
.replaceAll(/([a-z0-9])([A-Z])/
|
|
27
|
-
.replaceAll(/([A-Z])([A-Z][a-z])/
|
|
26
|
+
.replaceAll(/([a-z0-9])([A-Z])/gu, "$1 $2")
|
|
27
|
+
.replaceAll(/([A-Z])([A-Z][a-z])/gu, "$1 $2")
|
|
28
28
|
.toLowerCase()
|
|
29
|
-
.split(/[\s_-]+/);
|
|
29
|
+
.split(/[\s_-]+/u);
|
|
30
30
|
export const isSensitiveKey = (key) => {
|
|
31
|
-
const normalized = key.toLowerCase().replaceAll(/[-_]/
|
|
32
|
-
return (SENSITIVE_NAMES.includes(normalized)
|
|
33
|
-
SENSITIVE_PARTS.some((part) => normalized.includes(part))
|
|
34
|
-
wordsOf(key).some((word) => SENSITIVE_WORDS.includes(word)));
|
|
31
|
+
const normalized = key.toLowerCase().replaceAll(/[-_]/gu, "");
|
|
32
|
+
return (SENSITIVE_NAMES.includes(normalized)
|
|
33
|
+
|| SENSITIVE_PARTS.some((part) => normalized.includes(part))
|
|
34
|
+
|| wordsOf(key).some((word) => SENSITIVE_WORDS.includes(word)));
|
|
35
35
|
};
|
|
36
|
-
const AUTH_SCHEME = /\b(Bearer|Basic)\s+[A-Za-z0-9._~+/-]+=*/
|
|
37
|
-
const JWT = /\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*/
|
|
38
|
-
const URL_PASSWORD = /(\/\/[^:/\s@]+:)[^@/\s]+@/
|
|
39
|
-
const ASSIGNMENT = /([A-Za-z][\w.-]*)(["']?\s*[=:]\s*["']?)([^\s"'&,;]+)/
|
|
36
|
+
const AUTH_SCHEME = /\b(Bearer|Basic)\s+[A-Za-z0-9._~+/-]+=*/giu;
|
|
37
|
+
const JWT = /\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*/gu;
|
|
38
|
+
const URL_PASSWORD = /(\/\/[^:/\s@]+:)[^@/\s]+@/gu;
|
|
39
|
+
const ASSIGNMENT = /([A-Za-z][\w.-]*)(["']?\s*[=:]\s*["']?)([^\s"'&,;]+)/gu;
|
|
40
40
|
const scrub = (text, sensitive) => text
|
|
41
41
|
.replaceAll(AUTH_SCHEME, `$1 ${REDACTED}`)
|
|
42
42
|
.replaceAll(JWT, REDACTED)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sensitive.js","sourceRoot":"","sources":["../../src/rpc-server/sensitive.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC;AAErC,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,eAAe,GAAG;IACvB,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,eAAe;IACf,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,KAAK;IACL,QAAQ;IACR,WAAW;IACX,WAAW;IACX,YAAY;IACZ,eAAe;IACf,MAAM;IACN,MAAM;CACN,CAAC;AACF,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACpE,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAI3C,MAAM,OAAO,GAAG,CAAC,GAAW,
|
|
1
|
+
{"version":3,"file":"sensitive.js","sourceRoot":"","sources":["../../src/rpc-server/sensitive.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC;AAErC,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,eAAe,GAAG;IACvB,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,eAAe;IACf,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,KAAK;IACL,QAAQ;IACR,WAAW;IACX,WAAW;IACX,YAAY;IACZ,eAAe;IACf,MAAM;IACN,MAAM;CACN,CAAC;AACF,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACpE,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAI3C,MAAM,OAAO,GAAG,CAAC,GAAW,EAAY,EAAE,CACzC,GAAG;KACD,UAAU,CAAC,qBAAqB,EAAE,OAAO,CAAC;KAC1C,UAAU,CAAC,uBAAuB,EAAE,OAAO,CAAC;KAC5C,WAAW,EAAE;KACb,KAAK,CAAC,UAAU,CAAC,CAAC;AAErB,MAAM,CAAC,MAAM,cAAc,GAAiB,CAAC,GAAG,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC9D,OAAO,CACN,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC;WACjC,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;WACzD,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC9D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,GAAG,GAAG,uDAAuD,CAAC;AACpE,MAAM,YAAY,GAAG,6BAA6B,CAAC;AACnD,MAAM,UAAU,GAAG,wDAAwD,CAAC;AAE5E,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,SAAuB,EAAU,EAAE,CAC/D,IAAI;KACF,UAAU,CAAC,WAAW,EAAE,MAAM,QAAQ,EAAE,CAAC;KACzC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC;KACzB,UAAU,CAAC,YAAY,EAAE,KAAK,QAAQ,GAAG,CAAC;KAC1C,UAAU,CAAC,UAAU,EAAE,CAAC,KAAa,EAAE,GAAW,EAAE,SAAiB,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,SAAS,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AAEzI,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,SAAuB,EAAU,EAAE;IAC3E,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACxC,OAAO,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,UAAU,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClI,CAAC,CAAC"}
|
|
@@ -12,8 +12,8 @@ export interface SessionProvider<Session extends SessionShape> {
|
|
|
12
12
|
readonly get: (headers: Headers.Headers) => Effect.Effect<Option.Option<Session>, AuthUnavailable>;
|
|
13
13
|
}
|
|
14
14
|
export interface SessionPolicy<Session extends SessionShape> {
|
|
15
|
-
readonly provider: SessionProvider<Session>;
|
|
16
15
|
readonly origin: OriginPolicy;
|
|
16
|
+
readonly provider: SessionProvider<Session>;
|
|
17
17
|
}
|
|
18
18
|
export declare const resolveSession: <Session extends SessionShape>(policy: SessionPolicy<Session>, headers: Headers.Headers, rpc: string) => Effect.Effect<Option.Option<Session>, AuthUnavailable | Forbidden>;
|
|
19
19
|
export declare const authenticatedLayer: <Session extends SessionShape>(policy: SessionPolicy<Session>) => Layer.Layer<Authenticated>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,KAAK,eAAe,EAAE,SAAS,EAAgB,MAAM,uBAAuB,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,aAAa,CAAC;AAG/D,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,MAAM,WAAW,eAAe,CAAC,OAAO,SAAS,YAAY;IAC5D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC;CACnG;AAED,MAAM,WAAW,aAAa,CAAC,OAAO,SAAS,YAAY;IAC1D,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,KAAK,eAAe,EAAE,SAAS,EAAgB,MAAM,uBAAuB,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,aAAa,CAAC;AAG/D,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,MAAM,WAAW,eAAe,CAAC,OAAO,SAAS,YAAY;IAC5D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC;CACnG;AAED,MAAM,WAAW,aAAa,CAAC,OAAO,SAAS,YAAY;IAC1D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;CAC5C;AAED,eAAO,MAAM,cAAc,EAAE,CAAC,OAAO,SAAS,YAAY,EACzD,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAC9B,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,GAAG,EAAE,MAAM,KACP,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAQpE,CAAC;AAIH,eAAO,MAAM,kBAAkB,GAAI,OAAO,SAAS,YAAY,EAAE,QAAQ,aAAa,CAAC,OAAO,CAAC,KAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAUzH,CAAC;AAEH,eAAO,MAAM,uBAAuB,GAAI,OAAO,SAAS,YAAY,EAAE,QAAQ,aAAa,CAAC,OAAO,CAAC,KAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAUnI,CAAC"}
|
|
@@ -6,22 +6,25 @@ import { originRequest } from "./origin.js";
|
|
|
6
6
|
import { transportHeaders } from "./transport.js";
|
|
7
7
|
export const resolveSession = Effect.fn("PlatformRpc.resolveSession")(function* (policy, headers, rpc) {
|
|
8
8
|
const transport = yield* transportHeaders(headers);
|
|
9
|
-
if (!policy.origin(originRequest(transport, rpc)))
|
|
9
|
+
if (!policy.origin(originRequest(transport, rpc))) {
|
|
10
10
|
return yield* new Forbidden({ message: "Origin not allowed" });
|
|
11
|
+
}
|
|
11
12
|
return yield* policy.provider.get(transport);
|
|
12
13
|
});
|
|
13
14
|
const identified = (id) => Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
14
15
|
export const authenticatedLayer = (policy) => Layer.succeed(Authenticated, (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
15
16
|
const session = yield* resolveSession(policy, headers, rpc._tag);
|
|
16
|
-
if (Option.isNone(session))
|
|
17
|
+
if (Option.isNone(session)) {
|
|
17
18
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
19
|
+
}
|
|
18
20
|
const id = yield* identified(session.value.user.id);
|
|
19
21
|
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.annotateLogs({ userId: id }));
|
|
20
22
|
}));
|
|
21
23
|
export const maybeAuthenticatedLayer = (policy) => Layer.succeed(MaybeAuthenticated, (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
22
24
|
const session = yield* resolveSession(policy, headers, rpc._tag);
|
|
23
|
-
if (Option.isNone(session))
|
|
25
|
+
if (Option.isNone(session)) {
|
|
24
26
|
return yield* Effect.provideService(effect, OptionalIdentity, Option.none());
|
|
27
|
+
}
|
|
25
28
|
const id = yield* identified(session.value.user.id);
|
|
26
29
|
return yield* effect.pipe(Effect.provideService(OptionalIdentity, Option.some({ id })), Effect.annotateLogs({ userId: id }));
|
|
27
30
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,OAAO,EAAwB,SAAS,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAelD,MAAM,CAAC,MAAM,cAAc,GAI+C,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EAEzH,MAA8B,EAAE,OAAwB,EAAE,GAAW;IACtE,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/rpc-server/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/rpc-server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAA6B,MAAM,QAAQ,CAAC;AAGzE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;CAClC;
|
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/rpc-server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAA6B,MAAM,QAAQ,CAAC;AAGzE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;CAClC;AAmCD,eAAO,MAAM,mBAAmB,GAAI,UAAS,qBAA0B,KAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAalG,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { RequestId } from "../rpc/identity.js";
|
|
|
4
4
|
import { RequestTracing } from "../rpc/middleware.js";
|
|
5
5
|
import { redact } from "./redact.js";
|
|
6
6
|
import { redactCause } from "./redact-cause.js";
|
|
7
|
-
const ACCEPTED_REQUEST_ID = /^[A-Za-z0-9._:-]{1,128}
|
|
7
|
+
const ACCEPTED_REQUEST_ID = /^[A-Za-z0-9._:-]{1,128}$/u;
|
|
8
8
|
const hex = (byte) => byte.toString(16).padStart(2, "0");
|
|
9
9
|
const generateRequestId = Effect.map(Effect.all(Array.from({ length: 16 }, () => Random.nextIntBetween(0, 255))), (bytes) => bytes.map(hex).join(""));
|
|
10
10
|
const requestIdOf = (headers, header) => Option.match(Option.filter(Headers.get(headers, header), (value) => ACCEPTED_REQUEST_ID.test(value)), {
|
|
@@ -16,11 +16,13 @@ const failureTag = (cause) => Option.match(Cause.findErrorOption(cause), {
|
|
|
16
16
|
onSome: (error) => (Predicate.hasProperty(error, "_tag") && Predicate.isString(error._tag) ? error._tag : "unknown"),
|
|
17
17
|
});
|
|
18
18
|
const logFailure = (cause, payload, sensitive) => {
|
|
19
|
-
if (Cause.hasInterruptsOnly(cause))
|
|
19
|
+
if (Cause.hasInterruptsOnly(cause)) {
|
|
20
20
|
return Effect.void;
|
|
21
|
+
}
|
|
21
22
|
const annotations = { "rpc.payload": redact(payload, sensitive) };
|
|
22
|
-
if (!Cause.hasDies(cause))
|
|
23
|
+
if (!Cause.hasDies(cause)) {
|
|
23
24
|
return Effect.annotateLogs(Effect.logInfo("RPC failure"), { ...annotations, "rpc.failure": failureTag(cause) });
|
|
25
|
+
}
|
|
24
26
|
const defects = cause.reasons.filter(Cause.isDieReason).map((reason) => redact(reason.defect, sensitive));
|
|
25
27
|
return Effect.annotateLogs(Effect.logError("RPC defect"), { ...annotations, "rpc.defect": defects });
|
|
26
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/rpc-server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAQhD,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/rpc-server/tracing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.d.ts","sourceRoot":"","sources":["../../src/runtime/make.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"make.d.ts","sourceRoot":"","sources":["../../src/runtime/make.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAqD1E,eAAO,MAAM,mBAAmB,GAAI,QAAQ,EAAE,UAAU,EACvD,OAAO,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,EACxC,UAAS,sBAA2B,KAClC,eAAe,CAAC,QAAQ,EAAE,UAAU,CAuBtC,CAAC"}
|
package/dist/runtime/make.js
CHANGED
|
@@ -27,8 +27,9 @@ const make = (layer) => {
|
|
|
27
27
|
dispose: () => managed.dispose(),
|
|
28
28
|
runPromise: async (effect, options) => {
|
|
29
29
|
const exit = await runPromiseExit(effect, options);
|
|
30
|
-
if (Exit.isSuccess(exit))
|
|
30
|
+
if (Exit.isSuccess(exit)) {
|
|
31
31
|
return exit.value;
|
|
32
|
+
}
|
|
32
33
|
throw Cause.squash(exit.cause);
|
|
33
34
|
},
|
|
34
35
|
runPromiseExit,
|
|
@@ -39,8 +40,9 @@ const make = (layer) => {
|
|
|
39
40
|
const production = Effect.map(Effect.orDie(Config.string("NODE_ENV").pipe(Config.withDefault(""))), (environment) => environment === "production");
|
|
40
41
|
export const makePlatformRuntime = (layer, options = {}) => {
|
|
41
42
|
const key = Effect.runSync(production) ? undefined : options.developmentCacheKey;
|
|
42
|
-
if (key === undefined)
|
|
43
|
+
if (key === undefined) {
|
|
43
44
|
return make(layer);
|
|
45
|
+
}
|
|
44
46
|
const cached = runtimeCache.get(key);
|
|
45
47
|
if (cached !== undefined) {
|
|
46
48
|
return cachedEntry(cached);
|
|
@@ -49,8 +51,9 @@ export const makePlatformRuntime = (layer, options = {}) => {
|
|
|
49
51
|
const cachedRuntime = {
|
|
50
52
|
...runtime,
|
|
51
53
|
dispose: async () => {
|
|
52
|
-
if (runtimeCache.get(key) === cachedRuntime)
|
|
54
|
+
if (runtimeCache.get(key) === cachedRuntime) {
|
|
53
55
|
runtimeCache.delete(key);
|
|
56
|
+
}
|
|
54
57
|
await runtime.dispose();
|
|
55
58
|
},
|
|
56
59
|
};
|
package/dist/runtime/make.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.js","sourceRoot":"","sources":["../../src/runtime/make.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAG9E,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;AACxE,MAAM,WAAW,GAAY,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AACtE,MAAM,YAAY,GAAkC,WAAW,YAAY,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,EAA4B,CAAC;AACnI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;AAIvD,SAAS,WAAW,CAAC,OAAgB;IACpC,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,IAAI,GAAG,CAAuB,KAAwC,EAAyC,EAAE;IACtH,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAA0B,CAAC;IAEjE,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAClD,MAAM,WAAW,GAAG,CACnB,MAAyC,EACQ,EAAE;QACnD,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;QAClC,OAAO,OAAO,KAAK,SAAS;YAC3B,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjH,CAAC,CAAC;IAEF,MAAM,cAAc,GAA4D,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CACnG,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtD,MAAM,OAAO,GAA0C;QACtD,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;YAClC,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC,CAAC;QACF,eAAe;QACf,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QAChC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"make.js","sourceRoot":"","sources":["../../src/runtime/make.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/types.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { Context, Effect, Exit } from "effect";
|
|
2
2
|
export interface PlatformRuntimeOptions {
|
|
3
|
-
/** Reuse one runtime across development module reloads. */
|
|
4
3
|
readonly developmentCacheKey?: string | symbol;
|
|
5
4
|
}
|
|
6
5
|
export interface PlatformRuntime<Services, BuildError> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/runtime/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEpD,MAAM,WAAW,sBAAsB;IACtC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/runtime/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEpD,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/C;AAED,MAAM,WAAW,eAAe,CAAC,QAAQ,EAAE,UAAU;IACpD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;IAC7E,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,SAAS,QAAQ,EACxD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,EACzC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,KACvC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChB,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,SAAS,QAAQ,EAC5D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,EACzC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,KACvC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,KAAK,KAAK,KAAK,CAAC;CACjH;AAED,MAAM,MAAM,uBAAuB,CAAC,OAAO,IAAI,OAAO,SAAS,eAAe,CAAC,MAAM,QAAQ,EAAE,MAAM,WAAW,CAAC,GAAG,QAAQ,GAAG,KAAK,CAAC;AAErI,MAAM,MAAM,yBAAyB,CAAC,OAAO,IAAI,OAAO,SAAS,eAAe,CAAC,MAAM,SAAS,EAAE,MAAM,UAAU,CAAC,GAAG,UAAU,GAAG,KAAK,CAAC"}
|
package/dist/testing/types.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { TestContext, Vitest } from "@effect/vitest";
|
|
2
|
+
import type { Effect, Layer } from "effect";
|
|
2
3
|
import type { AnyDatabase, DatabaseService } from "@shivaedev/effect-prisma/testing";
|
|
3
4
|
import type { EffectTRPCAdapter } from "@shivaedev/effect-trpc";
|
|
4
5
|
import type { CallerOptions, CallerResult, EffectCallerFactory, TrpcHarnessTest, TrpcHarnessTester } from "@shivaedev/effect-trpc/testing";
|
|
5
|
-
import type { Effect, Layer } from "effect";
|
|
6
6
|
export type PlatformHarness<Database extends AnyDatabase, Options, Caller, Extension> = Readonly<{
|
|
7
7
|
db: DatabaseService<Database>;
|
|
8
8
|
trpc: EffectCallerFactory<Options, Caller>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/testing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/testing/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAE3I,MAAM,MAAM,eAAe,CAAC,QAAQ,SAAS,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,IAAI,QAAQ,CAAC;IAChG,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC9B,IAAI,EAAE,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;CAC3C,CAAC,GACD,QAAQ,CAAC;IACR,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;CAClF,CAAC,GACF,IAAI,CAAC,SAAS,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC;AAE5C,MAAM,MAAM,YAAY,CAAC,OAAO,EAAE,QAAQ,IAAI,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAEjF,MAAM,MAAM,cAAc,CAAC,OAAO,EAAE,QAAQ,IAAI,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAErF,MAAM,MAAM,UAAU,CAAC,OAAO,EAAE,QAAQ,IAAI,MAAM,CAAC,OAAO,GAAG;IAC5D,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;CACtD,CAAC;AAEF,MAAM,WAAW,qBAAqB,CACrC,QAAQ,SAAS,WAAW,EAC5B,YAAY,SAAS,CAAC,GAAG,UAAU,EAAE,KAAK,EAAE,KAAK,MAAM,EACvD,QAAQ,EACR,UAAU,EACV,SAAS;IAET,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACpE,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,CACjB,IAAI,EAAE,QAAQ,CAAC;QACd,EAAE,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,EAAE,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;KACrG,CAAC,EACF,OAAO,EAAE,WAAW,KAChB,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;CAClD"}
|
package/dist/testing/vitest.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { Effect, type Layer } from "effect";
|
|
1
2
|
import { type AnyDatabase } from "@shivaedev/effect-prisma/testing";
|
|
2
3
|
import { type CallerOptions, type CallerResult } from "@shivaedev/effect-trpc/testing";
|
|
3
|
-
import { Effect, type Layer } from "effect";
|
|
4
4
|
import type { MakePlatformItOptions, PlatformHarness, PlatformIt } from "./types.ts";
|
|
5
5
|
export declare const makePlatformIt: <const Database extends AnyDatabase>(database: Database) => <CreateCaller extends (...arguments_: never[]) => object, Provided, LayerError, Extension extends object = Record<never, never>>(options: MakePlatformItOptions<Database, CreateCaller, Provided, LayerError, Extension> & {
|
|
6
6
|
readonly layer: Layer.Layer<Provided | Effect.Services<Database>, LayerError>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../src/testing/vitest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../src/testing/vitest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,kCAAkC,CAAC;AAEzF,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAA+C,MAAM,gCAAgC,CAAC;AAEpI,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAoDrF,eAAO,MAAM,cAAc,GACzB,KAAK,CAAC,QAAQ,SAAS,WAAW,EAAE,UAAU,QAAQ,MACtD,YAAY,SAAS,CAAC,GAAG,UAAU,EAAE,KAAK,EAAE,KAAK,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EAC9H,SAAS,qBAAqB,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,GAAG;IACzF,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;CAC9E,KACC,UAAU,CACZ,eAAe,CAAC,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC,EAC7F,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAEP,CAAC"}
|
package/dist/testing/vitest.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
1
2
|
import { withTestTransaction } from "@shivaedev/effect-prisma/testing";
|
|
2
3
|
import { makeTrpcHarnessIt } from "@shivaedev/effect-trpc/testing";
|
|
3
|
-
import { Effect } from "effect";
|
|
4
4
|
function platformIt(database, options) {
|
|
5
5
|
const trpcIt = makeTrpcHarnessIt({
|
|
6
6
|
adapter: options.adapter,
|
|
7
|
+
around: (effect) => withTestTransaction(database, effect),
|
|
7
8
|
createCaller: options.createCaller,
|
|
8
9
|
layer: options.layer,
|
|
9
|
-
around: (effect) => withTestTransaction(database, effect),
|
|
10
10
|
makeHarness: (trpc, context) => Effect.gen(function* () {
|
|
11
11
|
const services = yield* Effect.context();
|
|
12
12
|
const db = yield* database;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../src/testing/vitest.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../src/testing/vitest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAc,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAoB,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEzF,OAAO,EAAmE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AA4BpI,SAAS,UAAU,CAAC,QAAqB,EAAE,OAAqB;IAC/D,MAAM,MAAM,GAAG,iBAAiB,CAAC;QAChC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC;QACzD,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAC9B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAW,CAAC;YAClD,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;YAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACrF,MAAM,OAAO,GAAG,CAAQ,QAA8B,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;YACxI,OAAO,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC5C,CAAC,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACxB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ;YAC7B,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;gBAC9B,OAAO,MAAM,CAAC,UAAU,CAAC;YAC1B,CAAC;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;KACD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAC1B,CAAqC,QAAkB,EAAE,EAAE,CAC3D,CACC,OAEC,EAIA,EAAE,CACH,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,28 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/platform",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.0",
|
|
4
4
|
"description": "Opinionated Effect application infrastructure for ShivaeDev services",
|
|
5
|
-
"type": "module",
|
|
6
|
-
"license": "MIT",
|
|
7
|
-
"repository": {
|
|
8
|
-
"type": "git",
|
|
9
|
-
"url": "git+https://github.com/ShivaeDev/platform.git",
|
|
10
|
-
"directory": "packages/platform"
|
|
11
|
-
},
|
|
12
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/platform#readme",
|
|
13
6
|
"bugs": {
|
|
14
7
|
"url": "https://github.com/ShivaeDev/platform/issues"
|
|
15
8
|
},
|
|
16
|
-
"
|
|
17
|
-
"
|
|
9
|
+
"repository": {
|
|
10
|
+
"type": "git",
|
|
11
|
+
"url": "git+https://github.com/ShivaeDev/platform.git",
|
|
12
|
+
"directory": "packages/platform"
|
|
18
13
|
},
|
|
14
|
+
"license": "MIT",
|
|
19
15
|
"sideEffects": false,
|
|
20
|
-
"
|
|
21
|
-
"dist",
|
|
22
|
-
"src",
|
|
23
|
-
"CHANGELOG.md",
|
|
24
|
-
"README.md"
|
|
25
|
-
],
|
|
16
|
+
"type": "module",
|
|
26
17
|
"exports": {
|
|
27
18
|
"./better-auth": {
|
|
28
19
|
"types": "./dist/better-auth.d.ts",
|
|
@@ -68,17 +59,40 @@
|
|
|
68
59
|
},
|
|
69
60
|
"./package.json": "./package.json"
|
|
70
61
|
},
|
|
71
|
-
"
|
|
72
|
-
"
|
|
73
|
-
"
|
|
62
|
+
"files": [
|
|
63
|
+
"dist",
|
|
64
|
+
"src",
|
|
65
|
+
"CHANGELOG.md",
|
|
66
|
+
"README.md"
|
|
67
|
+
],
|
|
68
|
+
"devDependencies": {
|
|
69
|
+
"@effect/vitest": "4.0.0-rc.112",
|
|
70
|
+
"@prisma-next/adapter-postgres": "0.15.0",
|
|
71
|
+
"@prisma-next/contract": "0.15.0",
|
|
72
|
+
"@prisma-next/postgres": "0.15.0",
|
|
73
|
+
"@prisma-next/sql-contract": "0.15.0",
|
|
74
|
+
"@prisma-next/target-postgres": "0.15.0",
|
|
75
|
+
"@shivaedev/effect-prisma": "0.7.0",
|
|
76
|
+
"@shivaedev/effect-trpc": "0.5.0",
|
|
77
|
+
"@shivaedev/quality": "0.7.0",
|
|
78
|
+
"@shivaedev/types": "0.1.0",
|
|
79
|
+
"@trpc/client": "11.18.0",
|
|
80
|
+
"@trpc/server": "11.18.0",
|
|
81
|
+
"@types/node": "24.10.1",
|
|
82
|
+
"@typescript/native": "npm:typescript@7.0.2",
|
|
83
|
+
"better-auth": "1.6.30",
|
|
84
|
+
"effect": "4.0.0-rc.112",
|
|
85
|
+
"superjson": "2.2.6",
|
|
86
|
+
"typescript": "npm:@typescript/typescript6@6.0.2",
|
|
87
|
+
"vitest": "4.1.9"
|
|
74
88
|
},
|
|
75
89
|
"peerDependencies": {
|
|
76
90
|
"@effect/vitest": "4.0.0-rc.112",
|
|
91
|
+
"@shivaedev/effect-prisma": "0.7.0",
|
|
92
|
+
"@shivaedev/effect-trpc": "0.5.0",
|
|
77
93
|
"@trpc/server": "11.18.0",
|
|
78
94
|
"better-auth": "1.6.30",
|
|
79
|
-
"effect": "4.0.0-rc.112"
|
|
80
|
-
"@shivaedev/effect-prisma": "0.6.4",
|
|
81
|
-
"@shivaedev/effect-trpc": "0.4.1"
|
|
95
|
+
"effect": "4.0.0-rc.112"
|
|
82
96
|
},
|
|
83
97
|
"peerDependenciesMeta": {
|
|
84
98
|
"@effect/vitest": {
|
|
@@ -97,32 +111,17 @@
|
|
|
97
111
|
"optional": true
|
|
98
112
|
}
|
|
99
113
|
},
|
|
100
|
-
"
|
|
101
|
-
"
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
"
|
|
105
|
-
"
|
|
106
|
-
"@prisma-next/target-postgres": "0.15.0",
|
|
107
|
-
"@trpc/client": "11.18.0",
|
|
108
|
-
"@trpc/server": "11.18.0",
|
|
109
|
-
"@types/node": "24.10.1",
|
|
110
|
-
"@typescript/native": "npm:typescript@7.0.2",
|
|
111
|
-
"better-auth": "1.6.30",
|
|
112
|
-
"effect": "4.0.0-rc.112",
|
|
113
|
-
"superjson": "2.2.6",
|
|
114
|
-
"typescript": "npm:@typescript/typescript6@6.0.2",
|
|
115
|
-
"vitest": "4.1.9",
|
|
116
|
-
"@shivaedev/effect-prisma": "0.6.4",
|
|
117
|
-
"@shivaedev/effect-trpc": "0.4.1"
|
|
114
|
+
"engines": {
|
|
115
|
+
"node": ">=24"
|
|
116
|
+
},
|
|
117
|
+
"publishConfig": {
|
|
118
|
+
"access": "public",
|
|
119
|
+
"provenance": true
|
|
118
120
|
},
|
|
119
121
|
"scripts": {
|
|
120
122
|
"build": "node --eval \"import('node:fs').then(({ rmSync }) => rmSync('dist', { force: true, recursive: true }))\" && tsc6 --project tsconfig.build.json",
|
|
121
|
-
"
|
|
123
|
+
"ready": "pnpm typecheck && pnpm test && pnpm build",
|
|
122
124
|
"test": "vitest run",
|
|
123
|
-
"
|
|
124
|
-
"typecheck": "tsc --noEmit",
|
|
125
|
-
"typecheck:compat": "tsc6 --noEmit",
|
|
126
|
-
"ready": "pnpm check && pnpm typecheck && pnpm typecheck:compat && pnpm test && pnpm build && pnpm test:package"
|
|
125
|
+
"typecheck": "tsc --noEmit"
|
|
127
126
|
}
|
|
128
127
|
}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
-
import type { AnyDatabase } from "@shivaedev/effect-prisma";
|
|
2
1
|
import type { BetterAuthOptions, DBAdapterInstance } from "better-auth";
|
|
3
2
|
import { createAdapterFactory } from "better-auth/adapters";
|
|
4
3
|
import { Effect } from "effect";
|
|
4
|
+
import type { AnyDatabase } from "@shivaedev/effect-prisma";
|
|
5
5
|
import type { PlatformRuntime } from "../runtime/types.ts";
|
|
6
6
|
import { type DynamicRelation, refineRelation } from "./relation.ts";
|
|
7
7
|
import { makeRowAdapter, type RelationQuery } from "./row-adapter.ts";
|
|
8
8
|
|
|
9
9
|
export interface EffectPrismaAdapterOptions {
|
|
10
10
|
readonly debugLogs?: boolean;
|
|
11
|
-
/** Map Better Auth model names to Prisma contract model names. */
|
|
12
11
|
readonly modelName?: (model: string) => string;
|
|
13
12
|
readonly usePlural?: boolean;
|
|
14
13
|
}
|
|
@@ -59,13 +58,14 @@ export function effectPrismaAdapter(
|
|
|
59
58
|
const inTransaction = <Value>(callback: () => Promise<Value>): Effect.Effect<Value, unknown, unknown> =>
|
|
60
59
|
Effect.flatMap(Effect.context<unknown>(), (services) =>
|
|
61
60
|
Effect.tryPromise({
|
|
62
|
-
try: () => runtime.runWithServices(services, callback),
|
|
63
61
|
catch: (error) => error,
|
|
62
|
+
try: () => runtime.runWithServices(services, callback),
|
|
64
63
|
}),
|
|
65
64
|
);
|
|
66
65
|
|
|
67
66
|
let factory: ReturnType<typeof createAdapterFactory>;
|
|
68
67
|
factory = createAdapterFactory({
|
|
68
|
+
adapter: makeRowAdapter(query, adapterOptions.usePlural ?? false),
|
|
69
69
|
config: {
|
|
70
70
|
adapterId: "effect-prisma",
|
|
71
71
|
adapterName: "Effect Prisma",
|
|
@@ -78,7 +78,6 @@ export function effectPrismaAdapter(
|
|
|
78
78
|
supportsUUIDs: true,
|
|
79
79
|
transaction: (callback) => run((database) => database.transaction(inTransaction(() => callback(factory(authOptions))))),
|
|
80
80
|
},
|
|
81
|
-
adapter: makeRowAdapter(query, adapterOptions.usePlural ?? false),
|
|
82
81
|
});
|
|
83
82
|
|
|
84
83
|
return factory(authOptions);
|
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
import { all } from "@shivaedev/effect-prisma";
|
|
2
1
|
import type { Effect, Option } from "effect";
|
|
2
|
+
import { all } from "@shivaedev/effect-prisma";
|
|
3
3
|
import { type CleanedWhere, type DynamicField, type Expression, whereExpression } from "./where.ts";
|
|
4
4
|
|
|
5
|
-
export interface DynamicRelation<Requirements> extends Effect.Effect<
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
5
|
+
export interface DynamicRelation<Requirements> extends Effect.Effect<readonly Record<string, unknown>[], unknown, Requirements> {
|
|
6
|
+
count: () => Effect.Effect<number, unknown, Requirements>;
|
|
7
|
+
create: (data: Record<string, unknown>) => Effect.Effect<Record<string, unknown>, unknown, Requirements>;
|
|
8
|
+
delete: () => Effect.Effect<Record<string, unknown> | null, unknown, Requirements>;
|
|
9
|
+
deleteAll: () => Effect.Effect<readonly Record<string, unknown>[], unknown, Requirements>;
|
|
10
|
+
first: () => Effect.Effect<Option.Option<Record<string, unknown>>, unknown, Requirements>;
|
|
11
|
+
orderBy: (ordering: (fields: Record<string, DynamicField>) => unknown) => DynamicRelation<Requirements>;
|
|
12
|
+
select: (...fields: readonly string[]) => DynamicRelation<Requirements>;
|
|
13
|
+
skip: (count: number) => DynamicRelation<Requirements>;
|
|
14
|
+
take: (count: number) => DynamicRelation<Requirements>;
|
|
15
|
+
update: (data: Record<string, unknown>) => Effect.Effect<Record<string, unknown> | null, unknown, Requirements>;
|
|
16
|
+
updateAll: (data: Record<string, unknown>) => Effect.Effect<readonly Record<string, unknown>[], unknown, Requirements>;
|
|
17
|
+
where: (predicate: (fields: Record<string, DynamicField>) => Expression) => DynamicRelation<Requirements>;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
export const refineRelation = <Requirements>(
|
|
21
21
|
relation: DynamicRelation<Requirements>,
|
|
22
22
|
options: {
|
|
23
|
-
readonly where?:
|
|
24
|
-
readonly select?:
|
|
23
|
+
readonly where?: readonly CleanedWhere[] | undefined;
|
|
24
|
+
readonly select?: readonly string[] | undefined;
|
|
25
25
|
readonly limit?: number | undefined;
|
|
26
26
|
readonly offset?: number | undefined;
|
|
27
27
|
readonly sortBy?:
|
|
@@ -48,8 +48,12 @@ export const refineRelation = <Requirements>(
|
|
|
48
48
|
return options.sortBy?.direction === "desc" ? field.desc() : field.asc();
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
if (options.offset !== undefined)
|
|
52
|
-
|
|
51
|
+
if (options.offset !== undefined) {
|
|
52
|
+
refined = refined.skip(options.offset);
|
|
53
|
+
}
|
|
54
|
+
if (options.limit !== undefined) {
|
|
55
|
+
refined = refined.take(options.limit);
|
|
56
|
+
}
|
|
53
57
|
if (options.select !== undefined && options.select.length > 0) {
|
|
54
58
|
refined = refined.select(...options.select);
|
|
55
59
|
}
|