@malloydata/malloy 0.0.3 → 0.0.5

package/dist/lang/ast/ast-expr.d.ts

@@ -141,7 +141,6 @@ export declare class ExprParens extends ExpressionDef {
     readonly expr: ExpressionDef;
     elementType: string;
     constructor(expr: ExpressionDef);
-    apply(fs: FieldSpace, op: string, expr: ExpressionDef): ExprValue;
     requestExpression(fs: FieldSpace): ExprValue | undefined;
     getExpression(fs: FieldSpace): ExprValue;
 }

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

@@ -426,9 +426,6 @@ class ExprParens extends ExpressionDef {
         this.expr = expr;
         this.elementType = "(expression)";
     }
-    apply(fs, op, expr) {
-        return this.expr.apply(fs, op, expr);
-    }
     requestExpression(fs) {
         return this.expr.requestExpression(fs);
     }

package/dist/lang/ast/ast-main.d.ts

@@ -303,9 +303,9 @@ export declare class WildcardFieldReference extends MalloyElement {
 }
 export declare class OrderBy extends MalloyElement {
     readonly field: number | FieldName;
-    readonly dir?: "desc" | "asc" | undefined;
+    readonly dir?: "asc" | "desc" | undefined;
     elementType: string;
-    constructor(field: number | FieldName, dir?: "desc" | "asc" | undefined);
+    constructor(field: number | FieldName, dir?: "asc" | "desc" | undefined);
     get modelField(): string | number;
     getOrderBy(_fs: FieldSpace): model.OrderBy;
 }

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

@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const model_1 = require("../../model");
 const sql_block_1 = require("../../model/sql_block");
 const ast_1 = require("../ast");
 const field_space_1 = require("../field-space");
@@ -961,6 +962,34 @@ describe("expressions", () => {
       `).compileToFailWith("pick type 'number', expected 'string'", "Cannot define 'd', value has unknown type");
         });
     });
+    test("paren and applied div", () => {
+        var _a, _b;
+        const modelSrc = `query: z is a -> { group_by: x is 1+(3/4) }`;
+        const m = new BetaModel(modelSrc);
+        expect(m).toTranslate();
+        const queryDef = (_b = (_a = m.translate()) === null || _a === void 0 ? void 0 : _a.translated) === null || _b === void 0 ? void 0 : _b.modelDef.contents.z;
+        expect(queryDef).toBeDefined();
+        expect(queryDef === null || queryDef === void 0 ? void 0 : queryDef.type).toBe("query");
+        if (queryDef && queryDef.type == "query") {
+            const x = queryDef.pipeline[0].fields[0];
+            if (typeof x != "string" &&
+                !(0, model_1.isFilteredAliasedName)(x) &&
+                (0, model_1.isFieldTypeDef)(x) &&
+                x.type == "number" &&
+                x.e) {
+                const firstFrag = x.e[0];
+                if (typeof firstFrag == "string") {
+                    expect(firstFrag).toContain("(");
+                }
+                else {
+                    fail("expression with parens compiled oddly");
+                }
+            }
+            else {
+                fail("expression with parens compiled oddly");
+            }
+        }
+    });
 });
 describe("sql backdoor", () => {
     function makeSchemaResponse(sql) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,8 @@
     "testLang": "npm run test --testPathPattern=packages/malloy/src/lang",
     "clean": "rm -rf src/lang/lib",
     "build": "npm run build-parser && tsc --build",
-    "malloyc": "ts-node ../../scripts/malloy-to-json"
+    "malloyc": "ts-node ../../scripts/malloy-to-json",
+    "prepublishOnly": "npm run clean && npm run build"
   },
   "dependencies": {
     "antlr4ts": "^0.5.0-alpha.4",