@malloydata/malloy 0.0.30-dev230405202234 → 0.0.30

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

@@ -77,7 +77,7 @@ class NamedSource extends source_1.Source {
             this.log(`Must use 'from()' for query source '${this.refName}`);
             return;
         }
-        else if (modelEnt.sqlType) {
+        else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
             this.log(`Must use 'from_sql()' for sql source '${this.refName}`);
             return;
         }

package/dist/lang/ast/sources/sql-source.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLSource = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
 const named_source_1 = require("./named-source");
 class SQLSource extends named_source_1.NamedSource {
     constructor() {
@@ -43,11 +44,12 @@ class SQLSource extends named_source_1.NamedSource {
             this.log(`Cannot use 'from_sql()' to explore query '${this.refName}'`);
             return;
         }
-        else if (!modelEnt.sqlType) {
-            this.log(`Cannot use 'from_sql()' to explore '${this.refName}'`);
-            return;
+        else if ((0, malloy_types_1.isSQLBlockStruct)(entry) && entry.declaredSQLBlock) {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const { declaredSQLBlock, ...newEntry } = entry;
+            return newEntry;
         }
-        return entry;
+        this.log(`Cannot use 'from_sql()' to explore '${this.refName}'`);
     }
 }
 exports.SQLSource = SQLSource;

package/dist/lang/ast/types/malloy-element.js

@@ -102,7 +102,7 @@ class MalloyElement {
                 });
             }
             else if ((result === null || result === void 0 ? void 0 : result.entry.type) === 'struct') {
-                if ((0, malloy_types_1.isSQLBlock)(result.entry)) {
+                if ((0, malloy_types_1.isSQLBlockStruct)(result.entry) && result.entry.declaredSQLBlock) {
                     this.addReference({
                         type: 'sqlBlockReference',
                         text: key,
@@ -349,11 +349,7 @@ class Document extends MalloyElement {
                 const entry = (0, cloneDeep_1.default)(orig);
                 if (entry.type === 'struct' || entry.type === 'query') {
                     const exported = extendingModelDef.exports.includes(nm);
-                    const sqlType = entry.type === 'struct' && (0, malloy_types_1.isSQLBlock)(entry);
-                    if (sqlType) {
-                        this.sqlBlocks.push(entry);
-                    }
-                    this.setEntry(nm, { entry, exported, sqlType });
+                    this.setEntry(nm, { entry, exported });
                 }
             }
         }
@@ -383,13 +379,17 @@ class Document extends MalloyElement {
         return def;
     }
     defineSQL(sql, name) {
-        const ret = { ...sql, as: `$${this.sqlBlocks.length}` };
+        const ret = {
+            ...sql,
+            as: `$${this.sqlBlocks.length}`,
+            declaredSQLBlock: true,
+        };
         if (name) {
             if (this.getEntry(name)) {
                 return false;
             }
             ret.as = name;
-            this.setEntry(name, { entry: ret, sqlType: true });
+            this.setEntry(name, { entry: ret });
         }
         this.sqlBlocks.push(ret);
         return true;

package/dist/lang/ast/types/model-entry.d.ts

@@ -2,5 +2,4 @@ import { NamedModelObject } from '../../../model/malloy_types';
 export interface ModelEntry {
     entry: NamedModelObject;
     exported?: boolean;
-    sqlType?: boolean;
 }

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

@@ -27,21 +27,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const granular_result_1 = require("../ast/types/granular-result");
 require("./parse-expects");
-function unlocatedStructDef(sd) {
-    const ret = { ...sd };
-    ret.fields = sd.fields.map(f => {
-        const nf = { ...f };
-        delete nf.location;
-        return nf;
-    });
-    delete ret.location;
-    return ret;
-}
 function exprOK(s) {
     return () => {
         expect(new test_translator_1.BetaExpression(s)).modelParsed();
@@ -849,124 +838,6 @@ describe('unspported fields in schema', () => {
         expect(uModel).modelCompiled();
     });
 });
-describe('sql:', () => {
-    function makeSchemaResponse(sql) {
-        const cname = sql.connection || 'bigquery';
-        return {
-            type: 'struct',
-            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 },
-            fields: test_translator_1.aTableDef.fields,
-        };
-    }
-    test('definition', () => {
-        const selStmt = 'SELECT * FROM aTable';
-        const model = new test_translator_1.TestTranslator(`
-      sql: users IS {
-        select: """${selStmt}"""
-        connection: "aConnection"
-      }
-    `);
-        const needReq = model.translate();
-        expect(model).modelParsed();
-        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');
-            expect(needs).toMatchObject(sql);
-            const refKey = needs.name;
-            expect(refKey).toBeDefined();
-            if (refKey) {
-                const sr = makeSchemaResponse(sql);
-                model.update({ compileSQL: { [refKey]: sr } });
-                expect(model).modelCompiled();
-                expect(unlocatedStructDef(model.sqlBlocks[0])).toEqual(unlocatedStructDef({ ...sr, as: 'users' }));
-            }
-        }
-    });
-    test('source from sql', () => {
-        const selStmt = 'SELECT * FROM aTable';
-        const model = new test_translator_1.TestTranslator(`
-      sql: users IS { select: """${selStmt}""" }
-      source: malloyUsers is from_sql(users) { primary_key: ai }
-    `);
-        expect(model).modelParsed();
-        const needReq = model.translate();
-        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 refKey = needs.name;
-            model.update({ compileSQL: { [refKey]: makeSchemaResponse(sql) } });
-            expect(model).modelCompiled();
-            const users = model.getSourceDef('malloyUsers');
-            expect(users).toBeDefined();
-        }
-    });
-    test('explore from imported sql-based-source', () => {
-        const selStmt = 'SELECT * FROM aTable';
-        const createModel = `
-      sql: users IS { select: """${selStmt}""" }
-      source: malloyUsers is from_sql(users) { primary_key: ai }
-    `;
-        const model = new test_translator_1.TestTranslator(`
-      import "createModel.malloy"
-      source: importUsers is malloyUsers
-    `);
-        model.importZone.define('internal://test/langtests/createModel.malloy', createModel);
-        expect(model).modelParsed();
-        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 }]);
-        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
-        expect(model).modelCompiled();
-    });
-    it('turducken', () => {
-        const m = new test_translator_1.TestTranslator(`
-      sql: someSql is {
-        select: """SELECT * FROM %{ a -> { group_by: astr } }% WHERE 1=1"""
-      }
-    `);
-        expect(m).modelParsed();
-        const compileSql = m.translate().compileSQL;
-        expect(compileSql).toBeDefined();
-        if (compileSql) {
-            const select = compileSql.select[0];
-            const star = compileSql.select[1];
-            const where = compileSql.select[2];
-            expect(select).toEqual({ sql: 'SELECT * FROM ' });
-            expect((0, model_1.isSQLFragment)(star)).toBeFalsy();
-            expect(where).toEqual({ sql: ' WHERE 1=1' });
-        }
-    });
-    it('model preserved', () => {
-        const selStmt = 'SELECT * FROM aTable';
-        const shouldBeOK = `
-      source: newa is a
-      sql: someSql is { select: """${selStmt}""" }
-      source: newaa is newa
-    `;
-        const model = new test_translator_1.TestTranslator(shouldBeOK);
-        expect(model).modelParsed();
-        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 }]);
-        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
-        expect(model).modelCompiled();
-    });
-});
 describe('error handling', () => {
     test('field and query with same name does not overflow', () => {
         expect(`

package/dist/lang/test/sql-block.spec.d.ts

@@ -0,0 +1 @@
+import './parse-expects';

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

@@ -0,0 +1,180 @@
+"use strict";
+/* eslint-disable no-console */
+/*
+ * 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 });
+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");
+function unlocatedStructDef(sd) {
+    const ret = { ...sd };
+    ret.fields = sd.fields.map(f => {
+        const nf = { ...f };
+        delete nf.location;
+        return nf;
+    });
+    delete ret.location;
+    return ret;
+}
+describe('sql:', () => {
+    const selStmt = 'SELECT * FROM aTable';
+    function makeSchemaResponse(sql) {
+        const cname = sql.connection || 'bigquery';
+        return {
+            type: 'struct',
+            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 },
+            fields: test_translator_1.aTableDef.fields,
+        };
+    }
+    test('definition', () => {
+        const model = new test_translator_1.TestTranslator(`
+      sql: users IS {
+        select: """${selStmt}"""
+        connection: "aConnection"
+      }
+    `);
+        const needReq = model.translate();
+        expect(model).modelParsed();
+        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');
+            expect(needs).toMatchObject(sql);
+            const refKey = needs.name;
+            expect(refKey).toBeDefined();
+            if (refKey) {
+                const sr = makeSchemaResponse(sql);
+                model.update({ compileSQL: { [refKey]: sr } });
+                expect(model).modelCompiled();
+                const expectThis = unlocatedStructDef({ ...sr, as: 'users' });
+                if ((0, model_1.isSQLBlockStruct)(expectThis)) {
+                    expectThis.declaredSQLBlock = true;
+                }
+                expect(unlocatedStructDef(model.sqlBlocks[0])).toEqual(expectThis);
+            }
+        }
+    });
+    test('source from sql', () => {
+        const model = new test_translator_1.TestTranslator(`
+      sql: users IS { select: """${selStmt}""" }
+      source: malloyUsers is from_sql(users) { primary_key: ai }
+    `);
+        expect(model).modelParsed();
+        const needReq = model.translate();
+        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 refKey = needs.name;
+            model.update({ compileSQL: { [refKey]: makeSchemaResponse(sql) } });
+            expect(model).modelCompiled();
+            const users = model.getSourceDef('malloyUsers');
+            expect(users).toBeDefined();
+            if (users && (0, model_1.isSQLBlockStruct)(users)) {
+                expect(users.declaredSQLBlock).toBeUndefined();
+            }
+        }
+    });
+    test('explore from imported sql-based-source', () => {
+        const createModel = `
+      sql: users IS { select: """${selStmt}""" }
+      source: malloyUsers is from_sql(users) { primary_key: ai }
+    `;
+        const model = new test_translator_1.TestTranslator(`
+      import "createModel.malloy"
+      source: importUsers is malloyUsers
+      query: malloyUsers -> { project: * }
+      query: importUsers -> { project: * }
+    `);
+        model.importZone.define('internal://test/langtests/createModel.malloy', createModel);
+        expect(model).modelParsed();
+        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 }]);
+        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        expect(model).modelCompiled();
+    });
+    it('turducken', () => {
+        const m = new test_translator_1.TestTranslator(`
+      sql: someSql is {
+        select: """SELECT * FROM %{ a -> { group_by: astr } }% WHERE 1=1"""
+      }
+    `);
+        expect(m).modelParsed();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            const select = compileSql.select[0];
+            const star = compileSql.select[1];
+            const where = compileSql.select[2];
+            expect(select).toEqual({ sql: 'SELECT * FROM ' });
+            expect((0, model_1.isSQLFragment)(star)).toBeFalsy();
+            expect(where).toEqual({ sql: ' WHERE 1=1' });
+        }
+    });
+    it('model preserved', () => {
+        const shouldBeOK = `
+      source: newa is a
+      sql: someSql is { select: """${selStmt}""" }
+      source: newaa is newa
+    `;
+        const model = new test_translator_1.TestTranslator(shouldBeOK);
+        expect(model).modelParsed();
+        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 }]);
+        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        expect(model).modelCompiled();
+    });
+    test('explore from extended sql-based-source', () => {
+        var _a, _b;
+        const model = new test_translator_1.TestTranslator(`
+      sql: sql_block IS { select: """${selStmt}""" }
+      source: malloy_source is from_sql(sql_block) { primary_key: ai }
+`);
+        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }]);
+        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        expect(model).modelCompiled();
+        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;
+        const extModel = new parse_malloy_1.MalloyTranslator('sqlblocktest://main');
+        extModel.importZone.define('sqlblocktest://main', 'query: malloy_source -> { project: * }');
+        extModel.translate(modelDef);
+        expect(extModel).toBeErrorless();
+    });
+});
+//# sourceMappingURL=sql-block.spec.js.map

package/dist/malloy.js

@@ -155,7 +155,7 @@ class Malloy {
                             });
                         }
                         if (resolved.structDef) {
-                            if ((0, model_1.isSQLBlock)(resolved.structDef)) {
+                            if ((0, model_1.isSQLBlockStruct)(resolved.structDef)) {
                                 translator.update({
                                     compileSQL: { [expanded.name]: resolved.structDef },
                                 });

package/dist/model/malloy_types.d.ts

@@ -453,8 +453,9 @@ export interface StructDef extends NamedObject, ResultStructMetadata, Filtered {
 }
 export interface SQLBlockStructDef extends StructDef {
     structSource: SubquerySource;
+    declaredSQLBlock?: boolean;
 }
-export declare function isSQLBlock(sd: StructDef): sd is SQLBlockStructDef;
+export declare function isSQLBlockStruct(sd: StructDef): sd is SQLBlockStructDef;
 /** any of the different field types */
 export declare type FieldTypeDef = FieldStringDef | FieldDateDef | FieldTimestampDef | FieldNumberDef | FieldBooleanDef | FieldJSONDef | FieldUnsupportedDef;
 export declare function isFieldTypeDef(f: FieldDef): f is FieldTypeDef;

package/dist/model/malloy_types.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlock = exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxExpressionType = exports.expressionIsCalculation = exports.expressionIsAggregate = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isAnalyticFragment = exports.malloyFunctions = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
+exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.isSQLFragment = exports.isJoinOn = exports.isIndexSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxExpressionType = exports.expressionIsCalculation = exports.expressionIsAggregate = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isAnalyticFragment = exports.malloyFunctions = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
 exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
@@ -296,11 +296,11 @@ function isSQLFragment(f) {
     return f.sql !== undefined;
 }
 exports.isSQLFragment = isSQLFragment;
-function isSQLBlock(sd) {
+function isSQLBlockStruct(sd) {
     const src = sd.structSource;
     return src.type === 'sql' && src.method === 'subquery';
 }
-exports.isSQLBlock = isSQLBlock;
+exports.isSQLBlockStruct = isSQLBlockStruct;
 function isFieldTypeDef(f) {
     return (f.type === 'string' ||
         f.type === 'date' ||

package/package.json

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