libshv-js 7.1.0 → 7.1.2

package/dist/cpon.d.ts

@@ -22,7 +22,7 @@ declare class CponReader {
 }
 declare class CponWriter {
     private readonly indentString?;
-    private oneLiners;
+    private readonly oneLiners;
     ctx: PackContext;
     nestLevel: number;
     constructor(indentString?: string | undefined, oneLiners?: OneLiners);

package/dist/json.js

@@ -4,6 +4,7 @@ exports.toJson = exports.fromJson = void 0;
 const cpcontext_1 = require("./cpcontext");
 const cpon_1 = require("./cpon");
 const rpcvalue_1 = require("./rpcvalue");
+// eslint-disable-next-line @typescript-eslint/no-restricted-types
 const decodeMap = (x) => (0, rpcvalue_1.makeMap)(Object.fromEntries(Object.entries(x).map(([key, value]) => [key, decodeValueJson(value)])));
 const decodeValueJson = (x) => {
     switch (true) {
@@ -104,7 +105,6 @@ const encodeValueJson = (x) => {
         case x instanceof Date:
             return [JSON_TAG_TYPE, 'DateTime', (0, cpon_1.stringifyDate)(x)];
         case x === undefined:
-            // eslint-disable-next-line unicorn/no-null
             return null;
         case x instanceof rpcvalue_1.Decimal:
         case x instanceof rpcvalue_1.UInt:

package/dist/rpcmessage.d.ts

@@ -1,4 +1,4 @@
-import { Double, IMap, MetaMap, RpcValue, type RpcValueWithMetaData } from './rpcvalue';
+import { type Double, type IMap, type MetaMap, type RpcValue, type RpcValueWithMetaData } from './rpcvalue';
 export declare const RPC_MESSAGE_REQUEST_ID = 8;
 export declare const RPC_MESSAGE_SHV_PATH = 9;
 export declare const RPC_MESSAGE_METHOD = 10;

package/dist/rpcvalue.js

@@ -48,10 +48,13 @@ const withOffset = (date, utcOffset) => {
 exports.withOffset = withOffset;
 const shvMapType = Symbol('shvMapType');
 exports.shvMapType = shvMapType;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const isShvMap = (x) => typeof x === 'object' && x[shvMapType] === 'map';
 exports.isShvMap = isShvMap;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const isIMap = (x) => typeof x === 'object' && x[shvMapType] === 'imap';
 exports.isIMap = isIMap;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const isMetaMap = (x) => typeof x === 'object' && x[shvMapType] === 'metamap';
 exports.isMetaMap = isMetaMap;
 const typeName = (x) => {
@@ -73,16 +76,19 @@ const typeName = (x) => {
     }
 };
 exports.typeName = typeName;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const makeMetaMap = (x = {}) => ({
     ...x,
     [shvMapType]: 'metamap',
 });
 exports.makeMetaMap = makeMetaMap;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const makeIMap = (x = {}) => ({
     ...x,
     [shvMapType]: 'imap',
 });
 exports.makeIMap = makeIMap;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const makeMap = (x = {}) => ({
     ...x,
     [shvMapType]: 'map',

package/dist/shv-ri.d.ts

@@ -1,12 +1,12 @@
 export declare class ShvRI {
-    private ri;
-    private methodSepIx;
-    private signalSepIx?;
+    static fromPathMethodSignal(path: string, method: string, signal?: string): ShvRI;
+    private readonly ri;
+    private readonly methodSepIx;
+    private readonly signalSepIx?;
     constructor(ri: string);
     path(): string;
     method(): string;
     signal(): string | undefined;
     hasSignal(): boolean;
     asString(): string;
-    static fromPathMethodSignal(path: string, method: string, signal?: string): ShvRI;
 }

package/dist/shv-ri.js

@@ -2,6 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShvRI = void 0;
 class ShvRI {
+    static fromPathMethodSignal(path, method, signal) {
+        const m = method.length === 0 ? '*' : method;
+        const ri = signal !== undefined
+            ? `${path}:${m}:${signal}`
+            : `${path}:${m}`;
+        return new ShvRI(ri);
+    }
     ri;
     methodSepIx;
     signalSepIx;
@@ -44,12 +51,5 @@ class ShvRI {
     asString() {
         return this.ri;
     }
-    static fromPathMethodSignal(path, method, signal) {
-        const m = method.length === 0 ? '*' : method;
-        const ri = signal !== undefined
-            ? `${path}:${m}:${signal}`
-            : `${path}:${m}`;
-        return new ShvRI(ri);
-    }
 }
 exports.ShvRI = ShvRI;

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { ShvRI } from './shv-ri';
+import { type ShvRI } from './shv-ri';
 export type StringGetter = string | Promise<string> | (() => string | Promise<string>);
 export declare const resolveString: (input: StringGetter) => string | Promise<string>;
 export type RIGetter = ShvRI | Promise<ShvRI> | (() => ShvRI | Promise<ShvRI>);

package/dist/ws-client.d.ts

@@ -1,6 +1,6 @@
 import { type RpcMessage, type RpcRequest, type ErrorMap } from './rpcmessage';
 import { type RpcValue, type Null, type Int, type IMap, type ShvMap } from './rpcvalue';
-import { RIGetter } from './utils';
+import { type RIGetter } from './utils';
 type SubscriptionCallback = (path: string, signal: string, param?: RpcValue) => void;
 type ResultOrError<T = RpcValue> = T | Error;
 type Login = {
@@ -218,8 +218,8 @@ declare class WsClient {
     private requestId;
     private pingTimerId;
     private rpcHandlers;
-    private requestHandlers;
-    private abortedRequests;
+    private readonly requestHandlers;
+    private readonly abortedRequests;
     private readonly subscriptions;
     private readonly websocket;
     private readonly options;

package/dist/ws-client.js

@@ -11,6 +11,7 @@ const DEFAULT_TIMEOUT = 5000;
 const DEFAULT_PING_INTERVAL = 30 * 1000;
 const defaultParseMessage = (rpcVal) => {
     // Assume rpcVal is a valid RpcMessage - no runtime validation
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const rpcMsg = rpcVal;
     return rpcMsg;
 };
@@ -179,13 +180,13 @@ class WsClient {
                 };
                 if (rpcmessage_1.RPC_MESSAGE_ABORT in request.value) {
                     const requestHandler = this.requestHandlers.get(requestId);
-                    if (request.value[rpcmessage_1.RPC_MESSAGE_ABORT] === true) {
+                    if (request.value[rpcmessage_1.RPC_MESSAGE_ABORT]) {
                         this.abortedRequests.add(requestId);
                         if (requestHandler?.options.onAbort !== undefined) {
                             requestHandler.options.onAbort();
                         }
                     }
-                    if (request.value[rpcmessage_1.RPC_MESSAGE_ABORT] === false && requestHandler?.options.onProgressQuery !== undefined) {
+                    if (!request.value[rpcmessage_1.RPC_MESSAGE_ABORT] && requestHandler?.options.onProgressQuery !== undefined) {
                         const progress = requestHandler.options.onProgressQuery();
                         sendDelay(progress instanceof Promise ? await progress : progress);
                     }
@@ -352,10 +353,11 @@ class WsClient {
                         return new exports.NotImplemented(`Got an RpcResponse with unsupported keys: ${rpcMessageKeys.join(' ')}`);
                     }
                 })());
-                // eslint-disable-next-line @typescript-eslint/no-array-delete
+                // eslint-disable-next-line @typescript-eslint/no-array-delete, @typescript-eslint/no-dynamic-delete
                 delete this.rpcHandlers[Number(requestId)];
             }
         };
+        // eslint-disable-next-line @typescript-eslint/strict-void-return
         this.websocket.addEventListener('message', async (evt) => {
             const rpcVal = dataToRpcValue(evt.data);
             const parseMessage = this.options.parseMessage ?? defaultParseMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "description": "Typescript implementation of libshv",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,10 +40,10 @@
     "@typescript-eslint/parser": "^8.56.1",
     "@eslint/js": "^10.0.1",
     "eslint": "^10.0.0",
-    "eslint-config-xo": "^0.50.0",
+    "eslint-config-xo": "^0.51.0",
     "eslint-formatter-unix": "^9.0.1",
-    "eslint-plugin-unicorn": "^63.0.0",
-    "typescript": "^5.9.3",
+    "eslint-plugin-unicorn": "^64.0.0",
+    "typescript": "^6.0.2",
     "typescript-eslint": "^8.46.1"
   }
 }