@malloydata/malloy 0.0.132-dev240315233415 → 0.0.132-dev240318200933

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

@@ -84,9 +84,6 @@ import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { TagsContext } from "./MalloyParser";
 import { IsDefineContext } from "./MalloyParser";
 import { RunStatementContext } from "./MalloyParser";
-import { DefineSQLStatementContext } from "./MalloyParser";
-import { SqlBlockContext } from "./MalloyParser";
-import { BlockSQLDefContext } from "./MalloyParser";
 import { SqlStringContext } from "./MalloyParser";
 import { SqlInterpolationContext } from "./MalloyParser";
 import { ImportStatementContext } from "./MalloyParser";
@@ -1216,36 +1213,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitRunStatement?: (ctx: RunStatementContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.defineSQLStatement`.
-     * @param ctx the parse tree
-     */
-    enterDefineSQLStatement?: (ctx: DefineSQLStatementContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.defineSQLStatement`.
-     * @param ctx the parse tree
-     */
-    exitDefineSQLStatement?: (ctx: DefineSQLStatementContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.sqlBlock`.
-     * @param ctx the parse tree
-     */
-    enterSqlBlock?: (ctx: SqlBlockContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.sqlBlock`.
-     * @param ctx the parse tree
-     */
-    exitSqlBlock?: (ctx: SqlBlockContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.blockSQLDef`.
-     * @param ctx the parse tree
-     */
-    enterBlockSQLDef?: (ctx: BlockSQLDefContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.blockSQLDef`.
-     * @param ctx the parse tree
-     */
-    exitBlockSQLDef?: (ctx: BlockSQLDefContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.sqlString`.
      * @param ctx the parse tree

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

@@ -84,9 +84,6 @@ import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { TagsContext } from "./MalloyParser";
 import { IsDefineContext } from "./MalloyParser";
 import { RunStatementContext } from "./MalloyParser";
-import { DefineSQLStatementContext } from "./MalloyParser";
-import { SqlBlockContext } from "./MalloyParser";
-import { BlockSQLDefContext } from "./MalloyParser";
 import { SqlStringContext } from "./MalloyParser";
 import { SqlInterpolationContext } from "./MalloyParser";
 import { ImportStatementContext } from "./MalloyParser";
@@ -802,24 +799,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitRunStatement?: (ctx: RunStatementContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.defineSQLStatement`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitDefineSQLStatement?: (ctx: DefineSQLStatementContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.sqlBlock`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitSqlBlock?: (ctx: SqlBlockContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.blockSQLDef`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitBlockSQLDef?: (ctx: BlockSQLDefContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sqlString`.
      * @param ctx the parse tree

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

@@ -84,7 +84,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitTableFunction(pcx: parse.TableFunctionContext): ast.TableSource;
     visitTableMethod(pcx: parse.TableMethodContext): ast.TableSource;
-    protected getLegacySQLSouce(pcx: parse.SqlExploreNameRefContext): ast.FromSQLSource;
     visitSqlSource(pcx: parse.SqlSourceContext): ast.SQLSource;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.Joins;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
@@ -197,7 +196,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitLiteralYear(pcx: parse.LiteralYearContext): ast.ExpressionDef;
     visitImportStatement(pcx: parse.ImportStatementContext): ast.ImportStatement;
     visitJustExpr(pcx: parse.JustExprContext): ast.ExpressionDef;
-    visitDefineSQLStatement(pcx: parse.DefineSQLStatementContext): ast.SQLStatement;
     visitSampleStatement(pcx: parse.SampleStatementContext): ast.SampleProperty;
     visitDocAnnotations(pcx: parse.DocAnnotationsContext): ast.ModelAnnotation;
     visitIgnoredObjectAnnotations(pcx: parse.IgnoredObjectAnnotationsContext): IgnoredElement;

package/dist/lang/malloy-to-ast.js

@@ -313,11 +313,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const tablePath = this.getPlainString(pcx.tablePath());
         return this.astAt(new ast.TableMethodSource(connectionName, tablePath), pcx);
     }
-    getLegacySQLSouce(pcx) {
-        const name = this.getModelEntryName(pcx);
-        const res = this.astAt(new ast.FromSQLSource(name), pcx);
-        return res;
-    }
     visitSqlSource(pcx) {
         const connId = pcx.connectionId();
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
@@ -1168,36 +1163,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitJustExpr(pcx) {
         return this.getFieldExpr(pcx.fieldExpr());
     }
-    visitDefineSQLStatement(pcx) {
-        var _a;
-        const blockName = (_a = pcx.nameSQLBlock()) === null || _a === void 0 ? void 0 : _a.text;
-        const blockParts = pcx.sqlBlock().blockSQLDef();
-        const sqlStr = new ast.SQLString();
-        let connectionName;
-        for (const blockEnt of blockParts) {
-            const nmCx = blockEnt.connectionName();
-            if (nmCx) {
-                if (connectionName) {
-                    this.contextError(nmCx, 'Cannot redefine connection');
-                }
-                else {
-                    connectionName = this.getPlainString(nmCx);
-                }
-            }
-            const selCx = blockEnt.sqlString();
-            if (selCx) {
-                this.makeSqlString(selCx, sqlStr);
-            }
-        }
-        const stmt = new ast.SQLStatement(sqlStr);
-        if (connectionName !== undefined) {
-            stmt.connection = connectionName;
-        }
-        stmt.is = blockName;
-        const result = this.astAt(stmt, pcx);
-        this.m4advisory(pcx, '`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
-        return result;
-    }
     visitSampleStatement(pcx) {
         const rowCx = pcx.sampleSpec().INTEGER_LITERAL();
         if (rowCx) {

package/dist/lang/parse-malloy.js

@@ -55,7 +55,6 @@ const parse_log_1 = require("./parse-log");
 const find_external_references_1 = require("./parse-tree-walkers/find-external-references");
 const zone_1 = require("./zone");
 const document_symbol_walker_1 = require("./parse-tree-walkers/document-symbol-walker");
-const document_highlight_walker_1 = require("./parse-tree-walkers/document-highlight-walker");
 const document_completion_walker_1 = require("./parse-tree-walkers/document-completion-walker");
 const document_help_context_walker_1 = require("./parse-tree-walkers/document-help-context-walker");
 const reference_list_1 = require("./reference-list");
@@ -299,48 +298,24 @@ class ASTStep {
         const secondPass = new malloy_to_ast_1.MalloyToAST(parse, that.root.logger, that.compilerFlags);
         const newAst = secondPass.visit(parse.root);
         that.compilerFlags = secondPass.compilerFlags;
-        if (that.root.logger.hasErrors()) {
-            this.response = that.fatalResponse();
-            return this.response;
-        }
         if (newAst.elementType === 'unimplemented') {
-            throw new Error('TRANSLATOR INTERNAL ERROR: Unimplemented AST node');
+            newAst.log('INTERNAL COMPILER ERROR: Untranslated parse node');
         }
-        // I kind of think table refs should probably also be collected here
-        // instead of in the parse step. Note to myself, do that someday.
-        const sqlExplores = {};
         if (!this.walked) {
+            // The DocumentStatement.needs method has largely replaced the need to walk
+            // the AST once it has been translated, this one check remains, though
+            // it should probably never be hit
             for (const walkedTo of newAst.walk()) {
-                if (walkedTo instanceof ast.FromSQLSource) {
-                    if (!sqlExplores[walkedTo.refName]) {
-                        sqlExplores[walkedTo.refName] = {};
-                    }
-                    sqlExplores[walkedTo.refName].ref = walkedTo;
-                }
-                else if (walkedTo instanceof ast.SQLStatement && walkedTo.is) {
-                    if (!sqlExplores[walkedTo.is]) {
-                        sqlExplores[walkedTo.is] = {};
-                    }
-                    sqlExplores[walkedTo.is].def = walkedTo;
-                }
-                else if (walkedTo instanceof ast.Unimplemented) {
+                if (walkedTo instanceof ast.Unimplemented) {
                     walkedTo.log('INTERNAL COMPILER ERROR: Untranslated parse node');
                 }
             }
             this.walked = true;
         }
-        // If there is a partial ast ...
         if (that.root.logger.hasErrors()) {
             this.response = that.fatalResponse();
             return this.response;
         }
-        /*
-    TODO we used to scna the AST for SQL blocks here, don't need to do that
-    becausae that happens at the translate step, but the code I need to
-    understand is how a root translate can return the need of a chiold
-    which has an SQL block ...
-    
-    */
         // Now make sure that every child has fully translated itself
         // before this tree is ready to also translate ...
         for (const child of that.childTranslators.values()) {
@@ -380,19 +355,8 @@ class MetadataStep {
                 catch {
                     // Do nothing, symbols already `undefined`
                 }
-                let walkHighlights;
-                try {
-                    walkHighlights = (0, document_highlight_walker_1.walkForDocumentHighlights)(tryParse.parse.tokenStream, tryParse.parse.root);
-                }
-                catch {
-                    walkHighlights = [];
-                }
                 this.response = {
                     symbols,
-                    highlights: (0, document_highlight_walker_1.sortHighlights)([
-                        ...(0, document_highlight_walker_1.passForHighlights)(tryParse.parse.tokenStream),
-                        ...walkHighlights,
-                    ]),
                     final: true,
                 };
             }

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

@@ -241,16 +241,6 @@ class DocumentSymbolWalker {
             parent.children.push(symbol);
         }
     }
-    enterDefineSQLStatement(pcx) {
-        const name = pcx.nameSQLBlock().text;
-        const symbol = {
-            range: this.translator.rangeFromContext(pcx),
-            name,
-            type: 'sql',
-            children: [],
-        };
-        this.symbols.push(symbol);
-    }
     enterImportStatement(pcx) {
         const name = (0, parse_utils_1.getStringIfShort)(pcx.importURL());
         if (name) {

package/dist/lang/test/locations.spec.js

@@ -154,21 +154,6 @@ describe('source locations', () => {
             expect(a.location).toMatchObject(source.locations[0]);
         }
     });
-    test('pre m4 location of named SQL block', () => {
-        const source = (0, test_translator_1.markSource) `##! -m4warnings\n${'sql: s is { select: """SELECT 1 as one""" }'}`;
-        const m = new test_translator_1.TestTranslator(source.code);
-        expect(m).toParse();
-        const compileSql = m.translate().compileSQL;
-        expect(compileSql).toBeDefined();
-        if (compileSql) {
-            m.update({
-                compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
-            });
-            expect(m).toTranslate();
-            const s = m.sqlBlocks[0];
-            expect(s.location).isLocationIn(source.locations[0], source.code);
-        }
-    });
     test('location of renamed field', () => {
         const source = (0, test_translator_1.markSource) `
       source: na is a extend {
@@ -221,14 +206,6 @@ describe('source locations', () => {
         const y = (0, test_translator_1.getFieldDef)(x, 'y');
         expect(y.location).toMatchObject(source.locations[0]);
     });
-    // Since """ strings are not single tokens, I don't know how to do this.
-    // test("multi line sql block token span is correct", () => {
-    //   const sqlSource = `sql: { select: """// line 0\n//line 1\n// line 2""" }`;
-    //   const m = new TestTranslator(sqlSource);
-    //   expect(m).not.toParse();
-    //   const errList = m.errors().errors;
-    //   expect(errList[0].at?.range.end).toEqual({ line: 2, character: 11 });
-    // });
     test('undefined query location', () => {
         expect((0, test_translator_1.model) `run: ${'xyz'}`).translationToFailWith("Reference to undefined object 'xyz'");
     });

package/dist/lang/test/parse.spec.js

@@ -571,17 +571,6 @@ describe('sql expressions', () => {
             expect(m).toTranslate();
         }
     });
-    test('sql statement deprecation warning', () => {
-        const m = new test_translator_1.TestTranslator(`##! m4warnings=warn
-      sql: bad_sql is {select: """SELECT 1 as one"""}`);
-        const req = m.translate().compileSQL;
-        if (req) {
-            m.update({
-                compileSQL: { [req.name]: (0, test_translator_1.getSelectOneStruct)(req) },
-            });
-        }
-        expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
-    });
     test('reference to sql expression in run', () => {
         const m = new test_translator_1.TestTranslator(`
       run: bigquery.sql("""select 1 as one""")

package/dist/lang/test/sql-block.spec.js

@@ -28,17 +28,7 @@ const sql_block_1 = require("../../model/sql_block");
 const test_translator_1 = require("./test-translator");
 require("./parse-expects");
 const parse_malloy_1 = require("../parse-malloy");
-function unlocatedStructDef(sd) {
-    const ret = { ...sd };
-    ret.fields = sd.fields.map(f => {
-        const nf = { ...f };
-        delete nf.location;
-        return nf;
-    });
-    delete ret.location;
-    return ret;
-}
-describe('sql:', () => {
+describe('sql blocks in malloy', () => {
     const selStmt = 'SELECT * FROM aTable';
     function makeSchemaResponse(sql) {
         const cname = sql.connection || 'bigquery';
@@ -59,37 +49,6 @@ describe('sql:', () => {
             fields: test_translator_1.aTableDef.fields,
         };
     }
-    test('definition', () => {
-        const model = new test_translator_1.TestTranslator(`
-      ##! -m4warnings
-      sql: users IS {
-        select: """${selStmt}"""
-        connection: "aConnection"
-      }
-    `);
-        const needReq = model.translate();
-        expect(model).toParse();
-        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
-        expect(needs).toBeDefined();
-        if (needs) {
-            const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }], 'aConnection');
-            expect(needs).toMatchObject(sql);
-            const refKey = needs.name;
-            expect(refKey).toBeDefined();
-            if (refKey) {
-                const sr = makeSchemaResponse(sql);
-                model.update({ compileSQL: { [refKey]: sr } });
-                expect(model).toTranslate();
-                const expectThis = unlocatedStructDef({ ...sr, as: 'users' });
-                if ((0, model_1.isSQLBlockStruct)(expectThis)) {
-                    expectThis.declaredSQLBlock = true;
-                }
-                const got = unlocatedStructDef(model.sqlBlocks[0]);
-                delete got.modelAnnotation;
-                expect(got).toEqual(expectThis);
-            }
-        }
-    });
     test('source from sql', () => {
         const model = new test_translator_1.TestTranslator(`
       source: users is aConnection.sql("""${selStmt}""")
@@ -132,29 +91,7 @@ describe('sql:', () => {
     });
     it('simple turducken', () => {
         const m = new test_translator_1.TestTranslator(`
-      ##! -m4warnings
-      sql: someSql is {
-        select: """SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1"""
-      }
-    `);
-        expect(m).toParse();
-        const compileSql = m.translate().compileSQL;
-        expect(compileSql).toBeDefined();
-        if (compileSql) {
-            const select = compileSql.select[0];
-            const star = compileSql.select[1];
-            const where = compileSql.select[2];
-            expect(select).toEqual({ sql: 'SELECT * FROM ' });
-            expect((0, model_1.isSQLFragment)(star)).toBeFalsy();
-            expect(where).toEqual({ sql: ' WHERE 1=1' });
-        }
-    });
-    it('old style ', () => {
-        const m = new test_translator_1.TestTranslator(`
-      ##! -m4warnings
-      sql: someSql is {
-        select: """SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1"""
-      }
+      source: someSql is _db_.sql("""SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1""")
     `);
         expect(m).toParse();
         const compileSql = m.translate().compileSQL;
@@ -200,22 +137,6 @@ describe('sql:', () => {
     `);
         expect(m).toParse();
     });
-    it('model preserved', () => {
-        const shouldBeOK = `
-      ##! -m4warnings
-      source: newa is a
-      sql: someSql is { select: """${selStmt}""" }
-      source: newaa is newa
-    `;
-        const model = new test_translator_1.TestTranslator(shouldBeOK);
-        expect(model).toParse();
-        const needReq = model.translate();
-        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
-        expect(needs).toBeDefined();
-        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }]);
-        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
-        expect(model).toTranslate();
-    });
     test('source from extended sql-based-source', () => {
         var _a, _b;
         const model = new test_translator_1.TestTranslator(`

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

@@ -2,7 +2,6 @@ import { Annotation, ModelDef, Query, SQLBlockSource, SQLBlockStructDef } from '
 import { MalloyElement } from './ast';
 import { LogMessage } from './parse-log';
 import { DocumentSymbol } from './parse-tree-walkers/document-symbol-walker';
-import { DocumentHighlight } from './parse-tree-walkers/document-highlight-walker';
 import { DocumentCompletion } from './parse-tree-walkers/document-completion-walker';
 import { DocumentHelpContext } from './parse-tree-walkers/document-help-context-walker';
 /**
@@ -40,7 +39,6 @@ interface ASTData extends ProblemResponse, NeededData, FinalResponse {
 export type ASTResponse = Partial<ASTData>;
 interface Metadata extends NeededData, ProblemResponse, FinalResponse {
     symbols: DocumentSymbol[];
-    highlights: DocumentHighlight[];
 }
 export type MetadataResponse = Partial<Metadata>;
 interface ModelAnnotationData extends NeededData, ProblemResponse, FinalResponse {

package/dist/malloy.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { RunSQLOptions } from './run_sql_options';
-import { DocumentCompletion as DocumentCompletionDefinition, DocumentHighlight as DocumentHighlightDefinition, DocumentSymbol as DocumentSymbolDefinition, LogMessage, MalloyTranslator } from './lang';
+import { DocumentCompletion as DocumentCompletionDefinition, DocumentSymbol as DocumentSymbolDefinition, LogMessage, MalloyTranslator } from './lang';
 import { DocumentHelpContext } from './lang/parse-tree-walkers/document-help-context-walker';
 import { CompiledQuery, DocumentLocation, DocumentReference, FieldBooleanDef, FieldDateDef, FieldJSONDef, FieldNumberDef, FieldStringDef, FieldTimestampDef, FieldTypeDef, FilterExpression, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SQLBlock, SQLBlockSource, SQLBlockStructDef, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, FieldUnsupportedDef, QueryRunStats, ImportLocation, Annotation } from './model';
 import { Connection, InfoConnection, LookupConnection, ModelString, ModelURL, QueryString, QueryURL, URLReader } from './runtime_types';
@@ -267,15 +267,6 @@ export declare class PreparedQuery implements Taggable {
 export declare class Parse {
     private translator;
     constructor(translator: MalloyTranslator);
-    /**
-     * Retrieve the document highlights for the parsed document.
-     *
-     * These highlights represent the parsed tokens contained in the document,
-     * and may be used for syntax highlighting in an IDE, for example.
-     *
-     * @return An array of document highlights.
-     */
-    get highlights(): DocumentHighlight[];
     /**
      * Retrieve the symbols defined in the parsed document.
      *
@@ -295,25 +286,6 @@ export declare class Parse {
         character: number;
     }): DocumentHelpContext | undefined;
 }
-/**
- * A document highlight.
- *
- * Represents a parsed token contained in a Malloy document
- * and may be used for syntax highlighting in an IDE, for example.
- */
-export declare class DocumentHighlight {
-    private _range;
-    private _type;
-    constructor(documentHighlight: DocumentHighlightDefinition);
-    /**
-     * @return The range of characters this highlight spans within its source document.
-     */
-    get range(): DocumentRange;
-    /**
-     * @return The type of highlight, which may be any `HighlightType`.
-     */
-    get type(): string;
-}
 /**
  * A range of characters within a Malloy document.
  */

package/dist/malloy.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentHighlight = exports.Parse = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
+exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.Parse = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
 const lang_1 = require("./lang");
 const model_1 = require("./model");
 const luxon_1 = require("luxon");
@@ -546,17 +546,6 @@ class Parse {
     constructor(translator) {
         this.translator = translator;
     }
-    /**
-     * Retrieve the document highlights for the parsed document.
-     *
-     * These highlights represent the parsed tokens contained in the document,
-     * and may be used for syntax highlighting in an IDE, for example.
-     *
-     * @return An array of document highlights.
-     */
-    get highlights() {
-        return (this.translator.metadata().highlights || []).map(highlight => new DocumentHighlight(highlight));
-    }
     /**
      * Retrieve the symbols defined in the parsed document.
      *
@@ -579,31 +568,6 @@ class Parse {
     }
 }
 exports.Parse = Parse;
-/**
- * A document highlight.
- *
- * Represents a parsed token contained in a Malloy document
- * and may be used for syntax highlighting in an IDE, for example.
- */
-class DocumentHighlight {
-    constructor(documentHighlight) {
-        this._range = new DocumentRange(new DocumentPosition(documentHighlight.range.start.line, documentHighlight.range.start.character), new DocumentPosition(documentHighlight.range.end.line, documentHighlight.range.end.character));
-        this._type = documentHighlight.type;
-    }
-    /**
-     * @return The range of characters this highlight spans within its source document.
-     */
-    get range() {
-        return this._range;
-    }
-    /**
-     * @return The type of highlight, which may be any `HighlightType`.
-     */
-    get type() {
-        return this._type;
-    }
-}
-exports.DocumentHighlight = DocumentHighlight;
 /**
  * A range of characters within a Malloy document.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.132-dev240315233415",
+  "version": "0.0.132-dev240318200933",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",

package/dist/lang/ast/source-elements/from-sql-source.d.ts

@@ -1,7 +0,0 @@
-import { StructDef, StructRef } from '../../../model/malloy_types';
-import { NamedSource } from './named-source';
-export declare class FromSQLSource extends NamedSource {
-    elementType: string;
-    structRef(): StructRef;
-    modelStruct(): StructDef | undefined;
-}

package/dist/lang/ast/source-elements/from-sql-source.js

@@ -1,68 +0,0 @@
-"use strict";
-/*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FromSQLSource = void 0;
-const malloy_types_1 = require("../../../model/malloy_types");
-const named_source_1 = require("./named-source");
-class FromSQLSource extends named_source_1.NamedSource {
-    constructor() {
-        super(...arguments);
-        this.elementType = 'fromSQLSource';
-    }
-    structRef() {
-        return this.structDef();
-    }
-    modelStruct() {
-        const modelEnt = this.modelEntry(this.ref);
-        const entry = modelEnt === null || modelEnt === void 0 ? void 0 : modelEnt.entry;
-        if (!entry) {
-            this.log(`Undefined from_sql source '${this.refName}'`);
-            return;
-        }
-        if (entry.type === 'function') {
-            this.log(`Cannot construct a source from a function '${this.refName}'`);
-            return;
-        }
-        else if (entry.type === 'query') {
-            this.log(`Cannot use 'from_sql()' with a query '${this.refName}'`);
-            return;
-        }
-        else if (entry.type === 'connection') {
-            this.log(`Cannot use 'from_sql()' with a connection '${this.refName}'`);
-            return;
-        }
-        else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const { declaredSQLBlock, ...newEntry } = entry;
-            return newEntry;
-        }
-        else if (!(0, malloy_types_1.isSQLBlockStruct)(entry)) {
-            this.log(`Cannot use 'from_sql()' to reference '${this.refName}'`);
-            return;
-        }
-        this.log(`Cannot use 'from_sql()' to reference '${this.refName}'`);
-    }
-}
-exports.FromSQLSource = FromSQLSource;
-//# sourceMappingURL=from-sql-source.js.map

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

@@ -1,21 +0,0 @@
-import { SQLBlockSource } from '../../../model/malloy_types';
-import { ModelDataRequest } from '../../translate-response';
-import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
-import { SQLString } from './sql-string';
-export declare class SQLStatement extends MalloyElement implements DocStatement {
-    readonly select: SQLString;
-    elementType: string;
-    is?: string;
-    connection?: string;
-    requestBlock?: SQLBlockSource;
-    constructor(select: SQLString);
-    sqlBlock(): SQLBlockSource;
-    private lookupCompiledSQL;
-    needs(doc: Document): ModelDataRequest;
-    /**
-     * This is the one statement which pauses execution. First time through
-     * it will generate a schema request, next time through it will either
-     * record the error or record the schema.
-     */
-    execute(doc: Document): void;
-}