libshv-js 3.2.3 → 3.3.0

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "libshv-js",
-  "version": "3.2.3",
+  "version": "3.3.0",
   "description": "Typescript implementation of libshv",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "xo --reporter unix src/* --extension=vue",
+    "fix": "xo --reporter unix src/* --extension=vue --fix"
   },
   "author": "Elektroline",
   "repository": {

package/src/chainpack.ts

@@ -1,5 +1,5 @@
 import {utf8ToString} from './cpon';
-import {type RpcValue, type RpcValueType, type DateTime, Decimal, Double, type IMap, Int, type MetaMap, RpcValueWithMetaData, type ShvMap, UInt, withOffset, shvMapType} from './rpcvalue';
+import {type RpcValue, type RpcValueType, type DateTime, Decimal, Double, type IMap, type Int, type MetaMap, RpcValueWithMetaData, type ShvMap, UInt, withOffset, shvMapType} from './rpcvalue';
 import {UnpackContext, PackContext} from './cpcontext';
 
 enum PackingSchema {
@@ -106,7 +106,7 @@ class ChainPackReader {
 
         if (codePointAt < PackingSchema.Null) {
             if (codePointAt >= PackingSchema.IntThreshold) {
-                return impl_return(new Int(codePointAt - 64));
+                return impl_return(codePointAt - 64);
             }
             return impl_return(new UInt(codePointAt));
         }
@@ -121,7 +121,7 @@ class ChainPackReader {
                 return impl_return(false);
             }
             case PackingSchema.Int: {
-                return impl_return(new Int(this.readIntData()));
+                return impl_return(this.readIntData());
             }
             case PackingSchema.UInt: {
                 return impl_return(new UInt(this.readUIntData()));
@@ -325,11 +325,11 @@ class ChainPackReader {
             const val = this.read();
             if (map[shvMapType] === 'metamap' && typeof key === 'string') {
                 map[key] = val;
-            } else if (map[shvMapType] === 'metamap' && key instanceof Int) {
+            } else if (map[shvMapType] === 'metamap' && typeof key === 'number') {
                 map[Number(key)] = val;
             } else if (map[shvMapType] === 'map' && typeof key === 'string') {
                 map[key] = val;
-            } else if (map[shvMapType] === 'imap' && key instanceof Int) {
+            } else if (map[shvMapType] === 'imap' && typeof key === 'number') {
                 map[Number(key)] = val;
             } else {
                 throw new TypeError('Malformed map, invalid key');
@@ -367,7 +367,7 @@ class ChainPackWriter {
             case rpc_val instanceof UInt:
                 this.writeUInt(rpc_val);
                 break;
-            case rpc_val instanceof Int:
+            case typeof rpc_val === 'number':
                 this.writeInt(rpc_val);
                 break;
             case rpc_val instanceof Decimal:
@@ -567,13 +567,13 @@ class ChainPackWriter {
                     throw new TypeError('Invalid NaN IMap key');
                 }
 
-                this.writeInt(new Int(int_key));
+                this.writeInt(int_key);
             } else if (map[shvMapType] === 'metamap') {
                 const int_key = Number(key);
                 if (Number.isNaN(int_key)) {
                     this.writeJSString(key.toString());
                 } else {
-                    this.writeInt(new Int(int_key));
+                    this.writeInt(int_key);
                 }
             } else {
                 this.writeJSString(key.toString());

package/src/cpon.ts

@@ -1,4 +1,4 @@
-import {type RpcValue, type RpcValueType, type DateTime, type List, Decimal, Double, type IMap, Int, type MetaMap, RpcValueWithMetaData, type ShvMap, UInt, withOffset, shvMapType, isShvMap, isIMap} from './rpcvalue';
+import {type RpcValue, type RpcValueType, type DateTime, type List, Decimal, Double, type IMap, type Int, type MetaMap, RpcValueWithMetaData, type ShvMap, UInt, withOffset, shvMapType, isShvMap, isIMap} from './rpcvalue';
 import {PackContext, UnpackContext} from './cpcontext';
 
 const hexify = (byte: number) => {
@@ -475,7 +475,7 @@ class CponReader {
         if (neg) {
             val = -val;
         }
-        return new Int(val);
+        return val;
     }
 
     readNumber() {
@@ -547,7 +547,7 @@ class CponReader {
         if (is_uint) {
             return new UInt(mantisa);
         }
-        return new Int(is_neg ? -mantisa : mantisa);
+        return is_neg ? -mantisa : mantisa;
     }
 
     private implReadMap(map_type: 'map', terminator: number): ShvMap;
@@ -575,11 +575,11 @@ class CponReader {
 
             if (map[shvMapType] === 'metamap' && typeof key === 'string') {
                 map[key] = val;
-            } else if (map[shvMapType] === 'metamap' && (key instanceof UInt || key instanceof Int)) {
+            } else if (map[shvMapType] === 'metamap' && (key instanceof UInt || typeof key === 'number')) {
                 map[Number(key)] = val;
             } else if (map[shvMapType] === 'map' && typeof key === 'string') {
                 map[key] = val;
-            } else if (map[shvMapType] === 'imap' && (key instanceof UInt || key instanceof Int)) {
+            } else if (map[shvMapType] === 'imap' && (key instanceof UInt || typeof key === 'number')) {
                 map[Number(key)] = val;
             } else {
                 throw new TypeError('Malformed map, invalid key');
@@ -618,7 +618,7 @@ class CponWriter {
             case rpc_val instanceof UInt:
                 this.writeUInt(rpc_val);
                 break;
-            case rpc_val instanceof Int:
+            case typeof rpc_val === 'number':
                 this.writeInt(rpc_val);
                 break;
             case rpc_val instanceof Double:
@@ -786,7 +786,7 @@ class CponWriter {
                     throw new TypeError('Invalid NaN IMap key');
                 }
 
-                this.writeInt(new Int(int_key));
+                this.writeInt(int_key);
             } else if (map[shvMapType] === 'metamap') {
                 const int_key = Number(key);
                 if (Number.isNaN(int_key)) {
@@ -794,7 +794,7 @@ class CponWriter {
                     this.ctx.writeStringUtf8(key.toString());
                     this.ctx.putByte('"'.codePointAt(0)!);
                 } else {
-                    this.writeInt(new Int(int_key));
+                    this.writeInt(int_key);
                 }
             } else {
                 this.writeJSString(key.toString());

package/src/rpcmessage.ts

@@ -1,4 +1,4 @@
-import {type IMap, Int, isIMap, makeIMap, makeMetaMap, type MetaMap, type RpcValue, RpcValueWithMetaData} from './rpcvalue';
+import {type IMap, type Int, isIMap, makeIMap, makeMetaMap, type MetaMap, type RpcValue, RpcValueWithMetaData} from './rpcvalue';
 import {toCpon} from './cpon';
 import {toChainPack} from './chainpack';
 
@@ -31,7 +31,7 @@ enum ErrorCode {
 }
 
 export type ErrorMap = {
-    [ERROR_CODE]: Int<ErrorCode>;
+    [ERROR_CODE]: ErrorCode;
     [ERROR_MESSAGE]?: string;
     [ERROR_DATA]?: RpcValue;
 };
@@ -99,8 +99,8 @@ class RpcMessage {
         return (this.meta[TagRequestId] as Int);
     }
 
-    setRequestId(id: number | Int) {
-        this.meta[TagRequestId] = new Int(id);
+    setRequestId(id: number) {
+        this.meta[TagRequestId] = id;
     }
 
     callerIds(): RpcValue[] | undefined {
@@ -142,7 +142,7 @@ class RpcMessage {
             }
 
             const error_map = this.value[KeyError];
-            if (!(error_map[ERROR_CODE] instanceof Int)) {
+            if (!(typeof error_map[ERROR_CODE] !== 'number')) {
                 return new ProtocolError('Response had an error, but this error did not contain at least an error code');
             }
 

package/src/rpcvalue.ts

@@ -1,27 +1,12 @@
-class Int<T = number> {
+class UInt<T extends number = number> {
     readonly value: T;
 
-    constructor(u: T | Int<T>) {
-        if (u instanceof Int) {
+    constructor(u: T | UInt<T>) {
+        if (u instanceof UInt) {
             this.value = u.value;
             return;
         }
-        if (!Number.isInteger(u)) {
-            throw new TypeError('Value for Int must a positive integral number');
-        }
-
-        this.value = u;
-    }
 
-    [Symbol.toPrimitive](_hint: string) {
-        return this.value;
-    }
-}
-
-class UInt {
-    readonly value: number;
-
-    constructor(u: number) {
         if (u < 0 || !Number.isInteger(u)) {
             throw new Error(`Invalid value '${u}' for UInt must a positive integral number`);
         }
@@ -85,6 +70,8 @@ type ShvMap<T extends Record<string, RpcValue> = Record<string, any>> = {
     [shvMapType]: 'map';
 };
 
+export type Int = number;
+
 export type RpcValueType =
     Null |
     Bool |
@@ -130,4 +117,4 @@ class RpcValueWithMetaData {
 
 export type RpcValue = RpcValueType | RpcValueWithMetaData;
 
-export {shvMapType, Decimal, Double, type IMap, Int, type MetaMap, RpcValueWithMetaData, type ShvMap, UInt, withOffset, makeMap, makeIMap, makeMetaMap, isIMap, isShvMap};
+export {shvMapType, Decimal, Double, type IMap, type MetaMap, RpcValueWithMetaData, type ShvMap, UInt, withOffset, makeMap, makeIMap, makeMetaMap, isIMap, isShvMap};

package/src/ws-client.ts

@@ -1,7 +1,7 @@
 import {ChainPackReader, ChainpackProtocolType, ChainPackWriter} from './chainpack';
 import {type CponReader, CponProtocolType} from './cpon';
 import {ERROR_MESSAGE, ErrorCode, ERROR_CODE, RpcMessage, type RpcResponse, MethodCallTimeout} from './rpcmessage';
-import {type RpcValue, type Null, Int, type IMap, type ShvMap, makeMap, makeIMap} from './rpcvalue';
+import {type RpcValue, type Null, type Int, type IMap, type ShvMap, makeMap, makeIMap} from './rpcvalue';
 
 const DEFAULT_TIMEOUT = 5000;
 
@@ -63,7 +63,7 @@ export const DIR_SIGNALS = 6;
 export const DIR_EXTRA = 63;
 type DirResult = Array<IMap<{
     [DIR_NAME]: string;
-    [DIR_FLAGS]: Int<DirFlags>;
+    [DIR_FLAGS]: DirFlags;
     [DIR_PARAM]: string | Null;
     [DIR_RESULT]: string | Null;
     [DIR_ACCESS]: Int;
@@ -197,7 +197,7 @@ class WsClient {
         const promise = new Promise<RpcResponse>(resolve => {
             this.rpcHandlers[rq_id] = {resolve, timeout_handle: self.setTimeout(() => {
                 resolve(new MethodCallTimeout(makeIMap({
-                    [ERROR_CODE]: new Int(ErrorCode.MethodCallTimeout),
+                    [ERROR_CODE]: ErrorCode.MethodCallTimeout,
                     [ERROR_MESSAGE]: `Shv call timeout after: ${this.timeout} msec.`,
                 })));
             }, this.timeout)};

package/src/zod.ts

@@ -1,11 +1,11 @@
 import {z, type ZodType} from 'zod';
-import {Int, shvMapType, UInt} from './rpcvalue';
+import {shvMapType, UInt} from './rpcvalue';
 
 export const map = <T extends Record<string, ZodType<any, any, any>>>(schema: T) => z.object(schema).and(z.object({[shvMapType]: z.literal('map')}));
 export const recmap = <T extends ZodType<any, any, any>>(schema: T) => z.record(z.string(), schema).and(z.object({[shvMapType]: z.literal('map')}));
 export const imap = <T extends Record<string, ZodType<any, any, any>>>(schema: T) => z.object(schema).and(z.object({[shvMapType]: z.literal('imap')}));
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments -- Zod needs the default argument, otherwise it'll infer as Int<unknown>
-export const int = () => z.instanceof(Int<number>);
-export const uint = () => z.instanceof(UInt);
+export const int = () => z.number();
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-arguments -- Zod needs the default argument, otherwise it'll infer as UInt<unknown>
+export const uint = () => z.instanceof(UInt<number>);
 
 export * from 'zod';