@blackglory/cache-js 0.7.0 → 0.8.1

package/lib/cache.d.ts

@@ -1,5 +1,5 @@
-import { IStats } from './contract';
-export { IStats } from './contract';
+import { IStats } from './contract.js';
+export { IStats } from './contract.js';
 export interface IMetadata {
     updatedAt: number;
     timeToLive: number | null;

package/lib/cache.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheClient = void 0;
-const rpc_client_1 = require("./utils/rpc-client");
-const extra_abort_1 = require("extra-abort");
-const prelude_1 = require("@blackglory/prelude");
-class CacheClient {
+import { createRPCClient } from "./utils/rpc-client.js";
+import { timeoutSignal, withAbortSignal } from 'extra-abort';
+import { isNull } from '@blackglory/prelude';
+export class CacheClient {
     constructor(client, batchClient, batchProxy, closeClients, timeout) {
         this.client = client;
         this.batchClient = batchClient;
@@ -13,7 +10,7 @@ class CacheClient {
         this.timeout = timeout;
     }
     static async create(options) {
-        const { client, batchClient, proxy, close } = await (0, rpc_client_1.createRPCClient)(options.server);
+        const { client, batchClient, proxy, close } = await createRPCClient(options.server);
         return new CacheClient(client, batchClient, proxy, close, options.timeout);
     }
     async close() {
@@ -28,7 +25,7 @@ class CacheClient {
     async getWithMetadata(namespace, key, timeout) {
         return await this.withTimeout(async () => {
             const result = await this.client.getWithMetadata(namespace, key);
-            if ((0, prelude_1.isNull)(result))
+            if (isNull(result))
                 return null;
             return {
                 value: result.value,
@@ -65,12 +62,11 @@ class CacheClient {
     }
     async withTimeout(fn, timeout = this.timeout) {
         if (timeout) {
-            return await (0, extra_abort_1.withAbortSignal)((0, extra_abort_1.timeoutSignal)(timeout), fn);
+            return await withAbortSignal(timeoutSignal(timeout), fn);
         }
         else {
             return await fn();
         }
     }
 }
-exports.CacheClient = CacheClient;
 //# sourceMappingURL=cache.js.map

package/lib/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AAGnD,6CAA4D;AAC5D,iDAA4C;AAc5C,MAAa,WAAW;IACtB,YACU,MAAyB,EACzB,WAAwB,EACxB,UAA2C,EAC3C,YAAiC,EACjC,OAAgB;QAJhB,WAAM,GAAN,MAAM,CAAmB;QACzB,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAiC;QAC3C,iBAAY,GAAZ,YAAY,CAAqB;QACjC,YAAO,GAAP,OAAO,CAAS;IACvB,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAA4B;QAC9C,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,4BAAe,EACjE,OAAO,CAAC,MAAM,CACf,CAAA;QACD,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QACxD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EACrC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QACxD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EACrC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QAIpE,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,KAAK,IAAI,EAAE;YACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;YAChE,IAAI,IAAA,gBAAM,EAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAA;YAE/B,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,QAAQ,EAAE;oBACR,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;oBACpC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;iBACvC;aACF,CAAA;QACH,CAAC,EACD,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CACX,SAAiB,EACjB,IAAc,EACd,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,KAAK,IAAI,EAAE;YACT,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAC7C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CACxD,CAAA;YACD,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,CAAC,EACD,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CACP,SAAiB,EACjB,GAAW,EACX,KAAa,EACb,UAAyB,EACzB,OAAgB;QAEhB,MAAM,IAAI,CAAC,WAAW,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CACnB,SAAS,EACT,GAAG,EACH,KAAK,EACL,UAAU,CACX,EACD,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAgB;QACxD,MAAM,IAAI,CAAC,WAAW,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EACrC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,OAAgB;QAC7C,MAAM,IAAI,CAAC,WAAW,CACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAClC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,OAAgB;QACtD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAC3C,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAgB;QACrC,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,EACpC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB,EAAE,OAAgB;QAC7C,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAClC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,OAAO,CACxB,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,EAAwB,EACxB,UAA8B,IAAI,CAAC,OAAO;QAE1C,IAAI,OAAO,EAAE;YACX,OAAO,MAAM,IAAA,6BAAe,EAAC,IAAA,2BAAa,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAA;SACzD;aAAM;YACL,OAAO,MAAM,EAAE,EAAE,CAAA;SAClB;IACH,CAAC;CACF;AAtID,kCAsIC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}

package/lib/contract.d.ts

@@ -20,4 +20,4 @@ export interface IMetadata {
     updatedAt: number;
     timeToLive: number | null;
 }
-export declare const expectedVersion = "^0.6.0";
+export declare const expectedVersion = "^0.6.0 || ^0.7.0";

package/lib/contract.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectedVersion = void 0;
-exports.expectedVersion = '^0.6.0';
+export const expectedVersion = '^0.6.0 || ^0.7.0';
 //# sourceMappingURL=contract.js.map

package/lib/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":";;;AA+Ba,QAAA,eAAe,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AA+BA,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAA"}

package/lib/index.d.ts

@@ -1 +1 @@
-export * from './cache';
+export * from './cache.js';

package/lib/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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("./cache"), exports);
+export * from './cache.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA"}

package/lib/utils/rpc-client.browser.d.ts

@@ -1,4 +1,4 @@
-import { IAPI } from "../contract";
+import { IAPI } from "../contract.js";
 import { ClientProxy, BatchClient, BatchClientProxy } from 'delight-rpc';
 export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
     client: ClientProxy<IAPI>;

package/lib/utils/rpc-client.browser.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRPCClient = void 0;
-const contract_1 = require("../contract");
-const delight_rpc_1 = require("delight-rpc");
-const extra_native_websocket_1 = require("@delight-rpc/extra-native-websocket");
-const extra_native_websocket_2 = require("extra-native-websocket");
-async function createRPCClient(url, retryIntervalForReconnection) {
-    const ws = new extra_native_websocket_2.ExtraNativeWebSocket(() => new WebSocket(url));
-    const cancelAutoReconnect = (0, extra_native_websocket_2.autoReconnect)(ws, retryIntervalForReconnection);
+import { expectedVersion } from "../contract.js";
+import { createBatchProxy } from 'delight-rpc';
+import { createClient, createBatchClient } from '@delight-rpc/extra-native-websocket';
+import { ExtraNativeWebSocket, autoReconnect } from 'extra-native-websocket';
+export async function createRPCClient(url, retryIntervalForReconnection) {
+    const ws = new ExtraNativeWebSocket(() => new WebSocket(url));
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
     await ws.connect();
-    const [client, closeClient] = (0, extra_native_websocket_1.createClient)(ws, { expectedVersion: contract_1.expectedVersion });
-    const [batchClient, closeBatchClient] = (0, extra_native_websocket_1.createBatchClient)(ws, { expectedVersion: contract_1.expectedVersion });
-    const proxy = (0, delight_rpc_1.createBatchProxy)();
+    const [client, closeClient] = createClient(ws, { expectedVersion });
+    const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion });
+    const proxy = createBatchProxy();
     return {
         client,
         batchClient,
@@ -24,5 +21,4 @@ async function createRPCClient(url, retryIntervalForReconnection) {
         }
     };
 }
-exports.createRPCClient = createRPCClient;
 //# sourceMappingURL=rpc-client.browser.js.map

package/lib/utils/rpc-client.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,gFAAqF;AACrF,mEAA4E;AAErE,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,MAAM,EAAE,GAAG,IAAI,6CAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,IAAA,sCAAa,EAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qCAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,0CAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AA5BD,0CA4BC"}
+{"version":3,"file":"rpc-client.browser.js","sourceRoot":"","sources":["../../src/utils/rpc-client.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AACxD,OAAO,EAA8C,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAA;AACrF,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAE5E,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,MAAM,EAAE,GAAG,IAAI,oBAAoB,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7D,MAAM,mBAAmB,GAAG,aAAa,CAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,gBAAgB,EAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}

package/lib/utils/rpc-client.d.ts

@@ -1,4 +1,4 @@
-import { IAPI } from "../contract";
+import { IAPI } from "../contract.js";
 import { ClientProxy, BatchClient, BatchClientProxy } from 'delight-rpc';
 export declare function createRPCClient(url: string, retryIntervalForReconnection?: number): Promise<{
     client: ClientProxy<IAPI>;

package/lib/utils/rpc-client.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRPCClient = void 0;
-const contract_1 = require("../contract");
-const delight_rpc_1 = require("delight-rpc");
-const extra_websocket_1 = require("@delight-rpc/extra-websocket");
-const ws_1 = require("ws");
-const extra_websocket_2 = require("extra-websocket");
-async function createRPCClient(url, retryIntervalForReconnection) {
-    const ws = new extra_websocket_2.ExtraWebSocket(() => new ws_1.WebSocket(url));
-    const cancelAutoReconnect = (0, extra_websocket_2.autoReconnect)(ws, retryIntervalForReconnection);
+import { expectedVersion } from "../contract.js";
+import { createBatchProxy } from 'delight-rpc';
+import { createClient, createBatchClient } from '@delight-rpc/extra-websocket';
+import { WebSocket } from 'ws';
+import { ExtraWebSocket, autoReconnect } from 'extra-websocket';
+export async function createRPCClient(url, retryIntervalForReconnection) {
+    const ws = new ExtraWebSocket(() => new WebSocket(url));
+    const cancelAutoReconnect = autoReconnect(ws, retryIntervalForReconnection);
     await ws.connect();
-    const [client, closeClient] = (0, extra_websocket_1.createClient)(ws, { expectedVersion: contract_1.expectedVersion });
-    const [batchClient, closeBatchClient] = (0, extra_websocket_1.createBatchClient)(ws, { expectedVersion: contract_1.expectedVersion });
-    const proxy = (0, delight_rpc_1.createBatchProxy)();
+    const [client, closeClient] = createClient(ws, { expectedVersion });
+    const [batchClient, closeBatchClient] = createBatchClient(ws, { expectedVersion });
+    const proxy = createBatchProxy();
     return {
         client,
         batchClient,
@@ -25,5 +22,4 @@ async function createRPCClient(url, retryIntervalForReconnection) {
         }
     };
 }
-exports.createRPCClient = createRPCClient;
 //# sourceMappingURL=rpc-client.js.map

package/lib/utils/rpc-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AACrD,6CAA0F;AAC1F,kEAA8E;AAC9E,2BAA8B;AAC9B,qDAA+D;AAExD,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,MAAM,EAAE,GAAG,IAAI,gCAAc,CAAC,GAAG,EAAE,CAAC,IAAI,cAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,IAAA,+BAAa,EAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,8BAAY,EAAO,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,IAAA,mCAAiB,EAAC,EAAE,EAAE,EAAE,eAAe,EAAf,0BAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,IAAA,8BAAgB,GAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AA5BD,0CA4BC"}
+{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/utils/rpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,eAAe,EAAE,uBAAwB;AACxD,OAAO,EAA8C,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC1F,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/D,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAAW,EACX,4BAAqC;IAOrC,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IACvD,MAAM,mBAAmB,GAAG,aAAa,CAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;IAC3E,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;IAElB,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,YAAY,CAAO,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IACzE,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAA;IAClF,MAAM,KAAK,GAAG,gBAAgB,EAAQ,CAAA;IAEtC,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,WAAW,EAAE,CAAA;YACb,gBAAgB,EAAE,CAAA;YAClB,mBAAmB,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@blackglory/cache-js",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "",
   "keywords": [],
   "files": [
     "lib"
   ],
+  "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "browser": {
@@ -21,12 +22,12 @@
   "scripts": {
     "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "test": "jest --runInBand --no-cache --config jest.config.js",
-    "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
-    "test:coverage": "jest --coverage --config jest.config.js",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --no-cache --config jest.config.cjs",
+    "test:debug": "cross-env NODE_OPTIONS=--experimental-vm-modules node --inspect-brk node_modules/.bin/jest --runInBand jest.config.cjs",
+    "test:coverage": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage --config jest.config.cjs",
     "prepublishOnly": "run-s prepare clean build",
     "clean": "rimraf lib",
-    "build": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib",
+    "build": "tsc --project tsconfig.build.json",
     "docker:test": "run-s docker:test:clean docker:test:build docker:test:run docker:test:clean",
     "docker:coverage": "run-s docker:test:clean docker:test:build docker:test:coverage docker:test:clean",
     "docker:test:build": "docker-compose --project-name cache-js --file docker-compose.test.yml build",
@@ -41,33 +42,36 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
-    "@types/jest": "^29.2.4",
-    "@types/ws": "^8.5.3",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "eslint": "^8.30.0",
+    "@blackglory/jest-resolver": "^0.3.0",
+    "@commitlint/cli": "^17.4.2",
+    "@commitlint/config-conventional": "^17.4.2",
+    "@types/jest": "^29.4.0",
+    "@types/ws": "^8.5.4",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.33.0",
     "husky": "4",
-    "jest": "^29.3.1",
-    "msw": "^0.49.2",
+    "jest": "^29.4.1",
+    "jest-resolve": "^29.4.1",
+    "msw": "^1.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.0.5",
     "ts-patch": "^2.1.0",
-    "tslib": "^2.4.1",
-    "typescript": "^4.7.4",
-    "typescript-transform-paths": "^3.4.4"
+    "tslib": "^2.5.0",
+    "typescript": "4.8",
+    "typescript-transform-paths": "^3.4.6"
   },
   "dependencies": {
-    "@blackglory/prelude": "^0.2.0",
+    "@blackglory/prelude": "^0.3.1",
     "@delight-rpc/extra-native-websocket": "^0.4.0",
     "@delight-rpc/extra-websocket": "^0.4.0",
-    "delight-rpc": "^5.0.0",
-    "extra-abort": "^0.2.0",
+    "delight-rpc": "^5.0.3",
+    "extra-abort": "^0.3.1",
     "extra-native-websocket": "^0.3.1",
     "extra-websocket": "^0.3.0",
-    "ws": "^8.11.0"
+    "ws": "^8.12.0"
   }
 }