@malloydata/malloy-query-builder 0.0.240-dev250311202829 → 0.0.240-dev250311214430

package/dist/query-ast.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASTAnnotation = exports.ASTAnnotationList = exports.ASTLimitViewOperation = exports.ASTView = exports.ASTFilterWithFilterString = exports.ASTFilter = exports.ASTWhereViewOperation = exports.ASTNestViewOperation = exports.ASTFilteredFieldExpression = exports.ASTWhereList = exports.ASTWhere = exports.ASTTimeTruncationExpression = exports.ASTReferenceExpression = exports.ASTExpression = exports.ASTField = exports.ASTAggregateViewOperation = exports.ASTGroupByViewOperation = exports.ASTOrderByViewOperation = exports.ASTViewOperation = exports.ASTViewOperationList = exports.ASTSegmentViewDefinition = exports.ASTRefinementViewDefinition = exports.ASTArrowViewDefinition = exports.ASTReferenceViewDefinition = exports.ASTReferenceQueryDefinition = exports.ASTRefinementQueryDefinition = exports.ASTArrowQueryDefinition = exports.ASTQueryDefinition = exports.ASTUnimplemented = exports.ASTTimestampLiteralValue = exports.ASTDateLiteralValue = exports.ASTBooleanLiteralValue = exports.ASTNumberLiteralValue = exports.ASTNullLiteralValue = exports.ASTStringLiteralValue = exports.LiteralValueAST = exports.ASTParameterValue = exports.ASTParameterValueList = exports.ASTSourceReference = exports.ASTFieldReference = exports.ASTReference = exports.ASTQuery = void 0;
+exports.ASTAnnotation = exports.ASTAnnotationList = exports.ASTLimitViewOperation = exports.ASTView = exports.ASTFilterWithFilterString = exports.ASTFilter = exports.ASTWhereViewOperation = exports.ASTNestViewOperation = exports.ASTFilteredFieldExpression = exports.ASTWhereList = exports.ASTWhere = exports.ASTTimeTruncationExpression = exports.ASTReferenceExpression = exports.ASTExpression = exports.ASTField = exports.ASTAggregateViewOperation = exports.ASTGroupByViewOperation = exports.ASTOrderByViewOperation = exports.ASTViewOperation = exports.ASTViewOperationList = exports.ASTSegmentViewDefinition = exports.ASTRefinementViewDefinition = exports.ASTArrowViewDefinition = exports.ASTReferenceViewDefinition = exports.ASTReferenceQueryArrowSource = exports.ASTReferenceQueryDefinition = exports.ASTRefinementQueryDefinition = exports.ASTArrowQueryDefinition = exports.ASTQueryDefinition = exports.ASTQueryArrowSource = exports.ASTUnimplemented = exports.ASTTimestampLiteralValue = exports.ASTDateLiteralValue = exports.ASTBooleanLiteralValue = exports.ASTNumberLiteralValue = exports.ASTNullLiteralValue = exports.ASTStringLiteralValue = exports.LiteralValueAST = exports.ASTParameterValue = exports.ASTParameterValueList = exports.ASTFieldReference = exports.ASTReference = exports.ASTQuery = void 0;
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -63,10 +63,10 @@ class ASTNode {
                     return node;
                 throw new Error('Not an ASTReference');
             },
-            SourceReference() {
-                if (node instanceof ASTSourceReference)
+            ReferenceQueryArrowSource() {
+                if (node instanceof ASTReferenceQueryArrowSource)
                     return node;
-                throw new Error('Not an ASTSourceReference');
+                throw new Error('Not an ASTReferenceQueryArrowSource');
             },
             ParameterValueList() {
                 if (node instanceof ASTParameterValueList)
@@ -200,8 +200,8 @@ class ASTNode {
             Reference(path) {
                 return node.findAny(path).as.Reference();
             },
-            SourceReference(path) {
-                return node.findAny(path).as.SourceReference();
+            ReferenceQueryArrowSource(path) {
+                return node.findAny(path).as.ReferenceQueryArrowSource();
             },
             ParameterValueList(path) {
                 return node.findAny(path).as.ParameterValueList();
@@ -519,8 +519,9 @@ class ASTQuery extends ASTObjectNode {
             }
             if (options.query) {
                 const definition = options.query.definition;
-                if (definition.kind === 'arrow') {
-                    const name = definition.source_reference.name;
+                if (definition.kind === 'arrow' &&
+                    definition.source.kind === 'source_reference') {
+                    const name = definition.source.name;
                     chosenSource = options.model.entries.find(e => e.name === name);
                     if (chosenSource === undefined) {
                         throw new Error(`Model does not contain source or query named ${name}`);
@@ -538,7 +539,8 @@ class ASTQuery extends ASTObjectNode {
         const query = (_a = options.query) !== null && _a !== void 0 ? _a : {
             definition: {
                 kind: 'arrow',
-                source_reference: {
+                source: {
+                    kind: 'source_reference',
                     name: source.name,
                 },
                 view: {
@@ -607,7 +609,7 @@ class ASTQuery extends ASTObjectNode {
         }
         this.definition = new ASTArrowQueryDefinition({
             kind: 'arrow',
-            source_reference: this.definition.sourceReference.build(),
+            source: this.definition.source.build(),
             view: {
                 kind: 'segment',
                 operations: [],
@@ -618,6 +620,11 @@ class ASTQuery extends ASTObjectNode {
     isRunnable() {
         return this.definition.isRunnable();
     }
+    isEmpty() {
+        return (this.definition instanceof ASTArrowQueryDefinition &&
+            this.definition.view instanceof ASTSegmentViewDefinition &&
+            this.definition.view.operations.length === 0);
+    }
     /**
      * Gets an {@link ASTSegmentViewDefinition} for the "default" place to add query
      * operations, or creates one if it doesn't exist.
@@ -660,7 +667,8 @@ class ASTQuery extends ASTObjectNode {
      */
     setSource(name) {
         if (this.definition instanceof ASTArrowQueryDefinition) {
-            if (this.definition.sourceReference.name === name) {
+            if (this.definition.source instanceof ASTReferenceQueryArrowSource &&
+                this.definition.source.name === name) {
                 return;
             }
         }
@@ -670,7 +678,10 @@ class ASTQuery extends ASTObjectNode {
         }
         this.definition = new ASTArrowQueryDefinition({
             kind: 'arrow',
-            source_reference: { name },
+            source: {
+                kind: 'source_reference',
+                name,
+            },
             view: this.definition instanceof ASTArrowQueryDefinition
                 ? this.definition.view.build()
                 : {
@@ -761,7 +772,7 @@ class ASTQuery extends ASTObjectNode {
         }
         this.definition = new ASTArrowQueryDefinition({
             kind: 'arrow',
-            source_reference: this.definition.sourceReference.build(),
+            source: this.definition.source.build(),
             view: {
                 kind: 'view_reference',
                 name,
@@ -769,21 +780,23 @@ class ASTQuery extends ASTObjectNode {
         });
         return this.definition.view.as.ReferenceViewDefinition();
     }
-    getInheritedAnnotations() {
-        var _a, _b;
-        if (this.definition instanceof ASTReferenceQueryDefinition) {
-            const query = this.getQueryInfo(this.definition.name);
+    _getInheritedAnnotations(definition) {
+        var _a;
+        if (definition instanceof ASTReferenceQueryDefinition) {
+            const query = this.getQueryInfo(definition.name);
             return (_a = query.annotations) !== null && _a !== void 0 ? _a : [];
         }
-        else if (this.definition instanceof ASTRefinementQueryDefinition) {
-            const query = this.getQueryInfo(this.definition.queryReference.name);
-            return (_b = query.annotations) !== null && _b !== void 0 ? _b : [];
+        else if (definition instanceof ASTRefinementQueryDefinition) {
+            return this._getInheritedAnnotations(definition.base);
         }
-        else if (this.definition instanceof ASTArrowQueryDefinition) {
-            return this.definition.view.getInheritedAnnotations();
+        else if (definition instanceof ASTArrowQueryDefinition) {
+            return definition.view.getInheritedAnnotations();
         }
         return [];
     }
+    getInheritedAnnotations() {
+        return this._getInheritedAnnotations(this.definition);
+    }
 }
 exports.ASTQuery = ASTQuery;
 class ASTReference extends ASTObjectNode {
@@ -888,43 +901,6 @@ class ASTFieldReference extends ASTReference {
     }
 }
 exports.ASTFieldReference = ASTFieldReference;
-class ASTSourceReference extends ASTReference {
-    /**
-     * @internal
-     */
-    get query() {
-        return this.parent.parent.as.Query();
-    }
-    /**
-     * Gets the `Malloy.SourceInfo` for the referenced source
-     *
-     * @returns The source information for the referenced source
-     */
-    getSourceInfo() {
-        const info = this.query.model.entries.find(e => e.name === this.name);
-        if (info === undefined) {
-            throw new Error('No source info found');
-        }
-        return info;
-    }
-    getSourceParameters() {
-        var _a;
-        return (_a = this.getSourceInfo().parameters) !== null && _a !== void 0 ? _a : [];
-    }
-    areRequiredParametersSet() {
-        const sourceParameters = this.getSourceParameters();
-        for (const parameterInfo of sourceParameters) {
-            if (parameterInfo.default_value !== undefined)
-                continue;
-            const parameter = this.tryGetParameter(parameterInfo.name);
-            if (parameter === undefined) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-exports.ASTSourceReference = ASTSourceReference;
 class ASTParameterValueList extends ASTListNode {
     constructor(parameters) {
         super(parameters, parameters.map(p => new ASTParameterValue(p)));
@@ -1097,8 +1073,18 @@ class ASTUnimplemented extends ASTNode {
     }
 }
 exports.ASTUnimplemented = ASTUnimplemented;
+exports.ASTQueryArrowSource = {
+    from(definition) {
+        switch (definition.kind) {
+            case 'refinement':
+                return new ASTRefinementQueryDefinition(definition);
+            case 'source_reference':
+                return new ASTReferenceQueryArrowSource(definition);
+        }
+    },
+};
 exports.ASTQueryDefinition = {
-    from: (definition) => {
+    from(definition) {
         switch (definition.kind) {
             case 'arrow':
                 return new ASTArrowQueryDefinition(definition);
@@ -1113,7 +1099,7 @@ class ASTArrowQueryDefinition extends ASTObjectNode {
     constructor(node) {
         super(node, {
             kind: 'arrow',
-            source_reference: new ASTSourceReference(node.source_reference),
+            source: exports.ASTQueryArrowSource.from(node.source),
             view: ASTViewDefinition.from(node.view),
         });
         this.node = node;
@@ -1126,20 +1112,24 @@ class ASTArrowQueryDefinition extends ASTObjectNode {
         this.children.view = view;
         view.parent = this;
     }
-    get sourceReference() {
-        return this.children.source_reference;
+    get source() {
+        return this.children.source;
+    }
+    set source(source) {
+        this.edit();
+        this.children.source = source;
     }
     getOrAddDefaultSegment() {
         return this.view.getOrAddDefaultSegment();
     }
     getSourceInfo() {
-        return this.sourceReference.getSourceInfo();
+        return this.source.getSourceInfo();
     }
     getOutputSchema() {
         return this.view.getRefinementSchema();
     }
     isRunnable() {
-        return (this.view.isRunnable() && this.sourceReference.areRequiredParametersSet());
+        return this.view.isRunnable() && this.source.isRunnable();
     }
     /**
      * @internal
@@ -1174,13 +1164,13 @@ class ASTRefinementQueryDefinition extends ASTObjectNode {
     constructor(node) {
         super(node, {
             kind: 'refinement',
-            query_reference: new ASTReference(node.query_reference),
+            base: exports.ASTQueryDefinition.from(node.base),
             refinement: ASTViewDefinition.from(node.refinement),
         });
         this.node = node;
     }
-    get queryReference() {
-        return this.children.query_reference;
+    get base() {
+        return this.children.base;
     }
     get refinement() {
         return this.children.refinement;
@@ -1203,12 +1193,7 @@ class ASTRefinementQueryDefinition extends ASTObjectNode {
         return this.refinement.getOrAddDefaultSegment();
     }
     getOutputSchema() {
-        const model = this.query.model;
-        const query = model.entries.find(e => e.name === this.queryReference.name);
-        if (query === undefined) {
-            throw new Error(`Query not found with name ${this.queryReference.name}`);
-        }
-        const base = query.schema;
+        const base = this.base.getOutputSchema();
         const refinement = this.refinement.getRefinementSchema();
         return ASTQuery.schemaMerge(base, refinement);
     }
@@ -1228,6 +1213,9 @@ class ASTRefinementQueryDefinition extends ASTObjectNode {
     reorderFields(names) {
         this.query.getOrAddAnnotations().setTagProperty(['field_order'], names);
     }
+    getSourceInfo() {
+        return this.base.getSourceInfo();
+    }
 }
 exports.ASTRefinementQueryDefinition = ASTRefinementQueryDefinition;
 class ASTReferenceQueryDefinition extends ASTObjectNode {
@@ -1260,14 +1248,9 @@ class ASTReferenceQueryDefinition extends ASTObjectNode {
         return this.children.path;
     }
     getOrAddDefaultSegment() {
-        var _a;
         const newQuery = new ASTRefinementQueryDefinition({
             kind: 'refinement',
-            query_reference: {
-                name: this.name,
-                path: this.path,
-                parameters: (_a = this.parameters) === null || _a === void 0 ? void 0 : _a.build(),
-            },
+            base: this.build(),
             refinement: {
                 kind: 'segment',
                 operations: [],
@@ -1300,8 +1283,123 @@ class ASTReferenceQueryDefinition extends ASTObjectNode {
     tryGetParameter(name) {
         return ASTReference.tryGetParameter(this, name);
     }
+    getOutputSchema() {
+        return this.getSourceInfo().schema;
+    }
+    getSourceInfo() {
+        const model = this.query.model;
+        const query = model.entries.find(e => e.name === this.name);
+        if (query === undefined) {
+            throw new Error(`Query not found with name ${this.name}`);
+        }
+        return query;
+    }
 }
 exports.ASTReferenceQueryDefinition = ASTReferenceQueryDefinition;
+class ASTReferenceQueryArrowSource extends ASTObjectNode {
+    constructor(node) {
+        super(node, {
+            kind: 'source_reference',
+            name: node.name,
+            path: node.path,
+            parameters: node.parameters && new ASTParameterValueList(node.parameters),
+        });
+        this.node = node;
+    }
+    isRunnable() {
+        return this.areRequiredParametersSet();
+    }
+    get name() {
+        return this.children.name;
+    }
+    get arrow() {
+        return this.parent.as.ArrowQueryDefinition();
+    }
+    get parameters() {
+        return this.children.parameters;
+    }
+    set parameters(parameters) {
+        this.edit();
+        this.children.parameters = parameters;
+    }
+    get path() {
+        return this.children.path;
+    }
+    getSourceInfo() {
+        const entry = this.arrow.query.model.entries.find(entry => entry.name === this.name);
+        if (entry === undefined) {
+            throw new Error(`No query or source named ${this.name}`);
+        }
+        return entry;
+    }
+    getOrAddDefaultSegment() {
+        const entry = this.getSourceInfo();
+        if (entry.kind !== 'query') {
+            throw new Error(`Cannot refine source ${this.name}`);
+        }
+        const newQuery = new ASTRefinementQueryDefinition({
+            kind: 'refinement',
+            base: {
+                ...this.build(),
+                kind: 'query_reference',
+            },
+            refinement: {
+                kind: 'segment',
+                operations: [],
+            },
+        });
+        this.arrow.source = newQuery;
+        return newQuery.refinement.as.SegmentViewDefinition();
+    }
+    /**
+     * @internal
+     */
+    propagateUp(_f) {
+        return;
+    }
+    /**
+     * @internal
+     */
+    propagateDown(_f) {
+        return;
+    }
+    getOrAddParameters() {
+        return ASTReference.getOrAddParameters(this);
+    }
+    setParameter(name, value) {
+        return ASTReference.setParameter(this, name, value);
+    }
+    tryGetParameter(name) {
+        return ASTReference.tryGetParameter(this, name);
+    }
+    /**
+     * @internal
+     */
+    get query() {
+        return this.parent.parent.as.Query();
+    }
+    getSourceParameters() {
+        var _a;
+        const sourceInfo = this.getSourceInfo();
+        if (sourceInfo.kind === 'query') {
+            return [];
+        }
+        return (_a = sourceInfo.parameters) !== null && _a !== void 0 ? _a : [];
+    }
+    areRequiredParametersSet() {
+        const sourceParameters = this.getSourceParameters();
+        for (const parameterInfo of sourceParameters) {
+            if (parameterInfo.default_value !== undefined)
+                continue;
+            const parameter = this.tryGetParameter(parameterInfo.name);
+            if (parameter === undefined) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+exports.ASTReferenceQueryArrowSource = ASTReferenceQueryArrowSource;
 const ASTViewDefinition = {
     from(definition) {
         switch (definition.kind) {
@@ -3375,13 +3473,13 @@ function tagFromAnnotations(prefix, annotations = [], inherited) {
 function serializeFilter(filter) {
     switch (filter.kind) {
         case 'string':
-            return new Filter.StringSerializer(filter.clauses).serialize();
+            return Filter.StringFilterExpression.unparse(filter.parsed);
         case 'number':
-            return new Filter.NumberSerializer(filter.clauses).serialize();
+            return Filter.NumberFilterExpression.unparse(filter.parsed);
         case 'boolean':
-            return new Filter.BooleanSerializer(filter.clauses).serialize();
-        case 'date':
-            return new Filter.DateSerializer(filter.clauses).serialize();
+            return Filter.BooleanFilterExpression.unparse(filter.parsed);
+        case 'temporal':
+            return Filter.TemporalFilterExpression.unparse(filter.parsed);
     }
 }
 function parseFilter(filterString, kind) {
@@ -3393,24 +3491,24 @@ function parseFilter(filterString, kind) {
     }
     switch (kind) {
         case 'string': {
-            const result = new Filter.StringParser(filterString).parse();
-            handleError(result.logs);
-            return { kind, clauses: result.clauses };
+            const result = Filter.StringFilterExpression.parse(filterString);
+            handleError(result.log);
+            return { kind, parsed: result.parsed };
         }
         case 'number': {
-            const result = new Filter.NumberParser(filterString).parse();
-            handleError(result.logs);
-            return { kind, clauses: result.clauses };
+            const result = Filter.NumberFilterExpression.parse(filterString);
+            handleError(result.log);
+            return { kind, parsed: result.parsed };
         }
         case 'boolean': {
-            const result = new Filter.BooleanParser(filterString).parse();
-            handleError(result.logs);
-            return { kind, clauses: result.clauses };
+            const result = Filter.BooleanFilterExpression.parse(filterString);
+            handleError(result.log);
+            return { kind, parsed: result.parsed };
         }
-        case 'date': {
-            const result = new Filter.DateParser(filterString).parse();
-            handleError(result.logs);
-            return { kind, clauses: result.clauses };
+        case 'temporal': {
+            const result = Filter.TemporalFilterExpression.parse(filterString);
+            handleError(result.log);
+            return { kind, parsed: result.parsed };
         }
         case 'other':
             throw new Error('Not implemented');
@@ -3464,7 +3562,7 @@ function getFilterType(fieldInfo) {
             return 'number';
         case 'date_type':
         case 'timestamp_type':
-            return 'date';
+            return 'temporal';
         default:
             return 'other';
     }