@malloydata/malloy 0.0.271 → 0.0.272

package/dist/api/core.js

@@ -437,6 +437,21 @@ function statedCompileQuery(state) {
             const modelAnnotations = (0, annotation_1.annotationToTaglines)(result.modelDef.annotation).map(l => ({
                 value: l,
             }));
+            let source;
+            if (query.compositeResolvedSourceDef) {
+                source = query.compositeResolvedSourceDef;
+            }
+            else {
+                if ((0, model_1.refIsStructDef)(query.structRef)) {
+                    source = query.structRef;
+                }
+                else {
+                    source = result.modelDef.contents[query.structRef];
+                }
+            }
+            const sourceAnnotations = (0, annotation_1.annotationToTaglines)(source.annotation).map(l => ({
+                value: l,
+            }));
             annotations.push({
                 value: malloy_tag_1.Tag.withPrefix('#(malloy) ')
                     .set(['source_name'], translatedQuery.sourceExplore)
@@ -454,9 +469,10 @@ function statedCompileQuery(state) {
                     sql: translatedQuery.sql,
                     schema,
                     connection_name: translatedQuery.connectionName,
-                    annotations: annotations.length > 0 ? annotations : undefined,
-                    model_annotations: modelAnnotations.length > 0 ? modelAnnotations : undefined,
+                    annotations: annotationsOrUndefined(annotations),
+                    model_annotations: annotationsOrUndefined(modelAnnotations),
                     query_timezone: translatedQuery.queryTimezone,
+                    source_annotations: annotationsOrUndefined(sourceAnnotations),
                 },
                 default_row_limit_added: translatedQuery.defaultRowLimitAdded,
             };
@@ -480,4 +496,7 @@ function statedCompileQuery(state) {
     }
 }
 exports.statedCompileQuery = statedCompileQuery;
+function annotationsOrUndefined(annotations) {
+    return annotations.length > 0 ? annotations : undefined;
+}
 //# sourceMappingURL=core.js.map

package/dist/dialect/trino/dialect_functions.js

@@ -363,5 +363,26 @@ exports.PRESTO_DIALECT_FUNCTIONS = {
     ...(0, util_1.def)('array_sort_desc', { 'x': { array: T } }, { array: T }),
     ...(0, util_1.def)('remove_nulls', { 'x': { array: T } }, { array: T }),
     ...(0, util_1.def)('array_top_n', { 'x': { array: T }, 'n': 'number' }, { array: T }),
+    // presto with more parameters
+    hll_accumulate: {
+        default: {
+            takes: { 'value': { dimension: T } },
+            returns: { measure: { sql_native: 'hyperloglog' } },
+            generic: {
+                'T': ['string', 'number', 'date', 'timestamp', 'boolean', 'json'],
+            },
+            isSymmetric: true,
+            impl: { sql: 'APPROX_SET(${value}, 0.0040625)' },
+        },
+        with_percent: {
+            takes: { 'value': { dimension: T }, 'accuracy': 'number' },
+            returns: { measure: { sql_native: 'hyperloglog' } },
+            generic: {
+                'T': ['string', 'number', 'date', 'timestamp', 'boolean', 'json'],
+            },
+            isSymmetric: true,
+            impl: { sql: 'APPROX_SET(${value}, 0.0040625)' },
+        },
+    },
 };
 //# sourceMappingURL=dialect_functions.js.map

package/dist/model/composite_source_utils.js

@@ -81,10 +81,16 @@ sources) {
                     abort();
                     continue overSources;
                 }
-                base = { ...resolveInner.success };
+                base = {
+                    ...resolveInner.success,
+                    annotation: composeAnnotations(base.annotation, resolveInner.success.annotation),
+                };
             }
             else {
-                base = { ...inputSource };
+                base = {
+                    ...inputSource,
+                    annotation: composeAnnotations(base.annotation, inputSource.annotation),
+                };
             }
             const fields = [...nonCompositeFields, ...base.fields];
             base = {
@@ -219,6 +225,20 @@ function categorizeFieldUsage(fieldUsage) {
     }
     return categorized;
 }
+function composeAnnotations(base, slice) {
+    var _a, _b, _c, _d;
+    if (base === undefined)
+        return slice;
+    if (slice === undefined)
+        return base;
+    const notes = [...((_a = base.notes) !== null && _a !== void 0 ? _a : []), ...((_b = slice.notes) !== null && _b !== void 0 ? _b : [])];
+    const blockNotes = [...((_c = base.blockNotes) !== null && _c !== void 0 ? _c : []), ...((_d = slice.blockNotes) !== null && _d !== void 0 ? _d : [])];
+    return {
+        inherits: composeAnnotations(base.inherits, slice.inherits),
+        notes: notes.length === 0 ? undefined : notes,
+        blockNotes: blockNotes.length === 0 ? undefined : blockNotes,
+    };
+}
 function mergeFields(...fields) {
     var _a;
     const fieldsByName = {};

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.271";
+export declare const MALLOY_VERSION = "0.0.272";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.271';
+exports.MALLOY_VERSION = '0.0.272';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.271",
+  "version": "0.0.272",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "^0.0.271",
-    "@malloydata/malloy-interfaces": "^0.0.271",
-    "@malloydata/malloy-tag": "^0.0.271",
+    "@malloydata/malloy-filter": "0.0.272",
+    "@malloydata/malloy-interfaces": "0.0.272",
+    "@malloydata/malloy-tag": "0.0.272",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",