@malloydata/malloy 0.0.112-dev231206174321 → 0.0.112-dev231206194739

package/dist/lang/ast/elements/define-query.d.ts

@@ -1,4 +1,4 @@
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation } from '../../../model/malloy_types';
 import { DocStatement, Document, MalloyElement, DocStatementList } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
 import { SourceQueryNode } from './source-query';

package/dist/lang/ast/elements/define-source.d.ts

@@ -1,4 +1,4 @@
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation } from '../../../model/malloy_types';
 import { HasParameter } from '../parameters/has-parameter';
 import { DocStatement, Document, MalloyElement, DocStatementList } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';

package/dist/lang/ast/elements/pipeline-desc.d.ts

@@ -1,5 +1,4 @@
-import { PipeSegment, Pipeline, StructDef } from '../../../model/malloy_types';
-import { DocumentLocation, Annotation } from '../../../model/model_runtime_types';
+import { Annotation, DocumentLocation, PipeSegment, Pipeline, StructDef } from '../../../model/malloy_types';
 import { FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { QOPDesc } from '../query-properties/qop-desc';

package/dist/lang/ast/elements/refined-source.d.ts

@@ -1,5 +1,4 @@
-import { StructDef } from '../../../model/malloy_types';
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation, StructDef } from '../../../model/malloy_types';
 import { HasParameter } from '../parameters/has-parameter';
 import { SourceDesc } from '../types/source-desc';
 import { Source } from './source';

package/dist/lang/ast/field-space/rename-space-field.d.ts

@@ -1,5 +1,4 @@
-import { FieldDef, TypeDesc } from '../../../model/malloy_types';
-import { DocumentLocation } from '../../../model/model_runtime_types';
+import { DocumentLocation, FieldDef, TypeDesc } from '../../../model/malloy_types';
 import { SpaceField } from '../types/space-field';
 export declare class RenameSpaceField extends SpaceField {
     private readonly otherField;

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

@@ -1,6 +1,5 @@
 import { Dialect } from '../../../dialect/dialect';
-import { FieldTypeDef, StructDef, TypeDesc, FieldDef, QueryFieldDef } from '../../../model/malloy_types';
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation, FieldTypeDef, StructDef, TypeDesc, FieldDef, QueryFieldDef } from '../../../model/malloy_types';
 import { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import { FieldName, FieldSpace, QueryFieldSpace } from '../types/field-space';

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

@@ -1,5 +1,4 @@
-import { FieldDef, TypeDesc } from '../../../model/malloy_types';
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation, FieldDef, TypeDesc } from '../../../model/malloy_types';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import { FieldName, FieldSpace } from '../types/field-space';

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

@@ -1,5 +1,4 @@
-import { Expr, StructDef } from '../../../model/malloy_types';
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation, Expr, StructDef } from '../../../model/malloy_types';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import { QueryBuilder } from '../types/query-builder';

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

@@ -1,5 +1,4 @@
 import * as model from '../../../model/malloy_types';
-import { Annotation } from '../../../model/model_runtime_types';
 import { FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
@@ -16,7 +15,7 @@ declare abstract class TurtleDeclRoot extends TurtleHeadedPipe implements Noteab
     readonly name: string;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
-    note?: Annotation;
+    note?: model.Annotation;
     constructor(name: string);
     getPipeline(fs: FieldSpace): model.Pipeline;
     getFieldDef(fs: FieldSpace): model.TurtleDef;

package/dist/lang/ast/types/annotation-elements.d.ts

@@ -1,4 +1,4 @@
-import { Note } from '../../../model/model_runtime_types';
+import { Note } from '../../../model/malloy_types';
 import { Tag } from '../../../tags';
 import { MessageLogger } from '../../parse-log';
 import { Document, DocStatement, MalloyElement } from './malloy-element';

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

@@ -1,5 +1,4 @@
-import { DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
-import { Annotation, DocumentLocation } from '../../../model/model_runtime_types';
+import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../../../model/malloy_types';
 import { Tag } from '../../../tags';
 import { LogSeverity, MessageLogger } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';

package/dist/lang/ast/types/noteable.d.ts

@@ -1,4 +1,4 @@
-import { Annotation } from '../../../model/model_runtime_types';
+import { Annotation } from '../../../model/malloy_types';
 /**
  * An object which can receive annotations is "Noteable"
  */

package/dist/lang/malloy-parse-info.d.ts

@@ -1,6 +1,6 @@
 import { CodePointCharStream, CommonTokenStream, ParserRuleContext } from 'antlr4ts';
 import { ParseTree } from 'antlr4ts/tree';
-import { DocumentRange } from '../model/model_runtime_types';
+import { DocumentRange } from '../model/malloy_types';
 export interface MalloyParseInfo {
     root: ParseTree;
     tokenStream: CommonTokenStream;

package/dist/lang/malloy-to-ast.d.ts

@@ -9,7 +9,7 @@ import { MalloyParseInfo } from './malloy-parse-info';
 import { FieldDeclarationConstructor } from './ast';
 import { HasString, HasID } from './parse-utils';
 import { CastType } from '../model';
-import { DocumentLocation, Note } from '../model/model_runtime_types';
+import { DocumentLocation, Note } from '../model/malloy_types';
 import { Tag } from '../tags';
 declare class ErrorNode extends ast.SourceQueryNode {
     elementType: string;

package/dist/lang/parse-log.d.ts

@@ -1,4 +1,4 @@
-import { DocumentLocation } from '../model/model_runtime_types';
+import { DocumentLocation } from '../model/malloy_types';
 export type LogSeverity = 'error' | 'warn' | 'debug';
 /**
  * Default severity is "error"

package/dist/lang/parse-malloy.d.ts

@@ -1,6 +1,5 @@
 import { ANTLRErrorListener, ParserRuleContext, Token } from 'antlr4ts';
-import { DocumentReference, ImportLocation, ModelDef, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../model/malloy_types';
-import { DocumentLocation, DocumentPosition, DocumentRange } from '../model/model_runtime_types';
+import { DocumentLocation, DocumentPosition, DocumentRange, DocumentReference, ImportLocation, ModelDef, NamedModelObject, Query, SQLBlockStructDef, StructDef } from '../model/malloy_types';
 import { LogMessage, MessageLog, MessageLogger } from './parse-log';
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';

package/dist/lang/parse-tree-walkers/document-highlight-walker.d.ts

@@ -1,6 +1,6 @@
 import { CommonTokenStream } from 'antlr4ts';
 import { ParseTree } from 'antlr4ts/tree';
-import { DocumentRange } from '../../model/model_runtime_types';
+import { DocumentRange } from '../../model/malloy_types';
 export interface DocumentHighlight {
     range: DocumentRange;
     type: string;

package/dist/lang/parse-tree-walkers/document-symbol-walker.d.ts

@@ -1,6 +1,6 @@
 import { CommonTokenStream } from 'antlr4ts';
 import { ParseTree } from 'antlr4ts/tree';
-import { DocumentRange } from '../../model/model_runtime_types';
+import { DocumentRange } from '../../model/malloy_types';
 import { MalloyTranslation } from '../parse-malloy';
 export interface DocumentSymbol {
     range: DocumentRange;

package/dist/lang/parse-tree-walkers/find-external-references.d.ts

@@ -1,6 +1,6 @@
 import { CommonTokenStream } from 'antlr4ts';
 import { ParseTree } from 'antlr4ts/tree';
-import { DocumentRange } from '../../model/model_runtime_types';
+import { DocumentRange } from '../../model/malloy_types';
 import { MalloyTranslation } from '../parse-malloy';
 type NeedImports = Record<string, DocumentRange>;
 type NeedTables = Record<string, {

package/dist/lang/parse-tree-walkers/model-annotation-walker.d.ts

@@ -1,5 +1,5 @@
 import { CommonTokenStream } from 'antlr4ts';
 import { MalloyTranslation } from '../parse-malloy';
-import { Annotation } from '../../model/model_runtime_types';
+import { Annotation } from '../../model/malloy_types';
 import { MalloyParseInfo } from '../malloy-parse-info';
 export declare function walkForModelAnnotation(forParse: MalloyTranslation, tokens: CommonTokenStream, parseInfo: MalloyParseInfo): Annotation;

package/dist/lang/test/test-translator.d.ts

@@ -1,5 +1,4 @@
-import { FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, SQLBlockSource, SQLBlockStructDef, StructDef, TurtleDef } from '../../model/malloy_types';
-import { DocumentLocation } from '../../model/model_runtime_types';
+import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, SQLBlockSource, SQLBlockStructDef, StructDef, TurtleDef } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import { NameSpace } from '../ast/types/name-space';
 import { ModelEntry } from '../ast/types/model-entry';

package/dist/lang/translate-response.d.ts

@@ -1,5 +1,4 @@
-import { ModelDef, Query, SQLBlockSource, SQLBlockStructDef } from '../model/malloy_types';
-import { Annotation } from '../model/model_runtime_types';
+import { Annotation, ModelDef, Query, SQLBlockSource, SQLBlockStructDef } from '../model/malloy_types';
 import { MalloyElement } from './ast';
 import { LogMessage } from './parse-log';
 import { DocumentSymbol } from './parse-tree-walkers/document-symbol-walker';

package/dist/lang/utils.d.ts

@@ -1,2 +1,2 @@
-import { DocumentLocation, DocumentPosition } from '../model/model_runtime_types';
+import { DocumentLocation, DocumentPosition } from '../model/malloy_types';
 export declare function locationContainsPosition(location: DocumentLocation, position: DocumentPosition): boolean;

package/dist/lang/zone.d.ts

@@ -1,4 +1,4 @@
-import { DocumentLocation } from '../model/model_runtime_types';
+import { DocumentLocation } from '../model/malloy_types';
 export type ZoneData<TValue> = Record<string, TValue>;
 type EntryStatus = 'present' | 'reference' | 'error';
 interface AllEntries {

package/dist/model/index.d.ts

@@ -1,3 +1,2 @@
 export * from './malloy_types';
 export { Segment, QueryModel, flattenQuery } from './malloy_query';
-export * from './model_runtime_types';

package/dist/model/index.js

@@ -42,5 +42,4 @@ var malloy_query_1 = require("./malloy_query");
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return malloy_query_1.Segment; } });
 Object.defineProperty(exports, "QueryModel", { enumerable: true, get: function () { return malloy_query_1.QueryModel; } });
 Object.defineProperty(exports, "flattenQuery", { enumerable: true, get: function () { return malloy_query_1.flattenQuery; } });
-__exportStar(require("./model_runtime_types"), exports);
 //# sourceMappingURL=index.js.map

package/dist/model/malloy_types.d.ts

@@ -1,4 +1,4 @@
-import { SQLBlock, QueryRunStats, DocumentLocation, Annotation, NamedObject, AliasedName, QueryData, HasLocation, QueryValue } from './model_runtime_types';
+/// <reference types="node" />
 interface ParamBase {
     name: string;
     type: AtomicFieldType;
@@ -17,10 +17,22 @@ export type Parameter = ParamCondition | ParamValue;
 export declare function isValueParameter(p: Parameter): p is ParamValue;
 export declare function isConditionParameter(p: Parameter): p is ParamCondition;
 export declare function paramHasValue(p: Parameter): boolean;
+export interface DocumentRange {
+    start: DocumentPosition;
+    end: DocumentPosition;
+}
+export interface DocumentPosition {
+    line: number;
+    character: number;
+}
 export interface ImportLocation {
     importURL: string;
     location: DocumentLocation;
 }
+export interface DocumentLocation {
+    url: string;
+    range: DocumentRange;
+}
 interface DocumentReferenceBase {
     text: string;
     location: DocumentLocation;
@@ -47,6 +59,15 @@ export interface DocumentFieldReference extends DocumentReferenceBase {
     definition: FieldDef;
 }
 export type DocumentReference = DocumentExploreReference | DocumentQueryReference | DocumentSQLBlockReference | DocumentFieldReference | DocumentJoinReference;
+/** put location into the parse tree. */
+export interface HasLocation {
+    location?: DocumentLocation;
+}
+/** All names have their source names and how they will appear in the symbol table that owns them */
+export interface AliasedName {
+    name: string;
+    as?: string;
+}
 export interface TypedObject {
     type: string;
 }
@@ -54,6 +75,10 @@ export interface FilteredAliasedName extends AliasedName {
     filterList?: FilterExpression[];
 }
 export declare function isFilteredAliasedName(f: FieldTypeRef): f is FilteredAliasedName;
+/** all named objects have a type an a name (optionally aliased) */
+export interface NamedObject extends AliasedName, HasLocation {
+    type: string;
+}
 export interface ResultMetadataDef {
     sourceField: string;
     sourceExpression?: string;
@@ -468,6 +493,11 @@ export interface SQLBlockSource {
     connection?: string;
     select: SQLPhrase[];
 }
+export interface SQLBlock extends NamedObject {
+    type: 'sqlBlock';
+    connection?: string;
+    selectStr: string;
+}
 interface SubquerySource {
     type: 'sql';
     method: 'subquery';
@@ -589,10 +619,40 @@ export interface ModelDef {
 /** Very common record type */
 export type NamedStructDefs = Record<string, StructDef>;
 export type NamedModelObjects = Record<string, NamedModelObject>;
+/** Malloy source annotations attached to objects */
+export interface Annotation {
+    inherits?: Annotation;
+    blockNotes?: Note[];
+    notes?: Note[];
+}
+export interface Note {
+    text: string;
+    at: DocumentLocation;
+}
 /** Annotations with a uuid to make it easier to stream */
 export interface ModelAnnotation extends Annotation {
     id: string;
 }
+export type QueryScalar = string | boolean | number | Date | Buffer | null;
+/** One value in one column of returned data. */
+export type QueryValue = QueryScalar | QueryData | QueryDataRow;
+/** A row of returned data. */
+export type QueryDataRow = {
+    [columnName: string]: QueryValue;
+};
+/** Returned query data. */
+export type QueryData = QueryDataRow[];
+/** Query execution stats. */
+export type QueryRunStats = {
+    queryCostBytes?: number;
+};
+/** Returned Malloy query data */
+export type MalloyQueryData = {
+    rows: QueryDataRow[];
+    totalRows: number;
+    runStats?: QueryRunStats;
+    profilingUrl?: string;
+};
 export interface DrillSource {
     sourceExplore: string;
     sourceFilters?: FilterExpression[];

package/dist/model/malloy_types.js

@@ -426,4 +426,5 @@ function isValueDate(value, field) {
     return field.type === 'date';
 }
 exports.isValueDate = isValueDate;
+// clang-format on
 //# sourceMappingURL=malloy_types.js.map

package/dist/run_sql_options.d.ts

@@ -1,4 +1,4 @@
-import { Annotation } from './model/model_runtime_types';
+import { Annotation } from './model/malloy_types';
 export interface RunSQLOptions {
     rowLimit?: number;
     abortSignal?: AbortSignal;

package/dist/runtime_types.d.ts

@@ -1,6 +1,5 @@
 import { RunSQLOptions } from './run_sql_options';
-import { StructDef } from './model/malloy_types';
-import { Annotation, QueryRunStats, QueryDataRow, MalloyQueryData, SQLBlock } from './model/model_runtime_types';
+import { Annotation, MalloyQueryData, QueryDataRow, QueryRunStats, SQLBlock, StructDef } from './model/malloy_types';
 import { Dialect } from './dialect';
 /**
  * The contents of a Malloy query document.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.112-dev231206174321",
+  "version": "0.0.112-dev231206194739",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/model/model_runtime_types.d.ts

@@ -1,61 +0,0 @@
-/// <reference types="node" />
-/** Query execution stats. */
-export type QueryRunStats = {
-    queryCostBytes?: number;
-};
-/** Malloy source annotations attached to objects */
-export interface Annotation {
-    inherits?: Annotation;
-    blockNotes?: Note[];
-    notes?: Note[];
-}
-export interface Note {
-    text: string;
-    at: DocumentLocation;
-}
-export interface DocumentLocation {
-    url: string;
-    range: DocumentRange;
-}
-export interface DocumentRange {
-    start: DocumentPosition;
-    end: DocumentPosition;
-}
-export interface DocumentPosition {
-    line: number;
-    character: number;
-}
-/** A row of returned data. */
-export type QueryDataRow = {
-    [columnName: string]: QueryValue;
-};
-export type QueryScalar = string | boolean | number | Date | Buffer | null;
-/** One value in one column of returned data. */
-export type QueryValue = QueryScalar | QueryData | QueryDataRow;
-/** Returned query data. */
-export type QueryData = QueryDataRow[];
-/** Returned Malloy query data */
-export type MalloyQueryData = {
-    rows: QueryDataRow[];
-    totalRows: number;
-    runStats?: QueryRunStats;
-    profilingUrl?: string;
-};
-/** All names have their source names and how they will appear in the symbol table that owns them */
-export interface AliasedName {
-    name: string;
-    as?: string;
-}
-/** put location into the parse tree. */
-export interface HasLocation {
-    location?: DocumentLocation;
-}
-/** all named objects have a type an a name (optionally aliased) */
-export interface NamedObject extends AliasedName, HasLocation {
-    type: string;
-}
-export interface SQLBlock extends NamedObject {
-    type: 'sqlBlock';
-    connection?: string;
-    selectStr: string;
-}

package/dist/model/model_runtime_types.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=model_runtime_types.js.map