@malloydata/malloy 0.0.48-dev230624040051 → 0.0.48-dev230626171048

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

@@ -7,5 +7,6 @@ export interface DocumentSymbol {
     type: string;
     name: string;
     children: DocumentSymbol[];
+    lensRange?: DocumentRange;
 }
 export declare function walkForDocumentSymbols(forParse: MalloyTranslation, tokens: CommonTokenStream, parseTree: ParseTree): DocumentSymbol[];

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

@@ -37,20 +37,32 @@ class DocumentSymbolWalker {
     peekScope() {
         return this.scopes[this.scopes.length - 1];
     }
+    enterTopLevelQueryDefs(pcx) {
+        const blockRange = this.translator.rangeFromContext(pcx);
+        const defs = pcx.topLevelQueryDef();
+        if (defs.length === 1) {
+            this.blockRange = blockRange;
+        }
+    }
     enterTopLevelQueryDef(pcx) {
         this.symbols.push({
             range: this.translator.rangeFromContext(pcx),
             name: pcx.queryName().text,
             type: 'query',
             children: [],
+            lensRange: this.blockRange,
         });
     }
+    exitTopLevelQueryDefs(_pcx) {
+        this.blockRange = undefined;
+    }
     enterRunStatementDef(pcx) {
         this.symbols.push({
             range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef()),
             name: 'unnamed_query',
             type: 'unnamed_query',
             children: [],
+            lensRange: this.translator.rangeFromContext(pcx),
         });
     }
     enterRunStatementRef(pcx) {
@@ -59,22 +71,37 @@ class DocumentSymbolWalker {
             name: pcx.queryName().id().text,
             type: 'query',
             children: [],
+            lensRange: this.translator.rangeFromContext(pcx),
         });
     }
-    enterTopLevelAnonQueryDef(pcx) {
+    enterAnonymousQuery(pcx) {
         this.symbols.push({
-            range: this.translator.rangeFromContext(pcx),
+            range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef().query()),
             name: 'unnamed_query',
             type: 'unnamed_query',
             children: [],
+            lensRange: this.translator.rangeFromContext(pcx),
         });
     }
+    enterDefineSourceStatement(pcx) {
+        const blockRange = this.translator.rangeFromContext(pcx);
+        const sourcePl = pcx.sourcePropertyList();
+        const defs = sourcePl.sourceDefinition();
+        if (defs.length === 1) {
+            this.blockRange = blockRange;
+        }
+    }
+    exitDefineSourceStatement(_pcx) {
+        this.blockRange = undefined;
+    }
     enterSourceDefinition(pcx) {
+        const range = this.translator.rangeFromContext(pcx);
         this.scopes.push({
-            range: this.translator.rangeFromContext(pcx),
+            range,
             name: pcx.sourceNameDef().id().text,
             type: 'explore',
             children: [],
+            lensRange: this.blockRange,
         });
     }
     exitSourceDefinition(_pcx) {
@@ -83,12 +110,20 @@ class DocumentSymbolWalker {
             this.symbols.push(scope);
         }
     }
+    enterDefExploreQuery(pcx) {
+        const blockRange = this.translator.rangeFromContext(pcx);
+        const defs = pcx.subQueryDefList().exploreQueryDef();
+        if (defs.length === 1) {
+            this.blockRange = blockRange;
+        }
+    }
     enterExploreQueryDef(pcx) {
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
             name: pcx.exploreQueryNameDef().id().text,
             type: 'query',
             children: [],
+            lensRange: this.blockRange,
         };
         const parent = this.peekScope();
         if (parent) {
@@ -99,6 +134,9 @@ class DocumentSymbolWalker {
     exitExploreQueryDef(_pcx) {
         this.popScope();
     }
+    exitDefExploreQuery(_pcx) {
+        this.blockRange = undefined;
+    }
     handleNestEntry(pcx) {
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
@@ -181,12 +219,11 @@ class DocumentSymbolWalker {
         }
     }
     enterDefineSQLStatement(pcx) {
-        var _a;
-        const name = (_a = pcx.nameSQLBlock()) === null || _a === void 0 ? void 0 : _a.text;
+        const name = pcx.nameSQLBlock().text;
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
-            name: name || 'unnamed_sql',
-            type: name === undefined ? 'unnamed_sql' : 'sql',
+            name: name,
+            type: 'sql',
             children: [],
         };
         this.symbols.push(symbol);

package/dist/lang/test/document-symbol-walker.spec.js

@@ -45,6 +45,21 @@ function testSymbol(source, name, type, path) {
         type,
     });
 }
+function testLens(source, path) {
+    const doc = new MalloyExplore(source.code);
+    let current = {
+        children: doc.symbols,
+    };
+    path.forEach(segment => {
+        current = current.children[segment];
+    });
+    expect(doc.logger.hasErrors()).toBeFalsy();
+    const expectedLensRange = source.locations[0].range;
+    const expected = 'lensRange' in current && current.lensRange !== undefined
+        ? { lensRange: expectedLensRange }
+        : { range: expectedLensRange };
+    expect(current).toMatchObject(expected);
+}
 test('source symbols are included', () => {
     testSymbol((0, test_translator_1.markSource) `source: ${"flights is table('my.table.flights')"}`, 'flights', 'explore', [0]);
 });
@@ -114,4 +129,48 @@ test('join ons are included', () => {
       }
     `, 'a', 'join', [0, 0]);
 });
+test('source lenses go before block annotations when one source', () => {
+    testLens((0, test_translator_1.markSource) `${`# tag
+    # tag2
+    source:
+    # tag3
+    flights is table('my.table.flights')`}`, [0]);
+});
+test('source lenses go before individual annotations when more than one source', () => {
+    testLens((0, test_translator_1.markSource) `# tag
+    source:
+      ${`# tag2
+      flights is table('my.table.flights')`}
+
+      flights2 is table('my.table.flights')`, [0]);
+});
+test('query lenses go before block annotations when one source', () => {
+    testLens((0, test_translator_1.markSource) `${`# tag
+    # tag2
+    query:
+    # tag3
+    q is flights -> by_carrier`}`, [0]);
+});
+test('query lenses go before individual annotations when more than one source', () => {
+    testLens((0, test_translator_1.markSource) `# tag
+    query:
+      ${`# tag2
+      q is flights -> by_carrier`}
+
+      q2 is flights -> by_carrier`, [0]);
+});
+test('anonymous query lenses go before block annotations', () => {
+    testLens((0, test_translator_1.markSource) `${`# tag
+    # tag2
+    query:
+    # tag3
+    flights -> by_carrier`}`, [0]);
+});
+test('run lenses go before block annotations', () => {
+    testLens((0, test_translator_1.markSource) `${`# tag
+    # tag2
+    run:
+    # tag3
+    flights -> by_carrier`}`, [0]);
+});
 //# sourceMappingURL=document-symbol-walker.spec.js.map

package/dist/lang/test/test-translator.js

@@ -464,7 +464,9 @@ function markSource(unmarked, ...marked) {
                 start,
                 end: {
                     line: start.line + bitLines.length - 1,
-                    character: bitLines.length === 1 ? start.character + mark.length : mark.length,
+                    character: bitLines.length === 1
+                        ? start.character + mark.length
+                        : bitLines[bitLines.length - 1].length,
                 },
             },
         };

package/dist/malloy.d.ts

@@ -144,13 +144,14 @@ export declare class MalloyError extends Error {
 /**
  * A compiled Malloy document.
  */
-export declare class Model {
+export declare class Model implements Taggable {
     private modelDef;
     private queryList;
     private sqlBlocks;
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
     readonly problems: LogMessage[];
     constructor(modelDef: ModelDef, queryList: InternalQuery[], sqlBlocks: SQLBlockStructDef[], problems: LogMessage[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined);
+    getTags(): Tags;
     /**
      * Retrieve a document reference for the token at the given position within
      * the document that produced this model.
@@ -315,6 +316,19 @@ export declare class DocumentRange {
             character: number;
         };
     };
+    /**
+     * Construct a DocumentRange from JSON.
+     */
+    static fromJSON(json: {
+        start: {
+            line: number;
+            character: number;
+        };
+        end: {
+            line: number;
+            character: number;
+        };
+    }): DocumentRange;
 }
 /**
  * A position within a Malloy document.
@@ -346,6 +360,7 @@ export declare class DocumentPosition {
  */
 export declare class DocumentSymbol {
     private _range;
+    private _lensRange;
     private _type;
     private _name;
     private _children;
@@ -354,6 +369,12 @@ export declare class DocumentSymbol {
      * @return The range of characters in the source Malloy document that define this symbol.
      */
     get range(): DocumentRange;
+    /**
+     * @return The range of characters in the source Malloy document that define this symbol,
+     * including tags. Note: "block tags" are included if there is exactly one
+     * definition in the block.
+     */
+    get lensRange(): DocumentRange;
     /**
      * @return The type of symbol.
      *

package/dist/malloy.js

@@ -325,6 +325,9 @@ class Model {
         this._referenceAt = referenceAt;
         this.problems = problems;
     }
+    getTags() {
+        return new tags_1.Tags(this.modelDef.annotation);
+    }
     /**
      * Retrieve a document reference for the token at the given position within
      * the document that produced this model.
@@ -593,6 +596,12 @@ class DocumentRange {
             end: this.end.toJSON(),
         };
     }
+    /**
+     * Construct a DocumentRange from JSON.
+     */
+    static fromJSON(json) {
+        return new DocumentRange(new DocumentPosition(json.start.line, json.start.character), new DocumentPosition(json.end.line, json.end.character));
+    }
 }
 exports.DocumentRange = DocumentRange;
 /**
@@ -630,7 +639,10 @@ exports.DocumentPosition = DocumentPosition;
  */
 class DocumentSymbol {
     constructor(documentSymbol) {
-        this._range = new DocumentRange(new DocumentPosition(documentSymbol.range.start.line, documentSymbol.range.start.character), new DocumentPosition(documentSymbol.range.end.line, documentSymbol.range.end.character));
+        this._range = DocumentRange.fromJSON(documentSymbol.range);
+        this._lensRange = documentSymbol.lensRange
+            ? DocumentRange.fromJSON(documentSymbol.lensRange)
+            : undefined;
         this._type = documentSymbol.type;
         this._name = documentSymbol.name;
         this._children = documentSymbol.children.map(child => new DocumentSymbol(child));
@@ -641,6 +653,15 @@ class DocumentSymbol {
     get range() {
         return this._range;
     }
+    /**
+     * @return The range of characters in the source Malloy document that define this symbol,
+     * including tags. Note: "block tags" are included if there is exactly one
+     * definition in the block.
+     */
+    get lensRange() {
+        var _a;
+        return (_a = this._lensRange) !== null && _a !== void 0 ? _a : this._range;
+    }
     /**
      * @return The type of symbol.
      *

package/dist/tags.js

@@ -71,10 +71,12 @@ function tagList(tagNode) {
  * A string is " enclosing and ending in " with \" allowed inside
  */
 function parseTag(src, tagProp) {
-    if (src.startsWith('#" ')) {
-        return { docString: src.slice(3) };
+    const docMatch = src.match(/^##?" /);
+    if (docMatch) {
+        return { docString: src.slice(docMatch[0].length) };
     }
-    if (!src.startsWith('# ')) {
+    const propMatch = src.match(/^##? /);
+    if (!propMatch) {
         return;
     }
     /*
@@ -84,7 +86,7 @@ function parseTag(src, tagProp) {
      *
      * Seems wrong to be writing a parser though.
      */
-    const tokens = tokenize(src.slice(2));
+    const tokens = tokenize(src.slice(propMatch[0].length));
     let tn = 0;
     const lastToken = tokens.length - 1;
     while (tn <= lastToken) {

package/package.json

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