@autofleet/sadot 0.4.1 → 0.4.3

package/dist/{src/scopes → scopes}/filter.js

@@ -13,16 +13,27 @@ const constants_1 = require("../utils/constants");
  * @returns {Function} - A function that takes conditions and returns the Sequelize options object.
  */
 const customFieldsFilterScope = (name) => (conditions) => {
+    if (!conditions || Object.keys(conditions).length === 0) {
+        return {};
+    }
     // Build the WHERE clause for custom field filtering
-    const customFieldConditions = Object.entries(conditions)
+    const conditionsStrings = Object.entries(conditions)
         .map(([key, value]) => {
         if (Array.isArray(value)) {
+            if (value.length === 0) {
+                // if empty array, the condition is ignored
+                return false;
+            }
             const values = value.map((v) => `'${v}'`).join(',');
             return `custom_fields->>'${key}' IN (${values})`;
         }
         return `custom_fields->>'${key}' = '${value}'`;
     })
-        .join(' AND ');
+        .filter(Boolean);
+    if (conditionsStrings.length === 0) {
+        return {};
+    }
+    const customFieldConditions = conditionsStrings.join(' AND ');
     const subQuery = `${'SELECT model_id FROM ('
         + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '
         + 'FROM custom_field_values AS cv '

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/scopes/filter.ts

@@ -29,18 +29,30 @@ export type CustomFieldFilterOptions = {
 export const customFieldsFilterScope = (
   name: string,
 ) => (conditions: Record<string, ConditionValue>): CustomFieldFilterOptions => {
+  if (!conditions || Object.keys(conditions).length === 0) {
+    return {};
+  }
   // Build the WHERE clause for custom field filtering
-  const customFieldConditions = Object.entries(conditions)
+  const conditionsStrings = Object.entries(conditions)
     .map(
       ([key, value]) => {
         if (Array.isArray(value)) {
+          if (value.length === 0) {
+            // if empty array, the condition is ignored
+            return false;
+          }
           const values = value.map((v) => `'${v}'`).join(',');
           return `custom_fields->>'${key}' IN (${values})`;
         }
         return `custom_fields->>'${key}' = '${value}'`;
       },
     )
-    .join(' AND ');
+    .filter(Boolean);
+
+  if (conditionsStrings.length === 0) {
+    return {};
+  }
+  const customFieldConditions = conditionsStrings.join(' AND ');
 
   const subQuery = `${'SELECT model_id FROM ('
     + 'SELECT cv.model_id, jsonb_object_agg(cd.name, cv.value) AS custom_fields '

package/tsconfig.json

@@ -9,5 +9,8 @@
     "emitDecoratorMetadata": true,
     "allowJs": true
   },
+  "include": [
+    "src/**/*",
+  ],
   "exclude": ["node_modules", "**/*.test.ts"]
 }

package/dist/jest.config.d.ts

@@ -1,12 +0,0 @@
-export const testEnvironment: string;
-export const roots: string[];
-export const transform: {
-    '^.+\\.tsx?$': string;
-};
-export const testRegex: string;
-export const moduleFileExtensions: string[];
-export namespace coverageThreshold {
-    namespace global {
-        const lines: number;
-    }
-}