@lakutata/core 1.0.45 → 1.0.46
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.
|
@@ -45,7 +45,7 @@ const Return = (returnSchema, options = {
|
|
|
45
45
|
};
|
|
46
46
|
exports.Return = Return;
|
|
47
47
|
const Accept = (argumentSchemas, options = {
|
|
48
|
-
strict:
|
|
48
|
+
strict: false,
|
|
49
49
|
stripUnknown: true
|
|
50
50
|
}) => {
|
|
51
51
|
return (target, propertyKey, descriptor) => {
|
|
@@ -55,7 +55,7 @@ const Accept = (argumentSchemas, options = {
|
|
|
55
55
|
const schemas = Array.isArray(argumentSchemas) ? argumentSchemas : [argumentSchemas];
|
|
56
56
|
try {
|
|
57
57
|
for (let argumentIndex = 0; argumentIndex < schemas.length; argumentIndex++) {
|
|
58
|
-
schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options);
|
|
58
|
+
args[argumentIndex] = schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MethodValidation.js","sourceRoot":"","sources":["../../src/decorators/MethodValidation.ts"],"names":[],"mappings":";;;AACA,6FAAuF;AACvF,6FAAuF;AAShF,MAAM,MAAM,GAAG,CAAC,YAAuB,EAAE,UAAwD;IACvG,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,IAAI;CAClB,EAAE,EAAE;IACJ,OAAO,CAAC,MAAc,EAAE,WAAmB,EAAE,UAA2E,EAAE,EAAE;QAC3H,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAA;QAC3B,MAAM,cAAc,GAA2C,UAAU,CAAC,KAAY,CAAA;QACtF,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,WAAW,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,WAAW,iBAAiB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;QAC9J,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;YAC1C,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC7D,IAAI,oBAAoB,YAAY,OAAO,EAAE;gBAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACtC,OAAO,oBAAoB,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE;wBAC5D,IAAI;4BACH,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;4BAClF,OAAO,CAAC,YAAY,CAAC,CAAA;yBACrB;wBAAC,OAAO,CAAC,EAAE;4BACX,MAAM,CAAC,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC,CAAA;yBAC9D;oBACF,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACjB,CAAC,CAAC,CAAA;aACF;iBAAM;gBACN,IAAI;oBACH,OAAO,YAAY,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;iBAC/D;gBAAC,OAAO,CAAC,EAAE;oBACX,IAAI,MAAM,CAAC,mBAAmB,CAAC,EAAE;wBAChC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,2DAA4B,EAAG,CAAW,CAAC,OAAO,CAAC,CAAA;qBACrF;yBAAM;wBACN,MAAM,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAA;qBAC5D;iBACD;aACD;QACF,CAAC,CAAA;QACD,OAAO,UAAU,CAAA;IAClB,CAAC,CAAA;AACF,CAAC,CAAA;AAnCY,QAAA,MAAM,UAmClB;AASM,MAAM,MAAM,GAAG,CAAC,eAAwC,EAAE,UAAwD;IACxH,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"MethodValidation.js","sourceRoot":"","sources":["../../src/decorators/MethodValidation.ts"],"names":[],"mappings":";;;AACA,6FAAuF;AACvF,6FAAuF;AAShF,MAAM,MAAM,GAAG,CAAC,YAAuB,EAAE,UAAwD;IACvG,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,IAAI;CAClB,EAAE,EAAE;IACJ,OAAO,CAAC,MAAc,EAAE,WAAmB,EAAE,UAA2E,EAAE,EAAE;QAC3H,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAA;QAC3B,MAAM,cAAc,GAA2C,UAAU,CAAC,KAAY,CAAA;QACtF,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,WAAW,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,WAAW,iBAAiB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;QAC9J,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;YAC1C,MAAM,oBAAoB,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC7D,IAAI,oBAAoB,YAAY,OAAO,EAAE;gBAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACtC,OAAO,oBAAoB,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE;wBAC5D,IAAI;4BACH,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAA;4BAClF,OAAO,CAAC,YAAY,CAAC,CAAA;yBACrB;wBAAC,OAAO,CAAC,EAAE;4BACX,MAAM,CAAC,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC,CAAA;yBAC9D;oBACF,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACjB,CAAC,CAAC,CAAA;aACF;iBAAM;gBACN,IAAI;oBACH,OAAO,YAAY,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAA;iBAC/D;gBAAC,OAAO,CAAC,EAAE;oBACX,IAAI,MAAM,CAAC,mBAAmB,CAAC,EAAE;wBAChC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,2DAA4B,EAAG,CAAW,CAAC,OAAO,CAAC,CAAA;qBACrF;yBAAM;wBACN,MAAM,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAA;qBAC5D;iBACD;aACD;QACF,CAAC,CAAA;QACD,OAAO,UAAU,CAAA;IAClB,CAAC,CAAA;AACF,CAAC,CAAA;AAnCY,QAAA,MAAM,UAmClB;AASM,MAAM,MAAM,GAAG,CAAC,eAAwC,EAAE,UAAwD;IACxH,MAAM,EAAE,KAAK;IACb,YAAY,EAAE,IAAI;CAClB,EAAE,EAAE;IACJ,OAAO,CAAC,MAAc,EAAE,WAAmB,EAAE,UAA2E,EAAE,EAAE;QAC3H,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAA;QAC3B,MAAM,cAAc,GAA2C,UAAU,CAAC,KAAY,CAAA;QACtF,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;YAC1C,MAAM,OAAO,GAAgB,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAA;YACjG,IAAI;gBACH,KAAK,IAAI,aAAa,GAAG,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE;oBAC5E,IAAI,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,WAAW,WAAW,qBAAqB,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC,CAAA;iBAC1J;aACD;YAAC,OAAO,CAAC,EAAE;gBACX,IAAI,MAAM,CAAC,mBAAmB,CAAC,EAAE;oBAChC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,2DAA4B,EAAG,CAAW,CAAC,OAAO,CAAC,CAAA;iBACrF;qBAAM;oBACN,MAAM,IAAI,2DAA4B,CAAE,CAAW,CAAC,OAAO,CAAC,CAAA;iBAC5D;aACD;YACD,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACxC,CAAC,CAAA;QACD,OAAO,UAAU,CAAA;IAClB,CAAC,CAAA;AACF,CAAC,CAAA;AAxBY,QAAA,MAAM,UAwBlB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lakutata/core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.46",
|
|
4
4
|
"description": "Lakutata Framework Core",
|
|
5
5
|
"main": "./build/Core.js",
|
|
6
6
|
"types": "./build/Core.d.ts",
|
|
@@ -59,21 +59,21 @@
|
|
|
59
59
|
"inversify": "^6.0.1",
|
|
60
60
|
"is-ssh": "^1.3.3",
|
|
61
61
|
"json-helpers": "^5.2.0",
|
|
62
|
-
"json5": "^2.2.
|
|
62
|
+
"json5": "^2.2.1",
|
|
63
63
|
"lodash.mapvalues": "^4.6.0",
|
|
64
64
|
"memfs": "^3.4.1",
|
|
65
65
|
"merge-deep": "^3.0.3",
|
|
66
|
-
"moment": "^2.29.
|
|
66
|
+
"moment": "^2.29.3",
|
|
67
67
|
"moment-timezone": "^0.5.34",
|
|
68
|
-
"msgpack5": "^
|
|
69
|
-
"needle": "^3.
|
|
68
|
+
"msgpack5": "^6.0.0",
|
|
69
|
+
"needle": "^3.1.0",
|
|
70
70
|
"node-rsa": "^1.1.1",
|
|
71
71
|
"p-timeout": "^4.1.0",
|
|
72
72
|
"pupa": "^2.1.1",
|
|
73
73
|
"random": "^3.0.6",
|
|
74
74
|
"reflect-metadata": "^0.1.13",
|
|
75
75
|
"string-random": "^0.1.3",
|
|
76
|
-
"winston": "^3.
|
|
76
|
+
"winston": "^3.7.2",
|
|
77
77
|
"winston-transport": "^4.5.0",
|
|
78
78
|
"yup": "^0.32.11"
|
|
79
79
|
},
|
|
@@ -54,7 +54,7 @@ export const Return = (returnSchema: AnySchema, options: { strict?: boolean, str
|
|
|
54
54
|
* @constructor
|
|
55
55
|
*/
|
|
56
56
|
export const Accept = (argumentSchemas: AnySchema | AnySchema[], options: { strict?: boolean, stripUnknown?: boolean } = {
|
|
57
|
-
strict:
|
|
57
|
+
strict: false,
|
|
58
58
|
stripUnknown: true
|
|
59
59
|
}) => {
|
|
60
60
|
return (target: Object, propertyKey: string, descriptor: TypedPropertyDescriptor<(...args: any[]) => any | Promise<any>>) => {
|
|
@@ -64,7 +64,7 @@ export const Accept = (argumentSchemas: AnySchema | AnySchema[], options: { stri
|
|
|
64
64
|
const schemas: AnySchema[] = Array.isArray(argumentSchemas) ? argumentSchemas : [argumentSchemas]
|
|
65
65
|
try {
|
|
66
66
|
for (let argumentIndex = 0; argumentIndex < schemas.length; argumentIndex++) {
|
|
67
|
-
schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options)
|
|
67
|
+
args[argumentIndex] = schemas[argumentIndex].label(`Method [${propertyKey}] accept argument[${argumentIndex}]`).validateSync(args[argumentIndex], options)
|
|
68
68
|
}
|
|
69
69
|
} catch (e) {
|
|
70
70
|
if (target['generateException']) {
|
|
@@ -26,9 +26,13 @@ export class Test3 extends Module {
|
|
|
26
26
|
return this.testVal
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
@Accept(Validator.Object({
|
|
29
|
+
@Accept(Validator.Object({
|
|
30
|
+
test: Validator.Bool.notRequired().default(false),
|
|
31
|
+
bbc:Validator.String.notRequired().default('aaacccc')
|
|
32
|
+
}))
|
|
30
33
|
@Return(Validator.Bool.required())
|
|
31
34
|
public ttttt(inp: { test?: any }): any {
|
|
35
|
+
console.log('ttttt@@@@@Accept:',inp)
|
|
32
36
|
return !!inp.test
|
|
33
37
|
}
|
|
34
38
|
|
|
@@ -47,4 +51,4 @@ export class Test3 extends Module {
|
|
|
47
51
|
protected readonly workflows: TWorkflowsConfig
|
|
48
52
|
protected readonly threads: TThreadsConfig = []
|
|
49
53
|
protected readonly processes: TProcessesConfig = []
|
|
50
|
-
}
|
|
54
|
+
}
|