@malloydata/malloy 0.0.120-dev240131220408 → 0.0.120

package/dist/model/malloy_query.js

@@ -249,12 +249,12 @@ class QueryField extends QueryNode {
             return [param.name, { param, argIndexes }];
         }));
     }
-    expandFunctionCall(dialect, overload, args) {
+    expandFunctionCall(dialect, overload, args, orderBy, limit) {
         const paramMap = this.getParameterMap(overload, args.length);
         if (overload.dialect[dialect] === undefined) {
             throw new Error(`Function is not defined for dialect ${dialect}`);
         }
-        return (0, utils_1.exprMap)(overload.dialect[dialect], fragment => {
+        return (0, utils_1.exprMap)(overload.dialect[dialect].e, fragment => {
             if (typeof fragment === 'string') {
                 return [fragment];
             }
@@ -264,7 +264,6 @@ class QueryField extends QueryNode {
                     typeof param === 'string' ||
                     param.type !== 'function_parameter') {
                     throw new Error('Invalid function definition. Argument to spread must be a function parameter.');
-                    return [];
                 }
                 const entry = paramMap.get(param.name);
                 if (entry === undefined) {
@@ -287,17 +286,34 @@ class QueryField extends QueryNode {
                     return args[entry.argIndexes[0]];
                 }
             }
+            else if (fragment.type === 'aggregate_order_by') {
+                return orderBy ? [` ${orderBy}`] : [];
+            }
+            else if (fragment.type === 'aggregate_limit') {
+                return limit ? [` ${limit}`] : [];
+            }
             return [fragment];
         });
     }
     generateFunctionCallExpression(resultSet, context, frag, state) {
-        var _a;
+        var _a, _b;
         const overload = frag.overload;
         const args = frag.args;
         const isSymmetric = (_a = frag.overload.isSymmetric) !== null && _a !== void 0 ? _a : false;
         const distinctKey = (0, malloy_types_1.expressionIsAggregate)(overload.returnType.expressionType) &&
             !isSymmetric &&
             this.generateDistinctKeyIfNecessary(resultSet, context, frag.structPath);
+        const aggregateOrderBy = frag.orderBy
+            ? 'ORDER BY ' +
+                frag.orderBy
+                    .map(ob => {
+                    const osql = this.generateDimFragment(resultSet, context, ob.e, state);
+                    const dirsql = ob.dir === 'asc' ? ' ASC' : ob.dir === 'desc' ? ' DESC' : '';
+                    return `${osql}${dirsql}`;
+                })
+                    .join(', ')
+            : undefined;
+        const aggregateLimit = frag.limit ? `LIMIT ${frag.limit}` : undefined;
         if (distinctKey) {
             if (!context.dialect.supportsAggDistinct) {
                 throw new Error(`Asymmetric aggregates are not supported for custom functions in ${context.dialect.name}.`);
@@ -306,26 +322,39 @@ class QueryField extends QueryNode {
                 return this.generateDimFragment(resultSet, context, arg, state);
             });
             return context.dialect.sqlAggDistinct(distinctKey, argsExpressions, valNames => {
-                const funcCall = this.expandFunctionCall(context.dialect.name, overload, valNames.map(v => [v]));
+                const funcCall = this.expandFunctionCall(context.dialect.name, overload, valNames.map(v => [v]), aggregateOrderBy, aggregateLimit);
                 return this.generateExpressionFromExpr(resultSet, context, funcCall, state);
             });
         }
         else {
             const mappedArgs = (0, malloy_types_1.expressionIsAggregate)(overload.returnType.expressionType)
-                ? args.map(arg => {
+                ? args.map((arg, index) => {
                     // TODO We assume that all arguments to this aggregate-returning function need to
                     // have filters applied to them. This is not necessarily true in the general case,
                     // e.g. in a function `avg_plus(a, b) = avg(a) + b` -- here, `b` should not be
                     // be filtered. But since there aren't any aggregate functions like this in the
                     // standard library we have planned, we ignore this for now.
-                    return [this.generateDimFragment(resultSet, context, arg, state)];
+                    // Update: Now we apply this only to arguments whose parameter is not constant-requiring.
+                    // So in `string_agg(val, sep)`, `sep` does not get filters applied to it because
+                    // it must be constant
+                    const param = overload.params[index];
+                    // TODO technically this should probably look at _which_ allowed param type was matched
+                    // for this argument and see if that type is at most constant... but we lose type information
+                    // by this point in the compilation, so that info would have to be passed into the func call
+                    // fragment.
+                    return param.allowedTypes.every(t => (0, malloy_types_1.isLiteral)(t.evalSpace))
+                        ? arg
+                        : [this.generateDimFragment(resultSet, context, arg, state)];
                 })
                 : args;
-            const funcCall = this.expandFunctionCall(context.dialect.name, overload, mappedArgs);
+            const funcCall = this.expandFunctionCall(context.dialect.name, overload, mappedArgs, aggregateOrderBy, aggregateLimit);
             if ((0, malloy_types_1.expressionIsAnalytic)(overload.returnType.expressionType)) {
+                const extraPartitions = ((_b = frag.partitionBy) !== null && _b !== void 0 ? _b : []).map(outputName => {
+                    return `(${resultSet.getField(outputName).getAnalyticalSQL(false)})`;
+                });
                 // TODO probably need to pass in the function and arguments separately
                 // in order to generate parameter SQL correctly in BQ re: partition
-                return this.generateAnalyticFragment(resultSet, context, funcCall, overload, state, args);
+                return this.generateAnalyticFragment(resultSet, context, funcCall, overload, state, args, extraPartitions, aggregateOrderBy);
             }
             return this.generateExpressionFromExpr(resultSet, context, funcCall, state);
         }
@@ -510,7 +539,7 @@ class QueryField extends QueryNode {
             return context.getFieldByName(expr.path).getIdentifier();
         }
     }
-    getAnalyticPartitions(resultStruct) {
+    getAnalyticPartitions(resultStruct, extraPartitionFields) {
         const ret = [];
         let p = resultStruct.parent;
         while (p !== undefined) {
@@ -519,23 +548,23 @@ class QueryField extends QueryNode {
             ret.push(...partitionSQLs);
             p = p.parent;
         }
-        return ret.join(', ');
+        if (extraPartitionFields) {
+            ret.push(...extraPartitionFields);
+        }
+        return ret;
     }
-    generateAnalyticFragment(resultStruct, context, expr, overload, state, args) {
-        let partitionBy = '';
+    generateAnalyticFragment(resultStruct, context, expr, overload, state, args, partitionByFields, funcOrdering) {
         const isComplex = resultStruct.root().isComplexQuery;
-        const fieldsString = this.getAnalyticPartitions(resultStruct);
-        if (isComplex || fieldsString.length > 0) {
-            partitionBy = 'PARTITION BY ';
-            if (isComplex) {
-                partitionBy += 'group_set';
-            }
-            if (fieldsString.length > 0) {
-                partitionBy += `, ${fieldsString}`;
-            }
-        }
-        let orderBy = '';
-        if (overload.needsWindowOrderBy) {
+        const partitionFields = this.getAnalyticPartitions(resultStruct, partitionByFields);
+        const allPartitions = [
+            ...(isComplex ? ['group_set'] : []),
+            ...partitionFields,
+        ];
+        const partitionBy = allPartitions.length > 0
+            ? `PARTITION BY ${allPartitions.join(', ')}`
+            : '';
+        let orderBy = funcOrdering !== null && funcOrdering !== void 0 ? funcOrdering : '';
+        if (!funcOrdering && overload.needsWindowOrderBy) {
             // calculate the ordering.
             const obSQL = [];
             let orderingField;
@@ -1548,6 +1577,11 @@ class QueryQuery extends QueryField {
                 if ((0, malloy_types_1.expressionIsAnalytic)(expr.overload.returnType.expressionType)) {
                     resultStruct.root().queryUsesPartitioning = true;
                 }
+                if (expr.orderBy) {
+                    for (const ob of expr.orderBy) {
+                        this.addDependantExpr(resultStruct, context, ob.e, joinStack);
+                    }
+                }
             }
         }
     }

package/dist/model/malloy_types.d.ts

@@ -124,11 +124,20 @@ export interface FunctionParameterFragment {
     name: string;
 }
 export declare function isFunctionParameterFragment(f: Fragment): f is FunctionParameterFragment;
+export interface AggregateOrderByFragment {
+    type: 'aggregate_order_by';
+}
+export interface AggregateLimitFragment {
+    type: 'aggregate_limit';
+}
 export interface FunctionCallFragment {
     type: 'function_call';
     overload: FunctionOverloadDef;
     expressionType: ExpressionType;
     args: Expr[];
+    orderBy?: FunctionOrderBy[];
+    limit?: number;
+    partitionBy?: string[];
     structPath?: string[];
 }
 export declare function isFunctionCallFragment(f: Fragment): f is FunctionCallFragment;
@@ -240,7 +249,7 @@ export interface NumberLiteralFragment extends DialectFragmentBase {
     literal: string;
 }
 export type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | StringLiteralFragment | RegexpLiteralFragment | NumberLiteralFragment | RegexpMatchFragment;
-export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | SourceReferenceFragment | SqlStringFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
+export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | SourceReferenceFragment | SqlStringFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | AggregateOrderByFragment | AggregateLimitFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
 export type Expr = Fragment[];
 export interface TypedValue {
     value: Expr;
@@ -377,6 +386,10 @@ export interface OrderBy {
     field: string | number;
     dir?: 'asc' | 'desc';
 }
+export interface FunctionOrderBy {
+    e: Expr;
+    dir?: 'asc' | 'desc';
+}
 export interface ByName {
     by: 'name';
     name: string;
@@ -561,6 +574,7 @@ export interface FunctionParamTypeDesc {
     evalSpace: EvalSpace;
 }
 export type EvalSpace = 'constant' | 'input' | 'output' | 'literal';
+export declare function isLiteral(evalSpace: EvalSpace): boolean;
 export declare function mergeEvalSpaces(...evalSpaces: EvalSpace[]): EvalSpace;
 export interface TypeDesc {
     dataType: FieldValueType;
@@ -583,7 +597,11 @@ export interface FunctionOverloadDef {
     isSymmetric?: boolean;
     params: FunctionParameterDef[];
     dialect: {
-        [dialect: string]: Expr;
+        [dialect: string]: {
+            e: Expr;
+            supportsOrderBy?: boolean;
+            supportsLimit?: boolean;
+        };
     };
 }
 export interface FunctionDef extends NamedObject {

package/dist/model/malloy_types.js

@@ -23,7 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isIndexSegment = exports.isRawSegment = 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.isSourceReferenceFragment = exports.isSqlStringFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = 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.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = 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 = exports.isLiteral = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -329,6 +329,10 @@ function isSQLFragment(f) {
     return f.sql !== undefined;
 }
 exports.isSQLFragment = isSQLFragment;
+function isLiteral(evalSpace) {
+    return evalSpace === 'literal';
+}
+exports.isLiteral = isLiteral;
 function mergeEvalSpaces(...evalSpaces) {
     if (evalSpaces.every(e => e === 'constant' || e === 'literal')) {
         return 'constant';

package/dist/run_sql_options.d.ts

@@ -5,3 +5,4 @@ export interface RunSQLOptions {
     modelAnnotation?: Annotation;
     queryAnnotation?: Annotation;
 }
+export type QueryOptionsReader = RunSQLOptions | (() => RunSQLOptions);

package/dist/runtime_types.d.ts

@@ -79,7 +79,10 @@ export interface ConnectionParameter {
     defaultValue?: ConnectionParameterValue;
 }
 export type ConnectionConfigSchema = ConnectionParameter[];
-export type ConnectionConfig = Record<string, ConnectionParameterValue>;
+export interface ConnectionConfig {
+    name: string;
+    [key: string]: ConnectionParameterValue | undefined;
+}
 export interface ConnectionFactory {
     connectionName: string;
     configSchema: ConnectionConfigSchema;

package/package.json

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

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

@@ -1,66 +0,0 @@
-"use strict";
-/*
- * 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.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExprFilter = 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 expression_def_1 = require("../types/expression-def");
-class ExprFilter extends expression_def_1.ExpressionDef {
-    constructor(expr, filter) {
-        super({ expr: expr, filter: filter });
-        this.expr = expr;
-        this.filter = filter;
-        this.elementType = 'filtered expression';
-        this.legalChildTypes = fragtype_utils_1.FT.anyAtomicT;
-    }
-    getExpression(fs) {
-        const testList = this.filter.getFilterList(fs);
-        const resultExpr = this.expr.getExpression(fs);
-        if (!(0, malloy_types_1.expressionIsAggregate)(resultExpr.expressionType)) {
-            this.expr.log('Filtered expression requires an aggregate computation');
-            return resultExpr;
-        }
-        if (testList.find(cond => (0, malloy_types_1.expressionIsCalculation)(cond.expressionType))) {
-            this.filter.log('Cannot filter an expresion with an aggregate or analytical computation');
-            return resultExpr;
-        }
-        if (this.typeCheck(this.expr, { ...resultExpr, expressionType: 'scalar' })) {
-            return {
-                ...resultExpr,
-                value: [
-                    {
-                        type: 'filterExpression',
-                        e: resultExpr.value,
-                        filterList: testList,
-                    },
-                ],
-            };
-        }
-        this.expr.log(`Cannot filter '${resultExpr.dataType}' data`);
-        return (0, ast_utils_1.errorFor)('cannot filter type');
-    }
-}
-exports.ExprFilter = ExprFilter;
-//# sourceMappingURL=expr-filter.js.map