@malloydata/malloy 0.0.80-dev230907183434 → 0.0.80

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

@@ -28,7 +28,7 @@ export declare class TestTranslator extends MalloyTranslator {
     readonly testSrc: string;
     testRoot?: TestRoot;
     internalModel: ModelDef;
-    constructor(testSrc: string, rootRule?: string);
+    constructor(testSrc: string, rootRule?: string, internalModel?: ModelDef);
     translate(): TranslateResponse;
     addChild(url: string): void;
     ast(): MalloyElement | undefined;
@@ -44,6 +44,7 @@ export declare class TestTranslator extends MalloyTranslator {
 export declare class BetaExpression extends TestTranslator {
     private compiled?;
     constructor(src: string);
+    private testFS;
     compile(): void;
     generated(): ExprValue;
 }
@@ -62,6 +63,11 @@ interface HasTranslator extends MarkedSource {
 }
 export declare function expr(unmarked: TemplateStringsArray, ...marked: string[]): HasTranslator;
 export declare function model(unmarked: TemplateStringsArray, ...marked: string[]): HasTranslator;
+export declare function makeModelFunc(options: {
+    model?: ModelDef;
+    prefix?: string;
+    wrap?: (code: string) => string;
+}): (unmarked: TemplateStringsArray, ...marked: string[]) => HasTranslator;
 export declare function markSource(unmarked: TemplateStringsArray, ...marked: string[]): MarkedSource;
 export declare function getSelectOneStruct(sqlBlock: SQLBlockSource): SQLBlockStructDef;
 export {};

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

@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSelectOneStruct = exports.markSource = exports.model = exports.expr = exports.getJoinField = exports.getQueryField = exports.getFieldDef = exports.getModelQuery = exports.getExplore = exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.aTableDef = exports.pretty = void 0;
+exports.getSelectOneStruct = exports.markSource = exports.makeModelFunc = exports.model = exports.expr = exports.getJoinField = exports.getQueryField = exports.getFieldDef = exports.getModelQuery = exports.getExplore = exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.aTableDef = exports.pretty = void 0;
 const util_1 = require("util");
 const malloy_types_1 = require("../../model/malloy_types");
 const ast_1 = require("../ast");
@@ -51,6 +51,14 @@ const mockSchema = {
             { type: 'timestamp', name: 'ats' },
             { type: 'unsupported', name: 'aun' },
             { type: 'unsupported', name: 'aweird', rawType: 'weird' },
+            {
+                type: 'struct',
+                name: 'astruct',
+                structSource: { type: 'nested' },
+                structRelationship: { type: 'inline' },
+                fields: [{ type: 'number', name: 'column', numberType: 'integer' }],
+                dialect: 'standardsql',
+            },
         ],
     },
     'malloytest.carriers': {
@@ -188,7 +196,7 @@ class TestChildTranslator extends parse_malloy_1.MalloyChildTranslator {
 exports.TestChildTranslator = TestChildTranslator;
 const testURI = 'internal://test/langtests/root.malloy';
 class TestTranslator extends parse_malloy_1.MalloyTranslator {
-    constructor(testSrc, rootRule = 'malloyDocument') {
+    constructor(testSrc, rootRule = 'malloyDocument', internalModel) {
         super(testURI);
         this.testSrc = testSrc;
         /*
@@ -252,6 +260,9 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         };
         this.grammarRule = rootRule;
         this.importZone.define(testURI, testSrc);
+        if (internalModel !== undefined) {
+            this.internalModel = internalModel;
+        }
         for (const tableName in mockSchema) {
             this.schemaZone.define(tableName, mockSchema[tableName]);
             this.schemaZone.define('conn:' + tableName, mockSchema[tableName]);
@@ -357,20 +368,24 @@ class BetaExpression extends TestTranslator {
     constructor(src) {
         super(src, 'justExpr');
     }
+    testFS() {
+        const aStruct = this.internalModel.contents['ab'];
+        if (aStruct.type === 'struct') {
+            const tstFS = new static_space_1.StaticSpace(aStruct);
+            return tstFS;
+        }
+        else {
+            throw new Error("Can't get simple namespace for expression tests");
+        }
+    }
     compile() {
         const exprAst = this.ast();
         if (exprAst instanceof ast_1.ExpressionDef) {
-            const aStruct = this.internalModel.contents['ab'];
-            if (aStruct.type === 'struct') {
-                const tstFS = new static_space_1.StaticSpace(aStruct);
-                const exprDef = exprAst.getExpression(tstFS);
-                this.compiled = exprDef;
-                if (TestTranslator.inspectCompile) {
-                    console.log('EXPRESSION: ', pretty(exprDef));
-                }
-            }
-            else {
-                throw new Error("Can't get simple namespace for expression tests");
+            const tstFS = this.testFS();
+            const exprDef = exprAst.getExpression(tstFS);
+            this.compiled = exprDef;
+            if (TestTranslator.inspectCompile) {
+                console.log('EXPRESSION: ', pretty(exprDef));
             }
         }
         else if (this.logger.hasErrors()) {
@@ -447,6 +462,18 @@ function model(unmarked, ...marked) {
     };
 }
 exports.model = model;
+function makeModelFunc(options) {
+    return function model(unmarked, ...marked) {
+        var _a;
+        const ms = markSource(unmarked, ...marked);
+        return {
+            ...ms,
+            translator: new TestTranslator(((_a = options.prefix) !== null && _a !== void 0 ? _a : '') +
+                (options.wrap ? options.wrap(ms.code) : ms.code), undefined, options === null || options === void 0 ? void 0 : options.model),
+        };
+    };
+}
+exports.makeModelFunc = makeModelFunc;
 function markSource(unmarked, ...marked) {
     let code = '';
     const locations = [];

package/dist/model/utils.d.ts

@@ -22,5 +22,6 @@ export declare class AndChain {
 }
 export declare function generateHash(input: string): string;
 export declare function exprMap(expr: Expr, func: (fragment: Fragment) => Expr): Expr;
+export declare function exprWalk(expr: Expr, func: (fragment: Fragment) => void): void;
 export declare function joinWith<T>(els: T[][], sep: T): T[];
 export declare function range(start: number, end: number): number[];

package/dist/model/utils.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.range = exports.joinWith = exports.exprMap = exports.generateHash = exports.AndChain = exports.generateSQLStringLiteral = exports.indent = void 0;
+exports.range = exports.joinWith = exports.exprWalk = exports.exprMap = exports.generateHash = exports.AndChain = exports.generateSQLStringLiteral = exports.indent = void 0;
 const uuid_1 = require("uuid");
 /** simple indent function */
 function indent(s) {
@@ -199,6 +199,106 @@ function exprMap(expr, func) {
     });
 }
 exports.exprMap = exprMap;
+function exprWalk(expr, func) {
+    expr.forEach(fragment => {
+        func(fragment);
+        if (typeof fragment === 'string') {
+            return fragment;
+        }
+        switch (fragment.type) {
+            case 'aggregate':
+            case 'all':
+            case 'spread':
+            case 'sql_expression':
+            case 'exclude':
+                return {
+                    ...fragment,
+                    e: exprWalk(fragment.e, func),
+                };
+            case 'apply':
+                return {
+                    ...fragment,
+                    to: exprWalk(fragment.to, func),
+                    value: exprWalk(fragment.value, func),
+                };
+            case 'applyVal':
+            case 'field':
+            case 'function_parameter':
+            case 'parameter':
+            case 'outputField':
+                return fragment;
+            case 'function_call':
+                return {
+                    ...fragment,
+                    args: fragment.args.map(arg => exprWalk(arg, func)),
+                };
+            case 'filterExpression':
+                return {
+                    ...fragment,
+                    e: exprWalk(fragment.e, func),
+                    filterList: fragment.filterList.map(filter => {
+                        return {
+                            ...filter,
+                            expression: exprWalk(filter.expression, func),
+                        };
+                    }),
+                };
+            case 'dialect': {
+                switch (fragment.function) {
+                    case 'cast':
+                    case 'regexpMatch':
+                        return {
+                            ...fragment,
+                            expr: exprWalk(fragment.expr, func),
+                        };
+                    case 'delta':
+                        return {
+                            ...fragment,
+                            delta: exprWalk(fragment.delta, func),
+                        };
+                    case 'div':
+                        return {
+                            ...fragment,
+                            denominator: exprWalk(fragment.denominator, func),
+                            numerator: exprWalk(fragment.numerator, func),
+                        };
+                    case 'now':
+                    case 'numberLiteral':
+                    case 'stringLiteral':
+                    case 'timeLiteral':
+                    case 'regexpLiteral':
+                        return fragment;
+                    case 'extract':
+                    case 'trunc':
+                        return {
+                            ...fragment,
+                            expr: {
+                                ...fragment.expr,
+                                value: exprWalk(fragment.expr.value, func),
+                            },
+                        };
+                    case 'timeDiff':
+                        return {
+                            ...fragment,
+                            left: {
+                                ...fragment.left,
+                                value: exprWalk(fragment.left.value, func),
+                            },
+                            right: {
+                                ...fragment.left,
+                                value: exprWalk(fragment.left.value, func),
+                            },
+                        };
+                    default:
+                        throw new Error('unexpected dialect function');
+                }
+            }
+            default:
+                throw new Error('unexpected');
+        }
+    });
+}
+exports.exprWalk = exprWalk;
 function joinWith(els, sep) {
     const result = [];
     for (let i = 0; i < els.length; i++) {

package/package.json

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