@malloydata/malloy 0.0.22-dev230207182613 → 0.0.22-dev230207183024

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -25,8 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprAggregateFunction = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
-const fragtype_utils_1 = require("../fragtype-utils");
 const struct_space_field_base_1 = require("../field-space/struct-space-field-base");
+const fragtype_utils_1 = require("../fragtype-utils");
 const expression_def_1 = require("../types/expression-def");
 class ExprAggregateFunction extends expression_def_1.ExpressionDef {
     constructor(func, expr) {
@@ -36,7 +36,7 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
         this.elementType = func;
         if (expr) {
             this.expr = expr;
-            this.has({ expr });
+            this.has({ "expr": expr });
         }
     }
     returns(_forExpression) {
@@ -52,9 +52,9 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
                 const footType = sourceFoot.typeDesc();
                 if ((0, malloy_types_1.isAtomicFieldType)(footType.dataType)) {
                     exprVal = {
-                        dataType: footType.dataType,
-                        expressionType: footType.expressionType,
-                        value: [{ type: "field", path: this.source.refString }],
+                        "dataType": footType.dataType,
+                        "expressionType": footType.expressionType,
+                        "value": [{ "type": "field", "path": this.source.refString }]
                     };
                     structPath = this.source.sourceString;
                 }
@@ -76,20 +76,20 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
         }
         if (this.typeCheck(this.expr || this, {
             ...exprVal,
-            expressionType: "scalar",
+            "expressionType": "scalar"
         })) {
             const f = {
-                type: "aggregate",
-                function: this.func,
-                e: exprVal.value,
+                "type": "aggregate",
+                "function": this.func,
+                "e": exprVal.value
             };
             if (structPath) {
                 f.structPath = structPath;
             }
             return {
-                dataType: this.returns(exprVal),
-                expressionType: "aggregate",
-                value: [f],
+                "dataType": this.returns(exprVal),
+                "expressionType": "aggregate",
+                "value": [f]
             };
         }
         return (0, ast_utils_1.errorFor)("aggregate type check");

package/dist/lang/ast/expressions/expr-alternation-tree.js

@@ -37,9 +37,9 @@ class ExprAlternationTree extends binary_boolean_1.BinaryBoolean {
         const choice1 = this.left.apply(fs, applyOp, expr);
         const choice2 = this.right.apply(fs, applyOp, expr);
         return {
-            dataType: "boolean",
-            expressionType: (0, malloy_types_1.maxExpressionType)(choice1.expressionType, choice2.expressionType),
-            value: (0, utils_1.compose)(choice1.value, this.op === "&" ? "and" : "or", choice2.value),
+            "dataType": "boolean",
+            "expressionType": (0, malloy_types_1.maxExpressionType)(choice1.expressionType, choice2.expressionType),
+            "value": (0, utils_1.compose)(choice1.value, this.op === "&" ? "and" : "or", choice2.value)
         };
     }
     requestExpression(_fs) {

package/dist/lang/ast/expressions/expr-asymmetric.d.ts

@@ -1,6 +1,6 @@
 import { FieldReference } from "../query-items/field-references";
-import { ExprAggregateFunction } from "./expr-aggregate-function";
 import { ExpressionDef } from "../types/expression-def";
+import { ExprAggregateFunction } from "./expr-aggregate-function";
 export declare abstract class ExprAsymmetric extends ExprAggregateFunction {
     readonly func: "sum" | "avg";
     readonly expr: ExpressionDef | undefined;

package/dist/lang/ast/expressions/expr-asymmetric.js

@@ -8,7 +8,7 @@ class ExprAsymmetric extends expr_aggregate_function_1.ExprAggregateFunction {
         this.func = func;
         this.expr = expr;
         this.source = source;
-        this.has({ source });
+        this.has({ "source": source });
     }
     defaultFieldName() {
         if (this.source && this.expr === undefined) {

package/dist/lang/ast/expressions/expr-avg.d.ts

@@ -1,5 +1,5 @@
-import { ExpressionDef } from "../types/expression-def";
 import { FieldReference } from "../query-items/field-references";
+import { ExpressionDef } from "../types/expression-def";
 import { ExprAsymmetric } from "./expr-asymmetric";
 export declare class ExprAvg extends ExprAsymmetric {
     constructor(expr: ExpressionDef | undefined, source?: FieldReference);

package/dist/lang/ast/expressions/expr-avg.js

@@ -27,7 +27,7 @@ const expr_asymmetric_1 = require("./expr-asymmetric");
 class ExprAvg extends expr_asymmetric_1.ExprAsymmetric {
     constructor(expr, source) {
         super("avg", expr, source);
-        this.has({ source });
+        this.has({ "source": source });
     }
 }
 exports.ExprAvg = ExprAvg;

package/dist/lang/ast/expressions/expr-cast.d.ts

@@ -1,6 +1,6 @@
 import { ExprValue } from "../types/expr-value";
-import { FieldSpace } from "../types/field-space";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 export declare type CastType = "string" | "number" | "boolean" | "date" | "timestamp";
 export declare function isCastType(t: string): t is CastType;
 export declare class ExprCast extends ExpressionDef {

package/dist/lang/ast/expressions/expr-cast.js

@@ -1,6 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprCast = exports.isCastType = void 0;
+/*
+ * 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.
+ */
 const time_utils_1 = require("../time-utils");
 const expression_def_1 = require("../types/expression-def");
 const utils_1 = require("./utils");
@@ -10,7 +32,7 @@ function isCastType(t) {
 exports.isCastType = isCastType;
 class ExprCast extends expression_def_1.ExpressionDef {
     constructor(expr, castType, safe = false) {
-        super({ expr });
+        super({ "expr": expr });
         this.expr = expr;
         this.castType = castType;
         this.safe = safe;
@@ -19,9 +41,9 @@ class ExprCast extends expression_def_1.ExpressionDef {
     getExpression(fs) {
         const expr = this.expr.getExpression(fs);
         return {
-            dataType: this.castType,
-            expressionType: expr.expressionType,
-            value: (0, utils_1.compressExpr)((0, time_utils_1.castTo)(this.castType, expr.value, this.safe)),
+            "dataType": this.castType,
+            "expressionType": expr.expressionType,
+            "value": (0, utils_1.compressExpr)((0, time_utils_1.castTo)(this.castType, expr.value, this.safe))
         };
     }
 }

package/dist/lang/ast/expressions/expr-compare.d.ts

@@ -1,7 +1,7 @@
 import { Comparison } from "../types/comparison";
-import { FieldSpace } from "../types/field-space";
 import { ExprValue } from "../types/expr-value";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 import { BinaryBoolean } from "./binary-boolean";
 export declare class ExprCompare extends BinaryBoolean<Comparison> {
     elementType: string;

package/dist/lang/ast/expressions/expr-compare.js

@@ -23,10 +23,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprCompare = void 0;
-const expr_granular_time_1 = require("./expr-granular-time");
+const fragtype_utils_1 = require("../fragtype-utils");
 const granular_result_1 = require("../types/granular-result");
 const binary_boolean_1 = require("./binary-boolean");
-const fragtype_utils_1 = require("../fragtype-utils");
+const expr_granular_time_1 = require("./expr-granular-time");
 const compareTypes = {
     "~": [fragtype_utils_1.FT.stringT],
     "!~": [fragtype_utils_1.FT.stringT],
@@ -35,7 +35,7 @@ const compareTypes = {
     "=": [fragtype_utils_1.FT.numberT, fragtype_utils_1.FT.stringT, fragtype_utils_1.FT.dateT, fragtype_utils_1.FT.timestampT],
     "!=": [fragtype_utils_1.FT.numberT, fragtype_utils_1.FT.stringT, fragtype_utils_1.FT.dateT, fragtype_utils_1.FT.timestampT],
     ">=": [fragtype_utils_1.FT.numberT, fragtype_utils_1.FT.stringT, fragtype_utils_1.FT.dateT, fragtype_utils_1.FT.timestampT],
-    ">": [fragtype_utils_1.FT.numberT, fragtype_utils_1.FT.stringT, fragtype_utils_1.FT.dateT, fragtype_utils_1.FT.timestampT],
+    ">": [fragtype_utils_1.FT.numberT, fragtype_utils_1.FT.stringT, fragtype_utils_1.FT.dateT, fragtype_utils_1.FT.timestampT]
 };
 class ExprCompare extends binary_boolean_1.BinaryBoolean {
     constructor(left, op, right) {

package/dist/lang/ast/expressions/expr-count.js

@@ -39,17 +39,17 @@ class ExprCount extends expr_aggregate_function_1.ExprAggregateFunction {
     }
     getExpression(_fs) {
         const ret = {
-            type: "aggregate",
-            function: "count",
-            e: [],
+            "type": "aggregate",
+            "function": "count",
+            "e": []
         };
         if (this.source) {
             ret.structPath = this.source.refString;
         }
         return {
-            dataType: "number",
-            expressionType: "aggregate",
-            value: [ret],
+            "dataType": "number",
+            "expressionType": "aggregate",
+            "value": [ret]
         };
     }
 }

package/dist/lang/ast/expressions/expr-filter.d.ts

@@ -1,7 +1,7 @@
-import { ExprValue } from "../types/expr-value";
-import { FieldSpace } from "../types/field-space";
 import { Filter } from "../query-properties/filters";
+import { ExprValue } from "../types/expr-value";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 export declare class ExprFilter extends ExpressionDef {
     readonly expr: ExpressionDef;
     readonly filter: Filter;

package/dist/lang/ast/expressions/expr-filter.js

@@ -29,7 +29,7 @@ const fragtype_utils_1 = require("../fragtype-utils");
 const expression_def_1 = require("../types/expression-def");
 class ExprFilter extends expression_def_1.ExpressionDef {
     constructor(expr, filter) {
-        super({ expr, filter });
+        super({ "expr": expr, "filter": filter });
         this.expr = expr;
         this.filter = filter;
         this.elementType = "filtered expression";
@@ -49,16 +49,16 @@ class ExprFilter extends expression_def_1.ExpressionDef {
             // idea of warnings, so for now ...
             return resultExpr;
         }
-        if (this.typeCheck(this.expr, { ...resultExpr, expressionType: "scalar" })) {
+        if (this.typeCheck(this.expr, { ...resultExpr, "expressionType": "scalar" })) {
             return {
                 ...resultExpr,
-                value: [
+                "value": [
                     {
-                        type: "filterExpression",
-                        e: resultExpr.value,
-                        filterList: testList,
-                    },
-                ],
+                        "type": "filterExpression",
+                        "e": resultExpr.value,
+                        "filterList": testList
+                    }
+                ]
             };
         }
         this.expr.log(`Cannot filter '${resultExpr.dataType}' data`);

package/dist/lang/ast/expressions/expr-func.d.ts

@@ -1,6 +1,6 @@
 import { ExprValue } from "../types/expr-value";
-import { FieldSpace } from "../types/field-space";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 export declare class ExprFunc extends ExpressionDef {
     readonly name: string;
     readonly args: ExpressionDef[];

package/dist/lang/ast/expressions/expr-func.js

@@ -28,7 +28,7 @@ const expression_def_1 = require("../types/expression-def");
 const utils_1 = require("./utils");
 class ExprFunc extends expression_def_1.ExpressionDef {
     constructor(name, args) {
-        super({ args });
+        super({ "args": args });
         this.name = name;
         this.args = args;
         this.elementType = "function call()";
@@ -53,9 +53,9 @@ class ExprFunc extends expression_def_1.ExpressionDef {
         const dialect = fs.dialectObj();
         const dataType = (_c = (_b = (_a = dialect === null || dialect === void 0 ? void 0 : dialect.getFunctionInfo(this.name)) === null || _a === void 0 ? void 0 : _a.returnType) !== null && _b !== void 0 ? _b : collectType) !== null && _c !== void 0 ? _c : "number";
         return {
-            dataType: dataType,
+            "dataType": dataType,
             expressionType,
-            value: (0, utils_1.compressExpr)(funcCall),
+            "value": (0, utils_1.compressExpr)(funcCall)
         };
     }
 }

package/dist/lang/ast/expressions/expr-granular-time.js

@@ -55,17 +55,17 @@ class ExprGranularTime extends expression_def_1.ExpressionDef {
         if ((0, malloy_types_1.isTimeFieldType)(exprVal.dataType)) {
             const tsVal = {
                 ...exprVal,
-                dataType: exprVal.dataType,
-                timeframe: timeframe,
+                "dataType": exprVal.dataType,
+                "timeframe": timeframe
             };
             if (this.truncate) {
                 tsVal.value = [
                     {
-                        type: "dialect",
-                        function: "trunc",
-                        expr: { value: exprVal.value, valueType: exprVal.dataType },
-                        units: timeframe,
-                    },
+                        "type": "dialect",
+                        "function": "trunc",
+                        "expr": { "value": exprVal.value, "valueType": exprVal.dataType },
+                        "units": timeframe
+                    }
                 ];
             }
             return tsVal;

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

@@ -32,7 +32,7 @@ class ExprIdReference extends expression_def_1.ExpressionDef {
         super();
         this.fieldReference = fieldReference;
         this.elementType = "ExpressionIdReference";
-        this.has({ fieldPath: fieldReference });
+        this.has({ "fieldPath": fieldReference });
     }
     get refString() {
         return this.fieldReference.refString;
@@ -40,10 +40,10 @@ class ExprIdReference extends expression_def_1.ExpressionDef {
     getExpression(fs) {
         const def = this.fieldReference.getField(fs);
         if (def.found) {
-            const value = [{ type: def.found.refType, path: this.refString }];
+            const value = [{ "type": def.found.refType, "path": this.refString }];
             return {
                 ...def.found.typeDesc(),
-                value,
+                value
             };
         }
         this.log(def.error);
@@ -56,15 +56,15 @@ class ExprIdReference extends expression_def_1.ExpressionDef {
             if ((0, malloy_types_1.isConditionParameter)(cParam)) {
                 const lval = expr.getExpression(fs);
                 return {
-                    dataType: "boolean",
-                    expressionType: lval.expressionType,
-                    value: [
+                    "dataType": "boolean",
+                    "expressionType": lval.expressionType,
+                    "value": [
                         {
-                            type: "apply",
-                            value: lval.value,
-                            to: [{ type: "parameter", path: this.refString }],
-                        },
-                    ],
+                            "type": "apply",
+                            "value": lval.value,
+                            "to": [{ "type": "parameter", "path": this.refString }]
+                        }
+                    ]
                 };
             }
         }

package/dist/lang/ast/expressions/expr-logical-op.js

@@ -29,7 +29,7 @@ class ExprLogicalOp extends binary_boolean_1.BinaryBoolean {
     constructor() {
         super(...arguments);
         this.elementType = "logical operator";
-        this.legalChildTypes = [fragtype_utils_1.FT.boolT, { ...fragtype_utils_1.FT.boolT, aggregate: true }];
+        this.legalChildTypes = [fragtype_utils_1.FT.boolT, { ...fragtype_utils_1.FT.boolT, "aggregate": true }];
     }
 }
 exports.ExprLogicalOp = ExprLogicalOp;

package/dist/lang/ast/expressions/expr-minus.d.ts

@@ -1,6 +1,6 @@
 import { ExprValue } from "../types/expr-value";
-import { FieldSpace } from "../types/field-space";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 export declare class ExprMinus extends ExpressionDef {
     readonly expr: ExpressionDef;
     elementType: string;

package/dist/lang/ast/expressions/expr-minus.js

@@ -28,7 +28,7 @@ const fragtype_utils_1 = require("../fragtype-utils");
 const expression_def_1 = require("../types/expression-def");
 class ExprMinus extends expression_def_1.ExpressionDef {
     constructor(expr) {
-        super({ expr });
+        super({ "expr": expr });
         this.expr = expr;
         this.elementType = "unary minus";
         this.legalChildTypes = [fragtype_utils_1.FT.numberT];
@@ -37,9 +37,9 @@ class ExprMinus extends expression_def_1.ExpressionDef {
         const expr = this.expr.getExpression(fs);
         if (this.typeCheck(this.expr, expr)) {
             if (expr.value.length > 1) {
-                return { ...expr, value: ["-(", ...expr.value, ")"] };
+                return { ...expr, "value": ["-(", ...expr.value, ")"] };
             }
-            return { ...expr, value: ["-", ...expr.value] };
+            return { ...expr, "value": ["-", ...expr.value] };
         }
         return (0, ast_utils_1.errorFor)("negate requires number");
     }

package/dist/lang/ast/expressions/expr-not.js

@@ -38,8 +38,8 @@ class ExprNot extends unary_1.Unary {
         if (this.typeCheck(this.expr, notThis)) {
             return {
                 ...notThis,
-                dataType: "boolean",
-                value: (0, utils_1.nullsafeNot)(notThis.value),
+                "dataType": "boolean",
+                "value": (0, utils_1.nullsafeNot)(notThis.value)
             };
         }
         return (0, ast_utils_1.errorFor)("not requires boolean");

package/dist/lang/ast/expressions/expr-now.js

@@ -31,14 +31,14 @@ class ExprNow extends expression_def_1.ExpressionDef {
     }
     getExpression(_fs) {
         return {
-            dataType: "timestamp",
-            expressionType: "scalar",
-            value: [
+            "dataType": "timestamp",
+            "expressionType": "scalar",
+            "value": [
                 {
-                    type: "dialect",
-                    function: "now",
-                },
-            ],
+                    "type": "dialect",
+                    "function": "now"
+                }
+            ]
         };
     }
 }

package/dist/lang/ast/expressions/expr-null.js

@@ -31,9 +31,9 @@ class ExprNULL extends expression_def_1.ExpressionDef {
     }
     getExpression() {
         return {
-            dataType: "null",
-            value: ["NULL"],
-            expressionType: "scalar",
+            "dataType": "null",
+            "value": ["NULL"],
+            "expressionType": "scalar"
         };
     }
 }

package/dist/lang/ast/expressions/expr-number.js

@@ -35,7 +35,7 @@ class ExprNumber extends expression_def_1.ExpressionDef {
         return this.constantExpression();
     }
     constantExpression() {
-        return { ...fragtype_utils_1.FT.numberT, value: [this.n] };
+        return { ...fragtype_utils_1.FT.numberT, "value": [this.n] };
     }
 }
 exports.ExprNumber = ExprNumber;

package/dist/lang/ast/expressions/expr-parens.js

@@ -26,7 +26,7 @@ exports.ExprParens = void 0;
 const expression_def_1 = require("../types/expression-def");
 class ExprParens extends expression_def_1.ExpressionDef {
     constructor(expr) {
-        super({ expr });
+        super({ "expr": expr });
         this.expr = expr;
         this.elementType = "(expression)";
     }
@@ -35,7 +35,7 @@ class ExprParens extends expression_def_1.ExpressionDef {
     }
     getExpression(fs) {
         const subExpr = this.expr.getExpression(fs);
-        return { ...subExpr, value: ["(", ...subExpr.value, ")"] };
+        return { ...subExpr, "value": ["(", ...subExpr.value, ")"] };
     }
 }
 exports.ExprParens = ExprParens;

package/dist/lang/ast/expressions/expr-regex.js

@@ -32,9 +32,9 @@ class ExprRegEx extends expression_def_1.ExpressionDef {
     }
     getExpression() {
         return {
-            dataType: "regular expression",
-            expressionType: "scalar",
-            value: [`r'${this.regex}'`],
+            "dataType": "regular expression",
+            "expressionType": "scalar",
+            "value": [`r'${this.regex}'`]
         };
     }
 }

package/dist/lang/ast/expressions/expr-string.js

@@ -36,13 +36,13 @@ class ExprString extends expression_def_1.ExpressionDef {
     getExpression(_fs) {
         return {
             ...fragtype_utils_1.FT.stringT,
-            value: [
+            "value": [
                 {
-                    type: "dialect",
-                    function: "stringLiteral",
-                    literal: this.value,
-                },
-            ],
+                    "type": "dialect",
+                    "function": "stringLiteral",
+                    "literal": this.value
+                }
+            ]
         };
     }
 }

package/dist/lang/ast/expressions/expr-sum.d.ts

@@ -1,6 +1,6 @@
 import { FieldReference } from "../query-items/field-references";
-import { ExprAsymmetric } from "./expr-asymmetric";
 import { ExpressionDef } from "../types/expression-def";
+import { ExprAsymmetric } from "./expr-asymmetric";
 export declare class ExprSum extends ExprAsymmetric {
     constructor(expr: ExpressionDef | undefined, source?: FieldReference);
 }

package/dist/lang/ast/expressions/expr-sum.js

@@ -5,7 +5,7 @@ const expr_asymmetric_1 = require("./expr-asymmetric");
 class ExprSum extends expr_asymmetric_1.ExprAsymmetric {
     constructor(expr, source) {
         super("sum", expr, source);
-        this.has({ source });
+        this.has({ "source": source });
     }
 }
 exports.ExprSum = ExprSum;

package/dist/lang/ast/expressions/expr-time-extract.d.ts

@@ -1,7 +1,7 @@
 import { ExtractUnit } from "../../../model/malloy_types";
 import { ExprValue } from "../types/expr-value";
-import { FieldSpace } from "../types/field-space";
 import { ExpressionDef } from "../types/expression-def";
+import { FieldSpace } from "../types/field-space";
 export declare class ExprTimeExtract extends ExpressionDef {
     readonly extractText: string;
     readonly args: ExpressionDef[];