@upstash/redis 1.36.0-rc.2 → 1.36.0-rc.4

package/nodejs.js

@@ -21,9 +21,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var nodejs_exports = {};
 __export(nodejs_exports, {
   Redis: () => Redis2,
-  createSearchIndex: () => createSearchIndex,
+  createIndex: () => createIndex,
   errors: () => error_exports,
-  getSearchIndex: () => getSearchIndex,
+  index: () => index,
   s: () => s
 });
 module.exports = __toCommonJS(nodejs_exports);
@@ -403,7 +403,7 @@ var AutoPipelineExecutor = class {
       this.activePipeline = pipeline;
       this.indexInCurrentPipeline = 0;
     }
-    const index = this.indexInCurrentPipeline++;
+    const index2 = this.indexInCurrentPipeline++;
     executeWithPipeline(pipeline);
     const pipelineDone = this.deferExecution().then(() => {
       if (!this.pipelinePromises.has(pipeline)) {
@@ -415,7 +415,7 @@ var AutoPipelineExecutor = class {
       return this.pipelinePromises.get(pipeline);
     });
     const results = await pipelineDone;
-    const commandResult = results[index];
+    const commandResult = results[index2];
     if (commandResult.error) {
       throw new UpstashError(`Command failed: ${commandResult.error}`);
     }
@@ -2529,55 +2529,119 @@ function flattenSchema(schema, pathPrefix = []) {
   }
   return fields;
 }
-function parseQueryResponse(rawResponse, options) {
-  const results = [];
-  if (options && "noContent" in options && options.noContent) {
-    for (const item of rawResponse) {
-      results.push({
-        key: item[0],
-        score: item[1]
-      });
-    }
-  } else {
-    for (const item of rawResponse) {
-      const fields = Array.isArray(item[2]) ? item[2].map((field) => ({
-        [field[0]]: field[1]
-      })) : [];
-      results.push({
-        key: item[0],
-        score: item[1],
-        fields
-      });
+function deserializeQueryResponse(rawResponse, options) {
+  const hasEmptySelect = options?.select && Object.keys(options.select).length === 0;
+  return rawResponse.map((itemRaw) => {
+    const raw = itemRaw;
+    const key = raw[0];
+    const score = raw[1];
+    const rawFields = raw[2];
+    if (hasEmptySelect) {
+      return { key, score };
+    }
+    if (!Array.isArray(rawFields) || rawFields.length === 0) {
+      return { key, score, data: {} };
+    }
+    const mergedFields = {};
+    for (const fieldRaw of rawFields) {
+      const fieldObj = kvArrayToObject(fieldRaw);
+      Object.assign(mergedFields, fieldObj);
+    }
+    if ("$" in mergedFields) {
+      const data2 = mergedFields["$"];
+      return { key, score, data: data2 };
+    }
+    const data = dotNotationToNested(mergedFields);
+    return { key, score, data };
+  });
+}
+function parseFieldInfo(fieldRaw) {
+  const fieldType = fieldRaw[1];
+  const options = fieldRaw.slice(2);
+  const fieldInfo = { type: fieldType };
+  for (const option of options) {
+    switch (option.toUpperCase()) {
+      case "NOTOKENIZE":
+        fieldInfo.noTokenize = true;
+        break;
+      case "NOSTEM":
+        fieldInfo.noStem = true;
+        break;
+      case "FAST":
+        fieldInfo.fast = true;
+        break;
     }
   }
-  return results;
+  return fieldInfo;
 }
-function parseDescribeResponse(rawResponse) {
-  return rawResponse;
+function deserializeDescribeResponse(rawResponse) {
+  const raw = kvArrayToObject(rawResponse);
+  const schema = {};
+  if (Array.isArray(raw.schema)) {
+    for (const fieldRaw of raw.schema) {
+      if (Array.isArray(fieldRaw) && fieldRaw.length >= 2) {
+        const fieldName = fieldRaw[0];
+        schema[fieldName] = parseFieldInfo(fieldRaw);
+      }
+    }
+  }
+  return {
+    name: raw.name,
+    dataType: raw.type.toLowerCase(),
+    prefixes: raw.prefixes,
+    ...raw.language && { language: raw.language },
+    schema
+  };
 }
 function parseCountResponse(rawResponse) {
   return typeof rawResponse === "number" ? rawResponse : parseInt(rawResponse, 10);
 }
+function kvArrayToObject(v) {
+  if (typeof v === "object" && v !== null && !Array.isArray(v)) return v;
+  if (!Array.isArray(v)) return {};
+  const obj = {};
+  for (let i = 0; i < v.length; i += 2) {
+    if (typeof v[i] === "string") obj[v[i]] = v[i + 1];
+  }
+  return obj;
+}
+function dotNotationToNested(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const parts = key.split(".");
+    let current = result;
+    for (let i = 0; i < parts.length - 1; i++) {
+      const part = parts[i];
+      if (!(part in current)) {
+        current[part] = {};
+      }
+      current = current[part];
+    }
+    current[parts[parts.length - 1]] = value;
+  }
+  return result;
+}
 
 // pkg/commands/search/command-builder.ts
-function buildQueryCommand(redisCommand, indexName, query, options) {
-  const command = [redisCommand, indexName, query];
+function buildQueryCommand(redisCommand, name, options) {
+  const query = JSON.stringify(options?.filter);
+  const command = [redisCommand, name, query];
   if (options?.limit !== void 0) {
     command.push("LIMIT", options.limit.toString());
   }
   if (options?.offset !== void 0) {
     command.push("OFFSET", options.offset.toString());
   }
-  if (options?.noContent) {
+  if (options?.select && Object.keys(options.select).length === 0) {
     command.push("NOCONTENT");
   }
-  if (options?.sortBy) {
-    command.push("SORTBY", options.sortBy.field);
-    if (options.sortBy.direction) {
-      command.push(options.sortBy.direction);
-    }
+  if (options?.orderBy) {
+    command.push("SORTBY");
+    Object.entries(options.orderBy).forEach(([field, direction]) => {
+      command.push(field, direction);
+    });
   }
-  if (options && "highlight" in options && options.highlight) {
+  if (options?.highlight) {
     command.push(
       "HIGHLIGHT",
       "FIELDS",
@@ -2588,16 +2652,20 @@ function buildQueryCommand(redisCommand, indexName, query, options) {
       command.push("TAGS", options.highlight.preTag, options.highlight.postTag);
     }
   }
-  if (options && "returnFields" in options && options.returnFields && options.returnFields.length > 0) {
-    command.push("RETURN", options.returnFields.length.toString(), ...options.returnFields);
+  if (options?.select && Object.keys(options.select).length > 0) {
+    command.push(
+      "RETURN",
+      Object.keys(options.select).length.toString(),
+      ...Object.keys(options.select)
+    );
   }
   return command;
 }
 function buildCreateIndexCommand(props) {
-  const { indexName, schema, dataType, prefix, language } = props;
+  const { name, schema, dataType, prefix, language } = props;
   const prefixArray = Array.isArray(prefix) ? prefix : [prefix];
   const payload = [
-    indexName,
+    name,
     "ON",
     dataType.toUpperCase(),
     "PREFIX",
@@ -2624,65 +2692,58 @@ function buildCreateIndexCommand(props) {
 
 // pkg/commands/search/search.ts
 var SearchIndex = class {
-  indexName;
+  name;
   schema;
   client;
-  constructor({ indexName, schema, client }) {
-    this.indexName = indexName;
+  constructor({ name, schema, client }) {
+    this.name = name;
     this.schema = schema;
     this.client = client;
   }
   async waitIndexing() {
-    const command = ["SEARCH.COMMIT", this.indexName];
+    const command = ["SEARCH.COMMIT", this.name];
     const result = await new ExecCommand(command).exec(
       this.client
     );
     return result;
   }
   async describe() {
-    const command = ["SEARCH.DESCRIBE", this.indexName];
+    const command = ["SEARCH.DESCRIBE", this.name];
     const rawResult = await new ExecCommand(command).exec(
       this.client
     );
-    return parseDescribeResponse(rawResult);
+    return deserializeDescribeResponse(rawResult);
   }
   async query(options) {
-    const queryString = JSON.stringify(options.filter);
-    const command = buildQueryCommand(
-      "SEARCH.QUERY",
-      this.indexName,
-      queryString,
-      options
-    );
+    const command = buildQueryCommand("SEARCH.QUERY", this.name, options);
     const rawResult = await new ExecCommand(command).exec(
       this.client
     );
-    return parseQueryResponse(rawResult, options);
+    return deserializeQueryResponse(rawResult, options);
   }
-  async count(filter) {
-    const queryString = JSON.stringify(filter);
-    const command = buildQueryCommand("SEARCH.COUNT", this.indexName, queryString);
+  async count({ filter }) {
+    const command = buildQueryCommand("SEARCH.COUNT", this.name, { filter });
     const rawResult = await new ExecCommand(command).exec(
       this.client
     );
-    return parseCountResponse(rawResult);
+    return { count: parseCountResponse(rawResult) };
   }
   async drop() {
-    const command = ["SEARCH.DROP", this.indexName];
+    const command = ["SEARCH.DROP", this.name];
     const result = await new ExecCommand(command).exec(
       this.client
     );
     return result;
   }
 };
-async function createSearchIndex(props) {
-  const { indexName, schema, client } = props;
+async function createIndex(props) {
+  const { name, schema, client } = props;
   const createIndexCommand = buildCreateIndexCommand(props);
   await new ExecCommand(createIndexCommand).exec(client);
-  return getSearchIndex({ indexName, schema, client });
+  return index(client, name, schema);
 }
-function getSearchIndex(props) {
-  return new SearchIndex(props);
+function index(client, name, schema) {
+  return new SearchIndex({ name, schema, client });
 }
 
 // pkg/commands/search/schema-builder.ts
@@ -2708,21 +2769,16 @@ var TextFieldBuilder = class _TextFieldBuilder {
     } : "TEXT";
   }
 };
-var NumericFieldBuilder = class _NumericFieldBuilder {
-  _fast;
+var NumericFieldBuilder = class {
   type;
-  constructor(type, fast = { fast: false }) {
+  constructor(type) {
     this.type = type;
-    this._fast = fast;
-  }
-  fast() {
-    return new _NumericFieldBuilder(this.type, { fast: true });
   }
   [BUILD]() {
-    return this._fast.fast ? {
+    return {
       type: this.type,
       fast: true
-    } : this.type;
+    };
   }
 };
 var BoolFieldBuilder = class _BoolFieldBuilder {
@@ -2756,74 +2812,18 @@ var DateFieldBuilder = class _DateFieldBuilder {
   }
 };
 var s = {
-  /**
-   * Full-text search field (TEXT)
-   * @example
-   * s.text() // Simple text field
-   * s.text().noTokenize() // Exact phrase matching
-   * s.text().noStem() // Disable stemming
-   */
-  text() {
+  string() {
     return new TextFieldBuilder();
   },
-  /**
-   * Unsigned 64-bit integer (U64)
-   * Range: 0 to 2^64-1
-   * @example
-   * s.unsigned() // Simple unsigned field
-   * s.unsigned().fast() // Enable sorting and range queries
-   */
-  unsignedInteger() {
-    return new NumericFieldBuilder("U64");
-  },
-  /**
-   * Signed 64-bit integer (I64)
-   * Range: -2^63 to 2^63-1
-   * @example
-   * s.integer() // Simple integer field
-   * s.integer().fast() // Enable sorting and range queries
-   */
-  integer() {
-    return new NumericFieldBuilder("I64");
-  },
-  /**
-   * 64-bit floating point (F64)
-   * @example
-   * s.float() // Simple float field
-   * s.float().fast() // Enable sorting and range queries
-   */
-  float() {
-    return new NumericFieldBuilder("F64");
+  number(type = "F64") {
+    return new NumericFieldBuilder(type);
   },
-  /**
-   * Boolean field (BOOL)
-   * @example
-   * s.bool() // Simple boolean field
-   * s.bool().fast() // Enable efficient filtering
-   */
-  bool() {
+  boolean() {
     return new BoolFieldBuilder();
   },
-  /**
-   * ISO 8601 date field (DATE)
-   * @example
-   * s.date() // Simple date field
-   * s.date().fast() // Enable sorting and range queries
-   */
   date() {
     return new DateFieldBuilder();
   },
-  /**
-   * Create a string/JSON index schema (supports nesting)
-   * @example
-   * s.object({
-   *   name: s.text(),
-   *   profile: s.object({
-   *     age: s.unsigned(),
-   *     city: s.text()
-   *   })
-   * })
-   */
   object(fields) {
     const result = {};
     for (const [key, value] of Object.entries(fields)) {
@@ -3410,7 +3410,7 @@ var Pipeline = class {
   /**
    * @see https://redis.io/commands/lset
    */
-  lset = (key, index, value) => this.chain(new LSetCommand([key, index, value], this.commandOptions));
+  lset = (key, index2, value) => this.chain(new LSetCommand([key, index2, value], this.commandOptions));
   /**
    * @see https://redis.io/commands/ltrim
    */
@@ -4173,18 +4173,19 @@ var Redis = class {
   createScript(script, opts) {
     return opts?.readonly ? new ScriptRO(this, script) : new Script(this, script);
   }
-  createSearchIndex = (props) => {
-    return createSearchIndex({
-      ...props,
-      client: this.client
-    });
-  };
-  getSearchIndex = (props) => {
-    return getSearchIndex({
-      ...props,
-      client: this.client
-    });
-  };
+  get search() {
+    return {
+      createIndex: (props) => {
+        return createIndex({
+          ...props,
+          client: this.client
+        });
+      },
+      index: (name, schema) => {
+        return index(this.client, name, schema);
+      }
+    };
+  }
   /**
    * Create a new pipeline that allows you to send requests in bulk.
    *
@@ -4521,7 +4522,7 @@ var Redis = class {
   /**
    * @see https://redis.io/commands/lset
    */
-  lset = (key, index, value) => new LSetCommand([key, index, value], this.opts).exec(this.client);
+  lset = (key, index2, value) => new LSetCommand([key, index2, value], this.opts).exec(this.client);
   /**
    * @see https://redis.io/commands/ltrim
    */
@@ -4892,7 +4893,7 @@ var Redis = class {
 };
 
 // version.ts
-var VERSION = "v1.36.0-rc.2";
+var VERSION = "v1.36.0-rc.4";
 
 // platforms/nodejs.ts
 if (typeof atob === "undefined") {
@@ -5003,8 +5004,8 @@ var Redis2 = class _Redis extends Redis {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Redis,
-  createSearchIndex,
+  createIndex,
   errors,
-  getSearchIndex,
+  index,
   s
 });

package/nodejs.mjs

@@ -2,11 +2,11 @@ import {
   HttpClient,
   Redis,
   VERSION,
-  createSearchIndex,
+  createIndex,
   error_exports,
-  getSearchIndex,
+  index,
   s
-} from "./chunk-TU3ADD2M.mjs";
+} from "./chunk-P45C5Z47.mjs";
 
 // platforms/nodejs.ts
 if (typeof atob === "undefined") {
@@ -116,8 +116,8 @@ var Redis2 = class _Redis extends Redis {
 };
 export {
   Redis2 as Redis,
-  createSearchIndex,
+  createIndex,
   error_exports as errors,
-  getSearchIndex,
+  index,
   s
 };

package/package.json

@@ -1 +1 @@
-{"name":"@upstash/redis","version":"v1.36.0-rc.2","main":"./nodejs.js","module":"./nodejs.mjs","types":"./nodejs.d.ts","exports":{".":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./node":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./cloudflare":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.js":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.mjs":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./fastly":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.js":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.mjs":{"import":"./fastly.mjs","require":"./fastly.js"}},"description":"An HTTP/REST based Redis client built on top of Upstash REST API.","repository":{"type":"git","url":"git+https://github.com/upstash/upstash-redis.git"},"keywords":["redis","database","serverless","edge","upstash"],"files":["./*"],"scripts":{"build":"tsup && cp package.json README.md LICENSE dist/","test":"bun test pkg","fmt":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","lint":"eslint \"**/*.{js,ts,tsx}\" --quiet --fix","format":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","format:check":"prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"","lint:fix":"eslint . -c .ts,.tsx,.js,.jsx --fix","commit":"cz","lint:format":"bun run lint:fix && bun run format","check-exports":"bun run build && cd dist && attw -P"},"author":"Andreas Thomas <dev@chronark.com>","license":"MIT","bugs":{"url":"https://github.com/upstash/upstash-redis/issues"},"homepage":"https://github.com/upstash/upstash-redis#readme","devDependencies":{"@biomejs/biome":"latest","@commitlint/cli":"^19.3.0","@commitlint/config-conventional":"^19.2.2","@typescript-eslint/eslint-plugin":"8.4.0","@typescript-eslint/parser":"8.4.0","bun-types":"1.0.33","eslint":"9.10.0","eslint-plugin-unicorn":"55.0.0","husky":"^9.1.1","prettier":"^3.3.3","tsup":"^8.2.3","typescript":"latest"},"dependencies":{"uncrypto":"^0.1.3"}}
+{"name":"@upstash/redis","version":"v1.36.0-rc.4","main":"./nodejs.js","module":"./nodejs.mjs","types":"./nodejs.d.ts","exports":{".":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./node":{"import":"./nodejs.mjs","require":"./nodejs.js"},"./cloudflare":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.js":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./cloudflare.mjs":{"import":"./cloudflare.mjs","require":"./cloudflare.js"},"./fastly":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.js":{"import":"./fastly.mjs","require":"./fastly.js"},"./fastly.mjs":{"import":"./fastly.mjs","require":"./fastly.js"}},"description":"An HTTP/REST based Redis client built on top of Upstash REST API.","repository":{"type":"git","url":"git+https://github.com/upstash/upstash-redis.git"},"keywords":["redis","database","serverless","edge","upstash"],"files":["./*"],"scripts":{"build":"tsup && cp package.json README.md LICENSE dist/","test":"bun test pkg","fmt":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","lint":"eslint \"**/*.{js,ts,tsx}\" --quiet --fix","format":"prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"","format:check":"prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\"","lint:fix":"eslint . -c .ts,.tsx,.js,.jsx --fix","commit":"cz","lint:format":"bun run lint:fix && bun run format","check-exports":"bun run build && cd dist && attw -P"},"author":"Andreas Thomas <dev@chronark.com>","license":"MIT","bugs":{"url":"https://github.com/upstash/upstash-redis/issues"},"homepage":"https://github.com/upstash/upstash-redis#readme","devDependencies":{"@biomejs/biome":"latest","@commitlint/cli":"^19.3.0","@commitlint/config-conventional":"^19.2.2","@typescript-eslint/eslint-plugin":"8.4.0","@typescript-eslint/parser":"8.4.0","bun-types":"1.0.33","eslint":"9.10.0","eslint-plugin-unicorn":"55.0.0","husky":"^9.1.1","prettier":"^3.3.3","tsup":"^8.2.3","typescript":"latest"},"dependencies":{"uncrypto":"^0.1.3"}}