@malloy-publisher/server 0.7.0 → 0.8.1

package/dist/package_load_worker.mjs

@@ -12905,6 +12905,8 @@ function internalErrorToHttpError(error) {
     return httpError(422, error.message);
   } else if (error instanceof ModelCompilationError) {
     return httpError(424, error.message);
+  } else if (error instanceof PackageManifestError) {
+    return httpError(424, error.message);
   } else if (error instanceof ConnectionError) {
     if (error.callerSafe) {
       return httpError(502, error.message);
@@ -12945,7 +12947,7 @@ function httpError(code, message, reason) {
     }
   };
 }
-var GENERIC_INTERNAL_MESSAGE = "Internal server error.", GENERIC_UPSTREAM_MESSAGE = "Upstream connection error.", MAX_LOGGED_DETAIL_CHARS = 2000, NotImplementedError, BadRequestError, InvalidArgumentError, CompileRefusedError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, TableNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, WriteConflictError, WriteRolledBackError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
+var GENERIC_INTERNAL_MESSAGE = "Internal server error.", GENERIC_UPSTREAM_MESSAGE = "Upstream connection error.", MAX_LOGGED_DETAIL_CHARS = 2000, NotImplementedError, BadRequestError, InvalidArgumentError, CompileRefusedError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, TableNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, PackageManifestError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, OffSurfaceError, MaterializationNotFoundError, MaterializationConflictError, WriteConflictError, WriteRolledBackError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
 var init_errors = __esm(() => {
   init_constants();
   init_logger();
@@ -13020,6 +13022,12 @@ var init_errors = __esm(() => {
       super(error.message);
     }
   };
+  PackageManifestError = class PackageManifestError extends Error {
+    constructor(message) {
+      super(message);
+      this.name = "PackageManifestError";
+    }
+  };
   MaterializationEligibilityError = class MaterializationEligibilityError extends Error {
     reason;
     constructor(error) {
@@ -13052,6 +13060,12 @@ var init_errors = __esm(() => {
       this.name = "NotQueryableError";
     }
   };
+  OffSurfaceError = class OffSurfaceError extends NotQueryableError {
+    constructor(message) {
+      super(message);
+      this.name = "OffSurfaceError";
+    }
+  };
   MaterializationNotFoundError = class MaterializationNotFoundError extends Error {
     constructor(message) {
       super(message);
@@ -13419,11 +13433,11 @@ function recordAuthorizeBypass(entryPoint) {
   });
   bypassCounter.add(1, { entry_point: entryPoint });
 }
-function recordRowLevelGateDecision(decision) {
+function recordRowLevelGateDecision(decision, site = "entry_point") {
   rowLevelDecisionCounter ??= publisherMeter().createCounter("publisher_authorize_row_level_total", {
-    description: "How a row-level `#(access_filter)` gate resolved a request. Label: decision ('denied_by_gate'|'empty_after_filter'). 'denied_by_gate' is the fail-closed refusal when the gate could not be applied; 'empty_after_filter' is a successful response with zero rows after the filter matched none, which is NOT an error."
+    description: "How a row-level `#(access_filter)` gate resolved a request. Labels: decision ('denied_by_gate'|'empty_after_filter'), site ('entry_point'|'caller_join'). 'denied_by_gate' is the fail-closed refusal when the gate could not be applied; 'empty_after_filter' is a successful response with zero rows after the filter matched none, which is NOT an error. site says whether the gate was the query's own run target or a source the caller's text joined."
   });
-  rowLevelDecisionCounter.add(1, { decision });
+  rowLevelDecisionCounter.add(1, { decision, site });
 }
 function recordRowLevelGateRejected(cause) {
   rowLevelRejectionCounter ??= publisherMeter().createCounter("publisher_authorize_row_level_rejected_total", {
@@ -13437,11 +13451,11 @@ function recordAuthorizeAdmitAllGate(route) {
   });
   admitAllCounter.add(1, { route });
 }
-function recordLockDecision(decision) {
+function recordLockDecision(decision, site = "entry_point") {
   lockDecisionCounter ??= publisherMeter().createCounter("publisher_authorize_lock_total", {
-    description: "How a `#(authorize)` lock resolved a request. Label: decision ('admitted'|'denied_by_lock'|'denied_unresolvable'). Both denials are a 403; 'denied_by_lock' is the gate refusing a caller it does not admit (routine), 'denied_unresolvable' is the fail-closed refusal when the gate could not be decided at all."
+    description: "How a `#(authorize)` lock resolved a request. Labels: decision ('admitted'|'denied_by_lock'|'denied_unresolvable'), site ('entry_point'|'caller_join'). Both denials are a 403; 'denied_by_lock' is the gate refusing a caller it does not admit (routine), 'denied_unresolvable' is the fail-closed refusal when the gate could not be decided at all. site says whether the lock was on the query's own run target or on a source the caller's text joined."
   });
-  lockDecisionCounter.add(1, { decision });
+  lockDecisionCounter.add(1, { decision, site });
 }
 var guardRejectionCounter = null, bypassCounter = null, rowLevelDecisionCounter = null, rowLevelRejectionCounter = null, admitAllCounter = null, lockDecisionCounter = null;
 var init_authorize_metrics = __esm(() => {
@@ -14465,858 +14479,1370 @@ var init_gate_classification = __esm(() => {
   init_gate_registry_walk();
 });
 
-// src/service/filter.ts
-function parseFilterAnnotation(annotation) {
-  const trimmed = annotation.trim();
-  if (!trimmed.startsWith(ANNOTATION_PREFIX)) {
-    return null;
-  }
-  const body = trimmed.slice(ANNOTATION_PREFIX.length).trim();
-  const tokens = tokenize(body);
-  let name;
-  let dimension;
-  let type;
-  let implicit = false;
-  let required = false;
-  for (const token of tokens) {
-    if (token.includes("=")) {
-      const eqIndex = token.indexOf("=");
-      const key = token.slice(0, eqIndex).toLowerCase();
-      const value = token.slice(eqIndex + 1);
-      switch (key) {
-        case "name":
-          name = value;
-          break;
-        case "dimension":
-          dimension = value;
-          break;
-        case "type":
-          if (!VALID_FILTER_TYPES.has(value)) {
-            throw new Error(`Invalid filter type "${value}". Must be one of: ${[...VALID_FILTER_TYPES].join(", ")}`);
-          }
-          type = value;
-          break;
-        default:
-          throw new Error(`Unknown filter parameter "${key}"`);
-      }
+// src/service/motly.ts
+import { parseAnnotation } from "@malloydata/malloy-tag";
+function onMotlyRoute(text) {
+  const afterSigil = text.replace(/^##?\|?/, "");
+  return afterSigil === "" || /^[ \t\r\n]/.test(afterSigil);
+}
+function hasEnvReference(annotation) {
+  return annotation.includes("@env.");
+}
+function pollutionTargets() {
+  const targets = [Object.prototype];
+  for (const key of Object.getOwnPropertyNames(Object.prototype)) {
+    const descriptor = Object.getOwnPropertyDescriptor(Object.prototype, key);
+    if (!descriptor)
+      continue;
+    let value;
+    if ("value" in descriptor) {
+      value = descriptor.value;
     } else {
-      const flag = token.toLowerCase();
-      if (flag === "implicit") {
-        implicit = true;
-      } else if (flag === "required") {
-        required = true;
-      } else {
-        throw new Error(`Unknown filter flag "${token}"`);
+      if (BUILT_IN_PROTO_GETTER === undefined || descriptor.get !== BUILT_IN_PROTO_GETTER) {
+        return;
       }
+      continue;
+    }
+    if ((typeof value === "object" || typeof value === "function") && value !== null && !targets.includes(value)) {
+      targets.push(value);
     }
   }
-  if (!dimension) {
-    throw new Error("filter annotation missing required 'dimension' parameter");
-  }
-  if (!type) {
-    throw new Error("filter annotation missing required 'type' parameter");
-  }
-  return {
-    name: name ?? dimension,
-    dimension,
-    type,
-    implicit,
-    required
-  };
+  return targets;
 }
-function parseFilters(annotations) {
-  const byName = new Map;
-  for (const annotation of annotations) {
-    const parsed = parseFilterAnnotation(annotation);
-    if (parsed) {
-      byName.set(parsed.name, parsed);
+function parseGuarded(texts) {
+  const targets = pollutionTargets();
+  if (targets === undefined) {
+    return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
+  }
+  let unreadable = false;
+  const ownNames = (target) => {
+    try {
+      return Object.getOwnPropertyNames(target);
+    } catch {
+      unreadable = true;
+      return [];
     }
+  };
+  const before = targets.map(ownNames);
+  if (unreadable)
+    return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
+  const undoPollution = () => {
+    let polluted = false;
+    targets.forEach((target, index) => {
+      for (const key of ownNames(target)) {
+        if (before[index].includes(key))
+          continue;
+        polluted = true;
+        try {
+          delete target[key];
+        } catch {}
+      }
+    });
+    return polluted || unreadable;
+  };
+  if (texts.some((text) => text.length > MAX_ANNOTATION_CHARS)) {
+    return { tag: undefined, messages: [ANNOTATION_TOO_LONG] };
+  }
+  try {
+    const result = parseAnnotation([...texts]);
+    if (undoPollution())
+      return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
+    return {
+      tag: result.tag,
+      messages: result.log.map((error) => error.message)
+    };
+  } catch {
+    undoPollution();
+    return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
   }
-  return [...byName.values()];
-}
-function escapeMalloyString(value) {
-  return value.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
 }
-function isBooleanLiteral(v) {
-  const lower = v.toLowerCase();
-  return lower === "true" || lower === "false";
+function docCommentText(texts) {
+  const lines = texts.filter((text) => /^##?\|?"([ \t\r\n]|$)/.test(text)).map((text) => text.replace(/^##?\|?"[ \t\r\n]?/, "").trimEnd());
+  return lines.some((text) => text.trim().length > 0) ? lines.join(`
+`) : undefined;
 }
-function isDateLiteral(v) {
-  return ISO_DATE_RE.test(v) || ISO_TIMESTAMP_RE.test(v);
+function splitDocComment(texts) {
+  const text = docCommentText(texts);
+  if (text === undefined)
+    return {};
+  const lines = text.split(`
+`);
+  const titleLine = lines.findIndex((line) => line.trim().length > 0);
+  if (titleLine === -1)
+    return {};
+  const body = lines.slice(titleLine + 1).join(`
+`).replace(/^[ \t\r\n]+/, "").trimEnd();
+  return {
+    title: lines[titleLine].trim(),
+    body: body.length > 0 ? body : undefined
+  };
 }
-function malloyLiteral(v) {
-  if (isBooleanLiteral(v)) {
-    return v.toLowerCase();
-  }
-  if (isDateLiteral(v)) {
-    return `@${v.slice(0, 10)}`;
+function docCommentTitleAndDescription(texts, explicitTitle) {
+  if (explicitTitle !== undefined) {
+    return { title: explicitTitle, description: docCommentText(texts) };
   }
-  return `'${escapeMalloyString(v)}'`;
+  const { title, body } = splitDocComment(texts);
+  return { title, description: body };
 }
-function buildPredicate(filter, value) {
-  const dim = `\`${filter.dimension}\``;
-  switch (filter.type) {
-    case "equal": {
-      const v = Array.isArray(value) ? value[0] : value;
-      return `${dim} = ${malloyLiteral(v)}`;
+function quoteFilterLiterals(annotation) {
+  const VALUE_START = /[=[,]/;
+  const BARE_FILTER_LITERAL = /^([ \t]*)f(['"])((?:\\.|(?!\2)[^\\])*)\2/;
+  let out = "";
+  let i = 0;
+  while (i < annotation.length) {
+    const char = annotation[i];
+    const delimited = endOfDelimited(annotation, i);
+    if (delimited > i) {
+      out += annotation.slice(i, delimited);
+      i = delimited;
+      continue;
     }
-    case "in": {
-      const values = Array.isArray(value) ? value : [value];
-      if (values.length === 1) {
-        return `${dim} = ${malloyLiteral(values[0])}`;
+    if (VALUE_START.test(char)) {
+      const match = BARE_FILTER_LITERAL.exec(annotation.slice(i + 1));
+      if (match) {
+        const body = match[3].replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+        out += `${char}${match[1]}"f'${body}'"`;
+        i += 1 + match[0].length;
+        continue;
       }
-      const conditions = values.map((v) => `${dim} = ${malloyLiteral(v)}`);
-      return `(${conditions.join(" or ")})`;
-    }
-    case "like": {
-      const v = Array.isArray(value) ? value[0] : value;
-      const escaped = escapeMalloyString(v.toLowerCase());
-      const pattern = escaped.startsWith("%") || escaped.endsWith("%") ? escaped : `%${escaped}%`;
-      return `lower(${dim}) ~ '${pattern}'`;
-    }
-    case "greater_than": {
-      const v = Array.isArray(value) ? value[0] : value;
-      return `${dim} > ${malloyLiteral(v)}`;
-    }
-    case "less_than": {
-      const v = Array.isArray(value) ? value[0] : value;
-      return `${dim} < ${malloyLiteral(v)}`;
     }
+    out += char;
+    i += 1;
   }
+  return out;
 }
-function buildFilterClause(filters, params) {
-  const predicates = [];
-  for (const filter of filters) {
-    const value = params[filter.name];
-    const hasValue = value !== undefined && value !== null && (Array.isArray(value) ? value.length > 0 : value !== "");
-    if (!hasValue) {
-      if (filter.required) {
-        throw new FilterValidationError(`Required filter "${filter.name}" (dimension: ${filter.dimension}) was not provided`);
+function endOfDelimited(text, start) {
+  const char = text[start];
+  if (char === "`") {
+    let i = start + 1;
+    while (i < text.length) {
+      if (text[i] === "\\") {
+        i += 2;
+        continue;
       }
-      continue;
+      if (text[i] === "`")
+        return i + 1;
+      if (text[i] === `
+`)
+        return text.length;
+      i += 1;
     }
-    predicates.push(buildPredicate(filter, value));
-  }
-  if (predicates.length === 0) {
-    return "";
-  }
-  return predicates.join(" and ");
-}
-function injectFilterRefinement(query, filterClause) {
-  if (!filterClause) {
-    return query;
+    return text.length;
   }
-  return `${query.trimEnd()}
-+ {where: ${filterClause}}`;
-}
-function tokenize(input) {
-  const tokens = [];
-  let current = "";
-  let inQuote = false;
-  let quoteChar = "";
-  for (const ch of input) {
-    if (inQuote) {
-      if (ch === quoteChar) {
-        inQuote = false;
-      } else {
-        current += ch;
+  if (text.startsWith("<<<", start)) {
+    let lineStart = start + 3;
+    for (;; ) {
+      const newline = text.indexOf(`
+`, lineStart);
+      const lineEnd = newline === -1 ? text.length : newline;
+      if (text.slice(lineStart, lineEnd).trim() === ">>>")
+        return lineEnd;
+      if (newline === -1)
+        return text.length;
+      lineStart = newline + 1;
+    }
+  }
+  if (char === '"' || char === "'") {
+    const triple = char.repeat(3);
+    if (text.startsWith(triple, start)) {
+      let i2 = start + triple.length;
+      while (i2 < text.length) {
+        if (text[i2] === "\\") {
+          i2 += 2;
+          continue;
+        }
+        if (text.startsWith(triple, i2))
+          return i2 + triple.length;
+        i2 += 1;
       }
-    } else if (ch === '"' || ch === "'") {
-      inQuote = true;
-      quoteChar = ch;
-    } else if (ch === " " || ch === "\t") {
-      if (current) {
-        tokens.push(current);
-        current = "";
+      return text.length;
+    }
+    let i = start + 1;
+    while (i < text.length) {
+      if (text[i] === "\\") {
+        i += 2;
+        continue;
       }
-    } else {
-      current += ch;
+      if (text[i] === char)
+        return i + 1;
+      if (text[i] === `
+`)
+        return i;
+      i += 1;
     }
+    return text.length;
   }
-  if (current) {
-    tokens.push(current);
+  return start;
+}
+function unwrapFilterLiteral(value) {
+  const match = /^f(['"])([\s\S]*)\1$/.exec(value);
+  return match ? match[2] : value;
+}
+function parseMotly(texts) {
+  const onRoute = texts.filter(onMotlyRoute);
+  const motly = onRoute.filter((text) => !hasEnvReference(text));
+  const envDropped = onRoute.length - motly.length;
+  const envErrors = envDropped > 0 ? [ENV_REFERENCE_DROPPED] : [];
+  if (motly.length === 0)
+    return { tag: undefined, errors: envErrors };
+  const direct = parseGuarded(motly);
+  if (direct.messages.length === 0)
+    return { tag: direct.tag, errors: envErrors };
+  const rescued = motly.map((text) => {
+    if (parseGuarded([text]).messages.length === 0)
+      return text;
+    const rewritten = quoteFilterLiterals(text);
+    return parseGuarded([rewritten]).messages.length === 0 ? rewritten : text;
+  });
+  const after = parseGuarded(rescued);
+  return { tag: after.tag, errors: [...envErrors, ...after.messages] };
+}
+function tagText(tag, ...path) {
+  try {
+    return tag?.text(...path);
+  } catch {
+    return;
   }
-  return tokens;
 }
-var VALID_FILTER_TYPES, ANNOTATION_PREFIX = "#(filter)", ISO_DATE_RE, ISO_TIMESTAMP_RE, FilterValidationError;
-var init_filter = __esm(() => {
-  VALID_FILTER_TYPES = new Set([
-    "equal",
-    "in",
-    "like",
-    "greater_than",
-    "less_than"
-  ]);
-  ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
-  ISO_TIMESTAMP_RE = /^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}/;
-  FilterValidationError = class FilterValidationError extends Error {
-    constructor(message) {
-      super(message);
-      this.name = "FilterValidationError";
-    }
-  };
+function tagNumeric(tag, ...path) {
+  try {
+    const raw = tagText(tag, ...path);
+    if (raw === undefined)
+      return;
+    const DECIMAL = /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?$/;
+    const text = raw.trim();
+    if (!DECIMAL.test(text))
+      return;
+    const value = Number(text);
+    return Number.isFinite(value) ? value : undefined;
+  } catch {
+    return;
+  }
+}
+function motlyTag(texts) {
+  return parseMotly(texts).tag;
+}
+function motlyParseErrors(texts) {
+  return parseMotly(texts).errors;
+}
+function readAutorun(tag) {
+  return tagText(tag, "autorun") !== "false";
+}
+function scalarTypeOf(tag) {
+  try {
+    return tag?.scalarType();
+  } catch {
+    return;
+  }
+}
+function authoredDay(isoText) {
+  const value = new Date(isoText);
+  if (Number.isNaN(value.getTime()))
+    return isoText.slice(0, 10);
+  const atUtcMidnight = value.getUTCHours() === 0 && value.getUTCMinutes() === 0 && value.getUTCSeconds() === 0 && value.getUTCMilliseconds() === 0;
+  const year = atUtcMidnight ? value.getUTCFullYear() : value.getFullYear();
+  const month = atUtcMidnight ? value.getUTCMonth() : value.getMonth();
+  const day = atUtcMidnight ? value.getUTCDate() : value.getDate();
+  return `${year}-${String(month + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+}
+function readStartingGivens(tag, declaredType) {
+  const entries = tag?.tag("givens");
+  if (!entries)
+    return;
+  const collected = {};
+  for (const [name, value] of entries.entries()) {
+    const tag2 = value;
+    const text = tagText(tag2);
+    if (text === undefined)
+      continue;
+    const declared = declaredType(name);
+    collected[name] = scalarTypeOf(tag2) === "date" && declared !== "timestamp" && declared !== "timestamptz" ? authoredDay(text) : declared?.startsWith("filter<") ? unwrapFilterLiteral(text) : text;
+  }
+  return Object.keys(collected).length > 0 ? collected : undefined;
+}
+var BUILT_IN_PROTO_GETTER, MAX_ANNOTATION_CHARS = 8192, ANNOTATION_TOO_LONG, ENV_REFERENCE_DROPPED = "annotation dropped for carrying an @env. reference", UNSAFE_TO_PARSE = "annotation could not be parsed safely";
+var init_motly = __esm(() => {
+  BUILT_IN_PROTO_GETTER = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__")?.get;
+  ANNOTATION_TOO_LONG = `annotation exceeds ${MAX_ANNOTATION_CHARS} characters and was not parsed`;
 });
 
-// src/service/source_extraction.ts
+// src/service/given.ts
 import {
-  isJoined as isJoined3,
-  isSourceDef as isSourceDef4,
-  modelDefToModelInfo
+  isSourceDef as isSourceDef4
 } from "@malloydata/malloy";
-function joinFieldNamesUnresolvableDeclaration(field, modelDef) {
-  const ids = [field.referenceID, field.sourceID].filter((id) => !!id);
-  if (ids.length === 0)
+function presentText(tag, ...path) {
+  const raw = tagText(tag, ...path);
+  return raw !== undefined && raw.trim() !== "" ? raw : undefined;
+}
+function readGivenControlSpec(annotationTexts2) {
+  const spec = {};
+  const tag = motlyTag(annotationTexts2);
+  if (!tag)
+    return spec;
+  const label = presentText(tag, "label");
+  if (label !== undefined)
+    spec.label = label;
+  const description = presentText(tag, "description");
+  if (description !== undefined)
+    spec.description = description;
+  const control = tagText(tag, "control");
+  if (control === "select" || control === "multiselect") {
+    spec.control = control;
+  }
+  const rangeMin = tagNumeric(tag, "range_min");
+  if (rangeMin !== undefined)
+    spec.rangeMin = rangeMin;
+  const rangeMax = tagNumeric(tag, "range_max");
+  if (rangeMax !== undefined)
+    spec.rangeMax = rangeMax;
+  const suggest = tag.tag("suggest");
+  if (suggest) {
+    const parsed = {};
+    const query = presentText(suggest, "query");
+    if (query !== undefined)
+      parsed.query = query;
+    const source = presentText(suggest, "source");
+    if (source !== undefined)
+      parsed.source = source;
+    const dimension = presentText(suggest, "dimension");
+    if (dimension !== undefined)
+      parsed.dimension = dimension;
+    const runnable = parsed.query !== undefined || parsed.source !== undefined && parsed.dimension !== undefined;
+    if (runnable)
+      spec.suggest = parsed;
+  }
+  return spec;
+}
+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;
+  const allNotes = given.annotations.forRoute(undefined);
+  return {
+    name: given.name,
+    type: renderedType,
+    annotations: allNotes.filter((note) => !isReservedRoute(note.route)).map((note) => note.text),
+    ...readGivenControlSpec(allNotes.map((note) => note.text)),
+    default: given._internal?.defaultText
+  };
+}
+function collectGivenRefs(value, into) {
+  if (Array.isArray(value)) {
+    for (const item of value)
+      collectGivenRefs(item, into);
+    return;
+  }
+  if (value === null || typeof value !== "object")
+    return;
+  const node = value;
+  if (node.node === "given" && typeof node.refName === "string") {
+    into.add(node.refName);
+  }
+  for (const child of Object.values(node))
+    collectGivenRefs(child, into);
+}
+function gateGivenSource(sources, name) {
+  const source = sources.find((candidate) => candidate.name === name);
+  if (!source)
+    return;
+  return [...source.authorize ?? [], ...source.accessFilter ?? []];
+}
+function suggestGivenLookup(modelDef, gatesBySource, surfaced) {
+  const registry = modelDef.givens ?? {};
+  const bySource = new Map;
+  const byQuery = new Map;
+  for (const obj of Object.values(modelDef.contents)) {
+    if (isSourceDef4(obj)) {
+      const name = obj.as || obj.name;
+      const refs = new Set;
+      collectGivenRefs(obj.filterList, refs);
+      for (const expr of gatesBySource(name) ?? []) {
+        for (const given of referencedGivenNames(expr))
+          refs.add(given);
+      }
+      bySource.set(name, Array.from(refs));
+    } else if (obj.type === "query") {
+      const query = obj;
+      byQuery.set(query.as || query.name, {
+        own: (query.givenUsage ?? []).map((usage) => registry[usage.id]?.name).filter((n) => n !== undefined),
+        source: typeof query.structRef === "string" ? query.structRef : undefined
+      });
+    }
+  }
+  const narrow = (names) => Array.from(new Set(names)).filter((name) => surfaced === undefined || surfaced.has(name));
+  return {
+    forSource: (name) => {
+      const found = bySource.get(name);
+      return found && narrow(found);
+    },
+    forQuery: (name) => {
+      const found = byQuery.get(name);
+      if (!found)
+        return;
+      return narrow([
+        ...found.own,
+        ...found.source ? bySource.get(found.source) ?? [] : []
+      ]);
+    }
+  };
+}
+function suggestGivenNames(suggest, lookup) {
+  const names = suggest.query !== undefined ? lookup.forQuery(suggest.query) : suggest.source !== undefined ? lookup.forSource(suggest.source) : undefined;
+  return names && names.length > 0 ? names : undefined;
+}
+function attachSuggestGivenNames(givens, lookup) {
+  for (const given of givens ?? []) {
+    if (!given.suggest)
+      continue;
+    const names = suggestGivenNames(given.suggest, lookup);
+    if (names)
+      given.suggest.givenNames = names;
+    else
+      delete given.suggest.givenNames;
+  }
+}
+var init_given = __esm(() => {
+  init_annotations();
+  init_authorize();
+  init_motly();
+});
+
+// src/service/dashboard.ts
+import { isSourceDef as isSourceDef5 } from "@malloydata/malloy";
+function filterPublisherOwnedRenderLogs(logs, modelPath) {
+  const couldBeATile = isDashboardModelPath(modelPath);
+  return logs.filter((log) => {
+    const match = UNKNOWN_RENDER_TAG.exec(log.message ?? "");
+    if (!match)
+      return true;
+    const [, tag, field] = match;
+    const root = tag.split(".")[0];
+    if (PUBLISHER_OWNED_TAGS.includes(root))
+      return false;
+    return !(couldBeATile && RENDERER_CHILD_TAGS.includes(root) && field === "root");
+  });
+}
+function isDashboardModelPath(modelPath) {
+  if (!modelPath.endsWith(MODEL_FILE_SUFFIX2))
     return false;
-  for (const id of ids) {
-    const entry = modelDef.sourceRegistry?.[id]?.entry;
-    if (!entry)
+  const segments = modelPath.split("/");
+  return segments.length === 2 && segments[0] === DASHBOARDS_DIR;
+}
+function dashboardSlug(modelPath) {
+  const basename = modelPath.slice(modelPath.lastIndexOf("/") + 1);
+  return basename.slice(0, -MODEL_FILE_SUFFIX2.length);
+}
+function matchesDocumentedDashboardName(slug) {
+  return /^[a-zA-Z0-9_-]+$/.test(slug);
+}
+function readArtifactTag(tag, declaredType) {
+  const artifact = tag.tag("artifact");
+  if (!artifact)
+    return;
+  const givens = readStartingGivens(artifact, declaredType);
+  const autorun = readAutorun(artifact);
+  return {
+    title: tagText(artifact, "title"),
+    tiles: artifact.array("tiles")?.map((tile) => tagText(tile)).filter((tile) => tile !== undefined),
+    dashboardColumns: positiveInteger(tagNumeric(tag.tag("dashboard"), "columns")),
+    givens,
+    autorun
+  };
+}
+function positiveInteger(value) {
+  return value !== undefined && Number.isInteger(value) && value >= 1 ? value : undefined;
+}
+function normalizeTileExpression(tile) {
+  return tile.split("->").map((part) => part.trim().replace(/\s+/g, " ")).join(" -> ").replace(/\s+/g, " ");
+}
+function readDashboardModelFacts(modelPath, modelDef, surfacedGivenNames, gatesBySource) {
+  const registry = modelDef.givens ?? {};
+  const surfaced = new Set(surfacedGivenNames);
+  const givens = new Map;
+  for (const given of Object.values(registry)) {
+    if (!surfaced.has(given.name))
+      continue;
+    const type = given.type;
+    const isFilter = type.type === "filter expression";
+    givens.set(given.name, {
+      name: given.name,
+      type: isFilter ? `filter<${type.filterType}>` : type.type,
+      default: given.defaultText,
+      annotations: (given.annotations?.blockNotes ?? []).concat(given.annotations?.notes ?? []).map((note) => note.text)
+    });
+  }
+  const isNamedQuery = (obj) => obj.type === "query";
+  const queries = Object.values(modelDef.contents).filter(isNamedQuery).map((query) => ({
+    name: query.as || query.name,
+    annotations: [
+      ...query.annotations?.blockNotes ?? [],
+      ...query.annotations?.notes ?? []
+    ].map((note) => note.text),
+    givens: (query.givenUsage ?? []).map((usage) => registry[usage.id]?.name).filter((name) => name !== undefined),
+    sourceName: typeof query.structRef === "string" ? query.structRef : undefined
+  }));
+  const viewGivens = new Map;
+  const viewAnnotations = new Map;
+  const sourceFields = new Map;
+  const drills = [];
+  for (const obj of Object.values(modelDef.contents)) {
+    if (!isSourceDef5(obj))
+      continue;
+    const sourceName = obj.as || obj.name;
+    const fieldNames = new Set;
+    sourceFields.set(sourceName, fieldNames);
+    const sourceGivens = new Set;
+    collectGivenRefs(obj.filterList, sourceGivens);
+    for (const field of obj.fields) {
+      const fieldName = field.as || field.name;
+      fieldNames.add(fieldName);
+      if (field.type === "turtle") {
+        const refs = new Set(sourceGivens);
+        collectGivenRefs(field.pipeline, refs);
+        const key = normalizeTileExpression(`${sourceName} -> ${fieldName}`);
+        viewGivens.set(key, Array.from(refs));
+        viewAnnotations.set(key, [
+          ...field.annotations?.blockNotes ?? [],
+          ...field.annotations?.notes ?? []
+        ].map((note) => note.text));
+        continue;
+      }
+      const drill = readDrillTag([
+        ...field.annotations?.blockNotes ?? [],
+        ...field.annotations?.notes ?? []
+      ].map((note) => note.text));
+      if (drill) {
+        drills.push({ ...drill, source: sourceName, dimension: fieldName });
+      }
+    }
+  }
+  return {
+    modelPath,
+    modelAnnotations: ownModelNotes(modelDef),
+    queries,
+    givens,
+    viewGivens,
+    viewAnnotations,
+    sourceFields,
+    drills,
+    suggestGivens: suggestGivenLookup(modelDef, (source) => gatesBySource?.get(source), surfaced)
+  };
+}
+function readTileLayout(annotations) {
+  const tag = motlyTag(annotations);
+  if (!tag)
+    return;
+  const layout = {};
+  const label = tagText(tag, "label");
+  if (label !== undefined)
+    layout.label = label;
+  const subtitle = tagText(tag, "subtitle");
+  if (subtitle !== undefined)
+    layout.subtitle = subtitle;
+  const colspan = positiveInteger(tagNumeric(tag, "colspan"));
+  if (colspan !== undefined)
+    layout.colspan = colspan;
+  if (tag.has("break"))
+    layout.break = true;
+  if (tag.has("borderless"))
+    layout.borderless = true;
+  return Object.keys(layout).length > 0 ? layout : undefined;
+}
+function readDrillTag(annotations) {
+  const drill = motlyTag(annotations)?.tag("drill");
+  if (!drill)
+    return;
+  const to = tagTextArray(drill, "to") ?? [tagText(drill, "to")].filter(isString);
+  const given = tagText(drill, "given");
+  return given === undefined ? { to } : { to, given };
+}
+function isString(value) {
+  return value !== undefined;
+}
+function tagTextArray(tag, ...path) {
+  const items = tag?.array(...path);
+  return items?.map((item) => tagText(item)).filter(isString);
+}
+function resolveTileGivens(tile, facts) {
+  return referencedTileGivens(tile, facts)?.filter((name) => facts.givens.has(name));
+}
+function resolveTileLayout(tile, facts) {
+  const annotations = tileAnnotations(tile, facts);
+  return annotations && readTileLayout(annotations);
+}
+function tileAnnotations(tile, facts) {
+  const normalized = normalizeTileExpression(tile);
+  return facts.viewAnnotations.get(normalized) ?? facts.queries.find((query) => query.name === normalized)?.annotations;
+}
+function referencedTileGivens(tile, facts) {
+  const normalized = normalizeTileExpression(tile);
+  return facts.viewGivens.get(normalized) ?? facts.queries.find((query) => query.name === normalized)?.givens;
+}
+function buildGivenSpecs(names, facts) {
+  const declarations = facts.givens;
+  const specs = [];
+  for (const name of new Set(names)) {
+    const declaration = declarations.get(name);
+    if (!declaration)
       continue;
-    const declared = entry.type === "source_registry_reference" ? modelDef.contents[entry.name] : entry;
-    if (declared && isSourceDef4(declared))
-      return false;
+    specs.push(givenSpec(declaration, facts));
   }
-  return true;
+  return specs;
 }
-function isEarlierPosition(a, b) {
-  return a.line < b.line || a.line === b.line && a.character < b.character;
+function givenSpec(declaration, facts) {
+  const control = readGivenControlSpec(declaration.annotations);
+  if (control.suggest) {
+    const names = suggestGivenNames(control.suggest, facts.suggestGivens);
+    if (names)
+      control.suggest.givenNames = names;
+  }
+  return {
+    name: declaration.name,
+    type: declaration.type,
+    default: declaration.type.startsWith("filter<") && declaration.default !== undefined ? unwrapFilterLiteral(declaration.default) : declaration.default,
+    annotations: declaration.annotations.filter((text) => /^##?\(/.test(text)),
+    ...control
+  };
 }
-function considerNoteOwner(declaredBy, note, candidate) {
-  const location = candidate.location;
-  if (!location || location.url !== note.at.url)
-    return;
-  const currentLocation = declaredBy.get(note)?.location;
-  if (!currentLocation || isEarlierPosition(location.range.start, currentLocation.range.start)) {
-    declaredBy.set(note, candidate);
+function factsCarryArtifactTag(facts) {
+  if (motlyTag(facts.modelAnnotations)?.tag("artifact"))
+    return true;
+  return facts.queries.some((query) => Boolean(motlyTag(query.annotations)?.tag("artifact")));
+}
+function buildDashboardManifest(facts) {
+  const name = dashboardSlug(facts.modelPath);
+  const base = {
+    name,
+    entryFile: facts.modelPath
+  };
+  const modelTag = motlyTag(facts.modelAnnotations);
+  const declaredType = (name2) => facts.givens.get(name2)?.type;
+  const composite = modelTag ? readArtifactTag(modelTag, declaredType) : undefined;
+  if (composite?.tiles?.length) {
+    const tiles = composite.tiles.map((query) => {
+      const givenNames = resolveTileGivens(query, facts);
+      const layout = resolveTileLayout(query, facts);
+      return {
+        query,
+        ...givenNames ? { givenNames } : {},
+        ...layout
+      };
+    });
+    const doc = docCommentTitleAndDescription(facts.modelAnnotations, composite.title);
+    return {
+      ...base,
+      title: doc.title ?? name,
+      description: doc.description,
+      tiles,
+      dashboardColumns: composite.dashboardColumns,
+      startingGivens: composite.givens,
+      autorun: composite.autorun,
+      givens: buildGivenSpecs(tiles.some((tile) => tile.givenNames === undefined) ? Array.from(facts.givens.keys()) : tiles.flatMap((tile) => tile.givenNames ?? []), facts)
+    };
+  }
+  for (const query of facts.queries) {
+    const tag = motlyTag(query.annotations);
+    const artifact = tag ? readArtifactTag(tag, declaredType) : undefined;
+    if (!artifact)
+      continue;
+    const doc = docCommentTitleAndDescription(query.annotations, artifact.title);
+    return {
+      ...base,
+      title: doc.title ?? name,
+      description: doc.description,
+      query: query.name,
+      dashboardColumns: artifact.dashboardColumns,
+      startingGivens: artifact.givens,
+      autorun: artifact.autorun,
+      givens: buildGivenSpecs(query.givens, facts)
+    };
   }
+  return;
 }
-function collectSourceInfos(modelDef) {
-  const names = Object.keys(modelDef.contents).filter((name) => isSourceDef4(modelDef.contents[name]));
-  const exports = [...new Set([...modelDef.exports, ...names])];
-  return modelDefToModelInfo({ ...modelDef, exports }).entries.filter((entry) => entry.kind === "source");
+function plainTileParts(tile) {
+  const piped = /^(\w+)\s*->\s*(\w+)$/.exec(tile.trim());
+  if (piped)
+    return { source: piped[1], view: piped[2] };
+  const bare = /^\w+$/.exec(tile.trim());
+  return bare ? { name: tile.trim() } : undefined;
 }
-function extractSourcesFromModelDef(modelDef, givens, onParseError) {
-  const filterMap = new Map;
-  const authorizeMap = new Map;
-  const misplacedAuthorize = [];
-  const gatedSourceOwnAuthorizeNotes = new Set;
-  const authorizeNoteDeclaredBy = new Map;
-  const nearMissAuthorize = [];
-  const sweptStructs = [];
-  for (const obj of Object.values(modelDef.contents)) {
-    if (!isSourceDef4(obj))
+function lintDashboard(facts, manifest) {
+  const findings = [];
+  const slug = manifest.name;
+  const add = (message, severity = "warn") => findings.push({ subject: slug, message, severity });
+  const ownAnnotations = manifest.tiles ? facts.modelAnnotations : facts.queries.find((query) => query.name === manifest.query)?.annotations ?? [];
+  const ownTag = motlyTag(ownAnnotations);
+  const artifactTag = ownTag?.tag("artifact");
+  const lintTargets = new Set([...facts.modelAnnotations, ...ownAnnotations]);
+  for (const message of new Set(motlyParseErrors([...lintTargets]))) {
+    add(`Annotation ${describeParseFailure(message)}, so that line had no ` + `effect on this dashboard.`);
+  }
+  if (!manifest.tiles) {
+    const modelArtifact = motlyTag(facts.modelAnnotations)?.tag("artifact");
+    if (modelArtifact) {
+      add(`${describeTilelessModelArtifact(modelArtifact)}, so it builds ` + `nothing and this dashboard is the query's own '# artifact' ` + `instead. ${NAME_THE_TILES}`);
+    }
+  }
+  const knownProperties = manifest.tiles ? COMPOSITE_ARTIFACT_PROPERTIES : QUERY_ARTIFACT_PROPERTIES;
+  for (const property of Object.keys(artifactTag?.dict ?? {})) {
+    if (knownProperties.includes(property))
       continue;
-    const struct = obj;
-    sweptStructs.push(obj);
-    for (const note of ownLevelNotes(struct.annotations)) {
-      if (containsAuthorizeAnnotationTag([note.text])) {
-        gatedSourceOwnAuthorizeNotes.add(note);
-        considerNoteOwner(authorizeNoteDeclaredBy, note, struct);
-      }
-    }
-    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes([
-      ...ownLevelNotes(struct.annotations),
-      ...struct.fields.flatMap((field) => ownLevelNotes(field.annotations))
-    ].map((note) => note.text)));
+    add(`\`${property}\` in the artifact tag does nothing in Publisher` + (ARTIFACT_PROPERTY_REPLACEMENTS[property] ? `. ${ARTIFACT_PROPERTY_REPLACEMENTS[property]}` : property === "tiles" ? `: a dashboard whose tag sits on a query is that one query's ` + `result. Move the tag to model level (\`## artifact\`) to ` + `combine separate queries into a grid.` : `.`));
   }
-  for (const value of Object.values(modelDef.sourceRegistry ?? {})) {
-    const entry = value.entry;
-    if (entry.type === "source_registry_reference")
+  for (const entry of artifactTag?.array("tiles") ?? []) {
+    const carried = Object.keys(entry.dict ?? {});
+    if (carried.length === 0)
       continue;
-    if (!isSourceDef4(entry))
+    const named = carried.map((property) => `\`${property}\``).join(", ");
+    add(`\`${tagText(entry) ?? "a tile"}\` in \`tiles=[…]\` carries ${named}, ` + `which Publisher does not read: a tile entry is the run expression ` + `alone. Per-tile presentation goes on the view the tile names ` + `(\`# colspan\`, \`# break\`, \`# label\`, \`# subtitle\`, ` + `\`# borderless\`).`);
+  }
+  for (const { query: tile } of manifest.tiles ?? []) {
+    const tag = motlyTag(tileAnnotations(tile, facts) ?? []);
+    if (!tag?.has("colspan"))
+      continue;
+    const colspan = positiveInteger(tagNumeric(tag, "colspan"));
+    if (colspan === undefined) {
+      const raw = tagText(tag, "colspan");
+      add(`# colspan on "${tile}" must be a positive integer, got ` + `${raw === undefined ? "a value that could not be read" : JSON.stringify(raw)}. ` + `The tile spans one column.`);
       continue;
-    sweptStructs.push(entry);
-    for (const note of ownLevelNotes(entry.annotations)) {
-      if (containsAuthorizeAnnotationTag([note.text])) {
-        gatedSourceOwnAuthorizeNotes.add(note);
-        considerNoteOwner(authorizeNoteDeclaredBy, note, entry);
-      }
     }
-    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes(ownLevelNotes(entry.annotations).map((note) => note.text)));
-  }
-  for (const struct of derivedStructsReachable(sweptStructs, modelDef)) {
-    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes([
-      ...ownLevelNotes(struct.annotations),
-      ...struct.fields.flatMap((field) => ownLevelNotes(field.annotations))
-    ].map((note) => note.text)));
-  }
-  {
-    const folded = modelAnnotations(modelDef);
-    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes([...folded.notes ?? [], ...folded.blockNotes ?? []].map((note) => note.text)));
-  }
-  assertNoAuthorizeNearMisses(nearMissAuthorize);
-  const authorizeOwnNotes = new Map;
-  const attributedAuthorizeOwnNotes = new Map;
-  {
-    const fileNoteTexts = ownLevelNoteTexts(modelAnnotations(modelDef));
-    if (containsAuthorizeAnnotationTag(fileNoteTexts)) {
-      misplacedAuthorize.push({
-        kind: "file",
-        route: fileNoteTexts.map((text) => authorizeAnnotationRoute(text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
-      });
+    const columns = manifest.dashboardColumns;
+    if (columns === undefined) {
+      add(`# colspan=${colspan} on "${tile}" needs a grid to span. This ` + `dashboard declares no # dashboard { columns=N }, so it lays out ` + `at the viewer's default width and every colspan is clamped to it.`);
+    } else if (colspan > columns) {
+      add(`# colspan=${colspan} on "${tile}" exceeds the ${columns} columns ` + `of this dashboard and is clamped to ${columns}. Widen ` + `# dashboard { columns=… } or lower the colspan.`);
     }
   }
-  const sources = Object.values(modelDef.contents).filter((obj) => isSourceDef4(obj)).map((sourceObj) => {
-    const struct = sourceObj;
-    const sourceName = struct.as || struct.name;
-    const annotations = annotationTexts(struct.annotations);
-    const collected = [];
-    let cur = struct.annotations;
-    while (cur) {
-      if (cur.blockNotes) {
-        collected.push(cur.blockNotes.map((note) => note.text));
-      }
-      cur = cur.inherits;
-    }
-    const allAnnotations = collected.reverse().flat();
-    let filters;
-    if (allAnnotations.length > 0) {
-      try {
-        const parsed = parseFilters(allAnnotations);
-        if (parsed.length > 0) {
-          filterMap.set(sourceName, parsed);
-          const fields = struct.fields;
-          filters = parsed.map((f) => {
-            const field = fields.find((fd) => (fd.as || fd.name) === f.dimension);
-            return {
-              name: f.name,
-              dimension: f.dimension,
-              type: f.type,
-              implicit: f.implicit,
-              required: f.required,
-              dimensionType: field?.type
-            };
-          });
-        }
-      } catch (err) {
-        onParseError?.(sourceName, err);
-      }
-    }
-    const ownNotes = ownLevelNoteTexts(struct.annotations);
-    const ownAuthorizeNotes = ownLevelNotes(struct.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
-    const ownNotesByRoute = new Map;
-    const attributedOwnNotesByRoute = new Map;
-    for (const route of CANONICAL_AUTHORIZE_ROUTES) {
-      const notesForRoute = ownAuthorizeNotes.filter((note) => authorizeAnnotationRoute(note.text) === route);
-      ownNotesByRoute.set(route, notesForRoute);
-      attributedOwnNotesByRoute.set(route, notesForRoute.filter((note) => authorizeNoteDeclaredBy.get(note) === struct));
+  const columnsTag = ownTag?.tag("dashboard");
+  if (columnsTag?.has("columns")) {
+    if (positiveInteger(tagNumeric(columnsTag, "columns")) === undefined) {
+      const raw = tagText(columnsTag, "columns");
+      add(`# dashboard { columns=… } must be a positive integer, got ` + `${raw === undefined ? "a value that could not be read" : JSON.stringify(raw)}. ` + `The grid falls back to the default.`);
     }
-    authorizeOwnNotes.set(sourceName, ownNotesByRoute);
-    attributedAuthorizeOwnNotes.set(sourceName, attributedOwnNotesByRoute);
-    const groupsForSource = [];
-    const routeGroupsByRoute = new Map;
-    for (const route of CANONICAL_AUTHORIZE_ROUTES) {
-      const ownExprsForRoute = collectAuthorizeExprsForRoute(ownNotes, route);
-      const groupsForRoute = ownExprsForRoute.length > 0 ? [ownExprsForRoute] : effectiveAncestorGateExprs(struct, modelDef, route);
-      for (const exprs of groupsForRoute) {
-        groupsForSource.push({ route, exprs });
-      }
-      routeGroupsByRoute.set(route, groupsForRoute);
+  }
+  for (const { query: tile } of manifest.tiles ?? []) {
+    const parts = plainTileParts(tile);
+    if (!parts)
+      continue;
+    const resolved = referencedTileGivens(tile, facts) !== undefined || "name" in parts && facts.queries.some((query) => query.name === parts.name);
+    if (!resolved) {
+      const detail = "source" in parts ? facts.sourceFields.has(parts.source) ? `source "${parts.source}" has no view "${parts.view}"` : `no source "${parts.source}" in this file` : `no query named "${parts.name}" in this file`;
+      add(`tile "${tile}" does not resolve: ${detail}.`, "error");
     }
-    if (groupsForSource.length > 0) {
-      authorizeMap.set(sourceName, groupsForSource);
+    const unbindable = (referencedTileGivens(tile, facts) ?? []).filter((name) => !facts.givens.has(name));
+    for (const name of unbindable) {
+      add(`tile "${tile}" filters by given "${name}", which this file does ` + `not import, so no control is shown for it and it stays at its ` + `default. Add it to an import in ${facts.modelPath}.`);
     }
-    const routeGroupsToFlatWire = (groups) => groups && groups.length > 0 ? groups.flat() : undefined;
-    const authorize = routeGroupsToFlatWire(routeGroupsByRoute.get(AUTHORIZE_ROUTE));
-    const accessFilter = routeGroupsToFlatWire(routeGroupsByRoute.get(ACCESS_FILTER_ROUTE));
-    const views = struct.fields.filter((field) => field.type === "turtle").filter((turtle) => turtle.pipeline.map((stage) => stage.type).every((type) => type === "reduce")).map((turtle) => ({
-      name: turtle.as || turtle.name,
-      annotations: annotationTexts(turtle.annotations)
-    }));
-    for (const field of struct.fields) {
-      const fieldAuthorizeNotes = ownLevelNotes(field.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
-      if (fieldAuthorizeNotes.length === 0)
-        continue;
-      if (fieldAuthorizeNotes.every((note) => gatedSourceOwnAuthorizeNotes.has(note))) {
-        continue;
-      }
-      const fieldName = field.as || field.name;
-      if (isJoined3(field) && isSourceDef4(field)) {
-        const joinedStruct = field;
-        if (joinFieldNamesUnresolvableDeclaration(joinedStruct, modelDef)) {
-          continue;
-        }
-        misplacedAuthorize.push({
-          kind: "field",
-          name: sourceName,
-          fieldName,
-          route: fieldAuthorizeNotes.map((note) => authorizeAnnotationRoute(note.text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
-        });
+  }
+  if (manifest.query !== undefined) {
+    const query = facts.queries.find((q) => q.name === manifest.query);
+    for (const name of query?.givens ?? []) {
+      if (facts.givens.has(name))
         continue;
-      }
-      misplacedAuthorize.push({
-        kind: "field",
-        name: sourceName,
-        fieldName,
-        route: fieldAuthorizeNotes.map((note) => authorizeAnnotationRoute(note.text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
-      });
+      add(`query "${manifest.query}" filters by given "${name}", which this ` + `file does not import, so no control is shown for it and it ` + `stays at its default. Add it to an import in ` + `${facts.modelPath}.`);
     }
-    return {
-      name: sourceName,
-      annotations,
-      views,
-      filters,
-      givens,
-      authorize,
-      accessFilter
-    };
-  });
-  return {
-    sources,
-    filterMap,
-    authorizeMap,
-    misplacedAuthorize,
-    authorizeOwnNotes,
-    attributedAuthorizeOwnNotes
-  };
-}
-function extractQueriesFromModelDef(modelDef) {
-  const isNamedQuery = (obj) => obj.type === "query";
-  const namedQueries = Object.values(modelDef.contents).filter(isNamedQuery);
-  const misplacedAuthorize = namedQueries.filter((queryObj) => containsAuthorizeAnnotationTag(ownLevelNoteTexts(queryObj.annotations))).map((queryObj) => ({
-    kind: "query",
-    name: queryObj.as || queryObj.name,
-    route: ownLevelNoteTexts(queryObj.annotations).map((text) => authorizeAnnotationRoute(text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
-  }));
-  const queries = namedQueries.map((queryObj) => ({
-    name: queryObj.as || queryObj.name,
-    sourceName: typeof queryObj.structRef === "string" ? queryObj.structRef : undefined,
-    annotations: annotationTexts(queryObj.annotations)
-  }));
-  return { queries, misplacedAuthorize };
-}
-var init_source_extraction = __esm(() => {
-  init_annotations();
-  init_authorize();
-  init_authorize_routes();
-  init_filter();
-  init_gate_registry_walk();
-});
-
-// src/service/motly.ts
-import { parseAnnotation } from "@malloydata/malloy-tag";
-function onMotlyRoute(text) {
-  const afterSigil = text.replace(/^##?\|?/, "");
-  return afterSigil === "" || /^[ \t\r\n]/.test(afterSigil);
-}
-function hasEnvReference(annotation) {
-  return annotation.includes("@env.");
-}
-function pollutionTargets() {
-  const targets = [Object.prototype];
-  for (const key of Object.getOwnPropertyNames(Object.prototype)) {
-    const descriptor = Object.getOwnPropertyDescriptor(Object.prototype, key);
-    if (!descriptor)
-      continue;
-    let value;
-    if ("value" in descriptor) {
-      value = descriptor.value;
-    } else {
-      if (BUILT_IN_PROTO_GETTER === undefined || descriptor.get !== BUILT_IN_PROTO_GETTER) {
-        return;
+  }
+  for (const name of Object.keys(manifest.startingGivens ?? {})) {
+    if (facts.givens.has(name))
+      continue;
+    add(`'artifact { givens { ${name}=… } }' sets a starting value for given ` + `"${name}", which this file does not import, so the value is ` + `dropped at query time and the dashboard opens at the ` + `declaration's default. Add it to an import in ${facts.modelPath}.`);
+  }
+  for (const spec of manifest.givens) {
+    const suggest = spec.suggest;
+    if (!suggest) {
+      const declared = motlyTag(facts.givens.get(spec.name)?.annotations ?? [])?.tag("suggest");
+      if (declared) {
+        const has = (key) => tagText(declared, key) !== undefined;
+        const missing = has("dimension") ? `it names a dimension but no query= or source= to read it from` : has("source") ? `source= alone names no column to read options from` : `it names neither a query= nor a source=`;
+        add(`given "${spec.name}" declares a suggest that cannot fetch ` + `options: ${missing}. Use query=, source= with dimension=, ` + `or query= with dimension=. No control options are offered ` + `for it.`, "error");
       }
       continue;
     }
-    if ((typeof value === "object" || typeof value === "function") && value !== null && !targets.includes(value)) {
-      targets.push(value);
+    if (suggest.query !== undefined) {
+      const named = facts.queries.find((query) => query.name === suggest.query);
+      if (!named) {
+        add(`given "${spec.name}" suggests options from query ` + `"${suggest.query}", which this file does not define.`, "error");
+      } else if (named.sourceName !== undefined && !facts.sourceFields.has(named.sourceName)) {
+        add(`given "${spec.name}" suggests options from query ` + `"${suggest.query}", which reads source ` + `"${named.sourceName}" that this file does not import. The ` + `query resolves by name, so the package loads, but the ` + `control answers "Undefined source '${named.sourceName}'" ` + `and offers no options. Import that source here too.`, "error");
+      }
+    }
+    if (suggest.source !== undefined) {
+      const fields = facts.sourceFields.get(suggest.source);
+      if (!fields) {
+        add(`given "${spec.name}" suggests options from source ` + `"${suggest.source}", which this file does not define.`, "error");
+      } else if (suggest.dimension !== undefined && !fields.has(suggest.dimension)) {
+        add(`given "${spec.name}" suggests options from ` + `"${suggest.source} -> ${suggest.dimension}", but that ` + `source has no field "${suggest.dimension}".`, "error");
+      }
     }
   }
-  return targets;
+  return findings;
 }
-function parseGuarded(texts) {
-  const targets = pollutionTargets();
-  if (targets === undefined) {
-    return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
+function describeParseFailure(message) {
+  if (message === UNSAFE_TO_PARSE) {
+    return `was refused rather than parsed (${message}), which can be caused by something outside this file`;
   }
-  let unreadable = false;
-  const ownNames = (target) => {
-    try {
-      return Object.getOwnPropertyNames(target);
-    } catch {
-      unreadable = true;
-      return [];
-    }
-  };
-  const before = targets.map(ownNames);
-  if (unreadable)
-    return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
-  const undoPollution = () => {
-    let polluted = false;
-    targets.forEach((target, index) => {
-      for (const key of ownNames(target)) {
-        if (before[index].includes(key))
-          continue;
-        polluted = true;
-        try {
-          delete target[key];
-        } catch {}
-      }
-    });
-    return polluted || unreadable;
-  };
-  if (texts.some((text) => text.length > MAX_ANNOTATION_CHARS)) {
-    return { tag: undefined, messages: [ANNOTATION_TOO_LONG] };
+  if (message === ENV_REFERENCE_DROPPED) {
+    return `was dropped rather than parsed (${message}), so nothing on that line took effect`;
   }
-  try {
-    const result = parseAnnotation([...texts]);
-    if (undoPollution())
-      return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
-    return {
-      tag: result.tag,
-      messages: result.log.map((error) => error.message)
-    };
-  } catch {
-    undoPollution();
-    return { tag: undefined, messages: [UNSAFE_TO_PARSE] };
+  if (message === ANNOTATION_TOO_LONG) {
+    return `was refused rather than parsed (${message})`;
   }
+  return `does not parse (${message})`;
 }
-function docCommentText(texts) {
-  const lines = texts.filter((text) => /^##?\|?"([ \t\r\n]|$)/.test(text)).map((text) => text.replace(/^##?\|?"[ \t\r\n]?/, "").trimEnd());
-  return lines.some((text) => text.trim().length > 0) ? lines.join(`
-`) : undefined;
-}
-function splitDocComment(texts) {
-  const text = docCommentText(texts);
-  if (text === undefined)
-    return {};
-  const lines = text.split(`
-`);
-  const titleLine = lines.findIndex((line) => line.trim().length > 0);
-  if (titleLine === -1)
-    return {};
-  const body = lines.slice(titleLine + 1).join(`
-`).replace(/^[ \t\r\n]+/, "").trimEnd();
-  return {
-    title: lines[titleLine].trim(),
-    body: body.length > 0 ? body : undefined
-  };
-}
-function docCommentTitleAndDescription(texts, explicitTitle) {
-  if (explicitTitle !== undefined) {
-    return { title: explicitTitle, description: docCommentText(texts) };
+function lintUndiscoveredDashboard(facts) {
+  const subject = dashboardSlug(facts.modelPath);
+  const messages = [
+    ...motlyParseErrors(facts.modelAnnotations),
+    ...facts.queries.flatMap((query) => motlyParseErrors(query.annotations))
+  ].map((message) => `Tag ${describeParseFailure(message)}, so the whole tag is discarded ` + `and this file is treated as a shared include rather than a dashboard.`);
+  const findings = Array.from(new Set(messages), (message) => ({ subject, message, severity: "error" }));
+  if (findings.length > 0)
+    return findings;
+  const modelArtifact = motlyTag(facts.modelAnnotations)?.tag("artifact");
+  if (modelArtifact) {
+    findings.push({
+      subject,
+      message: `${describeTilelessModelArtifact(modelArtifact)}, so this file ` + `produces no dashboard. ${NAME_THE_TILES}`,
+      severity: "error"
+    });
   }
-  const { title, body } = splitDocComment(texts);
-  return { title, description: body };
+  findings.push(...lintArtifactOnView(facts));
+  return findings;
 }
-function quoteFilterLiterals(annotation) {
-  const VALUE_START = /[=[,]/;
-  const BARE_FILTER_LITERAL = /^([ \t]*)f(['"])((?:\\.|(?!\2)[^\\])*)\2/;
-  let out = "";
-  let i = 0;
-  while (i < annotation.length) {
-    const char = annotation[i];
-    const delimited = endOfDelimited(annotation, i);
-    if (delimited > i) {
-      out += annotation.slice(i, delimited);
-      i = delimited;
+function lintArtifactOnView(facts) {
+  const subject = dashboardSlug(facts.modelPath);
+  const findings = [];
+  for (const [view, annotations] of facts.viewAnnotations) {
+    if (!motlyTag(annotations)?.tag("artifact"))
       continue;
-    }
-    if (VALUE_START.test(char)) {
-      const match = BARE_FILTER_LITERAL.exec(annotation.slice(i + 1));
-      if (match) {
-        const body = match[3].replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
-        out += `${char}${match[1]}"f'${body}'"`;
-        i += 1 + match[0].length;
-        continue;
+    const viewName = view.split("->").at(-1)?.trim() ?? view;
+    findings.push({
+      subject,
+      message: `'# artifact' on view '${view}' is not read: Publisher reads the ` + `tag on a 'query:' or at model level, so this file produces no ` + `dashboard. Either name the view as a tile, ` + `## artifact { tiles=["${view}"] }, or tag a query that runs it, ` + `query: ${viewName} is ${view}.`,
+      severity: "error"
+    });
+  }
+  return findings;
+}
+function describeTilelessModelArtifact(modelArtifact) {
+  return modelArtifact.array("tiles") === undefined ? `Model-level '## artifact' declares no tiles=` : `Model-level '## artifact' declares an empty tiles=`;
+}
+function lintGivenTags(facts) {
+  const findings = new Map;
+  for (const file of facts) {
+    for (const [name, declaration] of file.givens) {
+      for (const message of motlyParseErrors(declaration.annotations)) {
+        findings.set(`${name}|${message}`, {
+          subject: name,
+          message: `given "${name}" has an annotation that ` + `${describeParseFailure(message)}, so the whole line is ` + `discarded and the given ` + `loses any label, control, range or suggest it declared. ` + `It still accepts values; only its presentation is lost.`,
+          severity: "error"
+        });
       }
     }
-    out += char;
-    i += 1;
   }
-  return out;
+  return Array.from(findings.values());
 }
-function endOfDelimited(text, start) {
-  const char = text[start];
-  if (char === "`") {
-    let i = start + 1;
-    while (i < text.length) {
-      if (text[i] === "\\") {
-        i += 2;
+function lintDrillTargets(facts, knownSlugs) {
+  const findings = new Map;
+  for (const file of facts) {
+    for (const drill of file.drills) {
+      const where = `${drill.source}.${drill.dimension}`;
+      if (drill.to.length === 0) {
+        findings.set(where, {
+          subject: where,
+          message: `# drill on ${where} names no destination (to=…).`,
+          severity: "error"
+        });
         continue;
       }
-      if (text[i] === "`")
-        return i + 1;
-      if (text[i] === `
-`)
-        return text.length;
-      i += 1;
+      for (const destination of drill.to) {
+        if (destination === "self" || knownSlugs.has(destination))
+          continue;
+        findings.set(`${where}|${destination}`, {
+          subject: where,
+          message: `# drill on ${where} targets "${destination}", which is not ` + `a dashboard in this package.`,
+          severity: "error"
+        });
+      }
     }
-    return text.length;
   }
-  if (text.startsWith("<<<", start)) {
-    let lineStart = start + 3;
-    for (;; ) {
-      const newline = text.indexOf(`
-`, lineStart);
-      const lineEnd = newline === -1 ? text.length : newline;
-      if (text.slice(lineStart, lineEnd).trim() === ">>>")
-        return lineEnd;
-      if (newline === -1)
-        return text.length;
-      lineStart = newline + 1;
+  return Array.from(findings.values());
+}
+function drillGivenName(drill) {
+  return drill.given ?? drill.dimension;
+}
+function lintSelfDrills(facts) {
+  const surfaced = new Set;
+  for (const file of facts) {
+    for (const name of file.givens.keys())
+      surfaced.add(name.toLowerCase());
+  }
+  const findings = new Map;
+  for (const file of facts) {
+    for (const drill of file.drills) {
+      if (!drill.to.includes("self"))
+        continue;
+      const given = drillGivenName(drill);
+      if (surfaced.has(given.toLowerCase()))
+        continue;
+      const where = `${drill.source}.${drill.dimension}`;
+      findings.set(where, {
+        subject: where,
+        message: `# drill on ${where} has to=self, but no model in this ` + `package declares a given "${given}" for the clicked value to ` + `filter on, so the drill cannot fire anywhere. Declare it, or ` + `point the tag at a given that exists with given=.`,
+        severity: "error"
+      });
     }
   }
-  if (char === '"' || char === "'") {
-    const triple = char.repeat(3);
-    if (text.startsWith(triple, start)) {
-      let i2 = start + triple.length;
-      while (i2 < text.length) {
-        if (text[i2] === "\\") {
-          i2 += 2;
-          continue;
-        }
-        if (text.startsWith(triple, i2))
-          return i2 + triple.length;
-        i2 += 1;
+  return Array.from(findings.values());
+}
+var DASHBOARDS_DIR = "dashboards", COMPONENT_FILE_SUFFIXES, MODEL_FILE_SUFFIX2 = ".malloy", PUBLISHER_OWNED_TAGS, RENDERER_CHILD_TAGS, UNKNOWN_RENDER_TAG, COMPOSITE_ARTIFACT_PROPERTIES, QUERY_ARTIFACT_PROPERTIES, ARTIFACT_PROPERTY_REPLACEMENTS, NAME_THE_TILES = `Name the views to show: tiles=["source -> view", …].`;
+var init_dashboard = __esm(() => {
+  init_annotations();
+  init_given();
+  init_motly();
+  COMPONENT_FILE_SUFFIXES = [".jsx", ".tsx"];
+  PUBLISHER_OWNED_TAGS = ["artifact", "drill"];
+  RENDERER_CHILD_TAGS = ["colspan", "break", "subtitle", "borderless"];
+  UNKNOWN_RENDER_TAG = /^Unknown render tag '([^']+)' on field '([^']*)'/;
+  COMPOSITE_ARTIFACT_PROPERTIES = [
+    "title",
+    "tiles",
+    "givens",
+    "autorun"
+  ];
+  QUERY_ARTIFACT_PROPERTIES = COMPOSITE_ARTIFACT_PROPERTIES.filter((property) => property !== "tiles");
+  ARTIFACT_PROPERTY_REPLACEMENTS = {
+    dashboard_columns: "Write the grid width as `# dashboard { columns=N }` beside the artifact tag.",
+    dashboard: "The grid width is a sibling of the artifact tag, not a property of it: " + "close the artifact braces first, as `## artifact { … } dashboard { columns=N }`."
+  };
+});
+
+// src/service/filter.ts
+function parseFilterAnnotation(annotation) {
+  const trimmed = annotation.trim();
+  if (!trimmed.startsWith(ANNOTATION_PREFIX)) {
+    return null;
+  }
+  const body = trimmed.slice(ANNOTATION_PREFIX.length).trim();
+  const tokens = tokenize(body);
+  let name;
+  let dimension;
+  let type;
+  let implicit = false;
+  let required = false;
+  for (const token of tokens) {
+    if (token.includes("=")) {
+      const eqIndex = token.indexOf("=");
+      const key = token.slice(0, eqIndex).toLowerCase();
+      const value = token.slice(eqIndex + 1);
+      switch (key) {
+        case "name":
+          name = value;
+          break;
+        case "dimension":
+          dimension = value;
+          break;
+        case "type":
+          if (!VALID_FILTER_TYPES.has(value)) {
+            throw new Error(`Invalid filter type "${value}". Must be one of: ${[...VALID_FILTER_TYPES].join(", ")}`);
+          }
+          type = value;
+          break;
+        default:
+          throw new Error(`Unknown filter parameter "${key}"`);
       }
-      return text.length;
-    }
-    let i = start + 1;
-    while (i < text.length) {
-      if (text[i] === "\\") {
-        i += 2;
-        continue;
+    } else {
+      const flag = token.toLowerCase();
+      if (flag === "implicit") {
+        implicit = true;
+      } else if (flag === "required") {
+        required = true;
+      } else {
+        throw new Error(`Unknown filter flag "${token}"`);
       }
-      if (text[i] === char)
-        return i + 1;
-      if (text[i] === `
-`)
-        return i;
-      i += 1;
     }
-    return text.length;
   }
-  return start;
-}
-function unwrapFilterLiteral(value) {
-  const match = /^f(['"])([\s\S]*)\1$/.exec(value);
-  return match ? match[2] : value;
-}
-function parseMotly(texts) {
-  const onRoute = texts.filter(onMotlyRoute);
-  const motly = onRoute.filter((text) => !hasEnvReference(text));
-  const envDropped = onRoute.length - motly.length;
-  const envErrors = envDropped > 0 ? [ENV_REFERENCE_DROPPED] : [];
-  if (motly.length === 0)
-    return { tag: undefined, errors: envErrors };
-  const direct = parseGuarded(motly);
-  if (direct.messages.length === 0)
-    return { tag: direct.tag, errors: envErrors };
-  const rescued = motly.map((text) => {
-    if (parseGuarded([text]).messages.length === 0)
-      return text;
-    const rewritten = quoteFilterLiterals(text);
-    return parseGuarded([rewritten]).messages.length === 0 ? rewritten : text;
-  });
-  const after = parseGuarded(rescued);
-  return { tag: after.tag, errors: [...envErrors, ...after.messages] };
+  if (!dimension) {
+    throw new Error("filter annotation missing required 'dimension' parameter");
+  }
+  if (!type) {
+    throw new Error("filter annotation missing required 'type' parameter");
+  }
+  return {
+    name: name ?? dimension,
+    dimension,
+    type,
+    implicit,
+    required
+  };
 }
-function tagText(tag, ...path) {
-  try {
-    return tag?.text(...path);
-  } catch {
-    return;
+function parseFilters(annotations) {
+  const byName = new Map;
+  for (const annotation of annotations) {
+    const parsed = parseFilterAnnotation(annotation);
+    if (parsed) {
+      byName.set(parsed.name, parsed);
+    }
   }
+  return [...byName.values()];
 }
-function tagNumeric(tag, ...path) {
-  try {
-    const raw = tagText(tag, ...path);
-    if (raw === undefined)
-      return;
-    const DECIMAL = /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?$/;
-    const text = raw.trim();
-    if (!DECIMAL.test(text))
-      return;
-    const value = Number(text);
-    return Number.isFinite(value) ? value : undefined;
-  } catch {
-    return;
-  }
+function escapeMalloyString(value) {
+  return value.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
 }
-function motlyTag(texts) {
-  return parseMotly(texts).tag;
+function isBooleanLiteral(v) {
+  const lower = v.toLowerCase();
+  return lower === "true" || lower === "false";
 }
-function motlyParseErrors(texts) {
-  return parseMotly(texts).errors;
+function isDateLiteral(v) {
+  return ISO_DATE_RE.test(v) || ISO_TIMESTAMP_RE.test(v);
 }
-function readAutorun(tag) {
-  return tagText(tag, "autorun") !== "false";
+function malloyLiteral(v) {
+  if (isBooleanLiteral(v)) {
+    return v.toLowerCase();
+  }
+  if (isDateLiteral(v)) {
+    return `@${v.slice(0, 10)}`;
+  }
+  return `'${escapeMalloyString(v)}'`;
 }
-function scalarTypeOf(tag) {
-  try {
-    return tag?.scalarType();
-  } catch {
-    return;
+function buildPredicate(filter, value) {
+  const dim = `\`${filter.dimension}\``;
+  switch (filter.type) {
+    case "equal": {
+      const v = Array.isArray(value) ? value[0] : value;
+      return `${dim} = ${malloyLiteral(v)}`;
+    }
+    case "in": {
+      const values = Array.isArray(value) ? value : [value];
+      if (values.length === 1) {
+        return `${dim} = ${malloyLiteral(values[0])}`;
+      }
+      const conditions = values.map((v) => `${dim} = ${malloyLiteral(v)}`);
+      return `(${conditions.join(" or ")})`;
+    }
+    case "like": {
+      const v = Array.isArray(value) ? value[0] : value;
+      const escaped = escapeMalloyString(v.toLowerCase());
+      const pattern = escaped.startsWith("%") || escaped.endsWith("%") ? escaped : `%${escaped}%`;
+      return `lower(${dim}) ~ '${pattern}'`;
+    }
+    case "greater_than": {
+      const v = Array.isArray(value) ? value[0] : value;
+      return `${dim} > ${malloyLiteral(v)}`;
+    }
+    case "less_than": {
+      const v = Array.isArray(value) ? value[0] : value;
+      return `${dim} < ${malloyLiteral(v)}`;
+    }
   }
 }
-function authoredDay(isoText) {
-  const value = new Date(isoText);
-  if (Number.isNaN(value.getTime()))
-    return isoText.slice(0, 10);
-  const atUtcMidnight = value.getUTCHours() === 0 && value.getUTCMinutes() === 0 && value.getUTCSeconds() === 0 && value.getUTCMilliseconds() === 0;
-  const year = atUtcMidnight ? value.getUTCFullYear() : value.getFullYear();
-  const month = atUtcMidnight ? value.getUTCMonth() : value.getMonth();
-  const day = atUtcMidnight ? value.getUTCDate() : value.getDate();
-  return `${year}-${String(month + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
+function filterHasValue(filter, params) {
+  const value = params[filter.name];
+  return value !== undefined && value !== null && (Array.isArray(value) ? value.length > 0 : value !== "");
 }
-function readStartingGivens(tag, declaredType) {
-  const entries = tag?.tag("givens");
-  if (!entries)
-    return;
-  const collected = {};
-  for (const [name, value] of entries.entries()) {
-    const tag2 = value;
-    const text = tagText(tag2);
-    if (text === undefined)
+function buildFilterClause(filters, params) {
+  const predicates = [];
+  for (const filter of filters) {
+    if (!filterHasValue(filter, params)) {
+      if (filter.required) {
+        throw new FilterValidationError(`Required filter "${filter.name}" (dimension: ${filter.dimension}) was not provided`);
+      }
       continue;
-    const declared = declaredType(name);
-    collected[name] = scalarTypeOf(tag2) === "date" && declared !== "timestamp" && declared !== "timestamptz" ? authoredDay(text) : declared?.startsWith("filter<") ? unwrapFilterLiteral(text) : text;
+    }
+    predicates.push(buildPredicate(filter, params[filter.name]));
   }
-  return Object.keys(collected).length > 0 ? collected : undefined;
+  if (predicates.length === 0) {
+    return "";
+  }
+  return predicates.join(" and ");
 }
-var BUILT_IN_PROTO_GETTER, MAX_ANNOTATION_CHARS = 8192, ANNOTATION_TOO_LONG, ENV_REFERENCE_DROPPED = "annotation dropped for carrying an @env. reference", UNSAFE_TO_PARSE = "annotation could not be parsed safely";
-var init_motly = __esm(() => {
-  BUILT_IN_PROTO_GETTER = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__")?.get;
-  ANNOTATION_TOO_LONG = `annotation exceeds ${MAX_ANNOTATION_CHARS} characters and was not parsed`;
-});
-
-// src/service/given.ts
-import {
-  isSourceDef as isSourceDef5
-} from "@malloydata/malloy";
-function presentText(tag, ...path) {
-  const raw = tagText(tag, ...path);
-  return raw !== undefined && raw.trim() !== "" ? raw : undefined;
+function injectFilterRefinement(query, filterClause) {
+  if (!filterClause) {
+    return query;
+  }
+  return `${query.trimEnd()}
++ {where: ${filterClause}}`;
 }
-function readGivenControlSpec(annotationTexts2) {
-  const spec = {};
-  const tag = motlyTag(annotationTexts2);
-  if (!tag)
-    return spec;
-  const label = presentText(tag, "label");
-  if (label !== undefined)
-    spec.label = label;
-  const description = presentText(tag, "description");
-  if (description !== undefined)
-    spec.description = description;
-  const control = tagText(tag, "control");
-  if (control === "select" || control === "multiselect") {
-    spec.control = control;
+function tokenize(input) {
+  const tokens = [];
+  let current = "";
+  let inQuote = false;
+  let quoteChar = "";
+  for (const ch of input) {
+    if (inQuote) {
+      if (ch === quoteChar) {
+        inQuote = false;
+      } else {
+        current += ch;
+      }
+    } else if (ch === '"' || ch === "'") {
+      inQuote = true;
+      quoteChar = ch;
+    } else if (ch === " " || ch === "\t") {
+      if (current) {
+        tokens.push(current);
+        current = "";
+      }
+    } else {
+      current += ch;
+    }
   }
-  const rangeMin = tagNumeric(tag, "range_min");
-  if (rangeMin !== undefined)
-    spec.rangeMin = rangeMin;
-  const rangeMax = tagNumeric(tag, "range_max");
-  if (rangeMax !== undefined)
-    spec.rangeMax = rangeMax;
-  const suggest = tag.tag("suggest");
-  if (suggest) {
-    const parsed = {};
-    const query = presentText(suggest, "query");
-    if (query !== undefined)
-      parsed.query = query;
-    const source = presentText(suggest, "source");
-    if (source !== undefined)
-      parsed.source = source;
-    const dimension = presentText(suggest, "dimension");
-    if (dimension !== undefined)
-      parsed.dimension = dimension;
-    const runnable = parsed.query !== undefined || parsed.source !== undefined && parsed.dimension !== undefined;
-    if (runnable)
-      spec.suggest = parsed;
+  if (current) {
+    tokens.push(current);
   }
-  return spec;
+  return tokens;
 }
-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;
-  const allNotes = given.annotations.forRoute(undefined);
-  return {
-    name: given.name,
-    type: renderedType,
-    annotations: allNotes.filter((note) => !isReservedRoute(note.route)).map((note) => note.text),
-    ...readGivenControlSpec(allNotes.map((note) => note.text)),
-    default: given._internal?.defaultText
+var VALID_FILTER_TYPES, ANNOTATION_PREFIX = "#(filter)", ISO_DATE_RE, ISO_TIMESTAMP_RE, FilterValidationError;
+var init_filter = __esm(() => {
+  VALID_FILTER_TYPES = new Set([
+    "equal",
+    "in",
+    "like",
+    "greater_than",
+    "less_than"
+  ]);
+  ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+  ISO_TIMESTAMP_RE = /^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}/;
+  FilterValidationError = class FilterValidationError extends Error {
+    constructor(message) {
+      super(message);
+      this.name = "FilterValidationError";
+    }
   };
-}
-function collectGivenRefs(value, into) {
-  if (Array.isArray(value)) {
-    for (const item of value)
-      collectGivenRefs(item, into);
-    return;
-  }
-  if (value === null || typeof value !== "object")
-    return;
-  const node = value;
-  if (node.node === "given" && typeof node.refName === "string") {
-    into.add(node.refName);
+});
+
+// src/service/source_extraction.ts
+import {
+  isJoined as isJoined3,
+  isSourceDef as isSourceDef6,
+  modelDefToModelInfo
+} from "@malloydata/malloy";
+function joinFieldNamesUnresolvableDeclaration(field, modelDef) {
+  const ids = [field.referenceID, field.sourceID].filter((id) => !!id);
+  if (ids.length === 0)
+    return false;
+  for (const id of ids) {
+    const entry = modelDef.sourceRegistry?.[id]?.entry;
+    if (!entry)
+      continue;
+    const declared = entry.type === "source_registry_reference" ? modelDef.contents[entry.name] : entry;
+    if (declared && isSourceDef6(declared))
+      return false;
   }
-  for (const child of Object.values(node))
-    collectGivenRefs(child, into);
+  return true;
 }
-function gateGivenSource(sources, name) {
-  const source = sources.find((candidate) => candidate.name === name);
-  if (!source)
+function isEarlierPosition(a, b) {
+  return a.line < b.line || a.line === b.line && a.character < b.character;
+}
+function considerNoteOwner(declaredBy, note, candidate) {
+  const location = candidate.location;
+  if (!location || location.url !== note.at.url)
     return;
-  return [...source.authorize ?? [], ...source.accessFilter ?? []];
+  const currentLocation = declaredBy.get(note)?.location;
+  if (!currentLocation || isEarlierPosition(location.range.start, currentLocation.range.start)) {
+    declaredBy.set(note, candidate);
+  }
 }
-function suggestGivenLookup(modelDef, gatesBySource, surfaced) {
-  const registry = modelDef.givens ?? {};
-  const bySource = new Map;
-  const byQuery = new Map;
+function collectSourceInfos(modelDef) {
+  const names = Object.keys(modelDef.contents).filter((name) => isSourceDef6(modelDef.contents[name]));
+  const exports = [...new Set([...modelDef.exports, ...names])];
+  return modelDefToModelInfo({ ...modelDef, exports }).entries.filter((entry) => entry.kind === "source");
+}
+function extractSourcesFromModelDef(modelDef, givens, onParseError) {
+  const filterMap = new Map;
+  const authorizeMap = new Map;
+  const misplacedAuthorize = [];
+  const gatedSourceOwnAuthorizeNotes = new Set;
+  const authorizeNoteDeclaredBy = new Map;
+  const nearMissAuthorize = [];
+  const sweptStructs = [];
   for (const obj of Object.values(modelDef.contents)) {
-    if (isSourceDef5(obj)) {
-      const name = obj.as || obj.name;
-      const refs = new Set;
-      collectGivenRefs(obj.filterList, refs);
-      for (const expr of gatesBySource(name) ?? []) {
-        for (const given of referencedGivenNames(expr))
-          refs.add(given);
+    if (!isSourceDef6(obj))
+      continue;
+    const struct = obj;
+    sweptStructs.push(obj);
+    for (const note of ownLevelNotes(struct.annotations)) {
+      if (containsAuthorizeAnnotationTag([note.text])) {
+        gatedSourceOwnAuthorizeNotes.add(note);
+        considerNoteOwner(authorizeNoteDeclaredBy, note, struct);
       }
-      bySource.set(name, Array.from(refs));
-    } else if (obj.type === "query") {
-      const query = obj;
-      byQuery.set(query.as || query.name, {
-        own: (query.givenUsage ?? []).map((usage) => registry[usage.id]?.name).filter((n) => n !== undefined),
-        source: typeof query.structRef === "string" ? query.structRef : undefined
+    }
+    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes([
+      ...ownLevelNotes(struct.annotations),
+      ...struct.fields.flatMap((field) => ownLevelNotes(field.annotations))
+    ].map((note) => note.text)));
+  }
+  for (const value of Object.values(modelDef.sourceRegistry ?? {})) {
+    const entry = value.entry;
+    if (entry.type === "source_registry_reference")
+      continue;
+    if (!isSourceDef6(entry))
+      continue;
+    sweptStructs.push(entry);
+    for (const note of ownLevelNotes(entry.annotations)) {
+      if (containsAuthorizeAnnotationTag([note.text])) {
+        gatedSourceOwnAuthorizeNotes.add(note);
+        considerNoteOwner(authorizeNoteDeclaredBy, note, entry);
+      }
+    }
+    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes(ownLevelNotes(entry.annotations).map((note) => note.text)));
+  }
+  for (const struct of derivedStructsReachable(sweptStructs, modelDef)) {
+    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes([
+      ...ownLevelNotes(struct.annotations),
+      ...struct.fields.flatMap((field) => ownLevelNotes(field.annotations))
+    ].map((note) => note.text)));
+  }
+  {
+    const folded = modelAnnotations(modelDef);
+    nearMissAuthorize.push(...collectAuthorizeNearMissesAllRoutes([...folded.notes ?? [], ...folded.blockNotes ?? []].map((note) => note.text)));
+  }
+  assertNoAuthorizeNearMisses(nearMissAuthorize);
+  const authorizeOwnNotes = new Map;
+  const attributedAuthorizeOwnNotes = new Map;
+  {
+    const fileNoteTexts = ownLevelNoteTexts(modelAnnotations(modelDef));
+    if (containsAuthorizeAnnotationTag(fileNoteTexts)) {
+      misplacedAuthorize.push({
+        kind: "file",
+        route: fileNoteTexts.map((text) => authorizeAnnotationRoute(text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
       });
     }
   }
-  const narrow = (names) => Array.from(new Set(names)).filter((name) => surfaced === undefined || surfaced.has(name));
-  return {
-    forSource: (name) => {
-      const found = bySource.get(name);
-      return found && narrow(found);
-    },
-    forQuery: (name) => {
-      const found = byQuery.get(name);
-      if (!found)
-        return;
-      return narrow([
-        ...found.own,
-        ...found.source ? bySource.get(found.source) ?? [] : []
-      ]);
+  const sources = Object.values(modelDef.contents).filter((obj) => isSourceDef6(obj)).map((sourceObj) => {
+    const struct = sourceObj;
+    const sourceName = struct.as || struct.name;
+    const annotations = annotationTexts(struct.annotations);
+    const collected = [];
+    let cur = struct.annotations;
+    while (cur) {
+      if (cur.blockNotes) {
+        collected.push(cur.blockNotes.map((note) => note.text));
+      }
+      cur = cur.inherits;
+    }
+    const allAnnotations = collected.reverse().flat();
+    let filters;
+    if (allAnnotations.length > 0) {
+      try {
+        const parsed = parseFilters(allAnnotations);
+        if (parsed.length > 0) {
+          filterMap.set(sourceName, parsed);
+          const fields = struct.fields;
+          filters = parsed.map((f) => {
+            const field = fields.find((fd) => (fd.as || fd.name) === f.dimension);
+            return {
+              name: f.name,
+              dimension: f.dimension,
+              type: f.type,
+              implicit: f.implicit,
+              required: f.required,
+              dimensionType: field?.type
+            };
+          });
+        }
+      } catch (err) {
+        onParseError?.(sourceName, err);
+      }
+    }
+    const ownNotes = ownLevelNoteTexts(struct.annotations);
+    const ownAuthorizeNotes = ownLevelNotes(struct.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
+    const ownNotesByRoute = new Map;
+    const attributedOwnNotesByRoute = new Map;
+    for (const route of CANONICAL_AUTHORIZE_ROUTES) {
+      const notesForRoute = ownAuthorizeNotes.filter((note) => authorizeAnnotationRoute(note.text) === route);
+      ownNotesByRoute.set(route, notesForRoute);
+      attributedOwnNotesByRoute.set(route, notesForRoute.filter((note) => authorizeNoteDeclaredBy.get(note) === struct));
+    }
+    authorizeOwnNotes.set(sourceName, ownNotesByRoute);
+    attributedAuthorizeOwnNotes.set(sourceName, attributedOwnNotesByRoute);
+    const groupsForSource = [];
+    const routeGroupsByRoute = new Map;
+    for (const route of CANONICAL_AUTHORIZE_ROUTES) {
+      const ownExprsForRoute = collectAuthorizeExprsForRoute(ownNotes, route);
+      const groupsForRoute = ownExprsForRoute.length > 0 ? [ownExprsForRoute] : effectiveAncestorGateExprs(struct, modelDef, route);
+      for (const exprs of groupsForRoute) {
+        groupsForSource.push({ route, exprs });
+      }
+      routeGroupsByRoute.set(route, groupsForRoute);
+    }
+    if (groupsForSource.length > 0) {
+      authorizeMap.set(sourceName, groupsForSource);
+    }
+    const routeGroupsToFlatWire = (groups) => groups && groups.length > 0 ? groups.flat() : undefined;
+    const authorize = routeGroupsToFlatWire(routeGroupsByRoute.get(AUTHORIZE_ROUTE));
+    const accessFilter = routeGroupsToFlatWire(routeGroupsByRoute.get(ACCESS_FILTER_ROUTE));
+    const views = struct.fields.filter((field) => field.type === "turtle").filter((turtle) => turtle.pipeline.map((stage) => stage.type).every((type) => type === "reduce")).map((turtle) => ({
+      name: turtle.as || turtle.name,
+      annotations: annotationTexts(turtle.annotations)
+    }));
+    for (const field of struct.fields) {
+      const fieldAuthorizeNotes = ownLevelNotes(field.annotations).filter((note) => containsAuthorizeAnnotationTag([note.text]));
+      if (fieldAuthorizeNotes.length === 0)
+        continue;
+      if (fieldAuthorizeNotes.every((note) => gatedSourceOwnAuthorizeNotes.has(note))) {
+        continue;
+      }
+      const fieldName = field.as || field.name;
+      if (isJoined3(field) && isSourceDef6(field)) {
+        const joinedStruct = field;
+        if (joinFieldNamesUnresolvableDeclaration(joinedStruct, modelDef)) {
+          continue;
+        }
+        misplacedAuthorize.push({
+          kind: "field",
+          name: sourceName,
+          fieldName,
+          route: fieldAuthorizeNotes.map((note) => authorizeAnnotationRoute(note.text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
+        });
+        continue;
+      }
+      misplacedAuthorize.push({
+        kind: "field",
+        name: sourceName,
+        fieldName,
+        route: fieldAuthorizeNotes.map((note) => authorizeAnnotationRoute(note.text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
+      });
     }
+    return {
+      name: sourceName,
+      annotations,
+      views,
+      filters,
+      givens,
+      authorize,
+      accessFilter
+    };
+  });
+  return {
+    sources,
+    filterMap,
+    authorizeMap,
+    misplacedAuthorize,
+    authorizeOwnNotes,
+    attributedAuthorizeOwnNotes
   };
 }
-function suggestGivenNames(suggest, lookup) {
-  const names = suggest.query !== undefined ? lookup.forQuery(suggest.query) : suggest.source !== undefined ? lookup.forSource(suggest.source) : undefined;
-  return names && names.length > 0 ? names : undefined;
-}
-function attachSuggestGivenNames(givens, lookup) {
-  for (const given of givens ?? []) {
-    if (!given.suggest)
-      continue;
-    const names = suggestGivenNames(given.suggest, lookup);
-    if (names)
-      given.suggest.givenNames = names;
-    else
-      delete given.suggest.givenNames;
-  }
+function extractQueriesFromModelDef(modelDef) {
+  const isNamedQuery = (obj) => obj.type === "query";
+  const namedQueries = Object.values(modelDef.contents).filter(isNamedQuery);
+  const misplacedAuthorize = namedQueries.filter((queryObj) => containsAuthorizeAnnotationTag(ownLevelNoteTexts(queryObj.annotations))).map((queryObj) => ({
+    kind: "query",
+    name: queryObj.as || queryObj.name,
+    route: ownLevelNoteTexts(queryObj.annotations).map((text) => authorizeAnnotationRoute(text)).find((r) => r !== undefined) ?? ACCESS_FILTER_ROUTE
+  }));
+  const queries = namedQueries.map((queryObj) => ({
+    name: queryObj.as || queryObj.name,
+    sourceName: typeof queryObj.structRef === "string" ? queryObj.structRef : undefined,
+    annotations: annotationTexts(queryObj.annotations)
+  }));
+  return { queries, misplacedAuthorize };
 }
-var init_given = __esm(() => {
+var init_source_extraction = __esm(() => {
   init_annotations();
   init_authorize();
-  init_motly();
+  init_authorize_routes();
+  init_filter();
+  init_gate_registry_walk();
 });
 
 // src/utils.ts
@@ -15353,7 +15879,7 @@ init_gate_dimension();
 var import_recursive_readdir = __toESM(require_recursive_readdir(), 1);
 import {
   contextOverlay,
-  isSourceDef as isSourceDef6,
+  isSourceDef as isSourceDef7,
   MalloyConfig,
   MalloyError as MalloyError2,
   modelDefToModelInfo as modelDefToModelInfo2,
@@ -15370,6 +15896,8 @@ import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
 
 // src/service/package_manifest.ts
 init_constants();
+init_errors();
+init_dashboard();
 var FRESHNESS_FALLBACKS = ["live", "stale_ok", "fail"];
 var PACKAGE_SCOPES = ["version", "package"];
 function parsePackageScope(raw) {
@@ -15379,7 +15907,7 @@ function parsePackageScope(raw) {
   if (PACKAGE_SCOPES.includes(raw)) {
     return raw;
   }
-  throw new Error(`Invalid "scope" in the package manifest: ${JSON.stringify(raw)}. ` + `Expected "version" or "package" (default "package").`);
+  throw new PackageManifestError(`Invalid "scope" in the package manifest: ${JSON.stringify(raw)}. ` + `Expected "version" or "package" (default "package").`);
 }
 function resolvePackageScope(rootRaw, materializationRaw) {
   const envelopeRaw = materializationRaw && typeof materializationRaw === "object" ? materializationRaw.scope : undefined;
@@ -15389,7 +15917,7 @@ function resolvePackageScope(rootRaw, materializationRaw) {
   const envelopeScope = parsePackageScope(envelopeRaw);
   if (rootDeclared && envelopeDeclared) {
     if (rootScope !== envelopeScope) {
-      throw new Error(`Conflicting "scope" in publisher.json: root "${rootScope}" vs ` + `"materialization.scope" "${envelopeScope}". The package cannot ` + `load until they agree. Edit "materialization": { "scope": ... } ` + `to the value you want and delete the root-level "scope" (the ` + `server rewrites both homes on its next manifest write).`);
+      throw new PackageManifestError(`Conflicting "scope" in publisher.json: root "${rootScope}" vs ` + `"materialization.scope" "${envelopeScope}". The package cannot ` + `load until they agree. Edit "materialization": { "scope": ... } ` + `to the value you want and delete the root-level "scope" (the ` + `server rewrites both homes on its next manifest write).`);
     }
     return { scope: envelopeScope, warnings: [] };
   }
@@ -15502,43 +16030,51 @@ function resolveExplores(input) {
   const hasIndexModel = modelPaths.includes(INDEX_MODEL_NAME);
   const warnings = [];
   if (declaredExplores !== undefined && !(Array.isArray(declaredExplores) && declaredExplores.every((entry) => typeof entry === "string"))) {
-    throw new Error(`Invalid "explores" in publisher.json: expected an array of model ` + `paths, got ${JSON.stringify(declaredExplores)}. The package is ` + `not served, because ignoring the key would publish every source ` + `it was meant to withhold. Fix: "explores": ` + `["${INDEX_MODEL_NAME}"], or delete the key to use a root ` + `"${INDEX_MODEL_NAME}" instead.`);
+    throw new PackageManifestError(`Invalid "explores" in publisher.json: it must be a list of file ` + `names, but is ${JSON.stringify(declaredExplores)}. The package ` + `was not loaded. Fix: delete "explores" and add an ` + `${INDEX_MODEL_NAME}.`);
   }
   const declared = Array.isArray(declaredExplores) ? declaredExplores.map((entry) => normalizeModelPath(entry)) : undefined;
   if (declaredQueryableSources !== undefined && declaredQueryableSources !== "all") {
     warnings.push(QUERYABLE_SOURCES_DEPRECATION);
   }
   if (declared !== undefined) {
-    if (declared.length === 0 && !hasIndexModel) {
-      warnings.push(EXPLORES_EMPTY_IS_UNCURATED);
-    } else if (declared.length === 0) {
-      warnings.push(EXPLORES_EMPTY_SUPPRESSES_CONVENTION);
-    } else if (declared.length === 1) {
-      warnings.push(EXPLORES_DEPRECATION);
+    if (declared.length === 0) {
+      warnings.push(hasIndexModel ? EXPLORES_EMPTY_SUPPRESSES_CONVENTION : EXPLORES_EMPTY_IS_UNCURATED);
+    } else {
+      warnings.push(exploresDeprecation(declared, hasIndexModel));
     }
-    if (hasIndexModel && declared.length > 0) {
-      if (!declared.includes(INDEX_MODEL_NAME)) {
-        warnings.push(exploresOmitsIndexModel(declared));
-      }
+    if (hasIndexModel && declared.length > 0 && !declared.includes(INDEX_MODEL_NAME)) {
+      warnings.push(EXPLORES_OMITS_INDEX_MODEL);
     }
     return { explores: declared, warnings };
   }
   if (!hasIndexModel) {
+    for (const modelPath of modelPaths) {
+      if (!modelPath.includes("/") && modelPath.toLowerCase() === INDEX_MODEL_NAME) {
+        warnings.push(`${modelPath} is ignored: only a root file named exactly ` + `${INDEX_MODEL_NAME} decides what is published. Fix: rename ` + `it to ${INDEX_MODEL_NAME}.`);
+      }
+    }
     return { explores: undefined, warnings };
   }
-  if (modelPaths.some((modelPath) => modelPath.endsWith(MODEL_FILE_SUFFIX) && modelPath !== INDEX_MODEL_NAME)) {
-    warnings.push(INDEX_MODEL_IS_THE_SURFACE);
-  }
   return { explores: [INDEX_MODEL_NAME], warnings };
 }
-var INDEX_MODEL_IS_THE_SURFACE = `This package has a root "${INDEX_MODEL_NAME}" and no "explores" in ` + `publisher.json, so that file is its published surface: only it is listed, ` + `and sources it does not "export { ... }" are refused by name with a 404. ` + `Other models still compile and are still importable and joinable. If that ` + `is intended, nothing to do. If this package is not meant to be curated, ` + `add "explores": [] to publisher.json, which keeps every model listed and ` + `queryable. Do NOT rename or delete the file to opt out: that widens the ` + `surface silently and breaks every import that names it.`;
-function exploresOmitsIndexModel(declared) {
-  return `This package has an "${INDEX_MODEL_NAME}" but its publisher.json ` + `"explores" does not list it (${JSON.stringify(declared)}). The ` + `explicit key wins, so "${INDEX_MODEL_NAME}" is neither listed nor ` + `queryable. If that is intended, rename the file to silence this. If you ` + `meant it to be the package's entry point, delete "explores" and let the ` + `convention use it, or add it to the list.`;
+function listFiles(files) {
+  return files.length <= 1 ? files[0] ?? "" : `${files.slice(0, -1).join(", ")} and ${files[files.length - 1]}`;
+}
+function exploresDeprecation(declared, hasIndexModel) {
+  const lead = `"explores" in publisher.json is deprecated.`;
+  const files = declared.filter((entry) => entry !== INDEX_MODEL_NAME && !isDashboardModelPath(entry));
+  if (files.length > 0) {
+    return hasIndexModel ? `${lead} Fix: import ${listFiles(files)} into ${INDEX_MODEL_NAME}, ` + `export the sources you publish from it, then delete "explores".` : `${lead} Fix: add an ${INDEX_MODEL_NAME} at the package root that ` + `imports ${listFiles(files)} and exports the sources you want to ` + `publish, then delete "explores".`;
+  }
+  if (declared.includes(INDEX_MODEL_NAME)) {
+    return `${lead} ${INDEX_MODEL_NAME} already publishes the same thing. ` + `Fix: delete "explores".`;
+  }
+  return hasIndexModel ? `${lead} Fix: delete "explores", so ${INDEX_MODEL_NAME} decides what is published.` : `${lead} Fix: add an ${INDEX_MODEL_NAME} at the package root that ` + `exports the sources you want to publish, then delete "explores".`;
 }
-var EXPLORES_DEPRECATION = `"explores" in publisher.json is deprecated: put an "${INDEX_MODEL_NAME}" ` + `at the package root that imports your models and "export { ... }"s what ` + `you publish, then delete the key. The file is the surface, it is checked ` + `by the compiler rather than by a path list, and it curates and enforces ` + `exactly as the key does. The key still works and is not going away in this ` + `release.`;
-var EXPLORES_EMPTY_SUPPRESSES_CONVENTION = `"explores": [] in publisher.json is keeping this package uncurated. It has ` + `an "${INDEX_MODEL_NAME}", which would otherwise be its published surface: ` + `only that file would be listed, and sources it does not export would stop ` + `answering by name. The empty array suppresses that, so every model stays ` + `listed and queryable. This is supported and is the intended way to opt out ` + `-- do NOT delete the key unless you want the convention to take effect.`;
-var EXPLORES_EMPTY_IS_UNCURATED = `"explores": [] in publisher.json is keeping this package uncurated: every ` + `model is listed and queryable by name. This is supported and is the ` + `intended way to say "do not curate". Nothing to do unless you meant to ` + `publish a surface, in which case list the models, or add a root ` + `"${INDEX_MODEL_NAME}" and delete the key.`;
-var QUERYABLE_SOURCES_DEPRECATION = `"queryableSources" in publisher.json is deprecated. "declared" is already ` + `the default, so the key changes nothing, and an "${INDEX_MODEL_NAME}" ` + `gives the same curated-and-enforced surface with no manifest field at all. ` + `Delete it. The key still works and is not going away in this release.`;
+var EXPLORES_OMITS_INDEX_MODEL = `${INDEX_MODEL_NAME} is ignored because "explores" in publisher.json ` + `doesn't list it. Fix: delete "explores" to publish what ` + `${INDEX_MODEL_NAME} exports, or rename ${INDEX_MODEL_NAME} (and any import ` + `of it) if it isn't meant to decide what is published.`;
+var EXPLORES_EMPTY_SUPPRESSES_CONVENTION = `"explores" in publisher.json is deprecated. Here it stops ` + `${INDEX_MODEL_NAME} from limiting what this package publishes. Fix: to ` + `publish everything, rename ${INDEX_MODEL_NAME}, point any import of it at ` + `the new name, then delete "explores".`;
+var EXPLORES_EMPTY_IS_UNCURATED = `"explores": [] in publisher.json does nothing. Fix: delete it.`;
+var QUERYABLE_SOURCES_DEPRECATION = `"queryableSources" in publisher.json does nothing. Fix: delete it.`;
 
 // src/package_load/package_load_worker.ts
 init_source_extraction();
@@ -15776,7 +16312,15 @@ function buildWorkerMalloyConfig(job) {
 async function readPackageMetadata(packagePath, modelPaths) {
   const manifestPath = path2.join(packagePath, PACKAGE_MANIFEST_NAME);
   const contents = await fs2.promises.readFile(manifestPath, "utf8");
-  const parsed = JSON.parse(contents);
+  let parsed;
+  try {
+    parsed = JSON.parse(contents);
+  } catch (error) {
+    throw new PackageManifestError(`Invalid ${PACKAGE_MANIFEST_NAME}: it is not valid JSON ` + `(${error instanceof Error ? error.message : String(error)}). ` + `The package is not served until the file parses. Fix: make it ` + `valid JSON; a trailing comma or an unquoted key is the usual cause.`);
+  }
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new PackageManifestError(`Invalid ${PACKAGE_MANIFEST_NAME}: expected a JSON object, got ` + `${JSON.stringify(parsed)}. Fix: { "name": "my-package" }.`);
+  }
   const scope = resolvePackageScope(parsed.scope, parsed.materialization);
   const queryMetadata = resolvePackageQueryMetadata(parsed.queryMetadata, parsed.materialization);
   const explores = resolveExplores({
@@ -15910,7 +16454,7 @@ async function compileMalloyModel(job, malloyConfig, modelPath) {
     onRowLevelGateUnexpressible: authorizeWarningCollection.onRowLevelGateUnexpressible,
     onOwnRowLevelConditionCompiled: (sourceName, condition, route) => {
       const struct = modelDef.contents[sourceName];
-      if (!struct || !isSourceDef6(struct))
+      if (!struct || !isSourceDef7(struct))
         return;
       validateSourceLineGateGivenUsage(sourceName, route, struct, condition.refSummary, condition.e, modelDef, (cause, detail) => {
         recordRowLevelGateRejected(cause);
@@ -16035,7 +16579,7 @@ async function compileNotebookModel(job, malloyConfig, modelPath) {
       onRowLevelGateUnexpressible: authorizeWarningCollection.onRowLevelGateUnexpressible,
       onOwnRowLevelConditionCompiled: (sourceName, condition, route) => {
         const struct = finalCompiledModelDef.contents[sourceName];
-        if (!struct || !isSourceDef6(struct))
+        if (!struct || !isSourceDef7(struct))
           return;
         validateSourceLineGateGivenUsage(sourceName, route, struct, condition.refSummary, condition.e, finalCompiledModelDef, (cause, detail) => {
           recordRowLevelGateRejected(cause);
@@ -16133,6 +16677,14 @@ function serializeError(error) {
       isCompilationError: true
     };
   }
+  if (error instanceof PackageManifestError) {
+    return {
+      name: error.name,
+      message: error.message,
+      stack: error.stack,
+      isManifestError: true
+    };
+  }
   if (error instanceof Error) {
     return {
       name: error.name,