@malloydata/malloy 0.0.121-dev240202013951 → 0.0.121-dev240202151424

package/dist/lang/malloy-to-ast.js

@@ -120,8 +120,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     inExperiment(experimentID, cx) {
         const experimental = this.compilerFlags.tag('experimental');
-        if (experimental) {
-            return experimental.bare() || experimental.has(experimentID);
+        if (experimental &&
+            (experimental.bare() || experimental.has(experimentID))) {
+            return true;
         }
         this.contextError(cx, `Experimental flag '${experimentID}' required to enable this feature`);
         return false;

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

@@ -173,6 +173,17 @@ describe('expressions', () => {
           }
         `).translationToFailWith("Experimental flag 'function_order_by' required to enable this feature", "Experimental flag 'partition_by' required to enable this feature", "Experimental flag 'aggregate_limit' required to enable this feature");
         });
+        test('props not allowed with different experiment enabled', () => {
+            expect((0, test_translator_1.markSource) `
+        ##! experimental.something_else
+          run: a -> {
+            group_by: ai
+            group_by: x1 is string_agg(astr) { order_by: ai }
+            group_by: x2 is lag(ai) { partition_by: ai }
+            group_by: x3 is string_agg(astr) { limit: 10 }
+          }
+        `).translationToFailWith("Experimental flag 'function_order_by' required to enable this feature", "Experimental flag 'partition_by' required to enable this feature", "Experimental flag 'aggregate_limit' required to enable this feature");
+        });
         test('props not allowed on most expressions', () => {
             expect((0, test_translator_1.markSource) `
           ##! experimental { function_order_by partition_by aggregate_limit }

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

@@ -71,6 +71,9 @@ describe('model statements', () => {
     test('experimental explicit enable', () => {
         expect('##! experimental { compilerTestExperimentParse compilerTestExperimentTranslate }\n;;[ "x" ]').toTranslate();
     });
+    test('experiments do not bleed into one another', () => {
+        expect('##! experimental { this_experiment_does_not_exist }\n;;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentParse' required to enable this feature");
+    });
     test('experiment failures in parse are flagged', () => {
         expect(';;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentParse' required to enable this feature");
     });

package/dist/model/malloy_query.js

@@ -1267,7 +1267,7 @@ class FieldInstanceResultRoot extends FieldInstanceResult {
             //   group_by: user_id
             //   aggregate: order_count is orders.count()
             if (join.leafiest) {
-                if (join.parent !== null &&
+                if (join.parent !== undefined &&
                     join.uniqueKeyPossibleUses.has('count') &&
                     !join.queryStruct.primaryKey()) {
                     join.makeUniqueKey = true;

package/package.json

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