npm - @malloy-publisher/server - Versions diffs - 0.0.248 → 0.0.249 - Mend

@malloy-publisher/server 0.0.248 → 0.0.249

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist/app/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
          href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap"
       />
       <title>Malloy Publisher</title>
-     <script type="module" crossorigin src="/assets/index-BwoU1Ko8.js"></script>
+     <script type="module" crossorigin src="/assets/index-t7IEDVsK.js"></script>
      <link rel="stylesheet" crossorigin href="/assets/index-5eLCcNmP.css">
    </head>
    <body>

package/dist/package_load_worker.mjs CHANGED Viewed

@@ -2369,6 +2369,8 @@ function internalErrorToHttpError(error) {
     return httpError(404, error.message);
   } else if (error instanceof ModelNotFoundError) {
     return httpError(404, error.message);
+  } else if (error instanceof DashboardNotFoundError) {
+    return httpError(404, error.message);
   } else if (error instanceof NotQueryableError) {
     return httpError(404, error.message);
   } else if (error instanceof MalloyError) {
@@ -2414,7 +2416,7 @@ function httpError(code, message) {
     }
   };
 }
-var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, ConnectionNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
+var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
 var init_errors = __esm(() => {
   init_constants();
   NotImplementedError = class NotImplementedError extends Error {
@@ -2444,6 +2446,11 @@ var init_errors = __esm(() => {
       super(message);
     }
   };
+  DashboardNotFoundError = class DashboardNotFoundError extends Error {
+    constructor(message) {
+      super(message);
+    }
+  };
   ConnectionNotFoundError = class ConnectionNotFoundError extends Error {
     constructor(message) {
       super(message);
@@ -14186,19 +14193,352 @@ var init_source_extraction = __esm(() => {
   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;
+      }
+      continue;
+    }
+    if ((typeof value === "object" || typeof value === "function") && value !== null && !targets.includes(value)) {
+      targets.push(value);
+    }
+  }
+  return targets;
+}
+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] };
+  }
+}
+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) };
+  }
+  const { title, body } = splitDocComment(texts);
+  return { title, description: body };
+}
+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;
+    }
+    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;
+      }
+    }
+    out += char;
+    i += 1;
+  }
+  return out;
+}
+function endOfDelimited(text, start) {
+  const char = text[start];
+  if (char === "`") {
+    let i = start + 1;
+    while (i < text.length) {
+      if (text[i] === "\\") {
+        i += 2;
+        continue;
+      }
+      if (text[i] === "`")
+        return i + 1;
+      if (text[i] === `
+`)
+        return text.length;
+      i += 1;
+    }
+    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;
+    }
+  }
+  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 text.length;
+    }
+    let i = start + 1;
+    while (i < text.length) {
+      if (text[i] === "\\") {
+        i += 2;
+        continue;
+      }
+      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] };
+}
+function tagText(tag, ...path) {
+  try {
+    return tag?.text(...path);
+  } catch {
+    return;
+  }
+}
+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/given.ts
+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;
+  const allNotes = given.annotations.forRoute(undefined);
   return {
     name: given.name,
     type: renderedType,
-    annotations: given.annotations.forRoute(undefined).filter((note) => !isReservedRoute(note.route)).map((note) => note.text),
+    annotations: allNotes.filter((note) => !isReservedRoute(note.route)).map((note) => note.text),
+    ...readGivenControlSpec(allNotes.map((note) => note.text)),
     default: given._internal?.defaultText
   };
 }
 var init_given = __esm(() => {
   init_annotations();
+  init_motly();
 });
 // src/utils.ts