proto.io 0.0.213 → 0.0.215

package/dist/adapters/file/aliyun-oss.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoService } from '../../internals/index-Boxwkqe0.js';
+import { P as ProtoService } from '../../internals/index-YLrO0f2D.js';
 import OSS from 'ali-oss';
-import { a as FileStorageOptions } from '../../internals/base-CZGalGrd.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-BsT9SYny.js';
+import { a as FileStorageOptions } from '../../internals/base-Cp5le5dC.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk--Vo2-p-z.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-Boxwkqe0.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-CZGalGrd.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-YLrO0f2D.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-Cp5le5dC.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _ = require('lodash');
 var base = require('../../internals/base-NsJYo2MG.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('../../internals/index-D8O7SinR.js');
+var validator = require('../../internals/validator-m6wY35c6.js');
 require('util');
 require('zlib');
 require('../../internals/private-Ciddhure.js');
@@ -101,7 +101,7 @@ class DatabaseFileStorage extends base.FileStorageBase {
     async destroy(proto, token) {
         proto.storage.delete({
             className: '_FileChunk',
-            filter: index.QuerySelector.decode({ token: { $eq: token } }),
+            filter: validator.QuerySelector.decode({ token: { $eq: token } }),
             includes: ['_id'],
             matches: {},
             groupMatches: {},

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 - 2025 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, end?: number) {\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.delete({\n      className: '_FileChunk',\n      filter: QuerySelector.decode({ token: { $eq: token } }),\n      includes: ['_id'],\n      matches: {},\n      groupMatches: {},\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 - 2025 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, end?: number) {\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.delete({\n      className: '_FileChunk',\n      filter: QuerySelector.decode({ token: { $eq: token } }),\n      includes: ['_id'],\n      matches: {},\n      groupMatches: {},\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

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { F as FileStorageBase } from '../../internals/base-DYc1_peK.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
-import { Q as QuerySelector } from '../../internals/index-DG9HHO_U.mjs';
+import { b as QuerySelector } from '../../internals/validator-ChrCrz_C.mjs';
 import 'util';
 import 'zlib';
 import '../../internals/private-CNw40LZ7.mjs';

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

@@ -1,6 +1,6 @@
-import { P as ProtoService } from '../../internals/index-Boxwkqe0.js';
-import { a as FileStorageOptions } from '../../internals/base-CZGalGrd.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-BsT9SYny.js';
+import { P as ProtoService } from '../../internals/index-YLrO0f2D.js';
+import { a as FileStorageOptions } from '../../internals/base-Cp5le5dC.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk--Vo2-p-z.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

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

@@ -1,8 +1,8 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { File, Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-Boxwkqe0.js';
-import { a as FileStorageOptions } from '../../internals/base-CZGalGrd.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-BsT9SYny.js';
+import { P as ProtoService } from '../../internals/index-YLrO0f2D.js';
+import { a as FileStorageOptions } from '../../internals/base-Cp5le5dC.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk--Vo2-p-z.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 { a as TValueWithoutObject, T as TSchema, u as TValueWithUndefined, v as TValue, w as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, x as QueryAccumulator, y as QuerySelector, z as DecodedSortOption, A as DecodedQuery, B as FindOptions, I as InsertOptions, C as TStorage, G as TransactionOptions, j as TObject, H as TQueryRandomOptions, J as TPubSub } from '../../internals/index-Boxwkqe0.js';
+import { a as TValueWithoutObject, T as TSchema, u as TValueWithUndefined, v as TValue, w as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, x as QueryAccumulator, y as QuerySelector, z as DecodedSortOption, A as DecodedQuery, B as FindOptions, I as InsertOptions, C as TStorage, G as TransactionOptions, j as TObject, H as TQueryRandomOptions, J as TPubSub } from '../../internals/index-YLrO0f2D.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.js

@@ -9,10 +9,10 @@ var QueryStream = require('pg-query-stream');
 var utilsJs = require('@o2ter/utils-js');
 var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
-var index$1 = require('../../internals/index-D8O7SinR.js');
+var validator = require('../../internals/validator-m6wY35c6.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-DzvxbWAc.js');
 var _const = require('../../internals/const-C3I6cfav.js');
+var random$1 = require('../../internals/random-nkOQ9U6S.js');
 var _private = require('../../internals/private-Ciddhure.js');
 
 //
@@ -220,7 +220,7 @@ class QueryCompiler {
         const populates = {};
         const groupMatches = {};
         for (const include of query.includes) {
-            const { paths: [colname, ...subpath], dataType } = random$1.resolveColumn(this.schema, query.className, include);
+            const { paths: [colname, ...subpath], dataType } = validator.resolveColumn(this.schema, query.className, include);
             names[colname] = dataType;
             if (index.isRelation(dataType) && !_.isNil(query.groupMatches[colname]))
                 groupMatches[colname] = query.groupMatches[colname];
@@ -239,7 +239,7 @@ class QueryCompiler {
                     colname,
                 };
                 if (index.isRelation(dataType) && dataType.foreignField) {
-                    const targetType = random$1.resolveDataType(this.schema, dataType.target, dataType.foreignField);
+                    const targetType = validator.resolveDataType(this.schema, dataType.target, dataType.foreignField);
                     if (_.isNil(targetType))
                         throw Error(`Invalid path: ${include}`);
                     if (!index.isPointer(targetType) && !index.isRelation(targetType))
@@ -359,7 +359,7 @@ class QueryCompiler {
             sql `_updated_at = NOW()`,
         ];
         for (const [path, op] of _.toPairs(attrs)) {
-            const { paths: [column, ...subpath], dataType } = random$1.resolveColumn(this.schema, className, path);
+            const { paths: [column, ...subpath], dataType } = validator.resolveColumn(this.schema, className, path);
             if (index.isShape(dataType)) {
                 const [_op, value] = index.decodeUpdateOp(op);
                 if (_op !== '$set')
@@ -379,7 +379,7 @@ class QueryCompiler {
     _encodeObjectAttrs(className, attrs) {
         const result = {};
         for (const [key, value] of _.toPairs(attrs)) {
-            const { paths: [column, ...subpath], dataType } = random$1.resolveColumn(this.schema, className, key);
+            const { paths: [column, ...subpath], dataType } = validator.resolveColumn(this.schema, className, key);
             if (!_.isEmpty(subpath))
                 throw Error(`Invalid insert key: ${key}`);
             if (index.isShape(dataType)) {
@@ -406,13 +406,13 @@ class QueryCompiler {
         }
     }
     _encodeFilter(parent, filter) {
-        if (filter instanceof index$1.QueryCoditionalSelector) {
+        if (filter instanceof validator.QueryCoditionalSelector) {
             return this._encodeCoditionalSelector(parent, filter);
         }
-        if (filter instanceof index$1.QueryFieldSelector) {
+        if (filter instanceof validator.QueryFieldSelector) {
             return this.dialect.encodeFieldExpression(this, parent, filter.field, filter.expr);
         }
-        if (filter instanceof index$1.QueryExpressionSelector) {
+        if (filter instanceof validator.QueryExpressionSelector) {
             return this.dialect.encodeQueryExpression(this, parent, filter.expr);
         }
     }
@@ -672,14 +672,19 @@ class SqlStorage {
         const count = parseInt(_count);
         return _.isFinite(count) ? count : 0;
     }
-    _matchesType(options) {
+    _matchesType(compiler, options) {
         const types = {};
         for (const [key, match] of _.entries(options.matches)) {
-            types[key] = this._matchesType(match);
+            const type = validator.resolveDataType(compiler.schema, options.className, key);
+            if (_.isNil(type))
+                continue;
+            if (index.isPointer(type) || index.isRelation(type)) {
+                types[key] = this._matchesType(compiler, { className: type.target, ...match });
+            }
         }
         for (const [key, group] of _.entries(options.groupMatches)) {
             for (const [field, expr] of _.entries(group)) {
-                _.set(types, `${key}.${field}`, random$1.accumulatorKeyTypes[expr.type]);
+                _.set(types, `${key}.${field}`, expr.evalType(compiler.schema, options.className));
             }
         }
         return types;
@@ -687,24 +692,26 @@ class SqlStorage {
     find(query) {
         const self = this;
         const compiler = self._makeCompiler(false, query.extraFilter);
+        const _matchesType = self._matchesType(compiler, query);
         const _query = compiler._selectQuery(query);
         return (async function* () {
             const objects = self.query(_query);
             for await (const object of objects) {
-                yield self._decodeObject(query.className, object, self._matchesType(query));
+                yield self._decodeObject(query.className, object, _matchesType);
             }
         })();
     }
     random(query, opts) {
         const self = this;
         const compiler = self._makeCompiler(false, query.extraFilter);
+        const _matchesType = self._matchesType(compiler, query);
         const _query = compiler._selectQuery({ ...query, sort: {} }, {
             sort: sql `ORDER BY ${self.dialect.random(opts ?? {})}`,
         });
         return (async function* () {
             const objects = self.query(_query);
             for await (const object of objects) {
-                yield self._decodeObject(query.className, object, self._matchesType(query));
+                yield self._decodeObject(query.className, object, _matchesType);
             }
         })();
     }
@@ -725,6 +732,7 @@ class SqlStorage {
     nonrefs(query) {
         const self = this;
         const compiler = self._makeCompiler(false, query.extraFilter);
+        const _matchesType = self._matchesType(compiler, query);
         const _query = compiler._selectQuery(query, ({ fetchName }) => ({
             extraFilter: sql `
         NOT EXISTS (${this._refs(this.schema, query.className, ['_id'], sql `(${{ quote: query.className + '$' }} || ${{ identifier: fetchName }}.${{ identifier: '_id' }})`)})
@@ -733,29 +741,33 @@ class SqlStorage {
         return (async function* () {
             const objects = self.query(_query);
             for await (const object of objects) {
-                yield self._decodeObject(query.className, object, self._matchesType(query));
+                yield self._decodeObject(query.className, object, _matchesType);
             }
         })();
     }
     async insert(options, values) {
         const compiler = this._makeCompiler(true);
+        const _matchesType = this._matchesType(compiler, options);
         const result = await this.query(compiler.insert(options, values));
-        return _.map(result, x => this._decodeObject(options.className, x, this._matchesType(options)));
+        return _.map(result, x => this._decodeObject(options.className, x, _matchesType));
     }
     async update(query, update) {
         const compiler = this._makeCompiler(true, query.extraFilter);
+        const _matchesType = this._matchesType(compiler, query);
         const updated = await this.query(compiler.update(query, update));
-        return _.map(updated, x => this._decodeObject(query.className, x, this._matchesType(query)));
+        return _.map(updated, x => this._decodeObject(query.className, x, _matchesType));
     }
     async upsert(query, update, setOnInsert) {
         const compiler = this._makeCompiler(true, query.extraFilter);
+        const _matchesType = this._matchesType(compiler, query);
         const upserted = await this.query(compiler.upsert(query, update, setOnInsert));
-        return _.map(upserted, x => this._decodeObject(query.className, x, this._matchesType(query)));
+        return _.map(upserted, x => this._decodeObject(query.className, x, _matchesType));
     }
     async delete(query) {
         const compiler = this._makeCompiler(true, query.extraFilter);
+        const _matchesType = this._matchesType(compiler, query);
         const deleted = await this.query(compiler.delete(query));
-        return _.map(deleted, x => this._decodeObject(query.className, x, this._matchesType(query)));
+        return _.map(deleted, x => this._decodeObject(query.className, x, _matchesType));
     }
 }
 
@@ -783,7 +795,7 @@ class SqlStorage {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
-const _fetchElement = (parent, colname, subpath, dataType) => {
+const _fetchElement = (compiler, parent, colname, subpath, dataType) => {
     const element = sql `${{ identifier: parent.name }}.${{ identifier: parent.name.startsWith('_doller_expr_$') ? '$' : colname }}`;
     if (!parent.className) {
         if (colname !== '$') {
@@ -806,7 +818,7 @@ const _fetchElement = (parent, colname, subpath, dataType) => {
             return {
                 element: sql `${{ identifier: parent.name }}.${{ identifier: `${colname}.${subpath[0]}` }}`,
                 json: false,
-                dataType: random$1.accumulatorKeyTypes[match.type],
+                dataType: match.evalType(compiler.schema, dataType.target),
             };
         }
         else if (dataType && index._isTypeof(dataType, ['array', 'string[]', 'relation'])) {
@@ -831,7 +843,7 @@ const _fetchElement = (parent, colname, subpath, dataType) => {
     return { element, json: false };
 };
 const resolvePaths = (compiler, className, paths) => {
-    const { paths: [colname, ...subpath], dataType } = random$1.resolveColumn(compiler.schema, className, paths.join('.'));
+    const { paths: [colname, ...subpath], dataType } = validator.resolveColumn(compiler.schema, className, paths.join('.'));
     if (!_.isEmpty(subpath) && index.isVector(dataType)) {
         if (subpath.length !== 1)
             throw Error(`Invalid key: ${paths.join('.')}`);
@@ -848,7 +860,7 @@ const resolvePaths = (compiler, className, paths) => {
         return { ...resolved, colname: `${colname}.${resolved.colname}` };
     }
     const digit = _.first(subpath);
-    if (!_.isEmpty(subpath) && index.isRelation(dataType) && digit?.match(random$1.QueryValidator.patterns.digits)) {
+    if (!_.isEmpty(subpath) && index.isRelation(dataType) && digit?.match(validator.QueryValidator.patterns.digits)) {
         const resolved = resolvePaths(compiler, dataType.target, _.slice(subpath, 1));
         return { dataType, colname, subpath: [digit, resolved.colname, ...resolved.subpath] };
     }
@@ -869,7 +881,7 @@ const _resolvePopulate = (path, populates) => {
 const fetchElement = (compiler, parent, field) => {
     if (parent.className) {
         const { dataType, colname, subpath } = resolvePaths(compiler, parent.className, _.toPath(field));
-        const { element, json, dataType: _dataType } = _fetchElement(parent, colname, subpath, dataType);
+        const { element, json, dataType: _dataType } = _fetchElement(compiler, parent, colname, subpath, dataType);
         if (index.isPointer(dataType))
             return { element: sql `${{ identifier: parent.name }}.${{ identifier: `${colname}._id` }}`, dataType };
         const populate = index.isRelation(dataType) && _resolvePopulate(_.toPath(colname), parent.populates);
@@ -901,7 +913,7 @@ const fetchElement = (compiler, parent, field) => {
         }
     }
     const [colname, ...subpath] = _.toPath(field);
-    const { element } = _fetchElement(parent, colname, subpath);
+    const { element } = _fetchElement(compiler, parent, colname, subpath);
     return { element, dataType: null, relation: null };
 };
 
@@ -1664,36 +1676,48 @@ const updateOperation = (paths, dataType, operation) => {
 //  THE SOFTWARE.
 //
 const isArrayExpression = (expr) => {
-    if (expr instanceof index$1.QueryArrayExpression)
+    if (expr instanceof validator.QueryArrayExpression)
         return true;
-    if (expr instanceof index$1.QueryValueExpression)
+    if (expr instanceof validator.QueryValueExpression)
         return _.isArray(expr.value);
     return false;
 };
 const arrayLength = (expr) => {
-    if (expr instanceof index$1.QueryArrayExpression)
+    if (expr instanceof validator.QueryArrayExpression)
         return expr.exprs.length;
-    if (expr instanceof index$1.QueryValueExpression)
+    if (expr instanceof validator.QueryValueExpression)
         return _.isArray(expr.value) ? expr.value.length : 0;
     return 0;
 };
 const mapExpression = (expr, callback) => {
-    if (expr instanceof index$1.QueryArrayExpression)
+    if (expr instanceof validator.QueryArrayExpression)
         return _.map(expr.exprs, x => callback(x));
-    if (expr instanceof index$1.QueryValueExpression)
-        return _.isArray(expr.value) ? _.map(expr.value, x => callback(new index$1.QueryValueExpression(x))) : [];
+    if (expr instanceof validator.QueryValueExpression)
+        return _.isArray(expr.value) ? _.map(expr.value, x => callback(new validator.QueryValueExpression(x))) : [];
     return [];
 };
 const _PrimitiveValue = ['boolean', 'number', 'decimal', 'string', 'date'];
 const encodeTypedQueryExpression = (compiler, parent, expr) => {
-    if (expr instanceof index$1.QueryKeyExpression) {
+    if (expr instanceof validator.QueryKeyExpression) {
         const { element, dataType } = fetchElement(compiler, parent, expr.key);
         const _dataType = dataType ? index._typeof(dataType) : null;
-        if (_dataType && _PrimitiveValue.includes(_dataType)) {
+        if (_dataType === 'number') {
+            return [
+                { type: 'number', sql: element },
+                { type: 'decimal', sql: sql `CAST((${element}) AS DECIMAL)` },
+            ];
+        }
+        else if (_dataType === 'decimal') {
+            return [
+                { type: 'decimal', sql: element },
+                { type: 'number', sql: element },
+            ];
+        }
+        else if (_dataType && _PrimitiveValue.includes(_dataType)) {
             return [{ type: _dataType, sql: element }];
         }
     }
-    if (expr instanceof index$1.QueryValueExpression) {
+    if (expr instanceof validator.QueryValueExpression) {
         if (_.isBoolean(expr.value))
             return [{ type: 'boolean', sql: sql `${{ value: expr.value }}` }];
         if (_.isNumber(expr.value))
@@ -1711,20 +1735,20 @@ const encodeTypedQueryExpression = (compiler, parent, expr) => {
         if (_.isDate(expr.value))
             return [{ type: 'date', sql: sql `${{ value: expr.value }}` }];
     }
-    if (expr instanceof index$1.QueryCoditionalExpression ||
-        expr instanceof index$1.QueryComparisonExpression ||
-        expr instanceof index$1.QueryNotExpression) {
+    if (expr instanceof validator.QueryCoditionalExpression ||
+        expr instanceof validator.QueryComparisonExpression ||
+        expr instanceof validator.QueryNotExpression) {
         const value = encodeBooleanExpression(compiler, parent, expr);
         if (value)
             return [{ type: 'boolean', sql: value }];
     }
-    if (expr instanceof index$1.QueryDistanceExpression) {
+    if (expr instanceof validator.QueryDistanceExpression) {
         const value = encodeDistanceQueryExpression(compiler, parent, expr);
         return [{ type: 'number', sql: value }];
     }
 };
 const encodeJsonQueryExpression = (compiler, parent, expr) => {
-    if (expr instanceof index$1.QueryKeyExpression) {
+    if (expr instanceof validator.QueryKeyExpression) {
         const { element, dataType } = fetchElement(compiler, parent, expr.key);
         if (dataType && index.isPrimitive(dataType)) {
             switch (index._typeof(dataType)) {
@@ -1740,10 +1764,10 @@ const encodeJsonQueryExpression = (compiler, parent, expr) => {
         }
         return sql `${element}`;
     }
-    if (expr instanceof index$1.QueryValueExpression) {
+    if (expr instanceof validator.QueryValueExpression) {
         return _encodeJsonValue(index._encodeValue(expr.value));
     }
-    if (expr instanceof index$1.QueryArrayExpression) {
+    if (expr instanceof validator.QueryArrayExpression) {
         return sql `jsonb_build_array(${_.map(expr.exprs, x => encodeJsonQueryExpression(compiler, parent, x))})`;
     }
     const value = encodeQueryExpression(compiler, parent, expr);
@@ -1754,13 +1778,13 @@ const encodeJsonQueryExpression = (compiler, parent, expr) => {
 const encodeVectorExpression = (compiler, parent, exprs) => {
     if (exprs.length === 1) {
         const [expr] = exprs;
-        if (expr instanceof index$1.QueryKeyExpression) {
+        if (expr instanceof validator.QueryKeyExpression) {
             const { element, dataType } = fetchElement(compiler, parent, expr.key);
             if (!dataType || !index.isVector(dataType))
                 throw Error('Invalid expression');
             return { sql: element, dimension: dataType.dimension };
         }
-        if (expr instanceof index$1.QueryValueExpression) {
+        if (expr instanceof validator.QueryValueExpression) {
             if (!_.isArray(expr.value) || !_.every(expr.value, x => _.isFinite(x)))
                 throw Error('Invalid expression');
             return { sql: sql `${{ value: expr.value }}::DOUBLE PRECISION[]`, dimension: expr.value.length };
@@ -1799,7 +1823,7 @@ const matchType = (first, second) => {
     return found ? [found, _.find(second, r => r.type === found.type)] : undefined;
 };
 const encodeBooleanExpression = (compiler, parent, expr) => {
-    if (expr instanceof index$1.QueryCoditionalExpression) {
+    if (expr instanceof validator.QueryCoditionalExpression) {
         const queries = _.compact(_.map(expr.exprs, x => encodeBooleanExpression(compiler, parent, x)));
         if (_.isEmpty(queries))
             return;
@@ -1809,7 +1833,7 @@ const encodeBooleanExpression = (compiler, parent, expr) => {
             case '$or': return sql `(${{ literal: _.map(queries, x => sql `(${x})`), separator: ' OR ' }})`;
         }
     }
-    if (expr instanceof index$1.QueryComparisonExpression) {
+    if (expr instanceof validator.QueryComparisonExpression) {
         const operatorMap = {
             '$eq': nullSafeEqual(),
             '$ne': nullSafeNotEqual(),
@@ -1840,14 +1864,14 @@ const encodeBooleanExpression = (compiler, parent, expr) => {
         const _right2 = encodeJsonQueryExpression(compiler, parent, expr.right);
         return sql `${_left2} ${operatorMap[expr.type]} ${_right2}`;
     }
-    if (expr instanceof index$1.QueryNotExpression) {
+    if (expr instanceof validator.QueryNotExpression) {
         const _expr = encodeBooleanExpression(compiler, parent, expr.expr);
         return _expr ? sql `NOT (${_expr})` : undefined;
     }
     throw Error('Invalid expression');
 };
 const encodeQueryExpression = (compiler, parent, expr) => {
-    if (expr instanceof index$1.QueryDistanceExpression) {
+    if (expr instanceof validator.QueryDistanceExpression) {
         return encodeDistanceQueryExpression(compiler, parent, expr);
     }
     return encodeBooleanExpression(compiler, parent, expr);
@@ -1954,39 +1978,66 @@ const selectPopulate = (compiler, parent, populate, field) => {
             sql `${{ identifier: parent.name }}.${{ identifier: field }} AS ${{ identifier: `$${field}` }}`,
         ];
         if (!_.isEmpty(groupMatches?.[field])) {
-            for (const [key, { type, expr }] of _.entries(groupMatches[field])) {
-                switch (type) {
-                    case '$count':
-                        columns.push(sql `
-              (
-                SELECT COUNT(*) FROM (
-                  ${_selectRelationPopulate(compiler, parent, populate, field, false)}
-                ) ${{ identifier: populate.name }}
-              ) AS ${{ identifier: `${field}.${key}` }}
-            `);
-                        break;
-                    case '$avg':
-                    case '$sum':
-                        {
-                            const op = {
-                                '$avg': 'AVG',
-                                '$sum': 'SUM',
-                            }[type];
-                            if (!expr)
-                                throw Error('Invalid expression');
-                            const exprs = encodeTypedQueryExpression(compiler, populate, expr);
-                            const { sql: value } = (_.includes(['$avg'], type) ? _.find(exprs, e => e.type === 'number') : _.first(exprs)) ?? {};
-                            if (!value)
-                                throw Error('Invalid expression');
+            for (const [key, expr] of _.entries(groupMatches[field])) {
+                if (expr instanceof validator.QueryNoParamAccumulator) {
+                    switch (expr.type) {
+                        case '$count':
                             columns.push(sql `
                 (
-                  SELECT ${{ literal: op }}(${value}) FROM (
+                  SELECT COUNT(*) FROM (
                     ${_selectRelationPopulate(compiler, parent, populate, field, false)}
                   ) ${{ identifier: populate.name }}
                 ) AS ${{ identifier: `${field}.${key}` }}
               `);
-                        }
-                        break;
+                            break;
+                    }
+                }
+                else if (expr instanceof validator.QueryExprAccumulator) {
+                    const op = {
+                        '$max': 'MAX',
+                        '$min': 'MIN',
+                        '$avg': 'AVG',
+                        '$sum': 'SUM',
+                        '$stdDevPop': 'STDDEV_POP',
+                        '$stdDevSamp': 'STDDEV_SAMP',
+                        '$varPop': 'VAR_POP',
+                        '$varSamp': 'VAR_SAMP',
+                    }[expr.type];
+                    if (!expr.expr)
+                        throw Error('Invalid expression');
+                    const exprs = encodeTypedQueryExpression(compiler, populate, expr.expr);
+                    const value = _.first(exprs)?.sql;
+                    if (!value)
+                        throw Error('Invalid expression');
+                    columns.push(sql `
+            (
+              SELECT ${{ literal: op }}(${value}) FROM (
+                ${_selectRelationPopulate(compiler, parent, populate, field, false)}
+              ) ${{ identifier: populate.name }}
+            ) AS ${{ identifier: `${field}.${key}` }}
+          `);
+                }
+                else if (expr instanceof validator.QueryPercentileAccumulator) {
+                    const op = {
+                        'discrete': 'PERCENTILE_DISC',
+                        'continuous': 'PERCENTILE_CONT',
+                    }[expr.mode];
+                    if (!expr.input)
+                        throw Error('Invalid expression');
+                    const exprs = encodeTypedQueryExpression(compiler, populate, expr.input);
+                    const value = _.first(exprs)?.sql;
+                    if (!value)
+                        throw Error('Invalid expression');
+                    columns.push(sql `
+            (
+              SELECT ${{ literal: op }}(${{ value: expr.p }}) WITHIN GROUP (ORDER BY (${value})) FROM (
+                ${_selectRelationPopulate(compiler, parent, populate, field, false)}
+              ) ${{ identifier: populate.name }}
+            ) AS ${{ identifier: `${field}.${key}` }}
+          `);
+                }
+                else {
+                    throw Error('Invalid expression');
                 }
             }
         }
@@ -2021,7 +2072,7 @@ const encodeRemix = (parent, remix) => sql `${remix?.className === parent.classN
   (SELECT * FROM ${{ identifier: remix.name }} UNION SELECT * FROM ${{ identifier: parent.className }})
 ` : { identifier: parent.className }}`;
 const encodeForeignField = (compiler, parent, foreignField, remix) => {
-    const { paths: [colname, ...subpath], dataType } = random$1.resolveColumn(compiler.schema, parent.className, foreignField);
+    const { paths: [colname, ...subpath], dataType } = validator.resolveColumn(compiler.schema, parent.className, foreignField);
     const tempName = `_populate_$${compiler.nextIdx()}`;
     const _local = (field) => sql `${{ identifier: parent.name }}.${{ identifier: field }}`;
     const _foreign = (field) => sql `${{ identifier: tempName }}.${{ identifier: field }}`;
@@ -2152,7 +2203,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
     switch (expr.type) {
         case '$eq':
             {
-                if (_.isRegExp(expr.value) || expr.value instanceof index$1.QuerySelector || expr.value instanceof index$1.FieldSelectorExpression)
+                if (_.isRegExp(expr.value) || expr.value instanceof validator.QuerySelector || expr.value instanceof validator.FieldSelectorExpression)
                     break;
                 if (_.isNil(expr.value))
                     return sql `${element} IS NULL`;
@@ -2165,7 +2216,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
             }
         case '$ne':
             {
-                if (_.isRegExp(expr.value) || expr.value instanceof index$1.QuerySelector || expr.value instanceof index$1.FieldSelectorExpression)
+                if (_.isRegExp(expr.value) || expr.value instanceof validator.QuerySelector || expr.value instanceof validator.FieldSelectorExpression)
                     break;
                 if (_.isNil(expr.value))
                     return sql `${element} IS NOT NULL`;
@@ -2187,7 +2238,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     '$lt': '<',
                     '$lte': '<=',
                 }[expr.type];
-                if (_.isRegExp(expr.value) || expr.value instanceof index$1.QuerySelector || expr.value instanceof index$1.FieldSelectorExpression)
+                if (_.isRegExp(expr.value) || expr.value instanceof validator.QuerySelector || expr.value instanceof validator.FieldSelectorExpression)
                     break;
                 if (dataType && index.isPrimitive(dataType)) {
                     switch (index._typeof(dataType)) {
@@ -2348,7 +2399,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
             break;
         case '$not':
             {
-                if (!(expr.value instanceof index$1.FieldSelectorExpression))
+                if (!(expr.value instanceof validator.FieldSelectorExpression))
                     break;
                 return sql `NOT (${encodeFieldExpression(compiler, parent, field, expr.value)})`;
             }
@@ -2454,7 +2505,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
             break;
         case '$every':
             {
-                if (!(expr.value instanceof index$1.QuerySelector))
+                if (!(expr.value instanceof validator.QuerySelector))
                     break;
                 if (relation && parent.className) {
                     const tempName = `_populate_expr_$${compiler.nextIdx()}`;
@@ -2507,7 +2558,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
             break;
         case '$some':
             {
-                if (!(expr.value instanceof index$1.QuerySelector))
+                if (!(expr.value instanceof validator.QuerySelector))
                     break;
                 if (relation && parent.className) {
                     const tempName = `_populate_expr_$${compiler.nextIdx()}`;