@malloydata/malloy 0.0.39-dev230613161129 → 0.0.39

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxExpressionType = exports.expressionIsCalculation = exports.expressionIsAggregate = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isAnalyticFragment = exports.malloyFunctions = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = void 0;
+exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = 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 = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -45,6 +45,10 @@ function isFilteredAliasedName(f) {
     return true;
 }
 exports.isFilteredAliasedName = isFilteredAliasedName;
+function isOutputFieldFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'outputField';
+}
+exports.isOutputFieldFragment = isOutputFieldFragment;
 function isFilterFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'filterExpression';
 }
@@ -66,61 +70,22 @@ function isUngroupFragment(f) {
     return ftype === 'all' || ftype === 'exclude';
 }
 exports.isUngroupFragment = isUngroupFragment;
-exports.malloyFunctions = {
-    'row_number': {
-        returnType: 'number',
-        parameters: 'none',
-        expressionType: 'analytic',
-    },
-    'rank': {
-        returnType: 'number',
-        parameters: 'none',
-        expressionType: 'analytic',
-    },
-    'dense_rank': {
-        returnType: 'number',
-        parameters: 'none',
-        expressionType: 'analytic',
-    },
-    'first_value_in_column': {
-        returnType: 'number',
-        parameters: 'any',
-        expressionType: 'analytic',
-        sqlName: 'first_value',
-    },
-    'last_value_in_column': {
-        returnType: 'number',
-        parameters: 'any',
-        expressionType: 'analytic',
-        sqlName: 'last_value',
-    },
-    'min_in_column': {
-        returnType: 'number',
-        parameters: 'any',
-        expressionType: 'analytic',
-        sqlName: 'min',
-    },
-    'max_in_column': {
-        returnType: 'number',
-        parameters: 'any',
-        expressionType: 'analytic',
-        sqlName: 'max',
-    },
-    'ntile': {
-        returnType: 'number',
-        parameters: ['nconst'],
-        expressionType: 'analytic',
-    },
-    'lag': {
-        returnType: 'number',
-        parameters: ['number', 'nconst'],
-        expressionType: 'analytic',
-    },
-};
-function isAnalyticFragment(f) {
-    return (f === null || f === void 0 ? void 0 : f.type) === 'analytic';
-}
-exports.isAnalyticFragment = isAnalyticFragment;
+function isFunctionParameterFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'function_parameter';
+}
+exports.isFunctionParameterFragment = isFunctionParameterFragment;
+function isFunctionCallFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'function_call';
+}
+exports.isFunctionCallFragment = isFunctionCallFragment;
+function isSQLExpressionFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'sql_expression';
+}
+exports.isSQLExpressionFragment = isSQLExpressionFragment;
+function isSpreadFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'spread';
+}
+exports.isSpreadFragment = isSpreadFragment;
 function isFieldFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'field';
 }
@@ -168,25 +133,77 @@ function mkExpr(src, ...exprs) {
     return ret;
 }
 exports.mkExpr = mkExpr;
+function expressionIsScalar(e) {
+    return e === undefined || e === 'scalar';
+}
+exports.expressionIsScalar = expressionIsScalar;
 function expressionIsAggregate(e) {
-    return e === 'aggregate';
+    return e === 'aggregate' || e === 'ungrouped_aggregate';
 }
 exports.expressionIsAggregate = expressionIsAggregate;
+function expressionIsUngroupedAggregate(e) {
+    return e === 'ungrouped_aggregate';
+}
+exports.expressionIsUngroupedAggregate = expressionIsUngroupedAggregate;
+function expressionInvolvesAggregate(e) {
+    return (e === 'aggregate' ||
+        e === 'ungrouped_aggregate' ||
+        e === 'aggregate_analytic');
+}
+exports.expressionInvolvesAggregate = expressionInvolvesAggregate;
 function expressionIsCalculation(e) {
-    return e === 'aggregate' || e === 'analytic';
+    return (e === 'aggregate' ||
+        e === 'scalar_analytic' ||
+        e === 'aggregate_analytic' ||
+        e === 'ungrouped_aggregate');
 }
 exports.expressionIsCalculation = expressionIsCalculation;
+function expressionIsAnalytic(e) {
+    return e === 'aggregate_analytic' || e === 'scalar_analytic';
+}
+exports.expressionIsAnalytic = expressionIsAnalytic;
+function expressionTypeLevel(e) {
+    return {
+        scalar: 0,
+        aggregate: 1,
+        ungrouped_aggregate: 2,
+        scalar_analytic: 2,
+        aggregate_analytic: 3,
+    }[e];
+}
+function isExpressionTypeLEQ(e1, e2) {
+    return e1 === e2 || expressionTypeLevel(e1) < expressionTypeLevel(e2);
+}
+exports.isExpressionTypeLEQ = isExpressionTypeLEQ;
+// TODO rename this to be like `combineExpressionTypes`
 function maxExpressionType(e1, e2) {
+    // TODO handle the case where e1 is analytic and e2 is ungrouped_aggregate
     let ret = 'scalar';
     if (e1 === 'aggregate' || e2 === 'aggregate') {
         ret = 'aggregate';
     }
-    if (e1 === 'analytic' || e2 === 'analytic') {
-        ret = 'analytic';
+    if (e1 === 'ungrouped_aggregate' || e2 === 'ungrouped_aggregate') {
+        ret = 'ungrouped_aggregate';
+    }
+    if (e1 === 'scalar_analytic' || e2 === 'scalar_analytic') {
+        ret = 'scalar_analytic';
+    }
+    if (e1 === 'aggregate_analytic' || e2 === 'aggregate_analytic') {
+        ret = 'aggregate_analytic';
+    }
+    if (e1 === 'scalar_analytic' && e2 === 'aggregate') {
+        ret = 'aggregate_analytic';
+    }
+    else if (e1 === 'aggregate' && e2 === 'scalar_analytic') {
+        ret = 'aggregate_analytic';
     }
     return ret;
 }
 exports.maxExpressionType = maxExpressionType;
+function maxOfExpressionTypes(types) {
+    return types.reduce(maxExpressionType, 'scalar');
+}
+exports.maxOfExpressionTypes = maxOfExpressionTypes;
 /**  Grants access to the expression property of a FielfDef */
 function hasExpression(f) {
     return f.e !== undefined;
@@ -296,6 +313,16 @@ function isSQLFragment(f) {
     return f.sql !== undefined;
 }
 exports.isSQLFragment = isSQLFragment;
+function mergeEvalSpaces(...evalSpaces) {
+    if (evalSpaces.every(e => e === 'constant' || e === 'literal')) {
+        return 'constant';
+    }
+    else if (evalSpaces.every(e => e === 'output' || e === 'constant' || e === 'literal')) {
+        return 'output';
+    }
+    return 'input';
+}
+exports.mergeEvalSpaces = mergeEvalSpaces;
 function isSQLBlockStruct(sd) {
     const src = sd.structSource;
     return src.type === 'sql' && src.method === 'subquery';

package/dist/model/utils.d.ts

@@ -1,3 +1,4 @@
+import { Expr, Fragment } from './malloy_types';
 /** simple indent function */
 export declare function indent(s: string): string;
 /**
@@ -20,3 +21,6 @@ export declare class AndChain {
     sql(whereOrHaving?: 'where' | 'having'): string;
 }
 export declare function generateHash(input: string): string;
+export declare function exprMap(expr: Expr, func: (fragment: Fragment) => Expr): Expr;
+export declare function joinWith<T>(els: T[][], sep: T): T[];
+export declare function range(start: number, end: number): number[];

package/dist/model/utils.js

@@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateHash = exports.AndChain = exports.generateSQLStringLiteral = exports.indent = void 0;
+exports.range = exports.joinWith = exports.exprMap = exports.generateHash = exports.AndChain = exports.generateSQLStringLiteral = exports.indent = void 0;
 const md5_1 = __importDefault(require("md5"));
 /** simple indent function */
 function indent(s) {
@@ -99,4 +99,121 @@ function generateHash(input) {
     return (0, md5_1.default)(input);
 }
 exports.generateHash = generateHash;
+function exprMap(expr, func) {
+    return expr.flatMap(fragment => {
+        const mapped = func(fragment);
+        return mapped.map(fragment => {
+            if (typeof fragment === 'string') {
+                return fragment;
+            }
+            switch (fragment.type) {
+                case 'aggregate':
+                case 'all':
+                case 'spread':
+                case 'sql_expression':
+                case 'exclude':
+                    return {
+                        ...fragment,
+                        e: exprMap(fragment.e, func),
+                    };
+                case 'apply':
+                    return {
+                        ...fragment,
+                        to: exprMap(fragment.to, func),
+                        value: exprMap(fragment.value, func),
+                    };
+                case 'applyVal':
+                case 'field':
+                case 'function_parameter':
+                case 'parameter':
+                case 'outputField':
+                    return fragment;
+                case 'function_call':
+                    return {
+                        ...fragment,
+                        args: fragment.args.map(arg => exprMap(arg, func)),
+                    };
+                case 'filterExpression':
+                    return {
+                        ...fragment,
+                        e: exprMap(fragment.e, func),
+                        filterList: fragment.filterList.map(filter => {
+                            return {
+                                ...filter,
+                                expression: exprMap(filter.expression, func),
+                            };
+                        }),
+                    };
+                case 'dialect': {
+                    switch (fragment.function) {
+                        case 'cast':
+                        case 'regexpMatch':
+                            return {
+                                ...fragment,
+                                expr: exprMap(fragment.expr, func),
+                            };
+                        case 'delta':
+                            return {
+                                ...fragment,
+                                delta: exprMap(fragment.delta, func),
+                            };
+                        case 'div':
+                            return {
+                                ...fragment,
+                                denominator: exprMap(fragment.denominator, func),
+                                numerator: exprMap(fragment.numerator, func),
+                            };
+                        case 'now':
+                        case 'numberLiteral':
+                        case 'stringLiteral':
+                        case 'timeLiteral':
+                        case 'regexpLiteral':
+                            return fragment;
+                        case 'extract':
+                        case 'trunc':
+                            return {
+                                ...fragment,
+                                expr: {
+                                    ...fragment.expr,
+                                    value: exprMap(fragment.expr.value, func),
+                                },
+                            };
+                        case 'timeDiff':
+                            return {
+                                ...fragment,
+                                left: {
+                                    ...fragment.left,
+                                    value: exprMap(fragment.left.value, func),
+                                },
+                                right: {
+                                    ...fragment.left,
+                                    value: exprMap(fragment.left.value, func),
+                                },
+                            };
+                        default:
+                            throw new Error('unexpected dialect function');
+                    }
+                }
+                default:
+                    throw new Error('unexpected');
+            }
+        });
+    });
+}
+exports.exprMap = exprMap;
+function joinWith(els, sep) {
+    const result = [];
+    for (let i = 0; i < els.length; i++) {
+        result.push(...els[i]);
+        if (i < els.length - 1) {
+            result.push(sep);
+        }
+    }
+    return result;
+}
+exports.joinWith = joinWith;
+function range(start, end) {
+    return Array.from({ length: end - start }, (_, index) => index + start);
+}
+exports.range = range;
 //# sourceMappingURL=utils.js.map

package/package.json

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

package/dist/lang/ast/types/type-desc.d.ts

@@ -1,8 +0,0 @@
-import { AtomicFieldType, ExpressionType } from '../../../model/malloy_types';
-export declare type ExpressionValueType = AtomicFieldType | 'null' | 'unknown' | 'duration' | 'regular expression';
-export declare type FieldValueType = ExpressionValueType | 'turtle' | 'struct';
-export interface TypeDesc {
-    dataType: FieldValueType;
-    expressionType: ExpressionType;
-    rawType?: string;
-}