@malloy-publisher/server 0.9.9 → 0.9.11

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-BK0mbcyQ.js"></script>
+     <script type="module" crossorigin src="/assets/index-gQEuz0Cg.js"></script>
      <link rel="stylesheet" crossorigin href="/assets/index-DUqldpo0.css">
    </head>
    <body>

package/dist/package_load_worker.mjs

@@ -20619,6 +20619,12 @@ function ownLevelNoteTexts(annote) {
 function ownLevelNotes(annote) {
   return [...annote?.blockNotes ?? [], ...annote?.notes ?? []];
 }
+function sameNotePosition(a, b) {
+  return a.url === b.url && a.range.start.line === b.range.start.line && a.range.start.character === b.range.start.character && a.range.end.line === b.range.end.line && a.range.end.character === b.range.end.character;
+}
+function notePositionKey(at) {
+  return `${at.url}#${at.range.start.line}:${at.range.start.character}-${at.range.end.line}:${at.range.end.character}`;
+}
 
 // src/service/notebook.ts
 var ARTIFACT_NOTE = {
@@ -21071,7 +21077,7 @@ ${body}`;
   if (artifactAt < 0) {
     return refuse({
       line: 1,
-      message: "Line 1: this notebook has no ## artifact note, so its header cannot be told from its cells. Fix: add `## artifact { layout=linear }` after the ##! line."
+      message: "Line 1: this notebook has no ## artifact note, so its header cannot be told from its cells. Fix: add `## artifact { layout=linear tiles=[…] }` after the ##! line."
     });
   }
   const runCount = items.filter((item) => item.kind === "statement" && item.run).length;
@@ -21271,12 +21277,14 @@ function readReportTag(modelNotes) {
   const kind = tagText(artifact, "kind");
   if (kind !== undefined)
     return { status: "kind-removed", kind };
-  const layout = parseLayoutValue(tagText(artifact, "layout"));
-  if (layout)
-    return { status: "report", layout, decidedBy: "layout" };
-  if (artifact.has("tiles") || tags?.tag("dashboard") !== undefined)
-    return { status: "report", layout: "grid", decidedBy: "tiles" };
-  return { status: "report", layout: "linear", decidedBy: "default" };
+  const hasTiles = artifact.has("tiles");
+  if (hasTiles && artifact.array("tiles") === undefined)
+    return { status: "unparsed" };
+  const declared = tagText(artifact, "layout");
+  const layout = parseLayoutValue(declared) ?? (hasTiles || tags?.tag("dashboard") !== undefined ? "grid" : "linear");
+  if (layout === "linear" && !hasTiles)
+    return declared !== undefined && parseLayoutValue(declared) === undefined ? { status: "cells-removed", unknownLayout: declared } : { status: "cells-removed" };
+  return { status: "report", layout };
 }
 function readReportTagOfText(text) {
   return readReportTag(modelNotesOfText(text));
@@ -23480,6 +23488,9 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
   const authorizeMap = new Map;
   const misplacedAuthorize = [];
   const gatedSourceOwnAuthorizeNotes = new Set;
+  const gatedSourceOwnAuthorizeNoteKeys = new Set;
+  const noteKey = (note) => `${notePositionKey(note.at)}#${note.text}`;
+  const isGatedSourceOwnNote = (note) => gatedSourceOwnAuthorizeNotes.has(note) || gatedSourceOwnAuthorizeNoteKeys.has(noteKey(note));
   const authorizeNoteDeclaredBy = new Map;
   const nearMissAuthorize = [];
   const sweptStructs = [];
@@ -23491,6 +23502,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(struct.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
+        gatedSourceOwnAuthorizeNoteKeys.add(noteKey(note));
         considerNoteOwner(authorizeNoteDeclaredBy, note, struct);
       }
     }
@@ -23509,6 +23521,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
     for (const note of ownLevelNotes(entry.annotations)) {
       if (containsAuthorizeAnnotationTag([note.text])) {
         gatedSourceOwnAuthorizeNotes.add(note);
+        gatedSourceOwnAuthorizeNoteKeys.add(noteKey(note));
         considerNoteOwner(authorizeNoteDeclaredBy, note, entry);
       }
     }
@@ -23607,7 +23620,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
       const fieldAuthorizeNotes = ownLevelNotes(field.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
       if (fieldAuthorizeNotes.length === 0)
         continue;
-      if (fieldAuthorizeNotes.every((note) => gatedSourceOwnAuthorizeNotes.has(note))) {
+      if (fieldAuthorizeNotes.every(isGatedSourceOwnNote)) {
         continue;
       }
       const fieldName = field.as || field.name;
@@ -23715,6 +23728,11 @@ function readGivenControlSpec(annotationTexts2) {
   }
   return spec;
 }
+function givenDeclaresNoDefault(given) {
+  const loose = given;
+  const parsed = "default" in loose ? loose.default : loose._internal?.default;
+  return parsed === undefined && loose._internal?.defaultText === undefined;
+}
 function malloyGivenToApi(given) {
   const type = given.type;
   const renderedType = type.type === "filter expression" ? `filter<${type.filterType}>` : type.type === "array" && type.elementTypeDef?.type ? `${type.elementTypeDef.type}[]` : type.type;
@@ -23725,7 +23743,8 @@ function malloyGivenToApi(given) {
     annotations: allNotes.filter((note) => !isReservedRoute(note.route) && note.route !== MARKDOWN_ROUTE).map((note) => note.text),
     ...readGivenControlSpec(allNotes.map((note) => note.text)),
     ...allNotes.some((note) => note.route === "secure") && { secure: true },
-    default: given._internal?.defaultText
+    default: given._internal?.defaultText,
+    ...givenDeclaresNoDefault(given) && { required: true }
   };
 }
 function collectGivenRefs(value, into) {
@@ -26370,7 +26389,13 @@ async function prepareForMainThread(job, malloyConfig, load, model) {
   const pastDeadline = () => performance.now() >= load.softDeadline;
   const { modelPath, materializer, importBaseURL } = model;
   const renderTagResults = [];
-  for (const target of renderTagTargets(model.queries, model.sources)) {
+  const targets = renderTagTargets(model.queries, model.sources);
+  if (targets.length > 0 && !load.failed && !pastDeadline()) {
+    try {
+      model.model.queryModel;
+    } catch {}
+  }
+  for (const target of targets) {
     if (load.failed || pastDeadline())
       break;
     try {
@@ -26408,8 +26433,7 @@ async function prepareForMainThread(job, malloyConfig, load, model) {
     contents: model.model._modelDef.contents,
     getRuntime: companionRuntime
   }) ?? null : undefined;
-  if (wantsPlan && (load.planLeftToMainThread || pastDeadline())) {
-    load.planLeftToMainThread = true;
+  if (wantsPlan && load.planLeftToMainThread) {
     wantsPlan = false;
   }
   if (wantsPlan && companion !== undefined && !load.failed) {