@tinacms/search 1.0.4 → 1.0.6

package/dist/index-client.d.ts

@@ -1,6 +1,6 @@
 export type { SearchClient } from './types';
 export { processDocumentForIndexing } from './indexer/utils';
-export declare const queryToSearchIndexQuery: (query: string) => any;
+export declare const queryToSearchIndexQuery: (query: string, stopwordLanguages?: string[]) => any;
 export declare const optionsToSearchIndexOptions: (options?: {
     limit?: number;
     cursor?: string;

package/dist/index-client.es.js

@@ -1,3 +1,4 @@
+import * as sw from "stopword";
 class StringBuilder {
   constructor(limit) {
     this.length = 0;
@@ -116,13 +117,33 @@ const processDocumentForIndexing = (data, path, collection, textIndexLength, fie
   }
   return data;
 };
-const queryToSearchIndexQuery = (query) => {
+const memo = {};
+const lookupStopwords = (keys, defaultStopWords = sw.eng) => {
+  let stopwords = defaultStopWords;
+  if (keys) {
+    if (memo[keys.join(",")]) {
+      return memo[keys.join(",")];
+    }
+    stopwords = [];
+    for (const key of keys) {
+      stopwords.push(...sw[key]);
+    }
+    memo[keys.join(",")] = stopwords;
+  }
+  return stopwords;
+};
+const queryToSearchIndexQuery = (query, stopwordLanguages) => {
   let q;
   const parts = query.split(" ");
+  const stopwords = lookupStopwords(stopwordLanguages);
   if (parts.length === 1) {
     q = { AND: [parts[0]] };
   } else {
-    q = { AND: parts.filter((part) => part.toLowerCase() !== "and") };
+    q = {
+      AND: parts.filter(
+        (part) => part.toLowerCase() !== "and" && stopwords.indexOf(part.toLowerCase()) === -1
+      )
+    };
   }
   return q;
 };

package/dist/index-client.js

@@ -1,7 +1,24 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@tinacms/search"] = {}));
-})(this, function(exports2) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("stopword")) : typeof define === "function" && define.amd ? define(["exports", "stopword"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@tinacms/search"] = {}, global.NOOP));
+})(this, function(exports2, sw) {
   "use strict";
+  function _interopNamespaceDefault(e) {
+    const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+    if (e) {
+      for (const k in e) {
+        if (k !== "default") {
+          const d = Object.getOwnPropertyDescriptor(e, k);
+          Object.defineProperty(n, k, d.get ? d : {
+            enumerable: true,
+            get: () => e[k]
+          });
+        }
+      }
+    }
+    n.default = e;
+    return Object.freeze(n);
+  }
+  const sw__namespace = /* @__PURE__ */ _interopNamespaceDefault(sw);
   class StringBuilder {
     constructor(limit) {
       this.length = 0;
@@ -120,13 +137,33 @@
     }
     return data;
   };
-  const queryToSearchIndexQuery = (query) => {
+  const memo = {};
+  const lookupStopwords = (keys, defaultStopWords = sw__namespace.eng) => {
+    let stopwords = defaultStopWords;
+    if (keys) {
+      if (memo[keys.join(",")]) {
+        return memo[keys.join(",")];
+      }
+      stopwords = [];
+      for (const key of keys) {
+        stopwords.push(...sw__namespace[key]);
+      }
+      memo[keys.join(",")] = stopwords;
+    }
+    return stopwords;
+  };
+  const queryToSearchIndexQuery = (query, stopwordLanguages) => {
     let q;
     const parts = query.split(" ");
+    const stopwords = lookupStopwords(stopwordLanguages);
     if (parts.length === 1) {
       q = { AND: [parts[0]] };
     } else {
-      q = { AND: parts.filter((part) => part.toLowerCase() !== "and") };
+      q = {
+        AND: parts.filter(
+          (part) => part.toLowerCase() !== "and" && stopwords.indexOf(part.toLowerCase()) === -1
+        )
+      };
     }
     return q;
   };

package/dist/index.d.ts

@@ -2,6 +2,4 @@ import si from 'search-index';
 export { SearchIndexer } from './indexer';
 export { LocalSearchIndexClient, TinaCMSSearchIndexClient } from './client';
 export type { SearchClient } from './types';
-export { default as sw } from 'stopword';
 export { si };
-export declare const lookupStopwords: (keys?: string[], defaultStopWords?: string[]) => string[];

package/dist/index.js

@@ -28,18 +28,16 @@ __export(src_exports, {
   LocalSearchIndexClient: () => LocalSearchIndexClient,
   SearchIndexer: () => SearchIndexer,
   TinaCMSSearchIndexClient: () => TinaCMSSearchIndexClient,
-  lookupStopwords: () => lookupStopwords,
-  si: () => import_search_index2.default,
-  sw: () => import_stopword.default
+  si: () => import_search_index2.default
 });
 module.exports = __toCommonJS(src_exports);
-var sw = __toESM(require("stopword"));
 var import_search_index2 = __toESM(require("search-index"));
 
 // src/indexer/index.ts
 var import_graphql = require("@tinacms/graphql");
 
 // src/indexer/utils.ts
+var sw = __toESM(require("stopword"));
 var StringBuilder = class {
   constructor(limit) {
     this.length = 0;
@@ -158,6 +156,21 @@ var processDocumentForIndexing = (data, path, collection, textIndexLength, field
   }
   return data;
 };
+var memo = {};
+var lookupStopwords = (keys, defaultStopWords = sw.eng) => {
+  let stopwords = defaultStopWords;
+  if (keys) {
+    if (memo[keys.join(",")]) {
+      return memo[keys.join(",")];
+    }
+    stopwords = [];
+    for (const key of keys) {
+      stopwords.push(...sw[key]);
+    }
+    memo[keys.join(",")] = stopwords;
+  }
+  return stopwords;
+};
 
 // src/indexer/index.ts
 var SearchIndexer = class {
@@ -345,25 +358,10 @@ ${await res.text()}`
     }
   }
 };
-
-// src/index.ts
-var import_stopword = __toESM(require("stopword"));
-var lookupStopwords = (keys, defaultStopWords = sw.eng) => {
-  let stopwords = defaultStopWords;
-  if (keys) {
-    stopwords = [];
-    for (const key of keys) {
-      stopwords.push(...sw[key]);
-    }
-  }
-  return stopwords;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LocalSearchIndexClient,
   SearchIndexer,
   TinaCMSSearchIndexClient,
-  lookupStopwords,
-  si,
-  sw
+  si
 });

package/dist/indexer/utils.d.ts

@@ -1,2 +1,3 @@
 import { Collection, ObjectField } from '@tinacms/schema-tools';
 export declare const processDocumentForIndexing: (data: any, path: string, collection: Collection, textIndexLength: number, field?: ObjectField) => any;
+export declare const lookupStopwords: (keys?: string[], defaultStopWords?: string[]) => string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/search",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "main": "dist/index.js",
   "module": "dist/index-client.es.js",
   "typings": "dist/index.d.ts",
@@ -29,8 +29,8 @@
     ]
   },
   "dependencies": {
-    "@tinacms/graphql": "1.4.19",
-    "@tinacms/schema-tools": "1.4.7",
+    "@tinacms/graphql": "1.4.21",
+    "@tinacms/schema-tools": "1.4.8",
     "abstract-level": "^1.0.3",
     "memory-level": "^1.0.0",
     "module-error": "^1.0.2",