@cuboapp/api-backend 3.0.3 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",
@@ -14,7 +14,7 @@
     "@cuboapp/utils": "1.0.12"
   },
   "peerDependencies": {
-    "@cuboapp/crdt": "1.0.16",
+    "@cuboapp/crdt": "1.0.18",
     "@cuboapp/ws": "1.0.10",
     "mysql2": "3.22.5",
     "pg": "8.22.0",
@@ -38,7 +38,7 @@
     }
   },
   "devDependencies": {
-    "@cuboapp/crdt": "file:../crdt",
+    "@cuboapp/crdt": "1.0.18",
     "@cuboapp/ws": "1.0.10",
     "@types/node": "^26.0.0",
     "pg": "^8.22.0",

package/src/helpers/index.ts

@@ -3,7 +3,6 @@ import { Database, createDatabase } from '@cuboapp/database'
 import { CuboApiEntitiesMap, CuboEntity, CuboEntityField, CuboEntityFieldExtra, CuboEntityFieldType } from '@cuboapp/types'
 import { cloneDeep } from '@cuboapp/utils'
 
-import type { CuboBackendApi } from '../core'
 import {
   CUBO_CRUD_DEFAULT_FIELDS,
   CUBO_CRUD_DEFAULT_PAGE_LIMIT,
@@ -12,6 +11,7 @@ import {
   CUBO_CRUD_QUERY_KEY_REGEX,
   CUBO_CRUD_QUERY_SYMBOL_NOT
 } from '../constants'
+import type { CuboBackendApi } from '../core'
 import { CuboDialect, getDialect } from '../dialects'
 import { CuboBackendApiDbConnectionType, CuboCrudFindQuery, CuboCrudRequest, CuboDataFilter, CuboDataFiltersQuery } from '../types'
 
@@ -495,22 +495,24 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>, A = unknown> {
         const conditionField = entity.fields?.find((f) => f.alias === parts[0])
         const defaultField = CUBO_CRUD_DEFAULT_FIELDS.find((f) => f.alias === parts[0])
 
-        if (!conditionField && !defaultField) {
-          throw new Error('condition field "' + parts[0] + '" not found in entity "' + entity.alias + '"')
+        // if (!conditionField && !defaultField) {
+        //   throw new Error('condition field "' + parts[0] + '" not found in entity "' + entity.alias + '"')
+        // }
+
+        if (conditionField || defaultField) {
+          const fieldAlias = conditionField ? conditionField.alias : defaultField!.alias
+          const preparedCondition = this.clearFieldConditionValue(conditionField ? conditionField : defaultField!, query[key])
+          const prepared = this.prepareConditionSql(
+            `t1.${fieldAlias}`,
+            `c_1_${fieldAlias}_value`,
+            preparedCondition.value,
+            preparedCondition.condition,
+            preparedCondition.is_not
+          )
+
+          conditions.push(...(prepared.conditions || []))
+          Object.assign(replacements, prepared.replacements || {})
         }
-
-        const fieldAlias = conditionField ? conditionField.alias : defaultField!.alias
-        const preparedCondition = this.clearFieldConditionValue(conditionField ? conditionField : defaultField!, query[key])
-        const prepared = this.prepareConditionSql(
-          `t1.${fieldAlias}`,
-          `c_1_${fieldAlias}_value`,
-          preparedCondition.value,
-          preparedCondition.condition,
-          preparedCondition.is_not
-        )
-
-        conditions.push(...(prepared.conditions || []))
-        Object.assign(replacements, prepared.replacements || {})
       }
     }
 

package/src/helpers/withes.ts

@@ -158,35 +158,38 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
       const conditionField =
         lastEntity.fields?.find((f) => f.alias === conditionLastKey) || CUBO_CRUD_DEFAULT_FIELDS.find((f) => f.alias === conditionLastKey)
 
-      if (!conditionField) {
-        throw new Error('condition field "' + conditionKey + '" not found in entity "' + entity.alias + '"')
-      }
+      // if (!conditionField) {
+      //   throw new Error('condition field "' + conditionKey + '" not found in entity "' + entity.alias + '"')
+      // }
 
-      let conditionTableAlias = 't1'
-      if (conditionKeyParts.length > 0) {
-        const exWith = withes.find((w) => (w.full_key = conditionKeyParts.join('.')))
+      if (conditionField) {
+        let conditionTableAlias = 't1'
 
-        if (!exWith) {
-          throw new Error('condition field relation "' + conditionKey + '" not found')
-        }
+        if (conditionKeyParts.length > 0) {
+          const exWith = withes.find((w) => (w.full_key = conditionKeyParts.join('.')))
 
-        conditionTableAlias = 't_' + exWith.table_name
-      }
+          if (!exWith) {
+            throw new Error('condition field relation "' + conditionKey + '" not found')
+          }
+
+          conditionTableAlias = 't_' + exWith.table_name
+        }
 
-      opts.conditions = opts.conditions || []
+        opts.conditions = opts.conditions || []
 
-      const preparedCondition = this.helpers.clearFieldConditionValue(conditionField, opts.conditionValue)
+        const preparedCondition = this.helpers.clearFieldConditionValue(conditionField, opts.conditionValue)
 
-      const prepared = this.helpers.prepareConditionSql(
-        `${conditionTableAlias}.${conditionField.alias}`,
-        `${conditionTableAlias}_${conditionField.alias}_value`,
-        preparedCondition.value,
-        preparedCondition.condition,
-        preparedCondition.is_not
-      )
+        const prepared = this.helpers.prepareConditionSql(
+          `${conditionTableAlias}.${conditionField.alias}`,
+          `${conditionTableAlias}_${conditionField.alias}_value`,
+          preparedCondition.value,
+          preparedCondition.condition,
+          preparedCondition.is_not
+        )
 
-      opts.conditions.push(...(prepared.conditions || []))
-      Object.assign(opts.replacements, prepared.replacements || {})
+        opts.conditions.push(...(prepared.conditions || []))
+        Object.assign(opts.replacements, prepared.replacements || {})
+      }
     }
 
     // сортировка