@malloy-publisher/server 0.0.246 → 0.0.247

package/dist/package_load_worker.mjs

@@ -11887,11 +11887,19 @@ import { Annotations } from "@malloydata/malloy";
 function isReservedRoute(route) {
   return route === "" || !/[\p{L}\p{N}]/u.test(route);
 }
+function ownModelAnnotations(modelDef) {
+  return foldModelAnnotations(modelDef, (id) => id === modelDef.modelID || id.startsWith("internal://"));
+}
 function modelAnnotations(modelDef) {
+  return foldModelAnnotations(modelDef, () => true);
+}
+function foldModelAnnotations(modelDef, admits) {
   const registry = modelDef.modelAnnotations ?? {};
   const visited = new Set;
   const order = [];
   const visit = (id) => {
+    if (!admits(id))
+      return;
     if (visited.has(id))
       return;
     visited.add(id);
@@ -12328,6 +12336,48 @@ function resolvePackageScope(rootRaw, materializationRaw) {
   return { scope: envelopeScope, warnings: [] };
 }
 var SCOPE_ROOT_DEPRECATION = `"scope" at the manifest root is deprecated: declare it as ` + `"materialization": { "scope": ... } alongside the other build knobs. The ` + `root form still works and will be removed in a future release; until then ` + `the server keeps both homes in sync when it writes the manifest, so an ` + `older publisher still reads the right value.`;
+function resolvePackageQueryMetadata(rootRaw, materializationRaw) {
+  const envelopeRaw = materializationRaw && typeof materializationRaw === "object" ? materializationRaw.queryMetadata : undefined;
+  const rootDeclared = rootRaw !== undefined && rootRaw !== null;
+  const envelopeDeclared = envelopeRaw !== undefined && envelopeRaw !== null;
+  if (rootDeclared && envelopeDeclared) {
+    if (sameQueryMetadataBag(rootRaw, envelopeRaw)) {
+      return { queryMetadata: rootRaw, home: "root", warnings: [] };
+    }
+    return {
+      queryMetadata: rootRaw,
+      home: "root",
+      warnings: [QUERY_METADATA_CONFLICT]
+    };
+  }
+  if (envelopeDeclared) {
+    return {
+      queryMetadata: envelopeRaw,
+      home: "envelope",
+      warnings: [QUERY_METADATA_ENVELOPE_DEPRECATION]
+    };
+  }
+  return { queryMetadata: rootRaw, home: "root", warnings: [] };
+}
+function sameQueryMetadataBag(a, b) {
+  return keySortedJson(a) === keySortedJson(b);
+}
+function keySortedJson(value) {
+  if (value === null || typeof value !== "object") {
+    return JSON.stringify(value) ?? "undefined";
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map(keySortedJson).join(",")}]`;
+  }
+  const entries = Object.entries(value).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
+  return `{${entries.map(([name, nested]) => `${JSON.stringify(name)}:${keySortedJson(nested)}`).join(",")}}`;
+}
+var QUERY_METADATA_HOME_LABELS = {
+  root: "queryMetadata",
+  envelope: "materialization.queryMetadata"
+};
+var QUERY_METADATA_ENVELOPE_DEPRECATION = `"queryMetadata" inside "materialization" is deprecated: declare it at the ` + `manifest root instead. It is not a build setting — the properties ride ` + `every statement the package's sources issue, including served queries. The ` + `enveloped form still works and will be removed in a future release; until ` + `then the server keeps both homes in sync when it writes the manifest, so an ` + `older publisher still reads the right value.`;
+var QUERY_METADATA_CONFLICT = `Conflicting "queryMetadata" in publisher.json: the manifest root and ` + `"materialization.queryMetadata" declare different bags, and the root wins. ` + `Delete "materialization": { "queryMetadata": ... } — the server rewrites ` + `both homes on its next manifest write, so an older publisher still reads ` + `the right value.`;
 function parseFreshness(raw) {
   if (!raw || typeof raw !== "object") {
     return null;
@@ -12342,7 +12392,7 @@ function parseFreshness(raw) {
   }
   return freshness;
 }
-function parseQueryMetadata(raw) {
+function parseQueryMetadata(raw, label = QUERY_METADATA_HOME_LABELS.envelope) {
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
     return { metadata: null, warnings: [] };
   }
@@ -12352,7 +12402,7 @@ function parseQueryMetadata(raw) {
     if (typeof value === "string") {
       out[name] = value;
     } else {
-      warnings.push(`materialization.queryMetadata: property '${name}' must be a ` + `string (got ${value === null ? "null" : typeof value}); it is ` + `not attached to any statement`);
+      warnings.push(`${label}: property '${name}' must be a ` + `string (got ${value === null ? "null" : typeof value}); it is ` + `not attached to any statement`);
     }
   }
   return {
@@ -12371,12 +12421,18 @@ function parsePackageMaterialization(raw) {
     queryMetadata: parseQueryMetadata(queryMetadata).metadata
   };
 }
-function packageMaterializationWarnings(raw) {
-  if (!raw || typeof raw !== "object") {
-    return [];
-  }
-  const { queryMetadata } = raw;
-  return parseQueryMetadata(queryMetadata).warnings;
+function materializationWithQueryMetadata(parsed, queryMetadataRaw) {
+  const queryMetadata = parseQueryMetadata(queryMetadataRaw).metadata;
+  if (!parsed && !queryMetadata)
+    return null;
+  return {
+    schedule: parsed?.schedule ?? null,
+    freshness: parsed?.freshness ?? null,
+    queryMetadata
+  };
+}
+function queryMetadataParseWarnings(raw, home = "root") {
+  return parseQueryMetadata(raw, QUERY_METADATA_HOME_LABELS[home]).warnings;
 }
 
 // src/package_load/package_load_worker.ts
@@ -12438,9 +12494,9 @@ function newRpcId() {
 }
 function callMain(send) {
   const requestId = newRpcId();
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     pendingRpc.set(requestId, {
-      resolve: (value) => resolve(value),
+      resolve: (value) => resolve2(value),
       reject
     });
     send(requestId);
@@ -12555,18 +12611,21 @@ function serializeFetchOptions(options) {
   }
   return out;
 }
-function makeWorkerUrlReader(jobId) {
+function makeWorkerUrlReader(job) {
   return {
     readURL: async (url) => {
       if (url.protocol === "file:") {
         const filePath = fileURLToPath2(url);
+        if (job.replacement && path2.resolve(filePath) === path2.resolve(job.packagePath, job.replacement.modelPath)) {
+          return job.replacement.source;
+        }
         return fs2.promises.readFile(filePath, "utf8");
       }
       const response = await callMain((requestId) => {
         const req = {
           type: "read-url",
           requestId,
-          jobId,
+          jobId: job.requestId,
           url: url.toString()
         };
         port.postMessage(req);
@@ -12614,9 +12673,11 @@ async function readPackageMetadata(packagePath) {
   const contents = await fs2.promises.readFile(manifestPath, "utf8");
   const parsed = JSON.parse(contents);
   const scope = resolvePackageScope(parsed.scope, parsed.materialization);
+  const queryMetadata = resolvePackageQueryMetadata(parsed.queryMetadata, parsed.materialization);
   const manifestWarnings = [
     ...scope.warnings,
-    ...packageMaterializationWarnings(parsed.materialization)
+    ...queryMetadata.warnings,
+    ...queryMetadataParseWarnings(queryMetadata.queryMetadata, queryMetadata.home)
   ];
   return {
     name: parsed.name,
@@ -12624,7 +12685,7 @@ async function readPackageMetadata(packagePath) {
     explores: Array.isArray(parsed.explores) ? parsed.explores.map(normalizeModelPath) : undefined,
     queryableSources: parsed.queryableSources === "all" ? "all" : "declared",
     manifestLocation: typeof parsed.manifestLocation === "string" ? parsed.manifestLocation : null,
-    materialization: parsePackageMaterialization(parsed.materialization),
+    materialization: materializationWithQueryMetadata(parsePackageMaterialization(parsed.materialization), queryMetadata.queryMetadata),
     scope: scope.scope,
     manifestWarnings: manifestWarnings.length > 0 ? manifestWarnings : undefined
   };
@@ -12675,8 +12736,8 @@ function extractSources(modelDef, givens) {
 function extractQueries(modelDef) {
   return extractQueriesFromModelDef(modelDef);
 }
-function buildRuntimeForModel(job, malloyConfig, jobId) {
-  const urlReader = new HackyDataStylesAccumulator(makeWorkerUrlReader(jobId));
+function buildRuntimeForModel(job, malloyConfig) {
+  const urlReader = new HackyDataStylesAccumulator(makeWorkerUrlReader(job));
   const runtime = new Runtime({
     urlReader,
     config: malloyConfig,
@@ -12692,7 +12753,7 @@ async function compileMalloyModel(job, malloyConfig, modelPath) {
   const fullPath = path2.join(job.packagePath, modelPath);
   const modelURL = pathToFileURL(fullPath);
   const importBaseURL = new URL(".", modelURL);
-  const { runtime, urlReader } = buildRuntimeForModel(job, malloyConfig, job.requestId);
+  const { runtime, urlReader } = buildRuntimeForModel(job, malloyConfig);
   const mm = runtime.loadModel(modelURL, { importBaseURL });
   const compiled = await mm.getModel();
   const modelDef = compiled._modelDef;
@@ -12714,7 +12775,8 @@ async function compileMalloyModel(job, malloyConfig, modelPath) {
     filterMap: Array.from(filterMap.entries()),
     givens,
     dataStyles: urlReader.getHackyAccumulatedDataStyles(),
-    compileDurationMs: performance.now() - compileStart
+    compileDurationMs: performance.now() - compileStart,
+    problems: job.collectProblems ? compiled.problems : undefined
   };
 }
 async function compileNotebookModel(job, malloyConfig, modelPath) {
@@ -12722,7 +12784,7 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
   const fullPath = path2.join(job.packagePath, modelPath);
   const modelURL = pathToFileURL(fullPath);
   const importBaseURL = new URL(".", modelURL);
-  const { runtime, urlReader } = buildRuntimeForModel(job, malloyConfig, job.requestId);
+  const { runtime, urlReader } = buildRuntimeForModel(job, malloyConfig);
   const fileContents = await fs2.promises.readFile(modelURL, "utf8");
   const parse = MalloySQLParser.parse(fileContents, modelPath);
   let mm;
@@ -12799,8 +12861,10 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
   let finalSourceInfos;
   let finalFilterMap;
   let finalGivens;
+  let finalProblems;
   if (mm) {
     const compiled = await mm.getModel();
+    finalProblems = compiled.problems;
     finalModelDef = compiled._modelDef;
     const malloyGivens = Array.from(compiled.givens.values());
     finalGivens = malloyGivens.length > 0 ? malloyGivens.map((g) => malloyGivenToApi(g)) : undefined;
@@ -12825,7 +12889,8 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
     givens: finalGivens,
     notebookCells,
     dataStyles: urlReader.getHackyAccumulatedDataStyles(),
-    compileDurationMs: performance.now() - compileStart
+    compileDurationMs: performance.now() - compileStart,
+    problems: job.collectProblems ? finalProblems : undefined
   };
 }
 async function compileOneModel(job, malloyConfig, modelPath) {
@@ -12859,6 +12924,10 @@ async function loadPackage(job) {
   const malloyConfig = buildWorkerMalloyConfig(job);
   const allFiles = await listPackageFiles(job.packagePath);
   const modelPaths = filterModelPaths(allFiles);
+  const replacementMatchedExisting = job.replacement ? modelPaths.includes(job.replacement.modelPath) : undefined;
+  if (job.replacement && !replacementMatchedExisting) {
+    modelPaths.push(job.replacement.modelPath);
+  }
   const compileRegionStart = performance.now();
   schemaWait.begin(job.requestId);
   const models = await Promise.all(modelPaths.map((modelPath) => compileOneModel(job, malloyConfig, modelPath)));
@@ -12869,6 +12938,7 @@ async function loadPackage(job) {
     requestId: job.requestId,
     packageMetadata,
     models,
+    replacementMatchedExisting,
     loadDurationMs: loadEnd - loadStart,
     timings: {
       compileDurationMs: Math.max(0, loadEnd - compileRegionStart - schemaFetchDurationMs),