@malloydata/malloy 0.0.153 → 0.0.154-dev240722014518

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

@@ -265,7 +265,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                 if (unsupportedInterpolations.length > 0) {
                     const unsupportedInterpolationMsg = unsupportedInterpolations.length === 1
                         ? `'.' paths are not yet supported in sql interpolations, found ${unsupportedInterpolations.at(0)}`
-                        : `'.' paths are not yet supported in sql interpolations, found [${unsupportedInterpolations.join(', ')}]`;
+                        : `'.' paths are not yet supported in sql interpolations, found (${unsupportedInterpolations.join(', ')})`;
                     this.log(unsupportedInterpolationMsg);
                     return (0, ast_utils_1.errorFor)(`${unsupportedInterpolationMsg}. See LookML \${...} documentation at https://cloud.google.com/looker/docs/reference/param-field-sql#sql_for_dimensions`);
                 }

package/dist/lang/ast/expressions/pick-when.js

@@ -76,7 +76,7 @@ class Pick extends expression_def_1.ExpressionDef {
             anyEvalSpace = (0, malloy_types_1.mergeEvalSpaces)(anyEvalSpace, whenExpr.evalSpace, thenExpr.evalSpace);
             if (returnType && !fragtype_utils_1.FT.typeEq(returnType, thenExpr, true)) {
                 const whenType = fragtype_utils_1.FT.inspect(thenExpr);
-                this.log(`pick type '${whenType}', expected '${returnType.dataType}'`);
+                this.log(`pick type '${whenType}', expected '${returnType.dataType}'[pick-values-must-match]`);
                 return (0, ast_utils_1.errorFor)('pick when type');
             }
             returnType = typeCoalesce(returnType, thenExpr);
@@ -87,7 +87,7 @@ class Pick extends expression_def_1.ExpressionDef {
         returnType = typeCoalesce(returnType, elseVal);
         if (!fragtype_utils_1.FT.typeEq(returnType, elseVal, true)) {
             const errSrc = this.elsePick ? 'else' : 'pick default';
-            this.log(`${errSrc} type '${fragtype_utils_1.FT.inspect(elseVal)}', expected '${returnType.dataType}'`);
+            this.log(`${errSrc} type '${fragtype_utils_1.FT.inspect(elseVal)}', expected '${returnType.dataType}'[pick-values-must-match]`);
             return (0, ast_utils_1.errorFor)('pick else type');
         }
         return {
@@ -129,7 +129,7 @@ class Pick extends expression_def_1.ExpressionDef {
             }
             if (returnType && !fragtype_utils_1.FT.typeEq(returnType, aChoice.pick, true)) {
                 const whenType = fragtype_utils_1.FT.inspect(aChoice.pick);
-                this.log(`pick type '${whenType}', expected '${returnType.dataType}'`);
+                this.log(`pick type '${whenType}', expected '${returnType.dataType}'[pick-values-must-match]`);
                 return (0, ast_utils_1.errorFor)('pick value type');
             }
             returnType = typeCoalesce(returnType, aChoice.pick);
@@ -142,7 +142,7 @@ class Pick extends expression_def_1.ExpressionDef {
         anyEvalSpace = (0, malloy_types_1.mergeEvalSpaces)(anyEvalSpace, defVal.evalSpace);
         returnType = typeCoalesce(returnType, defVal);
         if (!fragtype_utils_1.FT.typeEq(returnType, defVal, true)) {
-            this.elsePick.log(`else type '${fragtype_utils_1.FT.inspect(defVal)}', expected '${returnType.dataType}'`);
+            this.elsePick.log(`else type '${fragtype_utils_1.FT.inspect(defVal)}', expected '${returnType.dataType}'[pick-values-must-match]`);
             return (0, ast_utils_1.errorFor)('pick value type mismatch');
         }
         caseValue.push(' ELSE ', ...defVal.value, ' END');

package/dist/lang/parse-log.d.ts

@@ -7,6 +7,7 @@ export interface LogMessage {
     message: string;
     at?: DocumentLocation;
     severity: LogSeverity;
+    errorTag?: string;
 }
 export interface MessageLogger {
     log(logMsg: LogMessage): void;
@@ -19,6 +20,12 @@ export interface MessageLogger {
 export declare class MessageLog implements MessageLogger {
     private rawLog;
     getLog(): LogMessage[];
+    /**
+     * Add a message to the log.
+     *
+     * If the messsage ends with '[tag]', the tag is removed and stored in the `errorTag` field.
+     * @param logMsg Message possibly containing an error tag
+     */
     log(logMsg: LogMessage): void;
     reset(): void;
     noErrors(): boolean;

package/dist/lang/parse-log.js

@@ -30,7 +30,23 @@ class MessageLog {
     getLog() {
         return this.rawLog;
     }
+    /**
+     * Add a message to the log.
+     *
+     * If the messsage ends with '[tag]', the tag is removed and stored in the `errorTag` field.
+     * @param logMsg Message possibly containing an error tag
+     */
     log(logMsg) {
+        const msg = logMsg.message;
+        // github security is worried about msg.match(/^(.+)\[(.+)\]$/ because if someone
+        // could craft code with a long varibale name which would blow up that regular expression
+        if (msg.endsWith(']')) {
+            const tagStart = msg.lastIndexOf('[');
+            if (tagStart > 0) {
+                logMsg.message = msg.slice(0, tagStart);
+                logMsg.errorTag = msg.slice(tagStart + 1, -1);
+            }
+        }
         this.rawLog.push(logMsg);
     }
     reset() {

package/dist/lang/test/parse.spec.js

@@ -879,4 +879,10 @@ describe('sql_functions', () => {
     });
 });
 test('non breaking space in source', () => expect('source:\u00a0z\u00a0is\u00a0a').toParse());
+test('error tagging', () => {
+    const m = (0, test_translator_1.model) `run: a -> { select: err is pick 1 when true else 'one' }`;
+    expect(m).translationToFailWith("else type 'string', expected 'number'");
+    const firstErr = m.translator.root.logger.getLog()[0];
+    expect(firstErr === null || firstErr === void 0 ? void 0 : firstErr.errorTag).toBe('pick-values-must-match');
+});
 //# sourceMappingURL=parse.spec.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.153",
+  "version": "0.0.154-dev240722014518",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",