@tinacms/cli 0.0.0-bf8b9b7-20251204000148 → 0.0.0-c19d29e-20251224001156

package/dist/cmds/forestry-migrate/util/index.d.ts

@@ -59,7 +59,6 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type?: "number" | "boolean" | "file" | "text" | "color" | "include" | "list" | "datetime" | "select" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks";
     default?: any;
     name?: string;
     config?: {
@@ -76,10 +75,10 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     };
     label?: string;
+    type?: "number" | "boolean" | "text" | "color" | "file" | "include" | "list" | "datetime" | "select" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks";
     template?: string;
     template_types?: string[];
 }, {
-    type?: "number" | "boolean" | "file" | "text" | "color" | "include" | "list" | "datetime" | "select" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks";
     default?: any;
     name?: string;
     config?: {
@@ -96,6 +95,7 @@ declare const forestryFieldWithoutField: z.ZodObject<{
         };
     };
     label?: string;
+    type?: "number" | "boolean" | "text" | "color" | "file" | "include" | "list" | "datetime" | "select" | "image_gallery" | "textarea" | "tag_list" | "field_group" | "field_group_list" | "blocks";
     template?: string;
     template_types?: string[];
 }>;
@@ -149,12 +149,12 @@ export declare const parseSections: ({ val }: {
     val: unknown;
 }) => {
     sections?: {
-        exclude?: string;
-        type?: "heading" | "document" | "directory" | "jekyll-pages" | "jekyll-posts";
         match?: string;
         templates?: string[];
         label?: string;
         path?: string;
+        type?: "heading" | "document" | "directory" | "jekyll-pages" | "jekyll-posts";
+        exclude?: string;
         create?: "none" | "all" | "documents";
         new_doc_ext?: string;
         read_only?: boolean;

package/dist/index.js

@@ -2,7 +2,7 @@
 import { Cli, Builtins } from "clipanion";
 
 // package.json
-var version = "2.0.0";
+var version = "2.0.5";
 
 // src/next/commands/dev-command/index.ts
 import path8 from "path";
@@ -28,15 +28,15 @@ function isUnicodeSupported() {
 }
 
 // src/logger/index.ts
-import log4js from "log4js";
-var logger = log4js.getLogger();
-log4js.configure({
-  appenders: {
-    out: { type: "stdout", layout: { type: "messagePassThrough" } }
-  },
-  categories: { default: { appenders: ["out"], level: "info" } }
-});
-logger.level = "info";
+var logger = {
+  level: "info",
+  info: (msg) => process.stdout.write(msg + "\n"),
+  warn: (msg) => process.stdout.write(msg + "\n"),
+  error: (msg) => process.stderr.write(msg + "\n"),
+  debug: (msg) => {
+    if (logger.level === "debug") process.stdout.write(msg + "\n");
+  }
+};
 function ansiRegex() {
   const pattern = [
     "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
@@ -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)
@@ -1115,20 +1123,12 @@ var ConfigManager = class {
       this.generatedFolderPath,
       "config.prebuild.jsx"
     );
-    const nativeNodeModulesPlugin = {
-      name: "native-node-modules",
-      setup(build3) {
-        build3.onResolve({ filter: /^node:.*/ }, (args) => {
-          return {
-            path: args.path,
-            external: true
-          };
-        });
-      }
-    };
     const outfile = path3.join(tmpdir, "config.build.jsx");
     const outfile2 = path3.join(tmpdir, "config.build.mjs");
     const tempTSConfigFile = path3.join(tmpdir, "tsconfig.json");
+    const esmRequireBanner = {
+      js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
+    };
     fs2.outputFileSync(tempTSConfigFile, "{}");
     const result2 = await esbuild.build({
       entryPoints: [configFilePath],
@@ -1158,12 +1158,12 @@ var ConfigManager = class {
       platform: "node",
       format: "esm",
       outfile,
-      loader: loaders
+      loader: loaders,
+      banner: esmRequireBanner
     });
     await esbuild.build({
       entryPoints: [outfile],
       bundle: true,
-      // Suppress warning about comparison with -0 from client module
       logLevel: "silent",
       platform: "node",
       target: ["esnext"],
@@ -1718,7 +1718,7 @@ var tinaTailwind = (spaPath, prebuildFilePath) => {
             },
             boxShadow: {
               xs: "0 0 0 1px rgba(0, 0, 0, 0.05)",
-              outline: "0 0 0 3px rgba(66, 153, 225, 0.5)"
+              outline: "0 0 0 3px rgba(194, 65, 12, 0.2)"
             },
             colors: {
               blue: {
@@ -1775,7 +1775,7 @@ var tinaTailwind = (spaPath, prebuildFilePath) => {
               "accent-foreground": "#171717",
               destructive: "#FF3B3B",
               "destructive-foreground": "#FAFAFA",
-              ring: "#0A0A0A"
+              ring: "#C2410C"
             },
             fontFamily: {
               sans: ["Inter", ...defaultTheme.fontFamily.sans]
@@ -2187,34 +2187,127 @@ 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
-    };
+    const fuzzyParam = requestURL.searchParams.get("fuzzy");
+    const fuzzyOptionsParam = requestURL.searchParams.get("fuzzyOptions");
+    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);
+    if (fuzzyParam === "true" && searchIndex.fuzzySearchWrapper) {
+      try {
+        const fuzzyOptions = fuzzyOptionsParam ? JSON.parse(fuzzyOptionsParam) : {};
+        const searchTerms = queryObj.AND ? queryObj.AND.filter(
+          (term) => !term.includes("_collection:")
+        ) : [];
+        const collectionFilter = queryObj.AND?.find(
+          (term) => term.includes("_collection:")
+        );
+        const paginationOptions = {};
+        if (searchIndexOptions.PAGE) {
+          paginationOptions.limit = searchIndexOptions.PAGE.SIZE;
+          paginationOptions.cursor = searchIndexOptions.PAGE.NUMBER.toString();
+        }
+        const searchQuery = collectionFilter ? `${searchTerms.join(" ")} ${collectionFilter}` : searchTerms.join(" ");
+        const result2 = await searchIndex.fuzzySearchWrapper.query(searchQuery, {
+          ...paginationOptions,
+          fuzzyOptions
+        });
+        if (collectionFilter) {
+          const collection = collectionFilter.split(":")[1];
+          result2.results = result2.results.filter(
+            (r) => r._id && r._id.startsWith(`${collection}:`)
+          );
+        }
+        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] Fuzzy search failed, falling back to standard search:",
+          error instanceof Error ? error.message : error
+        );
+      }
     }
+    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" });
@@ -2304,7 +2397,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") {
@@ -2585,10 +2678,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
@@ -5072,7 +5169,7 @@ var generateAllTemplates = async ({
       });
       templateMap.set(tem, { fields, templateObj });
     } catch (e) {
-      logger.log(`Error parsing template frontmatter template', tem + '.yml'`);
+      logger.warn(`Error parsing template frontmatter template, ${tem}.yml`);
       console.error(e);
       templateMap.set(tem, { fields: [], templateObj: {} });
     }
@@ -5116,7 +5213,7 @@ var generateCollectionFromForestrySection = (args) => {
   }
   if (section.type === "directory") {
     if (!section?.path || section.path === "/" || section.path === "./" || section.path === ".") {
-      logger.log(
+      logger.warn(
         warnText(
           `Warning: Section ${section.label} is using a Root Path. Currently, Tina Does not support Root paths see ${linkText(
             "https://github.com/tinacms/tinacms/issues/3768"
@@ -5253,7 +5350,7 @@ var generateCollectionFromForestrySection = (args) => {
         fields
       };
     } else {
-      logger.log(
+      logger.warn(
         warnText(
           `Error: document section has an unsupported file extension: ${extname} in ${section.path}`
         )
@@ -6528,9 +6625,7 @@ ${titleText(" TinaCMS ")} has been initialized!`));
     );
     if (framework.name === "hugo") {
       logger.info(
-        focusText("Hugo is required. "),
-        "Don't have Hugo installed? Follow this guide to set it up: ",
-        linkText("https://gohugo.io/installation/")
+        focusText("Hugo is required. ") + "Don't have Hugo installed? Follow this guide to set it up: " + linkText("https://gohugo.io/installation/")
       );
     }
     logger.info(

package/dist/logger/index.d.ts

@@ -1,5 +1,10 @@
-import log4js from 'log4js';
-export declare const logger: log4js.Logger;
+export declare const logger: {
+    level: string;
+    info: (msg: string) => boolean;
+    warn: (msg: string) => boolean;
+    error: (msg: string) => boolean;
+    debug: (msg: string) => void;
+};
 export declare const note: (message?: string, title?: string) => void;
 export declare const log: (message?: string) => void;
 export declare const warn: (message?: string, path?: string) => void;

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/dist/utils/theme.d.ts

@@ -1,36 +1,16 @@
 /**
 
 */
-export declare const successText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const focusText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const dangerText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const neutralText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const linkText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const labelText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const cmdText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
+export declare const successText: import("chalk").ChalkInstance;
+export declare const focusText: import("chalk").ChalkInstance;
+export declare const dangerText: import("chalk").ChalkInstance;
+export declare const neutralText: import("chalk").ChalkInstance;
+export declare const linkText: import("chalk").ChalkInstance;
+export declare const labelText: import("chalk").ChalkInstance;
+export declare const cmdText: import("chalk").ChalkInstance;
 export declare const indentedCmd: (str: any) => string;
 export declare const indentText: (str: any) => string;
-export declare const logText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const warnText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
-export declare const titleText: import("chalk").Chalk & {
-    supportsColor: import("chalk").ColorSupport;
-};
+export declare const logText: import("chalk").ChalkInstance;
+export declare const warnText: import("chalk").ChalkInstance;
+export declare const titleText: import("chalk").ChalkInstance;
 export declare const CONFIRMATION_TEXT: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/cli",
   "type": "module",
-  "version": "0.0.0-bf8b9b7-20251204000148",
+  "version": "0.0.0-c19d29e-20251224001156",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -36,13 +36,12 @@
     "@types/jest": "26.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/listr": "0.14.2",
-    "@types/log4js": "^2.3.5",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.13.1",
     "@types/progress": "^2.0.7",
     "@types/prompts": "^2.4.9",
     "jest": "^29.7.0",
-    "@tinacms/scripts": "1.4.1"
+    "@tinacms/scripts": "1.4.2"
   },
   "dependencies": {
     "@graphql-codegen/core": "^2.6.8",
@@ -64,7 +63,7 @@
     "auto-bind": "^4.0.0",
     "body-parser": "^1.20.3",
     "busboy": "^1.6.0",
-    "chalk": "^2.4.2",
+    "chalk": "^5.4.1",
     "chokidar": "^3.6.0",
     "cli-spinner": "^0.2.10",
     "clipanion": "^3.2.1",
@@ -75,7 +74,6 @@
     "fs-extra": "^11.3.0",
     "graphql": "15.8.0",
     "js-yaml": "^4.1.0",
-    "log4js": "^6.9.1",
     "many-level": "^2.0.0",
     "memory-level": "^1.0.0",
     "minimatch": "^5.1.6",
@@ -90,12 +88,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/graphql": "0.0.0-bf8b9b7-20251204000148",
-    "@tinacms/app": "0.0.0-bf8b9b7-20251204000148",
-    "@tinacms/metrics": "2.0.0",
-    "@tinacms/schema-tools": "2.0.0",
-    "@tinacms/search": "0.0.0-bf8b9b7-20251204000148",
-    "tinacms": "0.0.0-bf8b9b7-20251204000148"
+    "@tinacms/graphql": "0.0.0-c19d29e-20251224001156",
+    "@tinacms/app": "0.0.0-c19d29e-20251224001156",
+    "@tinacms/schema-tools": "0.0.0-c19d29e-20251224001156",
+    "@tinacms/metrics": "2.0.1",
+    "tinacms": "0.0.0-c19d29e-20251224001156",
+    "@tinacms/search": "0.0.0-c19d29e-20251224001156"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"