@upstash/redis 0.0.0-ci.97cb5577-20231010 → 0.0.0-ci.9d88b94d-20231018

package/esm/pkg/commands/geo_add.js

@@ -0,0 +1,27 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/geoadd
+ */
+export class GeoAddCommand extends Command {
+    constructor([key, arg1, ...arg2], opts) {
+        const command = ["geoadd", key];
+        if ("nx" in arg1 && arg1.nx) {
+            command.push("nx");
+        }
+        else if ("xx" in arg1 && arg1.xx) {
+            command.push("xx");
+        }
+        if ("ch" in arg1 && arg1.ch) {
+            command.push("ch");
+        }
+        if ("latitude" in arg1 && arg1.latitude) {
+            command.push(arg1.longitude, arg1.latitude, arg1.member);
+        }
+        command.push(...arg2.flatMap(({ latitude, longitude, member }) => [
+            longitude,
+            latitude,
+            member,
+        ]));
+        super(command, opts);
+    }
+}

package/esm/pkg/commands/geo_pos.js

@@ -0,0 +1,26 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/geopos
+ */
+export class GeoPosCommand extends Command {
+    constructor(cmd, opts) {
+        const [key] = cmd;
+        // Check if the second argument is an array of strings (members).
+        // If it is, use it directly; if not, it means the members were passed individually,
+        // so we slice the cmd from the second element onwards to get the members.
+        const members = Array.isArray(cmd[1]) ? cmd[1] : cmd.slice(1);
+        super(["GEOPOS", key, ...members], {
+            deserialize: (result) => transform(result),
+            ...opts,
+        });
+    }
+}
+function transform(result) {
+    const final = [];
+    for (const pos of result) {
+        if (!pos?.[0] || !pos?.[1])
+            continue;
+        final.push({ lng: pos[0], lat: pos[1] });
+    }
+    return final;
+}

package/esm/pkg/commands/hgetall.js

@@ -8,7 +8,15 @@ function deserialize(result) {
         const key = result.shift();
         const value = result.shift();
         try {
-            obj[key] = JSON.parse(value);
+            // handle unsafe integer
+            const valueIsNumberAndNotSafeInteger = !isNaN(Number(value)) &&
+                !Number.isSafeInteger(value);
+            if (valueIsNumberAndNotSafeInteger) {
+                obj[key] = value;
+            }
+            else {
+                obj[key] = JSON.parse(value);
+            }
         }
         catch {
             obj[key] = value;

package/esm/pkg/commands/mod.js

@@ -15,6 +15,8 @@ export * from "./expire.js";
 export * from "./expireat.js";
 export * from "./flushall.js";
 export * from "./flushdb.js";
+export * from "./geo_add.js";
+export * from "./geo_pos.js";
 export * from "./get.js";
 export * from "./getbit.js";
 export * from "./getdel.js";
@@ -120,7 +122,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";
@@ -138,4 +139,7 @@ export * from "./zremrangebyscore.js";
 export * from "./zrevrank.js";
 export * from "./zscan.js";
 export * from "./zscore.js";
+export * from "./zunion.js";
 export * from "./zunionstore.js";
+export * from "./xadd.js";
+export * from "./xrange.js";

package/esm/pkg/commands/xrange.js

@@ -0,0 +1,36 @@
+import { Command } from "./command.js";
+function deserialize(result) {
+    const obj = {};
+    for (const e of result) {
+        while (e.length >= 2) {
+            const streamId = e.shift();
+            const entries = e.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),
+            ...opts,
+        });
+    }
+}

package/esm/pkg/commands/zunion.js

@@ -0,0 +1,30 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/zunion
+ */
+export class ZUnionCommand extends Command {
+    constructor([numKeys, keyOrKeys, opts], cmdOpts) {
+        const command = ["zunion", numKeys];
+        if (Array.isArray(keyOrKeys)) {
+            command.push(...keyOrKeys);
+        }
+        else {
+            command.push(keyOrKeys);
+        }
+        if (opts) {
+            if ("weights" in opts && opts.weights) {
+                command.push("weights", ...opts.weights);
+            }
+            else if ("weight" in opts && typeof opts.weight === "number") {
+                command.push("weights", opts.weight);
+            }
+            if ("aggregate" in opts) {
+                command.push("aggregate", opts.aggregate);
+            }
+            if (opts?.withScores) {
+                command.push("withscores");
+            }
+        }
+        super(command, cmdOpts);
+    }
+}

package/esm/pkg/pipeline.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, 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, GeoPosCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, 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, ZUnionCommand, ZUnionStoreCommand, } from "./commands/mod.js";
 import { UpstashError } from "./error.js";
 import { ZMScoreCommand } from "./commands/zmscore.js";
 import { HRandFieldCommand } from "./commands/hrandfield.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}`);
@@ -1186,11 +1185,26 @@ export class Pipeline {
             writable: true,
             value: (...args) => this.chain(new ZUnionStoreCommand(args, this.commandOptions))
         });
+        /**
+         * @see https://redis.io/commands/zunion
+         */
+        Object.defineProperty(this, "zunion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => this.chain(new ZUnionCommand(args, this.commandOptions))
+        });
         this.client = opts.client;
         this.commands = []; // the TCommands generic in the class definition is only used for carrying through chained command types and should never be explicitly set when instantiating the class
         this.commandOptions = opts.commandOptions;
         this.multiExec = opts.multiExec ?? false;
     }
+    /**
+     * Returns the length of pipeline before the execution
+     */
+    length() {
+        return this.commands.length;
+    }
     /**
      * Pushes a command into the pipeline and returns a chainable instance of the
      * pipeline
@@ -1240,6 +1254,10 @@ export class Pipeline {
              * @see https://redis.io/commands/json.forget
              */
             forget: (...args) => this.chain(new JsonForgetCommand(args, this.commandOptions)),
+            /**
+             * @see https://redis.io/commands/geopos
+             */
+            geopos: (...args) => new GeoPosCommand(args, this.commandOptions).exec(this.client),
             /**
              * @see https://redis.io/commands/json.get
              */

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, GeoAddCommand, GeoPosCommand, 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, ZUnionCommand, 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
          */
@@ -1185,6 +1199,15 @@ export class Redis {
             writable: true,
             value: (key, member) => new ZScoreCommand([key, member], this.opts).exec(this.client)
         });
+        /**
+         * @see https://redis.io/commands/zunion
+         */
+        Object.defineProperty(this, "zunion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new ZUnionCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zunionstore
          */
@@ -1236,6 +1259,14 @@ export class Redis {
              * @see https://redis.io/commands/json.forget
              */
             forget: (...args) => new JsonForgetCommand(args, this.opts).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geoadd
+             */
+            geoadd: (...args) => new GeoAddCommand(args, this.opts).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geopos
+             */
+            geopos: (...args) => new GeoPosCommand(args, this.opts).exec(this.client),
             /**
              * @see https://redis.io/commands/json.get
              */

package/esm/version.js

@@ -1 +1 @@
-export const VERSION = "v0.0.0-ci.97cb5577-20231010";
+export const VERSION = "v0.0.0-ci.9d88b94d-20231018";

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/platforms/nodejs.js",
   "types": "./types/platforms/nodejs.d.ts",
   "name": "@upstash/redis",
-  "version": "v0.0.0-ci.97cb5577-20231010",
+  "version": "v0.0.0-ci.9d88b94d-20231018",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",

package/script/pkg/commands/geo_add.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeoAddCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/geoadd
+ */
+class GeoAddCommand extends command_js_1.Command {
+    constructor([key, arg1, ...arg2], opts) {
+        const command = ["geoadd", key];
+        if ("nx" in arg1 && arg1.nx) {
+            command.push("nx");
+        }
+        else if ("xx" in arg1 && arg1.xx) {
+            command.push("xx");
+        }
+        if ("ch" in arg1 && arg1.ch) {
+            command.push("ch");
+        }
+        if ("latitude" in arg1 && arg1.latitude) {
+            command.push(arg1.longitude, arg1.latitude, arg1.member);
+        }
+        command.push(...arg2.flatMap(({ latitude, longitude, member }) => [
+            longitude,
+            latitude,
+            member,
+        ]));
+        super(command, opts);
+    }
+}
+exports.GeoAddCommand = GeoAddCommand;

package/script/pkg/commands/geo_pos.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeoPosCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/geopos
+ */
+class GeoPosCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        const [key] = cmd;
+        // Check if the second argument is an array of strings (members).
+        // If it is, use it directly; if not, it means the members were passed individually,
+        // so we slice the cmd from the second element onwards to get the members.
+        const members = Array.isArray(cmd[1]) ? cmd[1] : cmd.slice(1);
+        super(["GEOPOS", key, ...members], {
+            deserialize: (result) => transform(result),
+            ...opts,
+        });
+    }
+}
+exports.GeoPosCommand = GeoPosCommand;
+function transform(result) {
+    const final = [];
+    for (const pos of result) {
+        if (!pos?.[0] || !pos?.[1])
+            continue;
+        final.push({ lng: pos[0], lat: pos[1] });
+    }
+    return final;
+}

package/script/pkg/commands/hgetall.js

@@ -11,7 +11,15 @@ function deserialize(result) {
         const key = result.shift();
         const value = result.shift();
         try {
-            obj[key] = JSON.parse(value);
+            // handle unsafe integer
+            const valueIsNumberAndNotSafeInteger = !isNaN(Number(value)) &&
+                !Number.isSafeInteger(value);
+            if (valueIsNumberAndNotSafeInteger) {
+                obj[key] = value;
+            }
+            else {
+                obj[key] = JSON.parse(value);
+            }
         }
         catch {
             obj[key] = value;

package/script/pkg/commands/mod.js

@@ -31,6 +31,8 @@ __exportStar(require("./expire.js"), exports);
 __exportStar(require("./expireat.js"), exports);
 __exportStar(require("./flushall.js"), exports);
 __exportStar(require("./flushdb.js"), exports);
+__exportStar(require("./geo_add.js"), exports);
+__exportStar(require("./geo_pos.js"), exports);
 __exportStar(require("./get.js"), exports);
 __exportStar(require("./getbit.js"), exports);
 __exportStar(require("./getdel.js"), exports);
@@ -136,7 +138,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);
@@ -154,4 +155,7 @@ __exportStar(require("./zremrangebyscore.js"), exports);
 __exportStar(require("./zrevrank.js"), exports);
 __exportStar(require("./zscan.js"), exports);
 __exportStar(require("./zscore.js"), exports);
+__exportStar(require("./zunion.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,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XRangeCommand = void 0;
+const command_js_1 = require("./command.js");
+function deserialize(result) {
+    const obj = {};
+    for (const e of result) {
+        while (e.length >= 2) {
+            const streamId = e.shift();
+            const entries = e.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),
+            ...opts,
+        });
+    }
+}
+exports.XRangeCommand = XRangeCommand;

package/script/pkg/commands/zunion.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZUnionCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/zunion
+ */
+class ZUnionCommand extends command_js_1.Command {
+    constructor([numKeys, keyOrKeys, opts], cmdOpts) {
+        const command = ["zunion", numKeys];
+        if (Array.isArray(keyOrKeys)) {
+            command.push(...keyOrKeys);
+        }
+        else {
+            command.push(keyOrKeys);
+        }
+        if (opts) {
+            if ("weights" in opts && opts.weights) {
+                command.push("weights", ...opts.weights);
+            }
+            else if ("weight" in opts && typeof opts.weight === "number") {
+                command.push("weights", opts.weight);
+            }
+            if ("aggregate" in opts) {
+                command.push("aggregate", opts.aggregate);
+            }
+            if (opts?.withScores) {
+                command.push("withscores");
+            }
+        }
+        super(command, cmdOpts);
+    }
+}
+exports.ZUnionCommand = ZUnionCommand;

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}`);
@@ -1189,11 +1188,26 @@ class Pipeline {
             writable: true,
             value: (...args) => this.chain(new mod_js_1.ZUnionStoreCommand(args, this.commandOptions))
         });
+        /**
+         * @see https://redis.io/commands/zunion
+         */
+        Object.defineProperty(this, "zunion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => this.chain(new mod_js_1.ZUnionCommand(args, this.commandOptions))
+        });
         this.client = opts.client;
         this.commands = []; // the TCommands generic in the class definition is only used for carrying through chained command types and should never be explicitly set when instantiating the class
         this.commandOptions = opts.commandOptions;
         this.multiExec = opts.multiExec ?? false;
     }
+    /**
+     * Returns the length of pipeline before the execution
+     */
+    length() {
+        return this.commands.length;
+    }
     /**
      * Pushes a command into the pipeline and returns a chainable instance of the
      * pipeline
@@ -1243,6 +1257,10 @@ class Pipeline {
              * @see https://redis.io/commands/json.forget
              */
             forget: (...args) => this.chain(new mod_js_1.JsonForgetCommand(args, this.commandOptions)),
+            /**
+             * @see https://redis.io/commands/geopos
+             */
+            geopos: (...args) => new mod_js_1.GeoPosCommand(args, this.commandOptions).exec(this.client),
             /**
              * @see https://redis.io/commands/json.get
              */

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
          */
@@ -1188,6 +1202,15 @@ class Redis {
             writable: true,
             value: (key, member) => new mod_js_1.ZScoreCommand([key, member], this.opts).exec(this.client)
         });
+        /**
+         * @see https://redis.io/commands/zunion
+         */
+        Object.defineProperty(this, "zunion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new mod_js_1.ZUnionCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zunionstore
          */
@@ -1239,6 +1262,14 @@ class Redis {
              * @see https://redis.io/commands/json.forget
              */
             forget: (...args) => new mod_js_1.JsonForgetCommand(args, this.opts).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geoadd
+             */
+            geoadd: (...args) => new mod_js_1.GeoAddCommand(args, this.opts).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geopos
+             */
+            geopos: (...args) => new mod_js_1.GeoPosCommand(args, this.opts).exec(this.client),
             /**
              * @see https://redis.io/commands/json.get
              */

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-ci.97cb5577-20231010";
+exports.VERSION = "v0.0.0-ci.9d88b94d-20231018";

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

@@ -0,0 +1,25 @@
+import { Command, CommandOptions } from "./command.js";
+export type GeoAddCommandOptions = {
+    nx?: boolean;
+    xx?: never;
+} | ({
+    nx?: never;
+    xx?: boolean;
+} & {
+    ch?: boolean;
+});
+export interface GeoMember<TMemberType> {
+    latitude: number;
+    longitude: number;
+    member: TMemberType;
+}
+/**
+ * @see https://redis.io/commands/geoadd
+ */
+export declare class GeoAddCommand<TMemberType = string> extends Command<number | null, number | null> {
+    constructor([key, arg1, ...arg2]: [
+        string,
+        GeoMember<TMemberType> | GeoAddCommandOptions,
+        ...GeoMember<TMemberType>[]
+    ], opts?: CommandOptions<number | null, number | null>);
+}

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

@@ -0,0 +1,12 @@
+import { Command, CommandOptions } from "./command.js";
+type Coordinates = {
+    lng: string;
+    lat: string;
+};
+/**
+ * @see https://redis.io/commands/geopos
+ */
+export declare class GeoPosCommand<TData extends Coordinates[]> extends Command<(string | null)[][], TData> {
+    constructor(cmd: [string, ...string[]] | [string, string[]], opts?: CommandOptions<(string | null)[][], TData>);
+}
+export {};

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

@@ -15,6 +15,8 @@ export * from "./expire.js";
 export * from "./expireat.js";
 export * from "./flushall.js";
 export * from "./flushdb.js";
+export * from "./geo_add.js";
+export * from "./geo_pos.js";
 export * from "./get.js";
 export * from "./getbit.js";
 export * from "./getdel.js";
@@ -120,7 +122,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";
@@ -138,4 +139,7 @@ export * from "./zremrangebyscore.js";
 export * from "./zrevrank.js";
 export * from "./zscan.js";
 export * from "./zscore.js";
+export * from "./zunion.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/commands/zunion.d.ts

@@ -0,0 +1,29 @@
+import { Command, CommandOptions } from "./command.js";
+export type ZUnionCommandOptions = {
+    withScores?: boolean;
+    aggregate?: "sum" | "min" | "max";
+} & ({
+    weight: number;
+    weights?: never;
+} | {
+    weight?: never;
+    weights: number[];
+} | {
+    weight?: never;
+    weights?: never;
+});
+/**
+ * @see https://redis.io/commands/zunion
+ */
+export declare class ZUnionCommand<TData extends unknown[]> extends Command<string[], TData> {
+    constructor(cmd: [
+        numKeys: 1,
+        key: string,
+        opts?: ZUnionCommandOptions
+    ], cmdOpts?: CommandOptions<string[], TData>);
+    constructor(cmd: [
+        numKeys: number,
+        keys: string[],
+        opts?: ZUnionCommandOptions
+    ], cmdOpts?: CommandOptions<string[], TData>);
+}

package/types/pkg/pipeline.d.ts

@@ -1,4 +1,4 @@
-import { BitOpCommand, DelCommand, ExistsCommand, FlushAllCommand, JsonGetCommand, MGetCommand, PingCommand, ScoreMember, ScriptExistsCommand, SetCommandOptions, TouchCommand, UnlinkCommand, ZAddCommandOptions, ZAddCommandOptionsWithIncr, ZRangeCommandOptions } from "./commands/mod.js";
+import { BitOpCommand, DelCommand, ExistsCommand, FlushAllCommand, GeoPosCommand, JsonGetCommand, MGetCommand, PingCommand, ScoreMember, ScriptExistsCommand, SetCommandOptions, TouchCommand, UnlinkCommand, ZAddCommandOptions, ZAddCommandOptionsWithIncr, ZRangeCommandOptions } from "./commands/mod.js";
 import { Command, CommandOptions } from "./commands/command.js";
 import { Requester } from "./http.js";
 import { CommandArgs } from "./types.js";
@@ -66,6 +66,10 @@ export declare class Pipeline<TCommands extends Command<any, any>[] = []> {
      * ```
      */
     exec: <TCommandResults extends unknown[] = [] extends TCommands ? unknown[] : InferResponseData<TCommands>>() => Promise<TCommandResults>;
+    /**
+     * Returns the length of pipeline before the execution
+     */
+    length(): number;
     /**
      * Pushes a command into the pipeline and returns a chainable instance of the
      * pipeline
@@ -579,6 +583,10 @@ export declare class Pipeline<TCommands extends Command<any, any>[] = []> {
      * @see https://redis.io/commands/zunionstore
      */
     zunionstore: (destination: string, numKeys: number, keys: string[], opts?: import("./commands/zunionstore.js").ZUnionStoreCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, number>]>;
+    /**
+     * @see https://redis.io/commands/zunion
+     */
+    zunion: (numKeys: number, keys: string[], opts?: import("./commands/zunion.js").ZUnionCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, any>]>;
     /**
      * @see https://redis.io/commands/?group=json
      */
@@ -619,6 +627,10 @@ export declare class Pipeline<TCommands extends Command<any, any>[] = []> {
          * @see https://redis.io/commands/json.forget
          */
         forget: (key: string, path?: string | undefined) => Pipeline<[...TCommands, Command<any, number>]>;
+        /**
+         * @see https://redis.io/commands/geopos
+         */
+        geopos: (...args: CommandArgs<typeof GeoPosCommand>) => Promise<any>;
         /**
          * @see https://redis.io/commands/json.get
          */

package/types/pkg/redis.d.ts

@@ -1,4 +1,4 @@
-import { CommandOptions, DelCommand, ExistsCommand, FlushAllCommand, JsonGetCommand, MGetCommand, PingCommand, ScoreMember, ScriptExistsCommand, SetCommandOptions, TouchCommand, UnlinkCommand, ZAddCommandOptions, ZAddCommandOptionsWithIncr, ZRangeCommandOptions } from "./commands/mod.js";
+import { CommandOptions, DelCommand, ExistsCommand, FlushAllCommand, GeoPosCommand, JsonGetCommand, MGetCommand, PingCommand, ScoreMember, ScriptExistsCommand, SetCommandOptions, TouchCommand, UnlinkCommand, ZAddCommandOptions, ZAddCommandOptionsWithIncr, ZRangeCommandOptions } from "./commands/mod.js";
 import { Requester, UpstashRequest, UpstashResponse } from "./http.js";
 import { Pipeline } from "./pipeline.js";
 import type { CommandArgs } from "./types.js";
@@ -61,6 +61,14 @@ export declare class Redis {
          * @see https://redis.io/commands/json.forget
          */
         forget: (key: string, path?: string | undefined) => Promise<number>;
+        /**
+         * @see https://redis.io/commands/geoadd
+         */
+        geoadd: (args_0: string, args_1: import("./commands/geo_add.js").GeoAddCommandOptions | import("./commands/geo_add.js").GeoMember<unknown>, ...args_2: import("./commands/geo_add.js").GeoMember<unknown>[]) => Promise<number | null>;
+        /**
+         * @see https://redis.io/commands/geopos
+         */
+        geopos: (...args: CommandArgs<typeof GeoPosCommand>) => Promise<any>;
         /**
          * @see https://redis.io/commands/json.get
          */
@@ -562,6 +570,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
      */
@@ -652,6 +685,10 @@ export declare class Redis {
      * @see https://redis.io/commands/zscore
      */
     zscore: <TData>(key: string, member: TData) => Promise<number | null>;
+    /**
+     * @see https://redis.io/commands/zunion
+     */
+    zunion: (numKeys: number, keys: string[], opts?: import("./commands/zunion.js").ZUnionCommandOptions | undefined) => Promise<any>;
     /**
      * @see https://redis.io/commands/zunionstore
      */

package/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "v0.0.0-ci.97cb5577-20231010";
+export declare const VERSION = "v0.0.0-ci.9d88b94d-20231018";