@cuboapp/api-backend 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",

package/src/crdt/index.ts

@@ -135,7 +135,7 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
                   auth: context.auth
                 },
                 excludeHooks: [],
-                queryOptions: { withDeleted: true }
+                queryOptions: { withDeleted: true, withCrdt: true }
               }
             )
           }
@@ -184,7 +184,7 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
             const entityMap = document.getMap(entityAlias)
             const id = entityMap.get('id')
 
-            if (!id) {
+            if (id === undefined) {
               document.connections.forEach(({ connection }) => {
                 connection.close({
                   reason: 'Document not loaded',

package/src/helpers/convert.ts

@@ -1,6 +1,6 @@
+import { CUBO_ENTITY_FIELD_TYPE } from '@cuboapp/constants'
 import { CuboApiEntitiesMap, CuboEntity, CuboEntityField } from '@cuboapp/types'
 import { get, set, unset } from '@cuboapp/utils'
-import { CUBO_ENTITY_FIELD_TYPE } from '@cuboapp/constants'
 
 import { CUBO_CRUD_DEFAULT_FIELDS } from '../constants'
 import { CuboCrudFindQuery, CuboCrudRequest } from '../types'
@@ -95,7 +95,7 @@ export class ApiHelpersConvert<T extends CuboApiEntitiesMap<T>> {
       case CUBO_ENTITY_FIELD_TYPE.DATE:
         return value
       case CUBO_ENTITY_FIELD_TYPE.FILE:
-        console.warn('field type "file" is not implemented yet')
+        // console.warn('field type "file" is not implemented yet')
         return undefined
       case CUBO_ENTITY_FIELD_TYPE.JSON:
       case CUBO_ENTITY_FIELD_TYPE.BINARY:

package/src/helpers/index.ts

@@ -306,12 +306,12 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
     }
   }
 
-  public async getConnection(type: CuboBackendApiDbConnectionType) {
+  public async getConnection(type: CuboBackendApiDbConnectionType, create = true) {
     if (this.connections[type]) {
       return this.connections[type]
     }
 
-    if (this.connecting[type] !== undefined) {
+    if (!create || this.connecting[type] !== undefined) {
       return this.connecting[type]
     }
 
@@ -361,6 +361,7 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
     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 || {}
 
@@ -446,7 +447,16 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
     }
 
     selects.push(...CUBO_CRUD_DEFAULT_FIELDS.map((f) => `t1.${f.alias}`))
-    selects.push(...entity.fields.map((f) => `t1.${f.alias}`))
+
+    let entityFields = entity.fields
+
+    if (this.api.crdt?.isCrdtSupported(entity) && !withCrdt) {
+      const crdtKey = this.api.crdt?.getCrdtField(entity)
+
+      entityFields = entityFields.filter((f) => f.alias !== crdtKey?.alias)
+    }
+
+    selects.push(...entityFields.map((f) => `t1.${f.alias}`))
 
     // remove deleted rows
     if (!queryDto?.withDeleted) {

package/src/index.ts

@@ -19,20 +19,22 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
 
   async init() {
     try {
-      this.auth = await this.request<{ variables: Record<string, any> }>('/auth/me?with=variables', {
-        withAuth: true
-      })
+      if (this.options.api !== undefined) {
+        this.auth = await this.request<{ variables: Record<string, any> }>('/auth/me?with=variables', {
+          withAuth: true
+        })
 
-      if (!this.auth) {
-        throw { code: 403, text: 'Авторизация Cubo-Backend не пройдена' }
-      }
+        if (!this.auth) {
+          throw { code: 403, text: 'Авторизация Cubo-Backend не пройдена' }
+        }
 
-      if (this.auth.variables?.db !== undefined) {
-        this.options.db = this.options.db || {}
+        if (this.auth.variables?.db !== undefined) {
+          this.options.db = this.options.db || {}
 
-        this.options.db.options = {
-          ...(this.options.db.options || {}),
-          ...(this.auth.variables?.db || {})
+          this.options.db.options = {
+            ...(this.options.db.options || {}),
+            ...(this.auth.variables?.db || {})
+          }
         }
       }
     } catch (e) {
@@ -40,6 +42,19 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     }
   }
 
+  async destroy() {
+    const read = await this.helpers.getConnection('read', false)
+    const write = await this.helpers.getConnection('write', false)
+
+    if (read) {
+      await read.disconnect()
+    }
+
+    if (write) {
+      await write.disconnect()
+    }
+  }
+
   public async request<T>(url: string, opts?: RequestInit & { debug?: boolean; withAuth?: boolean; withoutContentType?: boolean }) {
     const baseUrl = this.options?.api?.base_url || 'https://api.cubo.sh'
 
@@ -136,6 +151,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     // 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)
@@ -188,6 +204,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     // 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)
@@ -254,7 +271,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
       response = await augmentation.afterCreate(response, req, opts)
     }
 
-    if (opts.crdt === true && this.crdt?.isCrdtSupported(entity)) {
+    if (opts.crdt !== false && this.crdt?.isCrdtSupported(entity)) {
       const state = await this.crdt.createState({ entityAlias, id: created_id, entity }, response)
 
       const fieldKey = entity.fields.find((f) => f.type === 'binary').alias
@@ -306,7 +323,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
       response = await augmentation.afterUpdate(response, req, opts)
     }
 
-    if (opts.crdt === true && this.crdt?.isCrdtSupported(entity)) {
+    if (opts.crdt !== false && this.crdt?.isCrdtSupported(entity)) {
       const context = { auth: opts?.extra?.auth }
       await this.crdt.updateDocument({ entityAlias, id: item.id, entity }, response, context)
 

package/src/types/basic.ts

@@ -48,6 +48,7 @@ export type CuboCrudFindQuery = {
   withes: CuboCrudWith[]
 
   withDeleted?: boolean
+  withCrdt?: boolean
   is_count: boolean
   sql: string
 }

package/src/types/db.ts

@@ -10,7 +10,8 @@ export type CuboCrudQueryOptions = {
   sorts?: string[]
   groupBy?: string
   withDeleted?: boolean
-
+  withCrdt?: boolean
+  
   extra?: any
 }
 

package/src/types/index.ts

@@ -10,7 +10,7 @@ export * from './basic'
 export * from './db'
 
 export type CuboBackendApiOptions<T extends CuboApiEntitiesMap<T>> = {
-  api: {
+  api?: {
     base_url?: string
     headers: Partial<Record<`cubo-${CuboAuthTokenType}`, string>> & Record<string, any>
   }
@@ -23,6 +23,7 @@ export type CuboBackendApiOptions<T extends CuboApiEntitiesMap<T>> = {
   }
 
   crdt?: CuboCrdtConfiguration<T>
+
   augmentations?: Partial<CuboCrudAugmentationsStore<T>>
 }