@malloydata/malloy 0.0.101-dev231109201517 → 0.0.101-dev231110210501

package/dist/lang/ast/expressions/expr-id-reference.js

@@ -40,14 +40,15 @@ class ExprIdReference extends expression_def_1.ExpressionDef {
     getExpression(fs) {
         const def = this.fieldReference.getField(fs);
         if (def.found) {
-            if (def.found.typeDesc().evalSpace === 'output') {
+            const td = def.found.typeDesc();
+            if (def.isOutputField) {
                 return {
-                    ...def.found.typeDesc(),
+                    ...td,
+                    evalSpace: td.evalSpace === 'constant' ? 'constant' : 'output',
                     value: [{ type: 'outputField', name: this.refString }],
                 };
             }
             const value = [{ type: def.found.refType, path: this.refString }];
-            const td = def.found.typeDesc();
             // We think that aggregates are more 'output' like, but maybe we will reconsider that...
             const evalSpace = (0, malloy_types_1.expressionIsAggregate)(td.expressionType)
                 ? 'output'

package/dist/lang/ast/field-space/column-space-field.d.ts

@@ -4,5 +4,5 @@ export declare class ColumnSpaceField extends SpaceField {
     haveFieldDef: FieldDef;
     constructor(def: FieldTypeDef);
     fieldDef(): FieldDef;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }

package/dist/lang/ast/field-space/column-space-field.js

@@ -32,7 +32,7 @@ class ColumnSpaceField extends space_field_1.SpaceField {
     fieldDef() {
         return this.haveFieldDef;
     }
-    describeType() {
+    typeDesc() {
         return this.fieldTypeFromFieldDef(this.haveFieldDef);
     }
 }

package/dist/lang/ast/field-space/join-space-field.d.ts

@@ -1,8 +1,6 @@
-import { FieldSpace } from '../types/field-space';
 import { Join } from '../query-properties/joins';
 import { StructSpaceField } from './static-space';
 export declare class JoinSpaceField extends StructSpaceField {
-    readonly intoFS: FieldSpace;
     readonly join: Join;
-    constructor(intoFS: FieldSpace, join: Join);
+    constructor(join: Join);
 }

package/dist/lang/ast/field-space/join-space-field.js

@@ -25,9 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinSpaceField = void 0;
 const static_space_1 = require("./static-space");
 class JoinSpaceField extends static_space_1.StructSpaceField {
-    constructor(intoFS, join) {
+    constructor(join) {
         super(join.structDef());
-        this.intoFS = intoFS;
         this.join = join;
     }
 }

package/dist/lang/ast/field-space/query-space-field.d.ts

@@ -6,5 +6,5 @@ export declare abstract class QueryField extends SpaceField {
     constructor(inSpace: FieldSpace);
     abstract getQueryFieldDef(fs: FieldSpace): QueryFieldDef | undefined;
     abstract fieldDef(): FieldDef;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }

package/dist/lang/ast/field-space/query-space-field.js

@@ -29,7 +29,7 @@ class QueryField extends space_field_1.SpaceField {
         super();
         this.inSpace = inSpace;
     }
-    describeType() {
+    typeDesc() {
         return { dataType: 'turtle', expressionType: 'scalar', evalSpace: 'input' };
     }
 }

package/dist/lang/ast/field-space/query-spaces.d.ts

@@ -5,7 +5,6 @@ import { WildcardFieldReference } from '../query-items/field-references';
 import { RefinedSpace } from './refined-space';
 import { LookupResult } from '../types/lookup-result';
 import { QueryInputSpace } from './query-input-space';
-import { SpaceEntry } from '../types/space-entry';
 /**
  * The output space of a query operation, it is not named "QueryOutputSpace"
  * because this is the namespace of the Query. This is the one which is constructed
@@ -22,7 +21,6 @@ export declare abstract class QuerySpace extends RefinedSpace implements QueryFi
     private addRefineFromFields;
     log(s: string): void;
     pushFields(...defs: MalloyElement[]): void;
-    setEntry(name: string, value: SpaceEntry): void;
     protected addWild(wild: WildcardFieldReference): void;
     /**
      * Check for the definition of an ungrouping reference in the result space,

package/dist/lang/ast/field-space/query-spaces.js

@@ -110,11 +110,6 @@ class QuerySpace extends refined_space_1.RefinedSpace {
             }
         }
     }
-    setEntry(name, value) {
-        super.setEntry(name, value);
-        // Everything in this namespace is an output field
-        value.outputField = true;
-    }
     addWild(wild) {
         var _a;
         let current = this.exprSpace;
@@ -219,9 +214,9 @@ class QuerySpace extends refined_space_1.RefinedSpace {
                 // (see creation of a QuerySpace) we add references to all the fields from
                 // the refinement, but they don't have definitions. So in the case where we
                 // don't have a field def, we "know" that that field is already in the query,
-                // and we don't need to worry about actually adding it. This is also true for
-                // project statements, where we add "*" as a field and also all the individuala
-                // fields, but the individual fields don't have field defs.
+                // and we don't need to worry about actually adding it. Previously, this was also true for
+                // project statements, where we added "*" as a field and also all the individual
+                // fields, but the individual fields didn't have field defs.
             }
         }
         this.isComplete();
@@ -272,7 +267,7 @@ class QuerySpace extends refined_space_1.RefinedSpace {
     lookup(path) {
         const result = super.lookup(path);
         if (result.found) {
-            return result;
+            return { ...result, isOutputField: true };
         }
         return this.exprSpace.lookup(path);
     }

package/dist/lang/ast/field-space/reference-field.d.ts

@@ -13,7 +13,7 @@ export declare class ReferenceField extends SpaceField {
     constructor(fieldRef: FieldReference, inFS: FieldSpace);
     get referenceTo(): SpaceEntry | undefined;
     getQueryFieldDef(fs: FieldSpace): QueryFieldDef | undefined;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
     /**
      * If the referenced field has any annotations, replace the reference
      * with something which can hold an annotation

package/dist/lang/ast/field-space/reference-field.js

@@ -49,12 +49,12 @@ class ReferenceField extends space_field_1.SpaceField {
         }
         return this.queryFieldDef;
     }
-    describeType() {
+    typeDesc() {
         if (this.memoTypeDesc)
             return this.memoTypeDesc;
         const refTo = this.referenceTo;
         if (refTo) {
-            this.memoTypeDesc = refTo.describeType();
+            this.memoTypeDesc = refTo.typeDesc();
             return this.memoTypeDesc;
         }
         return { dataType: 'error', expressionType: 'scalar', evalSpace: 'input' };

package/dist/lang/ast/field-space/rename-space-field.d.ts

@@ -6,5 +6,5 @@ export declare class RenameSpaceField extends SpaceField {
     private readonly location;
     constructor(otherField: SpaceField, newName: string, location: DocumentLocation);
     fieldDef(): FieldDef | undefined;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }

package/dist/lang/ast/field-space/rename-space-field.js

@@ -42,7 +42,7 @@ class RenameSpaceField extends space_field_1.SpaceField {
             location: this.location,
         };
     }
-    describeType() {
+    typeDesc() {
         return this.otherField.typeDesc();
     }
 }

package/dist/lang/ast/field-space/static-space.js

@@ -158,7 +158,7 @@ class StaticSpace {
                 found: undefined,
             };
         }
-        return { found, error: undefined, relationship };
+        return { found, error: undefined, relationship, isOutputField: false };
     }
     isQueryFieldSpace() {
         return false;

package/dist/lang/ast/field-space/struct-space-field-base.d.ts

@@ -7,5 +7,5 @@ export declare abstract class StructSpaceFieldBase extends SpaceField {
     abstract get fieldSpace(): FieldSpace;
     get structRelationship(): StructRelationship;
     fieldDef(): FieldDef;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }

package/dist/lang/ast/field-space/struct-space-field-base.js

@@ -35,7 +35,7 @@ class StructSpaceFieldBase extends space_field_1.SpaceField {
     fieldDef() {
         return this.sourceDef;
     }
-    describeType() {
+    typeDesc() {
         return { dataType: 'struct', expressionType: 'scalar', evalSpace: 'input' };
     }
 }

package/dist/lang/ast/field-space/wild-space-field.d.ts

@@ -4,6 +4,6 @@ import { SpaceField } from '../types/space-field';
 export declare class WildSpaceField extends SpaceField {
     readonly wildText: string;
     constructor(wildText: string);
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
     getQueryFieldDef(_fs: FieldSpace): QueryFieldDef;
 }

package/dist/lang/ast/field-space/wild-space-field.js

@@ -29,7 +29,7 @@ class WildSpaceField extends space_field_1.SpaceField {
         super();
         this.wildText = wildText;
     }
-    describeType() {
+    typeDesc() {
         throw new Error('should never ask a wild field for its type');
     }
     getQueryFieldDef(_fs) {

package/dist/lang/ast/query-items/field-declaration.d.ts

@@ -82,5 +82,5 @@ export declare class FieldDefinitionValue extends SpaceField {
     fieldDef(): FieldDef;
     private qfd?;
     getQueryFieldDef(fs: FieldSpace): QueryFieldDef;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }

package/dist/lang/ast/query-items/field-declaration.js

@@ -274,7 +274,7 @@ class FieldDefinitionValue extends space_field_1.SpaceField {
     // really know what type we have. However since we have the FieldSpace,
     // we can compile the expression to find out, this might result in
     // some expressions being compiled twice.
-    describeType() {
+    typeDesc() {
         const typeFrom = this.qfd || this.fieldDef();
         return this.fieldTypeFromFieldDef(typeFrom);
     }

package/dist/lang/ast/query-properties/joins.js

@@ -38,7 +38,7 @@ class Join extends malloy_element_1.MalloyElement {
         this.extendNote = noteable_1.extendNoteMethod;
     }
     makeEntry(fs) {
-        fs.newEntry(this.name.refString, this, new join_space_field_1.JoinSpaceField(fs, this));
+        fs.newEntry(this.name.refString, this, new join_space_field_1.JoinSpaceField(this));
     }
     getStructDefFromExpr() {
         const source = this.sourceExpr.getSource();

package/dist/lang/ast/query-properties/ordering.js

@@ -41,7 +41,7 @@ class OrderBy extends malloy_element_1.MalloyElement {
         return typeof this.field === 'number' ? this.field : this.field.refString;
     }
     getOrderBy(fs) {
-        var _a, _b;
+        var _a;
         // TODO jump-to-definition now that we can lookup fields in the output space,
         // we need to actually add the reference when we do so.
         if (this.field instanceof field_space_1.FieldName && fs.isQueryFieldSpace()) {
@@ -50,10 +50,10 @@ class OrderBy extends malloy_element_1.MalloyElement {
             if (entry.error) {
                 this.field.log(entry.error);
             }
-            if (((_a = entry.found) === null || _a === void 0 ? void 0 : _a.typeDesc().evalSpace) === 'input') {
+            if (!entry.found || !entry.isOutputField) {
                 this.log(`Unknown field ${this.field.refString} in output space`);
             }
-            if ((0, malloy_types_1.expressionIsAnalytic)((_b = entry.found) === null || _b === void 0 ? void 0 : _b.typeDesc().expressionType)) {
+            if ((0, malloy_types_1.expressionIsAnalytic)((_a = entry.found) === null || _a === void 0 ? void 0 : _a.typeDesc().expressionType)) {
                 this.log(`Illegal order by of analytic field ${this.field.refString}`);
             }
         }

package/dist/lang/ast/query-properties/qop-desc.js

@@ -100,7 +100,7 @@ class QOPDesc extends malloy_element_1.ListOf {
             segment,
             outputSpace: () => 
             // TODO someday we'd like to get rid of the call to opOutputStruct here.
-            // If the `qex.resultFS` is correct, then we should be able to just use that
+            // If the `build.resultFS` is correct, then we should be able to just use that
             // in a more direct way.
             new static_space_1.StaticSpace((0, struct_utils_1.opOutputStruct)(this, inputFS.structDef(), segment)),
         };

package/dist/lang/ast/query-properties/refinements.js

@@ -68,7 +68,7 @@ class NamedRefinement extends Refinement {
                 }
             }
         }
-        this.name.log(`named refinement \`${this.name.refString}\` must be a view, found a ${res.found.describeType().dataType}`);
+        this.name.log(`named refinement \`${this.name.refString}\` must be a view, found a ${res.found.typeDesc().dataType}`);
     }
     refine(inputFS, pipeline) {
         if (pipeline.length === 1) {

package/dist/lang/ast/query-properties/top.js

@@ -39,7 +39,7 @@ class Top extends malloy_element_1.MalloyElement {
         this.has({ by: by });
     }
     getBy(fs) {
-        var _a, _b;
+        var _a;
         if (this.by) {
             if (this.by instanceof field_space_1.FieldName) {
                 if (fs.isQueryFieldSpace()) {
@@ -50,10 +50,10 @@ class Top extends malloy_element_1.MalloyElement {
                     if (entry.error) {
                         this.by.log(entry.error);
                     }
-                    if (((_a = entry.found) === null || _a === void 0 ? void 0 : _a.typeDesc().evalSpace) === 'input') {
+                    if (!entry.found || !entry.isOutputField) {
                         this.by.log(`Unknown field ${this.by.refString} in output space`);
                     }
-                    if ((0, malloy_types_1.expressionIsAnalytic)((_b = entry.found) === null || _b === void 0 ? void 0 : _b.typeDesc().expressionType)) {
+                    if ((0, malloy_types_1.expressionIsAnalytic)((_a = entry.found) === null || _a === void 0 ? void 0 : _a.typeDesc().expressionType)) {
                         this.by.log(`Illegal order by of analytic field ${this.by.refString}`);
                     }
                 }

package/dist/lang/ast/types/lookup-result.d.ts

@@ -7,6 +7,7 @@ export interface LookupFound {
         structRelationship: StructRelationship;
     }[];
     error: undefined;
+    isOutputField: boolean;
 }
 export interface LookupError {
     error: string;

package/dist/lang/ast/types/space-entry.d.ts

@@ -2,15 +2,8 @@ import { TypeDesc } from '../../../model';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { MalloyElement } from './malloy-element';
 export declare abstract class SpaceEntry {
-    /**
-     * Once upon a time this was called `typeDesc()` but now that is implemented here
-     * as a wrapper which knows about output spaces. Individual entries should describe
-     * themselves with describeType() and the typeDesc() here will call that.
-     */
-    abstract describeType(): TypeDesc;
+    abstract typeDesc(): TypeDesc;
     abstract refType: 'field' | 'parameter';
-    outputField: boolean;
-    typeDesc(): TypeDesc;
 }
 export interface MakeEntry {
     makeEntry: (fs: DynamicSpace) => void;

package/dist/lang/ast/types/space-entry.js

@@ -24,19 +24,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canMakeEntry = exports.SpaceEntry = void 0;
 class SpaceEntry {
-    constructor() {
-        this.outputField = false;
-    }
-    typeDesc() {
-        const type = this.describeType();
-        if (this.outputField) {
-            return {
-                ...type,
-                evalSpace: type.evalSpace === 'constant' ? 'constant' : 'output',
-            };
-        }
-        return type;
-    }
 }
 exports.SpaceEntry = SpaceEntry;
 function canMakeEntry(me) {

package/dist/lang/ast/types/space-param.d.ts

@@ -9,11 +9,11 @@ export declare class AbstractParameter extends SpaceParam {
     readonly astParam: HasParameter;
     constructor(astParam: HasParameter);
     parameter(): Parameter;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }
 export declare class DefinedParameter extends SpaceParam {
     readonly paramDef: Parameter;
     constructor(paramDef: Parameter);
     parameter(): Parameter;
-    describeType(): TypeDesc;
+    typeDesc(): TypeDesc;
 }

package/dist/lang/ast/types/space-param.js

@@ -39,7 +39,7 @@ class AbstractParameter extends SpaceParam {
     parameter() {
         return this.astParam.parameter();
     }
-    describeType() {
+    typeDesc() {
         const type = this.astParam.type || 'error';
         // TODO Not sure whether params are considered "input space". It seems like they
         // could be input or constant, depending on usage.
@@ -55,7 +55,7 @@ class DefinedParameter extends SpaceParam {
     parameter() {
         return this.paramDef;
     }
-    describeType() {
+    typeDesc() {
         return {
             dataType: this.paramDef.type,
             expressionType: 'scalar',

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

@@ -65,12 +65,19 @@ describe('lenses', () => {
     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 }
+          view: d1 is { group_by: n1 is ai; order_by: n1 }
+          view: d2 is { group_by: n2 is 1; order_by: n2 }
         }
         run: x -> d1 + d2
       `).translationToFailWith('refinement cannot override existing ordering');
     });
+    test('weird issue with order by constant group by', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          view: d1 is { group_by: n1 is 1; order_by: n1 }
+        }
+      `).toTranslate();
+    });
     test('can add a limit late', () => {
         expect((0, test_translator_1.markSource) `
         source: x is a extend {
@@ -253,6 +260,14 @@ describe('lenses', () => {
         run: x -> d + b
       `).translationToFailWith('named refinement `b` must be a view, found a struct');
     });
+    test('cannot reference field in LHS of refinement in group_by', () => {
+        expect((0, test_translator_1.markSource) `
+        source: x is a extend {
+          view: v is { group_by: i is 1 }
+        }
+        run: x -> v + { group_by: j is ${'i'} }
+      `).translationToFailWith("'i' is not defined");
+    });
     test('cannot named-refine multi-stage query', () => {
         expect((0, test_translator_1.markSource) `
         source: x is a extend {

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

@@ -247,6 +247,50 @@ describe('source:', () => {
             select: *
           }
         }
+      `).toTranslate();
+        });
+        test('chained explore-query with refinement two steps', () => {
+            expect(`
+        source: c is a extend {
+          view: base is {
+            group_by: astr
+          } + {
+            group_by: ai
+          }
+          view: chain2 is base -> {
+            top: 10; order_by: astr
+            select: *
+          }
+        }
+      `).toTranslate();
+        });
+        test('pipelined explore-query with refinement', () => {
+            expect(`
+        source: c is a extend {
+          view: base is {
+            group_by: astr
+          }
+          view: chain is base + {
+            group_by: ai
+          } -> {
+            top: 10; order_by: astr
+            select: *
+          }
+        }
+      `).toTranslate();
+        });
+        test.skip('pipelined explore-query with view chain', () => {
+            expect(`
+        source: c is a extend {
+          view: chain is {
+            group_by: astr
+          } + {
+            group_by: ai
+          } -> {
+            top: 10; order_by: astr
+            select: *
+          }
+        }
       `).toTranslate();
         });
         test('multiple explore-query', () => {

package/package.json

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