@malloydata/malloy 0.0.157 → 0.0.158-dev240805161224

package/dist/model/malloy_query.js

@@ -432,30 +432,12 @@ class QueryField extends QueryNode {
     generateSpread(_resultSet, _context, _frag, _state) {
         throw new Error('Unexpanded spread encountered during SQL generation');
     }
-    generateParameterFragment(resultSet, context, expr, _state) {
-        /*
-          mtoy todo parameters and paths figure this out
-    
-        // find the structDef and return the path to the field...
-        const param = context.parameters()[expr.path];
-        if (isValueParameter(param)) {
-          if (param.value) {
-            return this.generateExpressionFromExpr(
-              resultSet,
-              context,
-              param.value,
-              state
-            );
-          }
-        } else if (param.condition) {
-          return this.generateExpressionFromExpr(
-            resultSet,
-            context,
-            param.condition,
-            state
-          );
-        }
-        */
+    generateParameterFragment(resultSet, context, expr, state) {
+        const name = expr.path[0];
+        const argument = context.arguments()[name];
+        if (argument.value) {
+            return this.generateExpressionFromExpr(resultSet, context, argument.value, state);
+        }
         throw new Error(`Can't generate SQL, no value for ${expr.path}`);
     }
     generateFilterFragment(resultSet, context, expr, state) {
@@ -1443,7 +1425,7 @@ class QueryTurtle extends QueryField {
  */
 class Segment {
     static nextStructDef(structDef, segment) {
-        const qs = new QueryStruct(structDef, {
+        const qs = new QueryStruct(structDef, undefined, {
             model: new QueryModel(undefined),
         });
         const turtleDef = {
@@ -1486,7 +1468,7 @@ class QueryQuery extends QueryField {
             parent = new QueryStruct({
                 ...sourceDef,
                 fields: [...sourceDef.fields, ...firstStage.extendSource],
-            }, parent.parent ? { struct: parent } : { model: parent.model });
+            }, parentStruct.sourceArguments, parent.parent ? { struct: parent } : { model: parent.model });
             turtleWithFilters = {
                 ...turtleWithFilters,
                 pipeline: [
@@ -2596,7 +2578,7 @@ class QueryQuery extends QueryField {
             };
             structDef.name = this.parent.dialect.sqlUnnestPipelineHead(repeatedResultType === 'inline_all_numbers', sourceSQLExpression);
             structDef.structSource = { type: 'sql', method: 'nested' };
-            const qs = new QueryStruct(structDef, {
+            const qs = new QueryStruct(structDef, undefined, {
                 model: this.parent.getModel(),
             });
             const q = QueryQuery.makeQuery(newTurtle, qs, stageWriter, this.isJoinedSubquery);
@@ -2654,7 +2636,7 @@ class QueryQuery extends QueryField {
             };
             pipeline.shift();
             for (const transform of pipeline) {
-                const s = new QueryStruct(structDef, {
+                const s = new QueryStruct(structDef, undefined, {
                     model: this.parent.getModel(),
                 });
                 const q = QueryQuery.makeQuery({ type: 'turtle', name: 'ignoreme', pipeline: [transform] }, s, stageWriter, this.isJoinedSubquery);
@@ -2921,9 +2903,11 @@ class QueryQueryIndex extends QueryQuery {
 }
 /** Structure object as it is used to build a query */
 class QueryStruct extends QueryNode {
-    constructor(fieldDef, parent) {
+    constructor(fieldDef, sourceArguments, parent) {
         super(fieldDef);
+        this.sourceArguments = sourceArguments;
         this.nameMap = new Map();
+        this._arguments = undefined;
         this.setParent(parent);
         if ('model' in parent) {
             this.model = parent.model;
@@ -2945,15 +2929,57 @@ class QueryStruct extends QueryNode {
         this.dialect = (0, dialect_1.getDialect)(this.fieldDef.dialect);
         this.addFieldsFromFieldList(this.fieldDef.fields);
     }
-    parameters() {
-        return this.fieldDef.parameters || {};
+    resolveParentParameterReferences(param) {
+        return {
+            ...param,
+            value: param.value === null
+                ? null
+                : (0, utils_1.exprMap)(param.value, frag => {
+                    if (typeof frag === 'string')
+                        return [frag];
+                    if (frag.type === 'parameter') {
+                        if (this.parent === undefined) {
+                            throw new Error('No parent from which to retrieve parameter value');
+                        }
+                        const resolved1 = this.parent.arguments()[frag.path[0]];
+                        const resolved2 = this.parent.resolveParentParameterReferences(resolved1);
+                        if (resolved2.value === null) {
+                            throw new Error('Invalid parameter value');
+                        }
+                        else {
+                            return resolved2.value;
+                        }
+                    }
+                    return [frag];
+                }),
+        };
+    }
+    arguments() {
+        var _a, _b, _c;
+        if (this._arguments !== undefined) {
+            return this._arguments;
+        }
+        this._arguments = {};
+        // First, copy over all parameters, to get default values
+        const params = (_a = this.fieldDef.parameters) !== null && _a !== void 0 ? _a : {};
+        for (const parameterName in params) {
+            this._arguments[parameterName] = params[parameterName];
+        }
+        // Then, copy over arguments to override default values
+        const args = (_c = (_b = this.sourceArguments) !== null && _b !== void 0 ? _b : this.fieldDef.arguments) !== null && _c !== void 0 ? _c : {};
+        for (const parameterName in args) {
+            const orig = args[parameterName];
+            this._arguments[parameterName] =
+                this.resolveParentParameterReferences(orig);
+        }
+        return this._arguments;
     }
     addFieldsFromFieldList(fields) {
         for (const field of fields) {
             const as = (0, malloy_types_1.getIdentifier)(field);
             switch (field.type) {
                 case 'struct': {
-                    this.addFieldToNameMap(as, new QueryStruct(field, {
+                    this.addFieldToNameMap(as, new QueryStruct(field, undefined, {
                         struct: this,
                     }));
                     break;
@@ -3324,7 +3350,7 @@ class QueryModel {
         for (const s of Object.values(this.modelDef.contents)) {
             let qs;
             if (s.type === 'struct') {
-                qs = new QueryStruct(s, { model: this });
+                qs = new QueryStruct(s, undefined, { model: this });
                 this.structs.set((0, malloy_types_1.getIdentifier)(s), qs);
                 qs.resolveQueryFields();
             }
@@ -3345,10 +3371,15 @@ class QueryModel {
             throw new Error(`Struct ${name} not found in model.`);
         }
     }
-    getStructFromRef(structRef) {
+    getStructFromRef(structRef, sourceArguments) {
+        var _a;
         let structDef;
         if (typeof structRef === 'string') {
-            return this.getStructByName(structRef);
+            const ret = this.getStructByName(structRef);
+            if (sourceArguments !== undefined) {
+                return new QueryStruct(ret.fieldDef, sourceArguments, (_a = ret.parent) !== null && _a !== void 0 ? _a : { model: this });
+            }
+            return ret;
         }
         else if (structRef.type === 'struct') {
             structDef = structRef;
@@ -3356,7 +3387,7 @@ class QueryModel {
         else {
             throw new Error('Broken for now');
         }
-        return new QueryStruct(structDef, { model: this });
+        return new QueryStruct(structDef, sourceArguments, { model: this });
     }
     loadQuery(query, stageWriter, emitFinalStage = false, isJoinedSubquery = false) {
         const malloy = '';
@@ -3369,7 +3400,7 @@ class QueryModel {
             pipeline: query.pipeline,
             filterList: query.filterList,
         };
-        const q = QueryQuery.makeQuery(turtleDef, this.getStructFromRef(query.structRef), stageWriter, isJoinedSubquery);
+        const q = QueryQuery.makeQuery(turtleDef, this.getStructFromRef(query.structRef, query.sourceArguments), stageWriter, isJoinedSubquery);
         const ret = q.generateSQLFromPipeline(stageWriter);
         if (emitFinalStage && q.parent.dialect.hasFinalStage) {
             // const fieldNames: string[] = [];

package/dist/model/malloy_types.d.ts

@@ -1,21 +1,11 @@
 /// <reference types="node" />
-interface ParamBase {
-    name: string;
-    type: AtomicFieldType;
-}
 type ConstantExpr = Expr;
-type Condition = Expr;
-interface ParamCondition extends ParamBase {
-    condition: Condition | null;
-    type: CastType;
-}
-interface ParamValue extends ParamBase {
+export interface Parameter {
     value: ConstantExpr | null;
-    constant: boolean;
+    name: string;
+    type: AtomicFieldType;
 }
-export type Parameter = ParamCondition | ParamValue;
-export declare function isValueParameter(p: Parameter): p is ParamValue;
-export declare function isConditionParameter(p: Parameter): p is ParamCondition;
+export type Argument = Parameter;
 export declare function paramHasValue(p: Parameter): boolean;
 export interface DocumentRange {
     start: DocumentPosition;
@@ -414,6 +404,10 @@ export declare function isByExpression(by: By | undefined): by is ByExpression;
 /** reference to a data source */
 export type StructRef = string | StructDef;
 export declare function refIsStructDef(ref: StructRef): ref is StructDef;
+export type InvokedStructRef = {
+    structRef: StructRef;
+    sourceArguments?: Record<string, Argument>;
+};
 /** join pattern structs is a struct. */
 export interface JoinedStruct {
     structRef: StructRef;
@@ -436,11 +430,14 @@ export interface Query extends Pipeline, Filtered, HasLocation {
     type?: 'query';
     name?: string;
     structRef: StructRef;
+    sourceArguments?: Record<string, Argument>;
     annotation?: Annotation;
     modelAnnotation?: Annotation;
 }
 export type NamedQuery = Query & NamedObject;
 export type PipeSegment = QuerySegment | IndexSegment | RawSegment;
+export declare function segmentHasErrors(segment: PipeSegment): boolean;
+export declare function structHasErrors(struct: StructDef): boolean;
 export interface ReduceSegment extends QuerySegment {
     type: 'reduce';
 }
@@ -564,6 +561,7 @@ export interface StructDef extends NamedObject, ResultStructMetadata, Filtered {
     structRelationship: StructRelationship;
     fields: FieldDef[];
     primaryKey?: PrimaryKeyRef;
+    arguments?: Record<string, Argument>;
     parameters?: Record<string, Parameter>;
     queryTimezone?: string;
     dialect: string;

package/dist/model/malloy_types.js

@@ -22,18 +22,10 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 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.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.structHasErrors = exports.segmentHasErrors = 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 = 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;
-}
-exports.isValueParameter = isValueParameter;
-function isConditionParameter(p) {
-    return p.condition !== undefined;
-}
-exports.isConditionParameter = isConditionParameter;
 function paramHasValue(p) {
-    return isValueParameter(p) || p.condition !== null;
+    return p.value !== null;
 }
 exports.paramHasValue = paramHasValue;
 function isOutputFieldFragment(f) {
@@ -281,6 +273,26 @@ function refIsStructDef(ref) {
     return typeof ref !== 'string' && ref.type === 'struct';
 }
 exports.refIsStructDef = refIsStructDef;
+function segmentHasErrors(segment) {
+    if (segment.type === 'reduce' ||
+        segment.type === 'project' ||
+        segment.type === 'partial') {
+        if (segment.extendSource) {
+            if (segment.extendSource.some(f => f.type === 'error')) {
+                return true;
+            }
+        }
+        if (segment.queryFields.some(f => f.type === 'error')) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.segmentHasErrors = segmentHasErrors;
+function structHasErrors(struct) {
+    return struct.fields.some(f => f.type === 'error');
+}
+exports.structHasErrors = structHasErrors;
 function isReduceSegment(pe) {
     return pe.type === 'reduce';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.157",
+  "version": "0.0.158-dev240805161224",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",

package/dist/lang/ast/expressions/constant-sub-expression.d.ts

@@ -1,16 +0,0 @@
-import { AtomicFieldType } from '../../../model/malloy_types';
-import { ExprValue } from '../types/expr-value';
-import { ExpressionDef } from '../types/expression-def';
-import { FieldSpace } from '../types/field-space';
-export declare class ConstantSubExpression extends ExpressionDef {
-    readonly expr: ExpressionDef;
-    elementType: string;
-    private cfs?;
-    constructor(expr: ExpressionDef);
-    getExpression(_fs: FieldSpace): ExprValue;
-    private get constantFs();
-    constantValue(): ExprValue;
-    constantCondition(type: AtomicFieldType): ExprValue;
-    apply(fs: FieldSpace, op: string, expr: ExpressionDef): ExprValue;
-    requestExpression(fs: FieldSpace): ExprValue | undefined;
-}

package/dist/lang/ast/parameters/constant-parameter.d.ts

@@ -1,8 +0,0 @@
-import { Parameter } from '../../../model/malloy_types';
-import { ConstantSubExpression } from '../expressions/constant-sub-expression';
-import { HasParameter } from './has-parameter';
-export declare class ConstantParameter extends HasParameter {
-    readonly value: ConstantSubExpression;
-    constructor(name: string, value: ConstantSubExpression);
-    parameter(): Parameter;
-}

package/dist/lang/ast/parameters/constant-parameter.js

@@ -1,54 +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.ConstantParameter = void 0;
-const malloy_types_1 = require("../../../model/malloy_types");
-const has_parameter_1 = require("./has-parameter");
-class ConstantParameter extends has_parameter_1.HasParameter {
-    constructor(name, value) {
-        super({ name, isCondition: false });
-        this.value = value;
-        this.has({ value: value });
-    }
-    parameter() {
-        const cVal = this.value.constantValue();
-        if (!(0, malloy_types_1.isAtomicFieldType)(cVal.dataType)) {
-            this.log(`Unexpected expression type '${cVal.dataType}'`);
-            return {
-                value: ['XXX-type-mismatch-error-XXX'],
-                type: 'error',
-                name: this.name,
-                constant: true,
-            };
-        }
-        return {
-            value: cVal.value,
-            type: cVal.dataType,
-            name: this.name,
-            constant: true,
-        };
-    }
-}
-exports.ConstantParameter = ConstantParameter;
-//# sourceMappingURL=constant-parameter.js.map