@cuboapp/api-backend 1.0.0

package/.prettierrc

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "eslintIntegration": true,
+  "printWidth": 140
+}

package/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "@cuboapp/api-backend",
+  "version": "1.0.0",
+  "description": "Backend Api for CuboApp",
+  "main": "src/index.ts",
+  "repository": "git@github.com:cuboapp/api-backend.git",
+  "author": "CuboSoft",
+  "license": "MIT",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@cuboapp/config": "^0.0.6",
+    "@cuboapp/types": "^1.0.19",
+    "lodash-es": "^4.17.21",
+    "pg": "^8.13.3",
+    "sequelize": "^6.37.6"
+  },
+  "devDependencies": {
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.0.0",
+    "typescript": "^5.8.2"
+  }
+}

package/pnpm-lock.yaml

@@ -0,0 +1,378 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@cuboapp/config':
+        specifier: ^0.0.6
+        version: 0.0.6
+      '@cuboapp/types':
+        specifier: ^1.0.19
+        version: 1.0.19
+      lodash-es:
+        specifier: ^4.17.21
+        version: 4.17.21
+      pg:
+        specifier: ^8.13.3
+        version: 8.13.3
+      sequelize:
+        specifier: ^6.37.6
+        version: 6.37.6(pg@8.13.3)
+    devDependencies:
+      '@types/lodash-es':
+        specifier: ^4.17.12
+        version: 4.17.12
+      '@types/node':
+        specifier: ^22.0.0
+        version: 22.13.9
+      typescript:
+        specifier: ^5.8.2
+        version: 5.8.2
+
+packages:
+
+  '@cuboapp/config@0.0.6':
+    resolution: {integrity: sha512-2sQKqPYUK3YH46CPgbJXzvzD8QLxHm5CVrSAj78rxDzqX/xnnAAqOYfn4QS6B/4GZxRexNp2OkKH5c2ea+dXRg==}
+
+  '@cuboapp/types@1.0.19':
+    resolution: {integrity: sha512-CZyut9MmCT+5bBBbZF3ETiJnRbgnExvx/+zT/UKj4NxZKlqQAnzX8hWIFMBbed3YoSkbS+cdZcJE26k5mLNPjw==}
+
+  '@types/debug@4.1.12':
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+
+  '@types/events@3.0.3':
+    resolution: {integrity: sha512-trOc4AAUThEz9hapPtSd7wf5tiQKvTtu5b371UxXdTuqzIh0ArcRspRP0i0Viu+LXstIQ1z96t1nsPxT9ol01g==}
+
+  '@types/lodash-es@4.17.12':
+    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
+
+  '@types/lodash@4.17.16':
+    resolution: {integrity: sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==}
+
+  '@types/ms@2.1.0':
+    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
+
+  '@types/node@22.13.9':
+    resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==}
+
+  '@types/validator@13.12.2':
+    resolution: {integrity: sha512-6SlHBzUW8Jhf3liqrGGXyTJSIFe4nqlJ5A5KaMZ2l/vbM3Wh3KSybots/wfWVzNLK4D1NZluDlSQIbIEPx6oyA==}
+
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  dotenv-expand@12.0.1:
+    resolution: {integrity: sha512-LaKRbou8gt0RNID/9RoI+J2rvXsBRPMV7p+ElHlPhcSARbCPDYcYG2s1TIzAfWv4YSgyY5taidWzzs31lNV3yQ==}
+    engines: {node: '>=12'}
+
+  dotenv@16.4.7:
+    resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
+    engines: {node: '>=12'}
+
+  dottie@2.0.6:
+    resolution: {integrity: sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==}
+
+  inflection@1.13.4:
+    resolution: {integrity: sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==}
+    engines: {'0': node >= 0.4.0}
+
+  lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+
+  moment-timezone@0.5.47:
+    resolution: {integrity: sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==}
+
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  pg-cloudflare@1.1.1:
+    resolution: {integrity: sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==}
+
+  pg-connection-string@2.7.0:
+    resolution: {integrity: sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==}
+
+  pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+
+  pg-pool@3.7.1:
+    resolution: {integrity: sha512-xIOsFoh7Vdhojas6q3596mXFsR8nwBQBXX5JiV7p9buEVAGqYL4yFzclON5P9vFrpu1u7Zwl2oriyDa89n0wbw==}
+    peerDependencies:
+      pg: '>=8.0'
+
+  pg-protocol@1.7.1:
+    resolution: {integrity: sha512-gjTHWGYWsEgy9MsY0Gp6ZJxV24IjDqdpTW7Eh0x+WfJLFsm/TJx1MzL6T0D88mBvkpxotCQ6TwW6N+Kko7lhgQ==}
+
+  pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+
+  pg@8.13.3:
+    resolution: {integrity: sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+
+  pgpass@1.0.5:
+    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
+
+  postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
+
+  postgres-bytea@1.0.0:
+    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
+
+  retry-as-promised@7.1.1:
+    resolution: {integrity: sha512-hMD7odLOt3LkTjcif8aRZqi/hybjpLNgSk5oF5FCowfCjok6LukpN2bDX7R5wDmbgBQFn7YoBxSagmtXHaJYJw==}
+
+  semver@7.7.1:
+    resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  sequelize-pool@7.1.0:
+    resolution: {integrity: sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==}
+    engines: {node: '>= 10.0.0'}
+
+  sequelize@6.37.6:
+    resolution: {integrity: sha512-4Slqjqpktofs7AVqWviFOInzP9w8ZRQDhF+DnRtm4WKIdIATpyzGgedyseP3xbgpBxapvfQcJv6CeIdZe4ZL2A==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      ibm_db: '*'
+      mariadb: '*'
+      mysql2: '*'
+      oracledb: '*'
+      pg: '*'
+      pg-hstore: '*'
+      snowflake-sdk: '*'
+      sqlite3: '*'
+      tedious: '*'
+    peerDependenciesMeta:
+      ibm_db:
+        optional: true
+      mariadb:
+        optional: true
+      mysql2:
+        optional: true
+      oracledb:
+        optional: true
+      pg:
+        optional: true
+      pg-hstore:
+        optional: true
+      snowflake-sdk:
+        optional: true
+      sqlite3:
+        optional: true
+      tedious:
+        optional: true
+
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
+  toposort-class@1.0.1:
+    resolution: {integrity: sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==}
+
+  typescript@5.8.2:
+    resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  undici-types@6.20.0:
+    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
+
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
+
+  validator@13.12.0:
+    resolution: {integrity: sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==}
+    engines: {node: '>= 0.10'}
+
+  wkx@0.5.0:
+    resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==}
+
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+snapshots:
+
+  '@cuboapp/config@0.0.6':
+    dependencies:
+      '@cuboapp/types': 1.0.19
+      dotenv: 16.4.7
+      dotenv-expand: 12.0.1
+
+  '@cuboapp/types@1.0.19':
+    dependencies:
+      '@types/events': 3.0.3
+
+  '@types/debug@4.1.12':
+    dependencies:
+      '@types/ms': 2.1.0
+
+  '@types/events@3.0.3': {}
+
+  '@types/lodash-es@4.17.12':
+    dependencies:
+      '@types/lodash': 4.17.16
+
+  '@types/lodash@4.17.16': {}
+
+  '@types/ms@2.1.0': {}
+
+  '@types/node@22.13.9':
+    dependencies:
+      undici-types: 6.20.0
+
+  '@types/validator@13.12.2': {}
+
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
+  dotenv-expand@12.0.1:
+    dependencies:
+      dotenv: 16.4.7
+
+  dotenv@16.4.7: {}
+
+  dottie@2.0.6: {}
+
+  inflection@1.13.4: {}
+
+  lodash-es@4.17.21: {}
+
+  lodash@4.17.21: {}
+
+  moment-timezone@0.5.47:
+    dependencies:
+      moment: 2.30.1
+
+  moment@2.30.1: {}
+
+  ms@2.1.3: {}
+
+  pg-cloudflare@1.1.1:
+    optional: true
+
+  pg-connection-string@2.7.0: {}
+
+  pg-int8@1.0.1: {}
+
+  pg-pool@3.7.1(pg@8.13.3):
+    dependencies:
+      pg: 8.13.3
+
+  pg-protocol@1.7.1: {}
+
+  pg-types@2.2.0:
+    dependencies:
+      pg-int8: 1.0.1
+      postgres-array: 2.0.0
+      postgres-bytea: 1.0.0
+      postgres-date: 1.0.7
+      postgres-interval: 1.2.0
+
+  pg@8.13.3:
+    dependencies:
+      pg-connection-string: 2.7.0
+      pg-pool: 3.7.1(pg@8.13.3)
+      pg-protocol: 1.7.1
+      pg-types: 2.2.0
+      pgpass: 1.0.5
+    optionalDependencies:
+      pg-cloudflare: 1.1.1
+
+  pgpass@1.0.5:
+    dependencies:
+      split2: 4.2.0
+
+  postgres-array@2.0.0: {}
+
+  postgres-bytea@1.0.0: {}
+
+  postgres-date@1.0.7: {}
+
+  postgres-interval@1.2.0:
+    dependencies:
+      xtend: 4.0.2
+
+  retry-as-promised@7.1.1: {}
+
+  semver@7.7.1: {}
+
+  sequelize-pool@7.1.0: {}
+
+  sequelize@6.37.6(pg@8.13.3):
+    dependencies:
+      '@types/debug': 4.1.12
+      '@types/validator': 13.12.2
+      debug: 4.4.0
+      dottie: 2.0.6
+      inflection: 1.13.4
+      lodash: 4.17.21
+      moment: 2.30.1
+      moment-timezone: 0.5.47
+      pg-connection-string: 2.7.0
+      retry-as-promised: 7.1.1
+      semver: 7.7.1
+      sequelize-pool: 7.1.0
+      toposort-class: 1.0.1
+      uuid: 8.3.2
+      validator: 13.12.0
+      wkx: 0.5.0
+    optionalDependencies:
+      pg: 8.13.3
+    transitivePeerDependencies:
+      - supports-color
+
+  split2@4.2.0: {}
+
+  toposort-class@1.0.1: {}
+
+  typescript@5.8.2: {}
+
+  undici-types@6.20.0: {}
+
+  uuid@8.3.2: {}
+
+  validator@13.12.0: {}
+
+  wkx@0.5.0:
+    dependencies:
+      '@types/node': 22.13.9
+
+  xtend@4.0.2: {}

package/src/constants/backend.ts

@@ -0,0 +1,74 @@
+import { CuboEntityField } from '@cuboapp/types'
+
+import { CUBO_ENTITY_FIELD_TYPE } from './base'
+
+export const CUBO_CRUD_QUERY_KEY_REGEX = /[^a-zA-Z\.\_]/g
+
+export const CUBO_CRUD_QUERY_SYMBOL_NOT = 'not'
+
+export const CUBO_CRUD_DEFAULT_PAGE_LIMIT = 25
+export const CUBO_CRUD_MAX_PAGE_LIMIT = 500
+
+export const CUBO_CRUD_QUERY_CONDITION = {
+  EQ: 'eq',
+  EX: 'ex',
+  LIKE: 'like',
+  ILIKE: 'ilike',
+  IN: 'in',
+  NIN: 'nin',
+  GT: 'gt',
+  LT: 'lt',
+  GTE: 'gte',
+  LTE: 'lte'
+}
+
+export const CUBO_CRUD_DEFAULT_FIELDS: Pick<CuboEntityField, 'type_id' | 'alias' | 'extra'>[] = [
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.NUMBER,
+    alias: 'id',
+    extra: {
+      number_subtype: 'int'
+    }
+  },
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.TIMESTAMP,
+    alias: 'created_at',
+    extra: {}
+  },
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.SELECT,
+    alias: 'created_by',
+    extra: {
+      select_subtype: 'user',
+      select_entity_key: 'created_by'
+    }
+  },
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.TIMESTAMP,
+    alias: 'modified_at',
+    extra: {}
+  },
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.SELECT,
+    alias: 'modified_by',
+    extra: {
+      select_subtype: 'user',
+      select_entity_key: 'modified_by'
+    }
+  },
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.TIMESTAMP,
+    alias: 'deleted_at',
+    extra: {}
+  },
+  {
+    type_id: CUBO_ENTITY_FIELD_TYPE.SELECT,
+    alias: 'deleted_by',
+    extra: {
+      select_subtype: 'user',
+      select_entity_key: 'modified_by'
+    }
+  }
+]
+
+export const CUBO_CRUD_DEFAULT_FIELDS_ALIASES = CUBO_CRUD_DEFAULT_FIELDS.map((i) => i.alias)

package/src/constants/base.ts

@@ -0,0 +1,11 @@
+export const CUBO_ENTITY_FIELD_TYPE = {
+  TEXT: 1,
+  NUMBER: 2,
+  TEXTAREA: 3,
+  BOOLEAN: 4,
+  SELECT: 5,
+  DATE: 6,
+  TIMESTAMP: 7,
+  FILE: 8,
+  JSON: 9
+}

package/src/constants/index.ts

@@ -0,0 +1,2 @@
+export * from './backend'
+export * from './base'

package/src/helpers/convert.ts

@@ -0,0 +1,135 @@
+import get from 'lodash-es/get'
+import set from 'lodash-es/set'
+import unset from 'lodash-es/unset'
+
+import { CUBO_CRUD_DEFAULT_FIELDS, CUBO_ENTITY_FIELD_TYPE } from '../../constants'
+import { CuboCrudFindQuery, CuboCrudRequest, CuboEntitiesMap, CuboEntityFieldModel, CuboEntityModel } from '../../types'
+
+import { ApiHelpers } from '.'
+
+export class ApiHelpersConvert<T extends CuboEntitiesMap<T>> {
+  constructor(public helpers: ApiHelpers<T>) {}
+
+  public async prepareAll(req: CuboCrudRequest, entity: CuboEntityModel, rows: any[], query?: Partial<CuboCrudFindQuery>): Promise<any[]> {
+    for (const rowKey in rows) {
+      rows[rowKey] = await this.prepareOne(req, entity, rows[rowKey], query)
+    }
+
+    return rows
+  }
+
+  public async prepareOne(req: CuboCrudRequest, entity: CuboEntityModel, row: any, query?: Partial<CuboCrudFindQuery>) {
+    const usersDefaultFields = ['created_by', 'modified_by', 'deleted_by']
+
+    const toPrepare: Record<string, any> = {}
+    const toRemove: string[] = []
+    const userFieldsPrepared: string[] = []
+
+    // console.log('query?.withes', query?.withes)
+
+    // добавялем базовые поля
+    for (const field of [...entity.fields, ...CUBO_CRUD_DEFAULT_FIELDS]) {
+      if (!userFieldsPrepared.includes(field.alias)) {
+        toPrepare[field.alias] = field
+      }
+    }
+
+    // добавялем поля-with-ы
+    for (const withEl of query?.withes || []) {
+      const valueKey = withEl.table_name
+      const initialValueKey = usersDefaultFields.includes(withEl.key) ? valueKey : valueKey + '_id'
+
+      const rowValue = get(row, initialValueKey, undefined)
+
+      if (!withEl.entity.id && withEl.entity.alias === 'users') {
+        userFieldsPrepared.push(withEl.full_key)
+
+        switch (rowValue) {
+          case null:
+          case undefined:
+            set(row, withEl.full_key, null)
+            break
+          case 0:
+            set(row, withEl.full_key, { id: 0, name: this.helpers.api.account.name })
+            break
+          default:
+            const user = await this.helpers.users.getById(rowValue)
+
+            set(
+              row,
+              withEl.full_key,
+              user ? { id: user.id, name: user.name, email: user.email } : { id: rowValue, name: `User #${rowValue}` }
+            )
+            break
+        }
+      } else {
+        const rowValueEmpty = [0, '0', '', null, 'null'].includes(rowValue)
+
+        if (rowValueEmpty) {
+          set(row, withEl.full_key, null)
+        }
+
+        if (toPrepare[withEl.key]) {
+          delete toPrepare[withEl.key]
+        }
+
+        // console.log('rowValue', withEl.full_key, { rowValueEmpty, rowValue })
+
+        for (const field of [...withEl.entity.fields, ...CUBO_CRUD_DEFAULT_FIELDS]) {
+          const fieldValueKey = withEl.table_name.toLowerCase() + '_' + field.alias
+
+          // console.log('add field', field.alias, rowValueEmpty)
+
+          if (!rowValueEmpty && !usersDefaultFields.includes(field.alias)) {
+            const fieldKeyPath = withEl.full_key + '.' + field.alias
+            const rowRelationValue = get(row, fieldValueKey, undefined)
+
+            set(row, fieldKeyPath, this.prepareFieldValue(field, rowRelationValue))
+
+            toPrepare[fieldKeyPath] = field
+          }
+
+          if (field.alias !== 'id') {
+            toRemove.push(fieldValueKey)
+          }
+        }
+      }
+    }
+
+    for (const el of toRemove) {
+      unset(row, el)
+    }
+
+    // console.log('toPrepare', { toRemove, row })
+
+    for (const key in toPrepare) {
+      // console.log('set row field', key, this.prepareFieldValue(toPrepare[key], get(row, key)))
+
+      set(row, key, this.prepareFieldValue(toPrepare[key], get(row, key)))
+    }
+
+    return row
+  }
+
+  private prepareFieldValue(field: Pick<CuboEntityFieldModel, 'type_id' | 'alias' | 'extra'>, value: any) {
+    switch (field.type_id) {
+      case CUBO_ENTITY_FIELD_TYPE.BOOLEAN:
+        return value !== undefined ? (['true', true].includes(value) ? true : false) : null
+      case CUBO_ENTITY_FIELD_TYPE.DATE:
+        return value
+      case CUBO_ENTITY_FIELD_TYPE.FILE:
+        console.warn('field type "file" is not implemented yet')
+        return undefined
+      case CUBO_ENTITY_FIELD_TYPE.JSON:
+        return value
+      case CUBO_ENTITY_FIELD_TYPE.NUMBER:
+        return ![undefined, null].includes(value) ? parseFloat(value) : null
+      case CUBO_ENTITY_FIELD_TYPE.SELECT:
+        return ![undefined, null].includes(value) ? parseInt(value, 10) : null
+      case CUBO_ENTITY_FIELD_TYPE.TEXT:
+      case CUBO_ENTITY_FIELD_TYPE.TEXTAREA:
+      case CUBO_ENTITY_FIELD_TYPE.TIMESTAMP:
+        return value !== undefined ? value : null
+    }
+  }
+}