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

package/esm/JsonRpcValidator.js

@@ -6,29 +6,45 @@ function validate(data, schema) {
     const valid = validate(data);
     return {
         valid,
-        errors: validate.errors ?? []
+        errors: [...serializeErrors(validate.errors)]
     };
 }
+function* serializeErrors(error) {
+    if (!error)
+        return;
+    for (const { propertyName, message, schemaPath, data, keyword, instancePath, params } of error) {
+        const err = {};
+        if (propertyName)
+            err.propertyName = propertyName;
+        if (message)
+            err.message = message;
+        if (data)
+            err.data = data;
+        if (keyword)
+            err.keyword = keyword;
+        if (instancePath)
+            err.instancePath = instancePath;
+        if (schemaPath)
+            err.schemaPath = schemaPath;
+        if (Object.keys(err).length > 0) {
+            yield err;
+        }
+        if (params.errors) {
+            yield* serializeErrors(params.errors);
+        }
+    }
+}
 export class JsonRpcValidator {
     schema;
     constructor(schema) {
         this.schema = schema;
     }
-    get #params() {
-        return this.schema.$params;
-    }
-    get #return() {
-        return this.schema.$return;
-    }
     validateParams(params) {
-        const shorten = this.#params.slice(params.length).every(({ optional }) => optional);
-        const schema = shorten ? this.#params.slice(0, params.length) : this.#params;
-        const errors = schema
-            .map((schema, index) => validate(params[index], schema))
-            .map(({ errors }, argument) => errors.map(({ propertyName, message }) => ({ argument, property: propertyName ?? '', message: message ?? '' })))
-            .flat();
+        if (!this.schema.$params)
+            return params === undefined;
+        const { errors } = validate(params, this.schema.$params);
         if (errors.length > 0) {
-            const message = errors.map(({ argument, property, message }) => `args[${argument}].${property}: ${message}`).join('\n');
+            const message = errors.map(({ instancePath, message }) => `params${instancePath ?? ''}: ${message}`).join('\n');
             throw new InvalidParams(message, errors);
         }
         return true;
@@ -36,9 +52,9 @@ export class JsonRpcValidator {
     validateReturn(result) {
         if (!this.schema.$return)
             return result === undefined;
-        const errors = validate(result, this.#return).errors.map(({ propertyName, message }) => ({ property: propertyName ?? '', message: message ?? '' }));
+        const { errors } = validate(result, this.schema.$return);
         if (errors.length > 0) {
-            const message = errors.map(({ property, message }) => `return.${property}: ${message}`).join('\n');
+            const message = errors.map(({ instancePath, message }) => `return.${instancePath ?? ''}: ${message}`).join('\n');
             throw new InvalidReturn(message, errors);
         }
         return true;

package/esm/JsonRpcValidator.js.map

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

package/esm/WebSocketWrapper.js

@@ -25,8 +25,11 @@ export class NodeWebSocketWrapper {
     send(data) {
         this.socket.send(JSON.stringify(data));
     }
-    close() {
+    detach() {
         this.socket.off('message', this.#onMessage);
+    }
+    close() {
+        this.detach();
         this.socket.close();
     }
     #onMessage = async (data) => {
@@ -61,13 +64,31 @@ export class BrowserWebSocketWrapper {
         return this.socket.readyState;
     }
     #onMessage = async (ev) => {
-        this.listener(ev.data);
+        const parsed = await this.#parseMessage(ev.data);
+        this.listener(parsed);
     };
+    async #parseMessage(data) {
+        if (data instanceof ArrayBuffer) {
+            return JSON.parse(await new Blob([data]).text());
+        }
+        try {
+            if (typeof data === 'string') {
+                return JSON.parse(data);
+            }
+        }
+        catch (e) {
+            console.error('failed to parse message', data, e);
+        }
+        return data;
+    }
     send(data) {
         this.socket.send(JSON.stringify(data));
     }
-    close() {
+    detach() {
         this.socket.removeEventListener('message', this.#onMessage);
+    }
+    close() {
+        this.detach();
         this.socket.close();
     }
 }

package/esm/WebSocketWrapper.js.map

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

package/esm/client/JsonRpcMessagePortClient.js

@@ -70,7 +70,7 @@ export class JsonRpcMessagePortClient extends JsonRpcClient {
     async #receive(event) {
         if (event.source && event.source !== this.#output)
             return;
-        const { data } = event;
+        const data = JSON.parse(event.data);
         if (!isRpcResponse(data)) {
             console.debug('message is not JsonRpcResponse', data);
             return;

package/esm/client/JsonRpcMessagePortClient.js.map

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

package/esm/client/JsonRpcWebSocketClient.js

@@ -49,8 +49,12 @@ export class JsonRpcWebSocketClient extends JsonRpcClient {
         const promises = new Map(entries);
         return new ReadableStream({
             async start(controller) {
+                const initialCount = promises.size;
                 controller.enqueue('[');
                 while (promises.size > 0) {
+                    if (promises.size < initialCount) {
+                        controller.enqueue(',');
+                    }
                     const response = await Promise.race(promises.values());
                     controller.enqueue(JSON.stringify(response));
                     promises.delete(response.id);

package/esm/client/JsonRpcWebSocketClient.js.map

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

package/esm/router/FileSystemRouter.js

@@ -11,9 +11,10 @@ export class FileSystemRouter extends JsonRpcRouter {
         if (!stat.isDirectory())
             throw new Error(`Not a directory: ${rootDir}`);
     }
-    // instanceof だとモジュールが重複した際に問題が派生する
+    // instanceof JsonRpcMethodDefinition だと参照先モジュールが複数存在した際に一致しなくなる
     static #isDefinition(obj) {
-        return obj && obj.$params instanceof Array;
+        const key = obj?.constructor?.method;
+        return typeof key === 'symbol' && obj[key] instanceof Function;
     }
     #cache = {};
     async resolveChild(methodPath) {
@@ -37,7 +38,6 @@ export class FileSystemRouter extends JsonRpcRouter {
             if (FileSystemRouter.#isDefinition(module.default)) {
                 return this.#cache[methodPath] = module.default;
             }
-            console.warn(`Ignoring routing without default export as JsonRpcMethodDefinition: ${path}`);
         }
         catch (e) {
             console.error(`Invalid routing: ${path}`, e);

package/esm/router/FileSystemRouter.js.map

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

package/esm/schemas/Complex.js

@@ -20,6 +20,14 @@ export function $Expand(source, expand) {
         ...expand,
     };
 }
+export function $Optional(item) {
+    return {
+        oneOf: [item, false]
+    };
+}
+$Optional.is = (item) => {
+    return Boolean((item?.oneOf ?? item?.anyOf ?? []).some(i => i === false));
+};
 export function $And(...allOf) {
     return {
         allOf

package/esm/schemas/Complex.js.map

@@ -1 +1 @@
-{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,KAAK,CAA2C,GAAG,QAAW;IAC1E,OAAO;QACH,IAAI,EAAE,QAAQ;KACR,CAAC;AACf,CAAC;AAED,MAAM,UAAU,SAAS,CAAmB,GAAM;IAC9C,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAgB;KAC/B,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAyC,GAAM;IACtE,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAiB;KAClC,CAAC;AACf,CAAC;AAAA,CAAC;AAEF,MAAM,UAAU,OAAO,CAAyD,MAAW,EAAE,MAAU;IACnG,OAAO;QACH,GAAG,MAAM;QACT,GAAG,MAAM;KACH,CAAC;AACf,CAAC;AAED,MAAM,UAAU,IAAI,CAA+B,GAAG,KAAc;IAChE,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,GAAG,CAA+B,GAAG,KAAc;IAC/D,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,IAAI,CAA+B,GAAG,KAAc;IAChE,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC"}
+{"version":3,"file":"Complex.js","sourceRoot":"","sources":["../../src/schemas/Complex.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,KAAK,CAA2C,GAAG,QAAW;IAC1E,OAAO;QACH,IAAI,EAAE,QAAQ;KACR,CAAC;AACf,CAAC;AAED,MAAM,UAAU,SAAS,CAAmB,GAAM;IAC9C,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAgB;KAC/B,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAyC,GAAM;IACtE,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAiB;KAClC,CAAC;AACf,CAAC;AAAA,CAAC;AAEF,MAAM,UAAU,OAAO,CAAyD,MAAW,EAAE,MAAU;IACnG,OAAO;QACH,GAAG,MAAM;QACT,GAAG,MAAM;KACH,CAAC;AACf,CAAC;AAED,MAAM,UAAU,SAAS,CAAuB,IAAO;IACnD,OAAO;QACH,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;KACd,CAAC;AACf,CAAC;AACD,SAAS,CAAC,EAAE,GAAG,CAAC,IAA0B,EAAW,EAAE;IACnD,OAAO,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,UAAU,IAAI,CAA+B,GAAG,KAAc;IAChE,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,GAAG,CAA+B,GAAG,KAAc;IAC/D,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,IAAI,CAA+B,GAAG,KAAc;IAChE,OAAO;QACH,KAAK;KACC,CAAC;AACf,CAAC"}

package/esm/schemas/Structure.js

@@ -1,9 +1,4 @@
-export function $Optional(item) {
-    return {
-        ...item,
-        optional: true
-    };
-}
+import { $Optional } from "./Complex.js";
 export function $Array(items) {
     return {
         type: 'array',
@@ -13,14 +8,14 @@ export function $Array(items) {
 export function $Tuple(...items) {
     return {
         type: 'array',
-        items,
-        minItems: items.lastIndexOf((i) => !i.optional) + 1,
+        items: items,
+        minItems: items.lastIndexOf((i) => !$Optional.is(i)) + 1,
         maxItems: items.length,
     };
 }
 export function $Object(properties) {
     const required = Object.entries(properties)
-        .filter(([key, value]) => !value?.optional)
+        .filter(([key, value]) => !$Optional.is(value))
         .map(([key]) => key);
     return {
         type: 'object',

package/esm/schemas/Structure.js.map

@@ -1 +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"}
+{"version":3,"file":"Structure.js","sourceRoot":"","sources":["../../src/schemas/Structure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,UAAU,MAAM,CAAuB,KAAQ;IACjD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK;KACC,CAAC;AACf,CAAC;AAOD,MAAM,UAAU,MAAM,CAAyB,GAAG,KAAQ;IACtD,OAAO;QACH,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAU;QACjB,QAAQ,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAiC;QACpG,QAAQ,EAAE,KAAK,CAAC,MAA0B;KACpC,CAAC;AACf,CAAC;AAKD,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,SAAS,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/esm/server/JsonRpcWebSocketReceiver.js

@@ -15,7 +15,7 @@ export class JsonRpcWebSocketReceiver extends JsonRpcServer {
         const response = request instanceof Array
             ? await Promise.all(request.map(req => this.call(context, req)))
             : await this.call(context, request);
-        socket.send(JSON.stringify(response));
+        socket.send(response);
     }
     ;
     #sockets = new Map();

package/esm/server/JsonRpcWebSocketReceiver.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonRpcWebSocketReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcWebSocketReceiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAuC,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG5F,MAAM,OAAO,wBAA8B,SAAQ,aAAkB;IACjE,KAAK,CAAC,UAAU,CAAC,OAAY,EAAE,MAAwB,EAAE,IAAsB;QAC3E,MAAM,OAAO,GACP,CAAC,IAAI,YAAY,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChD,CAAC,CAAC,IAAwB;YAC9B,CAAC,CAAC,YAAY,CAAC,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,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1C,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,aAAa,CACzB,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"}
+{"version":3,"file":"JsonRpcWebSocketReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcWebSocketReceiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAuC,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG5F,MAAM,OAAO,wBAA8B,SAAQ,aAAkB;IACjE,KAAK,CAAC,UAAU,CAAC,OAAY,EAAE,MAAwB,EAAE,IAAsB;QAC3E,MAAM,OAAO,GACP,CAAC,IAAI,YAAY,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChD,CAAC,CAAC,IAAwB;YAC9B,CAAC,CAAC,YAAY,CAAC,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,aAAa,CACzB,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"}

package/esm/utility.js

@@ -36,7 +36,7 @@ export function isRpcResponse(data) {
         &&
             data.jsonrpc === '2.0'
         &&
-            ('result' in data
+            ('id' in data
                 ||
                     'error' in data));
 }

package/esm/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,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,MAAM,UAAU,eAAe,CAAC,IAAsB;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,UAAU;IACtB,OAAO,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAyC;IACzE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,EAA2B,CAAC;IAC3C,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,MAAM,UAAU,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,MAAM,UAAU,aAAa,CAAC,IAAS;IACnC,OAAO,CACH,IAAI,YAAY,MAAM;;YAEtB,IAAI,CAAC,OAAO,KAAK,KAAK;;YAEtB,CACI,QAAQ,IAAI,IAAI;;oBAEhB,OAAO,IAAI,IAAI,CAClB,CACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,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,MAAM,UAAU,eAAe,CAAC,IAAsB;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,UAAU;IACtB,OAAO,IAAI,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAyC;IACzE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,EAA2B,CAAC;IAC3C,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,MAAM,UAAU,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,MAAM,UAAU,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xxxaz/json-rpc-schema-typing",
-    "version": "0.9.11",
+    "version": "0.10.0",
     "description": "",
     "author": "xxx Inc.",
     "license": "MIT",
@@ -51,18 +51,19 @@
     },
     "dependencies": {
         "@types/json-schema": "^7.0.15",
-        "@types/ws": "^8.5.13",
-        "@xxxaz/stream-api-json": "^1.0.1",
+        "@types/node": "^22.0.0",
+        "@types/ws": "^8.18.1",
+        "@xxxaz/stream-api-json": "^1.0.2",
         "ajv": "^8.17.1",
-        "json-schema-to-ts": "^3.1.0",
-        "yaml": "^2.4.5",
-        "ws": "^8.18.0"
+        "json-schema-to-ts": "^3.1.1",
+        "ws": "^8.18.2",
+        "yaml": "^2.8.0"
     },
     "devDependencies": {
-        "@types/jest": "^29.5.12",
+        "@types/jest": "^29.5.14",
         "jest": "^29.7.0",
-        "ts-jest": "^29.1.5",
+        "ts-jest": "^29.3.4",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.2"
+        "typescript": "^5.8.3"
     }
 }

package/types/JsonRpcMethod.d.ts

@@ -1,20 +1,29 @@
-import { type FromSchema } from 'json-schema-to-ts';
-import { type JSONSchema } from "./types.js";
-export interface JsonRpcMethodSchema<PrmSch extends readonly JSONSchema[], RtnSch extends JSONSchema | undefined> {
+import { type JSONSchema, type FromSchema } from "./types.js";
+type ByPositionSchema = {
+    readonly type: 'array';
+    readonly items: readonly JSONSchema[];
+};
+type ObjectProperties = {
+    readonly [key: string]: JSONSchema;
+};
+type ByNameSchema = {
+    readonly type: 'object';
+    readonly properties: ObjectProperties;
+};
+export type ParameterSchema = ByPositionSchema | ByNameSchema | undefined;
+export interface JsonRpcMethodSchema<PrmSch extends ParameterSchema, RtnSch extends JSONSchema | undefined> {
     readonly $params: PrmSch;
     readonly $return?: RtnSch;
 }
-export type Params<Schema> = Schema extends readonly [JSONSchema, ...infer Rmn] ? (Schema[0] extends {
-    optional: true;
-} ? [p?: FromSchema<Schema[0]>, ...Params<Rmn>] : [FromSchema<Schema[0]>, ...Params<Rmn>]) : Schema extends readonly [] ? [] : never;
+export type Params<Schema> = Schema extends ByPositionSchema ? FromSchema<Schema> : Schema extends ByNameSchema ? [FromSchema<Schema>] : Schema extends undefined ? [] : never;
 export type Return<Schema> = Schema extends undefined ? void : Schema extends JSONSchema ? FromSchema<Schema> : never;
-export type JsonRpcMethod<Context, PrmSch extends readonly JSONSchema[], RtnSch extends JSONSchema | undefined> = (this: Context, ...params: Params<PrmSch>) => Promise<Return<RtnSch>> | Return<RtnSch>;
+export type JsonRpcMethod<Context, PrmSch extends ParameterSchema, RtnSch extends JSONSchema | undefined> = (this: Context, ...params: Params<PrmSch>) => Promise<Return<RtnSch>> | Return<RtnSch>;
 type ContextClass<Ctx> = {
     new (...args: any[]): Ctx;
 };
 type Context<Cls, FB> = Cls extends ContextClass<infer Ctx> ? Ctx : FB;
 declare const methodKey: unique symbol;
-export declare class JsonRpcMethodDefinition<Context, PrmSch extends readonly JSONSchema[], RtnSch extends JSONSchema | undefined> implements JsonRpcMethodSchema<PrmSch, RtnSch> {
+export declare class JsonRpcMethodDefinition<Context, PrmSch extends ParameterSchema, RtnSch extends JSONSchema | undefined> implements JsonRpcMethodSchema<PrmSch, RtnSch> {
     readonly $params: PrmSch;
     readonly $return: RtnSch;
     readonly $contextClass?: ContextClass<Context> | undefined;
@@ -22,16 +31,37 @@ export declare class JsonRpcMethodDefinition<Context, PrmSch extends readonly JS
     readonly [methodKey]: JsonRpcMethod<Context, PrmSch, RtnSch>;
     constructor(method: JsonRpcMethod<Context, PrmSch, RtnSch>, $params: PrmSch, $return: RtnSch, $contextClass?: ContextClass<Context> | undefined);
     apply(ctx: Context, params: Params<PrmSch>): Return<RtnSch> | Promise<Return<RtnSch>>;
-    static get builder(): DefinitionBuilder<undefined, never[], undefined>;
+    static get builder(): DefinitionBuilder<undefined, undefined, undefined>;
 }
-declare class DefinitionBuilder<CtxCls extends ContextClass<any> | undefined, PrmSch extends readonly JSONSchema[], RtnSch extends JSONSchema | undefined> implements JsonRpcMethodSchema<PrmSch, RtnSch> {
+declare class DefinitionBuilder<CtxCls extends ContextClass<any> | undefined, PrmSch extends ParameterSchema, RtnSch extends JSONSchema | undefined> implements JsonRpcMethodSchema<PrmSch, RtnSch> {
     readonly $contextClass: CtxCls;
     readonly $params: PrmSch;
     readonly $return: RtnSch;
     constructor($contextClass: CtxCls, $params: PrmSch, $return: RtnSch);
     define<Ctx = {}>(method: JsonRpcMethod<Context<CtxCls, Ctx>, PrmSch, RtnSch>): JsonRpcMethodDefinition<Context<CtxCls, Ctx>, PrmSch, RtnSch>;
     contextClass<CtxCls extends ContextClass<any>>(contextClass: CtxCls): DefinitionBuilder<CtxCls, PrmSch, RtnSch>;
-    paramsSchema<NewPrm extends readonly JSONSchema[]>(...params: NewPrm): DefinitionBuilder<CtxCls, NewPrm, RtnSch>;
+    params<NewPrm extends ParameterSchema>(params: NewPrm): DefinitionBuilder<CtxCls, NewPrm, RtnSch>;
+    paramsByName<NewPrm extends ObjectProperties>(params: NewPrm): DefinitionBuilder<CtxCls, {
+        readonly type: "object";
+        readonly additionalProperties: false;
+        readonly required: [Exclude<keyof NewPrm, Exclude<{ [K in keyof NewPrm]: import("./types.js").IsOptional<NewPrm[K], K, never>; }[keyof NewPrm], undefined>>];
+        readonly properties: NewPrm;
+    }, RtnSch>;
+    paramsByPosition<NewPrm extends readonly JSONSchema[]>(...params: NewPrm): DefinitionBuilder<CtxCls, {
+        readonly type: "array";
+        readonly items: [...NewPrm];
+        readonly minItems: import("./schemas/Structure.js").ExcludeOptional<[...NewPrm]>["length"];
+        readonly maxItems: import("./types.js").Max<[...NewPrm]["length"]>;
+    }, RtnSch>;
+    return<NewRtn extends JSONSchema | undefined>(rtn: NewRtn): DefinitionBuilder<CtxCls, PrmSch, NewRtn>;
+    /** @deprecated paramsByPosition を使用してください */
+    paramsSchema<NewPrm extends readonly JSONSchema[]>(...params: NewPrm): DefinitionBuilder<CtxCls, {
+        readonly type: "array";
+        readonly items: [...NewPrm];
+        readonly minItems: import("./schemas/Structure.js").ExcludeOptional<[...NewPrm]>["length"];
+        readonly maxItems: import("./types.js").Max<[...NewPrm]["length"]>;
+    }, RtnSch>;
+    /** @deprecated return を使用してください */
     returnSchema<NewRtn extends JSONSchema | undefined>(rtn: NewRtn): DefinitionBuilder<CtxCls, PrmSch, NewRtn>;
 }
 export {};

package/types/JsonRpcValidator.d.ts

@@ -1,8 +1,10 @@
-import { JsonRpcMethodSchema, Params, Return } from "./JsonRpcMethod.js";
+import { JsonRpcMethodSchema, Return } from "./JsonRpcMethod.js";
+import { FromSchema } from 'json-schema-to-ts';
+type ParamType<Sch extends JsonRpcMethodSchema<any, any>> = Sch['$params'] extends object ? FromSchema<Sch['$params']> : undefined;
 export declare class JsonRpcValidator<Sch extends JsonRpcMethodSchema<any, any>> {
-    #private;
     readonly schema: Sch;
     constructor(schema: Sch);
-    validateParams(params: unknown[]): params is Params<Sch['$params']>;
+    validateParams(params: unknown): params is ParamType<Sch>;
     validateReturn(result: unknown): result is Return<Sch['$return']>;
 }
+export {};

package/types/WebSocketWrapper.d.ts

@@ -17,6 +17,7 @@ export interface WebSocketWrapper<Socket extends WrapableWebSocket = WrapableWeb
     readonly listener: SocketListener;
     readonly readyState: WebSocketState;
     send(data: JsonSerializable): void;
+    detach(): void;
     close(): void;
 }
 export declare class NodeWebSocketWrapper implements WebSocketWrapper<NodeWebSocket> {
@@ -27,6 +28,7 @@ export declare class NodeWebSocketWrapper implements WebSocketWrapper<NodeWebSoc
     constructor(socket: NodeWebSocket, listener: SocketListener, closedListener: ScokcetClosedListener);
     get readyState(): WebSocketState;
     send(data: JsonSerializable): void;
+    detach(): void;
     close(): void;
 }
 export declare class BrowserWebSocketWrapper implements WebSocketWrapper<WebSocket> {
@@ -37,6 +39,7 @@ export declare class BrowserWebSocketWrapper implements WebSocketWrapper<WebSock
     constructor(socket: WebSocket, listener: SocketListener, closedListener: ScokcetClosedListener);
     get readyState(): WebSocketState;
     send(data: JsonSerializable): void;
+    detach(): void;
     close(): void;
 }
 export {};

package/types/client/JsonRpcClient.d.ts

@@ -1,4 +1,4 @@
-import { JsonRpcMethodSchema, Params, Return } from "../JsonRpcMethod.js";
+import { JsonRpcMethodSchema, ParameterSchema, Params, Return } from "../JsonRpcMethod.js";
 import { type JsonRpcSchema } from "../router/JsonRpcRouter.js";
 import { JsonRpcRequest, JsonRpcResponse } from "../types.js";
 type PostRpc = (request: ReadableStream<string>) => Promise<ReadableStream<string>>;
@@ -12,7 +12,7 @@ type JsonRpcClientOptions<Sch extends JsonRpcSchema> = {
 declare const $generateId: unique symbol;
 declare const $requestStack: unique symbol;
 declare const $methodPath: unique symbol;
-type TriggerFunction<ParamSch extends ReadonlyArray<any>, RtnSch> = {
+type TriggerFunction<ParamSch extends ParameterSchema, RtnSch> = {
     (...args: Params<ParamSch>): Promise<Return<RtnSch>>;
     notice(...args: Params<ParamSch>): void;
 };

package/types/router/JsonRpcRouter.d.ts

@@ -1,7 +1,7 @@
 import { JsonSerializable } from "@xxxaz/stream-api-json";
-import { JsonRpcMethodDefinition, JsonRpcMethodSchema, Params, Return } from "../JsonRpcMethod.js";
-type AsyncFunction<P, R> = (...params: Params<P>) => Promise<Return<R>>;
-type NoticeFunction<Prm> = (...params: Params<Prm>) => void;
+import { JsonRpcMethodDefinition, JsonRpcMethodSchema, ParameterSchema, Params, Return } from "../JsonRpcMethod.js";
+type AsyncFunction<P, R> = P extends ParameterSchema ? (...params: Params<P>) => Promise<Return<R>> : never;
+type NoticeFunction<P> = P extends ParameterSchema ? (...params: Params<P>) => void : never;
 export declare abstract class JsonRpcRouter<Context = {}> {
     abstract resolve(methodPath: string): Promise<JsonRpcRouter<Context> | JsonRpcMethodDefinition<Context, any, any> | null>;
     abstract resolveChild(methodPath: string): Promise<JsonRpcRouter<Context> | JsonRpcMethodDefinition<Context, any, any> | null>;

package/types/schemas/Complex.d.ts

@@ -12,6 +12,12 @@ export declare function $EnumValues<T extends {
     readonly enum: [T[keyof T]];
 };
 export declare function $Expand<Src extends JSONSchema, Ex extends Partial<JSONSchema>>(source: Src, expand: Ex): Src & Ex;
+export declare function $Optional<T extends JSONSchema>(item: T): {
+    readonly oneOf: readonly [T, false];
+};
+export declare namespace $Optional {
+    var is: (item: JSONSchema | undefined) => boolean;
+}
 export declare function $And<Schemas extends JSONSchema[]>(...allOf: Schemas): {
     readonly allOf: Schemas;
 };

package/types/schemas/Structure.d.ts

@@ -1,27 +1,22 @@
-import { IsOptional, JSONSchema, Max, RequiredKeys } from "../types.js";
-export declare function $Optional<T extends JSONSchema>(item: T): T | undefined;
+import { IsOptionalSchema, JSONSchema, Max, RequiredKeys } from "../types.js";
 export declare function $Array<T extends JSONSchema>(items: T): {
     readonly type: "array";
     readonly items: T;
 };
-type ExcludeUndefined<T extends any[]> = T extends [...infer A, infer L] ? IsOptional<L, ExcludeUndefined<A>, T> : T;
-type RequiredLength<T extends any[]> = ExcludeUndefined<[...T, undefined]>['length'];
+export type ExcludeOptional<T extends any[]> = T extends [...infer A, infer L] ? IsOptionalSchema<L, ExcludeOptional<A>, T> : T;
 export declare function $Tuple<T extends JSONSchema[]>(...items: T): {
     readonly type: "array";
     readonly items: T;
-    readonly minItems: RequiredLength<T>;
+    readonly minItems: ExcludeOptional<T>["length"];
     readonly maxItems: Max<T["length"]>;
 };
 type ObjectDefine = {
-    [key: string]: JSONSchema | undefined;
-};
-type Properties<T extends ObjectDefine> = {
-    [K in keyof T]: Exclude<T[K], undefined>;
+    [key: string]: JSONSchema;
 };
 export declare function $Object<T extends ObjectDefine>(properties: T): {
     readonly type: "object";
     readonly additionalProperties: false;
     readonly required: [RequiredKeys<T>];
-    readonly properties: Properties<T>;
+    readonly properties: T;
 };
 export {};

package/types/types.d.ts

@@ -1,8 +1,23 @@
-import { type JSONSchema as ToTsSchema } from 'json-schema-to-ts';
+import { FromSchema as ToTsFromSchema, type JSONSchema as ToTsSchema } from 'json-schema-to-ts';
 import { type JsonSerializable } from "@xxxaz/stream-api-json";
-export type JSONSchema = ToTsSchema & object & {
-    optional?: boolean;
+export type TupleSchema<T extends JSONSchema[]> = {
+    type: 'array';
+    items: T;
+    minItems: number;
+    maxItems: number;
 };
+export type IsOptionalSchema<Sch, T, F> = false extends (Sch extends {
+    oneOf: readonly ToTsSchema[];
+} ? Sch['oneOf'][number] : never) ? T : F;
+type FromTuples<Schemas> = Schemas extends [infer Head extends JSONSchema, ...infer Tail] ? (IsOptionalSchema<Head, [
+    t?: ToTsFromSchema<Head>,
+    ...FromTuples<Tail>
+], [
+    ToTsFromSchema<Head>,
+    ...FromTuples<Tail>
+]>) : [];
+export type FromSchema<T extends JSONSchema> = (T extends TupleSchema<infer U> ? FromTuples<U> : ToTsFromSchema<T>) | IsOptionalSchema<T, undefined, never>;
+export type JSONSchema = ToTsSchema & object;
 export type JsonRpcRequest = {
     jsonrpc: '2.0';
     id?: number | string;