@malloydata/malloy 0.0.123-dev240205152128 → 0.0.123-dev240205203117

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

@@ -19,7 +19,6 @@ import { ExprRegexContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
 import { TableFunctionContext } from "./MalloyParser";
 import { TableMethodContext } from "./MalloyParser";
-import { NestExistingContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
 import { ExprFieldPropsContext } from "./MalloyParser";
@@ -453,18 +452,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitTableMethod?: (ctx: TableMethodContext) => void;
-    /**
-     * Enter a parse tree produced by the `nestExisting`
-     * labeled alternative in `MalloyParser.nestEntry`.
-     * @param ctx the parse tree
-     */
-    enterNestExisting?: (ctx: NestExistingContext) => void;
-    /**
-     * Exit a parse tree produced by the `nestExisting`
-     * labeled alternative in `MalloyParser.nestEntry`.
-     * @param ctx the parse tree
-     */
-    exitNestExisting?: (ctx: NestExistingContext) => void;
     /**
      * Enter a parse tree produced by the `nestDef`
      * labeled alternative in `MalloyParser.nestEntry`.

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

@@ -19,7 +19,6 @@ import { ExprRegexContext } from "./MalloyParser";
 import { ExprNowContext } from "./MalloyParser";
 import { TableFunctionContext } from "./MalloyParser";
 import { TableMethodContext } from "./MalloyParser";
-import { NestExistingContext } from "./MalloyParser";
 import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
 import { ExprFieldPropsContext } from "./MalloyParser";
@@ -356,13 +355,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitTableMethod?: (ctx: TableMethodContext) => Result;
-    /**
-     * Visit a parse tree produced by the `nestExisting`
-     * labeled alternative in `MalloyParser.nestEntry`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitNestExisting?: (ctx: NestExistingContext) => Result;
     /**
      * Visit a parse tree produced by the `nestDef`
      * labeled alternative in `MalloyParser.nestEntry`.

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

@@ -144,7 +144,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitRunStatement(pcx: parse.RunStatementContext): ast.AnonymousQuery;
     visitNestStatement(pcx: parse.NestStatementContext): ast.Nests;
     visitNestedQueryList(pcx: parse.NestedQueryListContext): ast.Nests;
-    visitNestExisting(pcx: parse.NestExistingContext): ast.NestFieldDeclaration;
     visitNestDef(pcx: parse.NestDefContext): ast.NestFieldDeclaration;
     visitExploreQueryDef(pcx: parse.ExploreQueryDefContext): ast.ViewFieldDeclaration;
     visitExprNot(pcx: parse.ExprNotContext): ast.ExprNot;

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

@@ -606,7 +606,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                     expr = new ast.ExprSum(undefined, ref);
                 }
                 else {
-                    this.contextError(agg, "'${aggFunc}' is not legal in a reference-only aggregation");
+                    this.contextError(agg, `\`${aggFunc}\` is not legal in a reference-only aggregation`);
                     return ref;
                 }
             }
@@ -796,27 +796,24 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitNestedQueryList(pcx) {
         return new ast.Nests(this.only(pcx.nestEntry().map(cx => this.visit(cx)), x => x instanceof ast.NestFieldDeclaration && x, 'query'));
     }
-    visitNestExisting(pcx) {
-        const nameCx = pcx.fieldPath();
-        const name = this.getFieldPath(nameCx, ast.ViewOrScalarFieldReference);
-        const referenceView = this.astAt(new ast.ReferenceView(name), nameCx);
-        const refineCx = pcx.vExpr();
-        const notes = this.getNotes(pcx.tags());
-        if (refineCx) {
-            const nestRefine = new ast.NestFieldDeclaration(name.nameString, new ast.ViewRefine(referenceView, this.getVExpr(refineCx)));
-            nestRefine.extendNote({ notes });
-            return this.astAt(nestRefine, pcx);
-        }
-        const nestReference = new ast.NestFieldDeclaration(name.nameString, referenceView);
-        nestReference.extendNote({ notes });
-        return this.astAt(nestReference, pcx);
-    }
     visitNestDef(pcx) {
-        const name = (0, parse_utils_1.getId)(pcx.queryName());
+        const nameCx = pcx.queryName();
+        let name;
         const vExpr = this.getVExpr(pcx.vExpr());
+        if (nameCx) {
+            name = (0, parse_utils_1.getId)(nameCx);
+        }
+        else {
+            const implicitName = vExpr.getImplicitName();
+            if (implicitName === undefined) {
+                this.contextError(pcx, '`nest:` view requires a name (add `nest_name is ...`)');
+            }
+            name = implicitName !== null && implicitName !== void 0 ? implicitName : '__unnamed__';
+        }
         const nestDef = new ast.NestFieldDeclaration(name, vExpr);
+        const isDefineCx = pcx.isDefine();
         nestDef.extendNote({
-            notes: this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine())),
+            notes: this.getNotes(pcx.tags()).concat(isDefineCx ? this.getIsNotes(isDefineCx) : []),
         });
         return this.astAt(nestDef, pcx);
     }

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

@@ -21,33 +21,9 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -147,12 +123,48 @@ class DocumentSymbolWalker {
     exitExploreQueryDef(_pcx) {
         this.popScope();
     }
+    getNestDefName(pcx) {
+        const nameCx = pcx.queryName();
+        if (nameCx) {
+            return nameCx.id().text;
+        }
+        let result = undefined;
+        let done = false;
+        const vExprListen = {
+            enterVArrow(pcx) {
+                pcx.vExpr().enterRule(vExprListen);
+            },
+            enterVSeg(pcx) {
+                pcx.segExpr().enterRule(segExprListen);
+            },
+        };
+        const segExprListen = {
+            enterSegField(pcx) {
+                const names = pcx.fieldPath().fieldName();
+                if (!done)
+                    result !== null && result !== void 0 ? result : (result = names[names.length - 1].id().text);
+            },
+            enterSegParen(pcx) {
+                pcx.vExpr().enterRule(vExprListen);
+            },
+            enterSegRefine(pcx) {
+                pcx._lhs.enterRule(segExprListen);
+            },
+            enterSegOps() {
+                result = undefined;
+                done = true;
+            },
+        };
+        pcx.vExpr().enterRule(vExprListen);
+        return result;
+    }
     handleNestEntry(pcx) {
+        const name = this.getNestDefName(pcx);
+        if (name === undefined)
+            return;
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
-            name: pcx instanceof parser.NestExistingContext
-                ? pcx.fieldPath().text
-                : pcx.queryName().id().text,
+            name,
             type: 'query',
             children: [],
         };
@@ -162,12 +174,11 @@ class DocumentSymbolWalker {
         }
         return symbol;
     }
-    enterNestExisting(pcx) {
-        this.handleNestEntry(pcx);
-    }
     enterNestDef(pcx) {
         const symbol = this.handleNestEntry(pcx);
-        this.scopes.push(symbol);
+        if (symbol) {
+            this.scopes.push(symbol);
+        }
     }
     exitNestDef(_pcx) {
         this.popScope();

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

@@ -115,6 +115,20 @@ test('turtle children turtles are included', () => {
       }
     `, 'inner_turtle', 'query', [0, 0, 0]);
 });
+test('refinement chain gets name correctly', () => {
+    testSymbol((0, test_translator_1.markSource) `
+      source: flights is DB.table('my.table.flights') extend {
+        query: my_turtle is { nest: ${'something + something_else'} }
+      }
+    `, 'something', 'query', [0, 0, 0]);
+});
+test('arrow in nest infers name correctly', () => {
+    testSymbol((0, test_translator_1.markSource) `
+      source: flights is DB.table('my.table.flights') extend {
+        query: my_turtle is { nest: ${'thingy -> something + something_else'} }
+      }
+    `, 'something', 'query', [0, 0, 0]);
+});
 test('join withs are included', () => {
     testSymbol((0, test_translator_1.markSource) `
       source: flights is DB.table('my.table.flights') extend {

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

@@ -475,6 +475,18 @@ describe('expressions', () => {
         test('source.sum(nested.column)', () => {
             expect(modelX `source.sum(nested.column)`).translationToFailWith('Cannot compute `sum` across repeated relationship `nested`; use `nested.column.sum()`');
         });
+        test('can aggregate field defined with no join usage', () => {
+            expect((0, test_translator_1.markSource) `
+        ##! experimental { sql_functions }
+        source: s is a extend {
+          measure: c is count()
+          dimension: f is 1
+        }
+        run: s -> {
+          aggregate: v is f.sum()
+        }
+      `).toTranslate();
+        });
         test('sum(inline.column)', () => {
             expect(modelX `sum(inline.column)`).toTranslateWithWarnings('Join path is required for this calculation; use `inline.column.sum()` or `source.sum(inline.column)` to get a result weighted with respect to `source`');
         });
@@ -799,6 +811,11 @@ describe('unspported fields in schema', () => {
     test('negative numbers are not tokens', () => {
         expect((0, test_translator_1.expr) `ai-1`).toTranslate();
     });
+    describe('sql functions', () => {
+        test('can aggregate a sql_ function', () => {
+            expect((0, test_translator_1.expr) `sum(sql_number("\${a} * 2"))`).toTranslate();
+        });
+    });
     describe('cast', () => {
         // The "+ 1"s are there to make sure the result is of type 'number'
         test('sql cast', () => {

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

@@ -318,6 +318,32 @@ describe('partial views', () => {
         }
       `).toTranslate();
     });
+    test('order by tacked on the end should work', () => {
+        expect((0, test_translator_1.markSource) `
+        run: a -> {
+          nest: astr + ai + { order_by: astr }
+        }
+        run: a -> {
+          nest: astr + { order_by: astr }
+        }
+        run: a -> astr + { order_by: astr }
+        run: a -> astr + ai + { order_by: astr }
+      `).toTranslate();
+    });
+    test('name can be inferred with arrow', () => {
+        expect((0, test_translator_1.markSource) `
+        run: a extend { view: foo is { group_by: astr } } -> {
+          nest: foo -> astr + { order_by: astr }
+        }
+      `).toTranslate();
+    });
+    test('nice error when nest has no name', () => {
+        expect((0, test_translator_1.markSource) `
+        run: a -> {
+          nest: { group_by: astr }
+        }
+      `).translationToFailWith('`nest:` view requires a name (add `nest_name is ...`)');
+    });
     test.skip('partial with index', () => {
         expect((0, test_translator_1.markSource) `
         source: x is a extend {

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

@@ -875,5 +875,19 @@ describe('m3/m4 source query sentences', () => {
     `).toTranslate();
     });
 });
+describe('sql_functions', () => {
+    test('can aggregate sql function', () => {
+        expect((0, test_translator_1.markSource) `
+      ##! experimental { sql_functions }
+      source: s is a extend {
+        measure: c is count()
+        dimension: sql_expr is sql_number("LENGTH(\${TABLE}.astr)")
+      }
+      run: s -> {
+        aggregate: v is sql_expr.sum()
+      }
+    `).toTranslate();
+    });
+});
 test('non breaking space in source', () => expect('source:\u00a0z\u00a0is\u00a0a').toParse());
 //# sourceMappingURL=parse.spec.js.map

package/dist/model/utils.js

@@ -125,6 +125,9 @@ function exprMap(expr, func) {
                 case 'function_parameter':
                 case 'parameter':
                 case 'outputField':
+                case 'source-reference':
+                case 'aggregate_limit':
+                case 'aggregate_order_by':
                     return fragment;
                 case 'sql-string':
                     return {
@@ -231,6 +234,9 @@ function exprWalk(expr, func) {
             case 'function_parameter':
             case 'parameter':
             case 'outputField':
+            case 'source-reference':
+            case 'aggregate_limit':
+            case 'aggregate_order_by':
                 return fragment;
             case 'function_call':
                 return {
@@ -304,7 +310,7 @@ function exprWalk(expr, func) {
                 }
             }
             default:
-                throw new Error('unexpected');
+                throw new Error(`unexpected fragment type ${fragment.type}`);
         }
     });
 }

package/package.json

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