@malloydata/malloy 0.0.80-dev230830211713 → 0.0.80-dev230903192621

package/dist/lang/test/source.spec.d.ts

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

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

@@ -0,0 +1,241 @@
+"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 test_translator_1 = require("./test-translator");
+require("./parse-expects");
+describe('source:', () => {
+    test('table', () => {
+        expect("source: testA is table('aTable')").toTranslate();
+    });
+    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();
+    });
+    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('refine source', () => {
+        expect('source: aa is a { 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 }');
+        expect(x).toTranslate();
+        const a = x.getSourceDef('a');
+        if (a) {
+            const aFields = a.fields.map(f => f.as || f.name);
+            expect(aFields).toContain('astr');
+            expect(aFields).not.toContain('one');
+        }
+    });
+    describe('source properties', () => {
+        test('single dimension', () => {
+            expect('source: aa is a { dimension: x is 1 }').toTranslate();
+        });
+        test('multiple dimensions', () => {
+            expect(`
+        source: aa is a {
+          dimension:
+            x is 1
+            y is 2
+        }
+      `).toTranslate();
+        });
+        test('single declare', () => {
+            expect('source: aa is a { declare: x is 1 }').toTranslate();
+        });
+        test('multiple declare', () => {
+            expect(`
+        source: aa is a {
+          declare:
+            x is 1
+            y is 2
+        }
+      `).toTranslate();
+        });
+        test('single measure', () => {
+            expect('source: aa is a { measure: x is count() }').toTranslate();
+        });
+        test('multiple measures', () => {
+            expect(`
+        source: aa is a {
+          measure:
+            x is count()
+            y is x * x
+        }
+      `).toTranslate();
+        });
+        test('single where', () => {
+            expect('source: aa is a { where: ai > 10 }').toTranslate();
+        });
+        test('multiple where', () => {
+            expect(`
+        source: aa is a {
+          where:
+            ai > 10,
+            af < 1000
+        }
+      `).toTranslate();
+        });
+        test('where clause can use the join namespace in source refined query', () => {
+            expect(`
+      source: flights is table('malloytest.flights') + {
+        query: boo is {
+          join_one: carriers is table('malloytest.carriers') on carrier = carriers.code
+          where: carriers.code = 'WN' | 'AA'
+          group_by: carriers.nickname
+          aggregate: flight_count is count()
+        }
+      }`).toTranslate();
+        });
+        describe('joins', () => {
+            test('with', () => {
+                expect('source: x is a { 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();
+            });
+            test('with dotted ref', () => {
+                expect((0, test_translator_1.model) `source: x is ab { 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();
+            });
+            test('one is on', () => {
+                expect('source: x is a { 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();
+            });
+            test('many is on', () => {
+                expect('source: y is a { join_many: x is b on astr = x.astr }').toTranslate();
+            });
+            test('cross', () => {
+                expect('source: nab is a { join_cross: b }').toTranslate();
+            });
+            test('cross is', () => {
+                expect('source: nab is a { join_cross: xb is b }').toTranslate();
+            });
+            test('cross on', () => {
+                expect('source: nab is a { join_cross: b on true}').toTranslate();
+            });
+            test('multiple joins', () => {
+                expect(`
+          source: nab is a {
+            join_one:
+              b with astr,
+              br is b with astr
+          }
+        `).toTranslate();
+            });
+            test('with requires primary key', () => {
+                expect((0, test_translator_1.markSource) `
+            source: nb is b {
+              join_one: ${"bb is table('aTable') with astr"}
+            }
+          `).translationToFailWith('join_one: Cannot use with unless source has a primary key');
+            });
+        });
+        test('primary_key', () => {
+            expect('source: c is a { primary_key: ai }').toTranslate();
+        });
+        test('rename', () => {
+            expect('source: c is a { rename: nn is ai }').toTranslate();
+        });
+        test('accept single', () => {
+            const onlyAstr = new test_translator_1.TestTranslator('source: c is a { accept: astr }');
+            expect(onlyAstr).toTranslate();
+            const c = onlyAstr.getSourceDef('c');
+            if (c) {
+                expect(c.fields.length).toBe(1);
+            }
+        });
+        test('accept multi', () => {
+            expect('source: c is a { accept: astr, af }').toTranslate();
+        });
+        test('except single', () => {
+            const noAstr = new test_translator_1.TestTranslator('source: c is a { except: astr }');
+            expect(noAstr).toTranslate();
+            const c = noAstr.getSourceDef('c');
+            if (c) {
+                const foundAstr = c.fields.find(f => f.name === 'astr');
+                expect(foundAstr).toBeUndefined();
+            }
+        });
+        test('except multi', () => {
+            expect('source: c is a { except: astr, af }').toTranslate();
+        });
+        test('explore-query', () => {
+            expect('source: c is a {query: q is { group_by: astr } }').toTranslate();
+        });
+        test('refined explore-query', () => {
+            expect(`
+        source: abNew is ab {
+          query: for1 is aturtle {? ai = 1 }
+        }
+      `).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 {
+          query: chain is {
+            group_by: astr
+          } -> {
+            top: 10; order_by: astr
+            project: *
+          }
+        }
+      `).toTranslate();
+        });
+        test('multiple explore-query', () => {
+            expect(`
+        source: abNew is ab {
+          query:
+            q1 is { group_by: astr },
+            q2 is { group_by: ai }
+        }
+      `).toTranslate();
+        });
+    });
+});
+//# sourceMappingURL=source.spec.js.map

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

@@ -1,4 +1,4 @@
-import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, StructDef, TurtleDef } from '../../model/malloy_types';
+import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, SQLBlockSource, SQLBlockStructDef, StructDef, TurtleDef } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import { NameSpace } from '../ast/types/name-space';
 import { ModelEntry } from '../ast/types/model-entry';
@@ -63,4 +63,5 @@ 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 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.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.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");
@@ -478,4 +478,27 @@ function markSource(unmarked, ...marked) {
     return { code, locations };
 }
 exports.markSource = markSource;
+function getSelectOneStruct(sqlBlock) {
+    const selectThis = sqlBlock.select[0];
+    if (!(0, malloy_types_1.isSQLFragment)(selectThis)) {
+        throw new Error('weird test support error sorry');
+    }
+    return {
+        type: 'struct',
+        name: sqlBlock.name,
+        dialect: 'standardsql',
+        structSource: {
+            type: 'sql',
+            method: 'subquery',
+            sqlBlock: {
+                type: 'sqlBlock',
+                name: sqlBlock.name,
+                selectStr: selectThis.sql,
+            },
+        },
+        structRelationship: { type: 'basetable', connectionName: 'bigquery' },
+        fields: [{ type: 'number', name: 'one' }],
+    };
+}
+exports.getSelectOneStruct = getSelectOneStruct;
 //# sourceMappingURL=test-translator.js.map

package/package.json

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

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

@@ -1,112 +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 });
-require("./parse-expects");
-const test_translator_1 = require("./test-translator");
-describe('refinement location rules', () => {
-    test('where clauses go into the first segment', () => {
-        const doc = (0, test_translator_1.model) `
-        query: refineme is a -> { project: stage is "stage1" } -> { project: stage is "stage2" }
-        query: checkme is refineme refine { where: astr = 'a' }`;
-        expect(doc).toTranslate();
-        const checkme = doc.translator.getQuery('checkme');
-        expect(checkme).toBeDefined();
-        if (checkme) {
-            const whereClause = checkme.pipeline[0].filterList;
-            expect(whereClause).toBeDefined();
-            if (whereClause) {
-                expect(whereClause.length).toBe(1);
-            }
-        }
-    });
-    test('having clauses go into the last segment', () => {
-        const doc = (0, test_translator_1.model) `
-      query: refineme is a -> { group_by: ai,astr  } -> { group_by: ai, aggregate: ac is count() }
-      query: checkme is refineme refine { having: ac > 0 }`;
-        expect(doc).toTranslate();
-        const checkme = doc.translator.getQuery('checkme');
-        expect(checkme).toBeDefined();
-        if (checkme) {
-            const havingClause = checkme.pipeline[1].filterList;
-            expect(havingClause).toBeDefined();
-            if (havingClause) {
-                expect(havingClause.length).toBe(1);
-            }
-        }
-    });
-    test('limit goes into the last segment', () => {
-        const doc = (0, test_translator_1.model) `
-      query: refineme is a -> { group_by: ai,astr  } -> { group_by: ai, aggregate: ac is count() }
-      query: checkme is refineme refine { limit: 1 }`;
-        expect(doc).toTranslate();
-        const checkme = doc.translator.getQuery('checkme');
-        expect(checkme).toBeDefined();
-        if (checkme) {
-            expect(checkme.pipeline[1]).toMatchObject({ limit: 1 });
-        }
-    });
-    test('order_by goes into the last segment', () => {
-        const doc = (0, test_translator_1.model) `
-      query: refineme is a -> { group_by: ai,astr  } -> { group_by: ai, aggregate: ac is count() }
-      query: checkme is refineme refine { order_by: 2 }`;
-        expect(doc).toTranslate();
-        const checkme = doc.translator.getQuery('checkme');
-        expect(checkme).toBeDefined();
-        if (checkme) {
-            expect(checkme.pipeline[1]).toHaveProperty('orderBy');
-        }
-    });
-    const stageErr = 'Illegal in refinement of a query with more than one stage';
-    test('group_by illegal in long pipes', () => {
-        expect((0, test_translator_1.markSource) `query: refineme is a -> { project: stage is "stage1" } -> { project: stage is "stage2" }
-       query: checkme is refineme refine { ${'group_by: stage'} }`).translationToFailWith(stageErr);
-    });
-    test('aggregate illegal in long pipes', () => {
-        expect((0, test_translator_1.markSource) `query: refineme is a -> { project: stage is "stage1" } -> { project: stage is "stage2" }
-       query: checkme is refineme refine { ${'aggregate: c is count()'} }`).translationToFailWith(stageErr);
-    });
-    test('calcluate illegal in long pipes', () => {
-        expect((0, test_translator_1.markSource) `query: refineme is a -> { project: stage is "stage1" } -> { project: stage is "stage2" }
-       query: checkme is refineme refine { ${'calculate: c is count()'} }`).translationToFailWith(stageErr);
-    });
-    test('extend illegal in long pipes', () => {
-        expect((0, test_translator_1.markSource) `query: refineme is a -> { project: stage is "stage1" } -> { project: stage is "stage2" }
-       query: checkme is refineme refine { ${'extend: {measure: c is count()}'} }`).translationToFailWith(stageErr);
-    });
-    test('nest illegal in long pipes', () => {
-        expect((0, test_translator_1.markSource) `query: refineme is a -> { project: stage is "stage1" } -> { project: stage is "stage2" }
-       query: checkme is refineme refine { ${'nest: b is {group_by: stage}'} }`).translationToFailWith(stageErr);
-    });
-    test('all single stage refinements are accepted', () => {
-        expect((0, test_translator_1.markSource) `query: refineme is a -> { group_by: stage is "stage1" }
-       query: checkme is refineme refine {
-         extend: { dimension: red is 'red' }
-         nest: nestRed is { group_by: red }
-         group_by: ai
-         aggregate: counted is count()
-         calculate: l is lag(ai)
-       }`).toTranslate();
-    });
-});
-//# sourceMappingURL=refine.spec.js.map

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

@@ -1,155 +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 });
-require("./parse-expects");
-const parse_utils_1 = require("../parse-utils");
-const test_translator_1 = require("./test-translator");
-describe('quote comprehension inside strings', () => {
-    test('\\b', () => {
-        expect((0, parse_utils_1.parseString)('\\b')).toEqual('\b');
-    });
-    test('\\f', () => {
-        expect((0, parse_utils_1.parseString)('\\f')).toEqual('\f');
-    });
-    test('\\n', () => {
-        expect((0, parse_utils_1.parseString)('\\n')).toEqual('\n');
-    });
-    test('\\r', () => {
-        expect((0, parse_utils_1.parseString)('\\r')).toEqual('\r');
-    });
-    test('\\t', () => {
-        expect((0, parse_utils_1.parseString)('\\t')).toEqual('\t');
-    });
-    test('unicode ?', () => {
-        expect((0, parse_utils_1.parseString)('\\u003f')).toEqual('?');
-        expect((0, parse_utils_1.parseString)('\\u003F')).toEqual('?');
-    });
-    test('normal stuff', () => {
-        expect((0, parse_utils_1.parseString)('normal stuff')).toEqual('normal stuff');
-    });
-    test('stuff & nonsense', () => {
-        expect((0, parse_utils_1.parseString)('stuff \\u0026 nonsense')).toEqual('stuff & nonsense');
-    });
-    test('one thing\\nnext thing', () => {
-        expect((0, parse_utils_1.parseString)('one thing\\nnext thing')).toEqual('one thing\nnext thing');
-    });
-    test('quote stripping works', () => {
-        expect((0, parse_utils_1.parseString)('|42|', '|')).toEqual('42');
-    });
-});
-describe('string parsing in language', () => {
-    const tz = 'America/Mexico_City';
-    test('multi-line indent increasing', () => {
-        const checking = new test_translator_1.BetaExpression(`"""
-      left
-        mid
-          right
-    """`);
-        expect(checking).toTranslate();
-        const v = checking.generated().value[0];
-        expect(v).toMatchObject({ literal: '\nleft\n  mid\n    right\n' });
-    });
-    test('multi-line indent decreasing', () => {
-        const checking = new test_translator_1.BetaExpression(`"""
-          right
-        mid
-      left
-    """`);
-        expect(checking).toTranslate();
-        const v = checking.generated().value[0];
-        expect(v).toMatchObject({ literal: '\n    right\n  mid\nleft\n' });
-    });
-    test('multi-line indent keep', () => {
-        const checking = new test_translator_1.BetaExpression(`"""right
-        mid
-      left"""`);
-        expect(checking).toTranslate();
-        const v = checking.generated().value[0];
-        expect(v).toMatchObject({ literal: 'right\n        mid\n      left' });
-    });
-    test('timezone single quote', () => {
-        const m = new test_translator_1.TestTranslator(`run: a-> {timezone: '${tz}'; project: *}`);
-        expect(m).toParse();
-    });
-    test('timezone double quote', () => {
-        const m = new test_translator_1.TestTranslator(`run: a-> {timezone: "${tz}"; project: *}`);
-        expect(m).toParse();
-    });
-    test('timezone triple quote', () => {
-        const m = new test_translator_1.TestTranslator(`run: a->{timezone: """${tz}"""; project: *}`);
-        expect(m).toParse();
-    });
-    test('timezone with illegal query', () => {
-        expect(`run: a->{timezone: """${tz}%{ab->aturtle}"""; project: *}`).translationToFailWith('%{ query } illegal in this string');
-    });
-    test('table single quote', () => {
-        const m = new test_translator_1.TestTranslator("source: n is bigquery.table('n')");
-        expect(m).toParse();
-    });
-    test('table double quote', () => {
-        const m = new test_translator_1.TestTranslator('source: n is bigquery.table("n")');
-        expect(m).toParse();
-    });
-    test('table triple quote', () => {
-        const m = new test_translator_1.TestTranslator('source: n is bigquery.table("""n""")');
-        expect(m).toParse();
-    });
-    test('sql single quote', () => {
-        const m = new test_translator_1.TestTranslator("source: n is bigquery.sql('n')");
-        expect(m).toParse();
-    });
-    test('sql double quote', () => {
-        const m = new test_translator_1.TestTranslator('source: n is bigquery.sql("n")');
-        expect(m).toParse();
-    });
-    test('sql triple quote', () => {
-        const m = new test_translator_1.TestTranslator('source: n is bigquery.sql("""n""")');
-        expect(m).toParse();
-    });
-    test('import single quote', () => {
-        const m = new test_translator_1.TestTranslator("import 'a'");
-        expect(m).toParse();
-    });
-    test('import double quote', () => {
-        const m = new test_translator_1.TestTranslator('import "a"');
-        expect(m).toParse();
-    });
-    test('import triple quote', () => {
-        const m = new test_translator_1.TestTranslator('import """a"""');
-        expect(m).toParse();
-    });
-    test('literal single quote', () => {
-        const x = new test_translator_1.BetaExpression("'x'");
-        expect(x).toParse();
-    });
-    test('literal double quote', () => {
-        const x = new test_translator_1.BetaExpression('"x"');
-        expect(x).toParse();
-    });
-    test('literal triple quote', () => {
-        const x = new test_translator_1.BetaExpression('"""x"""');
-        expect(x).toParse();
-    });
-});
-//# sourceMappingURL=strings.spec.js.map