@malloydata/malloy 0.0.224-dev241217161218 → 0.0.224-dev241217193641

package/dist/dialect/trino/dialect_functions.js

@@ -69,7 +69,7 @@ const hll_accumulate = {
             'T': ['string', 'number', 'date', 'timestamp', 'boolean', 'json'],
         },
         takes: { 'value': { dimension: { generic: 'T' } } },
-        returns: { measure: 'string' },
+        returns: { measure: { sql_native: 'hyperloglog' } },
         isSymmetric: true,
         impl: {
             function: 'APPROX_SET',
@@ -80,7 +80,7 @@ const hll_accumulate = {
             'T': ['string', 'number', 'date', 'timestamp', 'boolean', 'json'],
         },
         takes: { 'value': { dimension: { generic: 'T' } }, 'accuracy': 'number' },
-        returns: { measure: 'string' },
+        returns: { measure: { sql_native: 'hyperloglog' } },
         isSymmetric: true,
         impl: {
             function: 'APPROX_SET',
@@ -89,33 +89,33 @@ const hll_accumulate = {
 };
 const hll_combine = {
     takes: {
-        'value': 'string',
+        'value': { sql_native: 'hyperloglog' },
     },
-    returns: { measure: 'string' },
+    returns: { measure: { sql_native: 'hyperloglog' } },
     impl: { function: 'MERGE' },
     isSymmetric: true,
 };
 const hll_estimate = {
     takes: {
-        'value': 'string',
+        'value': { sql_native: 'hyperloglog' },
     },
     returns: { dimension: 'number' },
     impl: { function: 'CARDINALITY' },
 };
 const hll_export = {
     takes: {
-        'value': 'string',
+        'value': { sql_native: 'hyperloglog' },
     },
-    returns: { dimension: 'string' },
+    returns: { dimension: { sql_native: 'varbinary' } },
     impl: {
         sql: 'CAST(${value} AS VARBINARY)',
     },
 };
 const hll_import = {
     takes: {
-        'value': 'string',
+        'value': { sql_native: 'varbinary' },
     },
-    returns: { dimension: 'string' },
+    returns: { dimension: { sql_native: 'hyperloglog' } },
     impl: {
         sql: 'CAST(${value} AS HyperLogLog)',
     },

package/dist/lang/ast/query-elements/query-arrow.js

@@ -40,6 +40,7 @@ class QueryArrow extends query_base_1.QueryBase {
         this.elementType = 'arrow';
     }
     queryComp(isRefOk) {
+        var _a;
         let inputStruct;
         let queryBase;
         let fieldSpace;
@@ -68,12 +69,17 @@ class QueryArrow extends query_base_1.QueryBase {
             fieldSpace = new static_space_1.StaticSourceSpace(lhsQuery.outputStruct);
         }
         const { pipeline, annotation, outputStruct, name } = this.view.pipelineComp(fieldSpace);
+        const query = {
+            ...queryBase,
+            name,
+            annotation,
+            pipeline: [...queryBase.pipeline, ...pipeline],
+        };
+        const compositeResolvedSourceDef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : this.resolveCompositeSource(inputStruct, query);
         return {
             query: {
-                ...queryBase,
-                name,
-                annotation,
-                pipeline: [...queryBase.pipeline, ...pipeline],
+                ...query,
+                compositeResolvedSourceDef,
             },
             outputStruct,
             inputStruct,

package/dist/lang/ast/query-elements/query-base.d.ts

@@ -1,7 +1,8 @@
-import { Query } from '../../../model/malloy_types';
+import { Query, SourceDef } from '../../../model/malloy_types';
 import { MalloyElement } from '../types/malloy-element';
 import { QueryComp } from '../types/query-comp';
 export declare abstract class QueryBase extends MalloyElement {
     abstract queryComp(isRefOk: boolean): QueryComp;
+    protected resolveCompositeSource(inputSource: SourceDef, query: Query): SourceDef | undefined;
     query(): Query;
 }

package/dist/lang/ast/query-elements/query-base.js

@@ -28,23 +28,24 @@ const malloy_types_1 = require("../../../model/malloy_types");
 const query_utils_1 = require("../query-utils");
 const malloy_element_1 = require("../types/malloy-element");
 class QueryBase extends malloy_element_1.MalloyElement {
-    query() {
+    resolveCompositeSource(inputSource, query) {
         var _a;
-        const { inputStruct, query } = this.queryComp(true);
+        const stage1 = query.pipeline[0];
         // TODO add an error if a raw query is done against a composite source
-        let compositeResolvedSourceDef = undefined;
-        if (query.pipeline[0] &&
-            ((0, malloy_types_1.isQuerySegment)(query.pipeline[0]) || (0, malloy_types_1.isIndexSegment)(query.pipeline[0]))) {
-            const compositeFieldUsage = (_a = query.pipeline[0].compositeFieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyCompositeFieldUsage)();
+        if (stage1 && ((0, malloy_types_1.isQuerySegment)(stage1) || (0, malloy_types_1.isIndexSegment)(stage1))) {
+            const compositeFieldUsage = (_a = stage1.compositeFieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyCompositeFieldUsage)();
             if (!(0, composite_source_utils_1.isEmptyCompositeFieldUsage)(compositeFieldUsage) ||
-                inputStruct.type === 'composite') {
-                const resolved = (0, composite_source_utils_1.resolveCompositeSources)(inputStruct, compositeFieldUsage);
-                compositeResolvedSourceDef = resolved.sourceDef;
+                inputSource.type === 'composite') {
+                const resolved = (0, composite_source_utils_1.resolveCompositeSources)(inputSource, compositeFieldUsage);
+                return resolved.sourceDef;
             }
         }
+        return undefined;
+    }
+    query() {
+        const { query } = this.queryComp(true);
         return {
             ...query,
-            compositeResolvedSourceDef,
             pipeline: (0, query_utils_1.detectAndRemovePartialStages)(query.pipeline, this),
         };
     }

package/dist/lang/ast/query-elements/query-refine.js

@@ -42,10 +42,15 @@ class QueryRefine extends query_base_1.QueryBase {
         const q = this.base.queryComp(isRefOk);
         const inputFS = new static_space_1.StaticSourceSpace(q.inputStruct);
         const resultPipe = this.refinement.refine(inputFS, q.query.pipeline, undefined);
+        const query = {
+            ...q.query,
+            pipeline: resultPipe,
+        };
+        const compositeResolvedSourceDef = this.resolveCompositeSource(q.inputStruct, query);
         return {
             query: {
-                ...q.query,
-                pipeline: resultPipe,
+                ...query,
+                compositeResolvedSourceDef,
             },
             outputStruct: (0, struct_utils_1.getFinalStruct)(this.refinement, q.inputStruct, resultPipe),
             inputStruct: q.inputStruct,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.224-dev241217161218",
+  "version": "0.0.224-dev241217193641",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",