@upstash/redis 1.23.0-next.1 → 1.23.2

package/esm/pkg/commands/mod.js

@@ -120,7 +120,6 @@ export * from "./touch.js";
 export * from "./ttl.js";
 export * from "./type.js";
 export * from "./unlink.js";
-export * from "./xadd.js";
 export * from "./zadd.js";
 export * from "./zcard.js";
 export * from "./zcount.js";
@@ -139,3 +138,5 @@ export * from "./zrevrank.js";
 export * from "./zscan.js";
 export * from "./zscore.js";
 export * from "./zunionstore.js";
+export * from "./xadd.js";
+export * from "./xrange.js";

package/esm/pkg/commands/xrange.js

@@ -0,0 +1,37 @@
+import { Command } from "./command.js";
+function deserialize(result) {
+    if (result.length === 0) {
+        return {};
+    }
+    const obj = {};
+    while (result.length >= 2) {
+        const streamId = result.shift();
+        const entries = result.shift();
+        if (!(streamId in obj)) {
+            obj[streamId] = {};
+        }
+        while (entries.length >= 2) {
+            const field = entries.shift();
+            const value = entries.shift();
+            try {
+                obj[streamId][field] = JSON.parse(value);
+            }
+            catch {
+                obj[streamId][field] = value;
+            }
+        }
+    }
+    return obj;
+}
+export class XRangeCommand extends Command {
+    constructor([key, start, end, count], opts) {
+        const command = ["XRANGE", key, start, end];
+        if (typeof count === "number") {
+            command.push("COUNT", count);
+        }
+        super(command, {
+            deserialize: (result) => deserialize(result[0]),
+            ...opts,
+        });
+    }
+}

package/esm/pkg/pipeline.js

@@ -92,7 +92,6 @@ export class Pipeline {
                     path,
                     body: Object.values(this.commands).map((c) => c.command),
                 }));
-                console.log("after req", { res });
                 return res.map(({ error, result }, i) => {
                     if (error) {
                         throw new UpstashError(`Command ${i + 1} [ ${this.commands[i].command[0]} ] failed: ${error}`);

package/esm/pkg/redis.js

@@ -1,4 +1,4 @@
-import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HRandFieldCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, JsonArrAppendCommand, JsonArrIndexCommand, JsonArrInsertCommand, JsonArrLenCommand, JsonArrPopCommand, JsonArrTrimCommand, JsonClearCommand, JsonDelCommand, JsonForgetCommand, JsonGetCommand, JsonMGetCommand, JsonNumIncrByCommand, JsonNumMultByCommand, JsonObjKeysCommand, JsonObjLenCommand, JsonRespCommand, JsonSetCommand, JsonStrAppendCommand, JsonStrLenCommand, JsonToggleCommand, JsonTypeCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LMoveCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMIsMemberCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
+import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HRandFieldCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, JsonArrAppendCommand, JsonArrIndexCommand, JsonArrInsertCommand, JsonArrLenCommand, JsonArrPopCommand, JsonArrTrimCommand, JsonClearCommand, JsonDelCommand, JsonForgetCommand, JsonGetCommand, JsonMGetCommand, JsonNumIncrByCommand, JsonNumMultByCommand, JsonObjKeysCommand, JsonObjLenCommand, JsonRespCommand, JsonSetCommand, JsonStrAppendCommand, JsonStrLenCommand, JsonToggleCommand, JsonTypeCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LMoveCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMIsMemberCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, XAddCommand, XRangeCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
 import { Pipeline } from "./pipeline.js";
 import { Script } from "./script.js";
 import { ZMScoreCommand } from "./commands/zmscore.js";
@@ -1005,10 +1005,24 @@ export class Redis {
             writable: true,
             value: (...args) => new UnlinkCommand(args, this.opts).exec(this.client)
         });
-        // /**
-        //  * @see https://redis.io/commands/xadd
-        //  */
-        // xadd =
+        /**
+         * @see https://redis.io/commands/xadd
+         */
+        Object.defineProperty(this, "xadd", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new XAddCommand(args, this.opts).exec(this.client)
+        });
+        /**
+         * @see https://redis.io/commands/xrange
+         */
+        Object.defineProperty(this, "xrange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new XRangeCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zadd
          */

package/esm/version.js

@@ -1 +1 @@
-export const VERSION = "v0.0.0";
+export const VERSION = "v1.23.2";

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/platforms/nodejs.js",
   "types": "./types/platforms/nodejs.d.ts",
   "name": "@upstash/redis",
-  "version": "1.23.0-next.1",
+  "version": "v1.23.2",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",

package/script/pkg/commands/mod.js

@@ -136,7 +136,6 @@ __exportStar(require("./touch.js"), exports);
 __exportStar(require("./ttl.js"), exports);
 __exportStar(require("./type.js"), exports);
 __exportStar(require("./unlink.js"), exports);
-__exportStar(require("./xadd.js"), exports);
 __exportStar(require("./zadd.js"), exports);
 __exportStar(require("./zcard.js"), exports);
 __exportStar(require("./zcount.js"), exports);
@@ -155,3 +154,5 @@ __exportStar(require("./zrevrank.js"), exports);
 __exportStar(require("./zscan.js"), exports);
 __exportStar(require("./zscore.js"), exports);
 __exportStar(require("./zunionstore.js"), exports);
+__exportStar(require("./xadd.js"), exports);
+__exportStar(require("./xrange.js"), exports);

package/script/pkg/commands/xrange.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XRangeCommand = void 0;
+const command_js_1 = require("./command.js");
+function deserialize(result) {
+    if (result.length === 0) {
+        return {};
+    }
+    const obj = {};
+    while (result.length >= 2) {
+        const streamId = result.shift();
+        const entries = result.shift();
+        if (!(streamId in obj)) {
+            obj[streamId] = {};
+        }
+        while (entries.length >= 2) {
+            const field = entries.shift();
+            const value = entries.shift();
+            try {
+                obj[streamId][field] = JSON.parse(value);
+            }
+            catch {
+                obj[streamId][field] = value;
+            }
+        }
+    }
+    return obj;
+}
+class XRangeCommand extends command_js_1.Command {
+    constructor([key, start, end, count], opts) {
+        const command = ["XRANGE", key, start, end];
+        if (typeof count === "number") {
+            command.push("COUNT", count);
+        }
+        super(command, {
+            deserialize: (result) => deserialize(result[0]),
+            ...opts,
+        });
+    }
+}
+exports.XRangeCommand = XRangeCommand;

package/script/pkg/pipeline.js

@@ -95,7 +95,6 @@ class Pipeline {
                     path,
                     body: Object.values(this.commands).map((c) => c.command),
                 }));
-                console.log("after req", { res });
                 return res.map(({ error, result }, i) => {
                     if (error) {
                         throw new error_js_1.UpstashError(`Command ${i + 1} [ ${this.commands[i].command[0]} ] failed: ${error}`);

package/script/pkg/redis.js

@@ -1008,10 +1008,24 @@ class Redis {
             writable: true,
             value: (...args) => new mod_js_1.UnlinkCommand(args, this.opts).exec(this.client)
         });
-        // /**
-        //  * @see https://redis.io/commands/xadd
-        //  */
-        // xadd =
+        /**
+         * @see https://redis.io/commands/xadd
+         */
+        Object.defineProperty(this, "xadd", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new mod_js_1.XAddCommand(args, this.opts).exec(this.client)
+        });
+        /**
+         * @see https://redis.io/commands/xrange
+         */
+        Object.defineProperty(this, "xrange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new mod_js_1.XRangeCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zadd
          */

package/script/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "v0.0.0";
+exports.VERSION = "v1.23.2";

package/types/pkg/commands/mod.d.ts

@@ -120,7 +120,6 @@ export * from "./touch.js";
 export * from "./ttl.js";
 export * from "./type.js";
 export * from "./unlink.js";
-export * from "./xadd.js";
 export * from "./zadd.js";
 export * from "./zcard.js";
 export * from "./zcount.js";
@@ -139,3 +138,5 @@ export * from "./zrevrank.js";
 export * from "./zscan.js";
 export * from "./zscore.js";
 export * from "./zunionstore.js";
+export * from "./xadd.js";
+export * from "./xrange.js";

package/types/pkg/commands/xrange.d.ts

@@ -0,0 +1,9 @@
+import { Command, CommandOptions } from "./command.js";
+export declare class XRangeCommand<TData extends Record<string, Record<string, unknown>>> extends Command<string[][], TData> {
+    constructor([key, start, end, count]: [
+        key: string,
+        start: string,
+        end: string,
+        count?: number
+    ], opts?: CommandOptions<unknown[], TData[]>);
+}

package/types/pkg/redis.d.ts

@@ -562,6 +562,31 @@ export declare class Redis {
      * @see https://redis.io/commands/unlink
      */
     unlink: (...args: CommandArgs<typeof UnlinkCommand>) => Promise<number>;
+    /**
+     * @see https://redis.io/commands/xadd
+     */
+    xadd: (key: string, id: string, entries: {
+        [field: string]: unknown;
+    }, opts?: {
+        nomkStream?: boolean | undefined;
+        trim?: (({
+            type: "MAXLEN" | "maxlen";
+            threshold: number;
+        } | {
+            type: "MINID" | "minid";
+            threshold: string;
+        }) & ({
+            comparison: "~";
+            limit?: number | undefined;
+        } | {
+            comparison: "=";
+            limit?: undefined;
+        })) | undefined;
+    } | undefined) => Promise<string>;
+    /**
+     * @see https://redis.io/commands/xrange
+     */
+    xrange: (key: string, start: string, end: string, count?: number | undefined) => Promise<Record<string, Record<string, unknown>>>;
     /**
      * @see https://redis.io/commands/zadd
      */

package/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "v0.0.0";
+export declare const VERSION = "v1.23.2";