fix ADD

packages/time-series/lib/commands/ADD.spec.ts

@@ -1,80 +1,80 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './ADD';
+import ADD from './ADD';
 import { TimeSeriesDuplicatePolicies, TimeSeriesEncoding } from '.';
 
-describe('ADD', () => {
+describe('TS.ADD', () => {
-    describe('transformArguments', () => {
+  describe('transformArguments', () => {
-        it('without options', () => {
+    it('without options', () => {
-            assert.deepEqual(
+      assert.deepEqual(
-                transformArguments('key', '*', 1),
+        ADD.transformArguments('key', '*', 1),
-                ['TS.ADD', 'key', '*', '1']
+        ['TS.ADD', 'key', '*', '1']
-            );
+      );
-        });
-
-        it('with RETENTION', () => {
-            assert.deepEqual(
-                transformArguments('key', '*', 1, {
-                    RETENTION: 1
-                }),
-                ['TS.ADD', 'key', '*', '1', 'RETENTION', '1']
-            );
-        });
-
-        it('with ENCODING', () => {
-            assert.deepEqual(
-                transformArguments('key', '*', 1, {
-                    ENCODING: TimeSeriesEncoding.UNCOMPRESSED
-                }),
-                ['TS.ADD', 'key', '*', '1', 'ENCODING', 'UNCOMPRESSED']
-            );
-        });
-
-        it('with CHUNK_SIZE', () => {
-            assert.deepEqual(
-                transformArguments('key', '*', 1, {
-                    CHUNK_SIZE: 1
-                }),
-                ['TS.ADD', 'key', '*', '1', 'CHUNK_SIZE', '1']
-            );
-        });
-
-        it('with ON_DUPLICATE', () => {
-            assert.deepEqual(
-                transformArguments('key', '*', 1, {
-                    ON_DUPLICATE: TimeSeriesDuplicatePolicies.BLOCK
-                }),
-                ['TS.ADD', 'key', '*', '1', 'ON_DUPLICATE', 'BLOCK']
-            );
-        });
-
-        it('with LABELS', () => {
-            assert.deepEqual(
-                transformArguments('key', '*', 1, {
-                    LABELS: { label: 'value' }
-                }),
-                ['TS.ADD', 'key', '*', '1', 'LABELS', 'label', 'value']
-            );
-        });
-
-        it('with RETENTION, ENCODING, CHUNK_SIZE, ON_DUPLICATE, LABELS', () => {
-            assert.deepEqual(
-                transformArguments('key', '*', 1, {
-                    RETENTION: 1,
-                    ENCODING: TimeSeriesEncoding.UNCOMPRESSED,
-                    CHUNK_SIZE: 1,
-                    ON_DUPLICATE: TimeSeriesDuplicatePolicies.BLOCK,
-                    LABELS: { label: 'value' }
-                }),
-                ['TS.ADD', 'key', '*', '1', 'RETENTION', '1', 'ENCODING', 'UNCOMPRESSED', 'CHUNK_SIZE', '1', 'ON_DUPLICATE', 'BLOCK', 'LABELS', 'label', 'value']
-            );
-        });
     });
 
-    testUtils.testWithClient('client.ts.add', async client => {
+    it('with RETENTION', () => {
-        assert.equal(
+      assert.deepEqual(
-            await client.ts.add('key', 0, 1),
+        ADD.transformArguments('key', '*', 1, {
-            0
+          RETENTION: 1
-        );
+        }),
-    }, GLOBAL.SERVERS.OPEN);
+        ['TS.ADD', 'key', '*', '1', 'RETENTION', '1']
+      );
+    });
+
+    it('with ENCODING', () => {
+      assert.deepEqual(
+        ADD.transformArguments('key', '*', 1, {
+          ENCODING: TimeSeriesEncoding.UNCOMPRESSED
+        }),
+        ['TS.ADD', 'key', '*', '1', 'ENCODING', 'UNCOMPRESSED']
+      );
+    });
+
+    it('with CHUNK_SIZE', () => {
+      assert.deepEqual(
+        ADD.transformArguments('key', '*', 1, {
+          CHUNK_SIZE: 1
+        }),
+        ['TS.ADD', 'key', '*', '1', 'CHUNK_SIZE', '1']
+      );
+    });
+
+    it('with ON_DUPLICATE', () => {
+      assert.deepEqual(
+        ADD.transformArguments('key', '*', 1, {
+          ON_DUPLICATE: TimeSeriesDuplicatePolicies.BLOCK
+        }),
+        ['TS.ADD', 'key', '*', '1', 'ON_DUPLICATE', 'BLOCK']
+      );
+    });
+
+    it('with LABELS', () => {
+      assert.deepEqual(
+        ADD.transformArguments('key', '*', 1, {
+          LABELS: { label: 'value' }
+        }),
+        ['TS.ADD', 'key', '*', '1', 'LABELS', 'label', 'value']
+      );
+    });
+
+    it('with RETENTION, ENCODING, CHUNK_SIZE, ON_DUPLICATE, LABELS', () => {
+      assert.deepEqual(
+        ADD.transformArguments('key', '*', 1, {
+          RETENTION: 1,
+          ENCODING: TimeSeriesEncoding.UNCOMPRESSED,
+          CHUNK_SIZE: 1,
+          ON_DUPLICATE: TimeSeriesDuplicatePolicies.BLOCK,
+          LABELS: { label: 'value' }
+        }),
+        ['TS.ADD', 'key', '*', '1', 'RETENTION', '1', 'ENCODING', 'UNCOMPRESSED', 'CHUNK_SIZE', '1', 'ON_DUPLICATE', 'BLOCK', 'LABELS', 'label', 'value']
+      );
+    });
+  });
+
+  testUtils.testWithClient('client.ts.add', async client => {
+    assert.equal(
+      await client.ts.add('key', 0, 1),
+      0
+    );
+  }, GLOBAL.SERVERS.OPEN);
 });

packages/time-series/lib/commands/ADD.ts

@@ -1,31 +1,38 @@
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 import {
-    transformTimestampArgument,
+  transformTimestampArgument,
-    pushRetentionArgument,
+  pushRetentionArgument,
-    TimeSeriesEncoding,
+  TimeSeriesEncoding,
-    pushEncodingArgument,
+  pushEncodingArgument,
-    pushChunkSizeArgument,
+  pushChunkSizeArgument,
-    TimeSeriesDuplicatePolicies,
+  TimeSeriesDuplicatePolicies,
-    Labels,
+  Labels,
-    pushLabelsArgument,
+  pushLabelsArgument,
-    Timestamp,
+  Timestamp
 } from '.';
 
-interface AddOptions {
+export interface TsAddOptions {
-    RETENTION?: number;
+  RETENTION?: number;
-    ENCODING?: TimeSeriesEncoding;
+  ENCODING?: TimeSeriesEncoding;
-    CHUNK_SIZE?: number;
+  CHUNK_SIZE?: number;
-    ON_DUPLICATE?: TimeSeriesDuplicatePolicies;
+  ON_DUPLICATE?: TimeSeriesDuplicatePolicies;
-    LABELS?: Labels;
+  LABELS?: Labels;
 }
 
-export const FIRST_KEY_INDEX = 1;
+export default {
-
+  FIRST_KEY_INDEX: 1,
-export function transformArguments(key: string, timestamp: Timestamp, value: number, options?: AddOptions): Array<string> {
+  IS_READ_ONLY: false,
+  transformArguments(
+    key: RedisArgument,
+    timestamp: Timestamp,
+    value: number,
+    options?: TsAddOptions
+  ) {
     const args = [
-        'TS.ADD',
+      'TS.ADD',
-        key,
+      key,
-        transformTimestampArgument(timestamp),
+      transformTimestampArgument(timestamp),
-        value.toString()
+      value.toString()
     ];
 
     pushRetentionArgument(args, options?.RETENTION);
@@ -35,12 +42,12 @@ export function transformArguments(key: string, timestamp: Timestamp, value: num
     pushChunkSizeArgument(args, options?.CHUNK_SIZE);
 
     if (options?.ON_DUPLICATE) {
-        args.push('ON_DUPLICATE', options.ON_DUPLICATE);
+      args.push('ON_DUPLICATE', options.ON_DUPLICATE);
     }
 
     pushLabelsArgument(args, options?.LABELS);
 
     return args;
-}
+  },
-
+  transformReply: undefined as unknown as () => NumberReply
-export declare function transformReply(): number;
+} as const satisfies Command;