@malloydata/malloy 0.0.97-dev231026184251 → 0.0.97

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

@@ -98,6 +98,7 @@ import { IgnoredModelAnnotationsContext } from "./MalloyParser";
 import { TopLevelQueryDefsContext } from "./MalloyParser";
 import { TopLevelQueryDefContext } from "./MalloyParser";
 import { RefineOperatorContext } from "./MalloyParser";
+import { TurtleNameContext } from "./MalloyParser";
 import { QueryRefinementContext } from "./MalloyParser";
 import { SourceExtensionContext } from "./MalloyParser";
 import { SqlSourceContext } from "./MalloyParser";
@@ -1352,6 +1353,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitRefineOperator?: (ctx: RefineOperatorContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.turtleName`.
+     * @param ctx the parse tree
+     */
+    enterTurtleName?: (ctx: TurtleNameContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.turtleName`.
+     * @param ctx the parse tree
+     */
+    exitTurtleName?: (ctx: TurtleNameContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.queryRefinement`.
      * @param ctx the parse tree

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

@@ -98,6 +98,7 @@ import { IgnoredModelAnnotationsContext } from "./MalloyParser";
 import { TopLevelQueryDefsContext } from "./MalloyParser";
 import { TopLevelQueryDefContext } from "./MalloyParser";
 import { RefineOperatorContext } from "./MalloyParser";
+import { TurtleNameContext } from "./MalloyParser";
 import { QueryRefinementContext } from "./MalloyParser";
 import { SourceExtensionContext } from "./MalloyParser";
 import { SqlSourceContext } from "./MalloyParser";
@@ -883,6 +884,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitRefineOperator?: (ctx: RefineOperatorContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.turtleName`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTurtleName?: (ctx: TurtleNameContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.queryRefinement`.
      * @param ctx the parse tree

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

@@ -81,7 +81,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
     visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList;
     visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
-    protected getQueryRefinements(pcx: parse.QueryRefinementContext): ast.QOPDesc;
+    protected getQueryRefinements(pcx: parse.QueryRefinementContext): ast.QOPDesc | ast.ViewFieldReference;
     protected getSourceExtensions(pcx: parse.SourceExtensionContext): ast.SourceDesc;
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc;
     visitTableFunction(pcx: parse.TableFunctionContext): ast.TableSource;

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

@@ -292,14 +292,22 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(exploreDef, pcx);
     }
     getQueryRefinements(pcx) {
-        const properties = this.astAt(this.visitQueryProperties(pcx.queryProperties()), pcx);
-        if (pcx.REFINE()) {
-            this.contextError(pcx, 'The experimental "refine" operator is deprecated, use the "+" operator', 'warn');
+        const propertiesCx = pcx.queryProperties();
+        if (propertiesCx) {
+            const properties = this.astAt(this.visitQueryProperties(propertiesCx), pcx);
+            if (pcx.REFINE()) {
+                this.contextError(pcx, 'The experimental "refine" operator is deprecated, use the "+" operator', 'warn');
+            }
+            else if (!pcx.refineOperator()) {
+                this.contextError(pcx, 'Implicit query refinement is deprecated, use the `+` operator', 'warn');
+            }
+            return properties;
         }
-        else if (!pcx.refineOperator()) {
-            this.contextError(pcx, 'Implicit query refinement is deprecated, use the `+` operator', 'warn');
+        const turtleNameCx = pcx.turtleName();
+        if (turtleNameCx) {
+            return this.astAt(new ast.ViewFieldReference([this.getFieldName(turtleNameCx)]), turtleNameCx);
         }
-        return properties;
+        throw this.internalError(pcx, 'Expected either query properties or a view name in refinements');
     }
     getSourceExtensions(pcx) {
         const extensions = pcx === null || pcx === void 0 ? void 0 : pcx.exploreProperties();
@@ -760,10 +768,10 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             const queryDesc = this.visitQueryProperties(propsCx);
             pipe.addSegments(queryDesc);
         }
-        const rcx = firstCx.queryRefinement();
-        if (rcx) {
-            const queryDesc = this.getQueryRefinements(rcx);
-            pipe.refineWith(queryDesc);
+        const rcxs = firstCx.queryRefinement();
+        if (rcxs.length > 0) {
+            const queryDescs = rcxs.map(rcx => this.getQueryRefinements(rcx));
+            pipe.refineWith(queryDescs);
         }
         const tail = this.getSegments(pipeCx.pipeElement());
         pipe.addSegments(...tail);
@@ -817,11 +825,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitNestExisting(pcx) {
         const name = this.getFieldName(pcx.queryName());
-        const rcx = pcx.queryRefinement();
+        const rcxs = pcx.queryRefinement();
         const notes = this.getNotes(pcx.tags());
-        if (rcx) {
+        if (rcxs.length > 0) {
             const nestRefine = new ast.NestRefinement(name);
-            const queryDesc = this.getQueryRefinements(rcx);
+            const queryDesc = rcxs.map(rcx => this.getQueryRefinements(rcx));
             nestRefine.refineWith(queryDesc);
             nestRefine.extendNote({ notes });
             return this.astAt(nestRefine, pcx);
@@ -1291,9 +1299,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             viewParts.push(new ast.ViewFieldReference([
                 this.astAt(new ast.FieldName(headId), headIdCx),
             ]));
-            const andRefined = headCx.queryRefinement();
-            if (andRefined) {
-                viewParts.push(this.getQueryRefinements(andRefined));
+            const rcxs = headCx.queryRefinement();
+            if (rcxs.length > 0) {
+                viewParts.push(...rcxs.map(rcx => this.getQueryRefinements(rcx)));
             }
         }
         const qopCx = headCx.queryProperties();

package/dist/lang/test/lenses.spec.d.ts

@@ -0,0 +1 @@
+import './parse-expects';

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

@@ -0,0 +1,130 @@
+"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 });
+const test_translator_1 = require("./test-translator");
+require("./parse-expects");
+describe('lenses', () => {
+    test('long lens patterns', () => {
+        expect((0, test_translator_1.markSource) `
+        source: s1 is a extend {
+          view: v1 is { group_by: d1 is 1 }
+          view: v2 is { group_by: d2 is 2 }
+          view: v3 is { group_by: d3 is 3 }
+          view: v4 is v1 + v2 + v3
+          view: v5 is {
+            nest: n1 is v1 + v2 + v3
+            nest: n2 is { group_by: d1 is 1 } + v2 + v3
+            nest: n3 is v1 + v2 + { group_by: d3 is 3 }
+          }
+          view: v6 is { group_by: d1 is 1 } + v2 + v3
+        }
+        run: s1 -> v4
+        source: s2 is s1 -> v1 + v2 + v3
+        source: s3 is s1 -> { group_by: d1 is 1 } + v2 + v3
+      `).toTranslate();
+    });
+    test('cannot have overlapping names', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          dimension: n is 1
+          view: d is { group_by: n }
+        }
+        run: x -> d + d
+      `).translationToFailWith('overlapping fields in refinement: n');
+    });
+    test('cannot override limit', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          view: d1 is { group_by: n1 is 1; limit: 10 }
+          view: d2 is { group_by: n2 is 2; limit: 20 }
+        }
+        run: x -> d1 + d2
+      `).translationToFailWith('refinement cannot override existing limit');
+    });
+    test('cannot override ordering', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          view: d1 is { group_by: n1 is 1; order_by: n1 }
+          view: d2 is { group_by: n2 is 2; order_by: n2 }
+        }
+        run: x -> d1 + d2
+      `).translationToFailWith('refinement cannot override existing ordering');
+    });
+    test('can add a limit late', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          view: d1 is { group_by: n1 is 1 }
+          view: d2 is { group_by: n2 is 2 }
+        }
+        run: x -> d1 + d2 + { limit: 10 }
+      `).toTranslate();
+    });
+    test('cannot refine with incompatible view types', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          view: grp is { group_by: n1 is 1 }
+          view: proj is { select: n2 is 2 }
+          view: idx is { index: * }
+        }
+        run: x -> grp + proj
+        run: x -> grp + idx
+        run: x -> proj + idx
+        run: x -> proj + grp
+        run: x -> idx + grp
+        run: x -> idx + proj
+      `).translationToFailWith('cannot refine reduce view with project view', 'cannot refine reduce view with index view', 'cannot refine project view with index view', 'cannot refine project view with reduce view', 'cannot refine index view with reduce view', 'cannot refine index view with project view');
+    });
+    test('cannot reference dimension', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          dimension: n is 1
+          view: d is { group_by: n }
+        }
+        run: x -> d + n
+      `).translationToFailWith('named refinement `n` must be a view, found a number');
+    });
+    test('cannot reference join', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          join_one: b is a on true
+          dimension: n is 1
+          view: d is { group_by: n }
+        }
+        run: x -> d + b
+      `).translationToFailWith('named refinement `b` must be a view, found a struct');
+    });
+    test('cannot named-refine multi-stage query', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          join_one: b is a on true
+          dimension: n is 1
+          view: multi is { group_by: n } -> { group_by: n }
+          view: d is { group_by: n }
+        }
+        run: x -> multi + d
+        run: x -> d + multi
+      `).translationToFailWith('Named refinements of multi-stage views are not supported', 'named refinement `multi` must have exactly one stage');
+    });
+});
+//# sourceMappingURL=lenses.spec.js.map

package/package.json

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