@malloydata/malloy 0.0.352 → 0.0.354

package/dist/api/foundation/core.d.ts

@@ -3,8 +3,9 @@ import type { BuildID, CompiledQuery, DocumentLocation, BooleanFieldDef, JSONFie
 import { QueryModel } from '../../model';
 import type { Dialect } from '../../dialect';
 import type { BuildGraph, CompileQueryOptions } from './types';
-import type { Tag } from '@malloydata/malloy-tag';
+import { Tag } from '@malloydata/malloy-tag';
 import type { MalloyTagParse, TagParseSpec } from '../../annotation';
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { Taggable } from '../../taggable';
 declare abstract class Entity {
     private readonly _name;
@@ -494,5 +495,11 @@ export declare class PreparedResult implements Taggable {
      * CREATE SECRET, etc.) do not return a schema.
      */
     get hasSchema(): boolean;
+    /**
+     * Convert to the stable Malloy.Result interface format.
+     * Pass data to include query results, or omit for schema-only
+     * (e.g. headless tag validation).
+     */
+    toStableResult(data?: Malloy.Data): Malloy.Result;
 }
 export {};

package/dist/api/foundation/core.js

@@ -10,7 +10,10 @@ const utils_1 = require("../../model/utils");
 const dialect_1 = require("../../dialect");
 const persist_utils_1 = require("../../model/persist_utils");
 const source_def_utils_1 = require("../../model/source_def_utils");
+const malloy_tag_1 = require("@malloydata/malloy-tag");
 const annotation_1 = require("../../annotation");
+const to_stable_1 = require("../../to_stable");
+const util_1 = require("../util");
 const utils_2 = require("../../lang/utils");
 const reference_list_1 = require("../../lang/reference-list");
 function isSourceComponent(source) {
@@ -1248,6 +1251,59 @@ class PreparedResult {
     get hasSchema() {
         return this.inner.structs.length > 0;
     }
+    /**
+     * Convert to the stable Malloy.Result interface format.
+     * Pass data to include query results, or omit for schema-only
+     * (e.g. headless tag validation).
+     */
+    toStableResult(data) {
+        const structs = this.inner.structs;
+        const struct = structs[structs.length - 1];
+        const schema = { fields: (0, to_stable_1.convertFieldInfos)(struct, struct.fields) };
+        const annotations = (0, annotation_1.annotationToTaglines)(this.inner.annotation).map(l => ({
+            value: l,
+        }));
+        const metadataAnnot = struct.resultMetadata
+            ? (0, to_stable_1.getResultStructMetadataAnnotation)(struct, struct.resultMetadata)
+            : undefined;
+        if (metadataAnnot) {
+            annotations.push(metadataAnnot);
+        }
+        const sourceMetadataTag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
+        const sourceExplore = this.sourceExplore;
+        if (sourceExplore) {
+            sourceMetadataTag.set(['source', 'name'], sourceExplore.name);
+        }
+        if (this._sourceArguments) {
+            const args = Object.entries(this._sourceArguments);
+            for (let i = 0; i < args.length; i++) {
+                const [name, value] = args[i];
+                const literal = (0, util_1.nodeToLiteralValue)(value.value);
+                if (literal !== undefined) {
+                    (0, to_stable_1.writeLiteralToTag)(sourceMetadataTag, ['source', 'parameters', i, 'value'], literal);
+                }
+                sourceMetadataTag.set(['source', 'parameters', i, 'name'], name);
+            }
+        }
+        annotations.push({ value: sourceMetadataTag.toString() });
+        annotations.push({
+            value: malloy_tag_1.Tag.withPrefix('#(malloy) ')
+                .set(['query_name'], this.inner.queryName || struct.name)
+                .toString(),
+        });
+        const modelAnnotations = (0, annotation_1.annotationToTaglines)(this.modelDef.annotation).map(l => ({
+            value: l,
+        }));
+        return {
+            schema,
+            data,
+            connection_name: this.inner.connectionName,
+            annotations: annotations.length > 0 ? annotations : undefined,
+            model_annotations: modelAnnotations.length > 0 ? modelAnnotations : undefined,
+            query_timezone: struct.queryTimezone,
+            sql: this.inner.sql,
+        };
+    }
 }
 exports.PreparedResult = PreparedResult;
 //# sourceMappingURL=core.js.map

package/dist/api/util.js

@@ -13,8 +13,6 @@ exports.mapData = mapData;
 exports.wrapResult = wrapResult;
 exports.nodeToLiteralValue = nodeToLiteralValue;
 exports.mapLogs = mapLogs;
-const malloy_tag_1 = require("@malloydata/malloy-tag");
-const annotation_1 = require("../annotation");
 const to_stable_1 = require("../to_stable");
 const row_data_utils_1 = require("./row_data_utils");
 function wrapLegacyInfoConnection(connection) {
@@ -165,49 +163,7 @@ function wrapResult(result) {
     const structs = result._queryResult.structs;
     const struct = structs[structs.length - 1];
     const schema = { fields: (0, to_stable_1.convertFieldInfos)(struct, struct.fields) };
-    const annotations = (0, annotation_1.annotationToTaglines)(result.annotation).map(l => ({
-        value: l,
-    }));
-    const metadataAnnot = struct.resultMetadata
-        ? (0, to_stable_1.getResultStructMetadataAnnotation)(struct, struct.resultMetadata)
-        : undefined;
-    if (metadataAnnot) {
-        annotations.push(metadataAnnot);
-    }
-    annotations.push(...(struct.resultMetadata ? [] : []));
-    const sourceMetadataTag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
-    if (result.sourceExplore) {
-        sourceMetadataTag.set(['source', 'name'], result.sourceExplore.name);
-    }
-    if (result._sourceArguments) {
-        const args = Object.entries(result._sourceArguments);
-        for (let i = 0; i < args.length; i++) {
-            const [name, value] = args[i];
-            const literal = nodeToLiteralValue(value.value);
-            if (literal !== undefined) {
-                (0, to_stable_1.writeLiteralToTag)(sourceMetadataTag, ['source', 'parameters', i, 'value'], literal);
-            }
-            sourceMetadataTag.set(['source', 'parameters', i, 'name'], name);
-        }
-    }
-    annotations.push({ value: sourceMetadataTag.toString() });
-    annotations.push({
-        value: malloy_tag_1.Tag.withPrefix('#(malloy) ')
-            .set(['query_name'], result.resultExplore.name)
-            .toString(),
-    });
-    const modelAnnotations = (0, annotation_1.annotationToTaglines)(result._modelDef.annotation).map(l => ({
-        value: l,
-    }));
-    return {
-        schema,
-        data: mapData(result.data.rawData, schema),
-        connection_name: result.connectionName,
-        annotations: annotations.length > 0 ? annotations : undefined,
-        model_annotations: modelAnnotations.length > 0 ? modelAnnotations : undefined,
-        query_timezone: result.data.field.queryTimezone,
-        sql: result.sql,
-    };
+    return result.toStableResult(mapData(result.data.rawData, schema));
 }
 function nodeToLiteralValue(expr) {
     switch (expr === null || expr === void 0 ? void 0 : expr.node) {

package/dist/model/query_node.js

@@ -290,7 +290,11 @@ class QueryStruct {
                 this.addFieldToNameMap(as, this.makeQueryField(field));
             }
             else {
-                throw new Error('mtoy did nit add field');
+                // According to the type system this should be impossible, but we have seen this happen
+                // in the wild, so we are leaving error handling here to help debug if it happens again.
+                throw new Error(`Unexpected field '${as}' in addFieldsFromFieldList` +
+                    `\n  field: ${JSON.stringify(field)}` +
+                    `\n  structDef: ${JSON.stringify(this.structDef)}`);
             }
         }
         // if we don't have distinct key yet for this struct, add it.

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.352";
+export declare const MALLOY_VERSION = "0.0.354";

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.352';
+exports.MALLOY_VERSION = '0.0.354';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.352",
+  "version": "0.0.354",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -47,9 +47,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.352",
-    "@malloydata/malloy-interfaces": "0.0.352",
-    "@malloydata/malloy-tag": "0.0.352",
+    "@malloydata/malloy-filter": "0.0.354",
+    "@malloydata/malloy-interfaces": "0.0.354",
+    "@malloydata/malloy-tag": "0.0.354",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",