@malloydata/malloy 0.0.195-dev241003204819 → 0.0.195-dev241007154000

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

@@ -22,18 +22,15 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SOURCE_EXPLORE = exports.GRADPARENT_EXPLORE = exports.PARENT_EXPLORE = exports.CHILD_EXPLORE = void 0;
+exports.SOURCE_EXPLORE = exports.GRANDPARENT_EXPLORE = exports.PARENT_EXPLORE = exports.CHILD_EXPLORE = void 0;
 const malloy_1 = require("../../malloy");
 exports.CHILD_EXPLORE = {
-    type: 'struct',
+    type: 'table',
     name: 'some_ns.child',
     as: 'child',
     dialect: 'standardsql',
-    structSource: {
-        type: 'table',
-        tablePath: 'some_ns.child',
-    },
-    structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+    tablePath: 'some_ns.child',
+    connection: 'bigquery',
     primaryKey: 'id1',
     fields: [
         { type: 'string', name: 'carrier' },
@@ -46,15 +43,12 @@ exports.CHILD_EXPLORE = {
     ],
 };
 exports.PARENT_EXPLORE = {
-    type: 'struct',
+    type: 'table',
     name: 'some_ns.parent',
     as: 'parent',
     dialect: 'standardsql',
-    structSource: {
-        type: 'table',
-        tablePath: 'some_ns.parent',
-    },
-    structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+    tablePath: 'some_ns.parent',
+    connection: 'bigquery',
     primaryKey: 'id2',
     fields: [
         { type: 'string', name: 'name' },
@@ -66,37 +60,31 @@ exports.PARENT_EXPLORE = {
         },
     ],
 };
-exports.GRADPARENT_EXPLORE = {
-    type: 'struct',
+exports.GRANDPARENT_EXPLORE = {
+    type: 'table',
     name: 'some_ns.gradparent',
-    as: 'parent',
+    as: 'grandparent',
     dialect: 'standardsql',
-    structSource: {
-        type: 'table',
-        tablePath: 'some_ns.gradparent',
-    },
-    structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+    tablePath: 'some_ns.grandparent',
+    connection: 'bigquery',
     primaryKey: 'id3',
     fields: [
         { type: 'string', name: 'name' },
         {
             type: 'number',
-            name: 'some_gradparent_count',
+            name: 'some_grandparent_count',
             expressionType: 'aggregate',
             e: { node: 'aggregate', function: 'count', e: { node: '' } },
         },
     ],
 };
 exports.SOURCE_EXPLORE = {
-    type: 'struct',
+    type: 'table',
     name: 'some_ns.source',
     as: 'source',
     dialect: 'standardsql',
-    structSource: {
-        type: 'table',
-        tablePath: 'some_ns.source',
-    },
-    structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+    tablePath: 'some_ns.grandparent',
+    connection: 'bigquery',
     primaryKey: 'id4',
     fields: [
         { type: 'string', name: 'name' },
@@ -111,15 +99,15 @@ exports.SOURCE_EXPLORE = {
 describe('serializeModel', () => {
     test('Stringify on an `explore` with no parent nor source explore', async () => {
         const parent_explore = new malloy_1.Explore(exports.PARENT_EXPLORE);
-        expect(JSON.stringify(parent_explore)).toStrictEqual('{"_structDef":{"type":"struct","name":"some_ns.parent","as":"parent","dialect":"standardsql","structSource":{"type":"table","tablePath":"some_ns.parent"},"structRelationship":{"type":"basetable","connectionName":"bigquery"},"primaryKey":"id2","fields":[{"type":"string","name":"name"},{"type":"number","name":"some_parent_count","expressionType":"aggregate","e":{"node":"aggregate","function":"count","e":{"node":""}}}]}}');
+        expect(JSON.stringify(parent_explore)).toStrictEqual('{"_structDef":{"type":"table","name":"some_ns.parent","as":"parent","dialect":"standardsql","tablePath":"some_ns.parent","connection":"bigquery","primaryKey":"id2","fields":[{"type":"string","name":"name"},{"type":"number","name":"some_parent_count","expressionType":"aggregate","e":{"node":"aggregate","function":"count","e":{"node":""}}}]}}');
     });
     test('No parent nor source explore', async () => {
         const parent_explore = new malloy_1.Explore(exports.PARENT_EXPLORE);
         expect(malloy_1.Explore.fromJSON(parent_explore.toJSON())).toStrictEqual(parent_explore);
     });
     test('Having parent and source explores', async () => {
-        const gradparent_explore = new malloy_1.Explore(exports.GRADPARENT_EXPLORE);
-        const parent_explore = new malloy_1.Explore(exports.PARENT_EXPLORE, gradparent_explore);
+        const grandparent_explore = new malloy_1.Explore(exports.GRANDPARENT_EXPLORE);
+        const parent_explore = new malloy_1.Explore(exports.PARENT_EXPLORE, grandparent_explore);
         const source_explore = new malloy_1.Explore(exports.SOURCE_EXPLORE);
         const child_explore = new malloy_1.Explore(exports.CHILD_EXPLORE, parent_explore, source_explore);
         expect(malloy_1.Explore.fromJSON(child_explore.toJSON())).toStrictEqual(child_explore);

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

@@ -414,12 +414,11 @@ describe('pipeline comprehension', () => {
     test('new query can refine and append to exisiting query', () => {
         expect(`
       source: aq is _db_.table('aTable') extend {
-        view: by_region is { group_by: astr }
-        view: by_region2 is by_region + {
+        view: by_region is {
+          group_by: region is astr
           nest: dateNest is { group_by: ad }
-        } -> {
-          select: astr, dateNest.ad
         }
+        -> { select: dateNest.ad }
       }
     `).toTranslate();
     });

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

@@ -482,7 +482,7 @@ describe('query:', () => {
             expect(`run: ab -> {
           group_by: b.astr
           calculate: foo is lag(b)
-        }`).toLog((0, test_translator_1.errorMessage)('No matching overload for function lag(struct)'));
+        }`).toLog((0, test_translator_1.errorMessage)('No matching overload for function lag(table)'));
         });
         // TODO this doesn't work today, we're not rigorous enough with integer
         // subtypes. But we should probably make this typecheck properly.
@@ -990,7 +990,8 @@ describe('query:', () => {
                 const q = t.translated.queryList[0].pipeline[0];
                 if (q.type === 'reduce' && q.extendSource) {
                     expect(q.extendSource.length).toBe(1);
-                    expect(q.extendSource[0].type).toBe('struct');
+                    expect((0, model_1.isJoined)(q.extendSource[0])).toBeTruthy();
+                    expect(q.extendSource[0].type).toBe('table');
                 }
                 else {
                     fail('Did not generate extendSource');

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

@@ -180,6 +180,13 @@ describe('source:', () => {
           source: aqs is a extend {
             join_one: aq on ai = aq.ai
           }
+        `).toTranslate();
+            });
+            test('can with join a single column query', () => {
+                expect(`
+          source: awith is a extend {
+            join_one: has_primary_key is a -> { group_by: one_val is astr } with astr
+          }
         `).toTranslate();
             });
         });

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

@@ -23,29 +23,21 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const model_1 = require("../../model");
 const sql_block_1 = require("../../model/sql_block");
 const test_translator_1 = require("./test-translator");
 require("./parse-expects");
 const parse_malloy_1 = require("../parse-malloy");
+const model_1 = require("../../model");
 describe('connection sql()', () => {
     const selStmt = 'SELECT * FROM aTable';
     function makeSchemaResponse(sql) {
         const cname = sql.connection || 'bigquery';
         return {
-            type: 'struct',
+            type: 'sql_select',
             name: sql.name,
             dialect: 'standardsql',
-            structSource: {
-                type: 'sql',
-                method: 'subquery',
-                sqlBlock: {
-                    type: 'sqlBlock',
-                    ...sql,
-                    selectStr: sql.select.filter(s => typeof s === 'string').join(''),
-                },
-            },
-            structRelationship: { type: 'basetable', connectionName: cname },
+            connection: cname,
+            selectStr: selStmt,
             fields: test_translator_1.aTableDef.fields,
         };
     }
@@ -59,15 +51,12 @@ describe('connection sql()', () => {
         const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
         if (needs) {
-            const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }], 'aConnection');
+            const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], 'aConnection');
             const refKey = needs.name;
             model.update({ compileSQL: { [refKey]: makeSchemaResponse(sql) } });
             expect(model).toTranslate();
             const users = model.getSourceDef('malloyUsers');
             expect(users).toBeDefined();
-            if (users && (0, model_1.isSQLBlockStruct)(users)) {
-                expect(users.declaredSQLBlock).toBeUndefined();
-            }
         }
     });
     test('source from imported sql-based-source', () => {
@@ -85,7 +74,7 @@ describe('connection sql()', () => {
         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 }], '_db_');
+        const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], '_db_');
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).toTranslate();
     });
@@ -101,7 +90,7 @@ describe('connection sql()', () => {
             const star = compileSql.select[1];
             const where = compileSql.select[2];
             expect(select).toEqual({ sql: 'SELECT * FROM ' });
-            expect((0, model_1.isSQLFragment)(star)).toBeFalsy();
+            expect((0, model_1.isSegmentSQL)(star)).toBeFalsy();
             expect(where).toEqual({ sql: ' WHERE 1=1' });
         }
     });
@@ -143,7 +132,7 @@ describe('connection sql()', () => {
       source: sql_block is aConnection.sql("""${selStmt}""")
       source: malloy_source is sql_block extend { primary_key: ai }
     `);
-        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }], 'aConnection');
+        const sql = (0, sql_block_1.makeSQLSentence)([{ sql: selStmt }], 'aConnection');
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).toTranslate();
         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;

package/dist/lang/test/test-translator.d.ts

@@ -1,4 +1,4 @@
-import { DocumentLocation, Expr, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, SQLBlockSource, SQLBlockStructDef, StructDef, TurtleDef } from '../../model/malloy_types';
+import { DocumentLocation, Expr, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, StructDef, TurtleDef, SourceDef, SQLSourceDef, SQLSentence } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import { NameSpace } from '../ast/types/name-space';
 import { ModelEntry } from '../ast/types/model-entry';
@@ -8,7 +8,7 @@ import { ExprValue } from '../ast/types/expr-value';
 import { LogSeverity, MessageCode, MessageParameterType } from '../parse-log';
 import { EventStream } from '../../runtime_types';
 export declare function pretty(thing: any): string;
-export declare const aTableDef: StructDef;
+export declare const aTableDef: SourceDef;
 /**
  * When translating partial trees, there will not be a document node
  * to handle namespace requests, this stands in for document in that case.
@@ -41,7 +41,7 @@ export declare class TestTranslator extends MalloyTranslator {
     static inspectCompile: boolean;
     compile(): void;
     unresolved(): DataRequestResponse;
-    getSourceDef(srcName: string): StructDef | undefined;
+    getSourceDef(srcName: string): SourceDef | undefined;
     getQuery(queryName: string | number): Query | undefined;
 }
 export declare class BetaExpression extends TestTranslator {
@@ -73,7 +73,7 @@ export declare function makeModelFunc(options: {
     wrap?: (code: string) => string;
 }): (unmarked: TemplateStringsArray, ...marked: string[]) => HasTranslator<TestTranslator>;
 export declare function markSource(unmarked: TemplateStringsArray, ...marked: string[]): MarkedSource;
-export declare function getSelectOneStruct(sqlBlock: SQLBlockSource): SQLBlockStructDef;
+export declare function getSelectOneStruct(sqlBlock: SQLSentence): SQLSourceDef;
 export declare function exprToString(e: Expr, symbols?: Record<string, string>): string;
 export declare function error<T extends MessageCode>(code: T, data?: MessageParameterType<T>): {
     code: T;

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

@@ -37,11 +37,11 @@ function pretty(thing) {
 exports.pretty = pretty;
 const mockSchema = {
     'aTable': {
-        type: 'struct',
+        type: 'table',
         name: 'aTable',
         dialect: 'standardsql',
-        structSource: { type: 'table', tablePath: 'aTable' },
-        structRelationship: { type: 'basetable', connectionName: 'test' },
+        tablePath: 'aTable',
+        connection: 'test',
         fields: [
             { type: 'string', name: 'astr' },
             { type: 'number', name: 'af', numberType: 'float' },
@@ -52,32 +52,35 @@ const mockSchema = {
             { type: 'sql native', name: 'aun' },
             { type: 'sql native', name: 'aweird', rawType: 'weird' },
             {
-                type: 'struct',
+                type: 'array',
                 name: 'astruct',
-                structSource: { type: 'nested' },
-                structRelationship: { type: 'nested', isArray: true, fieldName: 'foo' },
-                fields: [{ type: 'number', name: 'column', numberType: 'integer' }],
+                elementTypeDef: { type: 'record_element' },
+                join: 'many',
+                fields: [
+                    {
+                        name: 'column',
+                        type: 'number',
+                        numberType: 'integer',
+                    },
+                ],
                 dialect: 'standardsql',
             },
             {
-                type: 'struct',
+                type: 'record',
                 name: 'aninline',
-                structSource: { type: 'nested' },
-                structRelationship: { type: 'inline' },
                 fields: [{ type: 'number', name: 'column', numberType: 'integer' }],
+                join: 'one',
+                matrixOperation: 'left',
                 dialect: 'standardsql',
             },
         ],
     },
     'malloytest.carriers': {
-        type: 'struct',
+        type: 'table',
         name: 'malloytest.carriers',
         dialect: 'standardsql',
-        structSource: {
-            type: 'table',
-            tablePath: 'malloytest.carriers',
-        },
-        structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+        tablePath: 'malloytest.carriers',
+        connection: 'bigquery',
         fields: [
             { name: 'code', type: 'string' },
             { name: 'name', type: 'string' },
@@ -86,14 +89,11 @@ const mockSchema = {
         as: 'carriers',
     },
     'malloytest.flights': {
-        type: 'struct',
+        type: 'table',
         name: 'malloytest.flights',
         dialect: 'standardsql',
-        structSource: {
-            type: 'table',
-            tablePath: 'malloytest.flights',
-        },
-        structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+        tablePath: 'malloytest.flights',
+        connection: 'bigquery',
         fields: [
             { name: 'carrier', type: 'string' },
             { name: 'origin', type: 'string' },
@@ -115,14 +115,11 @@ const mockSchema = {
         as: 'flights',
     },
     'malloytest.airports': {
-        type: 'struct',
+        type: 'table',
         name: 'malloytest.airports',
         dialect: 'standardsql',
-        structSource: {
-            type: 'table',
-            tablePath: 'malloytest.airports',
-        },
-        structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+        tablePath: 'malloytest.airports',
+        connection: 'bigquery',
         fields: [
             { name: 'id', type: 'number', numberType: 'integer' },
             { name: 'code', type: 'string' },
@@ -156,6 +153,24 @@ const mockSchema = {
     },
 };
 exports.aTableDef = mockSchema['aTable'];
+const bJoinedIntoA = {
+    type: 'table',
+    name: 'aTable',
+    dialect: 'standardsql',
+    tablePath: 'aTable',
+    connection: 'test',
+    as: 'b',
+    join: 'one',
+    matrixOperation: 'left',
+    onExpression: {
+        node: '=',
+        kids: {
+            left: { node: 'field', path: ['astr'] },
+            right: { node: 'field', path: ['b', 'astr'] },
+        },
+    },
+    fields: exports.aTableDef.fields,
+};
 /**
  * When translating partial trees, there will not be a document node
  * to handle namespace requests, this stands in for document in that case.
@@ -176,7 +191,7 @@ class TestRoot extends ast_1.MalloyElement {
         if (global)
             return global;
         const struct = this.modelDef.contents[name];
-        if (struct.type === 'struct') {
+        if ((0, malloy_types_1.modelObjIsSource)(struct)) {
             const exported = this.modelDef.exports.includes(name);
             return { entry: struct, exported };
         }
@@ -232,25 +247,10 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
                 b: { ...exports.aTableDef, primaryKey: 'astr', as: 'b' },
                 ab: {
                     ...exports.aTableDef,
-                    as: 'ab',
                     primaryKey: 'astr',
                     fields: [
                         ...exports.aTableDef.fields,
-                        {
-                            ...exports.aTableDef,
-                            as: 'b',
-                            structRelationship: {
-                                type: 'one',
-                                matrixOperation: 'left',
-                                onExpression: {
-                                    node: '=',
-                                    kids: {
-                                        left: { node: 'field', path: ['astr'] },
-                                        right: { node: 'field', path: ['b', 'astr'] },
-                                    },
-                                },
-                            },
-                        },
+                        bJoinedIntoA,
                         {
                             type: 'number',
                             name: 'acount',
@@ -345,7 +345,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
     }
     exploreFor(exploreName) {
         const explore = this.nameSpace[exploreName];
-        if (explore && explore.type === 'struct') {
+        if (explore && (0, malloy_types_1.modelObjIsSource)(explore)) {
             return explore;
         }
         throw new Error(`Expected model to contain source '${exploreName}'`);
@@ -365,7 +365,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         var _a;
         const t = this.translate().translated;
         const s = (_a = t === null || t === void 0 ? void 0 : t.modelDef) === null || _a === void 0 ? void 0 : _a.contents[srcName];
-        if (s && s.type === 'struct') {
+        if (s && (0, malloy_types_1.modelObjIsSource)(s)) {
             return s;
         }
         return undefined;
@@ -391,8 +391,8 @@ class BetaExpression extends TestTranslator {
     }
     testFS() {
         const aStruct = this.internalModel.contents['ab'];
-        if (aStruct.type === 'struct') {
-            const tstFS = new static_space_1.StaticSpace(aStruct);
+        if ((0, malloy_types_1.modelObjIsSource)(aStruct)) {
+            const tstFS = new static_space_1.StaticSourceSpace(aStruct);
             return tstFS;
         }
         else {
@@ -531,23 +531,15 @@ function markSource(unmarked, ...marked) {
 exports.markSource = markSource;
 function getSelectOneStruct(sqlBlock) {
     const selectThis = sqlBlock.select[0];
-    if (!(0, malloy_types_1.isSQLFragment)(selectThis)) {
+    if (!(0, malloy_types_1.isSegmentSQL)(selectThis)) {
         throw new Error('weird test support error sorry');
     }
     return {
-        type: 'struct',
+        type: 'sql_select',
         name: sqlBlock.name,
         dialect: 'standardsql',
-        structSource: {
-            type: 'sql',
-            method: 'subquery',
-            sqlBlock: {
-                type: 'sqlBlock',
-                name: sqlBlock.name,
-                selectStr: selectThis.sql,
-            },
-        },
-        structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+        connection: 'bigquery',
+        selectStr: selectThis.sql,
         fields: [{ type: 'number', name: 'one' }],
     };
 }

package/dist/lang/translate-response.d.ts

@@ -1,4 +1,4 @@
-import { Annotation, ModelDef, Query, SQLBlockSource, SQLBlockStructDef } from '../model/malloy_types';
+import { Annotation, ModelDef, Query, SQLSentence, SQLSourceDef } from '../model/malloy_types';
 import { MalloyElement } from './ast';
 import { LogMessage } from './parse-log';
 import { DocumentSymbol } from './parse-tree-walkers/document-symbol-walker';
@@ -26,7 +26,7 @@ export interface NeedURLData {
     urls: string[];
 }
 export interface NeedCompileSQL {
-    compileSQL: SQLBlockSource;
+    compileSQL: SQLSentence;
     partialModel: ModelDef | undefined;
 }
 interface NeededData extends NeedURLData, NeedSchemaData, NeedCompileSQL {
@@ -58,7 +58,7 @@ interface TranslatedResponseData extends NeededData, ProblemResponse, FinalRespo
     translated: {
         modelDef: ModelDef;
         queryList: Query[];
-        sqlBlocks: SQLBlockStructDef[];
+        sqlBlocks: SQLSourceDef[];
     };
     fromSources: string[];
 }