diff --git a/jest.config.js b/jest.config.ts similarity index 100% rename from jest.config.js rename to jest.config.ts diff --git a/lib/client.d.ts b/lib/client.d.ts index 3bf3b69..b35b994 100644 --- a/lib/client.d.ts +++ b/lib/client.d.ts @@ -17,5 +17,5 @@ export declare class DgraphClient { debug(msg: string): void anyClient(): DgraphClientStub } -export declare function isJwtExpired(err: unknown): boolean +export declare function isJwtExpired(err: any): boolean export declare function deleteEdges(mu: types.Mutation, uid: string, ...predicates: string[]): void diff --git a/lib/txn.d.ts b/lib/txn.d.ts index 7a88a81..ac45969 100644 --- a/lib/txn.d.ts +++ b/lib/txn.d.ts @@ -18,7 +18,7 @@ export declare class Txn { queryWithVars( q: string, vars?: { - [k: string]: unknown + [k: string]: any }, metadata?: grpc.Metadata, options?: grpc.CallOptions, @@ -27,7 +27,7 @@ export declare class Txn { queryRDFWithVars( q: string, vars?: { - [k: string]: unknown + [k: string]: any }, metadata?: grpc.Metadata, options?: grpc.CallOptions, diff --git a/lib/txn.js b/lib/txn.js index 5f4c1ff..a2f72e8 100644 --- a/lib/txn.js +++ b/lib/txn.js @@ -248,10 +248,10 @@ var Txn = (function () { } Txn.prototype.doRequest = function (req, metadata, options) { return __awaiter(this, void 0, void 0, function () { - var mutationList, resp, c, operation, _a, _b, e_1, _c, _d, e_2 + var mutationList, resp, c, operation, _a, _b, e_1, _c, _d, _e var _this = this - return __generator(this, function (_e) { - switch (_e.label) { + return __generator(this, function (_f) { + switch (_f.label) { case 0: mutationList = req.getMutationsList() if (this.finished) { @@ -289,33 +289,33 @@ var Txn = (function () { }) }) } - _e.label = 1 + _f.label = 1 case 1: - _e.trys.push([1, 3, , 11]) + _f.trys.push([1, 3, , 11]) _b = (_a = types).createResponse return [4, operation()] case 2: - resp = _b.apply(_a, [_e.sent()]) + resp = _b.apply(_a, [_f.sent()]) return [3, 11] case 3: - e_1 = _e.sent() + e_1 = _f.sent() if (!((0, client_1.isJwtExpired)(e_1) === true)) return [3, 6] return [4, c.retryLogin(metadata, options)] case 4: - _e.sent() + _f.sent() _d = (_c = types).createResponse return [4, operation()] case 5: - resp = _d.apply(_c, [_e.sent()]) + resp = _d.apply(_c, [_f.sent()]) return [3, 10] case 6: - _e.trys.push([6, 8, , 9]) + _f.trys.push([6, 8, , 9]) return [4, this.discard(metadata, options)] case 7: - _e.sent() + _f.sent() return [3, 9] case 8: - e_2 = _e.sent() + _e = _f.sent() return [3, 9] case 9: throw (0, util_1.isAbortedError)(e_1) || (0, util_1.isConflictError)(e_1) @@ -336,7 +336,7 @@ var Txn = (function () { } Txn.prototype.commit = function (metadata, options) { return __awaiter(this, void 0, void 0, function () { - var c, operation, e_3 + var c, operation, e_2 var _this = this return __generator(this, function (_a) { switch (_a.label) { @@ -364,8 +364,8 @@ var Txn = (function () { _a.sent() return [3, 8] case 3: - e_3 = _a.sent() - if (!((0, client_1.isJwtExpired)(e_3) === true)) return [3, 6] + e_2 = _a.sent() + if (!((0, client_1.isJwtExpired)(e_2) === true)) return [3, 6] return [4, c.retryLogin(metadata, options)] case 4: _a.sent() @@ -374,7 +374,7 @@ var Txn = (function () { _a.sent() return [3, 7] case 6: - throw (0, util_1.isAbortedError)(e_3) ? errors_1.ERR_ABORTED : e_3 + throw (0, util_1.isAbortedError)(e_2) ? errors_1.ERR_ABORTED : e_2 case 7: return [3, 8] case 8: @@ -385,7 +385,7 @@ var Txn = (function () { } Txn.prototype.discard = function (metadata, options) { return __awaiter(this, void 0, void 0, function () { - var c, operation, e_4 + var c, operation, e_3 var _this = this return __generator(this, function (_a) { switch (_a.label) { @@ -414,8 +414,8 @@ var Txn = (function () { _a.sent() return [3, 8] case 3: - e_4 = _a.sent() - if (!((0, client_1.isJwtExpired)(e_4) === true)) return [3, 6] + e_3 = _a.sent() + if (!((0, client_1.isJwtExpired)(e_3) === true)) return [3, 6] return [4, c.retryLogin(metadata, options)] case 4: _a.sent() @@ -424,7 +424,7 @@ var Txn = (function () { _a.sent() return [3, 7] case 6: - throw (0, util_1.isAbortedError)(e_4) ? errors_1.ERR_ABORTED : e_4 + throw (0, util_1.isAbortedError)(e_3) ? errors_1.ERR_ABORTED : e_3 case 7: return [3, 8] case 8: diff --git a/lib/types.d.ts b/lib/types.d.ts index 577f88a..2c29294 100644 --- a/lib/types.d.ts +++ b/lib/types.d.ts @@ -1,27 +1,27 @@ import * as messages from "../generated/api_pb" export declare class Payload extends messages.Payload { - getData(): unknown + getData(): string | Uint8Array getData_asB64(): string getData_asU8(): Uint8Array - setData(value: unknown): void + setData(value: any): void } export declare function createPayload(oldPayload: messages.Payload): Payload export declare class Response extends messages.Response { - getJson(): unknown + getJson(): string | Uint8Array getJson_asB64(): string getJson_asU8(): Uint8Array - setJson(value: unknown): void + setJson(value: any): void } export declare function createResponse(oldResponse: messages.Response): Response export declare class Mutation extends messages.Mutation { - getSetJson(): unknown + getSetJson(): string | Uint8Array getSetJson_asB64(): string getSetJson_asU8(): Uint8Array - setSetJson(value: unknown): void - getDeleteJson(): unknown + setSetJson(value: any): void + getDeleteJson(): string | Uint8Array getDeleteJson_asB64(): string getDeleteJson_asU8(): Uint8Array - setDeleteJson(value: unknown): void + setDeleteJson(value: any): void getSetNquads(): Uint8Array | string getSetNquads_asB64(): string getSetNquads_asU8(): Uint8Array diff --git a/lib/util.d.ts b/lib/util.d.ts index ac4b632..21e7a63 100644 --- a/lib/util.d.ts +++ b/lib/util.d.ts @@ -1,18 +1,18 @@ import * as jspb from "google-protobuf" -export declare function errorCode(err: unknown): { +export declare function errorCode(err: any): { valid: boolean code: number } -export declare function isAbortedError(err: unknown): boolean -export declare function isConflictError(err: unknown): boolean -export declare function isUnauthenticatedError(err: unknown): boolean +export declare function isAbortedError(err: any): boolean +export declare function isConflictError(err: any): boolean +export declare function isUnauthenticatedError(err: any): boolean export declare function promisify1( f: (arg: A, cb: (err?: Error, res?: T) => void) => void, - thisContext?: unknown, + thisContext?: any, ): (arg: A) => Promise export declare function promisify3( f: (argA: A, argB: B, argC: C, cb: (err?: Error, res?: T) => void) => void, - thisContext?: unknown, + thisContext?: any, ): (argA: A, argB: B, argC: C) => Promise export declare function stringifyMessage(msg: jspb.Message): string export { isBase64 } from "is-base64" @@ -20,4 +20,4 @@ export declare function strToB64(str: string): string export declare function strToU8(str: string): Uint8Array export declare function b64ToStr(b64Str: string): string export declare function u8ToStr(arr: Uint8Array): string -export declare function strToJson(jsonStr: string): unknown +export declare function strToJson(jsonStr: string): any diff --git a/lib/util.js b/lib/util.js index 793750d..de37863 100644 --- a/lib/util.js +++ b/lib/util.js @@ -18,7 +18,7 @@ function errorCode(err) { if ( err === undefined || typeof err !== "object" || - !err.hasOwnProperty("code") || + !Object.prototype.hasOwnProperty.call(err, "code") || typeof err.code !== "number" ) { return { @@ -92,7 +92,7 @@ function u8ToStr(arr) { function strToJson(jsonStr) { try { return JSON.parse(jsonStr) - } catch (e) { + } catch (_a) { return {} } } diff --git a/package-lock.json b/package-lock.json index be6acc5..359c43e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,10 +18,13 @@ "devDependencies": { "@trunkio/launcher": "^1.3.2", "@types/google-protobuf": "^3.15.12", + "@types/jest": "^29.5.14", "@types/node": "^22.10.5", "eslint": "^9.18.0", "grpc-tools": "^1.12.4", "jest": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", "typescript": "^5.7.2", "typescript-eslint": "^8.20.0" } @@ -91,18 +94,6 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -637,6 +628,30 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -1453,6 +1468,34 @@ "node": ">=18.0.0" } }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -1545,6 +1588,17 @@ "@types/istanbul-lib-report": "*" } }, + "node_modules/@types/jest": { + "version": "29.5.14", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz", + "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -1833,6 +1887,19 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -1945,6 +2012,13 @@ "node": ">=10" } }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT" + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -1954,6 +2028,13 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "dev": true, + "license": "MIT" + }, "node_modules/babel-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", @@ -2130,6 +2211,19 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/bser": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", @@ -2331,6 +2425,13 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -2415,6 +2516,16 @@ "node": ">=8" } }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/diff-sequences": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", @@ -2424,6 +2535,22 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.5.34", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.34.tgz", @@ -2803,6 +2930,39 @@ "node": ">=16.0.0" } }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -3349,6 +3509,25 @@ "node": ">=8" } }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", @@ -3958,6 +4137,19 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -4025,6 +4217,13 @@ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -4069,6 +4268,13 @@ "semver": "bin/semver.js" } }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true, + "license": "ISC" + }, "node_modules/makeerror": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", @@ -5065,6 +5271,99 @@ "typescript": ">=4.8.4" } }, + "node_modules/ts-jest": { + "version": "29.2.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz", + "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "^0.2.6", + "ejs": "^3.1.10", + "fast-json-stable-stringify": "^2.1.0", + "jest-util": "^29.0.0", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.6.3", + "yargs-parser": "^21.1.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/transform": "^29.0.0", + "@jest/types": "^29.0.0", + "babel-jest": "^29.0.0", + "jest": "^29.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/transform": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + } + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -5184,6 +5483,13 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "license": "MIT" + }, "node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", @@ -5343,6 +5649,16 @@ "node": ">=12" } }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index a9b62b4..b97f0f5 100644 --- a/package.json +++ b/package.json @@ -33,14 +33,18 @@ "coveralls": "cat ./coverage/lcov.info | coveralls" }, "devDependencies": { + "@trunkio/launcher": "^1.3.2", "@types/google-protobuf": "^3.15.12", + "@types/jest": "^29.5.14", "@types/node": "^22.10.5", - "@trunkio/launcher": "^1.3.2", "eslint": "^9.18.0", - "typescript-eslint": "^8.20.0", + "@eslint/js": "^9.18.0", "grpc-tools": "^1.12.4", "jest": "^29.7.0", - "typescript": "^5.7.2" + "ts-jest": "^29.2.5", + "ts-node": "^10.9.2", + "typescript": "^5.7.2", + "typescript-eslint": "^8.20.0" }, "dependencies": { "@grpc/grpc-js": "^1.12.5", diff --git a/src/client.ts b/src/client.ts index 84f1bb8..47e49c8 100644 --- a/src/client.ts +++ b/src/client.ts @@ -95,7 +95,7 @@ export class DgraphClient { } // isJwtExpired returns true if the error indicates that the jwt has expired. -export function isJwtExpired(err: unknown): boolean { +export function isJwtExpired(err: any): boolean { if (!err) { return false } diff --git a/src/txn.ts b/src/txn.ts index 9ae048c..aa46d2f 100644 --- a/src/txn.ts +++ b/src/txn.ts @@ -76,7 +76,7 @@ export class Txn { */ public async queryWithVars( q: string, - vars?: { [k: string]: unknown }, + vars?: { [k: string]: any }, metadata?: grpc.Metadata, options?: grpc.CallOptions, ): Promise { @@ -123,7 +123,7 @@ export class Txn { */ public async queryRDFWithVars( q: string, - vars?: { [k: string]: unknown }, + vars?: { [k: string]: any }, metadata?: grpc.Metadata, options?: grpc.CallOptions, ): Promise { diff --git a/src/types.ts b/src/types.ts index d1564d2..b99c607 100644 --- a/src/types.ts +++ b/src/types.ts @@ -10,7 +10,7 @@ import { b64ToStr, isBase64, strToB64, strToJson, strToU8, u8ToStr } from "./uti * Payload represents the return value of an alter operation. */ export class Payload extends messages.Payload { - public getData(): object { + public getData(): any { let jsonStr: string const value = super.getData() if (value instanceof Uint8Array) { @@ -40,7 +40,7 @@ export class Payload extends messages.Payload { return value } - public setData(value: unknown): void { + public setData(value: any): void { if (value instanceof Uint8Array) { super.setData(value) return @@ -68,7 +68,7 @@ export function createPayload(oldPayload: messages.Payload): Payload { * Response represents the return value of a mutation or query operations. */ export class Response extends messages.Response { - public getJson(): unknown { + public getJson(): any { let jsonStr: string const value = super.getJson() if (value instanceof Uint8Array) { @@ -98,7 +98,7 @@ export class Response extends messages.Response { return value } - public setJson(value: unknown): void { + public setJson(value: any): void { if (value instanceof Uint8Array) { super.setJson(value) return @@ -126,7 +126,7 @@ export function createResponse(oldResponse: messages.Response): Response { * Mutation represents the request value of a muatate operation. */ export class Mutation extends messages.Mutation { - public getSetJson(): unknown { + public getSetJson(): any { let jsonStr: string const value = super.getSetJson() if (value instanceof Uint8Array) { @@ -156,7 +156,7 @@ export class Mutation extends messages.Mutation { return value } - public setSetJson(value: unknown): void { + public setSetJson(value: any): void { if (value instanceof Uint8Array) { super.setSetJson(value) return @@ -170,7 +170,7 @@ export class Mutation extends messages.Mutation { super.setSetJson(strToU8(jsonStr)) } - public getDeleteJson(): unknown { + public getDeleteJson(): any { let jsonStr: string const value = super.getDeleteJson() if (value instanceof Uint8Array) { @@ -200,7 +200,7 @@ export class Mutation extends messages.Mutation { return value } - public setDeleteJson(value: unknown): void { + public setDeleteJson(value: any): void { if (value instanceof Uint8Array) { super.setDeleteJson(value) return diff --git a/src/util.ts b/src/util.ts index c9164f0..ed4c880 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1,12 +1,12 @@ import * as grpc from "@grpc/grpc-js" import * as jspb from "google-protobuf" -export function errorCode(err: unknown): { valid: boolean; code: number } { +export function errorCode(err: any): { valid: boolean; code: number } { if ( err === undefined || typeof err !== "object" || !Object.prototype.hasOwnProperty.call(err, "code") || - typeof (err as { code?: unknown }).code !== "number" + typeof (err as { code?: any }).code !== "number" ) { return { valid: false, @@ -20,30 +20,30 @@ export function errorCode(err: unknown): { valid: boolean; code: number } { } } -export function isAbortedError(err: unknown): boolean { +export function isAbortedError(err: any): boolean { const ec = errorCode(err) return ec.valid && ec.code === grpc.status.ABORTED } -export function isConflictError(err: unknown): boolean { +export function isConflictError(err: any): boolean { const ec = errorCode(err) return ( ec.valid && (ec.code === grpc.status.ABORTED || ec.code === grpc.status.FAILED_PRECONDITION) ) } -export function isUnauthenticatedError(err: unknown): boolean { +export function isUnauthenticatedError(err: any): boolean { const ec = errorCode(err) return ec.valid && ec.code === grpc.status.UNAUTHENTICATED } export function promisify1( f: (arg: A, cb: (err?: Error, res?: T) => void) => void, - thisContext?: unknown, + thisContext?: any, ): (arg: A) => Promise { return (arg: A) => { return new Promise( - (resolve: (value?: T | PromiseLike) => void, reject: (reason?: unknown) => void): void => { + (resolve: (value?: T | PromiseLike) => void, reject: (reason?: any) => void): void => { f.call(thisContext, arg, (err?: Error, result?: T): void => err !== undefined && err !== null ? reject(err) : resolve(result), ) @@ -54,11 +54,11 @@ export function promisify1( export function promisify3( f: (argA: A, argB: B, argC: C, cb: (err?: Error, res?: T) => void) => void, - thisContext?: unknown, + thisContext?: any, ): (argA: A, argB: B, argC: C) => Promise { return (argA: A, argB: B, argC: C) => { return new Promise( - (resolve: (value?: T | PromiseLike) => void, reject: (reason?: unknown) => void): void => { + (resolve: (value?: T | PromiseLike) => void, reject: (reason?: any) => void): void => { f.call(thisContext, argA, argB, argC, (err?: Error, result?: T): void => err !== undefined && err !== null ? reject(err) : resolve(result), ) @@ -95,7 +95,7 @@ export function u8ToStr(arr: Uint8Array): string { return buf.toString() } -export function strToJson(jsonStr: string): unknown { +export function strToJson(jsonStr: string): any { try { return JSON.parse(jsonStr) } catch {