@malloydata/malloy 0.0.347 → 0.0.349

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

@@ -342,6 +342,8 @@ export interface BuildPlan {
     graphs: BuildGraph[];
     /** Map from sourceId to PersistSource for accessing source details */
     sources: Record<string, PersistSource>;
+    /** Errors and warnings from parsing #@ annotations on persistable sources */
+    tagParseLog: LogMessage[];
 }
 /**
  * A wrapper around a source that has #@ persist annotation.

package/dist/api/foundation/core.js

@@ -906,18 +906,19 @@ class Model {
             throw new Error('Model must have ##! experimental.persistence to use getBuildPlan()');
         }
         const allDeps = [];
+        const tagParseLog = [];
         // Walk all objects in the model to find persistent dependencies
         for (const obj of Object.values(this.modelDef.contents)) {
             if (obj.type === 'query' || (0, model_1.isSourceDef)(obj)) {
-                allDeps.push(...(0, persist_utils_1.findPersistentDependencies)(obj, this.modelDef));
+                allDeps.push(...(0, persist_utils_1.findPersistentDependencies)(obj, this.modelDef, tagParseLog));
             }
         }
         // Also walk queryList (unnamed queries)
         for (const query of this.modelDef.queryList) {
-            allDeps.push(...(0, persist_utils_1.findPersistentDependencies)(query, this.modelDef));
+            allDeps.push(...(0, persist_utils_1.findPersistentDependencies)(query, this.modelDef, tagParseLog));
         }
         if (allDeps.length === 0) {
-            return { graphs: [], sources: {} };
+            return { graphs: [], sources: {}, tagParseLog };
         }
         // Find the minimal set of root graphs
         const rootNodes = (0, persist_utils_1.minimalBuildGraph)(allDeps);
@@ -952,7 +953,7 @@ class Model {
         for (const [connectionName, nodes] of graphsByConnection) {
             graphs.push({ connectionName, nodes: [nodes] });
         }
-        return { graphs, sources: sourcesMap };
+        return { graphs, sources: sourcesMap, tagParseLog };
     }
 }
 exports.Model = Model;

package/dist/model/persist_utils.d.ts

@@ -1,4 +1,5 @@
 import type { ModelDef, SourceDef, Query } from './malloy_types';
+import type { LogMessage } from '../lang';
 import type { BuildNode } from '../api/foundation/types';
 /**
  * Find persistent dependencies for a source or query, returning a nested DAG.
@@ -30,7 +31,7 @@ import type { BuildNode } from '../api/foundation/types';
  * @param modelDef The model definition containing the source registry
  * @returns Array of BuildNode representing the persistent dependency DAG
  */
-export declare function findPersistentDependencies(root: SourceDef | Query, modelDef: ModelDef): BuildNode[];
+export declare function findPersistentDependencies(root: SourceDef | Query, modelDef: ModelDef, tagParseLog?: LogMessage[]): BuildNode[];
 /**
  * Find the minimal set of root build graphs from a forest of BuildNodes.
  *

package/dist/model/persist_utils.js

@@ -18,24 +18,33 @@ function resolveSource(modelDef, name) {
 }
 /**
  * Check if a source has the #@ persist annotation.
+ * Returns both the persist flag and any tag parse errors.
  */
 function checkPersistAnnotation(source) {
     if (!source.annotation)
-        return false;
-    const { tag } = (0, annotation_1.annotationToTag)(source.annotation, { prefix: /^#@ / });
-    return tag.has('persist');
+        return { persist: false, log: [] };
+    const { tag, log } = (0, annotation_1.annotationToTag)(source.annotation, { prefix: /^#@ / });
+    return { persist: tag.has('persist'), log };
 }
 /**
  * Check if a sourceID is persistent, using lazy evaluation and caching.
  * Sets the persist flag on the registry entry as a side effect.
+ * Appends any tag parse errors to the provided log array.
  */
-function isPersistent(sourceID, modelDef) {
+function isPersistent(sourceID, modelDef, tagParseLog) {
     const value = modelDef.sourceRegistry[sourceID];
     if (!value)
         return false;
     if (value.persist === undefined) {
         const sourceDef = (0, source_def_utils_1.resolveSourceID)(modelDef, sourceID);
-        value.persist = sourceDef ? checkPersistAnnotation(sourceDef) : false;
+        if (sourceDef) {
+            const result = checkPersistAnnotation(sourceDef);
+            value.persist = result.persist;
+            tagParseLog.push(...result.log);
+        }
+        else {
+            value.persist = false;
+        }
     }
     return value.persist;
 }
@@ -69,7 +78,7 @@ function isPersistent(sourceID, modelDef) {
  * @param modelDef The model definition containing the source registry
  * @returns Array of BuildNode representing the persistent dependency DAG
  */
-function findPersistentDependencies(root, modelDef) {
+function findPersistentDependencies(root, modelDef, tagParseLog = []) {
     const visited = new Set();
     function processSourceID(sourceID) {
         if (visited.has(sourceID)) {
@@ -81,7 +90,7 @@ function findPersistentDependencies(root, modelDef) {
             return [];
         }
         const childDeps = processSourceDef(sourceDef);
-        const persistent = isPersistent(sourceID, modelDef);
+        const persistent = isPersistent(sourceID, modelDef, tagParseLog);
         if (persistent) {
             return [{ sourceID, dependsOn: childDeps }];
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.347";
+export declare const MALLOY_VERSION = "0.0.349";

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

package/package.json

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