@malloydata/malloy 0.0.101-dev231107220340 → 0.0.101-dev231109201517

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

@@ -109,7 +109,6 @@ import { ExploreTableContext } from "./MalloyParser";
 import { ConnectionIdContext } from "./MalloyParser";
 import { QueryPropertiesContext } from "./MalloyParser";
 import { FilterShortcutContext } from "./MalloyParser";
-import { ExploreQueryNameContext } from "./MalloyParser";
 import { QueryNameContext } from "./MalloyParser";
 import { SourcePropertyListContext } from "./MalloyParser";
 import { SourceDefinitionContext } from "./MalloyParser";
@@ -1463,16 +1462,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitFilterShortcut?: (ctx: FilterShortcutContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.exploreQueryName`.
-     * @param ctx the parse tree
-     */
-    enterExploreQueryName?: (ctx: ExploreQueryNameContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.exploreQueryName`.
-     * @param ctx the parse tree
-     */
-    exitExploreQueryName?: (ctx: ExploreQueryNameContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.queryName`.
      * @param ctx the parse tree

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

@@ -109,7 +109,6 @@ import { ExploreTableContext } from "./MalloyParser";
 import { ConnectionIdContext } from "./MalloyParser";
 import { QueryPropertiesContext } from "./MalloyParser";
 import { FilterShortcutContext } from "./MalloyParser";
-import { ExploreQueryNameContext } from "./MalloyParser";
 import { QueryNameContext } from "./MalloyParser";
 import { SourcePropertyListContext } from "./MalloyParser";
 import { SourceDefinitionContext } from "./MalloyParser";
@@ -950,12 +949,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitFilterShortcut?: (ctx: FilterShortcutContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.exploreQueryName`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExploreQueryName?: (ctx: ExploreQueryNameContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.queryName`.
      * @param ctx the parse tree

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

@@ -303,9 +303,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
             return properties;
         }
-        const turtleNameCx = pcx.turtleName();
-        if (turtleNameCx) {
-            return this.astAt(new ast.ViewFieldReference([this.getFieldName(turtleNameCx)]), turtleNameCx);
+        const fieldPathCx = pcx.fieldPath();
+        if (fieldPathCx) {
+            return this.astAt(this.getFieldPath(fieldPathCx, ast.ViewFieldReference), fieldPathCx);
         }
         throw this.internalError(pcx, 'Expected either query properties or a view name in refinements');
     }
@@ -759,9 +759,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (firstCx.ARROW()) {
             this.m4advisory(firstCx, "Leading '->' in a view or nest definition is no longer needed.");
         }
-        const nameCx = firstCx.exploreQueryName();
+        const nameCx = firstCx.fieldPath();
         if (nameCx) {
-            pipe.turtleName = this.getFieldName(nameCx);
+            pipe.turtleName = this.getFieldPath(nameCx, ast.ViewFieldReference);
         }
         const propsCx = firstCx.queryProperties();
         if (propsCx) {
@@ -824,7 +824,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.Nests(this.only(pcx.nestEntry().map(cx => this.visit(cx)), x => ast.isNestedQuery(x) && x, 'query'));
     }
     visitNestExisting(pcx) {
-        const name = this.getFieldName(pcx.queryName());
+        const name = this.getFieldPath(pcx.fieldPath(), ast.ViewFieldReference);
         const rcxs = pcx.queryRefinement();
         const notes = this.getNotes(pcx.tags());
         if (rcxs.length > 0) {
@@ -1293,12 +1293,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const applyTo = this.getSqExpr(pcx.sqExpr());
         const viewParts = [];
         const headCx = pcx.leadSeg();
-        const headId = (0, parse_utils_1.getOptionalId)(headCx);
-        const headIdCx = headCx.id();
-        if (headIdCx && headId) {
-            viewParts.push(new ast.ViewFieldReference([
-                this.astAt(new ast.FieldName(headId), headIdCx),
-            ]));
+        const headIdCx = headCx.fieldPath();
+        if (headIdCx) {
+            viewParts.push(this.getFieldPath(headIdCx, ast.ViewFieldReference));
             const rcxs = headCx.queryRefinement();
             if (rcxs.length > 0) {
                 viewParts.push(...rcxs.map(rcx => this.getQueryRefinements(rcx)));
@@ -1313,9 +1310,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             if (asQop) {
                 viewParts.push(this.visitQueryProperties(asQop));
             }
-            const viewName = (0, parse_utils_1.getOptionalId)(seg);
+            const viewName = seg.fieldPath();
             if (viewName) {
-                viewParts.push(new ast.ViewFieldReference([new ast.FieldName(viewName)]));
+                viewParts.push(this.getFieldPath(viewName, ast.ViewFieldReference));
             }
         }
         const sqExpr = new ast.SQAppendView(applyTo, viewParts);

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

@@ -21,9 +21,33 @@
  * 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"));
 class DocumentSymbolWalker {
     constructor(translator, tokens, scopes, symbols) {
         this.translator = translator;
@@ -125,7 +149,9 @@ class DocumentSymbolWalker {
     handleNestEntry(pcx) {
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
-            name: pcx.queryName().id().text,
+            name: pcx instanceof parser.NestExistingContext
+                ? pcx.fieldPath().text
+                : pcx.queryName().id().text,
             type: 'query',
             children: [],
         };

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

@@ -132,7 +132,34 @@ describe('lenses', () => {
         run: x -> d + n
       `).toTranslate();
     });
-    test('cannot nest dimension even when experiment is enabled', () => {
+    test('can reference join field when experiment is enabled', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_cross: y is a extend { dimension: n is 1 } on true
+        }
+        run: x -> y.n
+      `).toTranslate();
+    });
+    test('can reference join field in refinement when experiment is enabled', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_cross: y is a extend { dimension: n is 1 } on true
+        }
+        run: x -> ai + y.n
+      `).toTranslate();
+    });
+    test('can reference join field in nest refinement when experiment is enabled', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_cross: y is a extend { dimension: n is 1 } on true
+        }
+        run: x -> { nest: ai + y.n }
+      `).toTranslate();
+    });
+    test('can nest dimension when experiment is enabled', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental { scalar_lenses }
         source: x is a extend {
@@ -140,7 +167,71 @@ describe('lenses', () => {
           view: d is { nest: n }
         }
         run: x -> d
-      `).translationToFailWith('Cannot use a scalar field in a nest operation, did you mean to use a group_by or select operation instead?');
+      `).toTranslate();
+    });
+    test('cannot use join_name in refinement shortcut', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_one: y is a on true
+          view: m is { aggregate: c is count() }
+        }
+        run: x -> m + y + { limit: 1 }`).translationToFailWith('named refinement `y` must be a view, found a struct');
+    });
+    test('cannot use view from join as whole pipeline', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_one: y is a extend {
+            view: z is { group_by: d is 1 }
+          } on true
+        }
+        run: x -> y.z
+      `).translationToFailWith('Cannot use view from join');
+    });
+    test('cannot use view from join in nest', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_one: y is a extend {
+            view: z is { group_by: d is 1 }
+          } on true
+        }
+        run: x -> { nest: y.z }
+      `).translationToFailWith('Cannot nest view from join');
+    });
+    test('cannot use view from join as nest view head', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_one: y is a extend {
+            view: z is { group_by: d is 1 }
+          } on true
+        }
+        run: x -> { nest: y.z + { limit: 1 } }
+      `).translationToFailWith('Cannot use view from join');
+    });
+    test('cannot use view from join as lens in query', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_one: y is a extend {
+            view: z is { group_by: d is 1 }
+          } on true
+        }
+        run: x -> ai + y.z
+      `).translationToFailWith('Cannot use view from join as refinement');
+    });
+    test('cannot use view from join as lens in nest', () => {
+        expect((0, test_translator_1.markSource) `
+        ##! experimental { scalar_lenses }
+        source: x is a extend {
+          join_one: y is a extend {
+            view: z is { group_by: d is 1 }
+          } on true
+        }
+        run: x -> { nest: ai + y.z }
+      `).translationToFailWith('Cannot use view from join as refinement');
     });
     test('can nest dimension with refinement when experiment is enabled', () => {
         expect((0, test_translator_1.markSource) `

package/dist/model/malloy_types.d.ts

@@ -671,6 +671,7 @@ export interface QueryResult extends CompiledQuery {
     runStats?: QueryRunStats;
 }
 export declare function isTurtleDef(def: FieldDef): def is TurtleDef;
+export declare function isAtomicField(def: FieldDef): def is FieldAtomicDef;
 export interface SearchResultRow {
     field_name: string;
     field_value: string;

package/dist/model/malloy_types.js

@@ -23,7 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -366,6 +366,10 @@ function isTurtleDef(def) {
     return def.type === 'turtle';
 }
 exports.isTurtleDef = isTurtleDef;
+function isAtomicField(def) {
+    return isAtomicFieldType(def.type);
+}
+exports.isAtomicField = isAtomicField;
 function isDimensional(field) {
     var _a;
     if ('resultMetadata' in field) {

package/package.json

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