1
0
mirror of https://github.com/redis/node-redis.git synced 2025-08-09 00:22:08 +03:00

fix EVAL & EVALSHA, add some tests, npm update

This commit is contained in:
leibale
2021-09-29 18:20:50 -04:00
parent c19d200b91
commit 068f7f49bf
6 changed files with 25 additions and 19 deletions

View File

@@ -3,7 +3,3 @@ import { EvalOptions, pushEvalArguments } from './generic-transformers';
export function transformArguments(script: string, options?: EvalOptions): Array<string> {
return pushEvalArguments(['EVAL', script], options);
}
export function transformReply(reply: unknown): unknown {
return reply;
}

View File

@@ -3,7 +3,3 @@ import { EvalOptions, pushEvalArguments } from './generic-transformers';
export function transformArguments(sha1: string, options?: EvalOptions): Array<string> {
return pushEvalArguments(['EVALSHA', sha1], options);
}
export function transformReply(reply: unknown): unknown {
return reply;
}

View File

@@ -1,6 +1,6 @@
import { strict as assert } from 'assert';
import { TestRedisServers, itWithClient, describeHandleMinimumRedisVersion } from '../test-utils';
import { transformArguments } from './ZRANGESTORE';
import { transformArguments, transformReply } from './ZRANGESTORE';
describe('ZRANGESTORE', () => {
describeHandleMinimumRedisVersion([6, 2]);
@@ -68,6 +68,15 @@ describe('ZRANGESTORE', () => {
});
});
describe('transformReply', () => {
it('should throw TypeError when reply is not a number', () => {
assert.throws(
() => (transformReply as any)([]),
TypeError
);
});
});
itWithClient(TestRedisServers.OPEN, 'client.zRangeStore', async client => {
await client.zAdd('src', {
score: 0.5,

View File

@@ -300,6 +300,13 @@ describe('Generic Transformers', () => {
);
});
it('with COUNT', () => {
assert.deepEqual(
pushGeoCountArgument([], 1),
['COUNT', '1']
);
});
it('with ANY', () => {
assert.deepEqual(
pushGeoCountArgument([], {

View File

@@ -204,12 +204,10 @@ export function pushGeoSearchArguments(
args.push('BYBOX', by.width.toString(), by.height.toString());
}
if (by.unit) {
args.push(by.unit);
}
args.push(by.unit);
if (options?.SORT) {
args.push(options?.SORT);
args.push(options.SORT);
}
pushGeoCountArgument(args, options?.COUNT);

12
package-lock.json generated
View File

@@ -1789,9 +1789,9 @@
"dev": true
},
"node_modules/electron-to-chromium": {
"version": "1.3.853",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.853.tgz",
"integrity": "sha512-W4U8n+U8I5/SUaFcqZgbKRmYZwcyEIQVBDf+j5QQK6xChjXnQD+wj248eGR9X4u+dDmDR//8vIfbu4PrdBBIoQ==",
"version": "1.3.854",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.854.tgz",
"integrity": "sha512-00/IIC1mFPkq32MhUJyLdcTp7+wsKK2G3Sb65GSas9FKJQGYkDcZ4GwJkkxf5YyM3ETvl6n+toV8OmtXl4IA/g==",
"dev": true
},
"node_modules/emoji-regex": {
@@ -6967,9 +6967,9 @@
"dev": true
},
"electron-to-chromium": {
"version": "1.3.853",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.853.tgz",
"integrity": "sha512-W4U8n+U8I5/SUaFcqZgbKRmYZwcyEIQVBDf+j5QQK6xChjXnQD+wj248eGR9X4u+dDmDR//8vIfbu4PrdBBIoQ==",
"version": "1.3.854",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.854.tgz",
"integrity": "sha512-00/IIC1mFPkq32MhUJyLdcTp7+wsKK2G3Sb65GSas9FKJQGYkDcZ4GwJkkxf5YyM3ETvl6n+toV8OmtXl4IA/g==",
"dev": true
},
"emoji-regex": {