@malloydata/malloy-interfaces 0.0.240-dev250311202829 → 0.0.240-dev250311214430

package/dist/index.js

@@ -210,7 +210,10 @@ exports.thingy1 = {
 exports.thingy123r = {
     definition: {
         kind: 'arrow',
-        source_reference: { name: 'flights' },
+        source: {
+            kind: 'source_reference',
+            name: 'flights',
+        },
         view: {
             kind: 'view_reference',
             name: 'by_carrier',
@@ -220,7 +223,10 @@ exports.thingy123r = {
 exports.thingyssdfg = {
     definition: {
         kind: 'refinement',
-        query_reference: { name: 'flights' },
+        base: {
+            kind: 'query_reference',
+            name: 'flights',
+        },
         refinement: {
             kind: 'view_reference',
             name: 'by_carrier',
@@ -230,7 +236,10 @@ exports.thingyssdfg = {
 exports.thingy2asdf = {
     definition: {
         kind: 'arrow',
-        source_reference: { name: 'flights' },
+        source: {
+            kind: 'source_reference',
+            name: 'flights',
+        },
         view: {
             kind: 'refinement',
             base: {
@@ -256,7 +265,8 @@ exports.thingy2asdf = {
 exports.thingy3 = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -294,7 +304,8 @@ exports.thingy3 = {
 exports.thingy3dfdf = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -313,7 +324,8 @@ exports.thingy3dfdf = {
 exports.thingy4asdfasdf = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -345,7 +357,8 @@ exports.thingy4asdfasdf = {
 exports.thingy4asdfas = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -358,7 +371,8 @@ exports.thingy4asdfas = {
 exports.thingy4dfdsfs = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -383,7 +397,8 @@ exports.thingy4dfdsfs = {
 exports.thingy4sdfsd = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {
@@ -410,7 +425,8 @@ exports.thingy4sdfsd = {
 exports.thingy4sddfdfsd = {
     definition: {
         kind: 'arrow',
-        source_reference: {
+        source: {
+            kind: 'source_reference',
             name: 'flights',
         },
         view: {

package/dist/to_malloy.js

@@ -39,11 +39,14 @@ function codeFromFragments(fragments, { tabWidth } = { tabWidth: 2 }) {
     }
     return code;
 }
-function wrap(open, block, close) {
+function wrap(open, block, close, options) {
+    var _a;
     if (block.includes(NEWLINE)) {
         return [open, NEWLINE, INDENT, ...block, NEWLINE, OUTDENT, close];
     }
-    return [open, ' ', ...block, ' ', close];
+    const spaces = (_a = options === null || options === void 0 ? void 0 : options.spaces) !== null && _a !== void 0 ? _a : true;
+    const maybeSpace = spaces ? ' ' : '';
+    return [open, maybeSpace, ...block, maybeSpace, close];
 }
 function escapeString(str) {
     return { contents: str, quoteCharacter: '"' }; // TODO
@@ -153,7 +156,7 @@ function referenceToFragments(reference) {
                 parameterFragments.push(',', NEWLINE);
             }
         }
-        fragments.push(...wrap('(', parameterFragments, ')'));
+        fragments.push(...wrap('(', parameterFragments, ')', { spaces: false }));
     }
     return fragments;
 }
@@ -164,11 +167,24 @@ function queryToFragments(query) {
     fragments.push(...queryDefinitionToFragments(query.definition));
     return fragments;
 }
+function queryArrowSourceToFragments(query) {
+    const fragments = [];
+    switch (query.kind) {
+        case 'source_reference': {
+            fragments.push(...referenceToFragments(query));
+            break;
+        }
+        case 'refinement':
+            fragments.push(...queryDefinitionToFragments(query));
+            break;
+    }
+    return fragments;
+}
 function queryDefinitionToFragments(query) {
     const fragments = [];
     switch (query.kind) {
         case 'arrow': {
-            fragments.push(...referenceToFragments(query.source_reference));
+            fragments.push(...queryArrowSourceToFragments(query.source));
             fragments.push(' -> ');
             fragments.push(...viewDefinitionToFragments(query.view));
             break;
@@ -178,7 +194,13 @@ function queryDefinitionToFragments(query) {
             break;
         }
         case 'refinement': {
-            fragments.push(...referenceToFragments(query.query_reference));
+            const baseFragments = queryDefinitionToFragments(query.base);
+            if (query.base.kind === 'arrow') {
+                fragments.push(...wrap('(', baseFragments, ')', { spaces: false }));
+            }
+            else {
+                fragments.push(...baseFragments);
+            }
             fragments.push(' + ');
             fragments.push(...viewDefinitionToFragments(query.refinement));
             break;

package/dist/types.d.ts

@@ -312,9 +312,17 @@ export type Query = {
     annotations?: Array<Annotation>;
 };
 export type QueryArrow = {
-    source_reference: Reference;
+    source: QueryArrowSource;
     view: ViewDefinition;
 };
+export type QueryArrowSourceType = 'refinement' | 'source_reference';
+export type QueryArrowSource = QueryArrowSourceWithRefinement | QueryArrowSourceWithSourceReference;
+export type QueryArrowSourceWithRefinement = {
+    kind: 'refinement';
+} & QueryRefinement;
+export type QueryArrowSourceWithSourceReference = {
+    kind: 'source_reference';
+} & Reference;
 export type QueryDefinitionType = 'arrow' | 'query_reference' | 'refinement';
 export type QueryDefinition = QueryDefinitionWithArrow | QueryDefinitionWithQueryReference | QueryDefinitionWithRefinement;
 export type QueryDefinitionWithArrow = {
@@ -335,7 +343,7 @@ export type QueryInfo = {
     location?: Location;
 };
 export type QueryRefinement = {
-    query_reference: Reference;
+    base: QueryDefinition;
     refinement: ViewDefinition;
 };
 export type Range = {

package/package.json

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

package/thrift/malloy.thrift

@@ -305,7 +305,6 @@ stages: [
     ]
   }
 ]
-
 */
 
 struct Query {
@@ -319,13 +318,18 @@ union QueryDefinition {
   3: QueryRefinement refinement,
 }
 
+union QueryArrowSource {
+  3: QueryRefinement refinement,
+  2: Reference source_reference,
+}
+
 struct QueryArrow {
-  1: required Reference source_reference,
+  1: required QueryArrowSource source,
   2: required ViewDefinition view,
 }
 
 struct QueryRefinement {
-  1: required Reference query_reference,
+  1: required QueryDefinition base,
   2: required ViewDefinition refinement,
 }
 

package/dist/nest_unions.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/nest_unions.spec.js

@@ -1,67 +0,0 @@
-"use strict";
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const nest_unions_1 = require("./nest_unions");
-describe('unnest unions', () => {
-    test('works', () => {
-        const query = {
-            definition: {
-                kind: 'arrow',
-                source_reference: {
-                    name: 'flights',
-                },
-                view: {
-                    kind: 'segment',
-                    operations: [
-                        {
-                            kind: 'group_by',
-                            field: {
-                                expression: {
-                                    kind: 'field_reference',
-                                    name: 'carrier',
-                                },
-                            },
-                        },
-                        {
-                            kind: 'limit',
-                            limit: 10,
-                        },
-                    ],
-                },
-            },
-        };
-        expect((0, nest_unions_1.nestUnions)(query)).toMatchObject({
-            definition: {
-                arrow: {
-                    source_reference: {
-                        name: 'flights',
-                    },
-                    view: {
-                        segment: {
-                            operations: [
-                                {
-                                    group_by: {
-                                        field: {
-                                            expression: {
-                                                field_reference: { name: 'carrier' },
-                                            },
-                                        },
-                                    },
-                                },
-                                {
-                                    limit: { limit: 10 },
-                                },
-                            ],
-                        },
-                    },
-                },
-            },
-        });
-    });
-});
-//# sourceMappingURL=nest_unions.spec.js.map