@malloydata/malloy 0.0.109-dev231201181643 → 0.0.109-dev231201200035

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

@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.walkForDocumentSymbols = void 0;
 const ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
 const parser = __importStar(require("../lib/Malloy/MalloyParser"));
+const parse_utils_1 = require("../parse-utils");
 class DocumentSymbolWalker {
     constructor(translator, tokens, scopes, symbols) {
         this.translator = translator;
@@ -233,12 +234,43 @@ class DocumentSymbolWalker {
         const name = pcx.nameSQLBlock().text;
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
-            name: name,
+            name,
             type: 'sql',
             children: [],
         };
         this.symbols.push(symbol);
     }
+    enterImportStatement(pcx) {
+        const name = (0, parse_utils_1.getStringIfShort)(pcx.importURL());
+        if (name) {
+            this.scopes.push({
+                range: this.translator.rangeFromContext(pcx),
+                name,
+                type: 'import',
+                children: [],
+            });
+        }
+    }
+    exitImportStatement() {
+        const scope = this.popScope();
+        if (scope) {
+            this.symbols.push(scope);
+        }
+    }
+    enterImportSelect(pcx) {
+        const parent = this.peekScope();
+        if (parent) {
+            for (const item of pcx.importItem()) {
+                const symbol = {
+                    range: this.translator.rangeFromContext(pcx),
+                    name: item.text,
+                    type: 'import_item',
+                    children: [],
+                };
+                parent.children.push(symbol);
+            }
+        }
+    }
 }
 function walkForDocumentSymbols(forParse, tokens, parseTree) {
     const finder = new DocumentSymbolWalker(forParse, tokens, [], []);

package/dist/malloy.d.ts

@@ -227,6 +227,12 @@ export declare class Model implements Taggable {
      * @return An array of `Explore`s contained in the model.
      */
     get explores(): Explore[];
+    /**
+     * Get an array of `NamedQuery`s contained in the model.
+     *
+     * @return An array of `NamedQuery`s contained in the model.
+     */
+    get namedQueries(): NamedQuery[];
     get exportedExplores(): Explore[];
     get _modelDef(): ModelDef;
 }

package/dist/malloy.js

@@ -467,14 +467,19 @@ class Model {
      * @return An array of `Explore`s contained in the model.
      */
     get explores() {
-        const explores = [];
-        for (const me in this.modelDef.contents) {
-            const ent = this.modelDef.contents[me];
-            if (ent.type === 'struct') {
-                explores.push(new Explore(ent));
-            }
-        }
-        return explores;
+        const isStructDef = (object) => object.type === 'struct';
+        return Object.values(this.modelDef.contents)
+            .filter(isStructDef)
+            .map(structDef => new Explore(structDef));
+    }
+    /**
+     * Get an array of `NamedQuery`s contained in the model.
+     *
+     * @return An array of `NamedQuery`s contained in the model.
+     */
+    get namedQueries() {
+        const isNamedQuery = (object) => object.type === 'query';
+        return Object.values(this.modelDef.contents).filter(isNamedQuery);
     }
     get exportedExplores() {
         return this.explores.filter(explore => this.modelDef.exports.includes(explore.name));

package/package.json

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