@malloydata/malloy 0.0.38-dev230606235314 → 0.0.38-dev230609163341

package/dist/malloy.js

@@ -339,7 +339,7 @@ class Model {
      */
     getPreparedQueryByName(queryName) {
         const query = this.modelDef.contents[queryName];
-        if (query.type === 'query') {
+        if ((query === null || query === void 0 ? void 0 : query.type) === 'query') {
             return new PreparedQuery(query, this.modelDef, queryName);
         }
         throw new Error('Given query name does not refer to a named query.');

package/dist/model/malloy_query.js

@@ -208,11 +208,15 @@ class QueryField extends QueryNode {
         // find the structDef and return the path to the field...
         const field = context.getFieldByName(expr.path);
         if ((0, malloy_types_1.hasExpression)(field.fieldDef)) {
-            let ret = this.generateExpressionFromExpr(resultSet, field.parent, field.fieldDef.e, state);
-            if (!ret.match(/^\(.*\)$/)) {
-                ret = `(${ret})`;
-            }
-            return ret;
+            const ret = this.generateExpressionFromExpr(resultSet, field.parent, field.fieldDef.e, state);
+            // in order to avoid too many parens, there was some code here ..
+            // if (!ret.match(/^\(.*\)$/)) {
+            //   ret = `(${ret})`;
+            // }
+            // but this  failed when the expresion was (bool1)or(bool2)
+            // there could maybe be a smarter parse of the expression to avoid
+            // an extra paren, but correctness first, beauty AND correctness later
+            return `(${ret})`;
         }
         else {
             // return field.parent.getIdentifier() + "." + field.fieldDef.name;

package/package.json

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