@malloydata/malloy 0.0.56-dev230710210339 → 0.0.56-dev230710210433

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

@@ -163,6 +163,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     getFilterShortcut(cx) {
         const el = this.getFilterElement(cx.fieldExpr());
+        if (this.m4WarningsEnabled()) {
+            this.astError(el, 'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead', 'warn');
+        }
         return new ast.Filter([el]);
     }
     getPlainString(cx) {
@@ -355,7 +358,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitSQLSourceName(pcx) {
         const name = this.getModelEntryName(pcx.sqlExploreNameRef());
-        return this.astAt(new ast.FromSQLSource(name), pcx);
+        const res = this.astAt(new ast.FromSQLSource(name), pcx);
+        if (this.m4WarningsEnabled()) {
+            this.astError(res, '`from_sql` is deprecated; use `connection_name.sql(...)` as a source directly', 'warn');
+        }
+        return res;
     }
     visitSqlSource(pcx) {
         const connId = pcx.connectionId();
@@ -534,7 +541,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitFilterByShortcut(pcx) {
         const el = this.getFilterElement(pcx.fieldExpr());
-        return this.astAt(new ast.Filter([el]), pcx);
+        const res = this.astAt(new ast.Filter([el]), pcx);
+        if (this.m4WarningsEnabled()) {
+            this.astError(el, 'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead', 'warn');
+        }
+        return res;
     }
     visitWhereStatement(pcx) {
         const where = this.visitFilterClauseList(pcx.filterClauseList());

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

@@ -65,6 +65,12 @@ describe('model statements', () => {
         test('shorcut fitlered table', () => {
             expect("source: xA is table('aTable') {? astr ~ 'a%' }").toTranslate();
         });
+        test('shorcut fitlered table m4warning', () => {
+            expect(`
+        ##! m4warnings
+        source: xA is conn.table('aTable') extend {? astr ~ 'a%' }
+      `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
+        });
         test('fitlered table', () => {
             expect("source: testA is table('aTable') { where: astr ~ 'a%' }").toTranslate();
         });
@@ -130,6 +136,12 @@ describe('model statements', () => {
         test('query with shortcut filtered turtle', () => {
             expect("query: allA is ab->aturtle {? astr ~ 'a%' }").toTranslate();
         });
+        test('query with shortcut filtered turtle m4warning', () => {
+            expect(`
+        ##! m4warnings
+        query: allA is ab->aturtle refine {? astr ~ 'a%' }
+      `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
+        });
         test('query with filtered turtle', () => {
             expect("query: allA is ab->aturtle { where: astr ~ 'a%' }").toTranslate();
         });
@@ -779,6 +791,14 @@ describe('source properties', () => {
       }
     `).toTranslate();
     });
+    test('refined explore-query m4warning', () => {
+        expect(`
+      ##! m4warnings
+      source: abNew is ab extend {
+        query: for1 is aturtle refine {? ai = 1 }
+      }
+    `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
+    });
     test('chained explore-query', () => {
         expect(`
       source: c is a {
@@ -1345,6 +1365,15 @@ describe('expressions', () => {
         }
       `).toTranslate();
     });
+    test('shortcut filtered measure m4warning', () => {
+        expect(`
+      ##! m4warnings
+      run: a -> {
+        group_by: ai
+        aggregate: x is avg(ai) {? astr = 'why?' }
+      }
+    `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
+    });
     test('correctly flags filtered scalar', () => {
         const e = new test_translator_1.BetaExpression('ai { where: true }');
         expect(e).translationToFailWith('Filtered expression requires an aggregate computation');
@@ -2908,6 +2937,18 @@ describe('sql expressions', () => {
         }
         expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
     });
+    test('from_sql deprecation warning', () => {
+        const m = new test_translator_1.TestTranslator(`##! m4warnings
+      sql: bad_sql is {select: """SELECT 1 as one"""}
+      source: foo is from_sql(bad_sql)`);
+        const req = m.translate().compileSQL;
+        if (req) {
+            m.update({
+                compileSQL: { [req.name]: getSelectOneStruct(req) },
+            });
+        }
+        expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead', '`from_sql` is deprecated; use `connection_name.sql(...)` as a source directly');
+    });
     test('reference to sql expression in run', () => {
         const m = new test_translator_1.TestTranslator(`
       run: bigquery.sql("""select 1 as one""")

package/package.json

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