libshv-js 3.6.1 → 3.6.2

package/.github/workflows/check-version-bump.yml

@@ -14,9 +14,9 @@ on:
 jobs:
   check-version-bump:
     name: Check version bump
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check if version bumped
-        uses: del-systems/check-if-version-bumped@v2.0.3
+        uses: del-systems/check-if-version-bumped@v2
 

package/.github/workflows/lint.yml

@@ -14,9 +14,9 @@ on:
 jobs:
   type-check:
     name: Type check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install tsc
         run: npm install
       - name: Run tsc
@@ -24,9 +24,9 @@ jobs:
 
   xo:
     name: xo
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install tsc
         run: npm install
       - name: Run linters

package/.github/workflows/publish.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   test:
     name: Publish new version
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: '20.x'
+          node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Publish

package/.github/workflows/test.yml

@@ -14,7 +14,7 @@ on:
 jobs:
   test:
     name: CPON/Chainpack conversions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

package/eslint.config.js

@@ -0,0 +1,102 @@
+import xo from "eslint-config-xo";
+import typescriptEslintParser from "@typescript-eslint/parser";
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import unicornPlugin from 'eslint-plugin-unicorn';
+
+export default tseslint.config(
+    eslint.configs.recommended,
+    eslint.configs.recommended,
+    ...tseslint.configs.recommendedTypeChecked,
+    ...tseslint.configs.stylisticTypeChecked,
+    unicornPlugin.configs.recommended,
+    ...xo,
+    {
+        languageOptions: {
+            parser: typescriptEslintParser,
+            parserOptions: {
+                project: "./tsconfig.json",
+            },
+        },
+        rules: {
+            "@stylistic/indent": ["error", 4],
+            "@stylistic/indent-binary-ops": ["error", 4],
+            "@stylistic/max-len": ["off"],
+            "@stylistic/multiline-ternary": ["off"],
+            "@stylistic/function-paren-newline": ["off"],
+            "@typescript-eslint/no-misused-promises": ["error", {
+                checksVoidReturn: false
+            }],
+            "@typescript-eslint/no-unsafe-assignment": ["off"],
+            "@typescript-eslint/no-unsafe-call": ["off"],
+            "@typescript-eslint/no-unsafe-enum-comparison": ["off"],
+            "@typescript-eslint/consistent-type-definitions": ["error",
+                "type"
+            ],
+            "@typescript-eslint/array-type": ["error", {
+                default: "array-simple"
+            }],
+            "@typescript-eslint/naming-convention": ["error",
+                {
+                    "selector": "variableLike",
+                    "format": ["camelCase"]
+                },
+                {
+                    "selector": "variableLike",
+                    "format": null,
+                    "modifiers": ["unused"]
+                },
+                {
+                    "format": ["camelCase", "UPPER_CASE"],
+                    "selector": "variable",
+                    "modifiers": ["const"]
+                },
+                {
+                    "format": ["PascalCase"],
+                    "selector": "variable",
+                    "modifiers": ["const"],
+                    "filter": "Validation$|Zod$"
+                }
+            ],
+            "@typescript-eslint/prefer-promise-reject-errors": "off",
+            "@typescript-eslint/promise-function-async": "off",
+            "@typescript-eslint/strict-boolean-expressions": ["error",
+                {
+                    "allowString": false,
+                    "allowNumber": false,
+                    "allowNullableObject": false
+                }
+            ],
+            "@typescript-eslint/triple-slash-reference": "off",
+            "capitalized-comments": "off",
+            "@stylistic/object-curly-newline": ["error", {
+                "ImportDeclaration": "never"
+            }],
+            "n/file-extension-in-import": "off",
+            "promise-function-async": "off",
+            "camelcase": "off",
+            "default-case": "off",
+            "import/extensions": "off",
+            "import/no-unassigned-import": "off",
+            "no-dupe-class-members": "off",
+            "no-negated-condition": "off",
+            "no-unused-vars": "off",
+            "no-useless-constructor": "off",
+            "no-void": ["error", {
+                allowAsStatement: true
+            }],
+            "no-warning-comments": "off",
+            "prefer-promise-reject-errors": "off",
+            "unicorn/consistent-function-scoping": "off",
+            "unicorn/explicit-length-check": "off",
+            "unicorn/filename-case": "off",
+            "unicorn/no-negated-condition": "off",
+            "unicorn/no-useless-undefined": ["error", {
+                checkArguments: false
+            }],
+            "unicorn/prefer-top-level-await": "off",
+            "unicorn/switch-case-braces": "off",
+            "unicorn/prevent-abbreviations": "off",
+        }
+    }
+);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "libshv-js",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Typescript implementation of libshv",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "lint": "xo --reporter unix test.ts src/* --extension=vue",
+    "lint": "eslint --format unix src/",
     "fix": "npm run lint -- --fix"
   },
   "author": "Elektroline",
@@ -28,10 +28,15 @@
     "./zod.ts": "./src/zod.ts"
   },
   "dependencies": {
-    "zod": "^3.23.8"
+    "zod": "^3.24.2"
   },
   "devDependencies": {
-    "typescript": "^5.5.4",
-    "xo": "^0.59.3"
+    "@typescript-eslint/parser": "^8.27.0",
+    "eslint": "^9.22.0",
+    "eslint-config-xo": "^0.46.0",
+    "eslint-formatter-unix": "^8.40.0",
+    "eslint-plugin-unicorn": "^57.0.0",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.27.0"
   }
 }

package/src/chainpack.ts

@@ -155,9 +155,9 @@ class ChainPackReader {
                 bi >>= 2n;
 
                 let offset = 0;
-                if (hasTzOffset) {
+                if (hasTzOffset !== 0n) {
                     offset = Number(bi & 0x7Fn);
-                    if (offset & 0x40) {
+                    if ((offset & 0x40) !== 0) {
                         // sign extension
                         offset -= 128;
                     }
@@ -172,7 +172,7 @@ class ChainPackReader {
                 }
 
                 let msec = Number(bi);
-                if (hasNotMsec) {
+                if (hasNotMsec !== 0n) {
                     msec *= 1000;
                 }
 
@@ -216,7 +216,6 @@ class ChainPackReader {
             case PackingSchema.CString: {
                 // variation of CponReader.readCString()
                 const pctx = new PackContext();
-                // eslint-disable-next-line no-constant-condition
                 while (true) {
                     let b = this.ctx.getByte();
                     if (b === '\\'.codePointAt(0)) {
@@ -317,7 +316,6 @@ class ChainPackReader {
 
     readList() {
         const lst = [];
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             const b = this.ctx.peekByte();
             if (b as PackingSchema === PackingSchema.Term) {
@@ -343,14 +341,13 @@ class ChainPackReader {
         return this.implReadMap('imap');
     }
 
-    private implReadMap(map_type: 'map'): ShvMap;
-    private implReadMap(map_type: 'imap'): IMap;
-    private implReadMap(map_type: 'metamap'): MetaMap;
-    private implReadMap(map_type: 'map' | 'imap' | 'metamap') {
+    private implReadMap(mapType: 'map'): ShvMap;
+    private implReadMap(mapType: 'imap'): IMap;
+    private implReadMap(mapType: 'metamap'): MetaMap;
+    private implReadMap(mapType: 'map' | 'imap' | 'metamap') {
         const map: ShvMap | IMap | MetaMap = {
-            [shvMapType]: map_type,
+            [shvMapType]: mapType,
         };
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             const b = this.ctx.peekByte();
             if (b as PackingSchema === PackingSchema.Term) {
@@ -384,55 +381,55 @@ class ChainPackWriter {
         this.ctx = new PackContext();
     }
 
-    write(rpc_val: RpcValue) {
-        if (rpc_val instanceof RpcValueWithMetaData) {
-            this.writeMeta(rpc_val.meta);
-            rpc_val = rpc_val.value;
+    write(rpcVal: RpcValue) {
+        if (rpcVal instanceof RpcValueWithMetaData) {
+            this.writeMeta(rpcVal.meta);
+            rpcVal = rpcVal.value;
         }
 
         switch (true) {
-            case rpc_val === undefined:
+            case rpcVal === undefined:
                 this.ctx.putByte(PackingSchema.Null);
                 break;
-            case typeof rpc_val === 'boolean':
-                this.ctx.putByte(rpc_val ? PackingSchema.True : PackingSchema.False);
+            case typeof rpcVal === 'boolean':
+                this.ctx.putByte(rpcVal ? PackingSchema.True : PackingSchema.False);
                 break;
-            case typeof rpc_val === 'string':
-                this.writeJSString(rpc_val);
+            case typeof rpcVal === 'string':
+                this.writeJSString(rpcVal);
                 break;
-            case rpc_val instanceof ArrayBuffer:
-                this.writeBlob(rpc_val);
+            case rpcVal instanceof ArrayBuffer:
+                this.writeBlob(rpcVal);
                 break;
-            case rpc_val instanceof UInt:
-                this.writeUInt(rpc_val);
+            case rpcVal instanceof UInt:
+                this.writeUInt(rpcVal);
                 break;
-            case typeof rpc_val === 'number':
-                this.writeInt(rpc_val);
+            case typeof rpcVal === 'number':
+                this.writeInt(rpcVal);
                 break;
-            case rpc_val instanceof Decimal:
-                this.writeDecimal(rpc_val);
+            case rpcVal instanceof Decimal:
+                this.writeDecimal(rpcVal);
                 break;
-            case Array.isArray(rpc_val):
-                this.writeList(rpc_val);
+            case Array.isArray(rpcVal):
+                this.writeList(rpcVal);
                 break;
-            case rpc_val instanceof Date:
-                this.writeDateTime(rpc_val);
+            case rpcVal instanceof Date:
+                this.writeDateTime(rpcVal);
                 break;
-            case rpc_val instanceof Double:
+            case rpcVal instanceof Double:
                 throw new Error('writing doubles not implemented');
-            case typeof rpc_val === 'object':
-                switch (rpc_val[shvMapType]) {
+            case typeof rpcVal === 'object':
+                switch (rpcVal[shvMapType]) {
                     case 'imap':
-                        this.writeIMap(rpc_val);
+                        this.writeIMap(rpcVal);
                         break;
                     case 'map':
-                        this.writeMap(rpc_val);
+                        this.writeMap(rpcVal);
                         break;
                 }
 
                 break;
             default:
-                console.log('Can\'t serialize', rpc_val);
+                console.log('Can\'t serialize', rpcVal);
                 throw new Error('Can\'t serialize');
         }
     }

package/src/cpcontext.ts

@@ -45,7 +45,6 @@ const transfer = (source: ArrayBuffer, length: number) => {
 
 class PackContext {
     static CHUNK_LEN = 1024;
-
     data = new Uint8Array(0);
     length = 0;
 

package/src/cpon.ts

@@ -7,7 +7,7 @@ export const stringifyDate = (dt: DateTime) => {
     let utcOffset = dt.utc_offset;
     const localMsec = epochMsec + (60_000 * (utcOffset ?? 0));
     let res = new Date(localMsec).toISOString();
-    const rtrim = (localMsec % 1000) ? 1 : 5;
+    const rtrim = ((localMsec % 1000) !== 0) ? 1 : 5;
     res = res.slice(0, Math.max(0, res.length - rtrim));
 
     if (utcOffset === undefined || utcOffset === 0) {
@@ -21,7 +21,7 @@ export const stringifyDate = (dt: DateTime) => {
         }
 
         res += (Math.trunc(utcOffset / 60)).toString().padStart(2, '0');
-        if (utcOffset % 60) {
+        if ((utcOffset % 60) !== 0) {
             res += (utcOffset % 60).toString().padStart(2, '0');
         }
     }
@@ -85,8 +85,9 @@ const utf8ToString = (bytearray: ArrayBuffer) => {
 
 class CponReader {
     ctx: UnpackContext;
-    constructor(unpack_context: UnpackContext) {
-        this.ctx = unpack_context;
+
+    constructor(unpackContext: UnpackContext) {
+        this.ctx = unpackContext;
     }
 
     read(): RpcValue {
@@ -188,7 +189,6 @@ class CponReader {
         const KEY_DELIM = ':'.codePointAt(0)!;
         const FIELD_DELIM = ','.codePointAt(0)!;
         /* eslint-disable max-depth */
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             let b = this.ctx.peekByte();
             if (b < 1) {
@@ -202,7 +202,6 @@ class CponReader {
                         b = this.ctx.getByte();
                         if (b === STAR) {
                             // multiline_comment_entered;
-                            // eslint-disable-next-line no-constant-condition
                             while (true) {
                                 b = this.ctx.getByte();
                                 if (b === STAR) {
@@ -214,7 +213,6 @@ class CponReader {
                             }
                         } else if (b === SLASH) {
                             // to end of line comment entered;
-                            // eslint-disable-next-line no-constant-condition
                             while (true) {
                                 b = this.ctx.getByte();
                                 if (b === LF) {
@@ -354,7 +352,6 @@ class CponReader {
     readCString() {
         const pctx = new PackContext();
         this.ctx.getByte(); // eat '"'
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             let b = this.ctx.getByte();
             if (b === '\\'.codePointAt(0)) {
@@ -402,7 +399,6 @@ class CponReader {
     readBlobEsc() {
         const pctx = new PackContext();
         this.ctx.getByte(); // eat '"'
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             let b = this.ctx.getByte();
             if (b === '\\'.codePointAt(0)) {
@@ -445,7 +441,6 @@ class CponReader {
     readBlobHex() {
         const pctx = new PackContext();
         this.ctx.getByte(); // eat '"'
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             const b = this.ctx.getByte();
             if (b === '"'.codePointAt(0)) {
@@ -463,7 +458,6 @@ class CponReader {
     readList() {
         const lst = [];
         this.ctx.getByte(); // eat '['
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             this.skipWhitespace();
             const b = this.ctx.peekByte();
@@ -494,7 +488,7 @@ class CponReader {
     readInt() {
         let base = 10;
         let val = 0;
-        let neg = 0;
+        let neg = false;
         let n = 0;
         for (; ; n++) {
             const b = this.ctx.peekByte();
@@ -509,7 +503,7 @@ class CponReader {
 
                 this.ctx.getByte();
                 if (b === 45) {
-                    neg = 1;
+                    neg = true;
                 }
             } else if (b === 120) { // 'x'
                 if (n === 1 && val !== 0) {
@@ -575,7 +569,6 @@ class CponReader {
         mantisa = Number(this.readInt());
         b = this.ctx.peekByte();
         (() => {
-            // eslint-disable-next-line no-constant-condition
             while (true) {
                 switch (b) {
                     case 'u'.codePointAt(0): {
@@ -636,15 +629,14 @@ class CponReader {
         return isNeg ? -mantisa : mantisa;
     }
 
-    private implReadMap(map_type: 'map', terminator: number): ShvMap;
-    private implReadMap(map_type: 'imap', terminator: number): IMap;
-    private implReadMap(map_type: 'metamap', terminator: number): MetaMap;
-    private implReadMap(map_type: 'map' | 'imap' | 'metamap', terminator: number) {
+    private implReadMap(mapType: 'map', terminator: number): ShvMap;
+    private implReadMap(mapType: 'imap', terminator: number): IMap;
+    private implReadMap(mapType: 'metamap', terminator: number): MetaMap;
+    private implReadMap(mapType: 'map' | 'imap' | 'metamap', terminator: number) {
         const map: MetaMap | ShvMap | IMap = {
-            [shvMapType]: map_type,
+            [shvMapType]: mapType,
         };
         this.ctx.getByte(); // eat start
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             this.skipWhitespace();
             const b = this.ctx.peekByte();
@@ -681,60 +673,61 @@ class CponReader {
 class CponWriter {
     ctx: PackContext;
     nestLevel = 0;
+
     constructor(private readonly indentString?: string) {
         this.ctx = new PackContext();
     }
 
-    write(rpc_val: RpcValue) {
-        if (rpc_val instanceof RpcValueWithMetaData) {
-            this.writeMeta(rpc_val.meta);
-            rpc_val = rpc_val.value;
+    write(rpcVal: RpcValue) {
+        if (rpcVal instanceof RpcValueWithMetaData) {
+            this.writeMeta(rpcVal.meta);
+            rpcVal = rpcVal.value;
         }
 
         switch (true) {
-            case rpc_val === undefined:
+            case rpcVal === undefined:
                 this.ctx.writeStringUtf8('null');
                 break;
-            case typeof rpc_val === 'boolean':
-                this.writeBool(rpc_val);
+            case typeof rpcVal === 'boolean':
+                this.writeBool(rpcVal);
                 break;
-            case typeof rpc_val === 'string':
-                this.writeJSString(rpc_val);
+            case typeof rpcVal === 'string':
+                this.writeJSString(rpcVal);
                 break;
-            case rpc_val instanceof ArrayBuffer:
-                this.writeBlob(rpc_val);
+            case rpcVal instanceof ArrayBuffer:
+                this.writeBlob(rpcVal);
                 break;
-            case rpc_val instanceof UInt:
-                this.writeUInt(rpc_val);
+            case rpcVal instanceof UInt:
+                this.writeUInt(rpcVal);
                 break;
-            case typeof rpc_val === 'number':
-                this.writeInt(rpc_val);
+            case typeof rpcVal === 'number':
+                this.writeInt(rpcVal);
                 break;
-            case rpc_val instanceof Double:
-                this.writeDouble(rpc_val);
+            case rpcVal instanceof Double:
+                this.writeDouble(rpcVal);
                 break;
-            case rpc_val instanceof Decimal:
-                this.writeDecimal(rpc_val);
+            case rpcVal instanceof Decimal:
+                this.writeDecimal(rpcVal);
                 break;
-            case Array.isArray(rpc_val):
-                this.writeList(rpc_val);
+            case Array.isArray(rpcVal):
+                this.writeList(rpcVal);
                 break;
-            case rpc_val instanceof Date:
-                this.writeDateTime(rpc_val);
+            case rpcVal instanceof Date:
+                this.writeDateTime(rpcVal);
                 break;
-            case typeof rpc_val === 'object':
-                switch (rpc_val[shvMapType]) {
+            case typeof rpcVal === 'object':
+                switch (rpcVal[shvMapType]) {
                     case 'imap':
-                        this.writeIMap(rpc_val);
+                        this.writeIMap(rpcVal);
                         break;
                     case 'map':
-                        this.writeMap(rpc_val);
+                        this.writeMap(rpcVal);
                         break;
                 }
 
                 break;
             default:
-                console.log('Can\'t serialize rpc value', rpc_val);
+                console.log('Can\'t serialize rpc value', rpcVal);
                 throw new Error('Can\'t serialize rpc value');
         }
     }
@@ -745,25 +738,25 @@ class CponWriter {
             const charcode = str.codePointAt(i)!;
             switch (charcode) {
                 case 0:
-                    this.ctx.writeStringUtf8('\\0');
+                    this.ctx.writeStringUtf8(String.raw`\0`);
                     break;
                 case '\\'.codePointAt(0):
                     this.ctx.writeStringUtf8('\\\\');
                     break;
                 case '\t'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\t');
+                    this.ctx.writeStringUtf8(String.raw`\t`);
                     break;
                 case '\b'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\b');
+                    this.ctx.writeStringUtf8(String.raw`\b`);
                     break;
                 case '\r'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\r');
+                    this.ctx.writeStringUtf8(String.raw`\r`);
                     break;
                 case '\n'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\n');
+                    this.ctx.writeStringUtf8(String.raw`\n`);
                     break;
                 case '"'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\"');
+                    this.ctx.writeStringUtf8(String.raw`\"`);
                     break;
                 default:
                     this.ctx.writeCharCodeUtf8(charcode);
@@ -782,16 +775,16 @@ class CponWriter {
                     this.ctx.writeStringUtf8('\\\\');
                     break;
                 case '\t'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\t');
+                    this.ctx.writeStringUtf8(String.raw`\t`);
                     break;
                 case '\r'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\r');
+                    this.ctx.writeStringUtf8(String.raw`\r`);
                     break;
                 case '\n'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\n');
+                    this.ctx.writeStringUtf8(String.raw`\n`);
                     break;
                 case '"'.codePointAt(0):
-                    this.ctx.writeStringUtf8('\\"');
+                    this.ctx.writeStringUtf8(String.raw`\"`);
                     break;
                 default:
                     if (b >= 32 && b < 127) {
@@ -910,8 +903,8 @@ class CponWriter {
     }
 
     writeDecimal(val: Decimal) {
-        let mantisa = val.mantisa;
-        const exponent = val.exponent;
+        let {mantisa} = val;
+        const {exponent} = val;
         if (mantisa < 0) {
             mantisa = -mantisa;
             this.ctx.putByte('-'.codePointAt(0)!);

package/src/json.ts

@@ -2,7 +2,6 @@ import {UnpackContext} from './cpcontext';
 import {CponReader, stringifyDate} from './cpon';
 import {Decimal, Double, isIMap, isShvMap, makeIMap, makeMap, makeMetaMap, RpcValueWithMetaData, UInt, type RpcValue} from './rpcvalue';
 
-// eslint-disable-next-line @typescript-eslint/ban-types -- Zod needs the default argument, otherwise it'll infer as UInt<unknown>
 const decodeMap = (x: object) => makeMap(Object.fromEntries(Object.entries(x).map(([key, value]) => [key, decodeValueJson(value)])));
 
 const decodeValueJson = (x: unknown): RpcValue => {
@@ -123,6 +122,7 @@ const encodeValueJson = (x: RpcValue): unknown => {
         case x instanceof Date:
             return [JSON_TAG_TYPE, 'DateTime', stringifyDate(x)];
         case x === undefined:
+            // eslint-disable-next-line unicorn/no-null
             return null;
         case x instanceof Decimal:
         case x instanceof UInt:

package/src/rpcvalue.ts

@@ -14,7 +14,7 @@ class UInt<T extends number = number> {
         this.value = u;
     }
 
-    [Symbol.toPrimitive](_hint: string) {
+    [Symbol.toPrimitive]() {
         return this.value;
     }
 
@@ -34,6 +34,7 @@ class Double {
 class Decimal {
     mantisa: number;
     exponent: number;
+
     constructor(mantisa: number, exponent: number) {
         if (!Number.isInteger(exponent)) {
             throw new TypeError(`Decimal: exponent must be integral (${exponent})`);
@@ -49,9 +50,9 @@ export type Bool = boolean;
 export type Blob = ArrayBuffer;
 export type ShvString = string;
 export type DateTime = Date & {utc_offset?: number};
-const withOffset = (date: Date, utc_offset?: number) => {
-    const clonedDate: DateTime = new Date(date.getTime());
-    clonedDate.utc_offset = utc_offset;
+const withOffset = (date: Date, utcOffset?: number) => {
+    const clonedDate: DateTime = new Date(date);
+    clonedDate.utc_offset = utcOffset;
     return clonedDate;
 };
 
@@ -59,12 +60,14 @@ export type List = RpcValue[];
 
 const shvMapType = Symbol('shvMapType');
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- I can't get rid of this yet
 type IMap<T extends Record<number, RpcValue> = Record<number, any>> = {
     [Key in keyof T]: T[Key];
 } & {
     [shvMapType]: 'imap';
 };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- I can't get rid of this yet
 type ShvMap<T extends Record<string, RpcValue> = Record<string, any>> = {
     [Key in keyof T]: T[Key];
 } & {

package/src/ws-client.ts

@@ -122,15 +122,12 @@ class NotImplemented extends RpcError {}
 class WsClient {
     private requestId = 1;
     private pingTimerId = -1;
-
     private rpcHandlers: Array<{
         resolve: RpcResponseResolver;
         timeout_handle: number;
     }> = [];
-
     private readonly subscriptions: Subscription[] = [];
     private readonly websocket: WebSocket;
-
     private readonly options: WsClientOptions;
     private readonly timeout: number;
 
@@ -172,6 +169,7 @@ class WsClient {
                     handler.resolve((() => {
                         if (RPC_MESSAGE_ERROR in rpcMsg.value) {
                             const code = rpcMsg.value[RPC_MESSAGE_ERROR][ERROR_CODE] as unknown;
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
                             const ErrorTypeCtor = (() => {
                                 switch (code) {
                                     case ErrorCode.InvalidRequest: return InvalidRequest;
@@ -199,7 +197,7 @@ class WsClient {
 
                         return new ProtocolError('Response included neither result nor error');
                     })());
-                    // eslint-disable-next-line @typescript-eslint/no-array-delete, @typescript-eslint/no-dynamic-delete
+                    // eslint-disable-next-line @typescript-eslint/no-array-delete
                     delete this.rpcHandlers[Number(requestId)];
                 }
             }
@@ -217,16 +215,16 @@ class WsClient {
         }
     }
 
-    callRpcMethod(shv_path: '.broker/currentClient', method: 'accessGrantForMethodCall', params: [string, string]): Promise<ResultOrError<string>>;
-    callRpcMethod(shv_path: string | undefined, method: 'dir', params?: RpcValue): Promise<ResultOrError<DirResult>>;
-    callRpcMethod(shv_path: string | undefined, method: 'ls', params?: RpcValue): Promise<ResultOrError<LsResult>>;
-    callRpcMethod(shv_path: string | undefined, method: string, params?: RpcValue): Promise<ResultOrError>;
-    callRpcMethod(shv_path: string | undefined, method: string, params?: RpcValue): Promise<ResultOrError> {
+    callRpcMethod(shvPath: '.broker/currentClient', method: 'accessGrantForMethodCall', params: [string, string]): Promise<ResultOrError<string>>;
+    callRpcMethod(shvPath: string | undefined, method: 'dir', params?: RpcValue): Promise<ResultOrError<DirResult>>;
+    callRpcMethod(shvPath: string | undefined, method: 'ls', params?: RpcValue): Promise<ResultOrError<LsResult>>;
+    callRpcMethod(shvPath: string | undefined, method: string, params?: RpcValue): Promise<ResultOrError>;
+    callRpcMethod(shvPath: string | undefined, method: string, params?: RpcValue): Promise<ResultOrError> {
         const rqId = this.requestId++;
         const rq: RpcRequest = new RpcValueWithMetaData(makeMetaMap({
             [RPC_MESSAGE_REQUEST_ID]: rqId,
             [RPC_MESSAGE_METHOD]: method ?? '',
-            [RPC_MESSAGE_SHV_PATH]: shv_path ?? '',
+            [RPC_MESSAGE_SHV_PATH]: shvPath ?? '',
         }), makeIMap({
             [RPC_MESSAGE_PARAMS]: params,
         }));
@@ -234,7 +232,7 @@ class WsClient {
         this.sendRpcMessage(rq);
 
         const promise = new Promise<ResultOrError>(resolve => {
-            this.rpcHandlers[rqId] = {resolve, timeout_handle: self.setTimeout(() => {
+            this.rpcHandlers[rqId] = {resolve, timeout_handle: globalThis.setTimeout(() => {
                 resolve(new MethodCallTimeout(makeIMap({
                     [ERROR_CODE]: ErrorCode.MethodCallTimeout,
                     [ERROR_MESSAGE]: `Shv call timeout after: ${this.timeout} msec.`,
@@ -246,10 +244,10 @@ class WsClient {
         return promise;
     }
 
-    sendRpcMessage(rpc_msg: RpcMessage) {
-        if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
-            this.logDebug('sending rpc message:', toCpon(rpc_msg));
-            const msgData = new Uint8Array(toChainPack(rpc_msg));
+    sendRpcMessage(rpcMsg: RpcMessage) {
+        if (this.websocket.readyState === WebSocket.OPEN) {
+            this.logDebug('sending rpc message:', toCpon(rpcMsg));
+            const msgData = new Uint8Array(toChainPack(rpcMsg));
 
             const wr = new ChainPackWriter();
             wr.writeUIntData(msgData.length + 1);
@@ -354,7 +352,7 @@ class WsClient {
                 options.onWorkflows(response);
 
                 this.close();
-            }).catch((_: unknown) => {
+            }).catch(() => {
                 options.onWorkflowsFailed();
             });
         });
@@ -375,7 +373,7 @@ class WsClient {
                 options.onConnectionFailure(error);
             };
 
-            const handleLoginResponse = (response: any) => {
+            const handleLoginResponse = (response: unknown) => {
                 if (response instanceof Error) {
                     handleConnectionError(response);
                     return;
@@ -383,7 +381,7 @@ class WsClient {
 
                 this.logDebug('SUCCESS: connected to shv broker');
                 options.onConnected();
-                this.pingTimerId = window.setInterval(() => {
+                this.pingTimerId = globalThis.setInterval(() => {
                     this.sendPing();
                 }, options.pingInterval ?? DEFAULT_PING_INTERVAL);
             };
@@ -427,7 +425,7 @@ class WsClient {
             this.logDebug('DISCONNECTED');
             this.subscriptions.length = 0;
             options.onDisconnected();
-            window.clearInterval(this.pingTimerId);
+            globalThis.clearInterval(this.pingTimerId);
         });
     }
 }

package/src/zod.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import {z, type ZodType} from 'zod';
 import {Decimal, Double, type IMap, isIMap, isMetaMap, isShvMap, type MetaMap, type RpcValue, type RpcValueType, RpcValueWithMetaData, type ShvMap, UInt} from './rpcvalue';
 
@@ -6,7 +7,7 @@ export const recmap = <T extends ZodType<any, any, any>>(schema: T) => z.custom<
 export const imap = <T extends Record<string, ZodType<any, any, any>>>(schema?: T) => z.custom<IMap<{[K in keyof T]: z.infer<T[K]>}>>((data: RpcValue) => isIMap(data) && (schema === undefined || z.object(schema).safeParse(data).success));
 export const metamap = <T extends Record<string | number, ZodType<any, any, any>>>(schema?: T) => z.custom<MetaMap<{[K in keyof T]: z.infer<T[K]>}>>((data: RpcValue) => isMetaMap(data) && (schema === undefined || z.object(schema).safeParse(data).success));
 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 const double = () => z.instanceof(Double);
 export const decimal = () => z.instanceof(Decimal);

package/.xo-config.json

@@ -1,42 +0,0 @@
-{
-    "space": 4,
-    "rules": {
-        "@typescript-eslint/naming-convention": ["error",
-            {
-                "selector": "variable",
-                "format": ["camelCase"]
-            },
-            {
-                "format": ["camelCase", "UPPER_CASE"],
-                "selector": "variable",
-                "modifiers": ["const"]
-            },
-            {
-                "format": ["PascalCase"],
-                "selector": "variable",
-                "modifiers": ["const"],
-                "filter": "Ctor$|Validation$|Zod$"
-            }
-        ],
-        "@typescript-eslint/prefer-promise-reject-errors": "off",
-        "@typescript-eslint/promise-function-async": "off",
-        "@typescript-eslint/triple-slash-reference": "off",
-        "capitalized-comments": "off",
-        "object-curly-newline": ["error", {
-            "ImportDeclaration": "never"
-        }],
-        "n/file-extension-in-import": "off",
-        "promise-function-async": "off",
-        "default-case": "off",
-        "import/extensions": "off",
-        "import/no-unassigned-import": "off",
-        "no-warning-comments": "off",
-        "prefer-promise-reject-errors": "off",
-        "unicorn/explicit-length-check": "off",
-        "unicorn/filename-case": "off",
-        "unicorn/no-negated-condition": "off",
-        "unicorn/prefer-top-level-await": "off",
-        "unicorn/switch-case-braces": "off",
-        "unicorn/prevent-abbreviations": "off"
-    }
-}