@cuboapp/api-backend 1.0.28 → 1.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",
@@ -8,12 +8,12 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@cuboapp/constants": "2.0.7",
-    "@cuboapp/crdt": "1.0.6",
+    "@cuboapp/constants": "2.0.8",
+    "@cuboapp/crdt": "1.0.9",
     "@cuboapp/database": "1.0.4",
-    "@cuboapp/types": "2.0.12",
+    "@cuboapp/types": "2.0.13",
     "@cuboapp/utils": "1.0.10",
-    "@cuboapp/ws": "1.0.5",
+    "@cuboapp/ws": "1.0.6",
     "pg": "^8.17.2",
     "yjs": "^13.6.29"
   },

package/src/helpers/index.ts

@@ -16,6 +16,7 @@ import { CuboBackendApiDbConnectionType, CuboCrudFindQuery, CuboCrudRequest } fr
 import { ApiHelpersConvert } from './convert'
 import { ApiHelpersData } from './data'
 
+import { cloneDeep } from '@cuboapp/utils'
 import { ApiHelpersWithes } from './withes'
 
 export class ApiHelpers<T extends CuboApiEntitiesMap<T>, A> {
@@ -316,13 +317,17 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>, A> {
     }
 
     this.connecting[type] = new Promise(async (success) => {
-      const { iaas, pk_key, pk_type, ...config } = this.api.options.db.options
+      if (this.api.options.db.connection) {
+        this.connections[type] = this.api.options.db.connection
+      } else {
+        const { iaas, pk_key, pk_type, ...config } = this.api.options.db.options
 
-      this.connections[type] = createDatabase(config, JSON.parse(JSON.stringify({ iaas, pk_key, pk_type })))
-      await this.connections[type].connect()
+        this.connections[type] = createDatabase(config, JSON.parse(JSON.stringify({ iaas, pk_key, pk_type })))
+        await this.connections[type].connect()
 
-      if (config.dialect === 'postgres' && config.schema) {
-        await this.connections[type].connection.query(`SET schema '${config.schema}';`)
+        if (config.dialect === 'postgres' && config.schema) {
+          await this.connections[type].connection.query(`SET schema '${config.schema}';`)
+        }
       }
 
       success(this.connections[type])
@@ -353,17 +358,18 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>, A> {
     queryDto?: Partial<CuboCrudFindQuery>,
     isCount?: boolean
   ): Promise<Partial<CuboCrudFindQuery>> {
-    const withes = queryDto?.withes !== undefined ? queryDto.withes : []
-    const selects = queryDto?.selects !== undefined ? queryDto.selects : []
-    const joins = queryDto?.joins !== undefined ? queryDto.joins : []
-    const conditions = queryDto?.conditions !== undefined ? queryDto.conditions : []
-    const havings = queryDto?.havings !== undefined ? queryDto.havings : []
-    const sorts = queryDto?.sorts !== undefined ? queryDto.sorts : []
-    const replacements = queryDto?.replacements !== undefined ? queryDto?.replacements : {}
-    const groupBy = queryDto?.groupBy !== undefined ? queryDto?.groupBy : undefined
-    const withCrdt = queryDto?.withCrdt !== undefined ? queryDto?.withCrdt : false
-
-    const { sort, limit: _limit, page, with: _withes, ...query } = req.query || {}
+    const dto: Partial<CuboCrudFindQuery> = cloneDeep(queryDto || {})
+
+    const withes = dto.withes ?? []
+    const selects = dto.selects ?? []
+    const joins = dto.joins ?? []
+    const conditions = dto.conditions ?? []
+    const havings = dto.havings ?? []
+    const sorts = dto.sorts ?? []
+    const replacements = dto.replacements ?? {}
+    const groupBy = dto.groupBy ?? undefined
+
+    const { sort, limit: _limit, page, with: _withes, ...query } = cloneDeep(req.query || {})
 
     // plain conditions (nested are in withes.ts)
     for (const key in query || {}) {
@@ -374,6 +380,7 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>, A> {
         const defaultField = CUBO_CRUD_DEFAULT_FIELDS.find((f) => f.alias === parts[0])
 
         if (!conditionField && !defaultField) {
+          console.log(entity.alias, entity.fields)
           throw new Error('condition field "' + parts[0] + '" not found in entity "' + entity.alias + '"')
         }
 

package/src/index.ts

@@ -137,6 +137,9 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown>
   ): Promise<CuboCrudGetManyResponse<T[K]>> {
     opts = opts || {}
     req = req || {}
+
+    req.query = cloneDeep(req.query || {})
+
     const entity = await this.getEntity(entityAlias)
     const augmentation = this.options?.augmentations?.[entityAlias]
 
@@ -147,7 +150,6 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown>
     // get all joins
     const queryDto = await this.helpers.withes.prepare(req, entity, opts)
     queryDto.withDeleted = opts.queryOptions?.withDeleted
-    // queryDto.withCrdt = opts.queryOptions?.withCrdt
 
     // create find query
     const regularQuery = await this.helpers.createFindQuery(req, entity, queryDto)
@@ -200,7 +202,6 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown>
     // get all joins
     const queryDto = await this.helpers.withes.prepare(req, entity, opts)
     queryDto.withDeleted = opts.queryOptions?.withDeleted
-    queryDto.withCrdt = opts.queryOptions?.withCrdt
     queryDto.limit = 1
 
     const query = await this.helpers.createFindQuery(req, entity, queryDto)
@@ -283,13 +284,11 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown>
       if (!req.query?.id) {
         throw 'Debounce "updateOne" allowed only with "id"'
       }
-      console.log('call debounced updateOne')
 
       const key = `${entityAlias}:${+req.query.id}` as `${string}:${number}`
       let ex = this.debounces.get(key)
       if (ex) {
         if (ex.started > +new Date() - opts.debounce) {
-          console.log('clear execution')
           Promise.reject(ex.promise)
         } else {
           return ex.promise