playcademy 0.13.20 → 0.13.22

package/dist/db.js

@@ -592,6 +592,10 @@ var logger = {
     const spaces = "  ".repeat(indent);
     console.log(`${spaces}${text}`);
   },
+  customRaw: (text, indent = 0) => {
+    const spaces = "  ".repeat(indent);
+    console.log(`${spaces}${customTransform(text)}`);
+  },
   /**
    * Display a configuration error with helpful suggestions
    */

package/dist/index.js

@@ -2580,6 +2580,10 @@ var init_logger = __esm({
         const spaces = "  ".repeat(indent);
         console.log(`${spaces}${text5}`);
       },
+      customRaw: (text5, indent = 0) => {
+        const spaces = "  ".repeat(indent);
+        console.log(`${spaces}${customTransform(text5)}`);
+      },
       /**
        * Display a configuration error with helpful suggestions
        */
@@ -5254,6 +5258,7 @@ function filePathToRoutePath(filePath) {
     routePath = routePath.replace(/\/?index$/, "");
   }
   let urlPath = "/" + routePath.replace(/\\/g, "/");
+  urlPath = urlPath.replace(/\[\.\.\.([^\]]+)\]/g, ":$1{.*}");
   urlPath = urlPath.replace(/\[([^\]]+)\]/g, ":$1");
   urlPath = urlPath === "/" ? "/api" : `/api${urlPath}`;
   return urlPath;
@@ -7989,6 +7994,57 @@ init_constants4();
 
 // src/lib/dev/display.ts
 init_core();
+
+// src/lib/dev/route-sorting.ts
+function getSegmentType(segment) {
+  if (segment.startsWith(":") && segment.includes("{.*}")) {
+    return 2 /* CatchAll */;
+  }
+  if (segment.startsWith(":")) {
+    return 1 /* Dynamic */;
+  }
+  return 0 /* Static */;
+}
+function compareSegments(a, b) {
+  const typeA = getSegmentType(a);
+  const typeB = getSegmentType(b);
+  if (typeA !== typeB) {
+    if (typeA === 1 /* Dynamic */ && typeB === 0 /* Static */) {
+      return -1;
+    }
+    if (typeA === 0 /* Static */ && typeB === 1 /* Dynamic */) {
+      return 1;
+    }
+    if (typeA === 2 /* CatchAll */ && typeB === 0 /* Static */) {
+      return -1;
+    }
+    if (typeA === 0 /* Static */ && typeB === 2 /* CatchAll */) {
+      return 1;
+    }
+    return typeA - typeB;
+  }
+  return a.localeCompare(b);
+}
+function sortRoutes(routes) {
+  return [...routes].sort((a, b) => {
+    const segmentsA = a.path.split("/").filter(Boolean);
+    const segmentsB = b.path.split("/").filter(Boolean);
+    const maxLength = Math.max(segmentsA.length, segmentsB.length);
+    for (let i = 0; i < maxLength; i++) {
+      const segA = segmentsA[i];
+      const segB = segmentsB[i];
+      if (segA === void 0) return -1;
+      if (segB === void 0) return 1;
+      const comparison = compareSegments(segA, segB);
+      if (comparison !== 0) {
+        return comparison;
+      }
+    }
+    return 0;
+  });
+}
+
+// src/lib/dev/display.ts
 function displayRegisteredRoutes(integrations, customRoutes = []) {
   const healthRoutes = [
     { path: ROUTES.HEALTH, method: "GET" }
@@ -7999,23 +8055,21 @@ function displayRegisteredRoutes(integrations, customRoutes = []) {
     const method = hasSandboxCreds ? "POST" : "POST (not configured)";
     timebackRoutes.push({ path: ROUTES.TIMEBACK.END_ACTIVITY, method });
   }
-  const customRoutesList = customRoutes.map((route) => ({
-    path: route.path,
-    method: route.methods?.join(", ") || "*"
-  }));
+  const customRoutesList = customRoutes.map((route) => {
+    const methods = route.methods?.join(", ") || "*";
+    const isCatchAll = /{\.\*}/.test(route.path);
+    return {
+      path: route.path,
+      method: isCatchAll ? `${methods} (catch-all)` : methods
+    };
+  });
   const allRoutes = [...healthRoutes, ...timebackRoutes, ...customRoutesList];
-  const maxPathLength = Math.max(...allRoutes.map((r) => r.path.length));
-  const displayRoute = (route) => {
+  const sortedRoutes = sortRoutes(allRoutes);
+  const maxPathLength = Math.max(...sortedRoutes.map((r) => r.path.length));
+  sortedRoutes.forEach((route) => {
     const paddedPath = route.path.padEnd(maxPathLength + 2, " ");
-    logger.raw(`<${paddedPath}> ${dim5(route.method)}`, 1);
-  };
-  healthRoutes.forEach(displayRoute);
-  if (timebackRoutes.length > 0) {
-    timebackRoutes.forEach(displayRoute);
-  }
-  if (customRoutesList.length > 0) {
-    customRoutesList.forEach(displayRoute);
-  }
+    logger.customRaw(`<${paddedPath}> ${dim5(route.method)}`, 1);
+  });
 }
 
 // src/lib/dev/reload.ts
@@ -9241,7 +9295,7 @@ async function runDevServer(options) {
       logger: options.logger !== false
     });
     serverRef.current = server;
-    logger.success(`Game API started: ${underline2(`http://localhost:${port}/api`)}`);
+    logger.success(`Game API started: ${underline2(`<http://localhost:${port}/api>`)}`);
     logger.newLine();
     const customRoutesDir = getCustomRoutesDirectory(workspace, config);
     const customRoutes = await discoverRoutes(customRoutesDir);
@@ -9452,7 +9506,6 @@ async function runDbInit() {
 }
 
 // src/commands/db/reset.ts
-init_src2();
 init_src();
 import { spawn } from "child_process";
 import { existsSync as existsSync19, rmSync as rmSync2 } from "fs";
@@ -9503,24 +9556,10 @@ async function runDbReset() {
       logger.newLine();
       return;
     }
-    const config = await loadConfig();
-    const { code } = await bundleBackend(config);
+    await loadConfig();
     try {
       const mf = new Miniflare2({
-        port: 0,
-        // Random available port
-        modules: [
-          {
-            type: "ESModule",
-            path: "index.mjs",
-            contents: code
-          }
-        ],
-        bindings: {
-          PLAYCADEMY_API_KEY: "dev-api-key",
-          GAME_ID: CORE_GAME_UUIDS.PLAYGROUND,
-          PLAYCADEMY_BASE_URL: "http://localhost:5174"
-        },
+        modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
         d1Databases: ["DB"],
         d1Persist: dbDir,
         compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -9544,7 +9583,7 @@ async function runDbReset() {
             // stdin: ignore, stdout: ignore, stderr: inherit
             env: process.env
           });
-          child.on("close", (code2) => resolve11(code2 || 0));
+          child.on("close", (code) => resolve11(code || 0));
           child.on("error", () => resolve11(1));
         });
         return exitCode2;
@@ -9642,19 +9681,9 @@ async function runKVClear(options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join24(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare3({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -9765,19 +9794,9 @@ async function runKVDelete(key, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join25(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare4({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -9853,19 +9872,9 @@ async function runKVGet(key, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join26(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare5({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10043,19 +10052,9 @@ async function runKVInspect(key, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join27(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare6({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10173,19 +10172,9 @@ async function runKVList(options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join28(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare7({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10298,19 +10287,9 @@ async function runKVSeed(seedFile, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join29(workspace, CLI_DIRECTORIES.KV);
     const mf = new Miniflare8({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10459,19 +10438,9 @@ async function runKVSet(key, value, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join30(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare9({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10539,19 +10508,9 @@ async function runKVStats(options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const kvDir = join31(getWorkspace(), CLI_DIRECTORIES.KV);
     const mf = new Miniflare10({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       kvNamespaces: ["KV"],
       kvPersist: kvDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10707,19 +10666,9 @@ async function runBucketDelete(key, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const bucketDir = join32(getWorkspace(), CLI_DIRECTORIES.BUCKET);
     const mf = new Miniflare11({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       r2Buckets: ["BUCKET"],
       r2Persist: bucketDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -10811,19 +10760,9 @@ async function runBucketGet(key, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const bucketDir = join33(getWorkspace(), CLI_DIRECTORIES.BUCKET);
     const mf = new Miniflare12({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       r2Buckets: ["BUCKET"],
       r2Persist: bucketDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -11002,19 +10941,9 @@ async function runBucketList(options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const bucketDir = join34(getWorkspace(), CLI_DIRECTORIES.BUCKET);
     const mf = new Miniflare13({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       r2Buckets: ["BUCKET"],
       r2Persist: bucketDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
@@ -11143,29 +11072,18 @@ async function runBucketPut(key, filePath, options = {}) {
       }
       process.exit(1);
     }
-    const bundle = await bundleBackend(config, {
-      sourcemap: false,
-      minify: false
-    });
     const bucketDir = join35(getWorkspace(), CLI_DIRECTORIES.BUCKET);
     const mf = new Miniflare14({
-      modules: [
-        {
-          type: "ESModule",
-          path: "index.mjs",
-          contents: bundle.code
-        }
-      ],
+      modules: [{ type: "ESModule", path: "index.mjs", contents: "" }],
       r2Buckets: ["BUCKET"],
       r2Persist: bucketDir,
       compatibilityDate: CLOUDFLARE_COMPATIBILITY_DATE
     });
     try {
       const bucket = await mf.getR2Bucket("BUCKET");
-      const contentType = getContentType(filePath);
-      await bucket.put(key, fileBuffer, {
+      await bucket.put(key, new Uint8Array(fileBuffer).buffer, {
         httpMetadata: {
-          contentType
+          contentType: getContentType(filePath)
         }
       });
       if (options.json) {
@@ -11184,7 +11102,7 @@ async function runBucketPut(key, filePath, options = {}) {
       logger.success(`Uploaded '${filePath}' to '${key}'`);
       logger.newLine();
       logger.data("Size", `${fileSize} bytes`, 1);
-      logger.data("Content-Type", contentType, 1);
+      logger.data("Content-Type", getContentType(filePath), 1);
       logger.newLine();
     } finally {
       await mf.dispose();

package/dist/utils.js

@@ -990,6 +990,10 @@ var init_logger = __esm({
         const spaces = "  ".repeat(indent);
         console.log(`${spaces}${text}`);
       },
+      customRaw: (text, indent = 0) => {
+        const spaces = "  ".repeat(indent);
+        console.log(`${spaces}${customTransform(text)}`);
+      },
       /**
        * Display a configuration error with helpful suggestions
        */
@@ -1723,6 +1727,7 @@ function filePathToRoutePath(filePath) {
     routePath = routePath.replace(/\/?index$/, "");
   }
   let urlPath = "/" + routePath.replace(/\\/g, "/");
+  urlPath = urlPath.replace(/\[\.\.\.([^\]]+)\]/g, ":$1{.*}");
   urlPath = urlPath.replace(/\[([^\]]+)\]/g, ":$1");
   urlPath = urlPath === "/" ? "/api" : `/api${urlPath}`;
   return urlPath;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "playcademy",
-    "version": "0.13.20",
+    "version": "0.13.22",
     "type": "module",
     "module": "./dist/index.js",
     "main": "./dist/index.js",
@@ -40,7 +40,7 @@
     },
     "dependencies": {
         "@inquirer/prompts": "^7.8.6",
-        "@playcademy/sdk": "0.1.8",
+        "@playcademy/sdk": "0.1.10",
         "better-sqlite3": "^12.4.1",
         "chokidar": "^4.0.3",
         "colorette": "^2.0.20",