@malloy-publisher/server 0.10.2 → 0.10.4

package/dist/app/index.html

@@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT
          href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap"
       />
       <title>Malloy Publisher</title>
-     <script type="module" crossorigin src="/assets/index-iyvwQg3j.js"></script>
+     <script type="module" crossorigin src="/assets/index-CGKV9Dxi.js"></script>
      <link rel="stylesheet" crossorigin href="/assets/index-DUqldpo0.css">
    </head>
    <body>

package/dist/instrumentation.mjs

@@ -164831,7 +164831,7 @@ var init_telemetry = __esm(() => {
 });
 
 // package.json
-var version = "0.10.2";
+var version = "0.10.4";
 var init_package = () => {};
 
 // src/version.ts

package/dist/package_load_worker.mjs

@@ -22216,7 +22216,7 @@ async function compileSynthesizedPreaggregation(args) {
   const { runtime, importBaseURL } = await args.getRuntime(new Map([[synthesizedURL.href, text]]));
   const materializer = runtime.loadModel(synthesizedURL, { importBaseURL });
   const model = await materializer.getModel();
-  return { plans, model, materializer, text };
+  return { plans, model, materializer, runtime, text };
 }
 async function tryCompileSynthesizedPreaggregation(args) {
   try {
@@ -23215,27 +23215,47 @@ function composeDeclaredQueryMetadata(layers) {
   const resolved = Object.assign({}, ...ordered);
   return Object.keys(resolved).length > 0 ? resolved : null;
 }
-function flattenDependsOn(node) {
-  return node.dependsOn.map((d) => d.sourceID);
-}
-function* iterGraphSources(graph, sources) {
-  const seen = new Set;
-  function* visit(node) {
-    if (seen.has(node.sourceID))
-      return;
-    for (const dep of node.dependsOn) {
-      yield* visit(dep);
+function sourceBuildOf(build, unbuildable) {
+  const order = [];
+  const dependsOn = {};
+  for (const target of build.targets) {
+    const reads = target.dependsOn.flatMap((t) => t.sources.map((s) => s.sourceID));
+    for (const source of target.sources) {
+      order.push(source.sourceID);
+      dependsOn[source.sourceID] = reads;
     }
-    seen.add(node.sourceID);
-    const source = sources[node.sourceID];
+  }
+  for (const { source } of unbuildable) {
+    if (source.connectionName !== build.connectionName)
+      continue;
+    order.push(source.sourceID);
+    dependsOn[source.sourceID] = [];
+  }
+  return { connectionName: build.connectionName, order, dependsOn };
+}
+function sourceBuildsOf(targets) {
+  const builds = targets.connections.map((c) => sourceBuildOf(c, targets.unbuildable));
+  const planned = new Set(builds.map((b) => b.connectionName));
+  for (const { source } of targets.unbuildable) {
+    if (planned.has(source.connectionName))
+      continue;
+    planned.add(source.connectionName);
+    builds.push(sourceBuildOf({ connectionName: source.connectionName, targets: [] }, targets.unbuildable));
+  }
+  return builds;
+}
+function plannedSources(targets) {
+  return [
+    ...targets.connections.flatMap((c) => c.targets.flatMap((t) => t.sources)),
+    ...targets.unbuildable.map((u) => u.source)
+  ];
+}
+function* sourcesInBuildOrder(build, sources) {
+  for (const sourceID of build.order) {
+    const source = sources[sourceID];
     if (source)
       yield source;
   }
-  for (const level of graph.nodes) {
-    for (const node of level) {
-      yield* visit(node);
-    }
-  }
 }
 function computeSourceEntityId(source, connectionDigests) {
   return source.makeBuildId(connectionDigests[source.connectionName], addressPartitionLayout(source, source.getSQL()));
@@ -23324,7 +23344,7 @@ async function classifyPersistSourceGate(persistSource, modelDef, materializer,
 }
 function emptyBuildPlanParts() {
   return {
-    graphs: [],
+    builds: [],
     sources: {},
     sourceModelPaths: {},
     droppedPersistSources: [],
@@ -23333,7 +23353,7 @@ function emptyBuildPlanParts() {
   };
 }
 function mergeBuildPlanParts(into, from) {
-  into.graphs.push(...from.graphs);
+  into.builds.push(...from.builds);
   Object.assign(into.sources, from.sources);
   Object.assign(into.sourceModelPaths, from.sourceModelPaths);
   into.droppedPersistSources.push(...from.droppedPersistSources);
@@ -23341,7 +23361,14 @@ function mergeBuildPlanParts(into, from) {
   Object.assign(into.sourceGateOutcomes, from.sourceGateOutcomes);
 }
 async function collectModelBuildPlan(parts, args) {
-  const { modelPath, packagePath, materializer, malloyModel, getRuntime } = args;
+  const {
+    modelPath,
+    packagePath,
+    materializer,
+    malloyModel,
+    runtime,
+    getRuntime
+  } = args;
   const synthesized = args.synthesized !== undefined ? args.synthesized : await tryCompileSynthesizedPreaggregation({
     packagePath,
     modelPath,
@@ -23349,14 +23376,14 @@ async function collectModelBuildPlan(parts, args) {
     contents: malloyModel._modelDef?.contents ?? {}
   });
   if (synthesized) {
-    const rollupPlan = synthesized.model.getBuildPlan();
-    const rollupNames = new Set(synthesized.plans.map((p) => p.rollupSourceName));
-    parts.graphs.push(...rollupPlan.graphs);
+    const rollupTargets = await synthesized.runtime.getBuildTargets(synthesized.model);
+    parts.builds.push(...sourceBuildsOf(rollupTargets));
     const planByName = new Map(synthesized.plans.map((p) => [p.rollupSourceName, p]));
     let rollupClassificationCtx;
-    for (const [sourceID, source] of Object.entries(rollupPlan.sources)) {
-      if (!rollupNames.has(source.name))
+    for (const source of plannedSources(rollupTargets)) {
+      if (!planByName.has(source.name))
         continue;
+      const sourceID = source.sourceID;
       parts.sources[sourceID] = source;
       parts.sourceModelPaths[sourceID] = modelPath;
       const rollup = planByName.get(source.name);
@@ -23375,23 +23402,25 @@ async function collectModelBuildPlan(parts, args) {
   const modelTag = malloyModel.modelAnnotations.parseAsTag("!").tag;
   if (!modelTag.has("experimental", "persistence"))
     return;
-  const buildPlan = malloyModel.getBuildPlan();
-  for (const msg of buildPlan.tagParseLog) {
+  const targets = await runtime.getBuildTargets(malloyModel);
+  for (const msg of targets.tagParseLog) {
     logger.warn("Persist annotation issue", {
       modelPath,
       message: msg.message,
       severity: msg.severity
     });
   }
-  const recognizedNames = new Set(Object.values(buildPlan.sources).map((s) => s.name));
+  const planned = plannedSources(targets);
+  const recognizedNames = new Set(planned.map((s) => s.name));
   for (const name of detectDroppedPersistSources(malloyModel, recognizedNames)) {
     parts.droppedPersistSources.push({ name, modelPath });
   }
-  if (buildPlan.graphs.length === 0)
+  if (planned.length === 0)
     return;
-  parts.graphs.push(...buildPlan.graphs);
+  parts.builds.push(...sourceBuildsOf(targets));
   let classificationCtx;
-  for (const [sourceID, source] of Object.entries(buildPlan.sources)) {
+  for (const source of planned) {
+    const sourceID = source.sourceID;
     parts.sources[sourceID] = source;
     parts.sourceModelPaths[sourceID] = modelPath;
     if (!classificationCtx) {
@@ -23404,28 +23433,30 @@ async function collectModelBuildPlan(parts, args) {
     parts.sourceGateOutcomes[sourceID] = await classifyPersistSourceGate(source, classificationCtx.modelDef, materializer, classificationCtx.deps, modelPath);
   }
 }
-async function resolveConnectionDigests(connections, graphs, onSkipped) {
+async function resolveConnectionDigests(connections, builds, onSkipped) {
   const connectionDigests = {};
-  for (const graph of graphs) {
-    const conn = connections.get(graph.connectionName);
+  for (const build of builds) {
+    const conn = connections.get(build.connectionName);
     if (!conn) {
-      onSkipped(graph.connectionName);
+      onSkipped(build.connectionName);
       continue;
     }
-    if (!connectionDigests[graph.connectionName]) {
-      connectionDigests[graph.connectionName] = await conn.getDigest();
+    if (!connectionDigests[build.connectionName]) {
+      connectionDigests[build.connectionName] = await conn.getDigest();
     }
   }
   return connectionDigests;
 }
-function deriveBuildPlan(graphs, sources, connectionDigests, sourceNames, sourceModelPaths, packageMaterialization, options) {
+function deriveBuildPlan(builds, sources, connectionDigests, sourceNames, sourceModelPaths, packageMaterialization, options) {
   const include = sourceNames ? new Set(sourceNames) : null;
-  const wireGraphs = graphs.map((graph) => ({
-    connectionName: graph.connectionName,
-    nodes: graph.nodes.map((level) => level.map((node) => ({
-      sourceID: node.sourceID,
-      dependsOn: flattenDependsOn(node)
-    })))
+  const wireGraphs = builds.map((build) => ({
+    connectionName: build.connectionName,
+    nodes: [
+      build.order.map((sourceID) => ({
+        sourceID,
+        dependsOn: build.dependsOn[sourceID] ?? []
+      }))
+    ]
   }));
   const wireSources = {};
   const refusedSources = {};
@@ -23514,7 +23545,7 @@ function deriveBuildPlan(graphs, sources, connectionDigests, sourceNames, source
 function deriveBuildPlanOutcome(compiled, materializationConfig) {
   const droppedPersistSources = compiled.droppedPersistSources ?? [];
   const incrementalDeclarations = collectIncrementalDeclarations(compiled.sources);
-  const plan = compiled.graphs.length === 0 ? null : deriveBuildPlan(compiled.graphs, compiled.sources, compiled.connectionDigests, undefined, compiled.sourceModelPaths, materializationConfig, {
+  const plan = compiled.builds.length === 0 ? null : deriveBuildPlan(compiled.builds, compiled.sources, compiled.connectionDigests, undefined, compiled.sourceModelPaths, materializationConfig, {
     preaggregatePlans: compiled.preaggregatePlans,
     sourceGateOutcomes: compiled.sourceGateOutcomes
   });
@@ -24474,6 +24505,7 @@ async function compileMalloyModel(job, malloyConfig, modelPath, load) {
     modelPath,
     materializer: mm,
     model: compiled,
+    runtime,
     importBaseURL,
     queries,
     sources
@@ -24559,6 +24591,7 @@ async function prepareForMainThread(job, malloyConfig, load, model) {
         packagePath: job.packagePath,
         materializer,
         malloyModel: model.model,
+        runtime: model.runtime,
         getRuntime: companionRuntime,
         synthesized: companion
       });
@@ -24798,8 +24831,8 @@ async function finishWorkerBuildPlan(malloyConfig, modelPaths, load, materializa
     }
     const connections = await resolvePackageConnections({
       getMalloyConnection: (name) => malloyConfig.connections.lookupConnection(name)
-    }, parts.graphs.map((g) => g.connectionName));
-    const connectionDigests = await resolveConnectionDigests(connections, parts.graphs, (name) => digestSkipped.push(name));
+    }, parts.builds.map((b) => b.connectionName));
+    const connectionDigests = await resolveConnectionDigests(connections, parts.builds, (name) => digestSkipped.push(name));
     const outcome = deriveBuildPlanOutcome({ ...parts, connectionDigests }, materializationConfig);
     return {
       ok: true,