proto.io 0.0.180 → 0.0.182

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-BgZqiNxF.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B7qz_VeO.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-YpB-hXxf.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

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

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-BgZqiNxF.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B7qz_VeO.js';
+import { P as ProtoService } from '../../internals/index-YpB-hXxf.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.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-BgZqiNxF.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B7qz_VeO.js';
+import { P as ProtoService } from '../../internals/index-YpB-hXxf.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.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, 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-BgZqiNxF.js';
+import { _ as _TValue, 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-YpB-hXxf.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';
@@ -46,17 +46,19 @@ declare class PostgresDriver extends PostgresClientDriver {
     subscribe(channel: string, callback: (payload: _TValue) => void): () => void;
 }
 
-type Populate = {
+type QueryContext = {
     name: string;
-    className: string;
+    className?: string;
+    includes?: Record<string, TSchema.DataType>;
+    populates?: Record<string, Populate>;
+    countMatches?: string[];
+};
+type Populate = Required<QueryContext> & {
     colname: string;
     type: 'pointer' | 'relation';
     foreignField?: string;
     subpaths: string[];
     filter?: QuerySelector;
-    includes: Record<string, TSchema.DataType>;
-    populates: Record<string, Populate>;
-    countMatches: string[];
     sort?: Record<string, 1 | -1> | DecodedSortOption[];
     skip?: number;
     limit?: number;
@@ -81,7 +83,6 @@ declare class QueryCompiler {
         extraFilter?: (className: string) => QuerySelector;
     });
     nextIdx(): number;
-    private _makeContext;
     private _encodeIncludes;
     private _baseSelectQuery;
     private _refetch;
@@ -92,16 +93,9 @@ declare class QueryCompiler {
     private _encodeUpdateAttrs;
     private _encodeObjectAttrs;
     private _encodeCoditionalSelector;
-    _encodeFilter(parent: {
-        className?: string;
-        name: string;
-        populates?: Record<string, Populate>;
-    }, filter: QuerySelector): SQL | undefined;
+    _encodeFilter(parent: QueryContext, filter: QuerySelector): SQL | undefined;
     private _selectIncludes;
-    _encodeSort(sort: Record<string, 1 | -1> | DecodedSortOption[], parent: {
-        className?: string;
-        name: string;
-    }): SQL;
+    _encodeSort(sort: Record<string, 1 | -1> | DecodedSortOption[], parent: QueryContext): SQL;
     private _selectPopulateMap;
     insert(options: InsertOptions, attrs: Record<string, TValue>): SQL;
     insertMany(options: InsertOptions, values: Record<string, TValue>[]): SQL;
@@ -121,34 +115,21 @@ interface SqlDialect {
     encodeType(colname: string, type: TSchema.DataType, value: TValue): SQL;
     decodeType(type: TSchema.Primitive | 'vector', value: any): TValue;
     updateOperation(paths: string[], dataType: TSchema.DataType, operation: TUpdateOp): SQL;
-    selectPopulate(compiler: QueryCompiler, parent: {
+    selectPopulate(compiler: QueryCompiler, parent: QueryContext & {
         className: string;
-        name: string;
     }, populate: Populate, field: string, countMatches: boolean): {
         columns: SQL[];
         join?: SQL;
     };
-    encodeFieldExpression(compiler: QueryCompiler, parent: {
-        className?: string;
-        name: string;
-        populates?: Record<string, Populate>;
-    }, field: string, expr: FieldSelectorExpression): SQL;
-    encodeQueryExpression(compiler: QueryCompiler, parent: {
-        className?: string;
-        name: string;
-    }, expr: QueryExpression): SQL | undefined;
-    encodePopulate(compiler: QueryCompiler, parent: Populate, remix?: {
+    encodeFieldExpression(compiler: QueryCompiler, parent: QueryContext, field: string, expr: FieldSelectorExpression): SQL;
+    encodeQueryExpression(compiler: QueryCompiler, parent: QueryContext, expr: QueryExpression): SQL | undefined;
+    encodePopulate(compiler: QueryCompiler, parent: Populate, remix?: QueryContext & {
         className: string;
-        name: string;
     }): Record<string, SQL>;
-    encodeRelation(compiler: QueryCompiler, parent: {
+    encodeRelation(compiler: QueryCompiler, parent: QueryContext & {
         className: string;
-        name: string;
     }, relatedBy: NonNullable<RelationOptions['relatedBy']>): SQL;
-    encodeSortKey(compiler: QueryCompiler, parent: {
-        className?: string;
-        name: string;
-    }, key: string): SQL;
+    encodeSortKey(compiler: QueryCompiler, parent: QueryContext, key: string): SQL;
     random(opts: {
         weight?: string;
     }): SQL;

package/dist/adapters/storage/progres.js

@@ -210,13 +210,6 @@ class QueryCompiler {
     nextIdx() {
         return this.idx++;
     }
-    _makeContext(query) {
-        const context = this._encodeIncludes(query);
-        return {
-            ...context,
-            sorting: _encodeSorting(context.includes, context.populates, query.sort),
-        };
-    }
     _encodeIncludes(query) {
         const names = {};
         const populates = {};
@@ -270,16 +263,15 @@ class QueryCompiler {
             populate.populates = populates;
             populate.countMatches = countMatches;
         }
-        return { includes: names, populates, countMatches };
+        return { className: query.className, includes: names, populates, countMatches: _.uniq(countMatches) };
     }
     _baseSelectQuery(query, options) {
-        const context = this._makeContext(query);
+        const fetchName = `_fetch_$${query.className.toLowerCase()}`;
+        const context = { ...this._encodeIncludes(query), name: fetchName };
         const _stages = _.mapValues(context.populates, (populate) => this.dialect.encodePopulate(this, populate));
         const stages = _.fromPairs(_.flatMap(_.values(_stages), (p) => _.toPairs(p)));
-        const fetchName = `_fetch_$${query.className.toLowerCase()}`;
-        const parent = { className: query.className, name: fetchName, populates: context.populates };
-        const baseFilter = this._encodeFilter(parent, query.filter);
-        const populates = this._selectPopulateMap(context, query.className, fetchName);
+        const baseFilter = this._encodeFilter(context, query.filter);
+        const populates = this._selectPopulateMap(context);
         const joins = _.compact(_.map(populates, ({ join }) => join));
         const includes = {
             literal: [
@@ -292,12 +284,12 @@ class QueryCompiler {
         const filter = _.compact([
             baseFilter,
             _options?.extraFilter,
-            query.relatedBy && this.dialect.encodeRelation(this, parent, query.relatedBy),
+            query.relatedBy && this.dialect.encodeRelation(this, context, query.relatedBy),
         ]);
         return {
             stages,
             fetchName,
-            context: context,
+            context,
             query: sql `
         SELECT ${_options?.select ? _options?.select : sql `*`} FROM (
           SELECT ${includes}
@@ -314,10 +306,10 @@ class QueryCompiler {
         };
     }
     _refetch(name, query) {
-        const _context = this._encodeIncludes(query);
+        const _context = { ...this._encodeIncludes(query), name };
         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);
+        const _populates = this._selectPopulateMap(_context);
         const _joins = _.compact(_.map(_populates, ({ join }) => join));
         const _includes = {
             literal: [
@@ -432,11 +424,8 @@ class QueryCompiler {
       ${this.dialect.encodeSortKey(this, parent, key)} ${{ literal: order === 1 ? 'ASC' : 'DESC' }}
     `)}`;
     }
-    _selectPopulateMap(context, className, name) {
-        return _.map(context.populates, (populate, field) => this.dialect.selectPopulate(this, {
-            className,
-            name,
-        }, populate, field, _.includes(context.countMatches, field)));
+    _selectPopulateMap(context) {
+        return _.map(context.populates, (populate, field) => this.dialect.selectPopulate(this, context, populate, field, _.includes(context.countMatches, field)));
     }
     insert(options, attrs) {
         const _attrs = _.toPairs({
@@ -444,10 +433,10 @@ class QueryCompiler {
             ...this._encodeObjectAttrs(options.className, attrs),
         });
         const name = `_insert_$${options.className.toLowerCase()}`;
-        const context = this._makeContext(options);
+        const context = { ...this._encodeIncludes(options), name };
         const populates = _.mapValues(context.populates, (populate) => this.dialect.encodePopulate(this, populate));
         const stages = _.fromPairs(_.flatMap(_.values(populates), (p) => _.toPairs(p)));
-        const _populates = this._selectPopulateMap(context, options.className, name);
+        const _populates = this._selectPopulateMap(context);
         const joins = _.compact(_.map(_populates, ({ join }) => join));
         return sql `
       WITH ${{ identifier: name }} AS (
@@ -566,7 +555,7 @@ class QueryCompiler {
     deleteOne(query) {
         return this._modifyQuery({ ...query, limit: 1 }, (fetchName, context) => {
             const name = `_delete_$${query.className.toLowerCase()}`;
-            const populates = this._selectPopulateMap(context, query.className, name);
+            const populates = this._selectPopulateMap({ ...context, name });
             const joins = _.compact(_.map(populates, ({ join }) => join));
             return sql `
           , ${{ identifier: name }} AS (
@@ -576,7 +565,7 @@ class QueryCompiler {
           )
           SELECT ${{
                 literal: [
-                    ...this._selectIncludes(name, context.includes),
+                    ...this._selectIncludes(name, context.includes ?? {}),
                     ..._.flatMap(populates, ({ columns }) => columns),
                 ], separator: ',\n'
             }}
@@ -930,6 +919,7 @@ const fetchElement = (compiler, parent, field) => {
             element,
             dataType: json ? null : dataType,
             relation: {
+                colname,
                 target: dataType.target,
                 populate,
             },
@@ -2179,6 +2169,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         break;
                     return sql `${element} ${nullSafeEqual()} ${{ value: expr.value.objectId }}`;
                 }
+                if (relation && _.includes(parent.countMatches, relation.colname)) {
+                    return sql `${element} ${nullSafeEqual()} ${encodeType(colname, 'number', expr.value)}`;
+                }
                 return sql `${element} ${nullSafeEqual()} ${encodeValue(expr.value)}`;
             }
         case '$ne':
@@ -2192,6 +2185,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         break;
                     return sql `${element} ${nullSafeNotEqual()} ${{ value: expr.value.objectId }}`;
                 }
+                if (relation && _.includes(parent.countMatches, relation.colname)) {
+                    return sql `${element} ${nullSafeNotEqual()} ${encodeType(colname, 'number', expr.value)}`;
+                }
                 return sql `${element} ${nullSafeNotEqual()} ${encodeValue(expr.value)}`;
             }
         case '$gt':
@@ -2235,6 +2231,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 else if (!_.isString(dataType) && dataType?.type === 'pointer' && expr.value instanceof index.TObject && expr.value.objectId) {
                     return sql `${element} ${{ literal: op }} ${{ value: expr.value.objectId }}`;
                 }
+                else if (relation && _.includes(parent.countMatches, relation.colname)) {
+                    return sql `${element} ${{ literal: op }} ${encodeType(colname, 'number', expr.value)}`;
+                }
                 else if (!dataType) {
                     if (expr.value instanceof Decimal || _.isNumber(expr.value)) {
                         return sql `(
@@ -2425,6 +2424,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 if (dataType && index._isTypeof(dataType, 'string')) {
                     return sql `COALESCE(length(${element}), 0) = ${{ value: expr.value }}`;
                 }
+                if (relation && _.includes(parent.countMatches, relation.colname)) {
+                    return sql `${element} = ${{ value: expr.value }}`;
+                }
                 if (dataType && index._isTypeof(dataType, ['array', 'string[]', 'vector', 'relation'])) {
                     return sql `COALESCE(array_length(${element}, 1), 0) = ${{ value: expr.value }}`;
                 }
@@ -2446,6 +2448,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 if (dataType && index._isTypeof(dataType, 'string')) {
                     return sql `COALESCE(length(${element}), 0) ${{ literal: expr.value ? '=' : '<>' }} 0`;
                 }
+                if (relation && _.includes(parent.countMatches, relation.colname)) {
+                    return sql `${element} ${{ literal: expr.value ? '=' : '<>' }} 0`;
+                }
                 if (dataType && index._isTypeof(dataType, ['array', 'string[]', 'vector', 'relation'])) {
                     return sql `COALESCE(array_length(${element}, 1), 0) ${{ literal: expr.value ? '=' : '<>' }} 0`;
                 }