@xxxaz/json-rpc-schema-typing 0.9.9 → 0.9.11

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.
@@ -5,7 +5,10 @@ exports.$Array = $Array;
5
5
  exports.$Tuple = $Tuple;
6
6
  exports.$Object = $Object;
7
7
  function $Optional(item) {
8
- return item;
8
+ return {
9
+ ...item,
10
+ optional: true
11
+ };
9
12
  }
10
13
  function $Array(items) {
11
14
  return {
@@ -17,15 +20,18 @@ function $Tuple(...items) {
17
20
  return {
18
21
  type: 'array',
19
22
  items,
20
- minItems: items.length,
23
+ minItems: items.lastIndexOf((i) => !i.optional) + 1,
21
24
  maxItems: items.length,
22
25
  };
23
26
  }
24
27
  function $Object(properties) {
28
+ const required = Object.entries(properties)
29
+ .filter(([key, value]) => !value?.optional)
30
+ .map(([key]) => key);
25
31
  return {
26
32
  type: 'object',
27
33
  additionalProperties: false,
28
- required: Object.keys(properties),
34
+ required,
29
35
  properties: properties
30
36
  };
31
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":";;AAEA,8BAEC;AAED,wBAKC;AAID,wBAOC;AAQD,0BAOC;AAnCD,SAAgB,SAAS,CAAuB,IAAO;IACnD,OAAO,IAAmB,CAAC;AAC/B,CAAC;AAED,SAAgB,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAID,SAAgB,MAAM,CAAyB,GAAG,KAAQ;IACtD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;QACL,QAAQ,EAAE,KAAK,CAAC,MAA2B;QAC3C,QAAQ,EAAE,KAAK,CAAC,MAA0B;KACpC,CAAC;AACf,CAAC;AAQD,SAAgB,OAAO,CAAyB,UAAa;IACzD,OAAO;QACH,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,KAAK;QAC3B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAsB;QACtD,UAAU,EAAE,UAA2B;KACjC,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":";;AAEA,8BAKC;AAED,wBAKC;AAID,wBAOC;AAQD,0BAUC;AAzCD,SAAgB,SAAS,CAAuB,IAAO;IACnD,OAAO;QACH,GAAG,IAAI;QACP,QAAQ,EAAE,IAAI;KACF,CAAC;AACrB,CAAC;AAED,SAAgB,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAID,SAAgB,MAAM,CAAyB,GAAG,KAAQ;IACtD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;QACL,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAsB;QACpF,QAAQ,EAAE,KAAK,CAAC,MAA0B;KACpC,CAAC;AACf,CAAC;AAQD,SAAgB,OAAO,CAAyB,UAAa;IACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAsB,CAAC;IAC9C,OAAO;QACH,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,KAAK;QAC3B,QAAQ;QACR,UAAU,EAAE,UAA2B;KACjC,CAAC;AACf,CAAC"}
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.JsonRpcServer = void 0;
4
4
  const utility_1 = require("@xxxaz/stream-api-json/utility");
5
5
  const JsonRpcException_js_1 = require("../JsonRpcException.js");
6
- const JsonRpcMethod_js_1 = require("../JsonRpcMethod.js");
7
6
  const JsonRpcValidator_js_1 = require("../JsonRpcValidator.js");
8
7
  class JsonRpcServer {
9
8
  router;
@@ -19,10 +18,14 @@ class JsonRpcServer {
19
18
  }
20
19
  async pickMethodDefine(methodPath) {
21
20
  const picked = await this.router.resolve(methodPath);
22
- if (picked?.[JsonRpcMethod_js_1.JsonRpcMethodDefinition.method] instanceof Function) {
21
+ if (!picked) {
22
+ throw new JsonRpcException_js_1.MethodNotFound(`Definition of method ${methodPath} is not Found.`);
23
+ }
24
+ const methodKey = picked.constructor.method;
25
+ if (picked[methodKey] instanceof Function) {
23
26
  return picked;
24
27
  }
25
- throw new JsonRpcException_js_1.MethodNotFound(`method ${methodPath} is not Found.`);
28
+ throw new JsonRpcException_js_1.MethodNotFound(`Definition ${methodPath} dose not have method.`);
26
29
  }
27
30
  async execute(ctx, request) {
28
31
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,8 @@
1
1
  export function $Optional(item) {
2
- return item;
2
+ return {
3
+ ...item,
4
+ optional: true
5
+ };
3
6
  }
4
7
  export function $Array(items) {
5
8
  return {
@@ -11,15 +14,18 @@ export function $Tuple(...items) {
11
14
  return {
12
15
  type: 'array',
13
16
  items,
14
- minItems: items.length,
17
+ minItems: items.lastIndexOf((i) => !i.optional) + 1,
15
18
  maxItems: items.length,
16
19
  };
17
20
  }
18
21
  export function $Object(properties) {
22
+ const required = Object.entries(properties)
23
+ .filter(([key, value]) => !value?.optional)
24
+ .map(([key]) => key);
19
25
  return {
20
26
  type: 'object',
21
27
  additionalProperties: false,
22
- required: Object.keys(properties),
28
+ required,
23
29
  properties: properties
24
30
  };
25
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAuB,IAAO;IACnD,OAAO,IAAmB,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAID,MAAM,UAAU,MAAM,CAAyB,GAAG,KAAQ;IACtD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;QACL,QAAQ,EAAE,KAAK,CAAC,MAA2B;QAC3C,QAAQ,EAAE,KAAK,CAAC,MAA0B;KACpC,CAAC;AACf,CAAC;AAQD,MAAM,UAAU,OAAO,CAAyB,UAAa;IACzD,OAAO;QACH,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,KAAK;QAC3B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAsB;QACtD,UAAU,EAAE,UAA2B;KACjC,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAuB,IAAO;IACnD,OAAO;QACH,GAAG,IAAI;QACP,QAAQ,EAAE,IAAI;KACF,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAID,MAAM,UAAU,MAAM,CAAyB,GAAG,KAAQ;IACtD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;QACL,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAsB;QACpF,QAAQ,EAAE,KAAK,CAAC,MAA0B;KACpC,CAAC;AACf,CAAC;AAQD,MAAM,UAAU,OAAO,CAAyB,UAAa;IACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAsB,CAAC;IAC9C,OAAO;QACH,IAAI,EAAE,QAAQ;QACd,oBAAoB,EAAE,KAAK;QAC3B,QAAQ;QACR,UAAU,EAAE,UAA2B;KACjC,CAAC;AACf,CAAC"}
@@ -1,6 +1,5 @@
1
1
  import { LazyResolvers } from "@xxxaz/stream-api-json/utility";
2
2
  import { JsonRpcException, MethodNotFound, InternalError, InvalidRequest } from "../JsonRpcException.js";
3
- import { JsonRpcMethodDefinition } from "../JsonRpcMethod.js";
4
3
  import { JsonRpcValidator } from "../JsonRpcValidator.js";
5
4
  export class JsonRpcServer {
6
5
  router;
@@ -16,10 +15,14 @@ export class JsonRpcServer {
16
15
  }
17
16
  async pickMethodDefine(methodPath) {
18
17
  const picked = await this.router.resolve(methodPath);
19
- if (picked?.[JsonRpcMethodDefinition.method] instanceof Function) {
18
+ if (!picked) {
19
+ throw new MethodNotFound(`Definition of method ${methodPath} is not Found.`);
20
+ }
21
+ const methodKey = picked.constructor.method;
22
+ if (picked[methodKey] instanceof Function) {
20
23
  return picked;
21
24
  }
22
- throw new MethodNotFound(`method ${methodPath} is not Found.`);
25
+ throw new MethodNotFound(`Definition ${methodPath} dose not have method.`);
23
26
  }
24
27
  async execute(ctx, request) {
25
28
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xxxaz/json-rpc-schema-typing",
3
- "version": "0.9.9",
3
+ "version": "0.9.11",
4
4
  "description": "",
5
5
  "author": "xxx Inc.",
6
6
  "license": "MIT",