various cleanup

- improve db handling
- fix some build stuff
- import includeWikis as separate bags and other load-wiki-folder improvements

Author: Arlen22

package-lock.json

@@ -50,25 +50,21 @@
     "env": "env",
     "test": "node scripts/scripts.mjs test",
     "prisma:gen": "cd tools && npm run prisma:gen",
-    "prisma:mig": "cd tools && npm run prisma:mig",
-    "postinstall": "(cd tools && npm i)"
+    "prisma:mig": "cd tools && npm run prisma:mig"
   },
   "dependencies": {
-    "@material-symbols/svg-400": "^0.45.3",
-    "@prisma/client": "^7.2.0",
+    "@prisma/adapter-better-sqlite3": "7.8.0",
+    "@prisma/client": "7.8.0",
     "@serenity-kit/opaque": "^0.8.4",
-    "@types/pg": "^8.20.0",
     "source-map-support": "^0.5.21",
     "tiddlywiki": "^5.3.2"
   },
   "devDependencies": {
-    "@prisma/adapter-better-sqlite3": "7.2.0",
-    "@types/dropzone": "^5.7.9",
     "@types/node": "^24.6.0",
-    "@types/source-map-support": "^0.5.10",
-    "dropzone": "^6.0.0-beta.2"
+    "@types/pg": "^8.20.0",
+    "@types/source-map-support": "^0.5.10"
   },
   "peerDependencies": {
     "tiddlywiki": "^5.3.2"
   }
-}
+}

package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "@fontsource/roboto": "^5.2.6",
     "@material/web": "^2.4.0",
+    "@material-symbols/svg-400": "^0.45.3",
     "@mdui/icons": "^1.0.3",
     "@types/luxon": "^3.6.2",
     "esbuild-plugin-copy": "^2.1.1",
@@ -17,4 +18,4 @@
     "uuid": "^13.0.0",
     "rxjs": "7"
   }
-}
+}

packages/admin-vanilla/package.json

@@ -29,7 +29,7 @@ import {
 import { adminStorage, createDraft, getEmptyItems, jsonReviver } from "./definition/store";
 import { definitely, is } from "./definition/utils";
 import { logout } from "./passwords";
-import { fieldTypeRenderSidebars, formatFieldValue, renderFieldEditor, renderFieldSidebar } from "./definition/renders";
+import { fieldTypeRenderSidebars, formatFieldValue, renderFieldEditor, renderFieldSidebar, textWithSlashes } from "./definition/renders";
 
 
 export type AdminRecord = { id: IdString; };
@@ -1033,7 +1033,7 @@ function renderListCellValue(columnKey: string, value: string | undefined) {
     );
   }
 
-  return formattedValue;
+  return textWithSlashes(formattedValue);
 }
 
 function getListColumnLink(tabId: TabId, columnKey: string, item: AdminRecord): string | null {

packages/admin-vanilla/src/app.tsx

@@ -185,11 +185,15 @@ function renderLinesList(value: readonly string[], key: string, itemsByTab?: Adm
           null : null;
   const lines = value.map(line => ({ line, missing: missingCheck && !missingCheck.has(line), }));
   return <ul class="value-list">{lines.map(({ line, missing }) => <li>
-    {line.split("/").map((e, i, a) => <>{e}{(i !== a.length - 1) ? "/" : ""}<wbr /></>)}
+    {textWithSlashes(line)}
     {missing ? <span class="missing-marker" aria-label="Missing dependency" title="Missing dependency"><MaterialSymbol icon={warningIcon} /></span> : null}
   </li>)}</ul>;
 
 }
+export function textWithSlashes(line: string): JSX.Node[] {
+  return line.split("/").map((e, i, a) => <>{e}{(i !== a.length - 1) ? "/" : ""}<wbr /></>);
+}
+
 function renderCalloutField(ctx: ReadonlyFieldContext) {
   definitely<string>(ctx.value);
   return <div class="field-callout"><p>{formatFieldValue(ctx.value)}</p></div>;

packages/admin-vanilla/src/definition/renders.tsx

@@ -17,19 +17,13 @@ export class SqliteAdapter {
 
   adapter!: SqlMigrationAwareDriverAdapterFactory;
   async init() {
+    console.log("CWD: " + process.cwd());
+    console.log("DB: " + this.databasePath);
+
     const libsql = await this.adapter.connect();
 
     // this is used to test the upgrade path
-    if (process.env.RUN_FIRST_MWS_DB_SETUP_FOR_TESTING_0_0) {
-      throw new Error("this is disabled");
-      await libsql.executeScript(await readFile(dist_resolve(
-        "../prisma-20250406/migrations/" + INIT_0_0 + "/migration.sql"
-      ), "utf8"));
-    } else if (process.env.RUN_FIRST_MWS_DB_SETUP_FOR_TESTING_0_1) {
-      await libsql.executeScript(await readFile(dist_resolve(
-        "../prisma/migrations/" + INIT_0_1 + "/migration.sql"
-      ), "utf8"));
-    } else if (process.env.RUN_FIRST_MWS_DB_SETUP_FOR_TESTING_0_2) {
+    if (process.env.RUN_FIRST_MWS_DB_SETUP_FOR_TESTING_0_2) {
       await libsql.executeScript(await readFile(dist_resolve(
         "../prisma/migrations/" + INIT_0_2 + "/migration.sql"
       ), "utf8"));
@@ -62,8 +56,12 @@ export class SqliteAdapter {
         argTypes: [],
       }).then(e => e.rows.map(e => e[0] as string))
     );
+    const oldVersion =
+      applied_migrations.has(INIT_0_0) ? "0.0" :
+        applied_migrations.has(INIT_0_1) ? "0.1" :
+          undefined;
 
-    if (applied_migrations.has(INIT_0_0)) {
+    if (oldVersion) {
       console.log([
         "=======================================================================================",
         "The database you are trying to open is from a previous version of MWS.",
@@ -72,20 +70,19 @@ export class SqliteAdapter {
         "wikis you want to keep by opening them and downloading them as single-file",
         "wikis by clicking on the cloud status icon and then 'save snapshot for offline use'.",
         "",
+        "CWD: " + process.cwd(),
+        "DB: " + this.databasePath,
+        "",
         "To return to a usable version of this wiki, you may run ",
         "",
-        "npm install @tiddlywiki/mws@0.0",
+        "npm install @tiddlywiki/mws@" + oldVersion,
+        "",
+        "To prevent data loss the program will now exit.",
         "=======================================================================================",
       ].join("\n"))
-      await this.checkMigrationsTable(libsql, hasExisting && !hasMigrationsTable, applied_migrations, "prisma-20250406", INIT_0_0);
-      console.log("Your database is updated to the final version for 0.0.x");
-      console.log("This database is for a previous version of MWS. We will now exit to prevent data loss.");
-      console.log("=======================================================================================");
       process.exit(1);
-    // } else if (!applied_migrations.size || applied_migrations.has(INIT_0_1)) {
-    //   await this.checkMigrationsTable(libsql, hasExisting && !hasMigrationsTable, applied_migrations, "prisma", INIT_0_1);
     } else if (!applied_migrations.size || applied_migrations.has(INIT_0_2)) {
-      await this.checkMigrationsTable(libsql, hasExisting && !hasMigrationsTable, applied_migrations, "prisma", INIT_0_2);
+      await this.checkMigrationsTable(libsql, applied_migrations, "prisma/migrations");
     } else if (this.isDevMode) {
       console.log([
         "===============================================================",
@@ -137,13 +134,13 @@ export class SqliteAdapter {
   // prisma/migrations/20250508171144_init/migration.sql
   async checkMigrationsTable(
     libsql: SqlDriverAdapter,
-    migrateExisting: boolean,
     applied_migrations: Set<string>,
-    prismaFolder: string,
-    initMigration: string
+    prismaMigrationsFolder: string
   ) {
 
-    const migrations = await readdir(dist_resolve("../" + prismaFolder + "/migrations"));
+    const migrations = await readdir(dist_resolve("../" + prismaMigrationsFolder));
+    // the folder names are the iso digit string
+    // NOTE: Of all the insanities, numbers are sorted as strings!
     migrations.sort();
 
     const new_migrations = migrations.filter(m => !applied_migrations.has(m) && m !== "migration_lock.toml");
@@ -156,17 +153,13 @@ export class SqliteAdapter {
     console.log("New migrations found", new_migrations);
 
     for (const migration of new_migrations) {
-      const migration_path = dist_resolve(`../${prismaFolder}/migrations/${migration}/migration.sql`);
+      const migration_path = dist_resolve(`../${prismaMigrationsFolder}/${migration}/migration.sql`);
       if (!existsSync(migration_path)) continue;
 
       const fileContent = await readFile(migration_path, 'utf-8');
-      // this is the hard-coded name of the first migration.
-      if (migrateExisting && migration === initMigration) {
-        console.log("Existing migration", migration, "is already applied");
-      } else {
-        console.log("Applying migration", migration);
-        await libsql.executeScript(fileContent);
-      }
+
+      console.log("Applying migration", migration);
+      await libsql.executeScript(fileContent);
 
       await libsql.executeRaw(InsertStatement("_prisma_migrations", [
         {

packages/mws/src/db/sqlite-adapter.ts

@@ -52,6 +52,7 @@ export {
 export * from "./new-commands";
 export * from "./new-managers";
 
+export * from "@tiddlywiki/mws-prisma";
 
 export default async function runMWS(oldOptions?: any) {
   // detect version 0.0 and exit

packages/mws/src/index.ts

@@ -79,11 +79,11 @@ export class InitStoreCommand extends BaseCommand {
 
 		const runner = async (path: string, bagName: string, bagDesc: string, recName: string, recDesc: string) => {
 			const command = new LoadWikiFolderCommand([path!], {
-				"bag-name": [bagName],
+				"bag-relative-root": [dist_resolve("..")],
 				"bag-description": [bagDesc],
 				"recipe-name": [recName],
 				"recipe-description": [recDesc],
-				overwrite: false,
+				"overwrite": false,
 				"owner-roles": ["ADMIN"]
 			});
 			command.$tw = this.$tw;