@6thbridge/utils 1.2.1 → 1.4.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/lib/database/MongoDBTypeRepository.d.ts +9 -9
- package/lib/database/MongoDBTypeRepository.js +9 -4
- package/lib/database/MongoDBTypeRepository.js.map +1 -1
- package/lib/index.d.ts +3 -1
- package/lib/index.js +7 -1
- package/lib/index.js.map +1 -1
- package/lib/schemas/country.schema.d.ts +5 -0
- package/lib/schemas/country.schema.js +15 -0
- package/lib/schemas/country.schema.js.map +1 -0
- package/lib/schemas/index.d.ts +2 -0
- package/lib/schemas/index.js +21 -0
- package/lib/schemas/index.js.map +1 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/utils/http.d.ts +1 -0
- package/lib/utils/http.js +12 -1
- package/lib/utils/http.js.map +1 -1
- package/lib/utils/http.spec.d.ts +1 -0
- package/lib/utils/http.spec.js +44 -0
- package/lib/utils/http.spec.js.map +1 -0
- package/lib/utils/validator.d.ts +3 -2
- package/lib/utils/validator.js +23 -7
- package/lib/utils/validator.js.map +1 -1
- package/lib/utils/validator.spec.js +113 -7
- package/lib/utils/validator.spec.js.map +1 -1
- package/package.json +15 -10
package/lib/utils/http.js
CHANGED
|
@@ -24,6 +24,17 @@ class HttpUtil {
|
|
|
24
24
|
return undefined;
|
|
25
25
|
return (_a = headers['x-request-tag']) !== null && _a !== void 0 ? _a : headers['X-Request-Tag'];
|
|
26
26
|
}
|
|
27
|
+
static getLoggableRequestData(data) {
|
|
28
|
+
if (typeof data !== 'string')
|
|
29
|
+
return data;
|
|
30
|
+
const trimmed = data.trim();
|
|
31
|
+
try {
|
|
32
|
+
return JSON.parse(trimmed);
|
|
33
|
+
}
|
|
34
|
+
catch (_a) {
|
|
35
|
+
return data;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
27
38
|
static withRequestTag(tag, message) {
|
|
28
39
|
return tag ? `[${tag}] ${message}` : message;
|
|
29
40
|
}
|
|
@@ -73,7 +84,7 @@ class HttpUtil {
|
|
|
73
84
|
url: config === null || config === void 0 ? void 0 : config.url,
|
|
74
85
|
headers: config === null || config === void 0 ? void 0 : config.headers,
|
|
75
86
|
params: config === null || config === void 0 ? void 0 : config.params,
|
|
76
|
-
data: config === null || config === void 0 ? void 0 : config.data,
|
|
87
|
+
data: HttpUtil.getLoggableRequestData(config === null || config === void 0 ? void 0 : config.data),
|
|
77
88
|
};
|
|
78
89
|
}
|
|
79
90
|
static getAxiosInstance(config) {
|
package/lib/utils/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/utils/http.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/utils/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
jest.mock('../logger', () => ({
|
|
4
|
+
logger: {
|
|
5
|
+
info: jest.fn(),
|
|
6
|
+
error: jest.fn(),
|
|
7
|
+
debug: jest.fn(),
|
|
8
|
+
},
|
|
9
|
+
}));
|
|
10
|
+
jest.mock('axios-better-stacktrace', () => jest.fn());
|
|
11
|
+
const http_1 = require("./http");
|
|
12
|
+
describe('HttpUtil', () => {
|
|
13
|
+
describe('buildRequestLog', () => {
|
|
14
|
+
it('parses stringified JSON request bodies before logging', () => {
|
|
15
|
+
const requestLog = http_1.HttpUtil.buildRequestLog({
|
|
16
|
+
method: 'post',
|
|
17
|
+
baseURL: 'https://example.com',
|
|
18
|
+
url: '/v1/test',
|
|
19
|
+
headers: { 'content-type': 'application/json' },
|
|
20
|
+
params: { page: 1 },
|
|
21
|
+
data: JSON.stringify({
|
|
22
|
+
amount: 1000,
|
|
23
|
+
currency: 'USD',
|
|
24
|
+
}),
|
|
25
|
+
});
|
|
26
|
+
expect(requestLog.data).toEqual({
|
|
27
|
+
amount: 1000,
|
|
28
|
+
currency: 'USD',
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
it('keeps non-JSON string request bodies unchanged', () => {
|
|
32
|
+
const requestLog = http_1.HttpUtil.buildRequestLog({
|
|
33
|
+
method: 'post',
|
|
34
|
+
baseURL: 'https://example.com',
|
|
35
|
+
url: '/v1/test',
|
|
36
|
+
headers: { 'content-type': 'text/plain' },
|
|
37
|
+
params: {},
|
|
38
|
+
data: 'raw-body=value',
|
|
39
|
+
});
|
|
40
|
+
expect(requestLog.data).toBe('raw-body=value');
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
//# sourceMappingURL=http.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.spec.js","sourceRoot":"","sources":["../../src/utils/http.spec.ts"],"names":[],"mappings":";;AAAA,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1B,MAAM,EAAE;QACJ,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;QACf,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;QAChB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;KACnB;CACJ,CAAC,CAAC,CAAC;AAEJ,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AAEtD,iCAAkC;AAElC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACtB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC7D,MAAM,UAAU,GAAI,eAAgB,CAAC,eAAe,CAAC;gBACjD,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,qBAAqB;gBAC9B,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE,EAAC,cAAc,EAAE,kBAAkB,EAAC;gBAC7C,MAAM,EAAE,EAAC,IAAI,EAAE,CAAC,EAAC;gBACjB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACjB,MAAM,EAAE,IAAI;oBACZ,QAAQ,EAAE,KAAK;iBAClB,CAAC;aACL,CAAC,CAAC;YAEH,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;gBAC5B,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,KAAK;aAClB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACtD,MAAM,UAAU,GAAI,eAAgB,CAAC,eAAe,CAAC;gBACjD,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,qBAAqB;gBAC9B,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE,EAAC,cAAc,EAAE,YAAY,EAAC;gBACvC,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,gBAAgB;aACzB,CAAC,CAAC;YAEH,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/lib/utils/validator.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import * as Joi from 'joi';
|
|
2
|
+
import { z, ZodType } from 'zod';
|
|
2
3
|
import { FunctionResult } from '../types';
|
|
3
|
-
export declare function validate(schema: any, payload: any): string | null;
|
|
4
|
-
export declare function validateStrict(schema: any, payload: any, options?: any): FunctionResult<Record<string, any>>;
|
|
5
4
|
export declare class ValidatorUtil {
|
|
6
5
|
static validate(schema: Joi.SchemaMap, payload: Record<string, any>): string | null;
|
|
7
6
|
static validateStrict(schema: Joi.SchemaMap, payload: Record<string, any>, options?: Joi.ValidationOptions): FunctionResult<Record<string, any>>;
|
|
7
|
+
static validateWithZod<T extends ZodType | z.ZodRawShape>(schema: T, payload: Record<string, any>): string | null;
|
|
8
|
+
static validateStrictWithZod<T extends ZodType | z.ZodRawShape>(schema: T, payload: Record<string, any>): FunctionResult<Record<string, any>>;
|
|
8
9
|
}
|
|
9
10
|
export { Joi };
|
package/lib/utils/validator.js
CHANGED
|
@@ -23,17 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Joi = exports.ValidatorUtil =
|
|
26
|
+
exports.Joi = exports.ValidatorUtil = void 0;
|
|
27
27
|
const Joi = __importStar(require("joi"));
|
|
28
28
|
exports.Joi = Joi;
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
const zod_validation_error_1 = require("zod-validation-error");
|
|
30
|
+
const zod_1 = require("zod");
|
|
31
|
+
function getZodSchema(schema) {
|
|
32
|
+
if (schema instanceof zod_1.ZodType)
|
|
33
|
+
return schema;
|
|
34
|
+
return zod_1.z.object(schema).passthrough();
|
|
31
35
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
return ValidatorUtil.validateStrict(schema, payload, options);
|
|
36
|
+
function getZodErrorMessage(error) {
|
|
37
|
+
return (0, zod_validation_error_1.fromZodError)(error).message.replace(/['"]/g, '');
|
|
35
38
|
}
|
|
36
|
-
exports.validateStrict = validateStrict;
|
|
37
39
|
class ValidatorUtil {
|
|
38
40
|
static validate(schema, payload) {
|
|
39
41
|
const parsedSchema = Joi.object(schema);
|
|
@@ -51,6 +53,20 @@ class ValidatorUtil {
|
|
|
51
53
|
return { error: error.details[0].message.replace(/['"]/g, '') };
|
|
52
54
|
return { data: value };
|
|
53
55
|
}
|
|
56
|
+
static validateWithZod(schema, payload) {
|
|
57
|
+
const parsedSchema = getZodSchema(schema);
|
|
58
|
+
const result = parsedSchema.safeParse(payload);
|
|
59
|
+
if (!result.success)
|
|
60
|
+
return getZodErrorMessage(result.error);
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
static validateStrictWithZod(schema, payload) {
|
|
64
|
+
const parsedSchema = getZodSchema(schema);
|
|
65
|
+
const result = parsedSchema.safeParse(payload);
|
|
66
|
+
if (!result.success)
|
|
67
|
+
return { error: getZodErrorMessage(result.error), statusCode: 422, errorCode: "ValidationError" };
|
|
68
|
+
return { data: result.data };
|
|
69
|
+
}
|
|
54
70
|
}
|
|
55
71
|
exports.ValidatorUtil = ValidatorUtil;
|
|
56
72
|
//# sourceMappingURL=validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/utils/validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA2B;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/utils/validator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA2B;AAyDlB,kBAAG;AAxDZ,+DAAoD;AACpD,6BAAiC;AAGjC,SAAS,YAAY,CAAC,MAA+B;IACnD,IAAI,MAAM,YAAY,aAAO;QAAE,OAAO,MAAM,CAAC;IAC7C,OAAO,OAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;AACxC,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAU;IACpC,OAAO,IAAA,mCAAY,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,MAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,MAAqB,EAAE,OAA4B;QACjE,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC/C,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEhE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,MAAqB,EAAE,OAA4B,EAAE,OAA+B;QACxG,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,kBACpD,YAAY,EAAE,IAAI,IAAK,OAAO,EAC9B,CAAC;QAEH,IAAI,KAAK;YAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC;QAE3E,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,eAAe,CAAoC,MAAS,EAAE,OAA4B;QAC/F,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAoC,MAAS,EAAE,OAA4B;QACrG,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAEvH,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAA2B,EAAE,CAAC;IACtD,CAAC;CAEF;AAzCD,sCAyCC"}
|
|
@@ -24,6 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const Joi = __importStar(require("joi"));
|
|
27
|
+
const zod_1 = require("zod");
|
|
28
|
+
const schemas_1 = require("../schemas");
|
|
27
29
|
const validator_1 = require("./validator");
|
|
28
30
|
describe('Validator', () => {
|
|
29
31
|
describe('validate function', () => {
|
|
@@ -39,7 +41,7 @@ describe('Validator', () => {
|
|
|
39
41
|
extraField: 'This is allowed due to allowUnknown: true',
|
|
40
42
|
};
|
|
41
43
|
// Act
|
|
42
|
-
const result =
|
|
44
|
+
const result = validator_1.ValidatorUtil.validate(schema, payload);
|
|
43
45
|
// Assert
|
|
44
46
|
expect(result).toBeNull();
|
|
45
47
|
});
|
|
@@ -54,7 +56,7 @@ describe('Validator', () => {
|
|
|
54
56
|
// Missing required age field
|
|
55
57
|
};
|
|
56
58
|
// Act
|
|
57
|
-
const result =
|
|
59
|
+
const result = validator_1.ValidatorUtil.validate(schema, payload);
|
|
58
60
|
// Assert
|
|
59
61
|
expect(result).toBeDefined();
|
|
60
62
|
expect(typeof result).toBe('string');
|
|
@@ -70,7 +72,7 @@ describe('Validator', () => {
|
|
|
70
72
|
email: 'invalid-email',
|
|
71
73
|
};
|
|
72
74
|
// Act
|
|
73
|
-
const result =
|
|
75
|
+
const result = validator_1.ValidatorUtil.validate(schema, payload);
|
|
74
76
|
// Assert
|
|
75
77
|
expect(result).toBeDefined();
|
|
76
78
|
expect(result).not.toContain('"');
|
|
@@ -91,7 +93,7 @@ describe('Validator', () => {
|
|
|
91
93
|
extraField: 'This is allowed due to allowUnknown: true',
|
|
92
94
|
};
|
|
93
95
|
// Act
|
|
94
|
-
const result =
|
|
96
|
+
const result = validator_1.ValidatorUtil.validateStrict(schema, payload);
|
|
95
97
|
// Assert
|
|
96
98
|
expect(result).toHaveProperty('data');
|
|
97
99
|
expect(result.data).toEqual(expect.objectContaining({
|
|
@@ -111,7 +113,7 @@ describe('Validator', () => {
|
|
|
111
113
|
// Missing required age field
|
|
112
114
|
};
|
|
113
115
|
// Act
|
|
114
|
-
const result =
|
|
116
|
+
const result = validator_1.ValidatorUtil.validateStrict(schema, payload);
|
|
115
117
|
// Assert
|
|
116
118
|
expect(result).toHaveProperty('error');
|
|
117
119
|
expect(typeof result.error).toBe('string');
|
|
@@ -133,7 +135,7 @@ describe('Validator', () => {
|
|
|
133
135
|
stripUnknown: true,
|
|
134
136
|
};
|
|
135
137
|
// Act
|
|
136
|
-
const result =
|
|
138
|
+
const result = validator_1.ValidatorUtil.validateStrict(schema, payload, options);
|
|
137
139
|
// Assert
|
|
138
140
|
expect(result).toHaveProperty('error');
|
|
139
141
|
expect(result.error).toContain('age');
|
|
@@ -148,7 +150,7 @@ describe('Validator', () => {
|
|
|
148
150
|
email: 'invalid-email',
|
|
149
151
|
};
|
|
150
152
|
// Act
|
|
151
|
-
const result =
|
|
153
|
+
const result = validator_1.ValidatorUtil.validateStrict(schema, payload);
|
|
152
154
|
// Assert
|
|
153
155
|
expect(result).toHaveProperty('error');
|
|
154
156
|
expect(result.error).not.toContain('"');
|
|
@@ -156,6 +158,67 @@ describe('Validator', () => {
|
|
|
156
158
|
expect(result.error).toContain('email');
|
|
157
159
|
});
|
|
158
160
|
});
|
|
161
|
+
describe('validateWithZod function', () => {
|
|
162
|
+
it('should return null for valid data', () => {
|
|
163
|
+
const schema = zod_1.z.object({
|
|
164
|
+
name: zod_1.z.string(),
|
|
165
|
+
age: zod_1.z.number(),
|
|
166
|
+
});
|
|
167
|
+
const payload = {
|
|
168
|
+
name: 'John Doe',
|
|
169
|
+
age: 30,
|
|
170
|
+
extraField: 'This is allowed due to passthrough',
|
|
171
|
+
};
|
|
172
|
+
const result = validator_1.ValidatorUtil.validateWithZod(schema, payload);
|
|
173
|
+
expect(result).toBeNull();
|
|
174
|
+
});
|
|
175
|
+
it('should return error message for invalid data', () => {
|
|
176
|
+
const schema = zod_1.z.object({
|
|
177
|
+
name: zod_1.z.string(),
|
|
178
|
+
age: zod_1.z.number(),
|
|
179
|
+
}).passthrough();
|
|
180
|
+
const payload = {
|
|
181
|
+
name: 'John Doe',
|
|
182
|
+
};
|
|
183
|
+
const result = validator_1.ValidatorUtil.validateWithZod(schema, payload);
|
|
184
|
+
expect(result).toBeDefined();
|
|
185
|
+
expect(typeof result).toBe('string');
|
|
186
|
+
expect(result).toContain('expected number');
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
describe('validateStrictWithZod function', () => {
|
|
190
|
+
it('should return data object for valid data', () => {
|
|
191
|
+
const schema = zod_1.z.object({
|
|
192
|
+
name: zod_1.z.string(),
|
|
193
|
+
age: zod_1.z.number(),
|
|
194
|
+
}).passthrough();
|
|
195
|
+
const payload = {
|
|
196
|
+
name: 'John Doe',
|
|
197
|
+
age: 30,
|
|
198
|
+
extraField: 'This is allowed due to passthrough',
|
|
199
|
+
};
|
|
200
|
+
const result = validator_1.ValidatorUtil.validateStrictWithZod(schema, payload);
|
|
201
|
+
expect(result).toHaveProperty('data');
|
|
202
|
+
expect(result.data).toEqual(expect.objectContaining({
|
|
203
|
+
name: 'John Doe',
|
|
204
|
+
age: 30,
|
|
205
|
+
extraField: 'This is allowed due to passthrough',
|
|
206
|
+
}));
|
|
207
|
+
});
|
|
208
|
+
it('should return error object for invalid data', () => {
|
|
209
|
+
const schema = zod_1.z.object({
|
|
210
|
+
name: zod_1.z.string(),
|
|
211
|
+
age: zod_1.z.number(),
|
|
212
|
+
}).passthrough();
|
|
213
|
+
const payload = {
|
|
214
|
+
name: 'John Doe',
|
|
215
|
+
};
|
|
216
|
+
const result = validator_1.ValidatorUtil.validateStrictWithZod(schema, payload);
|
|
217
|
+
expect(result).toHaveProperty('error');
|
|
218
|
+
expect(typeof result.error).toBe('string');
|
|
219
|
+
expect(result.error).toContain('expected number');
|
|
220
|
+
});
|
|
221
|
+
});
|
|
159
222
|
describe('ValidatorUtil', () => {
|
|
160
223
|
describe('validate', () => {
|
|
161
224
|
it('should return null for valid data', () => {
|
|
@@ -283,6 +346,49 @@ describe('Validator', () => {
|
|
|
283
346
|
expect(result.error).toContain('unknown');
|
|
284
347
|
});
|
|
285
348
|
});
|
|
349
|
+
describe('validateWithZod', () => {
|
|
350
|
+
it('should allow unknown fields by default when a raw shape is provided', () => {
|
|
351
|
+
const schema = {
|
|
352
|
+
name: zod_1.z.string(),
|
|
353
|
+
};
|
|
354
|
+
const payload = {
|
|
355
|
+
name: 'John Doe',
|
|
356
|
+
unknown: 'value',
|
|
357
|
+
};
|
|
358
|
+
const result = validator_1.ValidatorUtil.validateWithZod(schema, payload);
|
|
359
|
+
expect(result).toBeNull();
|
|
360
|
+
});
|
|
361
|
+
});
|
|
362
|
+
describe('validateStrictWithZod', () => {
|
|
363
|
+
it('should return parsed zod data for valid country payloads', () => {
|
|
364
|
+
const payload = 'ng';
|
|
365
|
+
const result = schemas_1.countrySchema.parse(payload);
|
|
366
|
+
expect(result).toBe('NG');
|
|
367
|
+
});
|
|
368
|
+
it('should return parsed zod data for valid country payloads', () => {
|
|
369
|
+
const payload = 'GLOBAL';
|
|
370
|
+
const result = schemas_1.countrySchema.parse(payload);
|
|
371
|
+
expect(result).toBe('GLOBAL');
|
|
372
|
+
});
|
|
373
|
+
it('should validate the currency schema export', () => {
|
|
374
|
+
const result = validator_1.ValidatorUtil.validateStrictWithZod(schemas_1.currencySchema, 'xof');
|
|
375
|
+
expect(result.data).toBe('XOF');
|
|
376
|
+
});
|
|
377
|
+
it('should return an error for invalid country payloads', () => {
|
|
378
|
+
const schema = zod_1.z.object({
|
|
379
|
+
country: schemas_1.countrySchema,
|
|
380
|
+
currency: schemas_1.currencySchema,
|
|
381
|
+
});
|
|
382
|
+
const payload = {
|
|
383
|
+
country: 'nigeria',
|
|
384
|
+
currency: 'xof',
|
|
385
|
+
};
|
|
386
|
+
const result = validator_1.ValidatorUtil.validateStrictWithZod(schema, payload);
|
|
387
|
+
expect(result).toHaveProperty('error');
|
|
388
|
+
expect(typeof result.error).toBe('string');
|
|
389
|
+
expect(result.error).toContain('Validation error: Too big');
|
|
390
|
+
});
|
|
391
|
+
});
|
|
286
392
|
});
|
|
287
393
|
});
|
|
288
394
|
//# sourceMappingURL=validator.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.spec.js","sourceRoot":"","sources":["../../src/utils/validator.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validator.spec.js","sourceRoot":"","sources":["../../src/utils/validator.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@6thbridge/utils",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.0",
|
|
4
4
|
"description": "simple interface for the our commonly used functions",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -25,24 +25,26 @@
|
|
|
25
25
|
"license": "ISC",
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"@opentelemetry/api": "^1.9.1",
|
|
28
|
-
"@opentelemetry/auto-instrumentations-node": "^0.
|
|
28
|
+
"@opentelemetry/auto-instrumentations-node": "^0.76.0",
|
|
29
29
|
"amqp-connection-manager": "^4.1.15",
|
|
30
|
-
"amqplib": "^1.0
|
|
31
|
-
"axios": "^1.
|
|
30
|
+
"amqplib": "^1.2.0",
|
|
31
|
+
"axios": "^1.16.1",
|
|
32
32
|
"axios-better-stacktrace": "^2.1.7",
|
|
33
33
|
"bignumber.js": "^10.0.2",
|
|
34
34
|
"csv-parse": "^5.6.0",
|
|
35
35
|
"dayjs": "^1.11.20",
|
|
36
36
|
"ioredis": "^5.10.1",
|
|
37
|
-
"joi": "^18.1
|
|
38
|
-
"libphonenumber-js": "^1.
|
|
39
|
-
"lodash": "4.18.1",
|
|
40
|
-
"mongoose": "^9.
|
|
37
|
+
"joi": "^18.2.1",
|
|
38
|
+
"libphonenumber-js": "^1.13.2",
|
|
39
|
+
"lodash": "^4.18.1",
|
|
40
|
+
"mongoose": "^9.6.2",
|
|
41
41
|
"mongoose-paginate-v2": "^1.9.4",
|
|
42
42
|
"path-to-regexp": "^8.4.1",
|
|
43
43
|
"randomstring": "^1.3.1",
|
|
44
44
|
"rollbar": "^3.1.0",
|
|
45
|
-
"xlsx": "
|
|
45
|
+
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
|
|
46
|
+
"zod": "^4.4.3",
|
|
47
|
+
"zod-validation-error": "^5.0.0"
|
|
46
48
|
},
|
|
47
49
|
"devDependencies": {
|
|
48
50
|
"@types/amqplib": "^0.10.8",
|
|
@@ -57,6 +59,9 @@
|
|
|
57
59
|
"typescript": "^5.4.3"
|
|
58
60
|
},
|
|
59
61
|
"engines": {
|
|
60
|
-
"node": ">=
|
|
62
|
+
"node": ">=24"
|
|
63
|
+
},
|
|
64
|
+
"resolutions": {
|
|
65
|
+
"minimatch": "^10.2.5"
|
|
61
66
|
}
|
|
62
67
|
}
|