@malloydata/malloy 0.0.119-dev240123183113 → 0.0.119-dev240124170348

package/dist/model/malloy_types.d.ts

@@ -71,10 +71,6 @@ export interface AliasedName {
 export interface TypedObject {
     type: string;
 }
-export interface FilteredAliasedName extends AliasedName {
-    filterList?: FilterExpression[];
-}
-export declare function isFilteredAliasedName(f: FieldTypeRef): f is FilteredAliasedName;
 /** all named objects have a type an a name (optionally aliased) */
 export interface NamedObject extends AliasedName, HasLocation {
     type: string;
@@ -113,7 +109,7 @@ export interface AggregateFragment {
     type: 'aggregate';
     function: AggregateFunctionType;
     e: Expr;
-    structPath?: string;
+    structPath?: string[];
 }
 export declare function isAggregateFragment(f: Fragment): f is AggregateFragment;
 export declare function isAsymmetricFragment(f: Fragment): f is AggregateFragment;
@@ -133,7 +129,7 @@ export interface FunctionCallFragment {
     overload: FunctionOverloadDef;
     expressionType: ExpressionType;
     args: Expr[];
-    structPath?: string;
+    structPath?: string[];
 }
 export declare function isFunctionCallFragment(f: Fragment): f is FunctionCallFragment;
 export interface SQLExpressionFragment {
@@ -148,14 +144,9 @@ export interface SpreadFragment {
 export declare function isSpreadFragment(f: Fragment): f is SpreadFragment;
 export interface FieldFragment {
     type: 'field';
-    path: string;
+    path: string[];
 }
 export declare function isFieldFragment(f: Fragment): f is FieldFragment;
-export interface FieldReferenceFragment {
-    type: 'field-reference';
-    path: string;
-}
-export declare function isFieldReferenceFragment(f: Fragment): f is FieldReferenceFragment;
 export interface SqlStringFragment {
     type: 'sql-string';
     e: Expr;
@@ -163,12 +154,12 @@ export interface SqlStringFragment {
 export declare function isSqlStringFragment(f: Fragment): f is SqlStringFragment;
 export interface SourceReferenceFragment {
     type: 'source-reference';
-    path?: string;
+    path?: string[];
 }
 export declare function isSourceReferenceFragment(f: Fragment): f is SourceReferenceFragment;
 export interface ParameterFragment {
     type: 'parameter';
-    path: string;
+    path: string[];
 }
 export declare function isParameterFragment(f: Fragment): f is ParameterFragment;
 export interface ApplyValueFragment {
@@ -249,7 +240,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 | FieldReferenceFragment | 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 | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
 export type Expr = Fragment[];
 export interface TypedValue {
     value: Expr;
@@ -458,9 +449,11 @@ export interface RawSegment extends Filtered {
     fields: never[];
 }
 export declare function isRawSegment(pe: PipeSegment): pe is RawSegment;
+export type IndexFieldDef = RefToField;
+export type SegmentFieldDef = IndexFieldDef | QueryFieldDef;
 export interface IndexSegment extends Filtered {
     type: 'index';
-    fields: string[];
+    indexFields: IndexFieldDef[];
     limit?: number;
     weightMeasure?: string;
     sample?: Sampling;
@@ -468,7 +461,7 @@ export interface IndexSegment extends Filtered {
 export declare function isIndexSegment(pe: PipeSegment): pe is IndexSegment;
 export interface QuerySegment extends Filtered {
     type: 'reduce' | 'project' | 'partial';
-    fields: QueryFieldDef[];
+    queryFields: QueryFieldDef[];
     extendSource?: FieldDef[];
     limit?: number;
     by?: By;
@@ -496,7 +489,7 @@ export type StructRelationship = {
     type: 'inline';
 } | {
     type: 'nested';
-    field: FieldRef;
+    fieldName: string;
     isArray: boolean;
 };
 export interface SQLFragment {
@@ -611,14 +604,16 @@ export type FieldAtomicTypeDef = FieldStringTypeDef | FieldDateTypeDef | FieldTi
 export declare function isFieldTypeDef(f: FieldDef): f is FieldTypeDef;
 export declare function isFieldTimeBased(f: FieldDef): f is FieldTimestampDef | FieldDateDef;
 export declare function isFieldStructDef(f: FieldDef): f is StructDef;
-/** field reference in a query */
-export type FieldTypeRef = string | FieldTypeDef | FilteredAliasedName;
-/** field reference with with possibly and order by. */
-export type QueryFieldDef = FieldTypeRef | TurtleDef;
+export type QueryFieldDef = FieldTypeDef | TurtleDef | RefToField;
 /** basics statement */
 export type FieldDef = FieldTypeDef | StructDef | TurtleDef;
 /** reference to a field */
-export type FieldRef = string | FieldDef;
+export interface RefToField {
+    type: 'fieldref';
+    path: string[];
+    annotation?: Annotation;
+}
+export type FieldRefOrDef = FieldDef | RefToField;
 /** which field is the primary key in this struct */
 export type PrimaryKeyRef = string;
 /** filters */

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.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.isFieldReferenceFragment = 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.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = void 0;
+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;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -36,15 +36,6 @@ function paramHasValue(p) {
     return isValueParameter(p) || p.condition !== null;
 }
 exports.paramHasValue = paramHasValue;
-function isFilteredAliasedName(f) {
-    for (const prop of Object.keys(f)) {
-        if (!['name', 'as', 'filterList'].includes(prop)) {
-            return false;
-        }
-    }
-    return true;
-}
-exports.isFilteredAliasedName = isFilteredAliasedName;
 function isOutputFieldFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'outputField';
 }
@@ -90,10 +81,6 @@ function isFieldFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'field';
 }
 exports.isFieldFragment = isFieldFragment;
-function isFieldReferenceFragment(f) {
-    return (f === null || f === void 0 ? void 0 : f.type) === 'field-reference';
-}
-exports.isFieldReferenceFragment = isFieldReferenceFragment;
 function isSqlStringFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'sql-string';
 }

package/dist/tags.js

@@ -278,6 +278,20 @@ class TagErrorListener {
         };
         this.log.push(logMsg);
     }
+    semanticError(cx, msg) {
+        const errAt = {
+            line: this.atLine,
+            // mtoy TODO get this right
+            character: 0,
+        };
+        const range = { start: errAt, end: errAt };
+        const logMsg = {
+            message: msg,
+            at: { url: this.sourceURL, range },
+            severity: 'error',
+        };
+        this.log.push(logMsg);
+    }
 }
 function getBuildOn(ctx) {
     const buildOn = ctx['buildOn'];
@@ -333,19 +347,20 @@ function parseTagline(source, extending, outerScope, sourceURL, onLine, atChar)
     const inputStream = antlr4ts_1.CharStreams.fromString(source);
     const lexer = new MalloyTagLexer_1.MalloyTagLexer(inputStream);
     const tokenStream = new antlr4ts_1.CommonTokenStream(lexer);
+    const pLog = new TagErrorListener(sourceURL, onLine, atChar);
     const taglineParser = new MalloyTagParser_1.MalloyTagParser(tokenStream);
     taglineParser.removeErrorListeners();
-    const pLog = new TagErrorListener(sourceURL, onLine, atChar);
     taglineParser.addErrorListener(pLog);
     const tagTree = taglineParser.tagLine();
-    const treeWalker = new TaglineParser(outerScope);
+    const treeWalker = new TaglineParser(outerScope, pLog);
     const tag = treeWalker.tagLineToTag(tagTree, extending);
     return { tag, log: pLog.log };
 }
 class TaglineParser extends tree_1.AbstractParseTreeVisitor {
-    constructor(outerScopes = []) {
+    constructor(outerScopes = [], msgLog) {
         super();
         this.scopes = [];
+        this.msgLog = msgLog;
         this.scopes.unshift(...outerScopes);
     }
     defaultResult() {
@@ -420,7 +435,7 @@ class TaglineParser extends tree_1.AbstractParseTreeVisitor {
                 break;
             }
         }
-        // MTOY TODO SYNTAX ERROR NOT FOUND
+        this.msgLog.semanticError(ctx, `Reference to undefined property ${path.join('.')}`);
         return this.defaultResult();
     }
     visitTagEq(ctx) {

package/package.json

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