npm - cruddl - Versions diffs - 4.2.3 → 5.0.0-0.deploytest.0 - Mend

cruddl 4.2.3 → 5.0.0-0.deploytest.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

package/dist/src/query-tree/queries.d.ts CHANGED Viewed

@@ -2,6 +2,8 @@ import { Field, RelationSide, RootEntityType } from '../model';
 import { FieldSegment, RelationSegment } from '../model/implementation/collect-path';
 import { QueryNode } from './base';
 import { EntitiesIdentifierKind } from './mutations';
+import { VariableQueryNode } from './variables';
+import { OrderSpecification } from './lists';
 export declare class EntityFromIdQueryNode extends QueryNode {
     readonly rootEntityType: RootEntityType;
     readonly idNode: QueryNode;
@@ -88,14 +90,63 @@ export declare class FollowEdgeQueryNode extends QueryNode {
     constructor(relationSide: RelationSide, sourceEntityNode: QueryNode);
     describe(): string;
 }
-interface TraversalQueryNodeParams {
+export interface TraversalQueryNodeParams {
     readonly entitiesIdentifierKind?: EntitiesIdentifierKind;
     readonly sourceEntityNode: QueryNode;
-    readonly sourceIsList?: boolean;
-    readonly alwaysProduceList?: boolean;
     readonly relationSegments: ReadonlyArray<RelationSegment>;
     readonly fieldSegments: ReadonlyArray<FieldSegment>;
-    readonly captureRootEntities: boolean;
+    /**
+     * Specifies if sourceEntityNode resolves to a list of entities instead of a single entity
+     */
+    readonly sourceIsList?: boolean;
+    /**
+     * Specifies if the result should be a list of one value if the path results in a single object instead of a list
+     *
+     * Only supported if fieldSegments is empty
+     */
+    readonly alwaysProduceList?: boolean;
+    /**
+     * If true and this traversal results in a list, NULL values will be preserved in the list
+     *
+     * Note: this only exists for aggregations, so it might not work in every case
+     *
+     * @default false
+     */
+    readonly preserveNullValues?: boolean;
+    /**
+     * An optional transformation (map) to apply on the traversal result
+     */
+    readonly innerNode?: QueryNode;
+    /**
+     * The variable under which each item will be available in the innerNode
+     */
+    readonly itemVariable?: VariableQueryNode;
+    /**
+     * The variable under which the root entity (result after relation traversal, but before child entity traversals)
+     * will be available in the innerNode
+     */
+    readonly rootEntityVariable?: VariableQueryNode;
+    /**
+     * An optional filter that is applied on the resulting items of the traversal
+     *
+     * Don't access rootEntityVariable here (if we need that, we should add a rootFilterNode that is
+     * applied after the relation traversal but before the field traversal)
+     */
+    readonly filterNode?: QueryNode;
+    /**
+     * An optional filter that is applied on the resulting items of the traversal
+     *
+     * Both item and root can be accessed here
+     */
+    readonly orderBy?: OrderSpecification;
+    /**
+     * Number of items to skip at the start
+     */
+    readonly skip?: number;
+    /**
+     * Maximum number of items to return
+     */
+    readonly maxCount?: number;
 }
 /**
  * Traverses a path of relations and other fields
@@ -105,17 +156,61 @@ export declare class TraversalQueryNode extends QueryNode {
     readonly sourceEntityNode: QueryNode;
     readonly relationSegments: ReadonlyArray<RelationSegment>;
     readonly fieldSegments: ReadonlyArray<FieldSegment>;
-    readonly captureRootEntity: boolean;
     /**
      * Specifies if sourceEntityNode resolves to a list of entities instead of a single entity
      */
     readonly sourceIsList: boolean;
     /**
-     * Specifies if the result should be a list one value if the path results in a single object instead of a list
+     * Specifies if the result should be a list of one value if the path results in a single object instead of a list
+     *
+     * Only supported if fieldSegments is empty
      */
     readonly alwaysProduceList: boolean;
+    /**
+     * True if either alwaysProduceList is true or there is at least one list segment
+     */
+    readonly resultIsList: boolean;
+    /**
+     * If true and this traversal results in a list, NULL values will be preserved in the list
+     *
+     * Note: this only exists for aggregations, so it might not work in every case
+     */
+    readonly preserveNullValues: boolean;
+    /**
+     * An optional transformation (map) to apply on the traversal result
+     */
+    readonly innerNode?: QueryNode;
+    /**
+     * An optional filter that is applied on the resulting items of the traversal
+     *
+     * Don't access rootEntityVariable here (if we need that, we should add a rootFilterNode that is
+     * applied after the relation traversal but before the field traversal)
+     */
+    readonly filterNode?: QueryNode;
+    /**
+     * An optional filter that is applied on the resulting items of the traversal
+     *
+     * Both item and root can be accessed here
+     */
+    readonly orderBy: OrderSpecification;
+    /**
+     * The variable under which each item will be available in the innerNode
+     */
+    readonly itemVariable: VariableQueryNode;
+    /**
+     * The variable under which the root entity (result after relation traversal, but before child entity traversals)
+     * will be available in the innerNode
+     */
+    readonly rootEntityVariable: VariableQueryNode;
+    /**
+     * Number of items to skip at the start
+     */
+    readonly skip: number;
+    /**
+     * Maximum number of items to return
+     */
+    readonly maxCount?: number;
     constructor(params: TraversalQueryNodeParams);
     describe(): string;
     private describeSegment;
 }
-export {};

package/dist/src/query-tree/queries.js CHANGED Viewed

@@ -4,6 +4,9 @@ exports.TraversalQueryNode = exports.FollowEdgeQueryNode = exports.RevisionQuery
 const colors_1 = require("../utils/colors");
 const base_1 = require("./base");
 const mutations_1 = require("./mutations");
+const variables_1 = require("./variables");
+const utils_1 = require("../utils/utils");
+const lists_1 = require("./lists");
 class EntityFromIdQueryNode extends base_1.QueryNode {
     rootEntityType;
     idNode;
@@ -159,37 +162,101 @@ class TraversalQueryNode extends base_1.QueryNode {
     sourceEntityNode;
     relationSegments;
     fieldSegments;
-    captureRootEntity;
     /**
      * Specifies if sourceEntityNode resolves to a list of entities instead of a single entity
      */
     sourceIsList;
     /**
-     * Specifies if the result should be a list one value if the path results in a single object instead of a list
+     * Specifies if the result should be a list of one value if the path results in a single object instead of a list
+     *
+     * Only supported if fieldSegments is empty
      */
     alwaysProduceList;
+    /**
+     * True if either alwaysProduceList is true or there is at least one list segment
+     */
+    resultIsList;
+    /**
+     * If true and this traversal results in a list, NULL values will be preserved in the list
+     *
+     * Note: this only exists for aggregations, so it might not work in every case
+     */
+    preserveNullValues;
+    /**
+     * An optional transformation (map) to apply on the traversal result
+     */
+    innerNode;
+    /**
+     * An optional filter that is applied on the resulting items of the traversal
+     *
+     * Don't access rootEntityVariable here (if we need that, we should add a rootFilterNode that is
+     * applied after the relation traversal but before the field traversal)
+     */
+    filterNode;
+    /**
+     * An optional filter that is applied on the resulting items of the traversal
+     *
+     * Both item and root can be accessed here
+     */
+    orderBy;
+    /**
+     * The variable under which each item will be available in the innerNode
+     */
+    itemVariable;
+    /**
+     * The variable under which the root entity (result after relation traversal, but before child entity traversals)
+     * will be available in the innerNode
+     */
+    rootEntityVariable;
+    /**
+     * Number of items to skip at the start
+     */
+    skip;
+    /**
+     * Maximum number of items to return
+     */
+    maxCount;
     constructor(params) {
         super();
-        if (params.captureRootEntities && (!params.relationSegments || !params.fieldSegments)) {
-            throw new Error(`A TraversalQueryNode with captureRootEntity=true requires both relationSegments and fieldSegments`);
+        // don't need those with field segments, so don't support it
+        if (params.sourceIsList && params.fieldSegments.length > 0) {
+            throw new Error(`TraversalQueryNode with sourceIsList=true can only be used when there are no fieldSegments`);
         }
-        if (params.sourceIsList && !params.relationSegments) {
-            // only need this, so keep it simpler
-            throw new Error(`A TraversalQueryNode with sourceIsList=true requires relationSegments`);
+        if (params.alwaysProduceList && params.fieldSegments.length > 0) {
+            throw new Error(`TraversalQueryNode with alwaysProduceList=true can only be used when there are no fieldSegments`);
         }
         this.sourceEntityNode = params.sourceEntityNode;
         this.relationSegments = params.relationSegments;
         this.fieldSegments = params.fieldSegments;
-        this.captureRootEntity = params.captureRootEntities;
         this.sourceIsList = params.sourceIsList ?? false;
         this.alwaysProduceList = params.alwaysProduceList ?? false;
+        this.preserveNullValues = params.preserveNullValues ?? false;
         this.entitiesIdentifierKind =
             params.entitiesIdentifierKind || mutations_1.EntitiesIdentifierKind.ENTITY;
+        this.innerNode = params.innerNode;
+        this.filterNode = params.filterNode;
+        this.orderBy = params.orderBy ?? lists_1.OrderSpecification.UNORDERED;
+        this.itemVariable = params.itemVariable ?? new variables_1.VariableQueryNode(`collectItem`);
+        this.rootEntityVariable = params.rootEntityVariable ?? new variables_1.VariableQueryNode(`collectRoot`);
+        this.skip = params.skip ?? 0;
+        this.maxCount = params.maxCount;
+        this.resultIsList =
+            this.alwaysProduceList ||
+                this.fieldSegments.some((s) => s.resultIsList) ||
+                this.relationSegments.some((s) => s.resultIsList);
     }
     describe() {
         const segments = [...this.relationSegments, ...this.fieldSegments];
-        return (`traverse ${segments.map((s) => this.describeSegment(s)).join('.')}` +
-            `from ${this.sourceEntityNode.describe()}${this.sourceIsList ? ' (as list)' : ''}${this.captureRootEntity ? ` into { obj, root }` : ''}${this.alwaysProduceList ? ` as list` : ''}`);
+        return (`traverse "${segments.map((s) => this.describeSegment(s)).join('.')}" (\n` +
+            (0, utils_1.indent)(`from ${this.sourceEntityNode.describe()}${this.sourceIsList ? ' (as list)' : ''}${this.alwaysProduceList ? ` as list` : ''}` +
+                `\nitem var: ${this.itemVariable?.describe()}, root var: ${this.rootEntityVariable?.describe()}` +
+                (this.filterNode ? `\nwith filter: ${this.filterNode.describe()}` : '') +
+                (!this.orderBy.isUnordered() ? `\norder by: ${this.orderBy.describe()}` : '') +
+                (this.skip != 0 ? `skip ${this.skip}\n` : '') +
+                (this.maxCount != undefined ? `limit ${this.maxCount}\n` : '') +
+                (this.preserveNullValues ? `preserving null values\n` : '') +
+                (this.innerNode ? `\nas ${this.innerNode.describe()}` : '')) +
+            `\n)`);
     }
     describeSegment(segment) {
         if (segment.kind === 'relation') {

package/dist/src/query-tree/queries.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/query-tree/queries.ts"],"names":[],"mappings":";;;AAMA,4CAAuC;AACvC,iCAAmC;AACnC,2CAAqD;~~AAErD~~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~~AAYD~~;;GAEG;AACH,MAAa,kBAAmB,SAAQ,gBAAS;IACpC,sBAAsB,CAAyB;IAC/C,gBAAgB,CAAY;IAC5B,gBAAgB,CAAiC;IACjD,aAAa,CAA8B;~~IAC3C~~,iBAAiB,CAAU;IAEpC;;OAEG;IACM,YAAY,CAAU;IAE/B;;OAEG;IACM,~~iBAAiB~~,CAAU;~~IAEpC~~,YAAY,MAAgC;QACxC,KAAK,EAAE,CAAC;QAER,IAAI,MAAM,CAAC,~~mBAAmB~~,IAAI,~~CAAC,CAAC,~~MAAM,CAAC,~~gBAAgB~~,~~IAAI,~~CAAC,MAAM,~~CAAC~~,~~aAAa,~~CAAC,EAAE,CAAC;~~YACpF~~,MAAM,IAAI,KAAK,CACX,~~mGAAmG~~,~~CACtG~~,CAAC;QACN,CAAC;~~QAED~~,IAAI,MAAM,CAAC,~~YAAY~~,IAAI,CAAC,MAAM,CAAC,~~gBAAgB,~~EAAE,CAAC;~~YAClD~~,~~qCAAqC;YACrC,~~MAAM,IAAI,KAAK,CACX,~~uEAAuE~~,~~CAC1E~~,CAAC;QACN,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,~~iBAAiB~~,GAAG,MAAM,CAAC,~~mBAAmB~~,CAAC;~~QACpD~~,IAAI,CAAC,~~YAAY~~,GAAG,MAAM,CAAC,~~YAAY~~,IAAI,KAAK,CAAC;~~QACjD~~,IAAI,CAAC,~~iBAAiB~~,GAAG,MAAM,CAAC,~~iBAAiB~~,IAAI,KAAK,CAAC;~~QAC3D~~,IAAI,CAAC,sBAAsB;YACvB,MAAM,CAAC,sBAAsB,IAAI,kCAAsB,CAAC,MAAM,CAAC;~~IACvE~~,CAAC;IAED,QAAQ;QACJ,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACnE,OAAO,CACH,~~YAAY~~,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,~~EAAE~~;~~YACpE~~,QAAQ,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,~~GAC5E~~,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,~~qBAAqB~~,CAAC,CAAC,CAAC,~~EACrD~~,~~GAAG~~,IAAI,CAAC,~~iBAAiB~~,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,~~CAChD~~,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,OAA2B;QAC/C,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9B,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC;QAC5E,CAAC;QACD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;IAC9B,CAAC;CACJ;~~AA3DD~~,~~gDA2DC~~"}
1	+ {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/query-tree/queries.ts"],"names":[],"mappings":"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"}

package/dist/src/schema/schema-builder.js CHANGED Viewed

@@ -75,7 +75,11 @@ function createSchema(project, databaseAdapter) {
     try {
         const { validationResult, model } = validateAndPrepareSchema(project);
         if (validationResult.hasErrors()) {
-            throw new Error('Project has errors:\n' + validationResult.toString());
+            throw new Error('Project has errors:\n' +
+                validationResult
+                    .getErrors()
+                    .map((e) => e.toString())
+                    .join('\n'));
         }
         const schemaContext = {
             ...project.options,

package/dist/src/schema/schema-builder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schema-builder.js","sourceRoot":"","sources":["../../../src/schema/schema-builder.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"schema-builder.js","sourceRoot":"","sources":["../../../src/schema/schema-builder.ts"],"names":[],"mappings":"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"}

package/dist/src/schema-generation/field-nodes.d.ts CHANGED Viewed

@@ -1,6 +1,11 @@
 import { Field } from '../model/implementation';
-import { QueryNode } from '../query-tree';
-export declare function createFieldNode(field: Field, sourceNode: QueryNode, options?: {
-    skipNullFallbackForEntityExtensions?: boolean;
-    captureRootEntitiesOnCollectFields?: boolean;
-}): QueryNode;
+import { QueryNode, VariableQueryNode } from '../query-tree';
+export interface CreateFieldNodeOptions {
+    readonly skipNullFallbackForEntityExtensions?: boolean;
+    readonly rootEntityVar?: VariableQueryNode;
+    /**
+     * Call this on collect fields that traverse root entities to store a reference to the root entity in the stack
+     */
+    readonly registerRootNode?: (rootNode: QueryNode) => void;
+}
+export declare function createFieldNode(field: Field, sourceNode: QueryNode, options?: CreateFieldNodeOptions): QueryNode;

package/dist/src/schema-generation/field-nodes.js CHANGED Viewed

@@ -8,6 +8,15 @@ const constants_1 = require("../schema/constants");
 const offset_date_time_1 = require("../schema/scalars/offset-date-time");
 const filter_fields_1 = require("./filter-input-types/filter-fields");
 const input_types_1 = require("./utils/input-types");
+// collect fields without aggregation or with a different operator can and should discard NULL values
+const aggregationsThatNeedNullValues = new Set([
+    model_1.AggregationOperator.COUNT,
+    model_1.AggregationOperator.SOME,
+    model_1.AggregationOperator.NONE,
+    model_1.AggregationOperator.COUNT_NULL,
+    model_1.AggregationOperator.SOME_NULL,
+    model_1.AggregationOperator.NONE_NULL,
+]);
 function createFieldNode(field, sourceNode, options = {}) {
     // make use of the fact that field access on non-objects is NULL, so that type checks for OBJECT are redundant
     // this e.g. reverses the effect of the isEntityExtensionType check below
@@ -24,23 +33,37 @@ function createFieldNode(field, sourceNode, options = {}) {
     }
     if (field.collectPath) {
         const { relationSegments, fieldSegments } = (0, collect_path_1.getEffectiveCollectSegments)(field.collectPath);
+        const itemVariable = new query_tree_1.VariableQueryNode('collectItem');
+        const rootEntityVariable = options.registerRootNode
+            ? new query_tree_1.VariableQueryNode('collectRoot')
+            : undefined;
+        const preserveNullValues = !!field.aggregationOperator &&
+            aggregationsThatNeedNullValues.has(field.aggregationOperator);
         const traversalNode = new query_tree_1.TraversalQueryNode({
             sourceEntityNode: sourceNode,
             relationSegments,
             fieldSegments,
-            captureRootEntities: !!options.captureRootEntitiesOnCollectFields,
+            rootEntityVariable,
+            itemVariable,
+            preserveNullValues,
         });
+        if (options.registerRootNode && rootEntityVariable) {
+            options.registerRootNode(rootEntityVariable);
+        }
         if (!field.aggregationOperator) {
             return traversalNode;
         }
         else {
             let items = traversalNode;
-            if (field.aggregationOperator === model_1.AggregationOperator.COUNT) {
-                return new query_tree_1.CountQueryNode(items);
-            }
+            // note: we used to use CountQueryNode for AggregationOperator.COUNT here, but that
+            // meant that the COUNT aggregation operator was never tested. Consistently having an
+            // AggregationQueryNode with TraversalQueryNodes also will help us generate more
+            // straightforward AQL in the future (we might even make it a property of
+            // TraversalQueryNode)
             if (field.collectPath.resultingType &&
                 field.collectPath.resultingType.isScalarType &&
                 field.collectPath.resultingType.graphQLScalarType === offset_date_time_1.GraphQLOffsetDateTime) {
+                // TODO aql-perf move this into the TraversalQueryNode's innerNode
                 const offsetDateTimeNode = new query_tree_1.VariableQueryNode('offsetDateTime');
                 items = new query_tree_1.TransformListQueryNode({
                     listNode: items,
@@ -48,6 +71,11 @@ function createFieldNode(field, sourceNode, options = {}) {
                     innerNode: (0, filter_fields_1.getScalarFilterValueNode)(offsetDateTimeNode, field.collectPath.resultingType),
                 });
             }
+            // TODO aql-perf think about moving the DISTINCT operator into TraversalQueryNode
+            // code like the ListAugmentation recognizes TraversalQueryNode and puts its additions
+            // into that existing node. They do not know about AggregationQueryNode, so they wrap
+            // it in a TransformListQueryNode. This is good for correctness (ensures that DISTICNT
+            // happens before the mapping step), but bad for performance.
             // scalar fields should be ordered automatically because there is no argument to sort them
             const sort = field.aggregationOperator === model_1.AggregationOperator.DISTINCT &&
                 (field.type.isScalarType || field.type.isEnumType);

package/dist/src/schema-generation/field-nodes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"field-nodes.js","sourceRoot":"","sources":["../../../src/schema-generation/field-nodes.ts"],"names":[],"mappings":";;~~AA8BA~~,~~0CAoGC~~;~~AAlID~~,oCAA+D;AAE/D,uEAAmF;AACnF,~~8CAqBuB~~;AACvB,mDAA+C;AAC/C,~~yEAA+F~~;~~AAC/F~~,sEAA8E;AAC9E,qDAA0C;~~AAE1C~~,SAAgB,eAAe,CAC3B,KAAY,EACZ,UAAqB,EACrB,~~UAGI~~,EAAE;~~IAEN~~,8GAA8G;IAC9G,yEAAyE;IACzE,mFAAmF;IACnF,IACI,UAAU,YAAY,iCAAoB;QAC1C,UAAU,CAAC,SAAS,YAAY,+BAAkB;QAClD,UAAU,CAAC,SAAS,CAAC,IAAI,KAAK,sBAAS,CAAC,MAAM;QAC9C,UAAU,CAAC,KAAK,KAAK,UAAU,CAAC,SAAS,CAAC,SAAS,EACrD,CAAC;QACC,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,iCAAiC;IACjC,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACX,iDAAiD,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAC5F,CAAC;IACN,CAAC;IAED,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAAG,IAAA,0CAA2B,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3F,MAAM,aAAa,GAAG,IAAI,+BAAkB,CAAC;YACzC,gBAAgB,EAAE,UAAU;YAC5B,gBAAgB;YAChB,aAAa;YACb,~~mBAAmB~~,~~EAAE~~,CAAC,CAAC,OAAO,CAAC,~~kCAAkC~~;~~SACpE~~,CAAC,CAAC;~~QAEH~~,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC7B,OAAO,aAAa,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,IAAI,KAAK,GAAc,aAAa,CAAC;YACrC,~~IAAI~~,~~KAAK~~,~~CAAC,mBAAmB,KAAK,2BAAmB,CAAC,KAAK,EAAE,CAAC~~;~~gBAC1D~~,~~OAAO,IAAI,2BAAc,CAAC,KAAK,CAAC,CAAC~~;~~YACrC~~,~~CAAC~~;~~YAED~~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"}
1	+ {"version":3,"file":"field-nodes.js","sourceRoot":"","sources":["../../../src/schema-generation/field-nodes.ts"],"names":[],"mappings":"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"}

package/dist/src/schema-generation/filter-augmentation.js CHANGED Viewed

@@ -33,7 +33,6 @@ class FilterAugmentation {
                     filterValue: args[constants_1.FILTER_ARG],
                     filterType,
                     itemType,
-                    objectNodeCallback: (itemNode) => this.rootFieldHelper.getRealItemNode(itemNode, info),
                 });
             },
         };

package/dist/src/schema-generation/filter-augmentation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filter-augmentation.js","sourceRoot":"","sources":["../../../src/schema-generation/filter-augmentation.ts"],"names":[],"mappings":";;;AACA,mDAAiD;AAIjD,iDAA0D;AAE1D;;GAEG;AACH,MAAa,kBAAkB;IAEN;IACA;IAFrB,YACqB,mBAAwC,EACxC,eAAgC;QADhC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAEJ,OAAO,CAAC,WAA2B,EAAE,QAAc;QAC/C,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YACzB,OAAO,WAAW,CAAC;QACvB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE/D,OAAO;YACH,GAAG,WAAW;YACd,IAAI,EAAE;gBACF,GAAG,WAAW,CAAC,IAAI;gBACnB,CAAC,sBAAU,CAAC,EAAE;oBACV,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE;iBAClC;aACJ;YACD,OAAO,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;gBAChC,IAAI,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3D,OAAO,IAAA,iCAAqB,EAAC;oBACzB,QAAQ;oBACR,WAAW,EAAE,IAAI,CAAC,sBAAU,CAAC;oBAC7B,UAAU;oBACV,QAAQ;~~oBACR~~,~~kBAAkB,EAAE,~~CAAC,~~QAAQ,EAAE,EAAE,CAC7B,IAAI,~~CAAC~~,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC~~;~~iBAC3D,CAAC,CAAC;~~YACP,CAAC;SACJ,CAAC;IACN,CAAC;CACJ;~~AAlCD~~,~~gDAkCC~~"}
1	+ {"version":3,"file":"filter-augmentation.js","sourceRoot":"","sources":["../../../src/schema-generation/filter-augmentation.ts"],"names":[],"mappings":";;;AACA,mDAAiD;AAIjD,iDAA0D;AAE1D;;GAEG;AACH,MAAa,kBAAkB;IAEN;IACA;IAFrB,YACqB,mBAAwC,EACxC,eAAgC;QADhC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;IAClD,CAAC;IAEJ,OAAO,CAAC,WAA2B,EAAE,QAAc;QAC/C,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YACzB,OAAO,WAAW,CAAC;QACvB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE/D,OAAO;YACH,GAAG,WAAW;YACd,IAAI,EAAE;gBACF,GAAG,WAAW,CAAC,IAAI;gBACnB,CAAC,sBAAU,CAAC,EAAE;oBACV,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE;iBAClC;aACJ;YACD,OAAO,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;gBAChC,IAAI,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3D,OAAO,IAAA,iCAAqB,EAAC;oBACzB,QAAQ;oBACR,WAAW,EAAE,IAAI,CAAC,sBAAU,CAAC;oBAC7B,UAAU;oBACV,QAAQ;iBACX,CAAC,CAAC;YACP,CAAC;SACJ,CAAC;IACN,CAAC;CACJ;AAhCD,gDAgCC"}

package/dist/src/schema-generation/flex-search-post-filter-augmentation.js CHANGED Viewed

@@ -52,7 +52,6 @@ class FlexSearchPostFilterAugmentation {
                     filterValue: filterValue || legacyFilterValue,
                     filterType,
                     itemType,
-                    objectNodeCallback: (itemNode) => this.rootFieldHelper.getRealItemNode(itemNode, info),
                 });
             },
         };

package/dist/src/schema-generation/flex-search-post-filter-augmentation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"flex-search-post-filter-augmentation.js","sourceRoot":"","sources":["../../../src/schema-generation/flex-search-post-filter-augmentation.ts"],"names":[],"mappings":";;;AAAA,8CAAsD;AAEtD,mDAAkE;AAIlE,iDAA0D;AAW1D;;GAEG;AACH,MAAa,gCAAgC;IAEpB;IACA;IACA;IAHrB,YACqB,mBAAwC,EACxC,eAAgC,EAChC,OAAgD;QAFhD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAChC,YAAO,GAAP,OAAO,CAAyC;IAClE,CAAC;IAEJ,OAAO,CAAC,WAA2B,EAAE,QAAc;QAC/C,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YACzB,OAAO,WAAW,CAAC;QACvB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE/D,IAAI,IAAI,GAAkC;YACtC,GAAG,WAAW,CAAC,IAAI;YACnB,CAAC,2BAAe,CAAC,EAAE;gBACf,WAAW,EAAE,gKAAgK;gBAC7K,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE;aAClC;SACJ,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,EAAE,CAAC;YACnD,IAAI,GAAG;gBACH,GAAG,IAAI;gBACP,CAAC,sBAAU,CAAC,EAAE;oBACV,WAAW,EAAE,gDAAgD;oBAC7D,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE;iBAClC;aACJ,CAAC;QACN,CAAC;QAED,OAAO;YACH,GAAG,WAAW;YACd,IAAI;YACJ,OAAO,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;gBAChC,MAAM,WAAW,GAAG,IAAI,CAAC,2BAAe,CAAC,CAAC;gBAC1C,MAAM,iBAAiB,GAAG,IAAI,CAAC,sBAAU,CAAC,CAAC;gBAC3C,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;oBACnC,OAAO,IAAI,kCAAqB,CAC5B,kBAAkB,sBAAU,QAAQ,2BAAe,cAAc,2BAAe,GAAG,CACtF,CAAC;gBACN,CAAC;gBAED,IAAI,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3D,OAAO,IAAA,iCAAqB,EAAC;oBACzB,QAAQ;oBACR,WAAW,EAAE,WAAW,IAAI,iBAAiB;oBAC7C,UAAU;oBACV,QAAQ;~~oBACR~~,~~kBAAkB,EAAE,~~CAAC,~~QAAQ,EAAE,EAAE,CAC7B,IAAI,~~CAAC~~,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC~~;~~iBAC3D,CAAC,CAAC;~~YACP,CAAC;SACJ,CAAC;IACN,CAAC;CACJ;~~AAxDD~~,~~4EAwDC~~"}
1	+ {"version":3,"file":"flex-search-post-filter-augmentation.js","sourceRoot":"","sources":["../../../src/schema-generation/flex-search-post-filter-augmentation.ts"],"names":[],"mappings":";;;AAAA,8CAAsD;AAEtD,mDAAkE;AAIlE,iDAA0D;AAW1D;;GAEG;AACH,MAAa,gCAAgC;IAEpB;IACA;IACA;IAHrB,YACqB,mBAAwC,EACxC,eAAgC,EAChC,OAAgD;QAFhD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAChC,YAAO,GAAP,OAAO,CAAyC;IAClE,CAAC;IAEJ,OAAO,CAAC,WAA2B,EAAE,QAAc;QAC/C,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YACzB,OAAO,WAAW,CAAC;QACvB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE/D,IAAI,IAAI,GAAkC;YACtC,GAAG,WAAW,CAAC,IAAI;YACnB,CAAC,2BAAe,CAAC,EAAE;gBACf,WAAW,EAAE,gKAAgK;gBAC7K,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE;aAClC;SACJ,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,EAAE,CAAC;YACnD,IAAI,GAAG;gBACH,GAAG,IAAI;gBACP,CAAC,sBAAU,CAAC,EAAE;oBACV,WAAW,EAAE,gDAAgD;oBAC7D,IAAI,EAAE,UAAU,CAAC,YAAY,EAAE;iBAClC;aACJ,CAAC;QACN,CAAC;QAED,OAAO;YACH,GAAG,WAAW;YACd,IAAI;YACJ,OAAO,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;gBAChC,MAAM,WAAW,GAAG,IAAI,CAAC,2BAAe,CAAC,CAAC;gBAC1C,MAAM,iBAAiB,GAAG,IAAI,CAAC,sBAAU,CAAC,CAAC;gBAC3C,IAAI,WAAW,IAAI,iBAAiB,EAAE,CAAC;oBACnC,OAAO,IAAI,kCAAqB,CAC5B,kBAAkB,sBAAU,QAAQ,2BAAe,cAAc,2BAAe,GAAG,CACtF,CAAC;gBACN,CAAC;gBAED,IAAI,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3D,OAAO,IAAA,iCAAqB,EAAC;oBACzB,QAAQ;oBACR,WAAW,EAAE,WAAW,IAAI,iBAAiB;oBAC7C,UAAU;oBACV,QAAQ;iBACX,CAAC,CAAC;YACP,CAAC;SACJ,CAAC;IACN,CAAC;CACJ;AAtDD,4EAsDC"}