@malloy-publisher/server 0.0.239 → 0.0.241

package/dist/server.mjs

@@ -276144,9 +276144,10 @@ class IncrementalLedgerRepository {
   constructor(db) {
     this.db = db;
   }
-  async get(environmentId, packageName, sourceEntityId) {
+  async get(environmentId, connectionName, physicalTableName) {
     const row = await this.db.get(`SELECT * FROM incremental_ledger
-           WHERE environment_id = ? AND package_name = ? AND source_entity_id = ?`, [environmentId, packageName, sourceEntityId]);
+           WHERE environment_id = ? AND connection_name = ?
+             AND physical_table_name = ?`, [environmentId, connectionName, physicalTableName]);
     return row ? mapRow(row) : null;
   }
   async upsert(entry) {
@@ -276158,14 +276159,15 @@ class IncrementalLedgerRepository {
              physical_table_name, connection_name,
              advanced_by_materialization_id, advanced_at, created_at
           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-          ON CONFLICT (environment_id, package_name, source_entity_id) DO UPDATE SET
+          ON CONFLICT (environment_id, connection_name, physical_table_name)
+          DO UPDATE SET
+             package_name = EXCLUDED.package_name,
+             source_entity_id = EXCLUDED.source_entity_id,
              covered_through_value = EXCLUDED.covered_through_value,
              covered_through_type = EXCLUDED.covered_through_type,
              watermark_dimension = EXCLUDED.watermark_dimension,
              merge_key_dimensions = EXCLUDED.merge_key_dimensions,
              derived_strategy = EXCLUDED.derived_strategy,
-             physical_table_name = EXCLUDED.physical_table_name,
-             connection_name = EXCLUDED.connection_name,
              advanced_by_materialization_id = EXCLUDED.advanced_by_materialization_id,
              advanced_at = EXCLUDED.advanced_at
           RETURNING *`, [
@@ -276185,9 +276187,10 @@ class IncrementalLedgerRepository {
     ]);
     return mapRow(rows[0]);
   }
-  async deleteEntry(environmentId, packageName, sourceEntityId) {
+  async deleteEntry(environmentId, connectionName, physicalTableName) {
     await this.db.run(`DELETE FROM incremental_ledger
-           WHERE environment_id = ? AND package_name = ? AND source_entity_id = ?`, [environmentId, packageName, sourceEntityId]);
+           WHERE environment_id = ? AND connection_name = ?
+             AND physical_table_name = ?`, [environmentId, connectionName, physicalTableName]);
   }
   async deleteByEnvironmentId(environmentId) {
     await this.db.run("DELETE FROM incremental_ledger WHERE environment_id = ?", [environmentId]);
@@ -276695,14 +276698,14 @@ class DuckDBRepository {
   async deleteMaterialization(id) {
     return this.materializationRepo.deleteById(id);
   }
-  async getIncrementalLedgerEntry(environmentId, packageName, sourceEntityId) {
-    return this.incrementalLedgerRepo.get(environmentId, packageName, sourceEntityId);
+  async getIncrementalLedgerEntry(environmentId, connectionName, physicalTableName) {
+    return this.incrementalLedgerRepo.get(environmentId, connectionName, physicalTableName);
   }
   async upsertIncrementalLedgerEntry(entry) {
     return this.incrementalLedgerRepo.upsert(entry);
   }
-  async deleteIncrementalLedgerEntry(environmentId, packageName, sourceEntityId) {
-    return this.incrementalLedgerRepo.deleteEntry(environmentId, packageName, sourceEntityId);
+  async deleteIncrementalLedgerEntry(environmentId, connectionName, physicalTableName) {
+    return this.incrementalLedgerRepo.deleteEntry(environmentId, connectionName, physicalTableName);
   }
 }
 
@@ -276717,6 +276720,7 @@ async function initializeSchema(db, force = false) {
     await dropLegacyProjectSchema(db);
     logger.info("Creating database schema for the first time...");
   }
+  await dropPackageKeyedIncrementalLedger(db);
   await db.run(`
     CREATE TABLE IF NOT EXISTS environments (
       id VARCHAR PRIMARY KEY,
@@ -276800,7 +276804,7 @@ async function initializeSchema(db, force = false) {
       advanced_by_materialization_id VARCHAR,
       advanced_at TIMESTAMP NOT NULL,
       created_at TIMESTAMP NOT NULL,
-      PRIMARY KEY (environment_id, package_name, source_entity_id)
+      PRIMARY KEY (environment_id, connection_name, physical_table_name)
     )
   `);
   await db.run(`
@@ -276819,6 +276823,19 @@ async function initializeSchema(db, force = false) {
   await db.run("CREATE UNIQUE INDEX IF NOT EXISTS idx_materializations_active_key ON materializations(active_key)");
   await db.run("CREATE INDEX IF NOT EXISTS idx_incremental_ledger_environment_package ON incremental_ledger(environment_id, package_name)");
 }
+async function dropPackageKeyedIncrementalLedger(db) {
+  const present = await db.all("SELECT name FROM sqlite_master WHERE type='table' AND name='incremental_ledger'");
+  if (!present || present.length === 0) {
+    return;
+  }
+  const columns = await db.all("PRAGMA table_info('incremental_ledger')");
+  const keyedOnPackage = columns.some((column) => column.name === "package_name" && Boolean(column.pk));
+  if (!keyedOnPackage) {
+    return;
+  }
+  logger.info("Re-keying the incremental ledger onto (environment, connection, table); " + "recorded covered_through boundaries are discarded, so each incremental " + "source rebuilds in full once and then resumes advancing by delta");
+  await db.run("DROP TABLE IF EXISTS incremental_ledger");
+}
 async function createEntityEmbeddingsTable(db) {
   await db.run(`
     CREATE TABLE IF NOT EXISTS entity_embeddings (
@@ -280634,6 +280651,9 @@ function ledgerLineageMismatch(entry, lineage) {
     };
   }
   const changed = (reason) => ({ reasonCode: "lineage_changed", reason });
+  if (entry.sourceEntityId !== lineage.sourceEntityId) {
+    return changed(`the source's content address is not the one the recorded boundary was ` + `measured under, so that boundary describes different SQL than this ` + `refresh would apply a delta to — either the model was edited, or ` + `this refresh is instructed through a different version of the ` + `package than the one that advanced the boundary`);
+  }
   if (entry.connectionName !== lineage.connectionName) {
     return changed(`the recorded boundary was advanced on connection ` + `"${entry.connectionName}", not "${lineage.connectionName}"`);
   }
@@ -284539,6 +284559,9 @@ class MaterializationController {
       if (parsed.strictUpstreams !== undefined) {
         result.strictUpstreams = parsed.strictUpstreams;
       }
+      if (parsed.ledger !== undefined) {
+        result.ledger = parsed.ledger;
+      }
     }
     if (body.forceRefresh !== undefined) {
       if (typeof body.forceRefresh !== "boolean") {
@@ -284608,6 +284631,12 @@ class MaterializationController {
       }
       result.strictUpstreams = obj.strictUpstreams;
     }
+    if (obj.ledger !== undefined && obj.ledger !== null) {
+      if (!Array.isArray(obj.ledger)) {
+        throw new BadRequestError("buildInstructions.ledger must be an array");
+      }
+      result.ledger = obj.ledger.map((entry) => this.validateLedgerEntry(entry));
+    }
     return result;
   }
   validateManifestReference(raw) {
@@ -284658,6 +284687,40 @@ class MaterializationController {
       ...typeof instruction.reseed === "boolean" ? { reseed: instruction.reseed } : {}
     };
   }
+  validateLedgerEntry(raw) {
+    if (typeof raw !== "object" || raw === null) {
+      throw new BadRequestError("Each buildInstructions.ledger entry must be an object");
+    }
+    const entry = raw;
+    for (const field of [
+      "connectionName",
+      "physicalTableName",
+      "coveredThrough",
+      "coveredThroughType",
+      "watermark",
+      "sourceEntityId"
+    ]) {
+      if (typeof entry[field] !== "string" || entry[field] === "") {
+        throw new BadRequestError(`Ledger entry '${field}' must be a non-empty string`);
+      }
+    }
+    if (entry.strategy !== "merge" && entry.strategy !== "range_replace") {
+      throw new BadRequestError("Ledger entry 'strategy' must be 'merge' or 'range_replace'");
+    }
+    if (entry.mergeKeys !== undefined && (!Array.isArray(entry.mergeKeys) || entry.mergeKeys.some((k) => typeof k !== "string"))) {
+      throw new BadRequestError("Ledger entry 'mergeKeys' must be an array of strings");
+    }
+    return {
+      connectionName: entry.connectionName,
+      physicalTableName: entry.physicalTableName,
+      coveredThrough: entry.coveredThrough,
+      coveredThroughType: entry.coveredThroughType,
+      watermark: entry.watermark,
+      strategy: entry.strategy,
+      sourceEntityId: entry.sourceEntityId,
+      ...Array.isArray(entry.mergeKeys) ? { mergeKeys: entry.mergeKeys } : {}
+    };
+  }
   async stopMaterialization(environmentName, packageName, materializationId) {
     return this.materializationService.stopMaterialization(environmentName, packageName, materializationId);
   }
@@ -292722,6 +292785,25 @@ import { Manifest } from "@malloydata/malloy";
 
 // src/service/incremental_build.ts
 init_logger();
+function ledgerTableKey(connectionName, physicalTableName) {
+  return `${connectionName}\x00${physicalTableName}`;
+}
+function indexCallerLedger(entries) {
+  const index = new Map;
+  for (const entry of entries) {
+    index.set(ledgerTableKey(entry.connectionName, entry.physicalTableName), {
+      sourceEntityId: entry.sourceEntityId,
+      coveredThroughValue: entry.coveredThrough,
+      coveredThroughType: entry.coveredThroughType,
+      watermarkDimension: entry.watermark,
+      mergeKeyDimensions: entry.mergeKeys ?? [],
+      derivedStrategy: entry.strategy,
+      physicalTableName: entry.physicalTableName,
+      connectionName: entry.connectionName
+    });
+  }
+  return index;
+}
 function incrementalLineage(params) {
   const d = params.declaration;
   if (!d?.incremental)
@@ -292740,6 +292822,7 @@ function incrementalLineage(params) {
   return {
     physicalTableName: params.physicalTableName,
     connectionName: params.connectionName,
+    sourceEntityId: params.sourceEntityId,
     watermarkName: watermark.name,
     watermarkType: watermark.malloyType,
     mergeKeys,
@@ -292748,25 +292831,32 @@ function incrementalLineage(params) {
 }
 async function planSourceRefresh(params) {
   const { context, lineage } = params;
+  const forceRefresh = context.forceRefresh || params.reseed === true;
+  const dialect = params.persistSource.dialectName;
   let ledgerEntry = null;
-  try {
-    ledgerEntry = await context.ledger.getIncrementalLedgerEntry(context.environmentId, context.packageName, params.sourceEntityId);
-  } catch (err) {
-    return {
-      mode: "seed",
-      reasonCode: "ledger_unreadable",
-      reason: `the covered_through ledger could not be read (${errMessage(err)})`
-    };
+  if (context.callerLedger) {
+    ledgerEntry = context.callerLedger.get(ledgerTableKey(lineage.connectionName, lineage.physicalTableName)) ?? null;
+  } else {
+    try {
+      ledgerEntry = await context.ledger.getIncrementalLedgerEntry(context.environmentId, lineage.connectionName, lineage.physicalTableName);
+    } catch (err) {
+      return {
+        mode: "seed",
+        reasonCode: "ledger_unreadable",
+        reason: `the covered_through ledger could not be read (${errMessage(err)})`
+      };
+    }
   }
-  const postgresVersionNum = lineage.strategy === "merge" && params.persistSource.dialectName === "postgres" && ledgerEntry !== null ? await probePostgresVersion(params.runner) : undefined;
+  const postgresVersionNum = lineage.strategy === "merge" && dialect === "postgres" && ledgerEntry !== null ? await probePostgresVersion(params.runner) : undefined;
+  let step;
   try {
-    return await planIncrementalStep({
+    step = await planIncrementalStep({
       runner: params.runner,
-      dialect: params.persistSource.dialectName,
+      dialect,
       quotedTablePath: params.quotedTablePath,
       lineage,
       ledgerEntry,
-      forceRefresh: context.forceRefresh || params.reseed === true,
+      forceRefresh,
       now: context.now,
       sourceSQL: params.sourceSQL,
       columns: params.columns,
@@ -292779,14 +292869,20 @@ async function planSourceRefresh(params) {
       reason: `the delta could not be planned (${errMessage(err)})`
     };
   }
+  if (context.callerLedger && step.mode === "seed" && (step.reasonCode === "lineage_changed" || step.reasonCode === "table_renamed")) {
+    throw new Error(`The supplied ledger entry for table "${lineage.physicalTableName}" ` + `was measured under a different definition of this source: ` + `${step.reason}. Delete the entry to rebuild the source, or set ` + `reseed.`);
+  }
+  return step;
 }
 async function advanceLedger(params) {
   const { context, lineage } = params;
+  if (context.callerLedger)
+    return;
   try {
     await context.ledger.upsertIncrementalLedgerEntry({
       environmentId: context.environmentId,
       packageName: context.packageName,
-      sourceEntityId: params.sourceEntityId,
+      sourceEntityId: lineage.sourceEntityId,
       coveredThroughValue: params.coveredThrough.value,
       coveredThroughType: params.coveredThrough.malloyType,
       watermarkDimension: lineage.watermarkName,
@@ -292799,18 +292895,21 @@ async function advanceLedger(params) {
   } catch (err) {
     logger.warn("Failed to advance the covered_through boundary", {
       packageName: context.packageName,
-      sourceEntityId: params.sourceEntityId,
+      physicalTableName: lineage.physicalTableName,
+      sourceEntityId: lineage.sourceEntityId,
       error: errMessage(err)
     });
   }
 }
-async function resetLedger(context, sourceEntityId) {
+async function resetLedger(context, lineage) {
+  if (context.callerLedger)
+    return;
   try {
-    await context.ledger.deleteIncrementalLedgerEntry(context.environmentId, context.packageName, sourceEntityId);
+    await context.ledger.deleteIncrementalLedgerEntry(context.environmentId, lineage.connectionName, lineage.physicalTableName);
   } catch (err) {
     logger.warn("Failed to clear the covered_through boundary", {
       packageName: context.packageName,
-      sourceEntityId,
+      physicalTableName: lineage.physicalTableName,
       error: errMessage(err)
     });
   }
@@ -292821,7 +292920,7 @@ async function advanceLedgerAfterSeed(params) {
     if (boundary.error) {
       logger.warn("Could not read a covered_through boundary after a full rebuild; " + "the next refresh will rebuild again", {
         packageName: params.context.packageName,
-        sourceEntityId: params.sourceEntityId,
+        physicalTableName: params.lineage.physicalTableName,
         error: boundary.error
       });
     }
@@ -292830,7 +292929,6 @@ async function advanceLedgerAfterSeed(params) {
   await advanceLedger({
     context: params.context,
     lineage: params.lineage,
-    sourceEntityId: params.sourceEntityId,
     coveredThrough: boundary.bound
   });
   return boundary.bound;
@@ -293114,8 +293212,24 @@ async function resolveEnvironmentId(repository, environmentName) {
 }
 
 // src/service/materialization_service.ts
-function boundaryFields(bound) {
-  return bound ? { coveredThrough: bound.value, coveredThroughType: bound.malloyType } : {};
+function refreshFields(did) {
+  return did ? { refresh: did } : {};
+}
+function ledgerFields(lineage, bound) {
+  if (!lineage || !bound)
+    return {};
+  return {
+    ledger: {
+      connectionName: lineage.connectionName,
+      physicalTableName: lineage.physicalTableName,
+      coveredThrough: bound.value,
+      coveredThroughType: bound.malloyType,
+      watermark: lineage.watermarkName,
+      ...lineage.mergeKeys.length > 0 ? { mergeKeys: lineage.mergeKeys } : {},
+      strategy: lineage.strategy,
+      sourceEntityId: lineage.sourceEntityId
+    }
+  };
 }
 function connectionMetadataLayers(environment, connectionName) {
   try {
@@ -293258,7 +293372,7 @@ class MaterializationService {
     const buildInstructions = options.buildInstructions;
     const orchestrated = buildInstructions !== undefined;
     if (orchestrated) {
-      this.validateInstructions(pkg.getBuildPlan(), buildInstructions);
+      this.validateInstructions(pkg.getBuildPlan(), buildInstructions, options.ledger, options.reseed ?? false);
     }
     const active2 = await this.repository.getActiveMaterialization(environmentId, packageName);
     if (active2) {
@@ -293289,6 +293403,7 @@ class MaterializationService {
       forceRefresh,
       reseed,
       buildInstructions,
+      ledger: orchestrated ? options.ledger : undefined,
       referenceManifest: options.referenceManifest,
       strictUpstreams: options.strictUpstreams,
       trigger,
@@ -293325,7 +293440,8 @@ class MaterializationService {
         packageName,
         materializationId: id,
         forceRefresh: opts.reseed ?? false,
-        now: new Date(startedAt)
+        now: new Date(startedAt),
+        ledger: opts.ledger
       });
       let instructions;
       let carried;
@@ -293407,6 +293523,7 @@ class MaterializationService {
           dialect: persistSource.dialectName,
           physicalTableName: logicalName,
           connectionName: persistSource.connectionName,
+          sourceEntityId,
           isStorageBuild: destination !== undefined
         }) !== undefined;
         const prior = priorEntries[sourceEntityId];
@@ -293541,7 +293658,7 @@ class MaterializationService {
       });
     }
   }
-  validateInstructions(plan, instructions) {
+  validateInstructions(plan, instructions, ledger, runReseed = false) {
     if (!plan) {
       throw new BadRequestError("Package has no persist sources; buildInstructions cannot be applied");
     }
@@ -293557,6 +293674,41 @@ class MaterializationService {
         throw new BadRequestError("realization=SNAPSHOT is not supported (COPY only)");
       }
     }
+    if (ledger === undefined || ledger.length === 0)
+      return;
+    const instructed = new Map;
+    const byAddress = new Map(Object.values(plan.sources).map((s) => [s.sourceEntityId, s]));
+    for (const instruction of instructions) {
+      const planSource = (instruction.sourceID ? plan.sources[instruction.sourceID] : undefined) ?? byAddress.get(instruction.sourceEntityId);
+      if (!planSource)
+        continue;
+      instructed.set(`${planSource.connectionName}\x00${instruction.physicalTableName}`, {
+        sourceEntityId: planSource.sourceEntityId,
+        refresh: planSource.refresh ?? null,
+        reseed: runReseed || instruction.reseed === true
+      });
+    }
+    const seen = new Set;
+    for (const entry of ledger) {
+      const key = `${entry.connectionName}\x00${entry.physicalTableName}`;
+      const table = `'${entry.physicalTableName}' on connection '${entry.connectionName}'`;
+      if (seen.has(key)) {
+        throw new BadRequestError(`Ledger entry for table ${table} appears more than once`);
+      }
+      seen.add(key);
+      const target = instructed.get(key);
+      if (!target) {
+        throw new BadRequestError(`Ledger entry names table ${table}, which this run's ` + `instructions do not build`);
+      }
+      if (target.reseed)
+        continue;
+      if (target.refresh !== "incremental") {
+        throw new BadRequestError(`Ledger entry names table ${table}, whose source does not ` + `declare refresh="incremental"`);
+      }
+      if (entry.sourceEntityId !== target.sourceEntityId) {
+        throw new BadRequestError(`Ledger entry for table ${table} was measured under a ` + `different definition of its source (its sourceEntityId does ` + `not match the plan's) — expected after a publish or ` + `rollback that changed the source. Delete the entry to ` + `rebuild the source, or set reseed.`);
+      }
+    }
   }
   quoteSeedTablePath(sourceEntityId, physicalTableName, connectionName, connections) {
     const connection = connectionName ? connections.get(connectionName) : undefined;
@@ -293577,7 +293729,13 @@ class MaterializationService {
     }
     if (Object.keys(declarations).length === 0)
       return;
-    return { ...run, declarations, ledger: this.repository };
+    const { ledger, ...rest } = run;
+    return {
+      ...rest,
+      declarations,
+      ledger: this.repository,
+      ...ledger !== undefined ? { callerLedger: indexCallerLedger(ledger) } : {}
+    };
   }
   async executeInstructedBuild(compiled, environment, instructions, seedEntries, signal, strict = false, owner, buildMetadata, incremental) {
     const { graphs, sources, connectionDigests, connections } = compiled;
@@ -293760,12 +293918,12 @@ class MaterializationService {
       dialect,
       physicalTableName,
       connectionName: persistSource.connectionName,
+      sourceEntityId: contentSourceEntityId,
       isStorageBuild
     }) : undefined;
     const incrementalRefresh = incremental && lineage && contentSourceEntityId ? {
       context: incremental,
-      lineage,
-      ledgerKey: contentSourceEntityId
+      lineage
     } : undefined;
     if (incrementalRefresh) {
       const applied = await this.refreshOneSourceIncrementally({
@@ -293787,7 +293945,7 @@ class MaterializationService {
     const quotedPhysical = quotedPhysicalPath;
     const quotedBareName = quoteIdentifier(bareName, dialect);
     if (incrementalRefresh) {
-      await resetLedger(incrementalRefresh.context, incrementalRefresh.ledgerKey);
+      await resetLedger(incrementalRefresh.context, incrementalRefresh.lineage);
     }
     const startTime = performance.now();
     await connection.runSQL(`DROP TABLE IF EXISTS ${quotedStaging}`, runOptions);
@@ -293817,7 +293975,6 @@ class MaterializationService {
     const seededThrough = incrementalRefresh ? await advanceLedgerAfterSeed({
       context: incrementalRefresh.context,
       lineage: incrementalRefresh.lineage,
-      sourceEntityId: incrementalRefresh.ledgerKey,
       quotedTablePath: quotedPhysical,
       dialect,
       runner: (sql) => connection.runSQL(sql, runOptions)
@@ -293829,7 +293986,8 @@ class MaterializationService {
       physicalTableName,
       connectionName: persistSource.connectionName,
       realization: instruction.realization,
-      ...boundaryFields(seededThrough),
+      ...ledgerFields(incrementalRefresh?.lineage, seededThrough),
+      ...refreshFields(incrementalRefresh ? "full" : undefined),
       rowCount: null
     };
   }
@@ -293842,7 +294000,6 @@ class MaterializationService {
       context,
       lineage,
       persistSource,
-      sourceEntityId: params.ledgerKey,
       quotedTablePath: params.quotedTablePath,
       sourceSQL: params.buildSQL,
       columns: deriveColumns(persistSource).map((c) => String(c.name)),
@@ -293865,7 +294022,6 @@ class MaterializationService {
       await advanceLedger({
         context,
         lineage,
-        sourceEntityId: params.ledgerKey,
         coveredThrough: step.coveredThrough
       });
       const durationMs = Math.round(performance.now() - startTime);
@@ -293890,7 +294046,8 @@ class MaterializationService {
       connectionName: persistSource.connectionName,
       realization: instruction.realization,
       rowCount: null,
-      ...boundaryFields(step.coveredThrough)
+      ...ledgerFields(lineage, step.coveredThrough),
+      ...refreshFields(step.mode === "delta" ? "delta" : "none")
     };
   }
   async buildOneSourceIntoStorage(persistSource, instruction, manifest, environment, buildSQL, builtEntries, dependsOnStorageUpstream) {
@@ -294472,7 +294629,7 @@ var ASSET_EXTENSIONS = new Set([
   "woff2",
   "xlsx"
 ]);
-var SPA_OWNED_SEGMENTS = new Set(["pages", "workbook"]);
+var SPA_OWNED_SEGMENTS = new Set(["data-apps", "pages", "workbook"]);
 function extensionOf(segment) {
   const dot = segment.lastIndexOf(".");
   if (dot <= 0 || dot === segment.length - 1)
@@ -294784,7 +294941,7 @@ app.get("/environments/:environmentName/packages/:packageName", (req, res, next)
   res.redirect(308, withRequestQuery(req, canonical));
 });
 app.get("/environments/:environmentName/packages/:packageName/*", serveFromPackage);
-var PAGES_DEPTH_CAP = 3;
+var DATA_APPS_DEPTH_CAP = 3;
 var NON_TAG_TEXT_PATTERN = /<!--[\s\S]*?-->|<!--[\s\S]*$|<(script|style|title|textarea)\b[\s\S]*?<\/\1\s*>/gi;
 function stripNonTagText(input) {
   let current = input;
@@ -294795,7 +294952,7 @@ function stripNonTagText(input) {
   } while (current !== previous);
   return current;
 }
-async function listPackagePages(environmentName, packageName, publicRoot) {
+async function listPackageDataApps(environmentName, packageName, publicRoot) {
   const fs11 = await import("fs/promises");
   const out = [];
   let realPublicRoot;
@@ -294805,7 +294962,7 @@ async function listPackagePages(environmentName, packageName, publicRoot) {
     return out;
   }
   async function walk(dir, depth) {
-    if (depth > PAGES_DEPTH_CAP)
+    if (depth > DATA_APPS_DEPTH_CAP)
       return;
     let entries;
     try {
@@ -294902,14 +295059,14 @@ try {
   logger.warn("Failed to register Prometheus metrics endpoint", { error });
 }
 app.use(drainingGuard);
-app.get(`${API_PREFIX2}/environments/:environmentName/packages/:packageName/pages`, async (req, res) => {
+app.get(`${API_PREFIX2}/environments/:environmentName/packages/:packageName/data-apps`, async (req, res) => {
   try {
     const environment = await environmentStore.getEnvironment(req.params.environmentName, false);
     const pkg = await environment.getPackage(req.params.packageName, false);
-    const pages = await listPackagePages(req.params.environmentName, req.params.packageName, path14.join(pkg.getPackagePath(), "public"));
-    res.json(pages);
+    const dataApps = await listPackageDataApps(req.params.environmentName, req.params.packageName, path14.join(pkg.getPackagePath(), "public"));
+    res.json(dataApps);
   } catch (error) {
-    logger.error("Failed to list package pages", { error });
+    logger.error("Failed to list package data apps", { error });
     const { json, status } = internalErrorToHttpError(error);
     res.status(status).json(json);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.239",
+   "version": "0.0.241",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"

package/dist/app/assets/HomePage-DmgHdpH6.js

@@ -1 +0,0 @@
-import{$ as t,j as o,J as a}from"./index-ByceOJbS.js";function s(){const n=t();return o.jsx(a,{onClickEnvironment:n})}export{s as default};

package/dist/app/assets/ModelPage-oI3O6TwY.js

@@ -1 +0,0 @@
-import{F as j,$ as y,N,j as e,a0 as c,a1 as f,G as s,a2 as k,a3 as u,a4 as v,T as o,a5 as t,a6 as l}from"./index-ByceOJbS.js";function b(){const a=j(),n=a["*"],d=y(),{server:p}=N();if(!a.environmentName)return e.jsx("div",{children:e.jsx("h2",{children:"Missing environment name"})});if(!a.packageName)return e.jsx("div",{children:e.jsx("h2",{children:"Missing package name"})});const i={p:3,maxWidth:1200,mx:"auto"};if(n?.startsWith("pages/")&&!n.endsWith(".malloy")&&!n.endsWith(".malloynb")){const h=n.slice(6),g=c({environmentName:a.environmentName,packageName:a.packageName,modelPath:h});return e.jsx(f,{resourceUri:g})}const r=c({environmentName:a.environmentName,packageName:a.packageName,modelPath:n});if(n?.endsWith(".malloy"))return e.jsx(s,{sx:i,children:e.jsx(k,{resourceUri:r,runOnDemand:!0,maxResultSize:512*1024})});if(n?.endsWith(".malloynb"))return e.jsx(s,{sx:i,children:e.jsx(u,{resourceUri:r,maxResultSize:1024*1024,onNavigate:d})});const x=/\.[^./]+$/.test(n??""),m=v({server:p,environmentName:a.environmentName,packageName:a.packageName,path:n??""});return e.jsxs(s,{sx:i,children:[e.jsx(o,{variant:"h6",sx:{fontWeight:600},children:"Nothing to open at this path"}),e.jsxs(o,{variant:"body2",color:"text.secondary",sx:{mt:1},children:[e.jsx(s,{component:"span",sx:{fontFamily:t},children:n})," ","does not name a"," ",e.jsx(s,{component:"span",sx:{fontFamily:t},children:".malloy"})," ","or"," ",e.jsx(s,{component:"span",sx:{fontFamily:t},children:".malloynb"})," ","file in package"," ",e.jsx(s,{component:"span",sx:{fontFamily:t},children:a.packageName}),". This address opens"," ",e.jsx(s,{component:"span",sx:{fontFamily:t},children:".malloy"})," ","and"," ",e.jsx(s,{component:"span",sx:{fontFamily:t},children:".malloynb"})," ","files."]}),x&&e.jsxs(o,{variant:"body2",color:"text.secondary",sx:{mt:1},children:["A file from the package's"," ",e.jsx(s,{component:"span",sx:{fontFamily:t},children:"public/"})," ","directory is served at ",e.jsx(l,{href:m,children:m}),"."]}),e.jsxs(o,{variant:"body2",color:"text.secondary",sx:{mt:1},children:[e.jsxs(l,{href:`/${encodeURIComponent(a.environmentName)}/${encodeURIComponent(a.packageName)}`,children:["Back to ",a.packageName]})," ","lists this package's models, notebooks, and pages."]})]})}export{b as default};

package/dist/app/assets/RouteError-B5MgkwXx.js

@@ -1 +0,0 @@
-import{aa as o,j as r,ab as s,ac as a,G as n,T as t}from"./index-ByceOJbS.js";function x(){const e=o();return console.error(e),r.jsx(s,{maxWidth:"lg",component:"main",sx:{display:"flex",flexDirection:"column",my:2,gap:0},children:r.jsxs(a,{sx:{m:"auto",flexDirection:"column"},children:[r.jsx(n,{sx:{height:"300px"}}),r.jsx("img",{src:"/error.png"}),r.jsx(t,{variant:"subtitle1",children:"An unexpected error occurred"})]})})}export{x as default};