proto.io 0.0.180 → 0.0.182

package/dist/adapters/storage/progres.mjs

@@ -206,13 +206,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 = {};
@@ -266,16 +259,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: [
@@ -288,12 +280,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}
@@ -310,10 +302,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: [
@@ -428,11 +420,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({
@@ -440,10 +429,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 (
@@ -562,7 +551,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 (
@@ -572,7 +561,7 @@ class QueryCompiler {
           )
           SELECT ${{
                 literal: [
-                    ...this._selectIncludes(name, context.includes),
+                    ...this._selectIncludes(name, context.includes ?? {}),
                     ..._.flatMap(populates, ({ columns }) => columns),
                 ], separator: ',\n'
             }}
@@ -926,6 +915,7 @@ const fetchElement = (compiler, parent, field) => {
             element,
             dataType: json ? null : dataType,
             relation: {
+                colname,
                 target: dataType.target,
                 populate,
             },
@@ -2175,6 +2165,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':
@@ -2188,6 +2181,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':
@@ -2231,6 +2227,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 else if (!_.isString(dataType) && dataType?.type === 'pointer' && expr.value instanceof 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 `(
@@ -2421,6 +2420,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 if (dataType && _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 && _isTypeof(dataType, ['array', 'string[]', 'vector', 'relation'])) {
                     return sql `COALESCE(array_length(${element}, 1), 0) = ${{ value: expr.value }}`;
                 }
@@ -2442,6 +2444,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 if (dataType && _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 && _isTypeof(dataType, ['array', 'string[]', 'vector', 'relation'])) {
                     return sql `COALESCE(array_length(${element}, 1), 0) ${{ literal: expr.value ? '=' : '<>' }} 0`;
                 }