From 0cabe71cf846dead6abb56c33a23d13990ce8a08 Mon Sep 17 00:00:00 2001 From: leibale Date: Tue, 16 Nov 2021 02:35:24 -0500 Subject: [PATCH] replace @redis with @node-redis --- .github/README.md | 6 +- .release-it.json | 2 +- index.ts | 18 +- package-lock.json | 192 +++++++++++----------- package.json | 6 +- packages/client/.release-it.json | 2 +- packages/client/README.md | 2 +- packages/client/lib/test-utils.ts | 2 +- packages/client/package.json | 4 +- packages/json/.release-it.json | 2 +- packages/json/README.md | 2 +- packages/json/lib/commands/GET.ts | 2 +- packages/json/lib/test-utils.ts | 2 +- packages/json/package.json | 6 +- packages/search/.release-it.json | 2 +- packages/search/README.md | 2 +- packages/search/lib/commands/AGGREGATE.ts | 4 +- packages/search/lib/commands/CREATE.ts | 2 +- packages/search/lib/commands/DICTADD.ts | 4 +- packages/search/lib/commands/DICTDEL.ts | 4 +- packages/search/lib/commands/SEARCH.ts | 4 +- packages/search/lib/commands/SUGDEL.ts | 2 +- packages/search/lib/commands/SYNUPDATE.ts | 4 +- packages/search/lib/commands/index.ts | 2 +- packages/search/lib/test-utils.ts | 2 +- packages/search/package.json | 6 +- packages/test-utils/lib/dockers.ts | 6 +- packages/test-utils/lib/index.ts | 6 +- packages/test-utils/package.json | 4 +- 29 files changed, 153 insertions(+), 149 deletions(-) diff --git a/.github/README.md b/.github/README.md index f14b71d9f2..c704680510 100644 --- a/.github/README.md +++ b/.github/README.md @@ -281,9 +281,9 @@ Node Redis is supported with the following versions of Redis: | Name | Description | |-------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | [redis](../) | [![Downloads](https://img.shields.io/npm/dm/redis.svg)](https://www.npmjs.com/package/redis/v/next) [![Version](https://img.shields.io/npm/v/redis/next.svg)](https://www.npmjs.com/package/redis/v/next) | -| [@redis/client](../packages/client) | [![Downloads](https://img.shields.io/npm/dm/@redis/client.svg)](https://www.npmjs.com/package/@redis/client/v/next) [![Version](https://img.shields.io/npm/v/@redis/client/next.svg)](https://www.npmjs.com/package/@redis/client/v/next) | -| [@redis/json](../packages/json) | [![Downloads](https://img.shields.io/npm/dm/@redis/json.svg)](https://www.npmjs.com/package/@redis/json/v/next) [![Version](https://img.shields.io/npm/v/@redis/json/next.svg)](https://www.npmjs.com/package/@redis/json/v/next) [Redis JSON](https://oss.redis.com/redisjson/) commands | -| [@redis/search](../packages/search) | [![Downloads](https://img.shields.io/npm/dm/@redis/search.svg)](https://www.npmjs.com/package/@redis/search/v/next) [![Version](https://img.shields.io/npm/v/@redis/search/next.svg)](https://www.npmjs.com/package/@redis/search/v/next) [Redis Search](https://oss.redis.com/redisearch/) commands | +| [@node-redis/client](../packages/client) | [![Downloads](https://img.shields.io/npm/dm/@node-redis/client.svg)](https://www.npmjs.com/package/@node-redis/client/v/next) [![Version](https://img.shields.io/npm/v/@node-redis/client/next.svg)](https://www.npmjs.com/package/@node-redis/client/v/next) | +| [@node-redis/json](../packages/json) | [![Downloads](https://img.shields.io/npm/dm/@node-redis/json.svg)](https://www.npmjs.com/package/@node-redis/json/v/next) [![Version](https://img.shields.io/npm/v/@node-redis/json/next.svg)](https://www.npmjs.com/package/@node-redis/json/v/next) [Redis JSON](https://oss.redis.com/redisjson/) commands | +| [@node-redis/search](../packages/search) | [![Downloads](https://img.shields.io/npm/dm/@node-redis/search.svg)](https://www.npmjs.com/package/@node-redis/search/v/next) [![Version](https://img.shields.io/npm/v/@node-redis/search/next.svg)](https://www.npmjs.com/package/@node-redis/search/v/next) [Redis Search](https://oss.redis.com/redisearch/) commands | ## Contributing diff --git a/.release-it.json b/.release-it.json index 7fd2ef2991..982b4ac6cb 100644 --- a/.release-it.json +++ b/.release-it.json @@ -4,4 +4,4 @@ "commitMessage": "Release ${tagName}", "tagAnnotation": "Release ${tagName}" } -} \ No newline at end of file +} diff --git a/index.ts b/index.ts index 610da7c2bd..8fb31edb08 100644 --- a/index.ts +++ b/index.ts @@ -1,13 +1,13 @@ -import { createClient as _createClient, createCluster as _createCluster } from '@redis/client'; -import { RedisScripts } from '@redis/client/dist/lib/commands'; -import { RedisClientOptions, RedisClientType } from '@redis/client/dist/lib/client'; -import { RedisClusterOptions, RedisClusterType } from '@redis/client/dist/lib/cluster'; -import RedisJSON from '@redis/json'; -import RediSearch from '@redis/search'; +import { createClient as _createClient, createCluster as _createCluster } from '@node-redis/client'; +import { RedisScripts } from '@node-redis/client/dist/lib/commands'; +import { RedisClientOptions, RedisClientType } from '@node-redis/client/dist/lib/client'; +import { RedisClusterOptions, RedisClusterType } from '@node-redis/client/dist/lib/cluster'; +import RedisJSON from '@node-redis/json'; +import RediSearch from '@node-redis/search'; -export * from '@redis/client'; -export * from '@redis/json'; -export * from '@redis/search'; +export * from '@node-redis/client'; +export * from '@node-redis/json'; +export * from '@node-redis/search'; const modules = { json: RedisJSON, diff --git a/package-lock.json b/package-lock.json index 2732b2d9a1..5af35d6bad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,9 +12,9 @@ "./packages/*" ], "dependencies": { - "@redis/client": "^1.0.0-rc", - "@redis/json": "^1.0.0-rc", - "@redis/search": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc", + "@node-redis/json": "^1.0.0-rc", + "@node-redis/search": "^1.0.0-rc" }, "devDependencies": { "@tsconfig/node12": "^1.0.9", @@ -653,6 +653,22 @@ "node": ">=8" } }, + "node_modules/@node-redis/client": { + "resolved": "packages/client", + "link": true + }, + "node_modules/@node-redis/json": { + "resolved": "packages/json", + "link": true + }, + "node_modules/@node-redis/search": { + "resolved": "packages/search", + "link": true + }, + "node_modules/@node-redis/test-utils": { + "resolved": "packages/test-utils", + "link": true + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -820,22 +836,6 @@ "@octokit/openapi-types": "^11.2.0" } }, - "node_modules/@redis/client": { - "resolved": "packages/client", - "link": true - }, - "node_modules/@redis/json": { - "resolved": "packages/json", - "link": true - }, - "node_modules/@redis/search": { - "resolved": "packages/search", - "link": true - }, - "node_modules/@redis/test-utils": { - "resolved": "packages/test-utils", - "link": true - }, "node_modules/@sindresorhus/is": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz", @@ -6411,6 +6411,7 @@ } }, "packages/client": { + "name": "@node-redis/client", "version": "1.0.0-rc", "license": "MIT", "dependencies": { @@ -6421,7 +6422,7 @@ }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", + "@node-redis/test-utils": "*", "@types/node": "^16.11.7", "@types/redis-parser": "^3.0.0", "@types/sinon": "^10.0.6", @@ -6444,11 +6445,12 @@ } }, "packages/json": { + "name": "@node-redis/json", "version": "1.0.0-rc.0", "license": "MIT", "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", + "@node-redis/test-utils": "*", "@types/node": "^16.11.7", "nyc": "^15.1.0", "release-it": "^14.11.7", @@ -6457,15 +6459,16 @@ "typescript": "^4.4.4" }, "peerDependencies": { - "@redis/client": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc" } }, "packages/search": { + "name": "@node-redis/search", "version": "1.0.0-rc.0", "license": "MIT", "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", + "@node-redis/test-utils": "*", "@types/node": "^16.11.7", "nyc": "^15.1.0", "release-it": "^14.11.7", @@ -6474,10 +6477,11 @@ "typescript": "^4.4.4" }, "peerDependencies": { - "@redis/client": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc" } }, "packages/test-utils": { + "name": "@node-redis/test-utils", "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", "@types/mocha": "^9.0.0", @@ -6492,7 +6496,7 @@ "yargs": "^17.2.1" }, "peerDependencies": { - "@redis/client": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc" } } }, @@ -6981,6 +6985,75 @@ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true }, + "@node-redis/client": { + "version": "file:packages/client", + "requires": { + "@istanbuljs/nyc-config-typescript": "^1.0.1", + "@node-redis/test-utils": "*", + "@types/node": "^16.11.7", + "@types/redis-parser": "^3.0.0", + "@types/sinon": "^10.0.6", + "@types/yallist": "^4.0.1", + "@typescript-eslint/eslint-plugin": "^5.4.0", + "@typescript-eslint/parser": "^5.4.0", + "cluster-key-slot": "1.1.0", + "eslint": "^8.2.0", + "generic-pool": "3.8.2", + "nyc": "^15.1.0", + "redis-parser": "3.0.0", + "release-it": "^14.11.7", + "sinon": "^12.0.1", + "source-map-support": "^0.5.20", + "ts-node": "^10.4.0", + "typedoc": "^0.22.9", + "typedoc-github-wiki-theme": "^0.6.0", + "typedoc-plugin-markdown": "^3.11.6", + "typescript": "^4.4.4", + "yallist": "4.0.0" + } + }, + "@node-redis/json": { + "version": "file:packages/json", + "requires": { + "@istanbuljs/nyc-config-typescript": "^1.0.1", + "@node-redis/test-utils": "*", + "@types/node": "^16.11.7", + "nyc": "^15.1.0", + "release-it": "^14.11.7", + "source-map-support": "^0.5.20", + "ts-node": "^10.4.0", + "typescript": "^4.4.4" + } + }, + "@node-redis/search": { + "version": "file:packages/search", + "requires": { + "@istanbuljs/nyc-config-typescript": "^1.0.1", + "@node-redis/test-utils": "*", + "@types/node": "^16.11.7", + "nyc": "^15.1.0", + "release-it": "^14.11.7", + "source-map-support": "^0.5.20", + "ts-node": "^10.4.0", + "typescript": "^4.4.4" + } + }, + "@node-redis/test-utils": { + "version": "file:packages/test-utils", + "requires": { + "@istanbuljs/nyc-config-typescript": "^1.0.1", + "@types/mocha": "^9.0.0", + "@types/node": "^16.11.7", + "@types/yargs": "^17.0.5", + "mocha": "^9.1.3", + "nyc": "^15.1.0", + "release-it": "^14.11.7", + "source-map-support": "^0.5.20", + "ts-node": "^10.4.0", + "typescript": "^4.4.4", + "yargs": "^17.2.1" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -7131,75 +7204,6 @@ "@octokit/openapi-types": "^11.2.0" } }, - "@redis/client": { - "version": "file:packages/client", - "requires": { - "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", - "@types/node": "^16.11.7", - "@types/redis-parser": "^3.0.0", - "@types/sinon": "^10.0.6", - "@types/yallist": "^4.0.1", - "@typescript-eslint/eslint-plugin": "^5.4.0", - "@typescript-eslint/parser": "^5.4.0", - "cluster-key-slot": "1.1.0", - "eslint": "^8.2.0", - "generic-pool": "3.8.2", - "nyc": "^15.1.0", - "redis-parser": "3.0.0", - "release-it": "^14.11.7", - "sinon": "^12.0.1", - "source-map-support": "^0.5.20", - "ts-node": "^10.4.0", - "typedoc": "^0.22.9", - "typedoc-github-wiki-theme": "^0.6.0", - "typedoc-plugin-markdown": "^3.11.6", - "typescript": "^4.4.4", - "yallist": "4.0.0" - } - }, - "@redis/json": { - "version": "file:packages/json", - "requires": { - "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", - "@types/node": "^16.11.7", - "nyc": "^15.1.0", - "release-it": "^14.11.7", - "source-map-support": "^0.5.20", - "ts-node": "^10.4.0", - "typescript": "^4.4.4" - } - }, - "@redis/search": { - "version": "file:packages/search", - "requires": { - "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", - "@types/node": "^16.11.7", - "nyc": "^15.1.0", - "release-it": "^14.11.7", - "source-map-support": "^0.5.20", - "ts-node": "^10.4.0", - "typescript": "^4.4.4" - } - }, - "@redis/test-utils": { - "version": "file:packages/test-utils", - "requires": { - "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@types/mocha": "^9.0.0", - "@types/node": "^16.11.7", - "@types/yargs": "^17.0.5", - "mocha": "^9.1.3", - "nyc": "^15.1.0", - "release-it": "^14.11.7", - "source-map-support": "^0.5.20", - "ts-node": "^10.4.0", - "typescript": "^4.4.4", - "yargs": "^17.2.1" - } - }, "@sindresorhus/is": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz", diff --git a/package.json b/package.json index d576c3232b..5986f0f068 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "build-all": "npm run build:client && npm run build:test-utils && npm run build:modules && npm run build" }, "dependencies": { - "@redis/client": "^1.0.0-rc", - "@redis/json": "^1.0.0-rc", - "@redis/search": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc", + "@node-redis/json": "^1.0.0-rc", + "@node-redis/search": "^1.0.0-rc" }, "devDependencies": { "@tsconfig/node12": "^1.0.9", diff --git a/packages/client/.release-it.json b/packages/client/.release-it.json index 60235ee23e..035124348c 100644 --- a/packages/client/.release-it.json +++ b/packages/client/.release-it.json @@ -7,4 +7,4 @@ "npm": { "publishArgs": ["--access", "public"] } -} \ No newline at end of file +} diff --git a/packages/client/README.md b/packages/client/README.md index d9c8f80f2f..37c326fc42 100644 --- a/packages/client/README.md +++ b/packages/client/README.md @@ -1,2 +1,2 @@ -# @redis/client +# @node-redis/client The sources and docs for this package are in the main [node-redis](https://github.com/redis/node-redis) repo. diff --git a/packages/client/lib/test-utils.ts b/packages/client/lib/test-utils.ts index 85057da841..321a9da63d 100644 --- a/packages/client/lib/test-utils.ts +++ b/packages/client/lib/test-utils.ts @@ -1,4 +1,4 @@ -import TestUtils from '@redis/test-utils'; +import TestUtils from '@node-redis/test-utils'; import { SinonSpy } from 'sinon'; import { promiseTimeout } from './utils'; diff --git a/packages/client/package.json b/packages/client/package.json index 3e874af1af..8a2e2ed725 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,5 +1,5 @@ { - "name": "@redis/client", + "name": "@node-redis/client", "version": "1.0.0-rc", "license": "MIT", "main": "./dist/index.js", @@ -18,7 +18,7 @@ }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", + "@node-redis/test-utils": "*", "@types/node": "^16.11.7", "@types/redis-parser": "^3.0.0", "@types/sinon": "^10.0.6", diff --git a/packages/json/.release-it.json b/packages/json/.release-it.json index 68337fbd5c..ab495a49b1 100644 --- a/packages/json/.release-it.json +++ b/packages/json/.release-it.json @@ -7,4 +7,4 @@ "npm": { "publishArgs": ["--access", "public"] } -} \ No newline at end of file +} diff --git a/packages/json/README.md b/packages/json/README.md index 45264d671b..1cd599d5ea 100644 --- a/packages/json/README.md +++ b/packages/json/README.md @@ -1,2 +1,2 @@ -# @redis/json +# @node-redis/json The sources and docs for this package are in the main [node-redis](https://github.com/redis/node-redis) repo. diff --git a/packages/json/lib/commands/GET.ts b/packages/json/lib/commands/GET.ts index 36bb9bc4e4..8e897bb67d 100644 --- a/packages/json/lib/commands/GET.ts +++ b/packages/json/lib/commands/GET.ts @@ -1,4 +1,4 @@ -import { pushVerdictArguments } from '@redis/client/dist/lib/commands/generic-transformers'; +import { pushVerdictArguments } from '@node-redis/client/dist/lib/commands/generic-transformers'; export const FIRST_KEY_INDEX = 1; diff --git a/packages/json/lib/test-utils.ts b/packages/json/lib/test-utils.ts index 140e781d91..eeee3c77c9 100644 --- a/packages/json/lib/test-utils.ts +++ b/packages/json/lib/test-utils.ts @@ -1,4 +1,4 @@ -import TestUtils from '@redis/test-utils'; +import TestUtils from '@node-redis/test-utils'; import RedisJSON from '.'; export default new TestUtils({ diff --git a/packages/json/package.json b/packages/json/package.json index 41f1ec3064..7e5f6e10c1 100644 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -1,5 +1,5 @@ { - "name": "@redis/json", + "name": "@node-redis/json", "version": "1.0.0-rc.0", "license": "MIT", "main": "./dist/index.js", @@ -9,11 +9,11 @@ "build": "tsc" }, "peerDependencies": { - "@redis/client": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc" }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", + "@node-redis/test-utils": "*", "@types/node": "^16.11.7", "nyc": "^15.1.0", "release-it": "^14.11.7", diff --git a/packages/search/.release-it.json b/packages/search/.release-it.json index 9abec2264c..72cb1016ef 100644 --- a/packages/search/.release-it.json +++ b/packages/search/.release-it.json @@ -7,4 +7,4 @@ "npm": { "publishArgs": ["--access", "public"] } -} \ No newline at end of file +} diff --git a/packages/search/README.md b/packages/search/README.md index 08db1a72dc..856a75fbb5 100644 --- a/packages/search/README.md +++ b/packages/search/README.md @@ -1,2 +1,2 @@ -# @redis/search +# @node-redis/search The sources and docs for this package are in the main [node-redis](https://github.com/redis/node-redis) repo. diff --git a/packages/search/lib/commands/AGGREGATE.ts b/packages/search/lib/commands/AGGREGATE.ts index affc98b51d..c81dcfef4d 100644 --- a/packages/search/lib/commands/AGGREGATE.ts +++ b/packages/search/lib/commands/AGGREGATE.ts @@ -1,5 +1,5 @@ -import { RedisCommandArguments } from '@redis/client/dist/lib/commands'; -import { pushVerdictArgument, transformReplyTuples, TuplesObject } from '@redis/client/dist/lib/commands/generic-transformers'; +import { RedisCommandArguments } from '@node-redis/client/dist/lib/commands'; +import { pushVerdictArgument, transformReplyTuples, TuplesObject } from '@node-redis/client/dist/lib/commands/generic-transformers'; import { PropertyName, pushArgumentsWithLength, pushSortByArguments, SortByOptions } from '.'; export enum AggregateSteps { diff --git a/packages/search/lib/commands/CREATE.ts b/packages/search/lib/commands/CREATE.ts index b67896cd64..1a5e45a4a8 100644 --- a/packages/search/lib/commands/CREATE.ts +++ b/packages/search/lib/commands/CREATE.ts @@ -1,4 +1,4 @@ -import { pushOptionalVerdictArgument } from '@redis/client/dist/lib/commands/generic-transformers'; +import { pushOptionalVerdictArgument } from '@node-redis/client/dist/lib/commands/generic-transformers'; import { RedisSearchLanguages, PropertyName } from '.'; export enum SchemaFieldTypes { diff --git a/packages/search/lib/commands/DICTADD.ts b/packages/search/lib/commands/DICTADD.ts index 60af11fd41..b3f993395f 100644 --- a/packages/search/lib/commands/DICTADD.ts +++ b/packages/search/lib/commands/DICTADD.ts @@ -1,5 +1,5 @@ -import { RedisCommandArguments } from '@redis/client/dist/lib/commands'; -import { pushVerdictArguments } from '@redis/client/dist/lib/commands/generic-transformers'; +import { RedisCommandArguments } from '@node-redis/client/dist/lib/commands'; +import { pushVerdictArguments } from '@node-redis/client/dist/lib/commands/generic-transformers'; export function transformArguments(dictionary: string, term: string | Array): RedisCommandArguments { return pushVerdictArguments(['FT.DICTADD', dictionary], term); diff --git a/packages/search/lib/commands/DICTDEL.ts b/packages/search/lib/commands/DICTDEL.ts index a1b728f192..bd047a5031 100644 --- a/packages/search/lib/commands/DICTDEL.ts +++ b/packages/search/lib/commands/DICTDEL.ts @@ -1,5 +1,5 @@ -import { RedisCommandArguments } from '@redis/client/dist/lib/commands'; -import { pushVerdictArguments } from '@redis/client/dist/lib/commands/generic-transformers'; +import { RedisCommandArguments } from '@node-redis/client/dist/lib/commands'; +import { pushVerdictArguments } from '@node-redis/client/dist/lib/commands/generic-transformers'; export function transformArguments(dictionary: string, term: string | Array): RedisCommandArguments { return pushVerdictArguments(['FT.DICTDEL', dictionary], term); diff --git a/packages/search/lib/commands/SEARCH.ts b/packages/search/lib/commands/SEARCH.ts index a773514a73..9616bfa0be 100644 --- a/packages/search/lib/commands/SEARCH.ts +++ b/packages/search/lib/commands/SEARCH.ts @@ -1,5 +1,5 @@ -import { RedisCommandArguments } from '@redis/client/dist/lib/commands'; -import { pushOptionalVerdictArgument, pushVerdictArgument, transformReplyTuples } from '@redis/client/dist/lib/commands/generic-transformers'; +import { RedisCommandArguments } from '@node-redis/client/dist/lib/commands'; +import { pushOptionalVerdictArgument, pushVerdictArgument, transformReplyTuples } from '@node-redis/client/dist/lib/commands/generic-transformers'; import { RedisSearchLanguages, PropertyName, pushSortByArguments, SortByOptions } from '.'; export const FIRST_KEY_INDEX = 1; diff --git a/packages/search/lib/commands/SUGDEL.ts b/packages/search/lib/commands/SUGDEL.ts index be2d4262ca..43f4744c00 100644 --- a/packages/search/lib/commands/SUGDEL.ts +++ b/packages/search/lib/commands/SUGDEL.ts @@ -2,4 +2,4 @@ export function transformArguments(key: string, string: string): Array { return ['FT.SUGDEL', key, string]; } -export { transformReplyBoolean as transformReply } from '@redis/client/dist/lib/commands/generic-transformers'; +export { transformReplyBoolean as transformReply } from '@node-redis/client/dist/lib/commands/generic-transformers'; diff --git a/packages/search/lib/commands/SYNUPDATE.ts b/packages/search/lib/commands/SYNUPDATE.ts index 3384ea59d9..b59d35617f 100644 --- a/packages/search/lib/commands/SYNUPDATE.ts +++ b/packages/search/lib/commands/SYNUPDATE.ts @@ -1,5 +1,5 @@ -import { pushVerdictArguments } from '@redis/client/dist/lib/commands/generic-transformers'; -import { RedisCommandArguments } from '@redis/client/dist/lib/commands'; +import { pushVerdictArguments } from '@node-redis/client/dist/lib/commands/generic-transformers'; +import { RedisCommandArguments } from '@node-redis/client/dist/lib/commands'; interface SynUpdateOptions { SKIPINITIALSCAN?: true; diff --git a/packages/search/lib/commands/index.ts b/packages/search/lib/commands/index.ts index c10a10774b..70626c00df 100644 --- a/packages/search/lib/commands/index.ts +++ b/packages/search/lib/commands/index.ts @@ -26,7 +26,7 @@ import * as SUGLEN from './SUGLEN'; import * as SYNDUMP from './SYNDUMP'; import * as SYNUPDATE from './SYNUPDATE'; import * as TAGVALS from './TAGVALS'; -import { RedisCommandArguments } from '@redis/client/dist/lib/commands'; +import { RedisCommandArguments } from '@node-redis/client/dist/lib/commands'; export default { _LIST, diff --git a/packages/search/lib/test-utils.ts b/packages/search/lib/test-utils.ts index c68504c21d..4af05e1062 100644 --- a/packages/search/lib/test-utils.ts +++ b/packages/search/lib/test-utils.ts @@ -1,4 +1,4 @@ -import TestUtils from '@redis/test-utils'; +import TestUtils from '@node-redis/test-utils'; import RediSearch from '.'; export default new TestUtils({ diff --git a/packages/search/package.json b/packages/search/package.json index 33bf7fffe4..a72678c2ad 100644 --- a/packages/search/package.json +++ b/packages/search/package.json @@ -1,5 +1,5 @@ { - "name": "@redis/search", + "name": "@node-redis/search", "version": "1.0.0-rc.0", "license": "MIT", "main": "./dist/index.js", @@ -9,11 +9,11 @@ "build": "tsc" }, "peerDependencies": { - "@redis/client": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc" }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1", - "@redis/test-utils": "*", + "@node-redis/test-utils": "*", "@types/node": "^16.11.7", "nyc": "^15.1.0", "release-it": "^14.11.7", diff --git a/packages/test-utils/lib/dockers.ts b/packages/test-utils/lib/dockers.ts index 052388970e..3dd6dcf3eb 100644 --- a/packages/test-utils/lib/dockers.ts +++ b/packages/test-utils/lib/dockers.ts @@ -1,8 +1,8 @@ import { createConnection } from 'net'; import { once } from 'events'; -import { RedisModules, RedisScripts } from '@redis/client/lib/commands'; -import RedisClient, { RedisClientType } from '@redis/client/lib/client'; -import { promiseTimeout } from '@redis/client/lib/utils'; +import { RedisModules, RedisScripts } from '@node-redis/client/lib/commands'; +import RedisClient, { RedisClientType } from '@node-redis/client/lib/client'; +import { promiseTimeout } from '@node-redis/client/lib/utils'; import * as path from 'path'; import { promisify } from 'util'; import { exec } from 'child_process'; diff --git a/packages/test-utils/lib/index.ts b/packages/test-utils/lib/index.ts index f9a1fc1dbd..8e20df7581 100644 --- a/packages/test-utils/lib/index.ts +++ b/packages/test-utils/lib/index.ts @@ -1,6 +1,6 @@ -import { RedisModules, RedisScripts } from '@redis/client/lib/commands'; -import RedisClient, { RedisClientOptions, RedisClientType } from '@redis/client/lib/client'; -import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@redis/client/lib/cluster'; +import { RedisModules, RedisScripts } from '@node-redis/client/lib/commands'; +import RedisClient, { RedisClientOptions, RedisClientType } from '@node-redis/client/lib/client'; +import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@node-redis/client/lib/cluster'; import { RedisServerDockerConfig, spawnRedisServer, spawnRedisCluster } from './dockers'; import yargs from 'yargs'; import { hideBin } from 'yargs/helpers'; diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index a1b7c4d416..47ddc25acf 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,5 +1,5 @@ { - "name": "@redis/test-utils", + "name": "@node-redis/test-utils", "private": true, "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -8,7 +8,7 @@ "test": "echo \"TODO\"" }, "peerDependencies": { - "@redis/client": "^1.0.0-rc" + "@node-redis/client": "^1.0.0-rc" }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "^1.0.1",