proto.io 0.0.175 → 0.0.177

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-BYZpj31o.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BQqYdjaH.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-Dz0pmKCD.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CZShhrIu.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -104,6 +104,7 @@ class DatabaseFileStorage extends index.FileStorageBase {
             filter: index$1.QuerySelector.decode({ token: { $eq: token } }),
             includes: ['_id'],
             matches: {},
+            countMatches: [],
             objectIdSize: 0
         });
     }

package/dist/adapters/file/database.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.js","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n  constructor(options: FileStorageOptions = {}) {\n    super(options);\n  }\n\n  get schema(): Record<string, TSchema> {\n    return {\n      '_FileChunk': {\n        fields: {\n          token: 'string',\n          start: 'number',\n          end: 'number',\n          size: 'number',\n          base64: 'string',\n        },\n        classLevelPermissions: {\n          get: [],\n          find: [],\n          count: [],\n          create: [],\n          update: [],\n          delete: [],\n        },\n        fieldLevelPermissions: {\n          _expired_at: { create: [], update: [] },\n        },\n        indexes: [\n          { keys: { token: 1, start: 1, end: 1 } },\n          { keys: { token: 1, end: 1 } },\n        ]\n      },\n    }\n  }\n\n  async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n    const created = await proto.Query('_FileChunk').insert({\n      token,\n      start: start,\n      end: end,\n      size: end - start,\n      base64: bufferToBase64(compressed),\n    }, { master: true });\n\n    if (!created) throw Error('Unable to save file');\n\n  }\n\n  async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n    const query = proto.Query('_FileChunk')\n      .sort({ start: 1 })\n      .filter({\n        token: { $eq: token },\n        ...start ? { end: { $gt: start } } : {},\n        ...end ? { start: { $lt: end } } : {},\n      });\n    for await (const chunk of query.find({ master: true })) {\n      const startBytes = chunk.get('start');\n      const base64 = chunk.get('base64');\n      if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n      yield {\n        start: startBytes,\n        data: base64ToBuffer(base64),\n      };\n    }\n  }\n\n  async destroy<E>(proto: ProtoService<E>, token: string) {\n    proto.storage.deleteMany({\n      className: '_FileChunk',\n      filter: QuerySelector.decode({ token: { $eq: token } }),\n      includes: ['_id'],\n      matches: {},\n      objectIdSize: 0\n    });\n  }\n};\n\nexport default DatabaseFileStorage;"],"names":["FileStorageBase","bufferToBase64","base64ToBuffer","QuerySelector"],"mappings":"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"}
+{"version":3,"file":"database.js","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n  constructor(options: FileStorageOptions = {}) {\n    super(options);\n  }\n\n  get schema(): Record<string, TSchema> {\n    return {\n      '_FileChunk': {\n        fields: {\n          token: 'string',\n          start: 'number',\n          end: 'number',\n          size: 'number',\n          base64: 'string',\n        },\n        classLevelPermissions: {\n          get: [],\n          find: [],\n          count: [],\n          create: [],\n          update: [],\n          delete: [],\n        },\n        fieldLevelPermissions: {\n          _expired_at: { create: [], update: [] },\n        },\n        indexes: [\n          { keys: { token: 1, start: 1, end: 1 } },\n          { keys: { token: 1, end: 1 } },\n        ]\n      },\n    }\n  }\n\n  async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n    const created = await proto.Query('_FileChunk').insert({\n      token,\n      start: start,\n      end: end,\n      size: end - start,\n      base64: bufferToBase64(compressed),\n    }, { master: true });\n\n    if (!created) throw Error('Unable to save file');\n\n  }\n\n  async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n    const query = proto.Query('_FileChunk')\n      .sort({ start: 1 })\n      .filter({\n        token: { $eq: token },\n        ...start ? { end: { $gt: start } } : {},\n        ...end ? { start: { $lt: end } } : {},\n      });\n    for await (const chunk of query.find({ master: true })) {\n      const startBytes = chunk.get('start');\n      const base64 = chunk.get('base64');\n      if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n      yield {\n        start: startBytes,\n        data: base64ToBuffer(base64),\n      };\n    }\n  }\n\n  async destroy<E>(proto: ProtoService<E>, token: string) {\n    proto.storage.deleteMany({\n      className: '_FileChunk',\n      filter: QuerySelector.decode({ token: { $eq: token } }),\n      includes: ['_id'],\n      matches: {},\n      countMatches: [],\n      objectIdSize: 0\n    });\n  }\n};\n\nexport default DatabaseFileStorage;"],"names":["FileStorageBase","bufferToBase64","base64ToBuffer","QuerySelector"],"mappings":"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"}

package/dist/adapters/file/database.mjs

@@ -100,6 +100,7 @@ class DatabaseFileStorage extends FileStorageBase {
             filter: QuerySelector.decode({ token: { $eq: token } }),
             includes: ['_id'],
             matches: {},
+            countMatches: [],
             objectIdSize: 0
         });
     }

package/dist/adapters/file/database.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"database.mjs","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n  constructor(options: FileStorageOptions = {}) {\n    super(options);\n  }\n\n  get schema(): Record<string, TSchema> {\n    return {\n      '_FileChunk': {\n        fields: {\n          token: 'string',\n          start: 'number',\n          end: 'number',\n          size: 'number',\n          base64: 'string',\n        },\n        classLevelPermissions: {\n          get: [],\n          find: [],\n          count: [],\n          create: [],\n          update: [],\n          delete: [],\n        },\n        fieldLevelPermissions: {\n          _expired_at: { create: [], update: [] },\n        },\n        indexes: [\n          { keys: { token: 1, start: 1, end: 1 } },\n          { keys: { token: 1, end: 1 } },\n        ]\n      },\n    }\n  }\n\n  async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n    const created = await proto.Query('_FileChunk').insert({\n      token,\n      start: start,\n      end: end,\n      size: end - start,\n      base64: bufferToBase64(compressed),\n    }, { master: true });\n\n    if (!created) throw Error('Unable to save file');\n\n  }\n\n  async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n    const query = proto.Query('_FileChunk')\n      .sort({ start: 1 })\n      .filter({\n        token: { $eq: token },\n        ...start ? { end: { $gt: start } } : {},\n        ...end ? { start: { $lt: end } } : {},\n      });\n    for await (const chunk of query.find({ master: true })) {\n      const startBytes = chunk.get('start');\n      const base64 = chunk.get('base64');\n      if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n      yield {\n        start: startBytes,\n        data: base64ToBuffer(base64),\n      };\n    }\n  }\n\n  async destroy<E>(proto: ProtoService<E>, token: string) {\n    proto.storage.deleteMany({\n      className: '_FileChunk',\n      filter: QuerySelector.decode({ token: { $eq: token } }),\n      includes: ['_id'],\n      matches: {},\n      objectIdSize: 0\n    });\n  }\n};\n\nexport default DatabaseFileStorage;"],"names":[],"mappings":"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"}
+{"version":3,"file":"database.mjs","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n//  index.ts\n//\n//  The MIT License\n//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.\n//\n//  Permission is hereby granted, free of charge, to any person obtaining a copy\n//  of this software and associated documentation files (the \"Software\"), to deal\n//  in the Software without restriction, including without limitation the rights\n//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n//  copies of the Software, and to permit persons to whom the Software is\n//  furnished to do so, subject to the following conditions:\n//\n//  The above copyright notice and this permission notice shall be included in\n//  all copies or substantial portions of the Software.\n//\n//  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n//  THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n  constructor(options: FileStorageOptions = {}) {\n    super(options);\n  }\n\n  get schema(): Record<string, TSchema> {\n    return {\n      '_FileChunk': {\n        fields: {\n          token: 'string',\n          start: 'number',\n          end: 'number',\n          size: 'number',\n          base64: 'string',\n        },\n        classLevelPermissions: {\n          get: [],\n          find: [],\n          count: [],\n          create: [],\n          update: [],\n          delete: [],\n        },\n        fieldLevelPermissions: {\n          _expired_at: { create: [], update: [] },\n        },\n        indexes: [\n          { keys: { token: 1, start: 1, end: 1 } },\n          { keys: { token: 1, end: 1 } },\n        ]\n      },\n    }\n  }\n\n  async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n    const created = await proto.Query('_FileChunk').insert({\n      token,\n      start: start,\n      end: end,\n      size: end - start,\n      base64: bufferToBase64(compressed),\n    }, { master: true });\n\n    if (!created) throw Error('Unable to save file');\n\n  }\n\n  async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n    const query = proto.Query('_FileChunk')\n      .sort({ start: 1 })\n      .filter({\n        token: { $eq: token },\n        ...start ? { end: { $gt: start } } : {},\n        ...end ? { start: { $lt: end } } : {},\n      });\n    for await (const chunk of query.find({ master: true })) {\n      const startBytes = chunk.get('start');\n      const base64 = chunk.get('base64');\n      if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n      yield {\n        start: startBytes,\n        data: base64ToBuffer(base64),\n      };\n    }\n  }\n\n  async destroy<E>(proto: ProtoService<E>, token: string) {\n    proto.storage.deleteMany({\n      className: '_FileChunk',\n      filter: QuerySelector.decode({ token: { $eq: token } }),\n      includes: ['_id'],\n      matches: {},\n      countMatches: [],\n      objectIdSize: 0\n    });\n  }\n};\n\nexport default DatabaseFileStorage;"],"names":[],"mappings":"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"}

package/dist/adapters/file/filesystem.d.ts

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-BYZpj31o.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BQqYdjaH.js';
+import { P as ProtoService } from '../../internals/index-Dz0pmKCD.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CZShhrIu.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-BYZpj31o.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BQqYdjaH.js';
+import { P as ProtoService } from '../../internals/index-Dz0pmKCD.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CZShhrIu.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { _ as _TValue, o as EventData, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-BYZpj31o.js';
+import { _ as _TValue, o as EventData, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-Dz0pmKCD.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';
@@ -57,6 +57,7 @@ type Populate = {
     filter?: QuerySelector;
     includes: Record<string, TSchema.DataType>;
     populates: Record<string, Populate>;
+    countMatches: string[];
     sort?: Record<string, 1 | -1> | DecodedSortOption[];
     skip?: number;
     limit?: number;
@@ -124,7 +125,7 @@ interface SqlDialect {
     selectPopulate(compiler: QueryCompiler, parent: {
         className: string;
         name: string;
-    }, populate: Populate, field: string): {
+    }, populate: Populate, field: string, countMatches: boolean): {
         columns: SQL[];
         join?: SQL;
     };

package/dist/adapters/storage/progres.js

@@ -11,7 +11,7 @@ var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
 var index$1 = require('../../internals/index-Dc3V_Bzw.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-DVOUDDGg.js');
+var random$1 = require('../../internals/random-CvVZek_8.js');
 var _private = require('../../internals/private-CSB1Ep4g.js');
 
 //
@@ -237,22 +237,25 @@ class QueryCompiler {
         return this.idx++;
     }
     _makeContext(query) {
-        const context = this._encodeIncludes(query.className, query.includes, query.matches);
+        const context = this._encodeIncludes(query);
         return {
             ...context,
             sorting: _encodeSorting(context.includes, context.populates, query.sort),
         };
     }
-    _encodeIncludes(className, includes, matches) {
+    _encodeIncludes(query) {
         const names = {};
         const populates = {};
-        for (const include of includes) {
-            const { paths: [colname, ...subpath], dataType } = random$1.resolveColumn(this.schema, className, include);
+        const countMatches = [];
+        for (const include of query.includes) {
+            const { paths: [colname, ...subpath], dataType } = random$1.resolveColumn(this.schema, query.className, include);
             names[colname] = dataType;
+            if (index.isRelation(dataType) && _.includes(query.countMatches, colname))
+                countMatches.push(colname);
             if (index.isPointer(dataType) || index.isRelation(dataType)) {
                 if (_.isEmpty(subpath))
                     throw Error(`Invalid path: ${include}`);
-                const _matches = matches[colname];
+                const _matches = query.matches[colname];
                 populates[colname] = populates[colname] ?? {
                     name: `t${this.nextIdx()}`,
                     className: dataType.target,
@@ -278,13 +281,22 @@ class QueryCompiler {
             }
         }
         for (const [colname, populate] of _.toPairs(populates)) {
-            const _matches = matches[colname];
-            const { includes, populates } = this._encodeIncludes(populate.className, populate.subpaths, _matches.matches);
+            const _matches = query.matches[colname];
+            const { includes, populates, countMatches } = this._encodeIncludes({
+                className: populate.className,
+                includes: populate.subpaths,
+                matches: _matches.matches,
+                countMatches: [
+                    ..._.filter(query.countMatches, x => _.startsWith(x, `${colname}.`)).map(x => x.slice(colname.length + 1)),
+                    ..._matches.countMatches ?? [],
+                ],
+            });
             populate.sort = _encodeSorting(includes, populates, _matches.sort);
             populate.includes = includes;
             populate.populates = populates;
+            populate.countMatches = countMatches;
         }
-        return { includes: names, populates };
+        return { includes: names, populates, countMatches };
     }
     _baseSelectQuery(query, options) {
         const context = this._makeContext(query);
@@ -328,7 +340,7 @@ class QueryCompiler {
         };
     }
     _refetch(name, query) {
-        const _context = this._encodeIncludes(query.className, query.includes, query.matches);
+        const _context = this._encodeIncludes(query);
         const populates = _.mapValues(_context.populates, (populate) => this.dialect.encodePopulate(this, populate, { className: query.className, name }));
         const stages = _.fromPairs(_.flatMap(_.values(populates), (p) => _.toPairs(p)));
         const _populates = this._selectPopulateMap(_context, query.className, name);
@@ -362,7 +374,10 @@ class QueryCompiler {
     `;
     }
     _encodeUpdateAttrs(className, attrs) {
-        const updates = [];
+        const updates = [
+            sql `__v = __v + 1`,
+            sql `_updated_at = NOW()`,
+        ];
         for (const [path, op] of _.toPairs(attrs)) {
             const { paths: [column, ...subpath], dataType } = random$1.resolveColumn(this.schema, className, path);
             if (index.isShape(dataType)) {
@@ -447,7 +462,7 @@ class QueryCompiler {
         return _.map(context.populates, (populate, field) => this.dialect.selectPopulate(this, {
             className,
             name,
-        }, populate, field));
+        }, populate, field, _.includes(context.countMatches, field)));
     }
     insert(options, attrs) {
         const _attrs = _.toPairs({
@@ -496,8 +511,7 @@ class QueryCompiler {
             return sql `
           , ${{ identifier: name }} AS (
             UPDATE ${{ identifier: query.className }}
-            SET __v = __v + 1, _updated_at = NOW()
-            ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+            SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
             RETURNING *
           )
@@ -509,8 +523,7 @@ class QueryCompiler {
         return this._modifyQuery(query, (fetchName) => {
             return sql `
           UPDATE ${{ identifier: query.className }}
-          SET __v = __v + 1, _updated_at = NOW()
-          ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+          SET ${this._encodeUpdateAttrs(query.className, update)}
           WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
           RETURNING _id
         `;
@@ -528,8 +541,7 @@ class QueryCompiler {
             return sql `
           , ${{ identifier: updateName }} AS (
             UPDATE ${{ identifier: query.className }}
-            SET __v = __v + 1, _updated_at = NOW()
-            ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+            SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
             RETURNING *
           )
@@ -560,17 +572,16 @@ class QueryCompiler {
             return sql `
           , ${{ identifier: updateName }} AS (
             UPDATE ${{ identifier: query.className }}
-            SET __v = __v + 1, _updated_at = NOW()
-            ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+            SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
-            RETURNING _id, 0 AS ${{ identifier: 'result' }}
+            RETURNING _id, __v
           )
           , ${{ identifier: insertName }} AS (
             INSERT INTO ${{ identifier: query.className }}
             (${_.map(_insert, x => sql `${{ identifier: x[0] }}`)})
             SELECT ${_.map(_insert, x => sql `${x[1]} AS ${{ identifier: x[0] }}`)}
             WHERE NOT EXISTS(SELECT * FROM ${{ identifier: updateName }})
-            RETURNING _id, 1 AS ${{ identifier: 'result' }}
+            RETURNING _id, __v
           )
           SELECT * FROM ${{ identifier: updateName }}
           UNION
@@ -664,7 +675,9 @@ class SqlStorage {
             }
             else if (index.isRelation(type)) {
                 const _value = _.get(value, path);
-                if (_.isArray(_value))
+                if (_.isString(_value) && _value.match(/^\d+$/g))
+                    _.set(result, path, parseInt(_value));
+                else if (_.isArray(_value))
                     _.set(result, path, _value.map(x => this._decodeObject(type.target, x)));
             }
             else {
@@ -700,7 +713,9 @@ class SqlStorage {
                 }
             }
             else if (index.isRelation(dataType)) {
-                if (_.isArray(value))
+                if (_.isString(value) && value.match(/^\d+$/g))
+                    obj[_private.PVK].attributes[key] = parseInt(value);
+                else if (_.isArray(value))
                     obj[_private.PVK].attributes[key] = value.map(x => this._decodeObject(dataType.target, x));
             }
             else {
@@ -811,9 +826,10 @@ class SqlStorage {
     async upsertMany(query, update, setOnInsert) {
         const compiler = this._makeCompiler(true, query.extraFilter);
         const upserted = await this.query(compiler.upsertMany(query, update, setOnInsert));
+        const inserted = _.filter(upserted, x => x.__v === 0).length;
         return {
-            updated: _.filter(upserted, x => x.result === 0).length,
-            inserted: _.filter(upserted, x => x.result === 1).length,
+            updated: upserted.length - inserted,
+            inserted: inserted,
         };
     }
     async deleteOne(query) {
@@ -1992,11 +2008,17 @@ const _selectRelationPopulate = (compiler, parent, populate, field, encode) => {
     ${compiler.selectLock ? compiler.isUpdate ? sql `FOR UPDATE NOWAIT` : sql `FOR SHARE NOWAIT` : sql ``}
   `;
 };
-const selectPopulate = (compiler, parent, populate, field) => {
+const selectPopulate = (compiler, parent, populate, field, countMatches) => {
     if (populate.type === 'relation') {
         return {
             columns: [
-                sql `
+                countMatches ? sql `
+          (
+            SELECT COUNT(*) FROM (
+              ${_selectRelationPopulate(compiler, parent, populate, field, false)}
+            ) ${{ identifier: populate.name }}
+          ) AS ${{ identifier: field }}
+        ` : sql `
           ARRAY(
             SELECT to_jsonb(${{ identifier: populate.name }}) FROM (
               ${_selectRelationPopulate(compiler, parent, populate, field, true)}
@@ -2097,7 +2119,7 @@ const encodePopulate = (compiler, parent, remix) => {
         parent.filter && compiler._encodeFilter(parent, parent.filter),
         compiler.extraFilter && compiler._encodeFilter(parent, compiler.extraFilter(parent.className)),
     ]);
-    const _populates = _.map(parent.populates, (populate, field) => selectPopulate(compiler, parent, populate, field));
+    const _populates = _.map(parent.populates, (populate, field) => selectPopulate(compiler, parent, populate, field, _.includes(parent.countMatches, field)));
     const _joins = _.compact(_.map(_populates, ({ join }) => join));
     const _includes = _.pickBy(parent.includes, v => index.isPrimitive(v));
     const { joins: _joins2 = [], field: _foreignField = undefined, rows = false, } = parent.foreignField ? encodeForeignField(compiler, {