@malloydata/malloy 0.0.79-dev230818134709 → 0.0.79-dev230822184259

package/dist/dialect/dialect.d.ts

@@ -19,7 +19,7 @@ export interface QueryInfo {
 export declare const dayIndex: number;
 export declare function inDays(units: string): boolean;
 export declare function qtz(qi: QueryInfo): string | undefined;
-export declare type DialectFieldList = DialectField[];
+export type DialectFieldList = DialectField[];
 export declare abstract class Dialect {
     abstract name: string;
     abstract defaultNumberType: string;

package/dist/dialect/functions/function_map.d.ts

@@ -1,5 +1,5 @@
 import { DialectFunctionOverloadDef } from './util';
-declare type Thunk<T> = () => T;
+type Thunk<T> = () => T;
 export declare class FunctionMap {
     private functions;
     private getters;

package/dist/lang/ast/expressions/expr-cast.d.ts

@@ -1,7 +1,7 @@
 import { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import { FieldSpace } from '../types/field-space';
-export declare type CastType = 'string' | 'number' | 'boolean' | 'date' | 'timestamp';
+export type CastType = 'string' | 'number' | 'boolean' | 'date' | 'timestamp';
 export declare function isCastType(t: string): t is CastType;
 export declare class ExprCast extends ExpressionDef {
     readonly expr: ExpressionDef;

package/dist/lang/ast/expressions/expr-time-extract.js

@@ -28,12 +28,6 @@ const ast_utils_1 = require("../ast-utils");
 const expression_def_1 = require("../types/expression-def");
 const range_1 = require("./range");
 class ExprTimeExtract extends expression_def_1.ExpressionDef {
-    constructor(extractText, args) {
-        super({ args: args });
-        this.extractText = extractText;
-        this.args = args;
-        this.elementType = 'timeExtract';
-    }
     static extractor(funcName) {
         const mappedName = ExprTimeExtract.pluralMap[funcName];
         if (mappedName) {
@@ -43,6 +37,12 @@ class ExprTimeExtract extends expression_def_1.ExpressionDef {
             return funcName;
         }
     }
+    constructor(extractText, args) {
+        super({ args: args });
+        this.extractText = extractText;
+        this.args = args;
+        this.elementType = 'timeExtract';
+    }
     getExpression(fs) {
         const extractTo = ExprTimeExtract.extractor(this.extractText);
         if (extractTo) {

package/dist/lang/ast/query-items/field-declaration.d.ts

@@ -9,7 +9,7 @@ import { MakeEntry, SpaceEntry } from '../types/space-entry';
 import { extendNoteMethod, Noteable } from '../types/noteable';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { SpaceField } from '../types/space-field';
-export declare type FieldDeclarationConstructor = new (expr: ExpressionDef, defineName: string, exprSrc?: string) => FieldDeclaration;
+export type FieldDeclarationConstructor = new (expr: ExpressionDef, defineName: string, exprSrc?: string) => FieldDeclaration;
 export declare abstract class FieldDeclaration extends MalloyElement implements Noteable, MakeEntry {
     readonly expr: ExpressionDef;
     readonly defineName: string;

package/dist/lang/ast/query-items/field-references.d.ts

@@ -6,7 +6,7 @@ import { LookupResult } from '../types/lookup-result';
 import { ListOf, MalloyElement } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
 import { MakeEntry } from '../types/space-entry';
-export declare type FieldReferenceConstructor = new (names: FieldName[]) => FieldReference;
+export type FieldReferenceConstructor = new (names: FieldName[]) => FieldReference;
 export declare abstract class FieldReference extends ListOf<FieldName> implements Noteable, MakeEntry {
     readonly isNoteableObj = true;
     note?: Annotation;
@@ -71,7 +71,7 @@ export declare class WildcardFieldReference extends MalloyElement implements Not
     getFieldDef(): FieldDef;
     get refString(): string;
 }
-export declare type FieldReferenceElement = FieldReference | WildcardFieldReference;
+export type FieldReferenceElement = FieldReference | WildcardFieldReference;
 export declare class FieldReferences extends DefinitionList<FieldReferenceElement> {
     elementType: string;
     constructor(members: FieldReferenceElement[]);

package/dist/lang/ast/query-properties/joins.d.ts

@@ -27,7 +27,7 @@ export declare class KeyJoin extends Join {
     structDef(): StructDef;
     fixupJoinOn(outer: FieldSpace, inStruct: StructDef): void;
 }
-declare type ExpressionJoinType = 'many' | 'one' | 'cross';
+type ExpressionJoinType = 'many' | 'one' | 'cross';
 export declare class ExpressionJoin extends Join {
     readonly name: ModelEntryReference;
     readonly source: Source;

package/dist/lang/ast/query-properties/nest.d.ts

@@ -59,5 +59,5 @@ export declare class NestReference extends FieldReference implements QueryProper
     typecheck(type: TypeDesc): void;
     queryExecute(executeFor: QueryBuilder): void;
 }
-export declare type NestedQuery = NestReference | NestDefinition | NestRefinement;
+export type NestedQuery = NestReference | NestDefinition | NestRefinement;
 export {};

package/dist/lang/ast/query-properties/top.d.ts

@@ -3,7 +3,7 @@ import { ExpressionDef } from '../types/expression-def';
 import { FieldName, FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { LegalRefinementStage, QueryPropertyInterface } from '../types/query-property-interface';
-declare type TopInit = FieldName | ExpressionDef;
+type TopInit = FieldName | ExpressionDef;
 export declare class Top extends MalloyElement implements QueryPropertyInterface {
     readonly limit: number;
     readonly by?: TopInit | undefined;

package/dist/lang/ast/sources/table-source.d.ts

@@ -1,7 +1,7 @@
 import { StructDef } from '../../../model/malloy_types';
 import { Source } from '../elements/source';
 import { ModelEntryReference } from '../types/malloy-element';
-declare type TableInfo = {
+type TableInfo = {
     tablePath: string;
     connectionName?: string | undefined;
 };

package/dist/lang/ast/space-seed.d.ts

@@ -1,6 +1,6 @@
 import { StructDef } from '../../model/malloy_types';
 import { FieldSpace } from './types/field-space';
-export declare type SourceSpec = StructDef | FieldSpace;
+export type SourceSpec = StructDef | FieldSpace;
 /**
  * Based on how things are constructed, a DynamicSpace can be seeded
  * with a StructDef, or from another field space.

package/dist/lang/ast/sql-elements/sql-string.d.ts

@@ -1,7 +1,7 @@
 import { SQLPhrase } from '../../../model/malloy_types';
 import { QueryElement } from '../types/query-element';
 import { MalloyElement } from '../types/malloy-element';
-declare type SQLStringSegment = string | QueryElement;
+type SQLStringSegment = string | QueryElement;
 export declare class SQLString extends MalloyElement {
     elementType: string;
     elements: SQLStringSegment[];

package/dist/lang/ast/types/comparison.js

@@ -33,7 +33,7 @@ var Comparison;
     Comparison["GreaterThan"] = ">";
     Comparison["GreaterThanOrEqualTo"] = ">=";
     Comparison["NotEqualTo"] = "!=";
-})(Comparison = exports.Comparison || (exports.Comparison = {}));
+})(Comparison || (exports.Comparison = Comparison = {}));
 function isComparison(s) {
     return Object.values(Comparison).includes(s);
 }

package/dist/lang/ast/types/equality.js

@@ -29,7 +29,7 @@ var Equality;
     Equality["NotLike"] = "!~";
     Equality["Equals"] = "=";
     Equality["NotEquals"] = "!=";
-})(Equality = exports.Equality || (exports.Equality = {}));
+})(Equality || (exports.Equality = Equality = {}));
 function isEquality(s) {
     return Object.values(Equality).includes(s);
 }

package/dist/lang/ast/types/explore-field.d.ts

@@ -1,5 +1,5 @@
 import { RenameField } from '../source-properties/renames';
 import { FieldDecl } from './field-decl';
 import { MalloyElement } from './malloy-element';
-export declare type ExploreField = FieldDecl | RenameField;
+export type ExploreField = FieldDecl | RenameField;
 export declare function isExploreField(f: MalloyElement): f is ExploreField;

package/dist/lang/ast/types/expr-result.d.ts

@@ -1,5 +1,5 @@
 import { Fragment, TypeDesc } from '../../../model/malloy_types';
-declare type MorphicValues = Record<string, Fragment[]>;
+type MorphicValues = Record<string, Fragment[]>;
 export interface ExprResult extends TypeDesc {
     value: Fragment[];
     morphic?: MorphicValues;

package/dist/lang/ast/types/expr-value.d.ts

@@ -1,3 +1,3 @@
 import { ExprResult } from './expr-result';
 import { TimeResult } from './time-result';
-export declare type ExprValue = ExprResult | TimeResult;
+export type ExprValue = ExprResult | TimeResult;

package/dist/lang/ast/types/field-collection-member.d.ts

@@ -1,5 +1,5 @@
 import { FieldDeclaration } from '../query-items/field-declaration';
 import { FieldReferenceElement } from '../query-items/field-references';
 import { MalloyElement } from './malloy-element';
-export declare type FieldCollectionMember = FieldReferenceElement | FieldDeclaration;
+export type FieldCollectionMember = FieldReferenceElement | FieldDeclaration;
 export declare function isFieldCollectionMember(el: MalloyElement): el is FieldCollectionMember;

package/dist/lang/ast/types/field-decl.d.ts

@@ -3,5 +3,5 @@ import { Turtles } from '../source-properties/turtles';
 import { FieldDeclaration } from '../query-items/field-declaration';
 import { Join } from '../query-properties/joins';
 import { MalloyElement } from './malloy-element';
-export declare type FieldDecl = FieldDeclaration | Join | TurtleDecl | Turtles;
+export type FieldDecl = FieldDeclaration | Join | TurtleDecl | Turtles;
 export declare function isFieldDecl(f: MalloyElement): f is FieldDecl;

package/dist/lang/ast/types/lookup-result.d.ts

@@ -7,4 +7,4 @@ export interface LookupError {
     error: string;
     found: undefined;
 }
-export declare type LookupResult = LookupFound | LookupError;
+export type LookupResult = LookupFound | LookupError;

package/dist/lang/ast/types/malloy-element.d.ts

@@ -52,8 +52,8 @@ export declare class Unimplemented extends MalloyElement {
     elementType: string;
     reported: boolean;
 }
-declare type ChildBody = MalloyElement | MalloyElement[];
-declare type ElementChildren = Record<string, ChildBody>;
+type ChildBody = MalloyElement | MalloyElement[];
+type ElementChildren = Record<string, ChildBody>;
 export declare class ModelEntryReference extends MalloyElement {
     readonly name: string;
     elementType: string;

package/dist/lang/ast/types/query-element.d.ts

@@ -1,5 +1,5 @@
 import { MalloyElement } from './malloy-element';
 import { ExistingQuery } from '../query-elements/existing-query';
 import { FullQuery } from '../query-elements/full-query';
-export declare type QueryElement = FullQuery | ExistingQuery;
+export type QueryElement = FullQuery | ExistingQuery;
 export declare function isQueryElement(e: MalloyElement): e is QueryElement;

package/dist/lang/ast/types/query-extend-property.d.ts

@@ -2,5 +2,5 @@ import { Dimensions } from '../query-properties/dimensions';
 import { Joins } from '../query-properties/joins';
 import { Measures } from '../query-properties/measures';
 import { MalloyElement } from './malloy-element';
-export declare type QueryExtendProperty = Dimensions | Measures | Joins;
+export type QueryExtendProperty = Dimensions | Measures | Joins;
 export declare function isQueryExtendProperty(q: MalloyElement): q is QueryExtendProperty;

package/dist/lang/ast/types/query-item.d.ts

@@ -1,4 +1,4 @@
 import { FieldDeclaration } from '../query-items/field-declaration';
 import { FieldReference } from '../query-items/field-references';
 import { NestDefinition, NestReference } from '../query-properties/nest';
-export declare type QueryItem = FieldDeclaration | FieldReference | NestDefinition | NestReference;
+export type QueryItem = FieldDeclaration | FieldReference | NestDefinition | NestReference;

package/dist/lang/ast/types/query-property-interface.js

@@ -28,7 +28,7 @@ var QueryClass;
     QueryClass["Index"] = "index";
     QueryClass["Project"] = "project";
     QueryClass["Grouping"] = "grouping";
-})(QueryClass = exports.QueryClass || (exports.QueryClass = {}));
+})(QueryClass || (exports.QueryClass = QueryClass = {}));
 /**
  * A QueryProperty can have these responses to appearing in a refinement
  *   Head -- Legal in all queries, apply it to the first segment
@@ -41,5 +41,5 @@ var LegalRefinementStage;
     LegalRefinementStage[LegalRefinementStage["Single"] = 0] = "Single";
     LegalRefinementStage[LegalRefinementStage["Head"] = 1] = "Head";
     LegalRefinementStage[LegalRefinementStage["Tail"] = 2] = "Tail";
-})(LegalRefinementStage = exports.LegalRefinementStage || (exports.LegalRefinementStage = {}));
+})(LegalRefinementStage || (exports.LegalRefinementStage = LegalRefinementStage = {}));
 //# sourceMappingURL=query-property-interface.js.map

package/dist/lang/ast/types/query-property.d.ts

@@ -1,4 +1,4 @@
 import { MalloyElement } from './malloy-element';
 import { QueryPropertyInterface } from './query-property-interface';
-export declare type QueryProperty = MalloyElement & QueryPropertyInterface;
+export type QueryProperty = MalloyElement & QueryPropertyInterface;
 export declare function isQueryProperty(q: MalloyElement): q is QueryProperty;

package/dist/lang/ast/types/source-property.d.ts

@@ -8,5 +8,5 @@ import { Turtles } from '../source-properties/turtles';
 import { MalloyElement } from './malloy-element';
 import { TimezoneStatement } from '../source-properties/timezone-statement';
 import { ObjectAnnotation } from './annotation-elements';
-export declare type SourceProperty = Filter | Joins | DeclareFields | FieldListEdit | Renames | PrimaryKey | ObjectAnnotation | Turtles | TimezoneStatement;
+export type SourceProperty = Filter | Joins | DeclareFields | FieldListEdit | Renames | PrimaryKey | ObjectAnnotation | Turtles | TimezoneStatement;
 export declare function isSourceProperty(p: MalloyElement): p is SourceProperty;

package/dist/lang/field-utils.d.ts

@@ -1,5 +1,5 @@
 import { FieldDef, QueryFieldDef } from '../model/malloy_types';
-declare type Field = QueryFieldDef | FieldDef;
+type Field = QueryFieldDef | FieldDef;
 export declare function nameOf(qfd: Field): string;
 export declare function mergeFields<T extends Field>(older: T[] | undefined, newer: T[]): T[];
 export {};

package/dist/lang/lib/Malloy/MalloyLexer.js

@@ -31,16 +31,16 @@ const LexerATNSimulator_1 = require("antlr4ts/atn/LexerATNSimulator");
 const VocabularyImpl_1 = require("antlr4ts/VocabularyImpl");
 const Utils = __importStar(require("antlr4ts/misc/Utils"));
 class MalloyLexer extends Lexer_1.Lexer {
-    // tslint:enable:no-trailing-whitespace
-    constructor(input) {
-        super(input);
-        this._interp = new LexerATNSimulator_1.LexerATNSimulator(MalloyLexer._ATN, this);
-    }
     // @Override
     // @NotNull
     get vocabulary() {
         return MalloyLexer.VOCABULARY;
     }
+    // tslint:enable:no-trailing-whitespace
+    constructor(input) {
+        super(input);
+        this._interp = new LexerATNSimulator_1.LexerATNSimulator(MalloyLexer._ATN, this);
+    }
     // @Override
     get grammarFileName() { return "MalloyLexer.g4"; }
     // @Override

package/dist/lang/lib/Malloy/MalloyParser.d.ts

@@ -1520,8 +1520,9 @@ export declare class CalculateStatementContext extends ParserRuleContext {
 }
 export declare class ProjectStatementContext extends ParserRuleContext {
     tags(): TagsContext;
-    PROJECT(): TerminalNode;
     fieldCollection(): FieldCollectionContext;
+    SELECT(): TerminalNode | undefined;
+    PROJECT(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;