@tiddlywiki/mws 0.1.9 → 0.1.12

package/dist/mws.js

@@ -16346,17 +16346,6 @@ var serverEvents = new ServerEvents();
 // packages/commander/src/index.ts
 init_esm_shims();
 
-// packages/commander/src/BaseCommand.ts
-init_esm_shims();
-var _BaseCommand = class _BaseCommand {
-  constructor(params, options) {
-    this.params = params;
-    this.options = options;
-  }
-};
-__name(_BaseCommand, "BaseCommand");
-var BaseCommand = _BaseCommand;
-
 // packages/commander/src/runCLI.ts
 init_esm_shims();
 
@@ -17024,6 +17013,20 @@ function getCLI(commands2) {
 }
 __name(getCLI, "getCLI");
 
+// packages/commander/src/BaseCommand.ts
+init_esm_shims();
+var _BaseCommand = class _BaseCommand {
+  constructor(params, options) {
+    this.params = params;
+    this.options = options;
+  }
+};
+__name(_BaseCommand, "BaseCommand");
+var BaseCommand = _BaseCommand;
+
+// packages/commander/src/index.ts
+var src_default = runCLI;
+
 // packages/server/src/index.ts
 init_esm_shims();
 
@@ -29787,17 +29790,11 @@ var registerZodRoutes = /* @__PURE__ */ __name((parent, router, keys) => {
       method,
       path: path6,
       bodyFormat,
+      registerError,
       zodPathParams,
       zodQueryParams = /* @__PURE__ */ __name((z) => ({}), "zodQueryParams"),
       zodRequestBody = ["string", "json", "www-form-urlencoded"].includes(bodyFormat) ? (z) => z.undefined() : (z) => z.any(),
       inner,
-      corsRequest = /* @__PURE__ */ __name(async (state) => {
-        state.pathParams;
-        const headers = state.headers["access-control-request-headers"];
-        const method2 = state.headers["access-control-request-method"];
-        debugCORS("OPTIONS default %s %s %s", state.urlInfo.pathname, method2, headers);
-        throw state.sendEmpty(204, {});
-      }, "corsRequest"),
       securityChecks
     } = route;
     if (method.includes("OPTIONS"))
@@ -29808,28 +29805,17 @@ var registerZodRoutes = /* @__PURE__ */ __name((parent, router, keys) => {
     const pathregex = "^" + path6.split("/").map(
       (e) => e === "$key" ? key : e.startsWith(":") ? "([^/]+)" : e
     ).join("\\/") + "$";
-    parent.defineRoute({
-      method: ["OPTIONS"],
-      path: new RegExp(pathregex),
-      pathParams,
-      bodyFormat: "ignore",
-      denyFinal: false,
-      securityChecks
-    }, async (state) => {
-      checkPath(state, zodPathParams);
-      checkQuery(state, zodQueryParams);
-      await corsRequest(state);
-    });
     parent.defineRoute({
       method,
       path: new RegExp(pathregex),
       pathParams,
       bodyFormat,
-      denyFinal: false
+      denyFinal: false,
+      securityChecks
     }, async (state) => {
-      checkPath(state, zodPathParams);
-      checkQuery(state, zodQueryParams);
-      checkData(state, zodRequestBody);
+      checkPath(state, zodPathParams, registerError);
+      checkQuery(state, zodQueryParams, registerError);
+      checkData(state, zodRequestBody, registerError);
       const timekey = `handler ${state.bodyFormat} ${state.method} ${state.urlInfo.pathname}`;
       if (import_debug3.default.enabled("server:handler:timing")) console.time(timekey);
       const [good, error39, res] = await inner(state).then((e) => [true, void 0, e], (e) => [false, e, void 0]);
@@ -29849,10 +29835,12 @@ var registerZodRoutes = /* @__PURE__ */ __name((parent, router, keys) => {
     });
   });
 }, "registerZodRoutes");
-function checkData(state, zodRequestBody) {
+function checkData(state, zodRequestBody, registerError) {
   const inputCheck = Z2.any().pipe(zodRequestBody(Z2)).safeParse(state.data);
   if (!inputCheck.success) {
-    console.log(inputCheck.error);
+    console.log(`${inputCheck.error}
+for
+${registerError.stack?.split("\n").slice(1).join("\n")}`);
     throw state.sendString(
       400,
       { "x-reason": "zod-request" },
@@ -29863,10 +29851,12 @@ function checkData(state, zodRequestBody) {
   state.data = inputCheck.data;
 }
 __name(checkData, "checkData");
-function checkQuery(state, zodQueryParams) {
+function checkQuery(state, zodQueryParams, registerError) {
   const queryCheck = Z2.strictObject(zodQueryParams(Z2)).safeParse(state.queryParams);
   if (!queryCheck.success) {
-    console.log(queryCheck.error);
+    console.log(`${queryCheck.error}
+for
+${registerError.stack?.split("\n").slice(1).join("\n")}`);
     throw state.sendString(
       400,
       { "x-reason": "zod-query" },
@@ -29877,10 +29867,12 @@ function checkQuery(state, zodQueryParams) {
   state.queryParams = queryCheck.data;
 }
 __name(checkQuery, "checkQuery");
-function checkPath(state, zodPathParams) {
+function checkPath(state, zodPathParams, registerError) {
   const pathCheck = Z2.strictObject(zodPathParams(Z2)).safeParse(state.pathParams);
   if (!pathCheck.success) {
-    console.log(pathCheck.error);
+    console.log(`${pathCheck.error}
+for
+${registerError.stack?.split("\n").slice(1).join("\n")}`);
     throw state.sendString(
       404,
       { "x-reason": "zod-path" },
@@ -29895,6 +29887,7 @@ __name(checkPath, "checkPath");
 // packages/server/src/zodRoute.ts
 init_esm_shims();
 function zodRoute(route) {
+  route.registerError = new Error();
   return route;
 }
 __name(zodRoute, "zodRoute");
@@ -31139,7 +31132,7 @@ var package_default = {
   name: "@tiddlywiki/mws",
   description: "TiddlyWiki Multiple Wiki Server",
   private: false,
-  version: "0.1.5",
+  version: "0.1.10",
   bin: {
     mws: "./mws.run.mjs"
   },
@@ -31350,7 +31343,7 @@ serverEvents.on("mws.routes", (root, config2) => {
     bodyFormat: "ignore",
     pathParams: ["plugin"]
   }, async (state) => {
-    checkPath(state, (z) => ({ plugin: z.string() }));
+    checkPath(state, (z) => ({ plugin: z.string() }), new Error());
     const plugin = state.pluginCache.filePlugins.get(state.pathParams.plugin);
     if (!plugin) throw state.sendEmpty(404, { "x-reason": "Plugin not found" });
     state.setHeader("Content-Type", "application/javascript");
@@ -31565,9 +31558,9 @@ serverEvents.on("cli.execute.before", async (name, params, options, instance) =>
   const passwordService = await createPasswordService(readPasswordMasterKey(wikiPath));
   const cachePath = path4.resolve(wikiPath, "cache");
   mkdirSync2(cachePath, { recursive: true });
-  serverEvents.emitAsync("mws.cache.init.before", cachePath, $tw);
+  await serverEvents.emitAsync("mws.cache.init.before", cachePath, $tw);
   const cache = await startupCache($tw, cachePath);
-  serverEvents.emitAsync("mws.cache.init.after", cache, $tw);
+  await serverEvents.emitAsync("mws.cache.init.after", cache, $tw);
   const storePath = path4.resolve(wikiPath, "store");
   mkdirSync2(storePath, { recursive: true });
   const databasePath = path4.resolve(storePath, "database.sqlite");
@@ -31578,9 +31571,9 @@ serverEvents.on("cli.execute.before", async (name, params, options, instance) =>
     "They are not temporary files, they are part of the database."
   ].join("\n"));
   const adapter = new SqliteAdapter(databasePath, !!process.env.ENABLE_DEV_SERVER);
-  serverEvents.emitAsync("mws.adapter.init.before", adapter);
+  await serverEvents.emitAsync("mws.adapter.init.before", adapter);
   await adapter.init();
-  serverEvents.emitAsync("mws.adapter.init.after", adapter);
+  await serverEvents.emitAsync("mws.adapter.init.after", adapter);
   const engine = new PrismaClient({
     log: [
       ...import_debug4.default.enabled("prisma:query") ? ["query"] : [],
@@ -31590,9 +31583,9 @@ serverEvents.on("cli.execute.before", async (name, params, options, instance) =>
     adapter: adapter.adapter
   });
   const config2 = new ServerState({ wikiPath, cachePath, storePath }, $tw, engine, passwordService, cache);
-  serverEvents.emitAsync("mws.init.before", config2, $tw);
+  await serverEvents.emitAsync("mws.config.init.before", config2, $tw);
   await config2.init();
-  serverEvents.emitAsync("mws.init.after", config2, $tw);
+  await serverEvents.emitAsync("mws.config.init.after", config2, $tw);
   instance.config = config2;
   instance.$tw = $tw;
 });
@@ -34131,7 +34124,7 @@ serverEvents.on("mws.routes", (root, config2) => {
       throw state.sendEmpty(404, { "x-reason": "recipe name not found" });
     checkPath(state, (z) => ({
       recipe_name: z.prismaField("Recipes", "recipe_name", "string")
-    }));
+    }), new Error());
     await state.assertRecipeAccess(state.pathParams.recipe_name, false);
     await state.$transaction(async (prisma) => {
       const server3 = new WikiStateStore(state, prisma);
@@ -34530,7 +34523,7 @@ async function runMWS(oldOptions) {
   }
   await opaque3.ready;
   await startup();
-  await runCLI();
+  await src_default();
 }
 __name(runMWS, "runMWS");
 serverEvents.on("cli.commander", (program2) => {