@autofleet/sadot 1.5.1 → 1.5.2-beta-2cd7f45c.0

package/dist/scopes/helpers/filter.helpers.cjs

@@ -3,16 +3,14 @@ let e=function(e){return e.VALUES=`values`,e.ENTRIES=`entries`,e}({});const t=e=
       ${a?`${a} OR`:``}
       ce.custom_fields @> '${i}'
     )
-  `},y=(t,n,r)=>{switch(t){case e.VALUES:return`
+  `},y=(t,n,r)=>{switch(t){case e.VALUES:return r.map(e=>`
         SELECT cv.model_id
         FROM custom_field_values AS cv
         INNER JOIN custom_field_definitions AS cd ON cv.custom_field_definition_id = cd.id
         ${l}cd.model_type = '${n}'
-        WHERE ${r.join(u)}
+        WHERE ${e}
         ${l}cv.deleted_at IS NULL${l}cd.deleted_at IS NULL
-        GROUP BY cv.model_id
-        HAVING COUNT(DISTINCT cv.custom_field_definition_id) = ${r.length}
-      `.replace(/\n/g,``);case e.ENTRIES:return`
+      `).join(` INTERSECT `).replace(/\n/g,``);case e.ENTRIES:return`
         SELECT ce.model_id
         FROM custom_field_entries ce
         JOIN custom_field_definitions cfd

package/dist/scopes/helpers/filter.helpers.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"filter.helpers.cjs","names":["CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name`","CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value`","formattedValue: string | number | boolean"],"sources":["../../../src/scopes/helpers/filter.helpers.ts"],"sourcesContent":["import type { WhereOptions } from 'sequelize';\n\n/**\n * Type representing possible condition values.\n * Currently supporting strings and arrays of strings.\n * More types to be added (TBA).\n */\nexport interface ConditionWithOperator {\n  operator: string;\n  value: string;\n}\nexport type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];\n\nexport interface CustomFieldSort {\n  field: string;\n  direction: 'ASC' | 'DESC';\n}\n\nexport interface CustomFieldFilterOptions {\n  where?: WhereOptions;\n  replacements?: Record<string, string>;\n}\n\nexport enum SubQueryType {\n  VALUES = 'values',\n  ENTRIES = 'entries',\n}\n\nexport const isConditionStringArray = (input: any): input is string[] => Array.isArray(input) && typeof input[0] === 'string';\nexport const isBooleanString = (input: string): boolean => ['true', 'false'].includes(input.toString());\nexport const isDate = (input: any): input is Date => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';\n\nexport const castValueToJsonb = (value: string, type: string) => `to_jsonb(${value}::${type})`;\nexport const castValueToJsonbText = (value: string): string => castValueToJsonb(value, 'text');\nexport const castValueToJsonbBoolean = (value: string): string => castValueToJsonb(value, 'boolean');\nexport const castValueToJsonbNumeric = (value: string): string => castValueToJsonb(value, 'numeric');\nexport const castIfNeeded = (columnName: string, conditionValue: string): string => {\n  if (isDate(conditionValue)) {\n    return castValueToJsonb(columnName, 'timestamp');\n  }\n  return columnName;\n};\n\nexport const AND_DELIMITER = ' AND ';\nexport const OR_DELIMITER = ' OR ';\nexport const CD_TABLE_ALIAS = 'cd';\nexport const CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name` = `${CD_TABLE_ALIAS}.name`;\nexport const CV_TABLE_ALIAS = 'cv';\nexport const CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value` = `${CV_TABLE_ALIAS}.value`;\nexport const CE_TABLE_ALIAS = 'ce';\n\nconst getSingleConditionWithOperator = (value: any, operator: string, replacementKey: string, reverseReplacementsMap: Map<string, string>) => {\n  let type = 'text';\n  if (isDate(value)) {\n    type = 'date';\n  } else if (!Number.isNaN(Number(value))) {\n    type = 'numeric';\n  } else if (isBooleanString(value)) {\n    type = 'boolean';\n  }\n  const replacedValue = reverseReplacementsMap.get(value);\n\n  return `(jsonb_extract_path_text(${CE_TABLE_ALIAS}.custom_fields, :${replacementKey})::${type}) ${operator} :${replacedValue}`;\n};\n\nconst getFormattedValue = (value: string) => {\n  let formattedValue: string | number | boolean = value;\n  if (isBooleanString(value)) {\n    formattedValue = value === 'true';\n  } else if (!Number.isNaN(Number(value))) {\n    formattedValue = Number(value);\n  }\n\n  return formattedValue;\n};\n\nconst getJSONSubQuery = (value: string, key: string) => {\n  const formattedValue = getFormattedValue(value);\n  const jsonQuery = JSON.stringify({ [key]: formattedValue });\n  let jsonQueryWithStringBoolean;\n  if (isBooleanString(value)) {\n    jsonQueryWithStringBoolean = `${CE_TABLE_ALIAS}.custom_fields @> '${JSON.stringify({ [key]: value })}'`;\n  }\n  return `\n    (\n      ${jsonQueryWithStringBoolean ? `${jsonQueryWithStringBoolean} OR` : ''}\n      ${CE_TABLE_ALIAS}.custom_fields @> '${jsonQuery}'\n    )\n  `;\n};\n\nexport const getFilterCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, conditionsStrings: (string | boolean)[]): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES:\n      return `\n        SELECT ${CV_TABLE_ALIAS}.model_id\n        FROM custom_field_values AS ${CV_TABLE_ALIAS}\n        INNER JOIN custom_field_definitions AS ${CD_TABLE_ALIAS} ON ${CV_TABLE_ALIAS}.custom_field_definition_id = ${CD_TABLE_ALIAS}.id\n        ${AND_DELIMITER}${CD_TABLE_ALIAS}.model_type = '${modelType}'\n        WHERE ${conditionsStrings.join(OR_DELIMITER)}\n        ${AND_DELIMITER}${CV_TABLE_ALIAS}.deleted_at IS NULL${AND_DELIMITER}${CD_TABLE_ALIAS}.deleted_at IS NULL\n        GROUP BY ${CV_TABLE_ALIAS}.model_id\n        HAVING COUNT(DISTINCT ${CV_TABLE_ALIAS}.custom_field_definition_id) = ${conditionsStrings.length}\n      `.replace(/\\n/g, '');\n    case SubQueryType.ENTRIES:\n      return `\n        SELECT ce.model_id\n        FROM custom_field_entries ce\n        JOIN custom_field_definitions cfd\n        ON ce.model_type = cfd.model_type\n        AND ce.entity_id = cfd.entity_id\n        WHERE\n          cfd.deleted_at IS NULL AND\n          ${conditionsStrings.join(AND_DELIMITER)}\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const getSortCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, replacementKey: string): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES:\n      return `(\n              SELECT value\n              FROM (SELECT cv.model_id, cv.value\n                    FROM custom_field_values AS cv INNER JOIN custom_field_definitions AS cd\n                      ON cv.custom_field_definition_id = cd.id\n                      ${AND_DELIMITER}cd.model_type = '${modelType}'\n                      WHERE cv.model_id = \"${modelType}\".\"id\"\n                            ${AND_DELIMITER}cd.name = :${replacementKey}\n                            ) AS CustomFieldAggregation\n              )\n            `;\n    case SubQueryType.ENTRIES:\n      return `(\n        SELECT\n            customFields.value\n        FROM\n            custom_field_entries AS ${CE_TABLE_ALIAS},\n            jsonb_each_text(custom_fields) AS customFields\n        WHERE\n          customFields.key = :${replacementKey}${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_type = '${modelType}'${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_id = \"${modelType}\".\"id\"\n        )\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const formatConditionsForValues = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  const columnCondition = `(${CD_NAME_COLUMN} = :${replacementKey})`;\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.flatMap((v) => {\n        const valRandom = reverseReplacementsMap.get(v);\n        if (isBooleanString(v)) {\n          return [castValueToJsonbText(`:${valRandom}`), castValueToJsonbBoolean(`:${valRandom}`)];\n        }\n        if (!Number.isNaN(Number(v))) {\n          return castValueToJsonbNumeric(`:${valRandom}`);\n        }\n        return castValueToJsonbText(`:${valRandom}`);\n      }).join(',');\n      return `(${columnCondition}${AND_DELIMITER}${CV_VALUE_COLUMN} IN (${values}))`;\n    }\n    return condition.map((c) => {\n      const valRep = reverseReplacementsMap.get(c.value);\n      const valueAsJsonb = castValueToJsonbText(`:${valRep}`);\n\n      return `(${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, c.value)} ${c.operator} ${valueAsJsonb})`;\n    }).join(AND_DELIMITER);\n  }\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    const conditionRep = reverseReplacementsMap.get(condition);\n    const valueAsJsonb = !Number.isNaN(Number(condition)) ? castValueToJsonbNumeric(`:${conditionRep}`) : castValueToJsonbText(`:${conditionRep}`);\n    const valueAsJsonbBoolean = isBooleanString(condition) ? `${OR_DELIMITER}${CV_VALUE_COLUMN} = ${castValueToJsonbBoolean(`:${conditionRep}`)}` : '';\n    return `(${columnCondition}${AND_DELIMITER}(${castIfNeeded(CV_VALUE_COLUMN, condition)} = ${valueAsJsonb}${valueAsJsonbBoolean}))`;\n  }\n  if (condition?.operator) {\n    const valueRep = reverseReplacementsMap.get(condition.value);\n    const valueAsJsonb = castValueToJsonbText(`:${valueRep}`);\n    return `( ${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, condition.value)} ${condition.operator} ${valueAsJsonb})`;\n  }\n  return false;\n};\n\nexport const formatConditionsForEntries = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.map(value => getJSONSubQuery(value, key)).join(`${OR_DELIMITER}\\n`);\n      return `( ${values})`;\n    }\n    return condition.map(c => getSingleConditionWithOperator(c.value, c.operator, replacementKey, reverseReplacementsMap)).join(AND_DELIMITER);\n  }\n\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    return getJSONSubQuery(condition, key);\n  }\n\n  if (condition?.operator) {\n    return getSingleConditionWithOperator(condition.value, condition.operator, replacementKey, reverseReplacementsMap);\n  }\n  return false;\n};\n"],"mappings":"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"}
+{"version":3,"file":"filter.helpers.cjs","names":["CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name`","CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value`","formattedValue: string | number | boolean"],"sources":["../../../src/scopes/helpers/filter.helpers.ts"],"sourcesContent":["import type { WhereOptions } from 'sequelize';\n\n/**\n * Type representing possible condition values.\n * Currently supporting strings and arrays of strings.\n * More types to be added (TBA).\n */\nexport interface ConditionWithOperator {\n  operator: string;\n  value: string;\n}\nexport type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];\n\nexport interface CustomFieldSort {\n  field: string;\n  direction: 'ASC' | 'DESC';\n}\n\nexport interface CustomFieldFilterOptions {\n  where?: WhereOptions;\n  replacements?: Record<string, string>;\n}\n\nexport enum SubQueryType {\n  VALUES = 'values',\n  ENTRIES = 'entries',\n}\n\nexport const isConditionStringArray = (input: any): input is string[] => Array.isArray(input) && typeof input[0] === 'string';\nexport const isBooleanString = (input: string): boolean => ['true', 'false'].includes(input.toString());\nexport const isDate = (input: any): input is Date => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';\n\nexport const castValueToJsonb = (value: string, type: string) => `to_jsonb(${value}::${type})`;\nexport const castValueToJsonbText = (value: string): string => castValueToJsonb(value, 'text');\nexport const castValueToJsonbBoolean = (value: string): string => castValueToJsonb(value, 'boolean');\nexport const castValueToJsonbNumeric = (value: string): string => castValueToJsonb(value, 'numeric');\nexport const castIfNeeded = (columnName: string, conditionValue: string): string => {\n  if (isDate(conditionValue)) {\n    return castValueToJsonb(columnName, 'timestamp');\n  }\n  return columnName;\n};\n\nexport const AND_DELIMITER = ' AND ';\nexport const OR_DELIMITER = ' OR ';\nexport const CD_TABLE_ALIAS = 'cd';\nexport const CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name` = `${CD_TABLE_ALIAS}.name`;\nexport const CV_TABLE_ALIAS = 'cv';\nexport const CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value` = `${CV_TABLE_ALIAS}.value`;\nexport const CE_TABLE_ALIAS = 'ce';\n\nconst getSingleConditionWithOperator = (value: any, operator: string, replacementKey: string, reverseReplacementsMap: Map<string, string>) => {\n  let type = 'text';\n  if (isDate(value)) {\n    type = 'date';\n  } else if (!Number.isNaN(Number(value))) {\n    type = 'numeric';\n  } else if (isBooleanString(value)) {\n    type = 'boolean';\n  }\n  const replacedValue = reverseReplacementsMap.get(value);\n\n  return `(jsonb_extract_path_text(${CE_TABLE_ALIAS}.custom_fields, :${replacementKey})::${type}) ${operator} :${replacedValue}`;\n};\n\nconst getFormattedValue = (value: string) => {\n  let formattedValue: string | number | boolean = value;\n  if (isBooleanString(value)) {\n    formattedValue = value === 'true';\n  } else if (!Number.isNaN(Number(value))) {\n    formattedValue = Number(value);\n  }\n\n  return formattedValue;\n};\n\nconst getJSONSubQuery = (value: string, key: string) => {\n  const formattedValue = getFormattedValue(value);\n  const jsonQuery = JSON.stringify({ [key]: formattedValue });\n  let jsonQueryWithStringBoolean;\n  if (isBooleanString(value)) {\n    jsonQueryWithStringBoolean = `${CE_TABLE_ALIAS}.custom_fields @> '${JSON.stringify({ [key]: value })}'`;\n  }\n  return `\n    (\n      ${jsonQueryWithStringBoolean ? `${jsonQueryWithStringBoolean} OR` : ''}\n      ${CE_TABLE_ALIAS}.custom_fields @> '${jsonQuery}'\n    )\n  `;\n};\n\nexport const getFilterCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, conditionsStrings: (string | boolean)[]): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES: {\n      // INTERSECT of one SELECT per condition gives the same semantics as\n      // `WHERE c1 OR c2 ... GROUP BY model_id HAVING COUNT(DISTINCT def_id) = N`\n      // but lets the planner pick an index-driven plan per branch instead of\n      // a single sequential scan of custom_field_values.\n      const branches = conditionsStrings.map((condition) => `\n        SELECT ${CV_TABLE_ALIAS}.model_id\n        FROM custom_field_values AS ${CV_TABLE_ALIAS}\n        INNER JOIN custom_field_definitions AS ${CD_TABLE_ALIAS} ON ${CV_TABLE_ALIAS}.custom_field_definition_id = ${CD_TABLE_ALIAS}.id\n        ${AND_DELIMITER}${CD_TABLE_ALIAS}.model_type = '${modelType}'\n        WHERE ${condition}\n        ${AND_DELIMITER}${CV_TABLE_ALIAS}.deleted_at IS NULL${AND_DELIMITER}${CD_TABLE_ALIAS}.deleted_at IS NULL\n      `);\n      return branches.join(' INTERSECT ').replace(/\\n/g, '');\n    }\n    case SubQueryType.ENTRIES:\n      return `\n        SELECT ce.model_id\n        FROM custom_field_entries ce\n        JOIN custom_field_definitions cfd\n        ON ce.model_type = cfd.model_type\n        AND ce.entity_id = cfd.entity_id\n        WHERE\n          cfd.deleted_at IS NULL AND\n          ${conditionsStrings.join(AND_DELIMITER)}\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const getSortCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, replacementKey: string): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES:\n      return `(\n              SELECT value\n              FROM (SELECT cv.model_id, cv.value\n                    FROM custom_field_values AS cv INNER JOIN custom_field_definitions AS cd\n                      ON cv.custom_field_definition_id = cd.id\n                      ${AND_DELIMITER}cd.model_type = '${modelType}'\n                      WHERE cv.model_id = \"${modelType}\".\"id\"\n                            ${AND_DELIMITER}cd.name = :${replacementKey}\n                            ) AS CustomFieldAggregation\n              )\n            `;\n    case SubQueryType.ENTRIES:\n      return `(\n        SELECT\n            customFields.value\n        FROM\n            custom_field_entries AS ${CE_TABLE_ALIAS},\n            jsonb_each_text(custom_fields) AS customFields\n        WHERE\n          customFields.key = :${replacementKey}${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_type = '${modelType}'${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_id = \"${modelType}\".\"id\"\n        )\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const formatConditionsForValues = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  const columnCondition = `(${CD_NAME_COLUMN} = :${replacementKey})`;\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.flatMap((v) => {\n        const valRandom = reverseReplacementsMap.get(v);\n        if (isBooleanString(v)) {\n          return [castValueToJsonbText(`:${valRandom}`), castValueToJsonbBoolean(`:${valRandom}`)];\n        }\n        if (!Number.isNaN(Number(v))) {\n          return castValueToJsonbNumeric(`:${valRandom}`);\n        }\n        return castValueToJsonbText(`:${valRandom}`);\n      }).join(',');\n      return `(${columnCondition}${AND_DELIMITER}${CV_VALUE_COLUMN} IN (${values}))`;\n    }\n    return condition.map((c) => {\n      const valRep = reverseReplacementsMap.get(c.value);\n      const valueAsJsonb = castValueToJsonbText(`:${valRep}`);\n\n      return `(${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, c.value)} ${c.operator} ${valueAsJsonb})`;\n    }).join(AND_DELIMITER);\n  }\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    const conditionRep = reverseReplacementsMap.get(condition);\n    const valueAsJsonb = !Number.isNaN(Number(condition)) ? castValueToJsonbNumeric(`:${conditionRep}`) : castValueToJsonbText(`:${conditionRep}`);\n    const valueAsJsonbBoolean = isBooleanString(condition) ? `${OR_DELIMITER}${CV_VALUE_COLUMN} = ${castValueToJsonbBoolean(`:${conditionRep}`)}` : '';\n    return `(${columnCondition}${AND_DELIMITER}(${castIfNeeded(CV_VALUE_COLUMN, condition)} = ${valueAsJsonb}${valueAsJsonbBoolean}))`;\n  }\n  if (condition?.operator) {\n    const valueRep = reverseReplacementsMap.get(condition.value);\n    const valueAsJsonb = castValueToJsonbText(`:${valueRep}`);\n    return `( ${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, condition.value)} ${condition.operator} ${valueAsJsonb})`;\n  }\n  return false;\n};\n\nexport const formatConditionsForEntries = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.map(value => getJSONSubQuery(value, key)).join(`${OR_DELIMITER}\\n`);\n      return `( ${values})`;\n    }\n    return condition.map(c => getSingleConditionWithOperator(c.value, c.operator, replacementKey, reverseReplacementsMap)).join(AND_DELIMITER);\n  }\n\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    return getJSONSubQuery(condition, key);\n  }\n\n  if (condition?.operator) {\n    return getSingleConditionWithOperator(condition.value, condition.operator, replacementKey, reverseReplacementsMap);\n  }\n  return false;\n};\n"],"mappings":"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"}

package/dist/scopes/helpers/filter.helpers.js

@@ -3,16 +3,14 @@ let e=function(e){return e.VALUES=`values`,e.ENTRIES=`entries`,e}({});const t=e=
       ${a?`${a} OR`:``}
       ce.custom_fields @> '${i}'
     )
-  `},h=(t,n,r)=>{switch(t){case e.VALUES:return`
+  `},h=(t,n,r)=>{switch(t){case e.VALUES:return r.map(e=>`
         SELECT cv.model_id
         FROM custom_field_values AS cv
         INNER JOIN custom_field_definitions AS cd ON cv.custom_field_definition_id = cd.id
         ${l}cd.model_type = '${n}'
-        WHERE ${r.join(u)}
+        WHERE ${e}
         ${l}cv.deleted_at IS NULL${l}cd.deleted_at IS NULL
-        GROUP BY cv.model_id
-        HAVING COUNT(DISTINCT cv.custom_field_definition_id) = ${r.length}
-      `.replace(/\n/g,``);case e.ENTRIES:return`
+      `).join(` INTERSECT `).replace(/\n/g,``);case e.ENTRIES:return`
         SELECT ce.model_id
         FROM custom_field_entries ce
         JOIN custom_field_definitions cfd

package/dist/scopes/helpers/filter.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter.helpers.js","names":["CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name`","CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value`","formattedValue: string | number | boolean"],"sources":["../../../src/scopes/helpers/filter.helpers.ts"],"sourcesContent":["import type { WhereOptions } from 'sequelize';\n\n/**\n * Type representing possible condition values.\n * Currently supporting strings and arrays of strings.\n * More types to be added (TBA).\n */\nexport interface ConditionWithOperator {\n  operator: string;\n  value: string;\n}\nexport type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];\n\nexport interface CustomFieldSort {\n  field: string;\n  direction: 'ASC' | 'DESC';\n}\n\nexport interface CustomFieldFilterOptions {\n  where?: WhereOptions;\n  replacements?: Record<string, string>;\n}\n\nexport enum SubQueryType {\n  VALUES = 'values',\n  ENTRIES = 'entries',\n}\n\nexport const isConditionStringArray = (input: any): input is string[] => Array.isArray(input) && typeof input[0] === 'string';\nexport const isBooleanString = (input: string): boolean => ['true', 'false'].includes(input.toString());\nexport const isDate = (input: any): input is Date => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';\n\nexport const castValueToJsonb = (value: string, type: string) => `to_jsonb(${value}::${type})`;\nexport const castValueToJsonbText = (value: string): string => castValueToJsonb(value, 'text');\nexport const castValueToJsonbBoolean = (value: string): string => castValueToJsonb(value, 'boolean');\nexport const castValueToJsonbNumeric = (value: string): string => castValueToJsonb(value, 'numeric');\nexport const castIfNeeded = (columnName: string, conditionValue: string): string => {\n  if (isDate(conditionValue)) {\n    return castValueToJsonb(columnName, 'timestamp');\n  }\n  return columnName;\n};\n\nexport const AND_DELIMITER = ' AND ';\nexport const OR_DELIMITER = ' OR ';\nexport const CD_TABLE_ALIAS = 'cd';\nexport const CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name` = `${CD_TABLE_ALIAS}.name`;\nexport const CV_TABLE_ALIAS = 'cv';\nexport const CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value` = `${CV_TABLE_ALIAS}.value`;\nexport const CE_TABLE_ALIAS = 'ce';\n\nconst getSingleConditionWithOperator = (value: any, operator: string, replacementKey: string, reverseReplacementsMap: Map<string, string>) => {\n  let type = 'text';\n  if (isDate(value)) {\n    type = 'date';\n  } else if (!Number.isNaN(Number(value))) {\n    type = 'numeric';\n  } else if (isBooleanString(value)) {\n    type = 'boolean';\n  }\n  const replacedValue = reverseReplacementsMap.get(value);\n\n  return `(jsonb_extract_path_text(${CE_TABLE_ALIAS}.custom_fields, :${replacementKey})::${type}) ${operator} :${replacedValue}`;\n};\n\nconst getFormattedValue = (value: string) => {\n  let formattedValue: string | number | boolean = value;\n  if (isBooleanString(value)) {\n    formattedValue = value === 'true';\n  } else if (!Number.isNaN(Number(value))) {\n    formattedValue = Number(value);\n  }\n\n  return formattedValue;\n};\n\nconst getJSONSubQuery = (value: string, key: string) => {\n  const formattedValue = getFormattedValue(value);\n  const jsonQuery = JSON.stringify({ [key]: formattedValue });\n  let jsonQueryWithStringBoolean;\n  if (isBooleanString(value)) {\n    jsonQueryWithStringBoolean = `${CE_TABLE_ALIAS}.custom_fields @> '${JSON.stringify({ [key]: value })}'`;\n  }\n  return `\n    (\n      ${jsonQueryWithStringBoolean ? `${jsonQueryWithStringBoolean} OR` : ''}\n      ${CE_TABLE_ALIAS}.custom_fields @> '${jsonQuery}'\n    )\n  `;\n};\n\nexport const getFilterCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, conditionsStrings: (string | boolean)[]): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES:\n      return `\n        SELECT ${CV_TABLE_ALIAS}.model_id\n        FROM custom_field_values AS ${CV_TABLE_ALIAS}\n        INNER JOIN custom_field_definitions AS ${CD_TABLE_ALIAS} ON ${CV_TABLE_ALIAS}.custom_field_definition_id = ${CD_TABLE_ALIAS}.id\n        ${AND_DELIMITER}${CD_TABLE_ALIAS}.model_type = '${modelType}'\n        WHERE ${conditionsStrings.join(OR_DELIMITER)}\n        ${AND_DELIMITER}${CV_TABLE_ALIAS}.deleted_at IS NULL${AND_DELIMITER}${CD_TABLE_ALIAS}.deleted_at IS NULL\n        GROUP BY ${CV_TABLE_ALIAS}.model_id\n        HAVING COUNT(DISTINCT ${CV_TABLE_ALIAS}.custom_field_definition_id) = ${conditionsStrings.length}\n      `.replace(/\\n/g, '');\n    case SubQueryType.ENTRIES:\n      return `\n        SELECT ce.model_id\n        FROM custom_field_entries ce\n        JOIN custom_field_definitions cfd\n        ON ce.model_type = cfd.model_type\n        AND ce.entity_id = cfd.entity_id\n        WHERE\n          cfd.deleted_at IS NULL AND\n          ${conditionsStrings.join(AND_DELIMITER)}\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const getSortCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, replacementKey: string): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES:\n      return `(\n              SELECT value\n              FROM (SELECT cv.model_id, cv.value\n                    FROM custom_field_values AS cv INNER JOIN custom_field_definitions AS cd\n                      ON cv.custom_field_definition_id = cd.id\n                      ${AND_DELIMITER}cd.model_type = '${modelType}'\n                      WHERE cv.model_id = \"${modelType}\".\"id\"\n                            ${AND_DELIMITER}cd.name = :${replacementKey}\n                            ) AS CustomFieldAggregation\n              )\n            `;\n    case SubQueryType.ENTRIES:\n      return `(\n        SELECT\n            customFields.value\n        FROM\n            custom_field_entries AS ${CE_TABLE_ALIAS},\n            jsonb_each_text(custom_fields) AS customFields\n        WHERE\n          customFields.key = :${replacementKey}${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_type = '${modelType}'${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_id = \"${modelType}\".\"id\"\n        )\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const formatConditionsForValues = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  const columnCondition = `(${CD_NAME_COLUMN} = :${replacementKey})`;\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.flatMap((v) => {\n        const valRandom = reverseReplacementsMap.get(v);\n        if (isBooleanString(v)) {\n          return [castValueToJsonbText(`:${valRandom}`), castValueToJsonbBoolean(`:${valRandom}`)];\n        }\n        if (!Number.isNaN(Number(v))) {\n          return castValueToJsonbNumeric(`:${valRandom}`);\n        }\n        return castValueToJsonbText(`:${valRandom}`);\n      }).join(',');\n      return `(${columnCondition}${AND_DELIMITER}${CV_VALUE_COLUMN} IN (${values}))`;\n    }\n    return condition.map((c) => {\n      const valRep = reverseReplacementsMap.get(c.value);\n      const valueAsJsonb = castValueToJsonbText(`:${valRep}`);\n\n      return `(${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, c.value)} ${c.operator} ${valueAsJsonb})`;\n    }).join(AND_DELIMITER);\n  }\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    const conditionRep = reverseReplacementsMap.get(condition);\n    const valueAsJsonb = !Number.isNaN(Number(condition)) ? castValueToJsonbNumeric(`:${conditionRep}`) : castValueToJsonbText(`:${conditionRep}`);\n    const valueAsJsonbBoolean = isBooleanString(condition) ? `${OR_DELIMITER}${CV_VALUE_COLUMN} = ${castValueToJsonbBoolean(`:${conditionRep}`)}` : '';\n    return `(${columnCondition}${AND_DELIMITER}(${castIfNeeded(CV_VALUE_COLUMN, condition)} = ${valueAsJsonb}${valueAsJsonbBoolean}))`;\n  }\n  if (condition?.operator) {\n    const valueRep = reverseReplacementsMap.get(condition.value);\n    const valueAsJsonb = castValueToJsonbText(`:${valueRep}`);\n    return `( ${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, condition.value)} ${condition.operator} ${valueAsJsonb})`;\n  }\n  return false;\n};\n\nexport const formatConditionsForEntries = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.map(value => getJSONSubQuery(value, key)).join(`${OR_DELIMITER}\\n`);\n      return `( ${values})`;\n    }\n    return condition.map(c => getSingleConditionWithOperator(c.value, c.operator, replacementKey, reverseReplacementsMap)).join(AND_DELIMITER);\n  }\n\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    return getJSONSubQuery(condition, key);\n  }\n\n  if (condition?.operator) {\n    return getSingleConditionWithOperator(condition.value, condition.operator, replacementKey, reverseReplacementsMap);\n  }\n  return false;\n};\n"],"mappings":"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"}
+{"version":3,"file":"filter.helpers.js","names":["CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name`","CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value`","formattedValue: string | number | boolean"],"sources":["../../../src/scopes/helpers/filter.helpers.ts"],"sourcesContent":["import type { WhereOptions } from 'sequelize';\n\n/**\n * Type representing possible condition values.\n * Currently supporting strings and arrays of strings.\n * More types to be added (TBA).\n */\nexport interface ConditionWithOperator {\n  operator: string;\n  value: string;\n}\nexport type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];\n\nexport interface CustomFieldSort {\n  field: string;\n  direction: 'ASC' | 'DESC';\n}\n\nexport interface CustomFieldFilterOptions {\n  where?: WhereOptions;\n  replacements?: Record<string, string>;\n}\n\nexport enum SubQueryType {\n  VALUES = 'values',\n  ENTRIES = 'entries',\n}\n\nexport const isConditionStringArray = (input: any): input is string[] => Array.isArray(input) && typeof input[0] === 'string';\nexport const isBooleanString = (input: string): boolean => ['true', 'false'].includes(input.toString());\nexport const isDate = (input: any): input is Date => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';\n\nexport const castValueToJsonb = (value: string, type: string) => `to_jsonb(${value}::${type})`;\nexport const castValueToJsonbText = (value: string): string => castValueToJsonb(value, 'text');\nexport const castValueToJsonbBoolean = (value: string): string => castValueToJsonb(value, 'boolean');\nexport const castValueToJsonbNumeric = (value: string): string => castValueToJsonb(value, 'numeric');\nexport const castIfNeeded = (columnName: string, conditionValue: string): string => {\n  if (isDate(conditionValue)) {\n    return castValueToJsonb(columnName, 'timestamp');\n  }\n  return columnName;\n};\n\nexport const AND_DELIMITER = ' AND ';\nexport const OR_DELIMITER = ' OR ';\nexport const CD_TABLE_ALIAS = 'cd';\nexport const CD_NAME_COLUMN: `${typeof CD_TABLE_ALIAS}.name` = `${CD_TABLE_ALIAS}.name`;\nexport const CV_TABLE_ALIAS = 'cv';\nexport const CV_VALUE_COLUMN: `${typeof CV_TABLE_ALIAS}.value` = `${CV_TABLE_ALIAS}.value`;\nexport const CE_TABLE_ALIAS = 'ce';\n\nconst getSingleConditionWithOperator = (value: any, operator: string, replacementKey: string, reverseReplacementsMap: Map<string, string>) => {\n  let type = 'text';\n  if (isDate(value)) {\n    type = 'date';\n  } else if (!Number.isNaN(Number(value))) {\n    type = 'numeric';\n  } else if (isBooleanString(value)) {\n    type = 'boolean';\n  }\n  const replacedValue = reverseReplacementsMap.get(value);\n\n  return `(jsonb_extract_path_text(${CE_TABLE_ALIAS}.custom_fields, :${replacementKey})::${type}) ${operator} :${replacedValue}`;\n};\n\nconst getFormattedValue = (value: string) => {\n  let formattedValue: string | number | boolean = value;\n  if (isBooleanString(value)) {\n    formattedValue = value === 'true';\n  } else if (!Number.isNaN(Number(value))) {\n    formattedValue = Number(value);\n  }\n\n  return formattedValue;\n};\n\nconst getJSONSubQuery = (value: string, key: string) => {\n  const formattedValue = getFormattedValue(value);\n  const jsonQuery = JSON.stringify({ [key]: formattedValue });\n  let jsonQueryWithStringBoolean;\n  if (isBooleanString(value)) {\n    jsonQueryWithStringBoolean = `${CE_TABLE_ALIAS}.custom_fields @> '${JSON.stringify({ [key]: value })}'`;\n  }\n  return `\n    (\n      ${jsonQueryWithStringBoolean ? `${jsonQueryWithStringBoolean} OR` : ''}\n      ${CE_TABLE_ALIAS}.custom_fields @> '${jsonQuery}'\n    )\n  `;\n};\n\nexport const getFilterCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, conditionsStrings: (string | boolean)[]): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES: {\n      // INTERSECT of one SELECT per condition gives the same semantics as\n      // `WHERE c1 OR c2 ... GROUP BY model_id HAVING COUNT(DISTINCT def_id) = N`\n      // but lets the planner pick an index-driven plan per branch instead of\n      // a single sequential scan of custom_field_values.\n      const branches = conditionsStrings.map((condition) => `\n        SELECT ${CV_TABLE_ALIAS}.model_id\n        FROM custom_field_values AS ${CV_TABLE_ALIAS}\n        INNER JOIN custom_field_definitions AS ${CD_TABLE_ALIAS} ON ${CV_TABLE_ALIAS}.custom_field_definition_id = ${CD_TABLE_ALIAS}.id\n        ${AND_DELIMITER}${CD_TABLE_ALIAS}.model_type = '${modelType}'\n        WHERE ${condition}\n        ${AND_DELIMITER}${CV_TABLE_ALIAS}.deleted_at IS NULL${AND_DELIMITER}${CD_TABLE_ALIAS}.deleted_at IS NULL\n      `);\n      return branches.join(' INTERSECT ').replace(/\\n/g, '');\n    }\n    case SubQueryType.ENTRIES:\n      return `\n        SELECT ce.model_id\n        FROM custom_field_entries ce\n        JOIN custom_field_definitions cfd\n        ON ce.model_type = cfd.model_type\n        AND ce.entity_id = cfd.entity_id\n        WHERE\n          cfd.deleted_at IS NULL AND\n          ${conditionsStrings.join(AND_DELIMITER)}\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const getSortCustomFieldsSubQuery = (queryType: SubQueryType, modelType: string, replacementKey: string): string => {\n  switch (queryType) {\n    case SubQueryType.VALUES:\n      return `(\n              SELECT value\n              FROM (SELECT cv.model_id, cv.value\n                    FROM custom_field_values AS cv INNER JOIN custom_field_definitions AS cd\n                      ON cv.custom_field_definition_id = cd.id\n                      ${AND_DELIMITER}cd.model_type = '${modelType}'\n                      WHERE cv.model_id = \"${modelType}\".\"id\"\n                            ${AND_DELIMITER}cd.name = :${replacementKey}\n                            ) AS CustomFieldAggregation\n              )\n            `;\n    case SubQueryType.ENTRIES:\n      return `(\n        SELECT\n            customFields.value\n        FROM\n            custom_field_entries AS ${CE_TABLE_ALIAS},\n            jsonb_each_text(custom_fields) AS customFields\n        WHERE\n          customFields.key = :${replacementKey}${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_type = '${modelType}'${AND_DELIMITER}\n          ${CE_TABLE_ALIAS}.model_id = \"${modelType}\".\"id\"\n        )\n      `;\n    default:\n      throw new Error('Invalid query type');\n  }\n};\n\nexport const formatConditionsForValues = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  const columnCondition = `(${CD_NAME_COLUMN} = :${replacementKey})`;\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.flatMap((v) => {\n        const valRandom = reverseReplacementsMap.get(v);\n        if (isBooleanString(v)) {\n          return [castValueToJsonbText(`:${valRandom}`), castValueToJsonbBoolean(`:${valRandom}`)];\n        }\n        if (!Number.isNaN(Number(v))) {\n          return castValueToJsonbNumeric(`:${valRandom}`);\n        }\n        return castValueToJsonbText(`:${valRandom}`);\n      }).join(',');\n      return `(${columnCondition}${AND_DELIMITER}${CV_VALUE_COLUMN} IN (${values}))`;\n    }\n    return condition.map((c) => {\n      const valRep = reverseReplacementsMap.get(c.value);\n      const valueAsJsonb = castValueToJsonbText(`:${valRep}`);\n\n      return `(${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, c.value)} ${c.operator} ${valueAsJsonb})`;\n    }).join(AND_DELIMITER);\n  }\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    const conditionRep = reverseReplacementsMap.get(condition);\n    const valueAsJsonb = !Number.isNaN(Number(condition)) ? castValueToJsonbNumeric(`:${conditionRep}`) : castValueToJsonbText(`:${conditionRep}`);\n    const valueAsJsonbBoolean = isBooleanString(condition) ? `${OR_DELIMITER}${CV_VALUE_COLUMN} = ${castValueToJsonbBoolean(`:${conditionRep}`)}` : '';\n    return `(${columnCondition}${AND_DELIMITER}(${castIfNeeded(CV_VALUE_COLUMN, condition)} = ${valueAsJsonb}${valueAsJsonbBoolean}))`;\n  }\n  if (condition?.operator) {\n    const valueRep = reverseReplacementsMap.get(condition.value);\n    const valueAsJsonb = castValueToJsonbText(`:${valueRep}`);\n    return `( ${columnCondition}${AND_DELIMITER}${castIfNeeded(CV_VALUE_COLUMN, condition.value)} ${condition.operator} ${valueAsJsonb})`;\n  }\n  return false;\n};\n\nexport const formatConditionsForEntries = (key: string, condition: ConditionValue, reverseReplacementsMap: Map<string, string>): false | string => {\n  const replacementKey = reverseReplacementsMap.get(key);\n  if (!replacementKey) {\n    return false;\n  }\n\n  if (Array.isArray(condition)) {\n    if (condition.length === 0) {\n      // if empty array, the condition is ignored\n      return false;\n    }\n\n    if (isConditionStringArray(condition)) {\n      const values = condition.map(value => getJSONSubQuery(value, key)).join(`${OR_DELIMITER}\\n`);\n      return `( ${values})`;\n    }\n    return condition.map(c => getSingleConditionWithOperator(c.value, c.operator, replacementKey, reverseReplacementsMap)).join(AND_DELIMITER);\n  }\n\n  if (typeof condition === 'string' || typeof condition === 'number') {\n    return getJSONSubQuery(condition, key);\n  }\n\n  if (condition?.operator) {\n    return getSingleConditionWithOperator(condition.value, condition.operator, replacementKey, reverseReplacementsMap);\n  }\n  return false;\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.5.1",
+  "version": "1.5.2-beta-2cd7f45c.0",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -52,10 +52,10 @@
     "express": "^4.21.2",
     "npm-watch": "^0.11.0",
     "supertest": "^7.0.0",
-    "@autofleet/errors": "^3.1.53",
-    "@autofleet/logger": "^4.5.1",
+    "@autofleet/zehut": "^4.12.8",
     "@autofleet/node-common": "^4.3.13",
-    "@autofleet/zehut": "^4.12.8"
+    "@autofleet/errors": "^3.1.53",
+    "@autofleet/logger": "^4.5.1"
   },
   "peerDependencies": {
     "@autofleet/errors": "^3",