mongoose-smart-query 1.4.0 → 1.4.1

package/dist/plugin/methods.js

@@ -71,6 +71,7 @@ function createSmartQuery(options) {
                         typesenseIds = [];
                         typesenseTotal = 0;
                         if (!(typesense_1.globalTypesenseClient && typesense)) return [3 /*break*/, 4];
+                        if (!!(0, typesense_1.hasUnindexedFields)(query, typesense.schema, options)) return [3 /*break*/, 4];
                         _g.label = 1;
                     case 1:
                         _g.trys.push([1, 3, , 4]);
@@ -220,7 +221,9 @@ function createSmartCount(options) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(typesense_1.globalTypesenseClient && typesense)) return [3 /*break*/, 4];
+                        if (!(typesense_1.globalTypesenseClient &&
+                            typesense &&
+                            !(0, typesense_1.hasUnindexedFields)(query, typesense.schema, options))) return [3 /*break*/, 4];
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);

package/dist/typesense/builder.d.ts

@@ -3,3 +3,6 @@ import type { PluginOptions, PluginTypesenseOptions } from '../types';
 export declare const buildTypesenseSearchParameters: (query: {
     [key: string]: string;
 }, tsSchema: PluginTypesenseOptions["schema"], options: PluginOptions) => SearchParams<any>;
+export declare const hasUnindexedFields: (query: {
+    [key: string]: string;
+}, tsSchema: PluginTypesenseOptions["schema"], options: PluginOptions) => boolean;

package/dist/typesense/builder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTypesenseSearchParameters = void 0;
+exports.hasUnindexedFields = exports.buildTypesenseSearchParameters = void 0;
 var buildTypesenseSearchParameters = function (query, tsSchema, options) {
     var _a, _b, _c;
     var _d = options.queryName, queryName = _d === void 0 ? '$q' : _d, _e = options.pageQueryName, pageQueryName = _e === void 0 ? '$page' : _e, _f = options.limitQueryName, limitQueryName = _f === void 0 ? '$limit' : _f, _g = options.defaultLimit, defaultLimit = _g === void 0 ? 20 : _g, _h = options.fieldsForDefaultQuery, fieldsForDefaultQuery = _h === void 0 ? '' : _h, _j = options.sortQueryName, sortQueryName = _j === void 0 ? '$sort' : _j, _k = options.fieldsQueryName, fieldsQueryName = _k === void 0 ? '$fields' : _k, _l = options.unwindName, unwindName = _l === void 0 ? '$unwind' : _l, _m = options.textQueryName, textQueryName = _m === void 0 ? '$text' : _m, _o = options.allFieldsQueryName, allFieldsQueryName = _o === void 0 ? '$getAllFields' : _o, _p = options.defaultSort, defaultSort = _p === void 0 ? '-_id' : _p;
@@ -8,7 +8,7 @@ var buildTypesenseSearchParameters = function (query, tsSchema, options) {
     var page = parseInt(query[pageQueryName]) || 1;
     var limit = parseInt(query[limitQueryName]) || defaultLimit;
     var queryByFields = (_a = tsSchema.fields) === null || _a === void 0 ? void 0 : _a.filter(function (f) { return f.type.includes('string') && f.name !== 'id' && !f.facet; }).map(function (f) { return f.name; });
-    if (fieldsForDefaultQuery && query[queryName]) {
+    if (fieldsForDefaultQuery) {
         queryByFields = fieldsForDefaultQuery
             .split(' ')
             .map(function (mongoField) {
@@ -145,3 +145,31 @@ var buildTypesenseSearchParameters = function (query, tsSchema, options) {
     return searchParams;
 };
 exports.buildTypesenseSearchParameters = buildTypesenseSearchParameters;
+var hasUnindexedFields = function (query, tsSchema, options) {
+    var _a;
+    var _b = options.queryName, queryName = _b === void 0 ? '$q' : _b, _c = options.pageQueryName, pageQueryName = _c === void 0 ? '$page' : _c, _d = options.limitQueryName, limitQueryName = _d === void 0 ? '$limit' : _d, _e = options.sortQueryName, sortQueryName = _e === void 0 ? '$sort' : _e, _f = options.fieldsQueryName, fieldsQueryName = _f === void 0 ? '$fields' : _f, _g = options.unwindName, unwindName = _g === void 0 ? '$unwind' : _g, _h = options.textQueryName, textQueryName = _h === void 0 ? '$text' : _h, _j = options.allFieldsQueryName, allFieldsQueryName = _j === void 0 ? '$getAllFields' : _j;
+    var specialKeys = [
+        pageQueryName,
+        limitQueryName,
+        sortQueryName,
+        queryName,
+        fieldsQueryName,
+        unwindName,
+        textQueryName,
+        allFieldsQueryName,
+    ];
+    var _loop_3 = function (key) {
+        if (specialKeys.includes(key))
+            return "continue";
+        var field = (_a = tsSchema.fields) === null || _a === void 0 ? void 0 : _a.find(function (f) { return (f.mongoField || f.name) === key; });
+        if (!field)
+            return { value: true };
+    };
+    for (var key in query) {
+        var state_1 = _loop_3(key);
+        if (typeof state_1 === "object")
+            return state_1.value;
+    }
+    return false;
+};
+exports.hasUnindexedFields = hasUnindexedFields;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongoose-smart-query",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Optimize rest requests",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",