@malloydata/malloy 0.0.96-dev231025212541 → 0.0.96-dev231025215721

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -204,6 +204,7 @@ import { JustExprContext } from "./MalloyParser";
 import { SqlExploreNameRefContext } from "./MalloyParser";
 import { NameSQLBlockContext } from "./MalloyParser";
 import { ConnectionNameContext } from "./MalloyParser";
+import { ExperimentalStatementForTestingContext } from "./MalloyParser";
 /**
  * This interface defines a complete listener for a parse tree produced by
  * `MalloyParser`.
@@ -2411,4 +2412,14 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitConnectionName?: (ctx: ConnectionNameContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.experimentalStatementForTesting`.
+     * @param ctx the parse tree
+     */
+    enterExperimentalStatementForTesting?: (ctx: ExperimentalStatementForTestingContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.experimentalStatementForTesting`.
+     * @param ctx the parse tree
+     */
+    exitExperimentalStatementForTesting?: (ctx: ExperimentalStatementForTestingContext) => void;
 }

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -204,6 +204,7 @@ import { JustExprContext } from "./MalloyParser";
 import { SqlExploreNameRefContext } from "./MalloyParser";
 import { NameSQLBlockContext } from "./MalloyParser";
 import { ConnectionNameContext } from "./MalloyParser";
+import { ExperimentalStatementForTestingContext } from "./MalloyParser";
 /**
  * This interface defines a complete generic visitor for a parse tree produced
  * by `MalloyParser`.
@@ -1518,4 +1519,10 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitConnectionName?: (ctx: ConnectionNameContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.experimentalStatementForTesting`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExperimentalStatementForTesting?: (ctx: ExperimentalStatementForTestingContext) => Result;
 }

package/dist/lang/malloy-to-ast.d.ts

@@ -30,7 +30,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     readonly parseInfo: MalloyParseInfo;
     readonly msgLog: MessageLogger;
     compilerFlags: Tag;
-    constructor(parseInfo: MalloyParseInfo, msgLog: MessageLogger);
+    constructor(parseInfo: MalloyParseInfo, msgLog: MessageLogger, compilerFlags: Tag);
     /**
      * Mostly used to flag a case where the grammar and the type system are
      * no longer in sync. A visitor was written based on a grammar which
@@ -49,6 +49,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
      * Log an error message relative to a parse node
      */
     protected contextError(cx: ParserRuleContext, msg: string, sev?: LogSeverity): void;
+    protected inExperiment(experimentID: string, cx: ParserRuleContext): boolean;
     protected m4Severity(): LogSeverity | false;
     protected m4advisory(cx: ParserRuleContext, msg: string): void;
     protected only<T extends ast.MalloyElement>(els: ast.MalloyElement[], isGood: (el: ast.MalloyElement) => T | false, desc: string): T[];
@@ -212,5 +213,6 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitSQTable(pcx: parse.SQTableContext): ast.SQSourceWrapper | ErrorNode;
     visitSQLegacySQLBlock(pcx: parse.SQLegacySQLBlockContext): ast.SQSourceWrapper;
     visitSQSQL(pcx: parse.SQSQLContext): ast.SQSourceWrapper;
+    visitExperimentalStatementForTesting(pcx: parse.ExperimentalStatementForTestingContext): ast.ExperimentalExperiment;
 }
 export {};

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

@@ -73,11 +73,11 @@ const DEFAULT_COMPILER_FLAGS = ['##! m4warnings=error'];
  * AST from an ANTLR parse tree.
  */
 class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
-    constructor(parseInfo, msgLog) {
+    constructor(parseInfo, msgLog, compilerFlags) {
         super();
         this.parseInfo = parseInfo;
         this.msgLog = msgLog;
-        this.compilerFlags = new tags_1.Tag();
+        this.compilerFlags = compilerFlags;
         for (const flag of DEFAULT_COMPILER_FLAGS) {
             const withNewTag = tags_1.Tag.fromTagline(flag, this.compilerFlags);
             this.compilerFlags = withNewTag.tag;
@@ -118,6 +118,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             severity: sev,
         });
     }
+    inExperiment(experimentID, cx) {
+        const experimental = this.compilerFlags.tag('experimental');
+        if (experimental) {
+            return experimental.bare() || experimental.has(experimentID);
+        }
+        this.contextError(cx, `Experimental flag '${experimentID}' required to enable this feature`);
+        return false;
+    }
     m4Severity() {
         const m4severityTag = this.compilerFlags.tag('m4warnings');
         if (m4severityTag) {
@@ -1339,6 +1347,10 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const sqExpr = new ast.SQSourceWrapper(this.visitSqlSource(pcx.sqlSource()));
         return this.astAt(sqExpr, pcx);
     }
+    visitExperimentalStatementForTesting(pcx) {
+        this.inExperiment('compilerTestExperimentParse', pcx);
+        return this.astAt(new ast.ExperimentalExperiment('compilerTestExperimentTranslate'), pcx);
+    }
 }
 exports.MalloyToAST = MalloyToAST;
 //# sourceMappingURL=malloy-to-ast.js.map

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

@@ -86,6 +86,7 @@ declare class HelpContextStep implements TranslationStep {
 declare class TranslateStep implements TranslationStep {
     readonly astStep: ASTStep;
     response?: TranslateResponse;
+    importedFlags: boolean;
     constructor(astStep: ASTStep);
     step(that: MalloyTranslation, extendingModel?: ModelDef): TranslateResponse;
 }
@@ -100,6 +101,7 @@ export declare abstract class MalloyTranslation {
     sqlBlocks: SQLBlockStructDef[];
     modelDef: ModelDef;
     imports: ImportLocation[];
+    compilerFlags: Tag;
     readonly parseStep: ParseStep;
     readonly importsAndTablesStep: ImportsAndTablesStep;
     readonly astStep: ASTStep;
@@ -166,7 +168,6 @@ export declare class MalloyTranslator extends MalloyTranslation {
     importZone: Zone<string>;
     sqlQueryZone: Zone<SQLBlockStructDef>;
     logger: MessageLog;
-    compilerFlags: Tag;
     readonly root: MalloyTranslator;
     constructor(rootURL: string, importURL?: string | null, preload?: ParseUpdate | null);
     update(dd: ParseUpdate): void;

package/dist/lang/parse-malloy.js

@@ -291,9 +291,9 @@ class ASTStep {
         if (!parse) {
             throw new Error('TRANSLATOR INTERNAL ERROR: Translator parse response had no errors, but also no parser');
         }
-        const secondPass = new malloy_to_ast_1.MalloyToAST(parse, that.root.logger);
+        const secondPass = new malloy_to_ast_1.MalloyToAST(parse, that.root.logger, that.compilerFlags);
         const newAst = secondPass.visit(parse.root);
-        that.root.compilerFlags = secondPass.compilerFlags;
+        that.compilerFlags = secondPass.compilerFlags;
         if (that.root.logger.hasErrors()) {
             this.response = that.fatalResponse();
             return this.response;
@@ -450,11 +450,20 @@ class HelpContextStep {
 class TranslateStep {
     constructor(astStep) {
         this.astStep = astStep;
+        this.importedFlags = false;
     }
     step(that, extendingModel) {
         if (this.response) {
             return this.response;
         }
+        // begin with the compiler flags of the model we are extending
+        if (extendingModel && !this.importedFlags) {
+            const tagParse = tags_1.Tag.annotationToTag(extendingModel.annotation, {
+                prefix: /^##! /,
+            });
+            that.compilerFlags = tagParse.tag;
+            this.importedFlags = true;
+        }
         const astResponse = this.astStep.step(that);
         if ((0, translate_response_1.isNeedResponse)(astResponse)) {
             return astResponse;
@@ -513,6 +522,7 @@ class MalloyTranslation {
         this.queryList = [];
         this.sqlBlocks = [];
         this.imports = [];
+        this.compilerFlags = new tags_1.Tag();
         this.childTranslators = new Map();
         this.modelDef = {
             name: sourceURL,
@@ -767,7 +777,6 @@ class MalloyTranslator extends MalloyTranslation {
         this.importZone = new zone_1.Zone();
         this.sqlQueryZone = new zone_1.Zone();
         this.logger = new parse_log_1.MessageLog();
-        this.compilerFlags = new tags_1.Tag();
         this.root = this;
         if (preload) {
             this.update(preload);

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

@@ -59,6 +59,18 @@ describe('model statements', () => {
     test('errors on redefinition of query', () => {
         expect('query: q1 is a -> { select: * }, q1 is a -> { select: * }').translationToFailWith("'q1' is already defined, cannot redefine");
     });
+    test('##! experimental enables all experiments', () => {
+        expect('##! experimental\n;;[ "x" ]').toTranslate();
+    });
+    test('experimental explicit enable', () => {
+        expect('##! experimental { compilerTestExperimentParse compilerTestExperimentTranslate }\n;;[ "x" ]').toTranslate();
+    });
+    test('experiment failures in parse are flagged', () => {
+        expect(';;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentParse' required to enable this feature");
+    });
+    test('experiment failures in second pass are flagged', () => {
+        expect('##! experimental.compilerTestExperimentParse\n;;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentTranslate' is not set, feature not available");
+    });
 });
 describe('error handling', () => {
     test('field and query with same name does not overflow', () => {

package/dist/tags.d.ts

@@ -29,8 +29,9 @@ export interface Taggable {
  * tag.numeric(p?)      => numeric value of tag.p or undefined
  * tag.textArray(p ?)   => string[] value of elements in tag.p or undefined
  * tag.numericArray(p?) => string[] value of elements in tag.p or undefined
- * tag.tag(p)           => Tag value of tag.p
- * tag.has(p)           => boolean "tag contains tag.p"
+ * tag.tag(p?)           => Tag value of tag.p
+ * tag.has(p?)           => boolean "tag contains tag.p"
+ * tag.bare(p?)          => tag.p exists and has no properties
  * tag.dict             => Record<string,Tag> of tag properties
  * ```
  */
@@ -60,6 +61,7 @@ export declare class Tag implements TagInterface {
     has(...at: string[]): boolean;
     text(...at: string[]): string | undefined;
     numeric(...at: string[]): number | undefined;
+    bare(...at: string[]): boolean | undefined;
     get dict(): Record<string, Tag>;
     array(...at: string[]): Tag[] | undefined;
     textArray(...at: string[]): string[] | undefined;

package/dist/tags.js

@@ -42,8 +42,9 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
  * tag.numeric(p?)      => numeric value of tag.p or undefined
  * tag.textArray(p ?)   => string[] value of elements in tag.p or undefined
  * tag.numericArray(p?) => string[] value of elements in tag.p or undefined
- * tag.tag(p)           => Tag value of tag.p
- * tag.has(p)           => boolean "tag contains tag.p"
+ * tag.tag(p?)           => Tag value of tag.p
+ * tag.has(p?)           => boolean "tag contains tag.p"
+ * tag.bare(p?)          => tag.p exists and has no properties
  * tag.dict             => Record<string,Tag> of tag properties
  * ```
  */
@@ -188,6 +189,13 @@ class Tag {
             }
         }
     }
+    bare(...at) {
+        const p = this.find(at);
+        if (p === undefined) {
+            return;
+        }
+        return (p.properties === undefined || Object.entries(p.properties).length === 0);
+    }
     get dict() {
         const newDict = {};
         if (this.properties) {

package/package.json

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