@xxxaz/json-rpc-schema-typing 0.10.30 → 0.11.0

package/cjs/router/index.js

@@ -16,5 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FileSystemRouter.js"), exports);
 __exportStar(require("./JsonRpcRouter.js"), exports);
+__exportStar(require("./OpenRpc.js"), exports);
 __exportStar(require("./StaticRouter.js"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,qDAAmC;AACnC,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,qDAAmC;AACnC,+CAA6B;AAC7B,oDAAkC"}

package/cjs/schemas/Complex.js

@@ -10,14 +10,15 @@ exports.$Or = $Or;
 exports.$Xor = $Xor;
 exports.$Omit = $Omit;
 exports.$Override = $Override;
+// const 型パラメータでリテラル型を保持する (routes 経由の静的型導出で enum が widening しないように)
 function $Enum(...elements) {
     return {
-        enum: elements
+        enum: elements,
     };
 }
 function $EnumKeys(obj) {
     return {
-        enum: Object.keys(obj)
+        enum: Object.keys(obj),
     };
 }
 function $EnumValues(obj) {
@@ -25,7 +26,6 @@ function $EnumValues(obj) {
         enum: Object.values(obj),
     };
 }
-;
 function $Expand(source, expand) {
     return {
         ...source,
@@ -34,20 +34,20 @@ function $Expand(source, expand) {
 }
 function $Optional(item) {
     return {
-        oneOf: [item, false]
+        oneOf: [item, false],
     };
 }
 $Optional.is = (item) => {
     const lits = item?.oneOf ?? item?.anyOf ?? null;
     if (!lits)
         return false;
-    return (lits.some((i) => i === false));
+    return lits.some((i) => i === false);
 };
 $Optional.unwrap = (item) => {
     const optionalList = item?.oneOf ?? item?.anyOf ?? null;
     if (!optionalList)
         return item;
-    const list = optionalList.filter(i => i !== false);
+    const list = optionalList.filter((i) => i !== false);
     if (list.length === 1)
         return list[0];
     return item?.oneOf
@@ -56,17 +56,17 @@ $Optional.unwrap = (item) => {
 };
 function $And(...allOf) {
     return {
-        allOf
+        allOf,
     };
 }
 function $Or(...anyOf) {
     return {
-        anyOf
+        anyOf,
     };
 }
 function $Xor(...oneOf) {
     return {
-        oneOf
+        oneOf,
     };
 }
 function $Omit(schema, keys) {
@@ -84,10 +84,7 @@ function $Override(schema, override) {
         ...schema.properties,
         ...override,
     };
-    const uniq = Array.from(new Set([
-        ...(schema.required ?? []),
-        ...Object.keys(override),
-    ]));
+    const uniq = Array.from(new Set([...(schema.required ?? []), ...Object.keys(override)]));
     const required = uniq.filter((k) => !(k in override && $Optional.is(override[k])));
     return {
         type: 'object',

package/cjs/schemas/Complex.js.map

@@ -1 +1 @@
-{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"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"}

package/cjs/schemas/Primitive.js.map

@@ -1 +1 @@
-{"version":3,"file":"Primitive.js","sourceRoot":"","sources":["../../src/schemas/Primitive.ts"],"names":[],"mappings":";;;AACa,QAAA,KAAK,GAAG;IACjB,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,IAAI;CACR,CAAC;AAEE,QAAA,QAAQ,GAAG;IACpB,IAAI,EAAE,SAAS;CACT,CAAC;AAEE,QAAA,OAAO,GAAG;IACnB,IAAI,EAAE,QAAQ;CACR,CAAC;AAEE,QAAA,QAAQ,GAAG;IACpB,IAAI,EAAE,SAAS;CACT,CAAC;AAEE,QAAA,OAAO,GAAG;IACnB,IAAI,EAAE,QAAQ;CACR,CAAC"}
+{"version":3,"file":"Primitive.js","sourceRoot":"","sources":["../../src/schemas/Primitive.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAAG;IACjB,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,IAAI;CACR,CAAC;AAEE,QAAA,QAAQ,GAAG;IACpB,IAAI,EAAE,SAAS;CACT,CAAC;AAEE,QAAA,OAAO,GAAG;IACnB,IAAI,EAAE,QAAQ;CACR,CAAC;AAEE,QAAA,QAAQ,GAAG;IACpB,IAAI,EAAE,SAAS;CACT,CAAC;AAEE,QAAA,OAAO,GAAG;IACnB,IAAI,EAAE,QAAQ;CACR,CAAC"}

package/cjs/schemas/Structure.js

@@ -7,7 +7,7 @@ const Complex_js_1 = require("./Complex.js");
 function $Array(items) {
     return {
         type: 'array',
-        items
+        items,
     };
 }
 function $Tuple(...items) {
@@ -16,8 +16,9 @@ function $Tuple(...items) {
     const optionalNumber = [...items].reverse().findIndex((i) => Complex_js_1.$Optional.is(i)) + 1;
     return {
         type: 'array',
-        items: items.map(item => Complex_js_1.$Optional.unwrap(item)),
-        minItems: items.length - optionalNumber,
+        items: items.map((item) => Complex_js_1.$Optional.unwrap(item)),
+        minItems: (items.length -
+            optionalNumber),
         maxItems: items.length,
         additionalItems: false,
     };
@@ -30,7 +31,7 @@ function $Object(properties) {
         type: 'object',
         additionalProperties: false,
         required,
-        properties: properties
+        properties: properties,
     };
 }
 //# sourceMappingURL=Structure.js.map

package/cjs/schemas/Structure.js.map

@@ -1 +1 @@
-{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":";;AAGA,wBAKC;AAOD,wBAWC;AAED,0BAUC;AArCD,6CAAyC;AAEzC,SAAgB,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAOD,SAAgB,MAAM,CAAkC,GAAG,KAAQ;IAC/D,wCAAwC;IACxC,uHAAuH;IACvH,MAAM,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,sBAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9F,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAa;QAC7D,QAAQ,EAAE,KAAK,CAAC,MAAM,GAAG,cAA8C;QACvE,QAAQ,EAAE,KAAK,CAAC,MAA0B;QAC1C,eAAe,EAAE,KAAK;KAChB,CAAC;AACf,CAAC;AAED,SAAgB,OAAO,CAAuC,UAAa;IACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,sBAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;SAC9C,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,UAAe;KACrB,CAAC;AACf,CAAC"}
+{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":";;AAQA,wBAKC;AASD,wBAaC;AAED,0BAUC;AAzCD,6CAAyC;AAEzC,SAAgB,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AASD,SAAgB,MAAM,CAAkC,GAAG,KAAQ;IAC/D,wCAAwC;IACxC,uHAAuH;IACvH,MAAM,cAAc,GAChB,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,sBAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC3E,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAa;QAC/D,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM;YACnB,cAAc,CAAiC;QACnD,QAAQ,EAAE,KAAK,CAAC,MAA0B;QAC1C,eAAe,EAAE,KAAK;KAChB,CAAC;AACf,CAAC;AAED,SAAgB,OAAO,CAAuC,UAAa;IACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,sBAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;SAC9C,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,UAAe;KACrB,CAAC;AACf,CAAC"}

package/cjs/schemas/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Primitive.js"), exports);
 __exportStar(require("./Complex.js"), exports);
+__exportStar(require("./Primitive.js"), exports);
 __exportStar(require("./Structure.js"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/schemas/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schemas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,+CAA6B;AAC7B,iDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schemas/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,iDAA+B;AAC/B,iDAA+B"}

package/cjs/server/JsonRpcHttpReceiver.js

@@ -8,9 +8,9 @@ exports.toNodeReadable = toNodeReadable;
 const http_1 = __importDefault(require("http"));
 const stream_1 = __importDefault(require("stream"));
 const stream_api_json_1 = require("@xxxaz/stream-api-json");
-const JsonRpcServer_js_1 = require("./JsonRpcServer.js");
 const JsonRpcException_js_1 = require("../JsonRpcException.js");
 const utility_js_1 = require("../utility.js");
+const JsonRpcServer_js_1 = require("./JsonRpcServer.js");
 class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
     constructor(router, options = {}) {
         super(router);
@@ -30,7 +30,7 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
                 request.on('error', (error) => controller.error(error));
                 request.on('data', (chunk) => controller.enqueue(chunk));
                 request.on('end', () => controller.close());
-            }
+            },
         });
         return this.#requestConverter?.(stream) ?? stream;
     }
@@ -60,7 +60,10 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
         catch (err) {
             console.error(err);
             response.writeHead(500);
-            response.end(JSON.stringify({ jsonrpc: "2.0", error: new JsonRpcException_js_1.InternalError(String(err)).serialize() }));
+            response.end(JSON.stringify({
+                jsonrpc: '2.0',
+                error: new JsonRpcException_js_1.InternalError(String(err)).serialize(),
+            }));
         }
     }
     async #invoke(context, req) {
@@ -88,13 +91,15 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
                 const result = await this.call(context, await req.all());
                 return { status: 200, stream: (0, utility_js_1.stringifyStream)(result) };
             }
-            throw new JsonRpcException_js_1.InvalidRequest('Invalid Request', { request: req });
+            throw new JsonRpcException_js_1.InvalidRequest('Invalid Request', {
+                request: req,
+            });
         }
         catch (err) {
             if (err instanceof JsonRpcException_js_1.JsonRpcException) {
                 console.error(err);
                 const status = err instanceof JsonRpcException_js_1.InternalError ? 500 : 400;
-                const result = { jsonrpc: "2.0", error: err.serialize() };
+                const result = { jsonrpc: '2.0', error: err.serialize() };
                 return { status, stream: (0, utility_js_1.stringifyStream)(result) };
             }
             throw err;
@@ -118,7 +123,7 @@ function toNodeReadable(source) {
             else {
                 this.push(value);
             }
-        }
+        },
     });
 }
 //# sourceMappingURL=JsonRpcHttpReceiver.js.map

package/cjs/server/JsonRpcHttpReceiver.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcHttpReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcHttpReceiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonRpcHttpReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcHttpReceiver.ts"],"names":[],"mappings":"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"}

package/cjs/server/JsonRpcMessagePortReceiver.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonRpcMessagePortReceiver = void 0;
-const JsonRpcServer_js_1 = require("./JsonRpcServer.js");
 const utility_js_1 = require("../utility.js");
+const JsonRpcServer_js_1 = require("./JsonRpcServer.js");
 class JsonRpcMessagePortReceiver extends JsonRpcServer_js_1.JsonRpcServer {
     #input;
     #validator;
@@ -15,7 +15,7 @@ class JsonRpcMessagePortReceiver extends JsonRpcServer_js_1.JsonRpcServer {
         if (event.source && event.source !== output)
             return;
         const { data } = event;
-        const request = (data instanceof Array && data.some(utility_js_1.isRpcRequest))
+        const request = data instanceof Array && data.some(utility_js_1.isRpcRequest)
             ? data
             : (0, utility_js_1.isRpcRequest)(data)
                 ? data
@@ -29,7 +29,7 @@ class JsonRpcMessagePortReceiver extends JsonRpcServer_js_1.JsonRpcServer {
             return;
         }
         const response = request instanceof Array
-            ? await Promise.all(request.map(req => this.call(context, req)))
+            ? await Promise.all(request.map((req) => this.call(context, req)))
             : await this.call(context, request);
         if (event.source instanceof Window) {
             event.source.postMessage(response, event.origin);
@@ -38,7 +38,6 @@ class JsonRpcMessagePortReceiver extends JsonRpcServer_js_1.JsonRpcServer {
             (event.source ?? output).postMessage(response);
         }
     }
-    ;
     #listeners = new WeakMap();
     serve(context, output) {
         if (this.#listeners.has(output))

package/cjs/server/JsonRpcMessagePortReceiver.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcMessagePortReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcMessagePortReceiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonRpcMessagePortReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcMessagePortReceiver.ts"],"names":[],"mappings":"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"}

package/cjs/server/JsonRpcServer.js

@@ -17,11 +17,12 @@ class JsonRpcServer {
             throw new JsonRpcException_js_1.InvalidRequest('method is required.');
     }
     async pickMethodDefine(methodPath) {
-        const picked = await this.router.resolve(methodPath);
+        const picked = (await this.router.resolve(methodPath));
         if (!picked) {
             throw new JsonRpcException_js_1.MethodNotFound(`Definition of method ${methodPath} is not Found.`);
         }
-        const methodKey = picked.constructor.method;
+        const methodKey = picked.constructor
+            .method;
         if (picked[methodKey] instanceof Function) {
             return picked;
         }
@@ -33,8 +34,15 @@ class JsonRpcServer {
             const { method, params } = request;
             const picked = await this.pickMethodDefine(method);
             const validator = new JsonRpcValidator_js_1.JsonRpcValidator(picked);
-            validator.validateParams(params);
-            const result = await picked.$apply(ctx, params);
+            // スキーマレス client は単一オブジェクト引数を object params として送るため、
+            // by-position (tuple) スキーマのメソッドでは単一の位置引数として解釈する
+            const normalized = picked.$params?.type === 'array' &&
+                params &&
+                !Array.isArray(params)
+                ? [params]
+                : params;
+            validator.validateParams(normalized);
+            const result = await picked.$apply(ctx, normalized);
             try {
                 validator.validateReturn(result);
             }
@@ -64,7 +72,6 @@ class JsonRpcServer {
             return { jsonrpc, id, error };
         }
     }
-    ;
     async *batch(ctx, requests) {
         const promises = {};
         let loading = new utility_1.LazyResolvers();
@@ -96,7 +103,6 @@ class JsonRpcServer {
             delete promises[response.id];
         }
     }
-    ;
 }
 exports.JsonRpcServer = JsonRpcServer;
 //# sourceMappingURL=JsonRpcServer.js.map

package/cjs/server/JsonRpcServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}

package/cjs/server/JsonRpcWebSocketReceiver.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonRpcWebSocketReceiver = void 0;
-const JsonRpcServer_js_1 = require("./JsonRpcServer.js");
 const utility_js_1 = require("../utility.js");
 const WebSocketWrapper_js_1 = require("../WebSocketWrapper.js");
+const JsonRpcServer_js_1 = require("./JsonRpcServer.js");
 class JsonRpcWebSocketReceiver extends JsonRpcServer_js_1.JsonRpcServer {
     async #onMessage(context, socket, data) {
-        const request = (data instanceof Array && data.some(utility_js_1.isRpcRequest))
+        const request = data instanceof Array && data.some(utility_js_1.isRpcRequest)
             ? data
             : (0, utility_js_1.isRpcRequest)(data)
                 ? data
@@ -16,11 +16,10 @@ class JsonRpcWebSocketReceiver extends JsonRpcServer_js_1.JsonRpcServer {
             return;
         }
         const response = request instanceof Array
-            ? await Promise.all(request.map(req => this.call(context, req)))
+            ? await Promise.all(request.map((req) => this.call(context, req)))
             : await this.call(context, request);
         socket.send(response);
     }
-    ;
     #sockets = new Map();
     serve(context, socket) {
         if (this.#sockets.has(socket))

package/cjs/server/JsonRpcWebSocketReceiver.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcWebSocketReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcWebSocketReceiver.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AAEnD,8CAA6C;AAC7C,gEAA4F;AAG5F,MAAa,wBAA8B,SAAQ,gCAAkB;IACjE,KAAK,CAAC,UAAU,CAAC,OAAY,EAAE,MAAwB,EAAE,IAAsB;QAC3E,MAAM,OAAO,GACP,CAAC,IAAI,YAAY,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,yBAAY,CAAC,CAAC;YAChD,CAAC,CAAC,IAAwB;YAC9B,CAAC,CAAC,IAAA,yBAAY,EAAC,IAAI,CAAC;gBAChB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,IAAI,CAAC;QAEf,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;YACxD,OAAO;QACX,CAAC;QAED,MAAM,QAAQ,GACR,OAAO,YAAY,KAAK;YACtB,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAChE,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE5C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAAA,CAAC;IAEO,QAAQ,GAAG,IAAI,GAAG,EAAuC,CAAC;IACnE,KAAK,CAAC,OAAY,EAAE,MAAyB;QACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,OAAO;QACtC,MAAM,QAAQ,GAAG,CAAC,IAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACrF,MAAM,OAAO,GAAG,IAAA,mCAAa,EACzB,MAAM,EACN,QAAQ,EACR,CAAC,KAAK,EAAE,EAAE;YACN,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CACJ,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,CAAC,MAAyB;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,EAAE,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACJ;AA1CD,4DA0CC"}
+{"version":3,"file":"JsonRpcWebSocketReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcWebSocketReceiver.ts"],"names":[],"mappings":";;;AAEA,8CAA6C;AAC7C,gEAIgC;AAChC,yDAAmD;AAEnD,MAAa,wBAA8B,SAAQ,gCAAkB;IACjE,KAAK,CAAC,UAAU,CACZ,OAAY,EACZ,MAAwB,EACxB,IAAsB;QAEtB,MAAM,OAAO,GACT,IAAI,YAAY,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,yBAAY,CAAC;YAC5C,CAAC,CAAE,IAAyB;YAC5B,CAAC,CAAC,IAAA,yBAAY,EAAC,IAAI,CAAC;gBAClB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,IAAI,CAAC;QAEjB,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;YACxD,OAAO;QACX,CAAC;QAED,MAAM,QAAQ,GACV,OAAO,YAAY,KAAK;YACpB,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CACb,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAChD;YACH,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE5C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAEQ,QAAQ,GAAG,IAAI,GAAG,EAAuC,CAAC;IACnE,KAAK,CAAC,OAAY,EAAE,MAAyB;QACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,OAAO;QACtC,MAAM,QAAQ,GAAG,CAAC,IAAsB,EAAE,EAAE,CACxC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAA,mCAAa,EAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YACtD,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,CAAC,MAAyB;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,EAAE,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACJ;AA7CD,4DA6CC"}

package/cjs/server/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./JsonRpcServer.js"), exports);
 __exportStar(require("./JsonRpcHttpReceiver.js"), exports);
+__exportStar(require("./JsonRpcServer.js"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,2DAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,qDAAmC"}

package/cjs/utility.js

@@ -11,14 +11,14 @@ function toStream(src) {
         start(controller) {
             controller.enqueue(src);
             controller.close();
-        }
+        },
     });
 }
 function stringifyStream(json) {
     return toStream(JSON.stringify(json));
 }
 function emptyStrem() {
-    return new ReadableStream({ start: c => c.close() });
+    return new ReadableStream({ start: (c) => c.close() });
 }
 async function readStreamAll(stream) {
     const reader = stream.getReader();
@@ -33,19 +33,13 @@ async function readStreamAll(stream) {
     return new Blob(result);
 }
 function isRpcRequest(data) {
-    return (data instanceof Object
-        &&
-            data.jsonrpc === '2.0'
-        &&
-            typeof data.method === 'string');
+    return (data instanceof Object &&
+        data.jsonrpc === '2.0' &&
+        typeof data.method === 'string');
 }
 function isRpcResponse(data) {
-    return (data instanceof Object
-        &&
-            data.jsonrpc === '2.0'
-        &&
-            ('id' in data
-                ||
-                    'error' in data));
+    return (data instanceof Object &&
+        data.jsonrpc === '2.0' &&
+        ('id' in data || 'error' in data));
 }
 //# sourceMappingURL=utility.js.map

package/cjs/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":";;AAGA,4BAOC;AAED,0CAEC;AAED,gCAEC;AAED,sCASC;AAED,oCAQC;AAED,sCAYC;AAlDD,SAAgB,QAAQ,CAAI,GAAM;IAC9B,OAAO,IAAI,cAAc,CAAI;QACzB,KAAK,CAAC,UAAU;YACZ,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxB,UAAU,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,SAAgB,eAAe,CAAC,IAAsB;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAgB,UAAU;IACtB,OAAO,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACzD,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,MAA0C;IAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,EAA4B,CAAC;IAC5C,OAAO,IAAI,EAAE,CAAC;QACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,IAAI;YAAE,MAAM;IACpB,CAAC;IACD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,YAAY,CAAC,IAAS;IAClC,OAAO,CACH,IAAI,YAAY,MAAM;;YAEtB,IAAI,CAAC,OAAO,KAAK,KAAK;;YAEtB,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,CAClC,CAAC;AACN,CAAC;AAED,SAAgB,aAAa,CAAC,IAAS;IACnC,OAAO,CACH,IAAI,YAAY,MAAM;;YAEtB,IAAI,CAAC,OAAO,KAAK,KAAK;;YAEtB,CACI,IAAI,IAAI,IAAI;;oBAEZ,OAAO,IAAI,IAAI,CAClB,CACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":";;AAGA,4BAOC;AAED,0CAEC;AAED,gCAEC;AAED,sCAWC;AAED,oCAMC;AAED,sCAMC;AA5CD,SAAgB,QAAQ,CAAI,GAAM;IAC9B,OAAO,IAAI,cAAc,CAAI;QACzB,KAAK,CAAC,UAAU;YACZ,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxB,UAAU,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,SAAgB,eAAe,CAAC,IAAsB;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAgB,UAAU;IACtB,OAAO,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC3D,CAAC;AAEM,KAAK,UAAU,aAAa,CAC/B,MAA4C;IAE5C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,EAA8B,CAAC;IAC9C,OAAO,IAAI,EAAE,CAAC;QACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,IAAI;YAAE,MAAM;IACpB,CAAC;IACD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,YAAY,CAAC,IAAS;IAClC,OAAO,CACH,IAAI,YAAY,MAAM;QACtB,IAAI,CAAC,OAAO,KAAK,KAAK;QACtB,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,CAClC,CAAC;AACN,CAAC;AAED,SAAgB,aAAa,CAAC,IAAS;IACnC,OAAO,CACH,IAAI,YAAY,MAAM;QACtB,IAAI,CAAC,OAAO,KAAK,KAAK;QACtB,CAAC,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,CAAC,CACpC,CAAC;AACN,CAAC"}

package/esm/JsonRpcException.js

@@ -6,14 +6,14 @@ export class JsonRpcException extends Error {
             if (!JsonRpcException.isPrototypeOf(cls))
                 return;
             const ex = cls;
-            if (!this.#defined.has(ex) && ex.code) {
-                this.#defined.set(ex, name);
+            if (!JsonRpcException.#defined.has(ex) && ex.code) {
+                JsonRpcException.#defined.set(ex, name);
             }
         });
     }
     static deserialize(error) {
         const { code, message, data } = error;
-        for (const cls of this.#defined.keys()) {
+        for (const cls of JsonRpcException.#defined.keys()) {
             if (cls.code !== code)
                 continue;
             return new cls(message, data);
@@ -28,8 +28,7 @@ export class JsonRpcException extends Error {
     }
     data;
     get name() {
-        return JsonRpcException.#defined.get(this.constructor)
-            ?? this.constructor.name;
+        return (JsonRpcException.#defined.get(this.constructor) ?? this.constructor.name);
     }
     get code() {
         return this.constructor.code;

package/esm/JsonRpcException.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcException.js","sourceRoot":"","sources":["../src/JsonRpcException.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonRpcException.js","sourceRoot":"","sources":["../src/JsonRpcException.ts"],"names":[],"mappings":"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"}

package/esm/JsonRpcMethod.js

@@ -5,14 +5,23 @@ export class JsonRpcMethodDefinition {
     $params;
     $return;
     $contextClass;
+    $meta;
     static method = methodKey;
     [methodKey];
-    constructor(method, $params, $return, $contextClass) {
+    constructor(method, $params, $return, $contextClass, $meta) {
         this.$params = $params;
         this.$return = $return;
         this.$contextClass = $contextClass;
+        this.$meta = $meta;
         this[methodKey] = method;
     }
+    // instanceof はモジュール実体が二重ロードされた際に一致しないため、duck-typing でも判定する
+    static isDefinition(obj) {
+        if (obj instanceof JsonRpcMethodDefinition)
+            return true;
+        const key = obj?.constructor?.method;
+        return typeof key === 'symbol' && obj[key] instanceof Function;
+    }
     $apply(ctx, params) {
         if (this.$contextClass && !(ctx instanceof this.$contextClass)) {
             const passedCtxType = ctx?.constructor?.name ?? typeof ctx;
@@ -30,28 +39,33 @@ class DefinitionBuilder {
     $contextClass;
     $params;
     $return;
-    constructor($contextClass, $params, $return) {
+    $meta;
+    constructor($contextClass, $params, $return, $meta) {
         this.$contextClass = $contextClass;
         this.$params = $params;
         this.$return = $return;
+        this.$meta = $meta;
     }
     define(method) {
-        return new JsonRpcMethodDefinition(method, this.$params, this.$return, this.$contextClass);
+        return new JsonRpcMethodDefinition(method, this.$params, this.$return, this.$contextClass, this.$meta);
     }
     contextClass(contextClass) {
-        return new DefinitionBuilder(contextClass, this.$params, this.$return);
+        return new DefinitionBuilder(contextClass, this.$params, this.$return, this.$meta);
+    }
+    meta(meta) {
+        return new DefinitionBuilder(this.$contextClass, this.$params, this.$return, meta);
     }
     params(params) {
-        return new DefinitionBuilder(this.$contextClass, params, this.$return);
+        return new DefinitionBuilder(this.$contextClass, params, this.$return, this.$meta);
     }
     paramsByName(params) {
-        return new DefinitionBuilder(this.$contextClass, $Object(params), this.$return);
+        return new DefinitionBuilder(this.$contextClass, $Object(params), this.$return, this.$meta);
     }
     paramsByPosition(...params) {
-        return new DefinitionBuilder(this.$contextClass, $Tuple(...params), this.$return);
+        return new DefinitionBuilder(this.$contextClass, $Tuple(...params), this.$return, this.$meta);
     }
     return(rtn) {
-        return new DefinitionBuilder(this.$contextClass, this.$params, rtn);
+        return new DefinitionBuilder(this.$contextClass, this.$params, rtn, this.$meta);
     }
     /** @deprecated paramsByPosition を使用してください */
     paramsSchema(...params) {

package/esm/JsonRpcMethod.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcMethod.js","sourceRoot":"","sources":["../src/JsonRpcMethod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonRpcMethod.js","sourceRoot":"","sources":["../src/JsonRpcMethod.ts"],"names":[],"mappings":"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"}