@malloy-publisher/server 0.11.1 → 0.11.2

package/dist/instrumentation.mjs

@@ -164831,7 +164831,7 @@ var init_telemetry = __esm(() => {
 });
 
 // package.json
-var version = "0.11.1";
+var version = "0.11.2";
 var init_package = () => {};
 
 // src/version.ts

package/dist/server.mjs

@@ -164832,7 +164832,7 @@ var init_telemetry = __esm(() => {
 });
 
 // package.json
-var version = "0.11.1";
+var version = "0.11.2";
 var init_package = () => {};
 
 // src/version.ts
@@ -376106,6 +376106,110 @@ var init_watch_mode_controller = __esm(() => {
   MODEL_EXTS = new Set([".malloy", ".malloynb", ".md"]);
 });
 
+// src/legacy_package_name.ts
+function splitLegacyPackageName(name) {
+  if (typeof name !== "string")
+    return;
+  const at2 = name.lastIndexOf(LEGACY_VERSION_DELIMITER);
+  if (at2 <= 0)
+    return;
+  const versionId = name.slice(at2 + LEGACY_VERSION_DELIMITER.length);
+  if (!isSemver(versionId))
+    return;
+  return { packageName: name.slice(0, at2), versionId };
+}
+function recoverVersionFromName(packageName, versionId) {
+  const unchanged = { packageName, versionId, recovered: false };
+  if (!isVersioningEnabled())
+    return unchanged;
+  const split = splitLegacyPackageName(packageName);
+  if (!split)
+    return unchanged;
+  const unnamed = versionId === undefined || versionId === null || versionId === "" || versionId === LATEST_VERSION_ALIAS;
+  if (!unnamed && versionId !== split.versionId)
+    return unchanged;
+  warnOnce(packageName, split);
+  return { ...split, recovered: true };
+}
+function legacyPackageNameMiddleware() {
+  return (req, _res, next) => {
+    const queryAt = req.url.indexOf("?");
+    const pathname = queryAt < 0 ? req.url : req.url.slice(0, queryAt);
+    const search = queryAt < 0 ? "" : req.url.slice(queryAt);
+    const match = PACKAGE_PATH.exec(pathname);
+    if (!match)
+      return next();
+    let segment;
+    try {
+      segment = decodeURIComponent(match[3]);
+    } catch {
+      return next();
+    }
+    const apiPrefix = match[1] ?? "";
+    const recovered = recoverVersionFromName(segment, apiPrefix === "" ? undefined : req.query.versionId);
+    if (!recovered.recovered)
+      return next();
+    const environment = match[2];
+    const rest = match[4] ?? "";
+    const pkg = encodeURIComponent(recovered.packageName);
+    const version2 = encodeURIComponent(recovered.versionId);
+    const packagePath = pathname.slice(0, pathname.length - match[3].length - rest.length);
+    let path25 = `${packagePath}${pkg}${rest}`;
+    const versionsOf = `${apiPrefix}/environments/${environment}/packages/${pkg}/versions/${version2}`;
+    if (rest === "" && req.method === "DELETE") {
+      path25 = versionsOf;
+    } else if (rest === "" && req.method === "PATCH") {
+      req.method = "PUT";
+      path25 = `${versionsOf}/manifest`;
+    }
+    const params = new URLSearchParams(search.slice(1));
+    params.set("versionId", recovered.versionId);
+    req.url = `${path25}?${params.toString()}`;
+    req.query.versionId = recovered.versionId;
+    req[RECOVERED_VERSION] = recovered.versionId;
+    next();
+  };
+}
+function legacyPackageNameBodyMiddleware() {
+  return (req, _res, next) => {
+    const body = req.body;
+    if (!body || typeof body !== "object" || Array.isArray(body)) {
+      return next();
+    }
+    if (req.method === "POST" && PACKAGE_COLLECTION_PATH.test(req.path)) {
+      const recovered = recoverVersionFromName(body.name, undefined);
+      if (recovered.recovered)
+        body.name = recovered.packageName;
+      return next();
+    }
+    const version2 = req[RECOVERED_VERSION];
+    if (version2 !== undefined && (body.versionId === undefined || body.versionId === null || body.versionId === "")) {
+      body.versionId = version2;
+    }
+    next();
+  };
+}
+function warnOnce(combined, split) {
+  if (warned.has(combined))
+    return;
+  if (warned.size >= WARNED_CAP)
+    warned.clear();
+  warned.add(combined);
+  logger.warn(`versionId recovered from the package name ${combined}: package ` + `${split.packageName}, version ${split.versionId}. Pass the package ` + `name and versionId; reading the version from the name will be removed.`);
+}
+var LEGACY_VERSION_DELIMITER = "___", PACKAGE_PATH, PACKAGE_COLLECTION_PATH, RECOVERED_VERSION, warned, WARNED_CAP = 1e4;
+var init_legacy_package_name = __esm(() => {
+  init_config();
+  init_constants();
+  init_logger();
+  init_semver();
+  init_version_service();
+  PACKAGE_PATH = new RegExp(`^(${API_PREFIX})?/(?:environments|projects)/([^/]+)/packages/([^/]+)(/.*)?$`);
+  PACKAGE_COLLECTION_PATH = new RegExp(`^${API_PREFIX}/(?:environments|projects)/[^/]+/packages/?$`);
+  RECOVERED_VERSION = Symbol("recoveredVersionId");
+  warned = new Set;
+});
+
 // src/heap_check.ts
 import * as v8 from "v8";
 function installHeapGauges() {
@@ -409260,6 +409364,7 @@ var init_main_server = __esm(async () => {
   init_health();
   init_instrumentation();
   init_instrumentation();
+  init_legacy_package_name();
   init_logger();
   init_config();
   init_retrieval_config();
@@ -409380,6 +409485,7 @@ var init_main_server = __esm(async () => {
   themeStore = new ThemeStore(environmentStore.storageManager, SERVER_ROOT);
   themeController = new ThemeController(themeStore, SERVER_ROOT);
   mcpApp = createMcpApp(environmentStore);
+  app.use(legacyPackageNameMiddleware());
   registerDataAppStaticRoutes(app, environmentStore, path29.join(path29.dirname(__filename_esm), "runtime", "publisher.js"));
   if (!isDevelopment) {
     app.use("/", import_express3.default.static(ROOT));
@@ -409398,6 +409504,7 @@ var init_main_server = __esm(async () => {
     credentials: true
   }));
   app.use(import_body_parser3.default.json({ limit: "1mb" }));
+  app.use(legacyPackageNameBodyMiddleware());
   try {
     const metricsHandler = getPrometheusMetricsHandler();
     app.get("/metrics", metricsHandler);

package/package.json

@@ -19,7 +19,7 @@
       "snowflake"
    ],
    "homepage": "https://docs.malloydata.dev/documentation/user_guides/publishing/mcp_agents",
-   "version": "0.11.1",
+   "version": "0.11.2",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"