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

package/README.md

@@ -325,10 +325,10 @@ run: flights -> { aggregate: flight_count { where: carrier ~ f`WN, AA`} }
 
 ## Specify or remove source parameter value
 
-{@link ASTSourceReference.setParameter}
+{@link ASTReferenceQueryArrowSource.setParameter}
 
 ```ts
-query.definition.asArrowQueryDefinition().sourceReference.parameters.setParameter("param", 1)
+query.definition.as.ArrowQueryDefinition().source.as.ReferenceQueryArrowSource().parameters.setParameter("param", 1)
 ```
 ```
 run: flights(param is 1) ->
@@ -336,10 +336,10 @@ run: flights(param is 1) ->
 
 ## List parameters of the source and whether they are required
 
-{@link ASTSourceReference.getSourceParameters}
+{@link ASTReferenceQueryArrowSource.getSourceParameters}
 
 ```ts
-query.definition.asArrowQueryDefinition().sourceReference.getSourceParameters();
+query.definition.as.ArrowQueryDefinition().source.as.ReferenceQueryArrowSource().getSourceParameters();
 ```
 
 ## To a particular field in the query (including nests), add/edit/delete annotation

package/dist/query-ast.d.ts

@@ -1,18 +1,19 @@
 import * as Malloy from '@malloydata/malloy-interfaces';
 import { Tag, TagSetValue } from '@malloydata/malloy-tag';
 import * as Filter from '@malloydata/malloy-filter';
+export type FilterType = 'string' | 'boolean' | 'number' | 'temporal';
 export type ParsedFilter = {
     kind: 'string';
-    clauses: Filter.StringClause[];
+    parsed: Filter.StringClause | null;
 } | {
     kind: 'number';
-    clauses: Filter.NumberClause[];
+    parsed: Filter.NumberClause | null;
 } | {
     kind: 'boolean';
-    clauses: Filter.BooleanClause[];
+    parsed: Filter.BooleanClause | null;
 } | {
-    kind: 'date';
-    clauses: Filter.DateClause[];
+    kind: 'temporal';
+    parsed: Filter.TemporalClause | null;
 };
 export type PathSegment = number | string;
 export type Path = PathSegment[];
@@ -43,7 +44,7 @@ declare abstract class ASTNode<T> {
     get as(): {
         Query(): ASTQuery;
         Reference(): ASTReference;
-        SourceReference(): ASTSourceReference;
+        ReferenceQueryArrowSource(): ASTReferenceQueryArrowSource;
         ParameterValueList(): ASTParameterValueList;
         Where(): ASTWhere;
         WhereList(): ASTWhereList;
@@ -72,7 +73,7 @@ declare abstract class ASTNode<T> {
     get find(): {
         Query(path: Path): ASTQuery;
         Reference(path: Path): ASTReference;
-        SourceReference(path: Path): ASTSourceReference;
+        ReferenceQueryArrowSource(path: Path): ASTReferenceQueryArrowSource;
         ParameterValueList(path: Path): ASTParameterValueList;
         Where(path: Path): ASTWhere;
         WhereList(path: Path): ASTWhereList;
@@ -234,6 +235,7 @@ export declare class ASTQuery extends ASTObjectNode<Malloy.Query, {
     removeTagProperty(path: Path, prefix?: string): void;
     setViewToEmptySegment(): ASTSegmentViewDefinition;
     isRunnable(): boolean;
+    isEmpty(): boolean;
     /**
      * Gets an {@link ASTSegmentViewDefinition} for the "default" place to add query
      * operations, or creates one if it doesn't exist.
@@ -328,6 +330,7 @@ export declare class ASTQuery extends ASTObjectNode<Malloy.Query, {
      * @param name The name of the view to set as the head of the query pipeline
      */
     setView(name: string): ASTReferenceViewDefinition;
+    private _getInheritedAnnotations;
     getInheritedAnnotations(): Malloy.Annotation[];
 }
 export type RawLiteralValue = number | string | {
@@ -391,20 +394,6 @@ export declare class ASTFieldReference extends ASTReference {
     private getReferenceSchema;
     getFieldInfo(): Malloy.FieldInfo;
 }
-export declare class ASTSourceReference extends ASTReference {
-    /**
-     * @internal
-     */
-    get query(): ASTQuery;
-    /**
-     * Gets the `Malloy.SourceInfo` for the referenced source
-     *
-     * @returns The source information for the referenced source
-     */
-    getSourceInfo(): Malloy.SourceInfo;
-    getSourceParameters(): Malloy.ParameterInfo[];
-    areRequiredParametersSet(): boolean;
-}
 export declare class ASTParameterValueList extends ASTListNode<Malloy.ParameterValue, ASTParameterValue> {
     constructor(parameters: Malloy.ParameterValue[]);
     get parameters(): ASTParameterValue[];
@@ -497,22 +486,27 @@ export interface IASTQueryDefinition extends IASTQueryOrViewDefinition {
     reorderFields(names: string[]): void;
     isRunnable(): boolean;
 }
+export type ASTQueryArrowSource = ASTReferenceQueryArrowSource | ASTRefinementQueryDefinition;
+export declare const ASTQueryArrowSource: {
+    from(definition: Malloy.QueryArrowSource): ASTReferenceQueryArrowSource | ASTRefinementQueryDefinition;
+};
 export type ASTQueryDefinition = ASTReferenceQueryDefinition | ASTArrowQueryDefinition | ASTRefinementQueryDefinition;
 export declare const ASTQueryDefinition: {
-    from: (definition: Malloy.QueryDefinition) => ASTArrowQueryDefinition | ASTReferenceQueryDefinition | ASTRefinementQueryDefinition;
+    from(definition: Malloy.QueryDefinition): ASTArrowQueryDefinition | ASTReferenceQueryDefinition | ASTRefinementQueryDefinition;
 };
 export declare class ASTArrowQueryDefinition extends ASTObjectNode<Malloy.QueryDefinitionWithArrow, {
     kind: 'arrow';
-    source_reference: ASTSourceReference;
+    source: ASTQueryArrowSource;
     view: ASTViewDefinition;
 }> implements IASTQueryDefinition {
     node: Malloy.QueryDefinitionWithArrow;
     constructor(node: Malloy.QueryDefinitionWithArrow);
     get view(): ASTViewDefinition;
     set view(view: ASTViewDefinition);
-    get sourceReference(): ASTSourceReference;
+    get source(): ASTQueryArrowSource;
+    set source(source: ASTQueryArrowSource);
     getOrAddDefaultSegment(): ASTSegmentViewDefinition;
-    getSourceInfo(): Malloy.SourceInfo;
+    getSourceInfo(): any;
     getOutputSchema(): Malloy.Schema;
     isRunnable(): boolean;
     /**
@@ -531,12 +525,12 @@ export declare class ASTArrowQueryDefinition extends ASTObjectNode<Malloy.QueryD
 }
 export declare class ASTRefinementQueryDefinition extends ASTObjectNode<Malloy.QueryDefinitionWithRefinement, {
     kind: 'refinement';
-    query_reference: ASTReference;
+    base: ASTQueryDefinition;
     refinement: ASTViewDefinition;
 }> implements IASTQueryDefinition {
     node: Malloy.QueryDefinitionWithRefinement;
     constructor(node: Malloy.QueryDefinitionWithRefinement);
-    get queryReference(): ASTReference;
+    get base(): ASTQueryDefinition;
     get refinement(): ASTViewDefinition;
     set refinement(refinement: ASTViewDefinition);
     isRunnable(): boolean;
@@ -545,7 +539,7 @@ export declare class ASTRefinementQueryDefinition extends ASTObjectNode<Malloy.Q
      */
     get query(): ASTQuery;
     getOrAddDefaultSegment(): ASTSegmentViewDefinition;
-    getOutputSchema(): Malloy.Schema;
+    getOutputSchema(): any;
     /**
      * @internal
      */
@@ -555,6 +549,7 @@ export declare class ASTRefinementQueryDefinition extends ASTObjectNode<Malloy.Q
      */
     propagateDown(f: PropagationFunction): void;
     reorderFields(names: string[]): void;
+    getSourceInfo(): any;
 }
 export declare class ASTReferenceQueryDefinition extends ASTObjectNode<Malloy.QueryDefinitionWithQueryReference, {
     kind: 'query_reference';
@@ -583,6 +578,42 @@ export declare class ASTReferenceQueryDefinition extends ASTObjectNode<Malloy.Qu
     getOrAddParameters(): any;
     setParameter(name: string, value: RawLiteralValue): void;
     tryGetParameter(name: string): ASTParameterValue | undefined;
+    getOutputSchema(): Malloy.Schema;
+    getSourceInfo(): Malloy.ModelEntryValue;
+}
+export declare class ASTReferenceQueryArrowSource extends ASTObjectNode<Malloy.QueryArrowSourceWithSourceReference, {
+    kind: 'source_reference';
+    name: string;
+    path?: string[];
+    parameters?: ASTParameterValueList;
+}> implements IASTReference {
+    node: Malloy.QueryArrowSourceWithSourceReference;
+    constructor(node: Malloy.QueryArrowSourceWithSourceReference);
+    isRunnable(): boolean;
+    get name(): string;
+    get arrow(): ASTArrowQueryDefinition;
+    get parameters(): ASTParameterValueList | undefined;
+    set parameters(parameters: ASTParameterValueList | undefined);
+    get path(): string[] | undefined;
+    getSourceInfo(): Malloy.ModelEntryValue;
+    getOrAddDefaultSegment(): ASTSegmentViewDefinition;
+    /**
+     * @internal
+     */
+    propagateUp(_f: PropagationFunction): void;
+    /**
+     * @internal
+     */
+    propagateDown(_f: PropagationFunction): void;
+    getOrAddParameters(): any;
+    setParameter(name: string, value: RawLiteralValue): void;
+    tryGetParameter(name: string): ASTParameterValue | undefined;
+    /**
+     * @internal
+     */
+    get query(): ASTQuery;
+    getSourceParameters(): Malloy.ParameterInfo[];
+    areRequiredParametersSet(): boolean;
 }
 export interface IASTViewDefinition extends IASTQueryOrViewDefinition {
     isRunnable(): boolean;
@@ -1357,7 +1388,7 @@ export declare class ASTFilterWithFilterString extends ASTObjectNode<Malloy.Filt
     set filterString(filter: string);
     setFilterString(filterString: string): void;
     getFieldInfo(): Malloy.FieldInfoWithDimension | Malloy.FieldInfoWithMeasure;
-    getFilterType(): 'string' | 'boolean' | 'number' | 'date' | 'other';
+    getFilterType(): FilterType | 'other';
     setFilter(filter: ParsedFilter): void;
     getFilter(): ParsedFilter;
 }