@upstash/redis 0.0.0-ci.9cbc6e25-20230504 → 0.0.0-ci.9d88b94d-20231018

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/http.js

@@ -103,10 +103,17 @@ class HttpClient {
         }
         const body = (await res.json());
         if (!res.ok) {
-            throw new error_js_1.UpstashError(body.error);
+            throw new error_js_1.UpstashError(`${body.error}, command was: ${JSON.stringify(req.body)}`);
         }
         if (this.options?.responseEncoding === "base64") {
-            return Array.isArray(body) ? body.map(decode) : decode(body);
+            if (Array.isArray(body)) {
+                return body.map(({ result, error }) => ({
+                    result: decode(result),
+                    error,
+                }));
+            }
+            const result = decode(body.result);
+            return { result, error: body.error };
         }
         return body;
     }
@@ -138,19 +145,19 @@ function base64decode(b64) {
 }
 function decode(raw) {
     let result = undefined;
-    switch (typeof raw.result) {
+    switch (typeof raw) {
         case "undefined":
             return raw;
         case "number": {
-            result = raw.result;
+            result = raw;
             break;
         }
         case "object": {
-            if (Array.isArray(raw.result)) {
-                result = raw.result.map((v) => typeof v === "string"
+            if (Array.isArray(raw)) {
+                result = raw.map((v) => typeof v === "string"
                     ? base64decode(v)
                     : Array.isArray(v)
-                        ? v.map(base64decode)
+                        ? v.map(decode)
                         : v);
             }
             else {
@@ -161,11 +168,11 @@ function decode(raw) {
             break;
         }
         case "string": {
-            result = raw.result === "OK" ? "OK" : base64decode(raw.result);
+            result = raw === "OK" ? "OK" : base64decode(raw);
             break;
         }
         default:
             break;
     }
-    return { result, error: raw.error };
+    return result;
 }

package/script/pkg/pipeline.js

@@ -34,7 +34,7 @@ const zdiffstore_js_1 = require("./commands/zdiffstore.js");
  * const res = await p.set("key","value").get("key").exec()
  * ```
  *
- * It's not possible to infer correct types with a dynamic pipeline, so you can
+ * Return types are inferred if all commands are chained, but you can still
  * override the response type manually:
  * ```ts
  *  redis.pipeline()
@@ -75,9 +75,11 @@ class Pipeline {
          *
          * Returns an array with the results of all pipelined commands.
          *
-         * You can define a return type manually to make working in typescript easier
+         * If all commands are statically chained from start to finish, types are inferred. You can still define a return type manually if necessary though:
          * ```ts
-         * redis.pipeline().get("key").exec<[{ greeting: string }]>()
+         * const p = redis.pipeline()
+         * p.get("key")
+         * const result = p.exec<[{ greeting: string }]>()
          * ```
          */
         Object.defineProperty(this, "exec", {
@@ -1186,24 +1188,38 @@ 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 = [];
+        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;
     }
     /**
-     * Pushes a command into the pipelien and returns a chainable instance of the
+     * 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
      */
     chain(command) {
         this.commands.push(command);
-        return this;
+        return this; // TS thinks we're returning Pipeline<[]> here, because we're not creating a new instance of the class, hence the cast
     }
     /**
      * @see https://redis.io/commands/?group=json
      */
     get json() {
-        // For some reason we needed to define the types manually, otherwise Deno wouldn't build it
         return {
             /**
              * @see https://redis.io/commands/json.arrappend
@@ -1241,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,6 +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
+         */
+        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
          */
@@ -1184,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
          */
@@ -1235,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/platforms/nodejs.js

@@ -61,7 +61,7 @@ class Redis extends core.Redis {
             headers: { authorization: `Bearer ${configOrRequester.token}` },
             agent: configOrRequester.agent,
             responseEncoding: configOrRequester.responseEncoding,
-            cache: "no-store",
+            cache: configOrRequester.cache || "no-store",
         });
         super(client, {
             automaticDeserialization: configOrRequester.automaticDeserialization,

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.9cbc6e25-20230504";
+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";
@@ -137,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/set.d.ts

@@ -1,7 +1,7 @@
 import { Command, CommandOptions } from "./command.js";
 export type SetCommandOptions = {
-    get: boolean;
-} | ({
+    get?: boolean;
+} & ({
     ex: number;
     px?: never;
     exat?: never;

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

@@ -0,0 +1,31 @@
+import { Command, CommandOptions } from "./command.js";
+type XAddCommandOptions = {
+    nomkStream?: boolean;
+    trim?: ({
+        type: "MAXLEN" | "maxlen";
+        threshold: number;
+    } | {
+        type: "MINID" | "minid";
+        threshold: string;
+    }) & ({
+        comparison: "~";
+        limit?: number;
+    } | {
+        comparison: "=";
+        limit?: never;
+    });
+};
+/**
+ * @see https://redis.io/commands/xadd
+ */
+export declare class XAddCommand extends Command<string, string> {
+    constructor([key, id, entries, opts]: [
+        key: string,
+        id: "*" | string,
+        entries: {
+            [field: string]: unknown;
+        },
+        opts?: XAddCommandOptions
+    ], commandOptions?: CommandOptions<string, string>);
+}
+export {};

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/http.d.ts

@@ -62,6 +62,11 @@ export type RequesterConfig = {
      * @default "base64"
      */
     responseEncoding?: false | "base64";
+    /**
+     * Configure the cache behaviour
+     * @default "no-store"
+     */
+    cache?: CacheSetting;
 };
 export type HttpClientConfig = {
     headers?: Record<string, string>;
@@ -69,7 +74,6 @@ export type HttpClientConfig = {
     options?: Options;
     retry?: RetryConfig;
     agent?: any;
-    cache?: CacheSetting;
 } & RequesterConfig;
 export declare class HttpClient implements Requester {
     baseUrl: string;