@cuboapp/api-backend 1.0.36 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",
@@ -12,7 +12,7 @@
     "@cuboapp/crdt": "1.0.11",
     "@cuboapp/database": "1.0.6",
     "@cuboapp/types": "2.0.13",
-    "@cuboapp/utils": "1.0.10",
+    "@cuboapp/utils": "1.0.11",
     "@cuboapp/ws": "1.0.6",
     "mime-types": "^3.0.2",
     "pg": "^8.17.2",

package/src/helpers/convert.ts

@@ -93,7 +93,7 @@ export class ApiHelpersConvert<T extends CuboApiEntitiesMap<T>> {
       case CUBO_ENTITY_FIELD_TYPE.BOOLEAN:
         return value !== undefined ? (['true', true].includes(value) ? true : false) : null
       case CUBO_ENTITY_FIELD_TYPE.DATE:
-        return value
+        return value !== undefined ? value : null
       case CUBO_ENTITY_FIELD_TYPE.FILE:
         // console.warn('field type "file" is not implemented yet')
         return undefined

package/src/helpers/data.ts

@@ -26,7 +26,7 @@ export class ApiHelpersData<T extends CuboApiEntitiesMap<T>> {
         }
         break
       case 'delete':
-        prepared.deleted_at = dto?.deleted_at !== undefined ? dto.deleted_at : new Date().toISOString()
+        prepared.deleted_at = dto?.deleted_at !== undefined ? dto.deleted_at : new Date()
         prepared.deleted_by = dto?.deleted_by !== undefined ? dto.deleted_by : performer_id
         break
     }

package/src/helpers/index.ts

@@ -1,6 +1,7 @@
 import { CUBO_ENTITY_FIELD_TYPE } from '@cuboapp/constants'
 import { Database, createDatabase } from '@cuboapp/database'
 import { CuboApiEntitiesMap, CuboEntity, CuboEntityField, CuboEntityFieldExtra, CuboEntityFieldType } from '@cuboapp/types'
+import { cloneDeep } from '@cuboapp/utils'
 
 import { CuboBackendApi } from '../..'
 import {
@@ -15,8 +16,6 @@ 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> {
@@ -100,109 +99,119 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>, A> {
     switch (field.type) {
       case CUBO_ENTITY_FIELD_TYPE.TEXT:
       case CUBO_ENTITY_FIELD_TYPE.TEXTAREA:
-        switch (type) {
-          case 'object':
-            if (value !== null) {
+      case CUBO_ENTITY_FIELD_TYPE.DATE:
+      case CUBO_ENTITY_FIELD_TYPE.TIMESTAMP:
+        {
+          switch (type) {
+            case 'object':
+              if (value !== null) {
+                throw new Error('"' + field.alias + '" must be string')
+              }
+              break
+            case 'string':
+              if (value === 'null') {
+                value = null
+              } else if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
+                value = value.split(',')
+              }
+              break
+            case 'number':
+              value = `${value}`
+              break
+            default:
               throw new Error('"' + field.alias + '" must be string')
-            }
-            break
-          case 'string':
-            if (value === 'null') {
-              value = null
-            } else if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
-              value = value.split(',')
-            }
-            break
-          case 'number':
-            value = `${value}`
-            break
-          default:
-            throw new Error('"' + field.alias + '" must be string')
+          }
         }
         break
       case CUBO_ENTITY_FIELD_TYPE.SELECT:
-        if (value === 'null') {
-          value = null
-        } else {
-          if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
-            value = value.split(',')
+        {
+          if (value === 'null') {
+            value = null
+          } else {
+            if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
+              value = value.split(',')
+            }
           }
         }
         break
       case CUBO_ENTITY_FIELD_TYPE.NUMBER:
-        // const precision = field.extra?.number_precision || 0
-        const precision = 0
-
-        switch (type) {
-          case 'object':
-            if (value !== null) {
-              throw new Error('"' + field.alias + '" must be string')
-            }
-            break
-          case 'string':
-            if (value === 'null') {
-              value = null
-            } else {
-              if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
-                value = value.split(',').map(Number)
-              } else if (condition === CUBO_CRUD_QUERY_CONDITION.BTW) {
-                const [fromStr, toStr] = value.split(':')
-                const from = precision === 0 ? parseInt(fromStr) : parseFloat(fromStr)
-                const to = precision === 0 ? parseInt(toStr) : parseFloat(toStr)
-
-                if (isNaN(from) || isNaN(to)) {
-                  throw new Error(`"${field.alias}": both values for "btw" must be valid numbers`)
-                }
-
-                value = precision > 0 ? `${from.toFixed(precision)}:${to.toFixed(precision)}` : `${from}:${to}`
+        {
+          // const precision = field.extra?.number_precision || 0
+          const precision = 0
+
+          switch (type) {
+            case 'object':
+              if (value !== null) {
+                throw new Error('"' + field.alias + '" must be string')
+              }
+              break
+            case 'string':
+              if (value === 'null') {
+                value = null
               } else {
-                const potentialValue = precision === 0 ? parseInt(value) : parseFloat(value)
-                if (isNaN(potentialValue)) {
-                  throw new Error('"' + field.alias + '" must be number')
+                if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
+                  value = value.split(',').map(Number)
+                } else if (condition === CUBO_CRUD_QUERY_CONDITION.BTW) {
+                  const [fromStr, toStr] = value.split(':')
+                  const from = precision === 0 ? parseInt(fromStr) : parseFloat(fromStr)
+                  const to = precision === 0 ? parseInt(toStr) : parseFloat(toStr)
+
+                  if (isNaN(from) || isNaN(to)) {
+                    throw new Error(`"${field.alias}": both values for "btw" must be valid numbers`)
+                  }
+
+                  value = precision > 0 ? `${from.toFixed(precision)}:${to.toFixed(precision)}` : `${from}:${to}`
                 } else {
-                  if (precision > 0) {
-                    value = parseFloat(potentialValue.toFixed(precision))
+                  const potentialValue = precision === 0 ? parseInt(value) : parseFloat(value)
+                  if (isNaN(potentialValue)) {
+                    throw new Error('"' + field.alias + '" must be number')
                   } else {
-                    value = potentialValue
+                    if (precision > 0) {
+                      value = parseFloat(potentialValue.toFixed(precision))
+                    } else {
+                      value = potentialValue
+                    }
                   }
                 }
               }
-            }
-            break
-          case 'number':
-            if (precision > 0) {
-              value = parseFloat(parseFloat(value).toFixed(precision))
-            } else {
-              value = parseInt(value)
-            }
-            break
-          default:
-            throw new Error('"' + field.alias + '" must be number')
+              break
+            case 'number':
+              if (precision > 0) {
+                value = parseFloat(parseFloat(value).toFixed(precision))
+              } else {
+                value = parseInt(value)
+              }
+              break
+            default:
+              throw new Error('"' + field.alias + '" must be number')
+          }
         }
         break
       case CUBO_ENTITY_FIELD_TYPE.BOOLEAN:
-        switch (type) {
-          case 'object':
-            if (value !== null) {
-              throw new Error('"' + field.alias + '" must be string')
-            }
-            break
-          case 'string':
-            if (value === 'null') {
-              value = null
-            } else if (!['true', 'false'].includes(value)) {
-              throw new Error('"' + field.alias + '" must be true or false')
-            }
-            break
-          case 'number':
-            if (![0, 1].includes(value)) {
+        {
+          switch (type) {
+            case 'object':
+              if (value !== null) {
+                throw new Error('"' + field.alias + '" must be string')
+              }
+              break
+            case 'string':
+              if (value === 'null') {
+                value = null
+              } else if (!['true', 'false'].includes(value)) {
+                throw new Error('"' + field.alias + '" must be true or false')
+              }
+              break
+            case 'number':
+              if (![0, 1].includes(value)) {
+                throw new Error('"' + field.alias + '" must be true or false')
+              }
+              break
+            case 'boolean':
+              break
+            default:
               throw new Error('"' + field.alias + '" must be true or false')
-            }
-            break
-          case 'boolean':
-            break
-          default:
-            throw new Error('"' + field.alias + '" must be true or false')
+          }
         }
         break
       default:

package/tsconfig.json

@@ -8,13 +8,14 @@
     "allowSyntheticDefaultImports": true,
     "target": "ES2021",
     "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./",
+    "rootDir": ".",
     "incremental": true,
     "skipLibCheck": true,
+    "strict": false,
     "paths": {
-      "@/*": ["src/*"]
-    }
+      "@/*": ["./src/*"]
+    },
+    "types": ["node"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]