@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231002235732

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

@@ -27,31 +27,31 @@ const test_translator_1 = require("./test-translator");
 require("./parse-expects");
 describe('source:', () => {
     test('table', () => {
-        expect("source: testA is table('aTable')").toTranslate();
+        expect("source: testA is _db_.table('aTable')").toTranslate();
     });
     test('shorcut fitlered table', () => {
-        expect("source: xA is table('aTable') {? astr ~ 'a%' }").toTranslate();
+        expect("source: xA is _db_.table('aTable') extend { where: astr ~ 'a%' }").toTranslate();
     });
     test('shorcut fitlered table m4warning', () => {
         expect(`
       ##! m4warnings
-      source: xA is conn.table('aTable') extend {? astr ~ 'a%' }
+      source: xA is _db_.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();
+        expect("source: testA is _db_.table('aTable') extend { where: astr ~ 'a%' }").toTranslate();
     });
     test('ref source with no refinement', () => {
         expect('source: testA is a').toTranslate();
     });
-    test('from(query)', () => {
-        expect('source: testA is from(a->{group_by: astr})').toTranslate();
+    test('source from query', () => {
+        expect('source: testA is a->{group_by: astr}').toTranslate();
     });
     test('refine source', () => {
-        expect('source: aa is a { dimension: a is astr }').toTranslate();
+        expect('source: aa is a extend { dimension: a is astr }').toTranslate();
     });
     test('source refinement preserves original', () => {
-        const x = new test_translator_1.TestTranslator('source: na is a + { dimension: one is 1 }');
+        const x = new test_translator_1.TestTranslator('source: na is a extend { dimension: one is 1 }');
         expect(x).toTranslate();
         const a = x.getSourceDef('a');
         if (a) {
@@ -62,23 +62,24 @@ describe('source:', () => {
     });
     describe('source properties', () => {
         test('single dimension', () => {
-            expect('source: aa is a { dimension: x is 1 }').toTranslate();
+            expect('source: aa is a extend { dimension: x is 1 }').toTranslate();
         });
         test('multiple dimensions', () => {
             expect(`
-        source: aa is a {
+        source: aa is a extend {
           dimension:
             x is 1
             y is 2
         }
       `).toTranslate();
         });
-        test('single declare', () => {
-            expect('source: aa is a { declare: x is 1 }').toTranslate();
+        test('single declare ok b4 m4', () => {
+            expect('##! -m4warnings\nsource: aa is a extend { declare: x is 1 }').toTranslate();
         });
-        test('multiple declare', () => {
+        test('multiple declare ok b4 m4', () => {
             expect(`
-        source: aa is a {
+        ##! -m4warnings
+        source: aa is a extend {
           declare:
             x is 1
             y is 2
@@ -86,11 +87,11 @@ describe('source:', () => {
       `).toTranslate();
         });
         test('single measure', () => {
-            expect('source: aa is a { measure: x is count() }').toTranslate();
+            expect('source: aa is a extend { measure: x is count() }').toTranslate();
         });
         test('multiple measures', () => {
             expect(`
-        source: aa is a {
+        source: aa is a extend {
           measure:
             x is count()
             y is x * x
@@ -98,11 +99,11 @@ describe('source:', () => {
       `).toTranslate();
         });
         test('single where', () => {
-            expect('source: aa is a { where: ai > 10 }').toTranslate();
+            expect('source: aa is a extend { where: ai > 10 }').toTranslate();
         });
         test('multiple where', () => {
             expect(`
-        source: aa is a {
+        source: aa is a extend {
           where:
             ai > 10,
             af < 1000
@@ -111,9 +112,9 @@ describe('source:', () => {
         });
         test('where clause can use the join namespace in source refined query', () => {
             expect(`
-      source: flights is table('malloytest.flights') + {
+      source: flights is _db_.table('malloytest.flights') extend {
         view: boo is {
-          join_one: carriers is table('malloytest.carriers') on carrier = carriers.code
+          extend: { join_one: carriers is _db_.table('malloytest.carriers') on carrier = carriers.code }
           where: carriers.code = 'WN' | 'AA'
           group_by: carriers.nickname
           aggregate: flight_count is count()
@@ -122,38 +123,38 @@ describe('source:', () => {
         });
         describe('joins', () => {
             test('with', () => {
-                expect('source: x is a { join_one: b with astr }').toTranslate();
+                expect('source: x is a extend { join_one: b with astr }').toTranslate();
             });
             test('with', () => {
-                expect((0, test_translator_1.model) `source: x is a { join_one: y is b with astr }`).toTranslate();
+                expect((0, test_translator_1.model) `source: x is a extend { join_one: y is b with astr }`).toTranslate();
             });
             test('with dotted ref', () => {
-                expect((0, test_translator_1.model) `source: x is ab { join_one: xz is a with b.astr }`).toTranslate();
+                expect((0, test_translator_1.model) `source: x is ab extend { join_one: xz is a with b.astr }`).toTranslate();
             });
             test('one on', () => {
-                expect((0, test_translator_1.model) `source: x is a { join_one: b on astr = b.astr }`).toTranslate();
+                expect((0, test_translator_1.model) `source: x is a extend { join_one: b on astr = b.astr }`).toTranslate();
             });
             test('one is on', () => {
-                expect('source: x is a { join_one: y is b on astr = y.astr }').toTranslate();
+                expect('source: x is a extend { join_one: y is b on astr = y.astr }').toTranslate();
             });
             test('many on', () => {
-                expect('source: nab is a { join_many: b on astr = b.astr }').toTranslate();
+                expect('source: nab is a extend { join_many: b on astr = b.astr }').toTranslate();
             });
             test('many is on', () => {
-                expect('source: y is a { join_many: x is b on astr = x.astr }').toTranslate();
+                expect('source: y is a extend { join_many: x is b on astr = x.astr }').toTranslate();
             });
             test('cross', () => {
-                expect('source: nab is a { join_cross: b }').toTranslate();
+                expect('source: nab is a extend { join_cross: b }').toTranslate();
             });
             test('cross is', () => {
-                expect('source: nab is a { join_cross: xb is b }').toTranslate();
+                expect('source: nab is a extend { join_cross: xb is b }').toTranslate();
             });
             test('cross on', () => {
-                expect('source: nab is a { join_cross: b on true}').toTranslate();
+                expect('source: nab is a extend { join_cross: b on true}').toTranslate();
             });
             test('multiple joins', () => {
                 expect(`
-          source: nab is a {
+          source: nab is a extend {
             join_one:
               b with astr,
               br is b with astr
@@ -162,20 +163,28 @@ describe('source:', () => {
             });
             test('with requires primary key', () => {
                 expect((0, test_translator_1.markSource) `
-            source: nb is b {
-              join_one: ${"bb is table('aTable') with astr"}
+            source: nb is b extend {
+              join_one: ${'bb is _db_.table("aTable") with astr'}
             }
           `).translationToFailWith('join_one: Cannot use with unless source has a primary key');
             });
+            test('can join a query without a rename', () => {
+                expect(`
+          query: aq is a -> {select: *}
+          source: aqs is a extend {
+            join_one: aq on ai = aq.ai
+          }
+        `).toTranslate();
+            });
         });
         test('primary_key', () => {
-            expect('source: c is a { primary_key: ai }').toTranslate();
+            expect('source: c is a extend { primary_key: ai }').toTranslate();
         });
         test('rename', () => {
-            expect('source: c is a { rename: nn is ai }').toTranslate();
+            expect('source: c is a extend { rename: nn is ai }').toTranslate();
         });
         test('accept single', () => {
-            const onlyAstr = new test_translator_1.TestTranslator('source: c is a { accept: astr }');
+            const onlyAstr = new test_translator_1.TestTranslator('source: c is a extend { accept: astr }');
             expect(onlyAstr).toTranslate();
             const c = onlyAstr.getSourceDef('c');
             if (c) {
@@ -183,10 +192,10 @@ describe('source:', () => {
             }
         });
         test('accept multi', () => {
-            expect('source: c is a { accept: astr, af }').toTranslate();
+            expect('source: c is a extend { accept: astr, af }').toTranslate();
         });
         test('except single', () => {
-            const noAstr = new test_translator_1.TestTranslator('source: c is a { except: astr }');
+            const noAstr = new test_translator_1.TestTranslator('source: c is a extend { except: astr }');
             expect(noAstr).toTranslate();
             const c = noAstr.getSourceDef('c');
             if (c) {
@@ -195,7 +204,7 @@ describe('source:', () => {
             }
         });
         test('except multi', () => {
-            expect('source: c is a { except: astr, af }').toTranslate();
+            expect('source: c is a extend { except: astr, af }').toTranslate();
         });
         test('turtle in a source can be called view', () => {
             expect('source: c is a extend {view: q is { group_by: astr } }').toTranslate();
@@ -212,8 +221,8 @@ describe('source:', () => {
         });
         test('refined explore-query', () => {
             expect(`
-        source: abNew is ab {
-          view: for1 is aturtle {? ai = 1 }
+        source: abNew is ab extend {
+          view: for1 is aturtle + { where: ai = 1 }
         }
       `).toTranslate();
         });
@@ -221,25 +230,25 @@ describe('source:', () => {
             expect(`
         ##! m4warnings
         source: abNew is ab extend {
-          view: for1 is aturtle refine {? ai = 1 }
+          view: for1 is aturtle + {? ai = 1 }
         }
       `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
         });
         test('chained explore-query', () => {
             expect(`
-        source: c is a {
+        source: c is a extend {
           view: chain is {
             group_by: astr
           } -> {
             top: 10; order_by: astr
-            project: *
+            select: *
           }
         }
       `).toTranslate();
         });
         test('multiple explore-query', () => {
             expect(`
-        source: abNew is ab {
+        source: abNew is ab extend {
           view:
             q1 is { group_by: astr },
             q2 is { group_by: ai }

package/dist/lang/test/sql-block.spec.js

@@ -61,6 +61,7 @@ describe('sql:', () => {
     }
     test('definition', () => {
         const model = new test_translator_1.TestTranslator(`
+      ##! -m4warnings
       sql: users IS {
         select: """${selStmt}"""
         connection: "aConnection"
@@ -83,12 +84,15 @@ describe('sql:', () => {
                 if ((0, model_1.isSQLBlockStruct)(expectThis)) {
                     expectThis.declaredSQLBlock = true;
                 }
-                expect(unlocatedStructDef(model.sqlBlocks[0])).toEqual(expectThis);
+                const got = unlocatedStructDef(model.sqlBlocks[0]);
+                delete got.modelAnnotation;
+                expect(got).toEqual(expectThis);
             }
         }
     });
     test('source from sql', () => {
         const model = new test_translator_1.TestTranslator(`
+      ##! -m4warnings
       sql: users IS { select: """${selStmt}""" }
       source: malloyUsers is from_sql(users) { primary_key: ai }
     `);
@@ -110,26 +114,26 @@ describe('sql:', () => {
     });
     test('source from imported sql-based-source', () => {
         const createModel = `
-      sql: users IS { select: """${selStmt}""" }
-      source: malloyUsers is from_sql(users) { primary_key: ai }
+      source: malloyUsers is _db_.sql('${selStmt}') extend { primary_key: ai }
     `;
         const model = new test_translator_1.TestTranslator(`
       import "createModel.malloy"
       source: importUsers is malloyUsers
-      query: malloyUsers -> { project: * }
-      query: importUsers -> { project: * }
+      run: malloyUsers -> { select: * }
+      run: importUsers -> { select: * }
     `);
         model.importZone.define('internal://test/langtests/createModel.malloy', createModel);
         expect(model).toParse();
         const needReq = model.translate();
         const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
-        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }]);
+        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }], '_db_');
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).toTranslate();
     });
     it('simple turducken', () => {
         const m = new test_translator_1.TestTranslator(`
+      ##! -m4warnings
       sql: someSql is {
         select: """SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1"""
       }
@@ -148,6 +152,7 @@ describe('sql:', () => {
     });
     it('old style ', () => {
         const m = new test_translator_1.TestTranslator(`
+      ##! -m4warnings
       sql: someSql is {
         select: """SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1"""
       }
@@ -168,14 +173,14 @@ describe('sql:', () => {
         const m = new test_translator_1.TestTranslator(`
       run: duckdb.sql("""
         SELECT * from (%{
-          duckdb.sql("""SELECT 2 as two""") {
-            query: b is {
+          duckdb.sql("""SELECT 2 as two""") extend {
+            view: b is {
               nest: c is {
                 extend: {
                   join_one: d is duckdb.sql("""
                     SELECT * from (%{
-                      duckdb.sql("""SELECT 3 as three""") {
-                        query: b is {
+                      duckdb.sql("""SELECT 3 as three""") extend {
+                        view: b is {
                           nest: c is {
                             extend: {
                               join_one: d is duckdb.sql("""SELECT 4 as four""") on three = d.four - 1
@@ -198,6 +203,7 @@ describe('sql:', () => {
     });
     it('model preserved', () => {
         const shouldBeOK = `
+      ##! -m4warnings
       source: newa is a
       sql: someSql is { select: """${selStmt}""" }
       source: newaa is newa
@@ -211,9 +217,10 @@ describe('sql:', () => {
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).toTranslate();
     });
-    test('source from extended sql-based-source', () => {
+    test('pre m4 source from extended sql-based-source', () => {
         var _a, _b;
         const model = new test_translator_1.TestTranslator(`
+      ##! -m4warnings
       sql: sql_block IS { select: """${selStmt}""" }
       source: malloy_source is from_sql(sql_block) { primary_key: ai }
 `);
@@ -223,7 +230,7 @@ describe('sql:', () => {
         const modelDef = (_b = (_a = model === null || model === void 0 ? void 0 : model.translate()) === null || _a === void 0 ? void 0 : _a.translated) === null || _b === void 0 ? void 0 : _b.modelDef;
         // this tests the underlying api that .extendModel calls
         const extModel = new parse_malloy_1.MalloyTranslator('sqlblocktest://main');
-        extModel.importZone.define('sqlblocktest://main', 'query: malloy_source -> { project: * }');
+        extModel.importZone.define('sqlblocktest://main', 'run: malloy_source -> { select: * }');
         const tr = extModel.translate(modelDef);
         // because extModel is not a TestTranslator we can't use the hotness
         expect(tr.problems).toEqual([]);

package/dist/lang/test/test-translator.js

@@ -210,20 +210,23 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         /*
          * All test source files can assume that an import of this
          * model has already happened.
-         *   source: a is table('aTable') { primary_key: astr }
+         *
+         * Also the following tables will be available on _db_
+         *   aTable, malloytest.carriers, malloytest.flights, malloytest.airports
+         *
+         *   source: a is _db_.table('aTable') extend { primary_key: astr }
          *   source: b is a
-         *   source: ab is a {
+         *   source: ab is a extend {
          *     join_one: b with astr
          *     measure: acount is count()
          *     query: aturtle is { group_by: astr; aggregate: acount }
          *   }
-         * Also the following tables will be available
-         *   'aTable', 'malloytest.carriers'
          */
         this.internalModel = {
             name: testURI,
             exports: [],
             contents: {
+                _db_: { type: 'connection', name: '_db_' },
                 a: { ...exports.aTableDef, primaryKey: 'astr', as: 'a' },
                 b: { ...exports.aTableDef, primaryKey: 'astr', as: 'b' },
                 ab: {
@@ -273,7 +276,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         }
         for (const tableName in mockSchema) {
             this.schemaZone.define(tableName, mockSchema[tableName]);
-            this.schemaZone.define('conn:' + tableName, mockSchema[tableName]);
+            this.schemaZone.define(`_db_:${tableName}`, mockSchema[tableName]);
         }
     }
     translate() {

package/dist/malloy.js

@@ -1830,9 +1830,9 @@ class ModelMaterializer extends FluentState {
         -> {
           where: fieldType = 'string'
           group_by: fieldName
-          aggregate: cardinality is count(distinct fieldValue)
+          aggregate: cardinality is count(fieldValue)
           nest: values is {
-            project: fieldValue, weight
+            select: fieldValue, weight
             order_by: weight desc
             limit: ${limit}
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.88-dev231002231014",
+  "version": "0.0.88-dev231002235732",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,6 @@
   "scripts": {
     "test": "jest --config=../../jest.config.js",
     "build-parser": "node src/lang/grammar/build_parser.js",
-    "testLang": "npm run test --testPathPattern=packages/malloy/src/lang",
     "clean": "tsc --build --clean && rm -rf src/lang/lib dist",
     "build": "npm run build-parser && tsc --build",
     "malloyc": "ts-node ../../scripts/malloy-to-json",

package/dist/lang/ast/query-elements/run-query.d.ts

@@ -1,13 +0,0 @@
-import { Annotation } from '../../../model';
-import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
-import { Noteable, extendNoteMethod } from '../types/noteable';
-import { QueryElement } from '../types/query-element';
-export declare class RunQuery extends MalloyElement implements DocStatement, Noteable {
-    readonly theQuery: QueryElement;
-    elementType: string;
-    note?: Annotation;
-    readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    constructor(theQuery: QueryElement);
-    execute(doc: Document): void;
-}

package/dist/lang/ast/sources/named-source-or-query.d.ts

@@ -1,10 +0,0 @@
-import { StructDef } from '../../../model';
-import { Source } from '../elements/source';
-import { ModelEntryReference } from '../types/malloy-element';
-export declare class NamedSourceOrQuery extends Source {
-    readonly ref: ModelEntryReference;
-    elementType: string;
-    constructor(ref: ModelEntryReference);
-    private getSource;
-    structDef(): StructDef;
-}

package/dist/lang/ast/sources/named-source-or-query.js

@@ -1,71 +0,0 @@
-"use strict";
-/*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NamedSourceOrQuery = void 0;
-const source_1 = require("../elements/source");
-const error_factory_1 = require("../error-factory");
-const existing_query_1 = require("../query-elements/existing-query");
-const named_source_1 = require("./named-source");
-const query_source_1 = require("./query-source");
-class NamedSourceOrQuery extends source_1.Source {
-    constructor(ref) {
-        super();
-        this.ref = ref;
-        this.elementType = 'namedSourceOrQuery';
-        this.has({ ref: ref });
-    }
-    getSource() {
-        const modelEnt = this.modelEntry(this.ref);
-        const entry = modelEnt === null || modelEnt === void 0 ? void 0 : modelEnt.entry;
-        if (!entry) {
-            const undefMsg = `Undefined query or source '${this.ref.refString}'`;
-            this.ref.log(undefMsg);
-            return;
-        }
-        if (entry.type === 'query') {
-            const existingQuery = new existing_query_1.ExistingQuery();
-            existingQuery.head = this.ref;
-            return new query_source_1.QuerySource(existingQuery);
-        }
-        else if (entry.type === 'struct') {
-            return new named_source_1.NamedSource(this.ref);
-        }
-        else {
-            this.log(`'${this.ref.refString}' is a ${entry.type}, not a query or source`);
-        }
-    }
-    structDef() {
-        var _a;
-        const source = this.getSource();
-        this.has({ source });
-        if (source === undefined) {
-            return error_factory_1.ErrorFactory.structDef;
-        }
-        const ret = source.structDef();
-        (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(ret);
-        return ret;
-    }
-}
-exports.NamedSourceOrQuery = NamedSourceOrQuery;
-//# sourceMappingURL=named-source-or-query.js.map