@tinacms/cli 2.0.7 → 2.1.0

package/dist/index.js

@@ -2,7 +2,7 @@
 import { Cli, Builtins } from "clipanion";
 
 // package.json
-var version = "2.0.7";
+var version = "2.1.0";
 
 // src/next/commands/dev-command/index.ts
 import path8 from "path";
@@ -488,7 +488,15 @@ var Codegen = class {
       JSON.stringify(this.graphqlSchemaDoc)
     );
     const { search, ...rest } = this.tinaSchema.schema.config;
-    this.tinaSchema.schema.config = rest;
+    if (search?.tina) {
+      const { indexerToken, ...safeSearchConfig } = search.tina;
+      this.tinaSchema.schema.config = {
+        ...rest,
+        search: { tina: safeSearchConfig }
+      };
+    } else {
+      this.tinaSchema.schema.config = rest;
+    }
     await this.writeConfigFile(
       "_schema.json",
       JSON.stringify(this.tinaSchema.schema)
@@ -2179,34 +2187,83 @@ var createSearchIndexRouter = ({
   searchIndex
 }) => {
   const put = async (req, res) => {
-    const { docs } = req.body;
+    const docs = req.body?.docs ?? [];
     const result = await searchIndex.PUT(docs);
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ result }));
   };
   const get = async (req, res) => {
-    const requestURL = new URL(req.url, config2.apiURL);
+    const requestURL = new URL(req.url ?? "", config2.apiURL);
+    const isV2 = requestURL.pathname.startsWith("/v2/searchIndex");
+    res.writeHead(200, { "Content-Type": "application/json" });
+    if (isV2) {
+      const queryParam = requestURL.searchParams.get("query");
+      const collectionParam = requestURL.searchParams.get("collection");
+      const limitParam = requestURL.searchParams.get("limit");
+      const cursorParam = requestURL.searchParams.get("cursor");
+      if (!queryParam) {
+        res.end(JSON.stringify({ RESULT: [], RESULT_LENGTH: 0 }));
+        return;
+      }
+      if (!searchIndex.fuzzySearchWrapper) {
+        res.end(JSON.stringify({ RESULT: [], RESULT_LENGTH: 0 }));
+        return;
+      }
+      try {
+        const paginationOptions = {};
+        if (limitParam) {
+          paginationOptions.limit = parseInt(limitParam, 10);
+        }
+        if (cursorParam) {
+          paginationOptions.cursor = cursorParam;
+        }
+        const searchQuery = collectionParam ? `${queryParam} _collection:${collectionParam}` : queryParam;
+        const result2 = await searchIndex.fuzzySearchWrapper.query(searchQuery, {
+          ...paginationOptions
+        });
+        if (collectionParam) {
+          result2.results = result2.results.filter(
+            (r) => r._id && r._id.startsWith(`${collectionParam}:`)
+          );
+        }
+        res.end(
+          JSON.stringify({
+            RESULT: result2.results,
+            RESULT_LENGTH: result2.total,
+            NEXT_CURSOR: result2.nextCursor,
+            PREV_CURSOR: result2.prevCursor,
+            FUZZY_MATCHES: result2.fuzzyMatches || {}
+          })
+        );
+        return;
+      } catch (error) {
+        console.warn(
+          "[search] v2 fuzzy search failed:",
+          error instanceof Error ? error.message : error
+        );
+        res.end(JSON.stringify({ RESULT: [], RESULT_LENGTH: 0 }));
+        return;
+      }
+    }
     const query = requestURL.searchParams.get("q");
     const optionsParam = requestURL.searchParams.get("options");
-    let options = {
-      DOCUMENTS: false
-    };
+    if (!query) {
+      res.end(JSON.stringify({ RESULT: [] }));
+      return;
+    }
+    let searchIndexOptions = { DOCUMENTS: false };
     if (optionsParam) {
-      options = {
-        ...options,
+      searchIndexOptions = {
+        ...searchIndexOptions,
         ...JSON.parse(optionsParam)
       };
     }
-    res.writeHead(200, { "Content-Type": "application/json" });
-    if (query) {
-      const result = await searchIndex.QUERY(JSON.parse(query), options);
-      res.end(JSON.stringify(result));
-    } else {
-      res.end(JSON.stringify({ RESULT: [] }));
-    }
+    const queryObj = JSON.parse(query);
+    const result = await searchIndex.QUERY(queryObj, searchIndexOptions);
+    res.end(JSON.stringify(result));
   };
   const del = async (req, res) => {
-    const requestURL = new URL(req.url, config2.apiURL);
+    const requestURL = new URL(req.url ?? "", config2.apiURL);
     const docId = requestURL.pathname.split("/").filter(Boolean).slice(1).join("/");
     const result = await searchIndex.DELETE(docId);
     res.writeHead(200, { "Content-Type": "application/json" });
@@ -2296,7 +2353,7 @@ var devServerEndPointsPlugin = ({
           res.end(JSON.stringify(result));
           return;
         }
-        if (req.url.startsWith("/searchIndex")) {
+        if (req.url.startsWith("/searchIndex") || req.url.startsWith("/v2/searchIndex")) {
           if (req.method === "POST") {
             await searchIndexRouter.put(req, res);
           } else if (req.method === "GET") {
@@ -2577,10 +2634,14 @@ ${dangerText(e.message)}
         configManager.config.search && searchIndexer
       );
     }
+    const searchIndexWithFuzzy = searchIndexClient.searchIndex;
+    if (searchIndexWithFuzzy && searchIndexClient.fuzzySearchWrapper) {
+      searchIndexWithFuzzy.fuzzySearchWrapper = searchIndexClient.fuzzySearchWrapper;
+    }
     const server = await createDevServer(
       configManager,
       database,
-      searchIndexClient.searchIndex,
+      searchIndexWithFuzzy,
       apiURL,
       this.noWatch,
       dbLock

package/dist/next/commands/dev-command/server/searchIndex.d.ts

@@ -1,12 +1,47 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { SearchQueryResponse, SearchResult } from '@tinacms/search';
 export interface PathConfig {
     apiURL: string;
     searchPath: string;
 }
+interface SearchIndexOptions {
+    DOCUMENTS?: boolean;
+    PAGE?: {
+        NUMBER: number;
+        SIZE: number;
+    };
+}
+interface SearchIndexResult {
+    RESULT: SearchResult[];
+    RESULT_LENGTH: number;
+}
+interface FuzzySearchWrapper {
+    query: (query: string, options: {
+        limit?: number;
+        cursor?: string;
+        fuzzyOptions?: Record<string, unknown>;
+    }) => Promise<SearchQueryResponse>;
+}
+interface SearchIndex {
+    PUT: (docs: Record<string, unknown>[]) => Promise<unknown>;
+    DELETE: (id: string) => Promise<unknown>;
+    QUERY: (query: {
+        AND?: string[];
+        OR?: string[];
+    }, options: SearchIndexOptions) => Promise<SearchIndexResult>;
+    fuzzySearchWrapper?: FuzzySearchWrapper;
+}
+interface RequestWithBody extends IncomingMessage {
+    body?: {
+        docs?: Record<string, unknown>[];
+    };
+}
 export declare const createSearchIndexRouter: ({ config, searchIndex, }: {
     config: PathConfig;
-    searchIndex: any;
+    searchIndex: SearchIndex;
 }) => {
-    del: (req: any, res: any) => Promise<void>;
-    get: (req: any, res: any) => Promise<void>;
-    put: (req: any, res: any) => Promise<void>;
+    del: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
+    get: (req: IncomingMessage, res: ServerResponse) => Promise<void>;
+    put: (req: RequestWithBody, res: ServerResponse) => Promise<void>;
 };
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/cli",
   "type": "module",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -88,12 +88,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.3.19",
-    "@tinacms/graphql": "2.0.5",
+    "@tinacms/app": "2.3.20",
+    "@tinacms/graphql": "2.0.6",
+    "@tinacms/search": "1.2.0",
     "@tinacms/metrics": "2.0.1",
-    "@tinacms/search": "1.1.9",
-    "@tinacms/schema-tools": "2.2.0",
-    "tinacms": "3.2.0"
+    "@tinacms/schema-tools": "2.3.0",
+    "tinacms": "3.3.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"