@malloy-publisher/server 0.0.244 → 0.0.246

package/dist/package_load_worker.mjs

@@ -11447,6 +11447,56 @@ var init_logger = __esm(() => {
   SENSITIVE_KEYS = new Set(SENSITIVE_KEY_NAMES.map((name) => name.toLowerCase()));
 });
 
+// src/data_styles.ts
+function compileDataStyles(styles) {
+  try {
+    return JSON.parse(styles);
+  } catch (error) {
+    throw new Error(`Error compiling data styles: ${error}`);
+  }
+}
+async function dataStylesForFile(url, text, urlReader) {
+  const PREFIX = "--! styles ";
+  let styles = {};
+  for (const line of text.split(`
+`)) {
+    if (line.startsWith(PREFIX)) {
+      const fileName = line.trimEnd().substring(PREFIX.length);
+      let stylesText;
+      try {
+        stylesText = await urlReader.readURL(new URL(fileName, url));
+      } catch (error) {
+        logger.error(`Error loading data style '${fileName}': ${error}`);
+        stylesText = "{}";
+      }
+      styles = { ...styles, ...compileDataStyles(stylesText) };
+    }
+  }
+  return styles;
+}
+
+class HackyDataStylesAccumulator {
+  urlReader;
+  dataStyles = {};
+  constructor(urlReader) {
+    this.urlReader = urlReader;
+  }
+  async readURL(url) {
+    const contents = await this.urlReader.readURL(url);
+    this.dataStyles = {
+      ...this.dataStyles,
+      ...await dataStylesForFile(url.toString(), contents, this.urlReader)
+    };
+    return contents;
+  }
+  getHackyAccumulatedDataStyles() {
+    return this.dataStyles;
+  }
+}
+var init_data_styles = __esm(() => {
+  init_logger();
+});
+
 // src/errors.ts
 import { MalloyError } from "@malloydata/malloy";
 function internalErrorToHttpError(error) {
@@ -11629,81 +11679,7 @@ var init_errors = __esm(() => {
   };
 });
 
-// src/package_load/package_load_worker.ts
-init_constants();
-var import_recursive_readdir = __toESM(require_recursive_readdir(), 1);
-import {
-  contextOverlay,
-  MalloyConfig,
-  MalloyError as MalloyError2,
-  modelDefToModelInfo,
-  Runtime
-} from "@malloydata/malloy";
-import {
-  MalloySQLParser,
-  MalloySQLStatementType
-} from "@malloydata/malloy-sql";
-import * as fs2 from "fs";
-import * as path2 from "path";
-import { parentPort, threadId } from "node:worker_threads";
-import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
-
-// src/data_styles.ts
-init_logger();
-function compileDataStyles(styles) {
-  try {
-    return JSON.parse(styles);
-  } catch (error) {
-    throw new Error(`Error compiling data styles: ${error}`);
-  }
-}
-async function dataStylesForFile(url, text, urlReader) {
-  const PREFIX = "--! styles ";
-  let styles = {};
-  for (const line of text.split(`
-`)) {
-    if (line.startsWith(PREFIX)) {
-      const fileName = line.trimEnd().substring(PREFIX.length);
-      let stylesText;
-      try {
-        stylesText = await urlReader.readURL(new URL(fileName, url));
-      } catch (error) {
-        logger.error(`Error loading data style '${fileName}': ${error}`);
-        stylesText = "{}";
-      }
-      styles = { ...styles, ...compileDataStyles(stylesText) };
-    }
-  }
-  return styles;
-}
-
-class HackyDataStylesAccumulator {
-  urlReader;
-  dataStyles = {};
-  constructor(urlReader) {
-    this.urlReader = urlReader;
-  }
-  async readURL(url) {
-    const contents = await this.urlReader.readURL(url);
-    this.dataStyles = {
-      ...this.dataStyles,
-      ...await dataStylesForFile(url.toString(), contents, this.urlReader)
-    };
-    return contents;
-  }
-  getHackyAccumulatedDataStyles() {
-    return this.dataStyles;
-  }
-}
-
-// src/package_load/package_load_worker.ts
-init_errors();
-
 // src/service/authorize.ts
-init_errors();
-var AUTHORIZE_TAG = String.raw`##?\(\s*authorize\s*\)`;
-var AUTHORIZE_ANNOTATION_ANYWHERE = new RegExp(AUTHORIZE_TAG);
-var AUTHORIZE_ANNOTATION_PREFIX = new RegExp(`^${AUTHORIZE_TAG}`);
 function assertNoCallerAuthorizeAnnotation(callerText) {
   if (!AUTHORIZE_ANNOTATION_ANYWHERE.test(callerText))
     return;
@@ -11723,8 +11699,6 @@ ${givenDecls.map((g) => `  ${g.name} :: ${g.type}`).join(`
     limit: 1
   }`;
 }
-var GIVEN_REF_PATTERN = /\$([A-Za-z_][A-Za-z0-9_]*)/g;
-var STRING_LITERAL_PATTERN = /'(?:\\.|[^'\\])*'/g;
 function referencedGivenNames(expr) {
   const scanned = expr.replace(STRING_LITERAL_PATTERN, "''");
   const names = [];
@@ -11898,92 +11872,15 @@ function unwrapQuotedExpression(body) {
   }
   return expr;
 }
-
-// src/service/package_manifest.ts
-var FRESHNESS_FALLBACKS = ["live", "stale_ok", "fail"];
-var PACKAGE_SCOPES = ["version", "package"];
-function parsePackageScope(raw) {
-  if (raw === undefined || raw === null) {
-    return "package";
-  }
-  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").`);
-}
-function resolvePackageScope(rootRaw, materializationRaw) {
-  const envelopeRaw = materializationRaw && typeof materializationRaw === "object" ? materializationRaw.scope : undefined;
-  const rootDeclared = rootRaw !== undefined && rootRaw !== null;
-  const envelopeDeclared = envelopeRaw !== undefined && envelopeRaw !== null;
-  const rootScope = parsePackageScope(rootRaw);
-  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).`);
-    }
-    return { scope: envelopeScope, warnings: [] };
-  }
-  if (rootDeclared) {
-    return { scope: rootScope, warnings: [SCOPE_ROOT_DEPRECATION] };
-  }
-  return { scope: envelopeScope, warnings: [] };
-}
-var SCOPE_ROOT_DEPRECATION = `"scope" at the manifest root is deprecated: declare it as ` + `"materialization": { "scope": ... } alongside the other build knobs. The ` + `root form still works and will be removed in a future release; until then ` + `the server keeps both homes in sync when it writes the manifest, so an ` + `older publisher still reads the right value.`;
-function parseFreshness(raw) {
-  if (!raw || typeof raw !== "object") {
-    return null;
-  }
-  const { window: window2, fallback } = raw;
-  const freshness = {};
-  if (typeof window2 === "string") {
-    freshness.window = window2;
-  }
-  if (typeof fallback === "string" && FRESHNESS_FALLBACKS.includes(fallback)) {
-    freshness.fallback = fallback;
-  }
-  return freshness;
-}
-function parseQueryMetadata(raw) {
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-    return { metadata: null, warnings: [] };
-  }
-  const out = {};
-  const warnings = [];
-  for (const [name, value] of Object.entries(raw)) {
-    if (typeof value === "string") {
-      out[name] = value;
-    } else {
-      warnings.push(`materialization.queryMetadata: property '${name}' must be a ` + `string (got ${value === null ? "null" : typeof value}); it is ` + `not attached to any statement`);
-    }
-  }
-  return {
-    metadata: Object.keys(out).length > 0 ? out : null,
-    warnings
-  };
-}
-function parsePackageMaterialization(raw) {
-  if (!raw || typeof raw !== "object") {
-    return null;
-  }
-  const { schedule, freshness, queryMetadata } = raw;
-  return {
-    schedule: typeof schedule === "string" ? schedule : null,
-    freshness: parseFreshness(freshness),
-    queryMetadata: parseQueryMetadata(queryMetadata).metadata
-  };
-}
-function packageMaterializationWarnings(raw) {
-  if (!raw || typeof raw !== "object") {
-    return [];
-  }
-  const { queryMetadata } = raw;
-  return parseQueryMetadata(queryMetadata).warnings;
-}
-
-// src/service/source_extraction.ts
-import {
-  isSourceDef
-} from "@malloydata/malloy";
+var AUTHORIZE_TAG, AUTHORIZE_ANNOTATION_ANYWHERE, AUTHORIZE_ANNOTATION_PREFIX, GIVEN_REF_PATTERN, STRING_LITERAL_PATTERN;
+var init_authorize = __esm(() => {
+  init_errors();
+  AUTHORIZE_TAG = String.raw`##?\(\s*authorize\s*\)`;
+  AUTHORIZE_ANNOTATION_ANYWHERE = new RegExp(AUTHORIZE_TAG);
+  AUTHORIZE_ANNOTATION_PREFIX = new RegExp(`^${AUTHORIZE_TAG}`);
+  GIVEN_REF_PATTERN = /\$([A-Za-z_][A-Za-z0-9_]*)/g;
+  STRING_LITERAL_PATTERN = /'(?:\\.|[^'\\])*'/g;
+});
 
 // src/service/annotations.ts
 import { Annotations } from "@malloydata/malloy";
@@ -12045,16 +11942,9 @@ function annotationTexts(annote) {
 function ownLevelNoteTexts(annote) {
   return [...annote?.blockNotes ?? [], ...annote?.notes ?? []].map((note) => note.text);
 }
+var init_annotations = () => {};
 
 // src/service/filter.ts
-var VALID_FILTER_TYPES = new Set([
-  "equal",
-  "in",
-  "like",
-  "greater_than",
-  "less_than"
-]);
-var ANNOTATION_PREFIX = "#(filter)";
 function parseFilterAnnotation(annotation) {
   const trimmed = annotation.trim();
   if (!trimmed.startsWith(ANNOTATION_PREFIX)) {
@@ -12130,8 +12020,6 @@ function isBooleanLiteral(v) {
   const lower = v.toLowerCase();
   return lower === "true" || lower === "false";
 }
-var ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
-var ISO_TIMESTAMP_RE = /^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}/;
 function isDateLiteral(v) {
   return ISO_DATE_RE.test(v) || ISO_TIMESTAMP_RE.test(v);
 }
@@ -12200,13 +12088,6 @@ function injectFilterRefinement(query, filterClause) {
   return `${query.trimEnd()}
 + {where: ${filterClause}}`;
 }
-
-class FilterValidationError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "FilterValidationError";
-  }
-}
 function tokenize(input) {
   const tokens = [];
   let current = "";
@@ -12236,8 +12117,29 @@ function tokenize(input) {
   }
   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";
+    }
+  };
+});
 
 // src/service/source_extraction.ts
+import {
+  isSourceDef
+} from "@malloydata/malloy";
 function extractSourcesFromModelDef(modelDef, givens, onParseError) {
   const filterMap = new Map;
   const authorizeMap = new Map;
@@ -12330,6 +12232,11 @@ function extractQueriesFromModelDef(modelDef) {
     annotations: annotationTexts(queryObj.annotations)
   }));
 }
+var init_source_extraction = __esm(() => {
+  init_annotations();
+  init_authorize();
+  init_filter();
+});
 
 // src/service/given.ts
 function malloyGivenToApi(given) {
@@ -12342,26 +12249,140 @@ function malloyGivenToApi(given) {
     default: given._internal?.defaultText
   };
 }
+var init_given = __esm(() => {
+  init_annotations();
+});
 
 // src/utils.ts
 import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
-var URL_READER = {
-  readURL: (url) => {
-    let path2 = url.toString();
-    if (url.protocol == "file:") {
-      path2 = fileURLToPath(url);
-    }
-    return fs.promises.readFile(path2, "utf8");
-  }
-};
 function ignoreDotfiles(file) {
   return path.basename(file).startsWith(".");
 }
 function errMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
+var URL_READER;
+var init_utils = __esm(() => {
+  URL_READER = {
+    readURL: (url) => {
+      let path2 = url.toString();
+      if (url.protocol == "file:") {
+        path2 = fileURLToPath(url);
+      }
+      return fs.promises.readFile(path2, "utf8");
+    }
+  };
+});
+
+// src/package_load/package_load_worker.ts
+init_constants();
+init_data_styles();
+init_errors();
+init_authorize();
+var import_recursive_readdir = __toESM(require_recursive_readdir(), 1);
+import {
+  contextOverlay,
+  MalloyConfig,
+  MalloyError as MalloyError2,
+  modelDefToModelInfo,
+  Runtime
+} from "@malloydata/malloy";
+import {
+  MalloySQLParser,
+  MalloySQLStatementType
+} from "@malloydata/malloy-sql";
+import * as fs2 from "fs";
+import * as path2 from "path";
+import { parentPort, threadId } from "node:worker_threads";
+import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
+
+// src/service/package_manifest.ts
+var FRESHNESS_FALLBACKS = ["live", "stale_ok", "fail"];
+var PACKAGE_SCOPES = ["version", "package"];
+function parsePackageScope(raw) {
+  if (raw === undefined || raw === null) {
+    return "package";
+  }
+  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").`);
+}
+function resolvePackageScope(rootRaw, materializationRaw) {
+  const envelopeRaw = materializationRaw && typeof materializationRaw === "object" ? materializationRaw.scope : undefined;
+  const rootDeclared = rootRaw !== undefined && rootRaw !== null;
+  const envelopeDeclared = envelopeRaw !== undefined && envelopeRaw !== null;
+  const rootScope = parsePackageScope(rootRaw);
+  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).`);
+    }
+    return { scope: envelopeScope, warnings: [] };
+  }
+  if (rootDeclared) {
+    return { scope: rootScope, warnings: [SCOPE_ROOT_DEPRECATION] };
+  }
+  return { scope: envelopeScope, warnings: [] };
+}
+var SCOPE_ROOT_DEPRECATION = `"scope" at the manifest root is deprecated: declare it as ` + `"materialization": { "scope": ... } alongside the other build knobs. The ` + `root form still works and will be removed in a future release; until then ` + `the server keeps both homes in sync when it writes the manifest, so an ` + `older publisher still reads the right value.`;
+function parseFreshness(raw) {
+  if (!raw || typeof raw !== "object") {
+    return null;
+  }
+  const { window: window2, fallback } = raw;
+  const freshness = {};
+  if (typeof window2 === "string") {
+    freshness.window = window2;
+  }
+  if (typeof fallback === "string" && FRESHNESS_FALLBACKS.includes(fallback)) {
+    freshness.fallback = fallback;
+  }
+  return freshness;
+}
+function parseQueryMetadata(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    return { metadata: null, warnings: [] };
+  }
+  const out = {};
+  const warnings = [];
+  for (const [name, value] of Object.entries(raw)) {
+    if (typeof value === "string") {
+      out[name] = value;
+    } else {
+      warnings.push(`materialization.queryMetadata: property '${name}' must be a ` + `string (got ${value === null ? "null" : typeof value}); it is ` + `not attached to any statement`);
+    }
+  }
+  return {
+    metadata: Object.keys(out).length > 0 ? out : null,
+    warnings
+  };
+}
+function parsePackageMaterialization(raw) {
+  if (!raw || typeof raw !== "object") {
+    return null;
+  }
+  const { schedule, freshness, queryMetadata } = raw;
+  return {
+    schedule: typeof schedule === "string" ? schedule : null,
+    freshness: parseFreshness(freshness),
+    queryMetadata: parseQueryMetadata(queryMetadata).metadata
+  };
+}
+function packageMaterializationWarnings(raw) {
+  if (!raw || typeof raw !== "object") {
+    return [];
+  }
+  const { queryMetadata } = raw;
+  return parseQueryMetadata(queryMetadata).warnings;
+}
+
+// src/package_load/package_load_worker.ts
+init_source_extraction();
+init_given();
+init_utils();
 
 // src/package_load/rpc_wait_accountant.ts
 class RpcWaitAccountant {