@tiddlywiki/mws 0.0.19 → 0.0.20

package/dist/server.d.ts

@@ -554,6 +554,9 @@ declare const Z2: Z2<FieldTypeGroups>;
 declare global {
     type PrismaTxnClient = Omit<Commander["engine"], "$connect" | "$disconnect" | "$on" | "$transaction" | "$use" | "$extends">;
     type ART<T extends (...args: any) => any> = Awaited<ReturnType<T>>;
+    type Complete<T> = {
+        [K in keyof T]-?: T[K];
+    };
     /**
      * This primarily makes sure that positional arguments are used correctly
      * (so you can't switch a title and bag_name around).
@@ -774,10 +777,8 @@ declare class StreamerState {
 }
 
 declare function startupCache(rootRoute: rootRoute, commander: Commander): Promise<{
-    tiddlerFileCache: Map<string, string>;
-    tiddlerMemoryCache: Map<string, string>;
-    tiddlerFiles: Map<string, string>;
-    tiddlerHashes: Map<string, string>;
+    tiddlerFiles: Map<any, any>;
+    tiddlerHashes: Map<any, any>;
 }>;
 type CacheState = ART<typeof startupCache>;
 
@@ -888,7 +889,7 @@ interface MWSConfigConfig {
     readonly pathPrefix?: string;
     readonly enablePluginCache?: boolean;
 }
-interface SiteConfig extends MWSConfigConfig {
+interface SiteConfig extends Complete<MWSConfigConfig> {
     wikiPath: string;
     attachmentSizeLimit: number;
     attachmentsEnabled: boolean;

package/dist/server.js

@@ -152,8 +152,8 @@ var init_global = __esm({
       });
     };
     __Result = class __Result {
-      constructor(ok8, error, value) {
-        this.ok = ok8;
+      constructor(ok7, error, value) {
+        this.ok = ok7;
         this.error = error;
         this.value = value;
       }
@@ -14366,8 +14366,7 @@ var init_bag_file_server = __esm({
                 fields: true
               },
               where: {
-                is_deleted: false,
-                bag: { is_plugin: false }
+                is_deleted: false
               }
             }
           }
@@ -14991,21 +14990,13 @@ var init_setupDevServer = __esm({
 });
 
 // src/routes/cache.ts
-import { ok as ok4 } from "assert";
 import * as fs2 from "fs";
 import * as path3 from "path";
 import * as crypto from "crypto";
 async function startupCache(rootRoute2, commander2) {
   const $tw2 = commander2.$tw;
-  const bootTiddlers = $tw2.loadTiddlersFromPath($tw2.boot.bootPath).flatMap((file) => file.tiddlers);
-  const coreTiddler = $tw2.loadPluginFolder($tw2.boot.corePath);
-  ok4(coreTiddler);
-  const tiddlerMemoryCache = new Map([
-    ...bootTiddlers.map((e) => e.title && [e.title, JSON.stringify(e)]).filter(truthy),
-    [coreTiddler.title, JSON.stringify(coreTiddler)]
-  ]);
-  const tiddlerFileCache = /* @__PURE__ */ new Map();
-  const { tiddlerFiles, tiddlerHashes } = await importTW5(path3.join($tw2.boot.corePath, ".."), commander2.cachePath, "client", $tw2);
+  console.log(commander2.siteConfig.enablePluginCache);
+  const { tiddlerFiles, tiddlerHashes } = commander2.siteConfig.enablePluginCache ? await importTW5(path3.join($tw2.boot.corePath, ".."), commander2.cachePath, "client", $tw2) : { tiddlerFiles: /* @__PURE__ */ new Map(), tiddlerHashes: /* @__PURE__ */ new Map() };
   rootRoute2.defineRoute({
     method: ["GET", "HEAD"],
     path: /^\/\$cache\/(.*)\/plugin\.js$/,
@@ -15020,7 +15011,7 @@ async function startupCache(rootRoute2, commander2) {
       reqpath: state.pathParams.plugin + "/plugin.js"
     });
   });
-  return { tiddlerFileCache, tiddlerMemoryCache, tiddlerFiles, tiddlerHashes };
+  return { tiddlerFiles, tiddlerHashes };
 }
 async function importTW5(twFolder, cacheFolder, type, $tw2) {
   const readLevel = /* @__PURE__ */ __name((d) => {
@@ -15180,14 +15171,14 @@ var init_router = __esm({
         return this.siteConfig.pathPrefix;
       }
       handleIncomingRequest(req, res) {
-        const [ok8, err, streamer] = function() {
+        const [ok7, err, streamer] = function() {
           try {
             return [true, void 0, new Streamer(req, res, this)];
           } catch (e) {
             return [false, e, void 0];
           }
         }.call(this);
-        if (!ok8) {
+        if (!ok7) {
           if (err === STREAM_ENDED) return;
           res.writeHead(500, { "x-reason": "handle incoming request" }).end();
           throw err;
@@ -15358,7 +15349,7 @@ var init_router = __esm({
 
 // src/tiddlywiki.ts
 import { TiddlyWiki as TiddlyWiki2 } from "tiddlywiki";
-import { ok as ok5 } from "node:assert";
+import { ok as ok4 } from "node:assert";
 async function bootTiddlyWiki(wikiPath) {
   const $tw2 = TiddlyWiki2();
   $tw2.utils.eachAsync = eachAsync;
@@ -15402,7 +15393,7 @@ async function bootTiddlyWiki(wikiPath) {
     // this should be inert
   ];
   await new Promise((resolve13) => $tw2.boot.boot(resolve13));
-  ok5(!$tw2.boot.tasks.readBrowserTiddlers);
+  ok4(!$tw2.boot.tasks.readBrowserTiddlers);
   return $tw2;
 }
 var init_tiddlywiki = __esm({
@@ -19817,7 +19808,7 @@ __export(listen_exports, {
   ListenerHTTPS: () => ListenerHTTPS,
   info: () => info7
 });
-import { ok as ok6 } from "assert";
+import { ok as ok5 } from "assert";
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 import { createServer } from "http";
 import * as http2 from "node:http2";
@@ -19874,8 +19865,8 @@ var init_listen = __esm({
         const { port, host } = config;
         if (port && typeof port !== "number") throw new Error("If specified, port must be a number");
         const bindInfo = host ? `HTTPS ${host} ${port}` : `HTTPS ${port}`;
-        ok6(config.key && existsSync4(config.key), "Key file not found");
-        ok6(config.cert && existsSync4(config.cert), "Cert file not found");
+        ok5(config.key && existsSync4(config.key), "Key file not found");
+        ok5(config.cert && existsSync4(config.cert), "Cert file not found");
         const key = readFileSync3(config.key);
         const cert = readFileSync3(config.cert);
         super(http2.createSecureServer({ key, cert, allowHTTP1: true }), router, bindInfo);
@@ -20181,7 +20172,7 @@ var init_sqlite_adapter = __esm({
 import * as path5 from "node:path";
 import { PrismaClient as PrismaClient2 } from "@prisma/client";
 import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync4 } from "node:fs";
-import { ok as ok7 } from "node:assert";
+import { ok as ok6 } from "node:assert";
 var _StartupCommander, StartupCommander, _Commander, Commander;
 var init_commander = __esm({
   "src/commander.ts"() {
@@ -20202,8 +20193,8 @@ var init_commander = __esm({
         this.setupRequired = true;
         this.fieldModules = $tw2.Tiddler.fieldModules;
         if (config.config?.pathPrefix) {
-          ok7(config.config.pathPrefix.startsWith("/"), "pathPrefix must start with a slash");
-          ok7(!config.config.pathPrefix.endsWith("/"), "pathPrefix must not end with a slash");
+          ok6(config.config.pathPrefix.startsWith("/"), "pathPrefix must start with a slash");
+          ok6(!config.config.pathPrefix.endsWith("/"), "pathPrefix must not end with a slash");
         }
         this.wikiPath = config.wikiPath;
         this.storePath = path5.resolve(this.wikiPath, "store");
@@ -20226,7 +20217,8 @@ var init_commander = __esm({
           contentTypeInfo: $tw2.config.contentTypeInfo,
           storePath: this.storePath,
           pathPrefix: config.config?.pathPrefix ?? "",
-          saveLargeTextToFileSystem: void 0
+          saveLargeTextToFileSystem: void 0,
+          enablePluginCache: config.config?.enablePluginCache ?? false
         };
         this.SessionManager = config.SessionManager || SessionManager;
         this.AttachmentService = config.AttachmentService || AttachmentService;