Skip to content

Commit ebca66d

Browse files
leibaleleibale
committed
WIP
1 parent 817818a commit ebca66d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1767
-1952
lines changed

‎package-lock.json

Lines changed: 423 additions & 144 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
},
1313
"devDependencies": {
1414
"@istanbuljs/nyc-config-typescript": "^1.0.2",
15-
"@tsconfig/node18": "^18.2.2",
1615
"@types/mocha": "^10.0.3",
17-
"@typescript-eslint/eslint-plugin": "^6.9.0",
18-
"@typescript-eslint/parser": "^6.9.0",
16+
"@types/node": "^20.8.10",
17+
"@typescript-eslint/eslint-plugin": "^6.9.1",
18+
"@typescript-eslint/parser": "^6.9.1",
1919
"gh-pages": "^6.0.0",
2020
"mocha": "^10.2.0",
2121
"nyc": "^15.1.0",
22-
"source-map-support": "^0.5.21",
23-
"ts-node": "^10.9.1",
24-
"typedoc": "^0.25.2",
22+
"tsx": "^3.14.0",
23+
"typedoc": "^0.25.3",
2524
"typescript": "^5.2.2"
2625
}
2726
}

‎packages/bloom/lib/commands/bloom/RESERVE.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
2-
import { RedisVariadicArgument, pushVariadicArguments } from '@redis/client/dist/lib/commands/generic-transformers';
32

43
export interface BfReserveOptions {
54
EXPANSION?: number;

‎packages/bloom/lib/commands/cuckoo/DEL.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
1+
import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
22
import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
33

44
export default {

‎packages/bloom/lib/commands/cuckoo/EXISTS.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
1+
import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
22
import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
33

44
export default {

‎packages/bloom/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"!dist/tsconfig.tsbuildinfo"
1010
],
1111
"scripts": {
12-
"test": "nyc -r text-summary -r lcov mocha -r source-map-support/register -r ts-node/register './lib/**/*.spec.ts'"
12+
"test": "nyc -r text-summary -r lcov mocha -r tsx './lib/**/*.spec.ts'"
1313
},
1414
"peerDependencies": {
1515
"@redis/client": "*"

‎packages/client/lib/RESP/types.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,6 @@ export type ReplyWithTypeMapping<
210210
)
211211
);
212212

213-
type a = ReplyWithTypeMapping<
214-
ArrayReply<TuplesReply<[BlobStringReply | NullReply]>>,
215-
{}
216-
>;
217-
218213
export type TransformReply = (this: void, reply: any, preserve?: any) => any; // TODO;
219214

220215
export type RedisArgument = string | Buffer;

‎packages/client/lib/client/legacy-mode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisModules, RedisFunctions, RedisScripts, RespVersions, TypeMapping, Command, CommandArguments, ReplyUnion } from '../RESP/types';
1+
import { RedisModules, RedisFunctions, RedisScripts, RespVersions, Command, CommandArguments, ReplyUnion } from '../RESP/types';
22
import { RedisClientType } from '.';
33
import { getTransformReply } from '../commander';
44
import { ErrorReply } from '../errors';

‎packages/client/lib/client/multi-command.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import COMMANDS from '../commands';
22
import RedisMultiCommand, { MULTI_REPLY, MultiReply, MultiReplyType } from '../multi-command';
3-
import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping, ReplyUnion } from '../RESP/types';
3+
import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping } from '../RESP/types';
44
import { attachConfig, functionArgumentsPrefix, getTransformReply } from '../commander';
55
import { RedisClientType } from '.';
66

‎packages/client/lib/cluster/cluster-slots.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
import { RedisClusterClientOptions, RedisClusterOptions } from '.';
22
import { RootNodesUnavailableError } from '../errors';
33
import RedisClient, { RedisClientOptions, RedisClientType } from '../client';
4-
import { types } from 'node:util';
54
import { EventEmitter } from 'node:stream';
65
import { ChannelListeners, PubSubType, PubSubTypeListeners } from '../client/pub-sub';
76
import { RedisArgument, RedisFunctions, RedisModules, RedisScripts, RespVersions, TypeMapping } from '../RESP/types';
8-
9-
// TODO: ?!
10-
// We need to use 'require', because it's not possible with Typescript to import
11-
// function that are exported as 'module.exports = function`, without esModuleInterop
12-
// set to true.
13-
const calculateSlot = require('cluster-key-slot');
7+
import calculateSlot from 'cluster-key-slot';
148

159
interface NodeAddress {
1610
host: string;

‎packages/client/lib/cluster/multi-command.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import COMMANDS from '../commands';
22
import RedisMultiCommand, { MULTI_REPLY, MultiReply, MultiReplyType } from '../multi-command';
3-
import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping, ReplyUnion, RedisArgument } from '../RESP/types';
3+
import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping, RedisArgument } from '../RESP/types';
44
import { attachConfig, functionArgumentsPrefix, getTransformReply } from '../commander';
55
import RedisCluster, { RedisClusterType } from '.';
66

‎packages/client/lib/commands/CLIENT_TRACKINGINFO.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { strict as assert } from 'node:assert';
22
import testUtils, { GLOBAL } from '../test-utils';
33
import CLIENT_TRACKINGINFO from './CLIENT_TRACKINGINFO';
4-
import { RESP_TYPES } from '../RESP/decoder';
54

65
describe('CLIENT TRACKINGINFO', () => {
76
testUtils.isVersionGreaterThanHook([6, 2]);

‎packages/client/lib/commands/FCALL.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Command } from '../RESP/types';
2-
import EVAL, { EvalOptions, transformEvalArguments } from './EVAL';
2+
import EVAL, { transformEvalArguments } from './EVAL';
33

44
export default {
55
FIRST_KEY_INDEX: EVAL.FIRST_KEY_INDEX,

‎packages/client/lib/commands/FCALL_RO.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Command } from '../RESP/types';
2-
import EVAL, { EvalOptions, transformEvalArguments } from './EVAL';
2+
import EVAL, { transformEvalArguments } from './EVAL';
33

44
export default {
55
FIRST_KEY_INDEX: EVAL.FIRST_KEY_INDEX,

‎packages/client/lib/commands/FUNCTION_LIST.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, NullReply, SetReply, UnwrapReply, Resp2Reply, CommandArguments, Command, ReplyWithTypeMapping } from '../RESP/types';
1+
import { RedisArgument, TuplesToMapReply, BlobStringReply, ArrayReply, NullReply, SetReply, UnwrapReply, Resp2Reply, CommandArguments, Command } from '../RESP/types';
22

33
export interface FunctionListOptions {
44
LIBRARYNAME?: RedisArgument;

‎packages/client/lib/commands/GEORADIUSBYMEMBER_WITH.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, CommandArguments, ArrayReply, BlobStringReply, Command } from '../RESP/types';
1+
import { RedisArgument, CommandArguments, Command } from '../RESP/types';
22
import GEORADIUSBYMEMBER from './GEORADIUSBYMEMBER';
33
import { GeoSearchOptions, GeoUnits, pushGeoSearchOptions } from './GEOSEARCH';
44
import GEOSEARCH_WITH, { GeoReplyWith } from './GEOSEARCH_WITH';

‎packages/client/lib/commands/MEMORY_STATS.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TuplesToMapReply, BlobStringReply, NumberReply, DoubleReply, ArrayReply, UnwrapReply, Resp2Reply, Command } from '../RESP/types';
1+
import { TuplesToMapReply, BlobStringReply, NumberReply, DoubleReply, ArrayReply, UnwrapReply, Command } from '../RESP/types';
22

33
export type MemoryStatsReply = TuplesToMapReply<[
44
[BlobStringReply<'peak.allocated'>, NumberReply],

‎packages/client/lib/commands/MODULE_LOAD.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { RedisArgument, SimpleStringReply, Command } from '../RESP/types';
2-
import { pushVariadicArguments } from './generic-transformers';
32

43
export default {
54
FIRST_KEY_INDEX: undefined,

‎packages/client/lib/commands/UNWATCH.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, SimpleStringReply, Command } from '../RESP/types';
1+
import { SimpleStringReply, Command } from '../RESP/types';
22

33
export default {
44
FIRST_KEY_INDEX: undefined,

‎packages/client/lib/commands/ZINCRBY.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, DoubleReply, Command } from '../RESP/types';
1+
import { RedisArgument, Command } from '../RESP/types';
22
import { transformDoubleArgument, transformDoubleReply } from './generic-transformers';
33

44
export default {

‎packages/client/lib/commands/ZSCAN.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RedisArgument, ArrayReply, BlobStringReply, Command } from '../RESP/types';
22
import { ScanCommonOptions, pushScanArguments } from './SCAN';
3-
import { SortedSetMember, transformDoubleReply, transformSortedSetReply } from './generic-transformers';
3+
import { transformSortedSetReply } from './generic-transformers';
44

55
export interface HScanEntry {
66
field: BlobStringReply;

‎packages/client/lib/commands/generic-transformers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { UnwrapReply, ArrayReply, BlobStringReply, BooleanReply, CommandArguments, DoubleReply, MapReply, NullReply, NumberReply, RedisArgument, TuplesReply, RespType } from '../RESP/types';
1+
import { UnwrapReply, ArrayReply, BlobStringReply, BooleanReply, CommandArguments, DoubleReply, NullReply, NumberReply, RedisArgument, TuplesReply } from '../RESP/types';
22

33
export function isNullReply(reply: unknown): reply is NullReply {
44
return reply === null;

‎packages/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"!dist/tsconfig.tsbuildinfo"
1010
],
1111
"scripts": {
12-
"test": "nyc -r text-summary -r lcov mocha -r source-map-support/register -r ts-node/register './lib/**/*.spec.ts'"
12+
"test": "nyc -r text-summary -r lcov mocha -r tsx './lib/**/*.spec.ts'"
1313
},
1414
"dependencies": {
1515
"cluster-key-slot": "1.1.2",

‎packages/graph/lib/graph.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisClientType } from '@redis/client/dist/lib/client/index';
1+
import { RedisClientType } from '@redis/client';
22
import { RedisArgument, RedisFunctions, RedisScripts } from '@redis/client/dist/lib/RESP/types';
33
import QUERY, { QueryOptions } from './commands/QUERY';
44

@@ -132,7 +132,7 @@ type GraphReply<T> = {
132132
type GraphClientType = RedisClientType<{
133133
graph: {
134134
query: typeof QUERY,
135-
roQuery: typeof import('./commands/RO_QUERY').default
135+
roQuery: typeof import('./commands/RO_QUERY.js').default
136136
}
137137
}, RedisFunctions, RedisScripts>;
138138

‎packages/graph/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"!dist/tsconfig.tsbuildinfo"
1010
],
1111
"scripts": {
12-
"test": "nyc -r text-summary -r lcov mocha -r source-map-support/register -r ts-node/register './lib/**/*.spec.ts'"
12+
"test": "nyc -r text-summary -r lcov mocha -r tsx './lib/**/*.spec.ts'"
1313
},
1414
"peerDependencies": {
1515
"@redis/client": "*"

‎packages/json/lib/commands/DEBUG_MEMORY.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RedisArgument, NumberReply, ArrayReply, Command } from '@redis/client/dist/lib/RESP/types';
1+
import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
22

33
export interface JsonDebugMemoryOptions {
44
path?: RedisArgument;

‎packages/json/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dist/"
99
],
1010
"scripts": {
11-
"test": "nyc -r text-summary -r lcov mocha -r source-map-support/register -r ts-node/register './lib/**/*.spec.ts'"
11+
"test": "nyc -r text-summary -r lcov mocha -r tsx './lib/**/*.spec.ts'"
1212
},
1313
"peerDependencies": {
1414
"@redis/client": "*"

0 commit comments

Comments
 (0)