@malloydata/malloy 0.0.1 → 0.0.2

package/dist/lang/field-space.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fsPair = exports.DefSpace = exports.IndexFieldSpace = exports.ProjectFieldSpace = exports.ReduceFieldSpace = exports.QuerySpace = exports.QueryOperationSpace = exports.DynamicSpace = exports.StaticSpace = void 0;
+exports.DefSpace = exports.IndexFieldSpace = exports.ProjectFieldSpace = exports.ReduceFieldSpace = exports.ResultSpace = exports.QuerySpace = exports.DynamicSpace = exports.StaticSpace = void 0;
 /* eslint-disable no-useless-constructor */
 const lodash_1 = require("lodash");
 const dialect_1 = require("../dialect");
@@ -54,8 +54,13 @@ class StaticSpace {
     whenComplete(step) {
         step();
     }
-    getDialect() {
-        return (0, dialect_1.getDialect)(this.fromStruct.dialect);
+    dialectObj() {
+        try {
+            return (0, dialect_1.getDialect)(this.fromStruct.dialect);
+        }
+        catch {
+            return undefined;
+        }
     }
     fromFieldDef(from) {
         if (from.type === "struct") {
@@ -116,6 +121,8 @@ class StaticSpace {
         }
         if (found instanceof space_field_1.SpaceField) {
             /*
+             * TODO cache defs, post the addReference call to whenComplete
+             *
              * In the cleanup phase of query space construction, it may check
              * the output space for ungrouping variables. However if an
              * ungrouping variable is a measure, the field expression value
@@ -129,18 +136,7 @@ class StaticSpace {
              * ... or this check would look at the finalized output of
              * the namespace and not re-compile ...
              */
-            let definition = undefined;
-            if (this instanceof QuerySpace) {
-                const qfd = found.getQueryFieldDef(this.qfs());
-                if (qfd &&
-                    typeof qfd != "string" &&
-                    !model.isFilteredAliasedName(qfd)) {
-                    definition = qfd;
-                }
-            }
-            else {
-                definition = found.fieldDef();
-            }
+            const definition = found.fieldDef();
             if (definition) {
                 head.addReference({
                     type: found instanceof space_field_1.StructSpaceField
@@ -285,7 +281,7 @@ class DynamicSpace extends StaticSpace {
                     def.log("Can't rename field to itself");
                     continue;
                 }
-                const oldValue = def.oldName.getField(fsPair(this));
+                const oldValue = def.oldName.getField(this);
                 if (oldValue.found) {
                     if (oldValue.found instanceof space_field_1.SpaceField) {
                         this.setEntry(def.newName, new space_field_1.RenameSpaceField(oldValue.found, def.newName, def.location));
@@ -360,7 +356,7 @@ class DynamicSpace extends StaticSpace {
             }
             // If we have join expressions, we need to now go back and fill them in
             for (const [join, missingOn] of fixupJoins) {
-                join.fixupJoinOn(fsPair(this), missingOn);
+                join.fixupJoinOn(this, missingOn);
             }
         }
         this.isComplete();
@@ -370,25 +366,39 @@ class DynamicSpace extends StaticSpace {
 exports.DynamicSpace = DynamicSpace;
 /**
  * A namespace for Query operations. The have an input and an
- * output set of fields.
+ * output set of fields. The InputSpace is the QueryOperationSpace
+ * which is where all expressions are evaluated, and the output
+ * space is ResultSpace.
+ *
  */
-class QueryOperationSpace extends DynamicSpace {
-    constructor(input) {
+class QuerySpace extends DynamicSpace {
+    constructor(input, result) {
         const inputSpace = new SourceSpace(input);
-        super({ ...inputSpace.structDef, fields: [] });
-        this.queryInput = inputSpace;
+        super(inputSpace.structDef);
+        this.result = result;
+        this.extendList = [];
     }
-    inputFS() {
-        return this.queryInput.fieldSpace;
+    extendSource(extendField) {
+        this.addField(extendField);
+        if (extendField instanceof ast_1.Join) {
+            this.extendList.push(extendField.name.refString);
+        }
+        else {
+            this.extendList.push(extendField.defineName);
+        }
     }
-    structDef() {
-        // Actually since we have the input structdef and the fields, this feels
-        // like it could return the output structdef of the query op ... except
-        // the pipeline code merges refinements in before asking for the output
-        // struct, and that would require a call back here somehow to get the
-        // pre-refinement fields ... I think possibly this is always a
-        // runtime error
-        throw new Error("StructDef requested from QueryOperationSpace");
+}
+exports.QuerySpace = QuerySpace;
+class ResultSpace extends DynamicSpace {
+    constructor(queryInputSpace) {
+        super(queryInputSpace.emptyStructDef());
+        this.queryInputSpace = queryInputSpace;
+        this.exprSpace = new QuerySpace(queryInputSpace, this);
+    }
+    log(s) {
+        if (this.astEl) {
+            this.astEl.log(s);
+        }
     }
     addMembers(members) {
         for (const member of members) {
@@ -415,45 +425,18 @@ class QueryOperationSpace extends DynamicSpace {
     addWild(wild) {
         this.setEntry(wild.refString, new space_field_1.WildSpaceField(wild.refString));
     }
-    log(s) {
-        if (this.astEl) {
-            this.astEl.log(s);
-        }
-    }
-}
-exports.QueryOperationSpace = QueryOperationSpace;
-/**
- * Reduce and project queries use a "QuerySpace"
- */
-class QuerySpace extends QueryOperationSpace {
-    constructor() {
-        super(...arguments);
-        this.extendedFields = [];
-    }
-    extendSource(extendField) {
-        this.extendedFields.push(extendField instanceof ast_1.Join
-            ? extendField.name.refString
-            : extendField.defineName);
-        this.extendInto().addField(extendField);
-    }
-    inputFS() {
-        if (this.extendedInput) {
-            return this.extendedInput;
-        }
-        return this.queryInput.fieldSpace;
-    }
-    qfs() {
-        return {
-            in: this.inputFS(),
-            out: this,
-        };
-    }
+    /**
+     * Check for the definition of an ungrouping reference in the result space,
+     * or in the case of an exclude reference, if this query is nested
+     * in another query, in the result space of a query that this query
+     * is nested inside of.
+     */
     checkUngroup(fn, isExclude) {
-        if (this.lookup([fn]).error) {
-            if (isExclude && this.nestParent) {
-                const parent = this.nestParent;
+        if (!this.entry(fn.refString)) {
+            if (isExclude && this.exprSpace.nestParent) {
+                const parent = this.exprSpace.nestParent;
                 parent.whenComplete(() => {
-                    parent.checkUngroup(fn, isExclude);
+                    parent.result.checkUngroup(fn, isExclude);
                 });
             }
             else {
@@ -462,46 +445,6 @@ class QuerySpace extends QueryOperationSpace {
             }
         }
     }
-    extendInto() {
-        if (!this.extendedInput) {
-            this.extendedInput = new DynamicSpace(this.queryInput.sourceSpec);
-        }
-        return this.extendedInput;
-    }
-    getPipeSegment(refineFrom) {
-        const reduceOrProject = this.segType;
-        if (reduceOrProject === "index") {
-            throw new Error("IndexSegment getPipeSegment should not call super");
-        }
-        if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {
-            for (const xField of refineFrom.extendSource) {
-                this.extendInto().addFieldDef(xField);
-            }
-        }
-        const segment = {
-            type: reduceOrProject,
-            fields: this.queryFieldDefs(),
-        };
-        segment.fields = (0, field_utils_1.mergeFields)(refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.fields, segment.fields);
-        if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {
-            segment.extendSource = refineFrom.extendSource;
-        }
-        if (this.extendedInput) {
-            const newExtends = [];
-            // have to get the whole structdef because we need all the join
-            // resolution to happen and that only happens at the completion
-            // of the structdef generation.
-            const extendedStruct = this.extendedInput.structDef();
-            for (const extendName of this.extendedFields) {
-                const extendEnt = extendedStruct.fields.find((f) => (0, field_utils_1.nameOf)(f) == extendName);
-                if (extendEnt) {
-                    newExtends.push(extendEnt);
-                }
-            }
-            segment.extendSource = (0, field_utils_1.mergeFields)(segment.extendSource, newExtends);
-        }
-        return segment;
-    }
     addQueryItems(...qiList) {
         for (const qi of qiList) {
             if (qi instanceof ast_1.FieldReference || qi instanceof ast_1.NestReference) {
@@ -511,8 +454,8 @@ class QuerySpace extends QueryOperationSpace {
                 this.addField(qi);
             }
             else if ((0, ast_1.isNestedQuery)(qi)) {
-                const qf = new space_field_1.QueryFieldAST(this.inputFS(), qi, qi.name);
-                qf.nestParent = this;
+                const qf = new space_field_1.QueryFieldAST(this, qi, qi.name);
+                qf.nestParent = this.exprSpace;
                 this.setEntry(qi.name, qf);
             }
             else {
@@ -528,13 +471,13 @@ class QuerySpace extends QueryOperationSpace {
         const fields = [];
         for (const [name, field] of this.entries()) {
             if (field instanceof space_field_1.SpaceField) {
-                const fieldQueryDef = field.getQueryFieldDef(this.qfs());
+                const fieldQueryDef = field.getQueryFieldDef(this.exprSpace);
                 if (fieldQueryDef) {
                     if (this.canContain(fieldQueryDef)) {
                         fields.push(fieldQueryDef);
                     }
                     else {
-                        this.log(`'${name}' not legal in ${this.segType}`);
+                        this.log(`'${name}' not legal in ${this.segmentType}`);
                     }
                 }
                 else {
@@ -545,19 +488,61 @@ class QuerySpace extends QueryOperationSpace {
         this.isComplete();
         return fields;
     }
+    getQuerySegment(rf) {
+        const p = this.getPipeSegment(rf);
+        if (model.isQuerySegment(p)) {
+            return p;
+        }
+        throw new Error("TODO NOT POSSIBLE");
+    }
+    getPipeSegment(refineFrom) {
+        if (this.segmentType == "index") {
+            // TODO ... should make this go away
+            throw new Error("INDEX FIELD PIPE SEGMENT MIS HANDLED");
+        }
+        if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {
+            for (const xField of refineFrom.extendSource) {
+                this.exprSpace.addFieldDef(xField);
+            }
+        }
+        const segment = {
+            type: this.segmentType,
+            fields: this.queryFieldDefs(),
+        };
+        segment.fields = (0, field_utils_1.mergeFields)(refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.fields, segment.fields);
+        if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {
+            segment.extendSource = refineFrom.extendSource;
+        }
+        if (this.exprSpace.extendList.length > 0) {
+            const newExtends = [];
+            const extendedStruct = this.exprSpace.structDef();
+            for (const extendName of this.exprSpace.extendList) {
+                const extendEnt = extendedStruct.fields.find((f) => (0, field_utils_1.nameOf)(f) == extendName);
+                if (extendEnt) {
+                    newExtends.push(extendEnt);
+                }
+            }
+            segment.extendSource = (0, field_utils_1.mergeFields)(segment.extendSource, newExtends);
+        }
+        this.isComplete();
+        return segment;
+    }
 }
-exports.QuerySpace = QuerySpace;
-class ReduceFieldSpace extends QuerySpace {
+exports.ResultSpace = ResultSpace;
+/**
+ * Reduce and project queries use a "QuerySpace"
+ */
+class ReduceFieldSpace extends ResultSpace {
     constructor() {
         super(...arguments);
-        this.segType = "reduce";
+        this.segmentType = "reduce";
     }
 }
 exports.ReduceFieldSpace = ReduceFieldSpace;
-class ProjectFieldSpace extends QuerySpace {
+class ProjectFieldSpace extends ResultSpace {
     constructor() {
         super(...arguments);
-        this.segType = "project";
+        this.segmentType = "project";
     }
     canContain(qd) {
         if (typeof qd !== "string") {
@@ -577,14 +562,14 @@ class ProjectFieldSpace extends QuerySpace {
     }
 }
 exports.ProjectFieldSpace = ProjectFieldSpace;
-class IndexFieldSpace extends QueryOperationSpace {
+class IndexFieldSpace extends ResultSpace {
     constructor() {
         super(...arguments);
-        this.segType = "index";
+        this.segmentType = "index";
         this.fieldList = new Set();
     }
     addReference(ref) {
-        if (ref.getField(this.inputFS()).found) {
+        if (ref.getField(this.exprSpace).found) {
             this.fieldList.add(ref.refString);
         }
     }
@@ -633,19 +618,12 @@ class DefSpace {
         }
         return this.realFS.lookup(symbol);
     }
-    getDialect() {
-        return this.realFS.getDialect();
+    dialectObj() {
+        return this.realFS.dialectObj();
     }
     whenComplete(step) {
         this.realFS.whenComplete(step);
     }
 }
 exports.DefSpace = DefSpace;
-function fsPair(inFS, outFS) {
-    return {
-        in: inFS,
-        out: outFS || inFS,
-    };
-}
-exports.fsPair = fsPair;
 //# sourceMappingURL=field-space.js.map

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

@@ -1,5 +1,5 @@
 import * as model from "../model/malloy_types";
-import { FieldSpace, FSPair, DynamicSpace, QuerySpace } from "./field-space";
+import { FieldSpace, DynamicSpace, QuerySpace } from "./field-space";
 import { FieldValueType, FieldDeclaration, TurtleDecl, HasParameter, Join, FieldReference } from "./ast";
 interface FieldType {
     type: FieldValueType;
@@ -28,7 +28,7 @@ export declare class AbstractParameter extends SpaceParam {
 export declare abstract class SpaceField extends SpaceEntry {
     readonly refType = "field";
     protected fieldTypeFromFieldDef(def: model.FieldDef): FieldType;
-    getQueryFieldDef(_fs: FSPair): model.QueryFieldDef | undefined;
+    getQueryFieldDef(_fs: FieldSpace): model.QueryFieldDef | undefined;
     fieldDef(): model.FieldDef | undefined;
 }
 export declare class RenameSpaceField extends SpaceField {
@@ -43,7 +43,7 @@ export declare class WildSpaceField extends SpaceField {
     readonly wildText: string;
     constructor(wildText: string);
     type(): FieldType;
-    getQueryFieldDef(_fs: FSPair): model.QueryFieldDef;
+    getQueryFieldDef(_fs: FieldSpace): model.QueryFieldDef;
 }
 export declare class StructSpaceField extends SpaceField {
     protected sourceDef: model.StructDef;
@@ -67,7 +67,8 @@ export declare class ColumnSpaceField extends SpaceField {
 export declare abstract class QueryField extends SpaceField {
     protected inSpace: FieldSpace;
     constructor(inSpace: FieldSpace);
-    getQueryFieldDef(_fs: FSPair): model.QueryFieldDef | undefined;
+    abstract getQueryFieldDef(fs: FieldSpace): model.QueryFieldDef | undefined;
+    abstract fieldDef(): model.FieldDef;
     type(): FieldType;
 }
 export declare class QueryFieldAST extends QueryField {
@@ -76,6 +77,7 @@ export declare class QueryFieldAST extends QueryField {
     renameAs?: string;
     nestParent?: QuerySpace;
     constructor(fs: FieldSpace, turtle: TurtleDecl, name: string);
+    getQueryFieldDef(fs: FieldSpace): model.QueryFieldDef;
     fieldDef(): model.TurtleDef;
 }
 export declare class QueryFieldStruct extends QueryField {
@@ -83,6 +85,7 @@ export declare class QueryFieldStruct extends QueryField {
     constructor(fs: FieldSpace, turtleDef: model.TurtleDef);
     rename(name: string): void;
     fieldDef(): model.TurtleDef;
+    getQueryFieldDef(_fs: FieldSpace): model.QueryFieldDef | undefined;
 }
 /**
  * FilteredAliasedName
@@ -96,13 +99,13 @@ export declare class FANSPaceField extends SpaceField {
     name(): string;
     private filtersPresent;
     fieldDef(): model.FieldDef | undefined;
-    getQueryFieldDef(_fs: FSPair): model.QueryFieldDef;
+    getQueryFieldDef(_fs: FieldSpace): model.QueryFieldDef;
     type(): FieldType;
 }
 export declare class ReferenceField extends SpaceField {
     readonly fieldRef: FieldReference;
     constructor(fieldRef: FieldReference);
-    getQueryFieldDef(fs: FSPair): model.QueryFieldDef | undefined;
+    getQueryFieldDef(fs: FieldSpace): model.QueryFieldDef | undefined;
     type(): FieldType;
 }
 export declare class ExpressionFieldFromAst extends SpaceField {
@@ -113,7 +116,7 @@ export declare class ExpressionFieldFromAst extends SpaceField {
     constructor(space: DynamicSpace, exprDef: FieldDeclaration);
     get name(): string;
     fieldDef(): model.FieldDef;
-    getQueryFieldDef(fs: FSPair): model.QueryFieldDef;
+    getQueryFieldDef(fs: FieldSpace): model.QueryFieldDef;
     type(): FieldType;
 }
 export {};

package/dist/lang/space-field.js

@@ -176,9 +176,6 @@ class QueryField extends SpaceField {
         super();
         this.inSpace = inSpace;
     }
-    getQueryFieldDef(_fs) {
-        return this.fieldDef();
-    }
     type() {
         return { type: "turtle" };
     }
@@ -190,6 +187,13 @@ class QueryFieldAST extends QueryField {
         this.turtle = turtle;
         this.name = name;
     }
+    getQueryFieldDef(fs) {
+        const def = this.turtle.getFieldDef(fs, this.nestParent);
+        if (this.renameAs) {
+            def.as = this.renameAs;
+        }
+        return def;
+    }
     fieldDef() {
         const def = this.turtle.getFieldDef(this.inSpace, this.nestParent);
         if (this.renameAs) {
@@ -213,6 +217,9 @@ class QueryFieldStruct extends QueryField {
     fieldDef() {
         return this.turtleDef;
     }
+    getQueryFieldDef(_fs) {
+        return this.fieldDef();
+    }
 }
 exports.QueryFieldStruct = QueryFieldStruct;
 /**
@@ -297,7 +304,7 @@ class ReferenceField extends SpaceField {
     }
     getQueryFieldDef(fs) {
         // Lookup string and generate error if it isn't defined.
-        const check = this.fieldRef.getField(fs.in);
+        const check = this.fieldRef.getField(fs);
         if (check.error) {
             this.fieldRef.log(check.error);
         }

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

@@ -233,7 +233,7 @@ class BetaExpression extends Testable {
             const aStruct = this.internalModel.contents.ab;
             if (aStruct.type === "struct") {
                 const tstFS = new field_space_1.StaticSpace(aStruct);
-                const exprDef = exprAst.getExpression({ in: tstFS, out: tstFS });
+                const exprDef = exprAst.getExpression(tstFS);
                 if (inspectCompile) {
                     console.log("EXPRESSION: ", (0, test_translator_1.pretty)(exprDef));
                 }

package/dist/model/malloy_query.js

@@ -1264,6 +1264,12 @@ class QueryQuery extends QueryField {
                 switch (expr.function) {
                     case "now":
                         break;
+                    case "div":
+                        expressions.push(expr.denominator);
+                        expressions.push(expr.numerator);
+                        break;
+                    case "timeLiteral":
+                        break;
                     case "timeDiff":
                         expressions.push(expr.left.value, expr.right.value);
                         break;

package/dist/model/malloy_types.d.ts

@@ -173,7 +173,18 @@ export interface RegexpMatchFragment extends DialectFragmentBase {
     expr: Expr;
     regexp: string;
 }
-export declare type DialectFragment = NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | RegexpMatchFragment;
+export interface DivFragment extends DialectFragmentBase {
+    function: "div";
+    numerator: Expr;
+    denominator: Expr;
+}
+export interface TimeLiteralFragment extends DialectFragmentBase {
+    function: "timeLiteral";
+    literal: string;
+    literalType: TimeFieldType;
+    timezone: string;
+}
+export declare type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | RegexpMatchFragment;
 export declare type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | ParameterFragment | FilterFragment | AggregateFragment | UngroupFragment | DialectFragment;
 export declare type Expr = Fragment[];
 export interface TypedValue {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,6 +18,7 @@
     "blueimp-md5": "^2.19.0",
     "lodash": "^4.17.20",
     "luxon": "^1.26.0",
+    "md5": "^2.3.0",
     "url": "^0.11.0"
   },
   "devDependencies": {