@tinacms/cli 1.5.17 → 1.5.18

package/dist/index.js

@@ -28,10 +28,10 @@ __export(src_exports, {
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
-var import_clipanion7 = require("clipanion");
+var import_clipanion8 = require("clipanion");
 
 // package.json
-var version = "1.5.17";
+var version = "1.5.18";
 
 // src/next/commands/dev-command/index.ts
 var import_clipanion2 = require("clipanion");
@@ -1047,6 +1047,45 @@ var MediaModel = class {
   }
 };
 
+// src/next/commands/dev-command/server/searchIndex.ts
+var createSearchIndexRouter = ({
+  config: config3,
+  searchIndex
+}) => {
+  const put = async (req, res) => {
+    const { docs } = req.body;
+    const result = await searchIndex.PUT(docs);
+    res.end(JSON.stringify({ result }));
+  };
+  const get = async (req, res) => {
+    const requestURL = new URL(req.url, config3.apiURL);
+    const query = requestURL.searchParams.get("q");
+    const optionsParam = requestURL.searchParams.get("options");
+    let options = {
+      DOCUMENTS: false
+    };
+    if (optionsParam) {
+      options = {
+        ...options,
+        ...JSON.parse(optionsParam)
+      };
+    }
+    if (query) {
+      const result = await searchIndex.QUERY(JSON.parse(query), options);
+      res.end(JSON.stringify(result));
+    } else {
+      res.end(JSON.stringify({ RESULT: [] }));
+    }
+  };
+  const del = async (req, res) => {
+    const requestURL = new URL(req.url, config3.apiURL);
+    const docId = requestURL.pathname.split("/").filter(Boolean).slice(1).join("/");
+    const result = await searchIndex.DELETE(docId);
+    res.end(JSON.stringify({ result }));
+  };
+  return { del, get, put };
+};
+
 // src/next/vite/plugins.ts
 var transformTsxPlugin = ({
   configManager: _configManager
@@ -1068,7 +1107,8 @@ var transformTsxPlugin = ({
 var devServerEndPointsPlugin = ({
   configManager,
   apiURL,
-  database
+  database,
+  searchIndex
 }) => {
   const plug = {
     name: "graphql-endpoints",
@@ -1084,6 +1124,10 @@ var devServerEndPointsPlugin = ({
           publicFolder: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.publicFolder) || ""),
           mediaRoot: parseMediaFolder((mediaPaths == null ? void 0 : mediaPaths.mediaRoot) || "")
         });
+        const searchIndexRouter = createSearchIndexRouter({
+          config: { apiURL, searchPath: "searchIndex" },
+          searchIndex
+        });
         if (req.url.startsWith("/media/upload")) {
           await mediaRouter.handlePost(req, res);
           return;
@@ -1120,6 +1164,16 @@ var devServerEndPointsPlugin = ({
           res.end(JSON.stringify(result));
           return;
         }
+        if (req.url.startsWith("/searchIndex")) {
+          if (req.method === "POST") {
+            await searchIndexRouter.put(req, res);
+          } else if (req.method === "GET") {
+            await searchIndexRouter.get(req, res);
+          } else if (req.method === "DELETE") {
+            await searchIndexRouter.del(req, res);
+          }
+          return;
+        }
         next();
       });
     }
@@ -1163,10 +1217,10 @@ function viteTransformExtension({
 }
 
 // src/next/commands/dev-command/server/index.ts
-var createDevServer = async (configManager, database, apiURL, noWatch) => {
+var createDevServer = async (configManager, database, searchIndex, apiURL, noWatch) => {
   const plugins = [
     transformTsxPlugin({ configManager }),
-    devServerEndPointsPlugin({ apiURL, configManager, database }),
+    devServerEndPointsPlugin({ apiURL, configManager, database, searchIndex }),
     viteTransformExtension()
   ];
   return (0, import_vite3.createServer)(
@@ -1823,6 +1877,8 @@ var BaseCommand = class extends import_clipanion.Command {
 };
 
 // src/next/commands/dev-command/index.ts
+var import_memory_level2 = require("memory-level");
+var import_search = require("@tinacms/search");
 var DevCommand = class extends BaseCommand {
   constructor() {
     super(...arguments);
@@ -1847,6 +1903,7 @@ var DevCommand = class extends BaseCommand {
     }
   }
   async execute() {
+    var _a, _b, _c, _d;
     const configManager = new ConfigManager({
       rootPath: this.rootPath,
       legacyNoSDK: this.noSDK
@@ -1878,15 +1935,15 @@ var DevCommand = class extends BaseCommand {
       } else {
         database.clearCache();
       }
-      const { tinaSchema, graphQLSchema, lookup, queryDoc, fragDoc } = await (0, import_graphql8.buildSchema)(configManager.config);
+      const { tinaSchema: tinaSchema2, graphQLSchema: graphQLSchema2, lookup, queryDoc, fragDoc } = await (0, import_graphql8.buildSchema)(configManager.config);
       const codegen2 = new Codegen({
         isLocal: true,
         configManager,
         port: Number(this.port),
         queryDoc,
         fragDoc,
-        graphqlSchemaDoc: graphQLSchema,
-        tinaSchema,
+        graphqlSchemaDoc: graphQLSchema2,
+        tinaSchema: tinaSchema2,
         lookup
       });
       const apiURL2 = await codegen2.execute();
@@ -1911,26 +1968,67 @@ var DevCommand = class extends BaseCommand {
       }
       await this.indexContentWithSpinner({
         database,
-        graphQLSchema,
-        tinaSchema
+        graphQLSchema: graphQLSchema2,
+        tinaSchema: tinaSchema2
       });
-      return { apiURL: apiURL2, database };
+      return { apiURL: apiURL2, database, graphQLSchema: graphQLSchema2, tinaSchema: tinaSchema2 };
     };
-    const { apiURL } = await setup({ firstTime: true });
+    const { apiURL, graphQLSchema, tinaSchema } = await setup({
+      firstTime: true
+    });
     await import_fs_extra4.default.outputFile(configManager.outputHTMLFilePath, devHTML(this.port));
     await import_fs_extra4.default.outputFile(
       configManager.outputGitignorePath,
       "index.html\nassets/"
     );
+    const searchIndex = await (0, import_search.si)({
+      db: new import_memory_level2.MemoryLevel(),
+      stopwords: (0, import_search.lookupStopwords)(
+        (_b = (_a = configManager.config.search) == null ? void 0 : _a.tina) == null ? void 0 : _b.stopwordLanguages
+      )
+    });
+    const searchIndexClient = new import_search.LocalSearchIndexClient(searchIndex);
     const server = await createDevServer(
       configManager,
       database,
+      searchIndex,
       apiURL,
       this.noWatch
     );
     await server.listen(Number(this.port));
+    const searchIndexer = new import_search.SearchIndexer({
+      batchSize: ((_c = configManager.config.search) == null ? void 0 : _c.indexBatchSize) || 100,
+      bridge: new import_graphql8.FilesystemBridge(
+        configManager.rootPath,
+        configManager.contentRootPath
+      ),
+      schema: tinaSchema,
+      client: searchIndexClient,
+      textIndexLength: ((_d = configManager.config.search) == null ? void 0 : _d.maxSearchIndexFieldLength) || 100
+    });
+    await spin({
+      waitFor: async () => {
+        const res = await database.indexContent({
+          graphQLSchema,
+          tinaSchema
+        });
+      },
+      text: "Indexing local files"
+    });
+    if (configManager.config.search) {
+      await spin({
+        waitFor: async () => {
+          await searchIndexer.indexAllContent();
+        },
+        text: "Building search index"
+      });
+    }
     if (!this.noWatch) {
-      this.watchContentFiles(configManager, database);
+      this.watchContentFiles(
+        configManager,
+        database,
+        configManager.config.search && searchIndexer
+      );
     }
     server.watcher.on("change", async (changedPath) => {
       if (changedPath.includes("__generated__")) {
@@ -2001,7 +2099,7 @@ var DevCommand = class extends BaseCommand {
     });
     await this.startSubCommand();
   }
-  watchContentFiles(configManager, database) {
+  watchContentFiles(configManager, database, searchIndexer) {
     const collectionContentFiles = [];
     configManager.config.schema.collections.forEach((collection) => {
       const collectionGlob = `${import_path7.default.join(
@@ -2018,13 +2116,22 @@ var DevCommand = class extends BaseCommand {
         return;
       }
       const pathFromRoot = configManager.printContentRelativePath(addedFile);
-      database.indexContentByPaths([pathFromRoot]).catch(console.error);
+      await database.indexContentByPaths([pathFromRoot]).catch(console.error);
+      if (searchIndexer) {
+        await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
+      }
     }).on("change", async (changedFile) => {
       const pathFromRoot = configManager.printContentRelativePath(changedFile);
-      database.indexContentByPaths([pathFromRoot]).catch(console.error);
+      await database.indexContentByPaths([pathFromRoot]).catch(console.error);
+      if (searchIndexer) {
+        await searchIndexer.indexContentByPaths([pathFromRoot]).catch(console.error);
+      }
     }).on("unlink", async (removedFile) => {
       const pathFromRoot = configManager.printContentRelativePath(removedFile);
-      database.deleteContentByPaths([pathFromRoot]).catch(console.error);
+      await database.deleteContentByPaths([pathFromRoot]).catch(console.error);
+      if (searchIndexer) {
+        await searchIndexer.deleteIndexContent([pathFromRoot]).catch(console.error);
+      }
     });
   }
   watchQueries(configManager, callback) {
@@ -2192,6 +2299,7 @@ var waitForDB = async (config3, apiUrl, verbose) => {
 };
 
 // src/next/commands/build-command/index.ts
+var import_search2 = require("@tinacms/search");
 var BuildCommand = class extends BaseCommand {
   constructor() {
     super(...arguments);
@@ -2207,12 +2315,16 @@ var BuildCommand = class extends BaseCommand {
     this.skipCloudChecks = import_clipanion3.Option.Boolean("--skip-cloud-checks", false, {
       description: "Skips checking the provided cloud config."
     });
+    this.skipSearchIndex = import_clipanion3.Option.Boolean("--skip-search-index", false, {
+      description: "Skip indexing the site for search"
+    });
   }
   async catch(error) {
     console.error(error);
     process.exit(1);
   }
   async execute() {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     logger.info("Starting Tina build");
     this.logDeprecationWarnings();
     const configManager = new ConfigManager({
@@ -2255,7 +2367,13 @@ var BuildCommand = class extends BaseCommand {
       });
     }
     if (this.localOption) {
-      server = await createDevServer(configManager, database, apiURL, true);
+      server = await createDevServer(
+        configManager,
+        database,
+        null,
+        apiURL,
+        true
+      );
       await server.listen(Number(this.port));
       console.log("server listening on port", this.port);
     }
@@ -2274,6 +2392,66 @@ var BuildCommand = class extends BaseCommand {
       configManager.outputGitignorePath,
       "index.html\nassets/"
     );
+    if (configManager.config.search && !this.skipSearchIndex && !this.localOption) {
+      let client;
+      const hasTinaSearch = Boolean((_b = (_a = configManager.config) == null ? void 0 : _a.search) == null ? void 0 : _b.tina);
+      if (hasTinaSearch) {
+        if (!((_c = configManager.config) == null ? void 0 : _c.branch)) {
+          logger.error(
+            `${dangerText(
+              `ERROR: Branch not configured in tina search configuration.`
+            )}`
+          );
+          throw new Error("Branch not configured in tina search configuration.");
+        }
+        if (!((_d = configManager.config) == null ? void 0 : _d.clientId)) {
+          logger.error(`${dangerText(`ERROR: clientId not configured.`)}`);
+          throw new Error("clientId not configured.");
+        }
+        if (!((_g = (_f = (_e = configManager.config) == null ? void 0 : _e.search) == null ? void 0 : _f.tina) == null ? void 0 : _g.indexerToken)) {
+          logger.error(
+            `${dangerText(
+              `ERROR: indexerToken not configured in tina search configuration.`
+            )}`
+          );
+          throw new Error(
+            "indexerToken not configured in tina search configuration."
+          );
+        }
+        client = new import_search2.TinaCMSSearchIndexClient({
+          apiUrl: `${((_h = configManager.config.tinaioConfig) == null ? void 0 : _h.contentApiUrlOverride) || "https://content.tinajs.io"}/searchIndex/${(_i = configManager.config) == null ? void 0 : _i.clientId}`,
+          branch: (_j = configManager.config) == null ? void 0 : _j.branch,
+          indexerToken: (_m = (_l = (_k = configManager.config) == null ? void 0 : _k.search) == null ? void 0 : _l.tina) == null ? void 0 : _m.indexerToken,
+          stopwordLanguages: (_p = (_o = (_n = configManager.config) == null ? void 0 : _n.search) == null ? void 0 : _o.tina) == null ? void 0 : _p.stopwordLanguages
+        });
+      } else {
+        client = (_r = (_q = configManager.config) == null ? void 0 : _q.search) == null ? void 0 : _r.searchClient;
+      }
+      const searchIndexer = new import_search2.SearchIndexer({
+        batchSize: ((_s = configManager.config.search) == null ? void 0 : _s.indexBatchSize) || 100,
+        bridge: new import_graphql9.FilesystemBridge(
+          configManager.rootPath,
+          configManager.contentRootPath
+        ),
+        schema: tinaSchema,
+        client
+      });
+      let err;
+      await spin({
+        waitFor: async () => {
+          try {
+            await searchIndexer.indexAllContent();
+          } catch (e) {
+            err = e;
+          }
+        },
+        text: "Building search index"
+      });
+      if (err) {
+        logger.error(`${dangerText(`ERROR: ${err.message}`)}`);
+        process.exit(1);
+      }
+    }
     const summaryItems = [];
     if (!configManager.shouldSkipSDK()) {
       summaryItems.push({
@@ -4439,8 +4617,115 @@ InitCommand.usage = import_clipanion6.Command.Usage({
   description: `Add Tina to an existing project`
 });
 
+// src/next/commands/searchindex-command/index.ts
+var import_clipanion7 = require("clipanion");
+var import_graphql15 = require("@tinacms/graphql");
+var import_search3 = require("@tinacms/search");
+var SearchIndexCommand = class extends import_clipanion7.Command {
+  constructor() {
+    super(...arguments);
+    this.rootPath = import_clipanion7.Option.String("--rootPath", {
+      description: "Specify the root directory to run the CLI from (defaults to current working directory)"
+    });
+    this.verbose = import_clipanion7.Option.Boolean("-v,--verbose", false, {
+      description: "increase verbosity of logged output"
+    });
+  }
+  async catch(error) {
+    logger.error("Error occured during tinacms search-index");
+    console.error(error);
+    process.exit(1);
+  }
+  async execute() {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
+    const rootPath = this.rootPath || process.cwd();
+    const configManager = new ConfigManager({ rootPath });
+    try {
+      await configManager.processConfig();
+    } catch (e) {
+      logger.error(e.message);
+      if (this.verbose) {
+        console.error(e);
+      }
+    }
+    if (!((_a = configManager.config) == null ? void 0 : _a.search)) {
+      logger.error("No search config found");
+      process.exit(1);
+    }
+    const { schema } = configManager.config;
+    const tinaSchema = await (0, import_graphql15.createSchema)({
+      schema: { ...schema, config: configManager.config }
+    });
+    let client;
+    const hasTinaSearch = Boolean((_c = (_b = configManager.config) == null ? void 0 : _b.search) == null ? void 0 : _c.tina);
+    if (hasTinaSearch) {
+      if (!((_d = configManager.config) == null ? void 0 : _d.branch)) {
+        logger.error(
+          `${dangerText(
+            `ERROR: Branch not configured in tina search configuration.`
+          )}`
+        );
+        throw new Error("Branch not configured in tina search configuration.");
+      }
+      if (!((_e = configManager.config) == null ? void 0 : _e.clientId)) {
+        logger.error(`${dangerText(`ERROR: clientId not configured.`)}`);
+        throw new Error("clientId not configured.");
+      }
+      if (!((_h = (_g = (_f = configManager.config) == null ? void 0 : _f.search) == null ? void 0 : _g.tina) == null ? void 0 : _h.indexerToken)) {
+        logger.error(
+          `${dangerText(
+            `ERROR: indexerToken not configured in tina search configuration.`
+          )}`
+        );
+        throw new Error(
+          "indexerToken not configured in tina search configuration."
+        );
+      }
+      client = new import_search3.TinaCMSSearchIndexClient({
+        apiUrl: `${((_i = configManager.config.tinaioConfig) == null ? void 0 : _i.contentApiUrlOverride) || "https://content.tinajs.io"}/searchIndex/${(_j = configManager.config) == null ? void 0 : _j.clientId}`,
+        branch: (_k = configManager.config) == null ? void 0 : _k.branch,
+        indexerToken: (_n = (_m = (_l = configManager.config) == null ? void 0 : _l.search) == null ? void 0 : _m.tina) == null ? void 0 : _n.indexerToken,
+        stopwordLanguages: (_q = (_p = (_o = configManager.config) == null ? void 0 : _o.search) == null ? void 0 : _p.tina) == null ? void 0 : _q.stopwordLanguages
+      });
+    } else {
+      client = (_s = (_r = configManager.config) == null ? void 0 : _r.search) == null ? void 0 : _s.searchClient;
+    }
+    const searchIndexer = new import_search3.SearchIndexer({
+      batchSize: ((_t = configManager.config.search) == null ? void 0 : _t.indexBatchSize) || 100,
+      bridge: new import_graphql15.FilesystemBridge(
+        configManager.rootPath,
+        configManager.contentRootPath
+      ),
+      schema: tinaSchema,
+      textIndexLength: ((_u = configManager.config.search) == null ? void 0 : _u.maxSearchIndexFieldLength) || 100,
+      client
+    });
+    let err;
+    await spin({
+      waitFor: async () => {
+        try {
+          await searchIndexer.indexAllContent();
+        } catch (e) {
+          err = e;
+        }
+      },
+      text: "Building search index"
+    });
+    if (err) {
+      logger.error(`${dangerText(`ERROR: ${err.message}`)}`);
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+};
+SearchIndexCommand.paths = [["search-index"]];
+SearchIndexCommand.usage = import_clipanion7.Command.Usage({
+  category: `Commands`,
+  description: `Index the site for search`
+});
+
 // src/index.ts
-var cli = new import_clipanion7.Cli({
+var cli = new import_clipanion8.Cli({
   binaryName: `tinacms`,
   binaryLabel: `TinaCMS`,
   binaryVersion: version
@@ -4450,9 +4735,10 @@ cli.register(BuildCommand);
 cli.register(AuditCommand);
 cli.register(InitCommand);
 cli.register(CodemodCommand);
-cli.register(import_clipanion7.Builtins.DefinitionsCommand);
-cli.register(import_clipanion7.Builtins.HelpCommand);
-cli.register(import_clipanion7.Builtins.VersionCommand);
+cli.register(SearchIndexCommand);
+cli.register(import_clipanion8.Builtins.DefinitionsCommand);
+cli.register(import_clipanion8.Builtins.HelpCommand);
+cli.register(import_clipanion8.Builtins.VersionCommand);
 var src_default = cli;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/next/commands/build-command/index.d.ts

@@ -10,6 +10,7 @@ export declare class BuildCommand extends BaseCommand {
      * This option allows the user to skip the tina cloud checks if they want to. This could be useful for mismatched GraphQL versions or if they want to build only using the local client and never connect to Tina Cloud
      */
     skipCloudChecks: boolean;
+    skipSearchIndex: boolean;
     static usage: import("clipanion").Usage;
     catch(error: any): Promise<void>;
     execute(): Promise<number | void>;

package/dist/next/commands/dev-command/index.d.ts

@@ -1,6 +1,7 @@
 import { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../config-manager';
 import { BaseCommand } from '../baseCommands';
+import { SearchIndexer } from '@tinacms/search';
 export declare class DevCommand extends BaseCommand {
     static paths: string[][];
     watchFolders: string;
@@ -9,6 +10,6 @@ export declare class DevCommand extends BaseCommand {
     catch(error: any): Promise<void>;
     logDeprecationWarnings(): void;
     execute(): Promise<number | void>;
-    watchContentFiles(configManager: ConfigManager, database: Database): void;
+    watchContentFiles(configManager: ConfigManager, database: Database, searchIndexer?: SearchIndexer): void;
     watchQueries(configManager: ConfigManager, callback: () => Promise<string>): void;
 }

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

@@ -1,3 +1,3 @@
 import type { Database } from '@tinacms/graphql';
 import { ConfigManager } from '../../../config-manager';
-export declare const createDevServer: (configManager: ConfigManager, database: Database, apiURL: string, noWatch: boolean) => Promise<import("vite").ViteDevServer>;
+export declare const createDevServer: (configManager: ConfigManager, database: Database, searchIndex: any, apiURL: string, noWatch: boolean) => Promise<import("vite").ViteDevServer>;

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

@@ -0,0 +1,12 @@
+export interface PathConfig {
+    apiURL: string;
+    searchPath: string;
+}
+export declare const createSearchIndexRouter: ({ config, searchIndex, }: {
+    config: PathConfig;
+    searchIndex: any;
+}) => {
+    del: (req: any, res: any) => Promise<void>;
+    get: (req: any, res: any) => Promise<void>;
+    put: (req: any, res: any) => Promise<void>;
+};

package/dist/next/commands/searchindex-command/index.d.ts

@@ -0,0 +1,9 @@
+import { Command } from 'clipanion';
+export declare class SearchIndexCommand extends Command {
+    static paths: string[][];
+    rootPath: string;
+    verbose: boolean;
+    static usage: import("clipanion").Usage;
+    catch(error: any): Promise<void>;
+    execute(): Promise<number | void>;
+}

package/dist/next/vite/plugins.d.ts

@@ -7,10 +7,11 @@ import type { ConfigManager } from '../config-manager';
 export declare const transformTsxPlugin: ({ configManager: _configManager, }: {
     configManager: ConfigManager;
 }) => Plugin;
-export declare const devServerEndPointsPlugin: ({ configManager, apiURL, database, }: {
+export declare const devServerEndPointsPlugin: ({ configManager, apiURL, database, searchIndex, }: {
     apiURL: string;
     database: Database;
     configManager: ConfigManager;
+    searchIndex: any;
 }) => Plugin;
 export interface ViteSvgrOptions {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/cli",
-  "version": "1.5.17",
+  "version": "1.5.18",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -58,11 +58,12 @@
     "@tailwindcss/aspect-ratio": "^0.4.0",
     "@tailwindcss/line-clamp": "^0.3.1",
     "@tailwindcss/typography": "^0.5.9",
-    "@tinacms/app": "1.2.15",
-    "@tinacms/datalayer": "1.2.15",
-    "@tinacms/graphql": "1.4.15",
+    "@tinacms/app": "1.2.16",
+    "@tinacms/datalayer": "1.2.16",
+    "@tinacms/graphql": "1.4.16",
     "@tinacms/metrics": "1.0.2",
-    "@tinacms/schema-tools": "1.4.4",
+    "@tinacms/schema-tools": "1.4.5",
+    "@tinacms/search": "1.0.1",
     "@vitejs/plugin-react": "3.1.0",
     "ajv": "^6.12.3",
     "altair-express-middleware": "4.0.6",