@rudderjs/core 1.1.0 → 1.1.1
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/dist/validation.d.ts +1 -1
- package/dist/validation.d.ts.map +1 -1
- package/dist/validation.js +14 -5
- package/dist/validation.js.map +1 -1
- package/package.json +2 -2
package/dist/validation.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ export declare abstract class FormRequest<T extends ZodType = ZodType> {
|
|
|
23
23
|
protected req: AppRequest;
|
|
24
24
|
abstract rules(): T;
|
|
25
25
|
authorize(): boolean;
|
|
26
|
-
protected prepareForValidation(_input: Record<string, unknown>): Record<string, unknown> | void
|
|
26
|
+
protected prepareForValidation(_input: Record<string, unknown>): Record<string, unknown> | void | Promise<Record<string, unknown> | void>;
|
|
27
27
|
protected after(): Array<AfterCallback<z.infer<T>>>;
|
|
28
28
|
protected passedValidation(_data: z.infer<T>): z.infer<T> | void | Promise<z.infer<T> | void>;
|
|
29
29
|
protected failedValidation(errors: Record<string, string[]>): never | Response | Promise<never | Response>;
|
package/dist/validation.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,OAAO,EAAY,MAAM,KAAK,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAIlE,qBAAa,eAAgB,SAAQ,KAAK;IACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBAAhC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAKnD,MAAM;;;;CAMP;AAOD,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,QAAQ,EAAE,QAAQ;gBAAlB,QAAQ,EAAE,QAAQ;CAItC;AAID,MAAM,WAAW,YAAY,CAAC,KAAK;IACjC,IAAI,EAAM,KAAK,CAAA;IACf,GAAG,EAAO,UAAU,CAAA;IACpB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAErF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAA;AAE3F,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3D,SAAS,CAAC,GAAG,EAAG,UAAU,CAAA;IAE1B,QAAQ,CAAC,KAAK,IAAI,CAAC;IAEnB,SAAS,IAAI,OAAO;IAMpB,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,OAAO,EAAY,MAAM,KAAK,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAIlE,qBAAa,eAAgB,SAAQ,KAAK;IACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBAAhC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAKnD,MAAM;;;;CAMP;AAOD,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,QAAQ,EAAE,QAAQ;gBAAlB,QAAQ,EAAE,QAAQ;CAItC;AAID,MAAM,WAAW,YAAY,CAAC,KAAK;IACjC,IAAI,EAAM,KAAK,CAAA;IACf,GAAG,EAAO,UAAU,CAAA;IACpB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AAErF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,MAAM,CAAC,CAAC,CAAA;AAE3F,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3D,SAAS,CAAC,GAAG,EAAG,UAAU,CAAA;IAE1B,QAAQ,CAAC,KAAK,IAAI,CAAC;IAEnB,SAAS,IAAI,OAAO;IAMpB,SAAS,CAAC,oBAAoB,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAI3E,SAAS,CAAC,KAAK,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAInD,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAI7F,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC;IAI1G,SAAS,CAAC,QAAQ,IAAI,WAAW;IAM3B,QAAQ,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YA2CtC,IAAI;CAKnB;AA6BD,wBAAsB,QAAQ,CAAC,CAAC,SAAS,OAAO,EAC9C,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAerB;AAID,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,MAAM,EAAE,CAAC,IAErD,KAAK,UAAU,EACf,MAAM,WAAW,EACjB,MAAM,MAAM,OAAO,CAAC,IAAI,CAAC,mBAK5B;AAED,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA"}
|
package/dist/validation.js
CHANGED
|
@@ -50,17 +50,23 @@ export class FormRequest {
|
|
|
50
50
|
// ─── Pipeline ────────────────────────────────────────────
|
|
51
51
|
async validate(req) {
|
|
52
52
|
this.req = req;
|
|
53
|
-
if (!this.authorize()) {
|
|
54
|
-
return this.fail({ auth: ['Unauthorized'] });
|
|
55
|
-
}
|
|
56
53
|
let input = {
|
|
57
54
|
...(typeof req.body === 'object' && req.body !== null ? req.body : {}),
|
|
58
55
|
...req.query,
|
|
59
56
|
...req.params,
|
|
60
57
|
};
|
|
61
|
-
|
|
58
|
+
// prepareForValidation runs first so subclasses can normalize input that
|
|
59
|
+
// authorize() then reads (matches Laravel's FormRequest::validateResolved
|
|
60
|
+
// ordering). Awaited so async overrides work — without the await, a
|
|
61
|
+
// returned Promise would pass `typeof === 'object'` and be assigned to
|
|
62
|
+
// `input`, then the schema would fail with a confusing "expected object,
|
|
63
|
+
// received object" error.
|
|
64
|
+
const prepared = await this.prepareForValidation(input);
|
|
62
65
|
if (prepared && typeof prepared === 'object')
|
|
63
66
|
input = prepared;
|
|
67
|
+
if (!this.authorize()) {
|
|
68
|
+
return this.fail({ auth: ['Unauthorized'] });
|
|
69
|
+
}
|
|
64
70
|
const errorMap = buildErrorMap(this.messages());
|
|
65
71
|
const result = errorMap
|
|
66
72
|
? this.rules().safeParse(input, { error: errorMap })
|
|
@@ -101,7 +107,10 @@ function buildErrorMap(messages) {
|
|
|
101
107
|
if (keys.length === 0)
|
|
102
108
|
return undefined;
|
|
103
109
|
return (issue) => {
|
|
104
|
-
|
|
110
|
+
// Match the key shape that ValidationError.errors uses — top-level
|
|
111
|
+
// (no-path) issues land under `'root'`, not `''`. Override maps need to
|
|
112
|
+
// use the same key the user sees in the rendered errors.
|
|
113
|
+
const path = (issue.path ?? []).join('.') || 'root';
|
|
105
114
|
const entry = messages[path];
|
|
106
115
|
if (entry === undefined)
|
|
107
116
|
return undefined;
|
package/dist/validation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,QAAQ,EAAE,MAAM,KAAK,CAAA;AAG1C,8DAA8D;AAE9D,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACrB;IAAnB,YAAmB,MAAgC;QACjD,KAAK,CAAC,mBAAmB,CAAC,CAAA;QADT,WAAM,GAAN,MAAM,CAA0B;QAEjD,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAA;IAC/B,CAAC;IAED,MAAM;QACJ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAG,IAAI,CAAC,MAAM;SACrB,CAAA;IACH,CAAC;CACF;AAED,8DAA8D;AAE9D,+EAA+E;AAC/E,8EAA8E;AAC9E,gFAAgF;AAChF,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IACxB;IAAnB,YAAmB,QAAkB;QACnC,KAAK,CAAC,0BAA0B,CAAC,CAAA;QADhB,aAAQ,GAAR,QAAQ,CAAU;QAEnC,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAA;IAClC,CAAC;CACF;AAcD,MAAM,OAAgB,WAAW;IACrB,GAAG,CAAa;IAI1B,SAAS;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IAED,gEAAgE;IAEtD,oBAAoB,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rudderjs/core",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"zod": "^4.0.0",
|
|
34
34
|
"@rudderjs/console": "^1.0.0",
|
|
35
35
|
"@rudderjs/contracts": "^1.2.0",
|
|
36
|
-
"@rudderjs/router": "^1.1.
|
|
36
|
+
"@rudderjs/router": "^1.1.2",
|
|
37
37
|
"@rudderjs/support": "^1.1.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|