inkandswitch · paulsonnentag · May 29, 2024 · May 29, 2024 · May 30, 2024 · May 30, 2024
diff --git a/index.html b/index.html
@@ -20,6 +20,16 @@
   </head>
   <body>
     <div id="root"></div>
+    <script>
+      window.esmsInitOptions = {
+        polyfillEnable: ["css-modules", "json-modules", "wasm-modules"],
+      };
+    </script>
+    <script
+      async
+      src="https://ga.jspm.io/npm:[email protected]/dist/es-module-shims.js"
+      crossorigin="anonymous"
+    ></script>
     <script type="module" src="/src/os/main.tsx"></script>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -86,16 +86,20 @@
     "@typescript-eslint/parser": "^6.0.0",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.16",
+    "cheerio": "^1.0.0-rc.12",
     "eslint": "^8.45.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.3",
+    "glob": "^10.4.1",
     "jsdom": "^22.1.0",
     "pnpm": "^8.14.1",
     "postcss": "^8.4.31",
     "tailwindcss": "^3.3.3",
     "tsc-alias": "^1.8.8",
     "typescript": "^5.0.2",
     "vite": "^5.0.12",
+    "vite-plugin-external": "^4.3.1",
+    "vite-plugin-externalize-dependencies": "^0.12.0",
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-plugin-wasm": "^3.3.0",
     "vitest": "^0.34.6"

diff --git a/public/_headers b/public/_headers
@@ -0,0 +1,2 @@
+/*
+  Access-Control-Allow-Origin: *
diff --git a/src/components/utils.ts b/src/components/utils.ts
@@ -5,8 +5,3 @@ import { useReducer } from "react";
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
-
-export function useForceUpdate() {
-  const [, forceUpdate] = useReducer((x) => x + 1, 0);
-  return forceUpdate;
-}
diff --git a/src/datatypes/bot/datatype.ts b/src/datatypes/bot/datatype.ts
@@ -1,22 +1,17 @@
+import { MarkdownDatatype } from "@/datatypes/essay/datatype";
+import { MarkdownDoc } from "@/datatypes/essay/schema";
+import { DataTypeWitoutMetaData } from "@/os/datatypes";
 import { ContactDoc, RegisteredContactDoc } from "@/os/explorer/account";
-import { MarkdownDatatype } from "@/datatypes/markdown/datatype";
-import { MarkdownDoc } from "@/datatypes/markdown/schema";
-import { type DataType } from "@/os/datatypes";
 import { AutomergeUrl, Repo } from "@automerge/automerge-repo";
-import { Bot } from "lucide-react";
 import { EssayEditingBotDoc } from "./schema";
 
 const BOT_AVATAR_URL = "automerge:uL1duhieqUV4qaeHGHX1dg8FnNy" as AutomergeUrl;
 
-export const EssayEditingBotDatatype: DataType<
+export const EssayEditingBotDatatype: DataTypeWitoutMetaData<
   EssayEditingBotDoc,
   never,
   never
 > = {
-  id: "bot",
-  name: "Bot",
-  isExperimental: true,
-  icon: Bot,
   init: (doc: any, repo: Repo) => {
     const contactHandle = repo.create<RegisteredContactDoc>();
     const promptHandle = repo.create<MarkdownDoc>();

diff --git a/src/datatypes/bot/essayEditingBot.ts b/src/datatypes/bot/essayEditingBot.ts
@@ -1,7 +1,7 @@
 import { RegisteredContactDoc } from "@/os/explorer/account";
 import { DEFAULT_MODEL, openaiClient } from "@/os/lib/llm";
 import { createBranch } from "@/os/versionControl/branches";
-import { MarkdownDoc } from "@/datatypes/markdown/schema";
+import { MarkdownDoc } from "@/datatypes/essay/schema";
 import { AutomergeUrl, DocHandle, Repo } from "@automerge/automerge-repo";
 import { splice } from "@automerge/automerge/next";
 import { EssayEditingBotDoc } from "./schema";

diff --git a/src/datatypes/bot/module.ts b/src/datatypes/bot/module.ts
@@ -0,0 +1,21 @@
+import { DataTypeMetadata, DataTypeWitoutMetaData } from "@/os/datatypes";
+import { Module } from "@/os/modules";
+import { Bot } from "lucide-react";
+import { EssayEditingBotDoc } from "./schema";
+
+export default new Module<
+  DataTypeMetadata,
+  DataTypeWitoutMetaData<EssayEditingBotDoc, never, never>
+>({
+  metadata: {
+    id: "bot",
+    name: "Bot",
+    icon: Bot,
+    isExperimental: true,
+  },
+
+  load: () =>
+    import("./datatype").then(
+      ({ EssayEditingBotDatatype }) => EssayEditingBotDatatype
+    ),
+});
diff --git a/src/datatypes/datagrid/datatype.ts b/src/datatypes/datagrid/datatype.ts
@@ -1,9 +1,8 @@
-import { DataType } from "@/os/datatypes";
+import { DataTypeWitoutMetaData } from "@/os/datatypes";
 import { DecodedChangeWithMetadata } from "@/os/versionControl/groupChanges";
 import { Annotation } from "@/os/versionControl/schema";
 import { next as A } from "@automerge/automerge";
 import { pick } from "lodash";
-import { Sheet } from "lucide-react";
 import { DataGridDoc, DataGridDocAnchor } from "./schema";
 
 // When a copy of the document has been made,
@@ -123,15 +122,11 @@ const patchesToAnnotations = (
   });
 };
 
-export const DataGridDatatype: DataType<
+export const DataGridDatatype: DataTypeWitoutMetaData<
   DataGridDoc,
   DataGridDocAnchor,
   string
 > = {
-  id: "datagrid",
-  name: "Spreadsheet",
-  isExperimental: true,
-  icon: Sheet,
   init,
   getTitle,
   setTitle,

diff --git a/src/datatypes/datagrid/module.ts b/src/datatypes/datagrid/module.ts
@@ -0,0 +1,19 @@
+import { DataTypeMetadata, DataTypeWitoutMetaData } from "@/os/datatypes";
+import { Module } from "@/os/modules";
+import { Sheet } from "lucide-react";
+import { DataGridDoc, DataGridDocAnchor } from "./schema";
+
+export default new Module<
+  DataTypeMetadata,
+  DataTypeWitoutMetaData<DataGridDoc, DataGridDocAnchor, string>
+>({
+  metadata: {
+    id: "datagrid",
+    name: "Spreadsheet",
+    icon: Sheet,
+    isExperimental: true,
+  },
+
+  load: () =>
+    import("./datatype").then(({ DataGridDatatype }) => DataGridDatatype),
+});
diff --git a/src/datatypes/markdown/datatype.ts → src/datatypes/essay/datatype.ts b/src/datatypes/markdown/datatype.ts → src/datatypes/essay/datatype.ts
@@ -1,4 +1,4 @@
-import { DataType } from "@/os/datatypes";
+import { DataTypeWitoutMetaData } from "@/os/datatypes";
 import { FileExportMethod } from "@/os/fileExports";
 import { DecodedChangeWithMetadata } from "@/os/versionControl/groupChanges";
 import {
@@ -12,9 +12,8 @@ import {
 } from "@/os/versionControl/utils";
 import { next as A } from "@automerge/automerge";
 import { Repo } from "@automerge/automerge-repo";
-import { Doc, splice } from "@automerge/automerge/next";
+import { splice } from "@automerge/automerge/next";
 import { pick } from "lodash";
-import { Text } from "lucide-react";
 import { AssetsDoc } from "../../tools/essay/assets";
 import { MarkdownDoc, MarkdownDocAnchor } from "./schema";
 
@@ -289,14 +288,11 @@ const fileExportMethods: FileExportMethod<MarkdownDoc>[] = [
   },
 ];
 
-export const MarkdownDatatype: DataType<
+export const MarkdownDatatype: DataTypeWitoutMetaData<
   MarkdownDoc,
   MarkdownDocAnchor,
   string
 > = {
-  id: "essay",
-  name: "Essay",
-  icon: Text,
   init,
   getTitle,
   markCopy,

diff --git a/src/datatypes/markdown/index.ts → src/datatypes/essay/index.ts b/src/datatypes/markdown/index.ts → src/datatypes/essay/index.ts
diff --git a/src/datatypes/essay/module.ts b/src/datatypes/essay/module.ts
@@ -0,0 +1,18 @@
+import { DataTypeMetadata, DataTypeWitoutMetaData } from "@/os/datatypes";
+import { Text } from "lucide-react";
+import { MarkdownDoc, MarkdownDocAnchor } from "./schema";
+import { Module } from "@/os/modules";
+
+export default new Module<
+  DataTypeMetadata,
+  DataTypeWitoutMetaData<MarkdownDoc, MarkdownDocAnchor, string>
+>({
+  metadata: {
+    id: "essay",
+    name: "Essay",
+    icon: Text,
+  },
+
+  load: () =>
+    import("./datatype").then(({ MarkdownDatatype }) => MarkdownDatatype),
+});
diff --git a/src/datatypes/markdown/schema.ts → src/datatypes/essay/schema.ts b/src/datatypes/markdown/schema.ts → src/datatypes/essay/schema.ts
diff --git a/src/datatypes/markdown/utils.ts → src/datatypes/essay/utils.ts b/src/datatypes/markdown/utils.ts → src/datatypes/essay/utils.ts
diff --git a/src/datatypes/folder/datatype.ts b/src/datatypes/folder/datatype.ts
@@ -1,5 +1,4 @@
-import { DataType } from "@/os/datatypes";
-import { FolderIcon } from "lucide-react";
+import { DataTypeWitoutMetaData } from "@/os/datatypes";
 import { FolderDoc } from ".";
 
 export const init = (doc: any) => {
@@ -22,10 +21,7 @@ export const setTitle = (doc: FolderDoc, title: string) => {
   doc.title = title;
 };
 
-export const FolderDatatype: DataType<FolderDoc, never, never> = {
-  id: "folder",
-  name: "Folder",
-  icon: FolderIcon,
+export const FolderDatatype: DataTypeWitoutMetaData<FolderDoc, never, never> = {
   init,
   getTitle,
   setTitle,

diff --git a/src/datatypes/folder/module.ts b/src/datatypes/folder/module.ts
@@ -0,0 +1,17 @@
+import { DataTypeMetadata, DataTypeWitoutMetaData } from "@/os/datatypes";
+import { Folder } from "lucide-react";
+import { FolderDoc } from "./schema";
+import { Module } from "@/os/modules";
+
+export default new Module<
+  DataTypeMetadata,
+  DataTypeWitoutMetaData<FolderDoc, never, never>
+>({
+  metadata: {
+    id: "folder",
+    name: "Folder",
+    icon: Folder,
+  },
+
+  load: () => import("./datatype").then(({ FolderDatatype }) => FolderDatatype),
+});
diff --git a/src/datatypes/kanban/datatype.ts b/src/datatypes/kanban/datatype.ts
@@ -1,39 +1,15 @@
-import { DataType } from "@/os/datatypes";
+import { DataTypeWitoutMetaData, useDataType } from "@/os/datatypes";
 import { ChangeGroup } from "@/os/versionControl/groupChanges";
 import {
   Annotation,
-  HasVersionControlMetadata,
   initVersionControlMetadata,
 } from "@/os/versionControl/schema";
 import { next as A } from "@automerge/automerge";
-import { KanbanSquare } from "lucide-react";
-
-export type Lane = {
-  id: string;
-  title: string;
-  cardIds: string[];
-};
-
-export type Card = {
-  id: string;
-  title: string;
-  description: string;
-  label: string;
-};
-
-export type KanbanBoardDocAnchor =
-  | { type: "card"; id: string }
-  | { type: "lane"; id: string };
-
-export type KanbanBoardDoc = {
-  title: string;
-  lanes: Lane[];
-  cards: Card[];
-} & HasVersionControlMetadata<never, never>;
+import { Card, KanbanBoardDoc, KanbanBoardDocAnchor, Lane } from "./schema";
 
 // When a copy of the document has been made,
 // update the title so it's more clear which one is the copy vs original.
-export const markCopy = () => {
+const markCopy = () => {
   console.error("todo");
 };
 
@@ -45,7 +21,7 @@ const setTitle = async (doc: KanbanBoardDoc, title: string) => {
   doc.title = title;
 };
 
-export const init = (doc: any) => {
+const init = (doc: any) => {
   doc.title = "Untitled Board";
   doc.lanes = [];
   doc.cards = [];
@@ -240,15 +216,11 @@ const actions = {
   },
 };
 
-export const KanbanBoardDatatype: DataType<
+export const KanbanBoardDatatype: DataTypeWitoutMetaData<
   KanbanBoardDoc,
   KanbanBoardDocAnchor,
   undefined
 > = {
-  id: "kanban",
-  name: "Kanban Board",
-  isExperimental: true,
-  icon: KanbanSquare,
   init,
   getTitle,
   setTitle,

diff --git a/src/datatypes/kanban/index.ts b/src/datatypes/kanban/index.ts
@@ -1,4 +1,3 @@
-import { KanbanBoardDatatype } from "./datatype";
-export default KanbanBoardDatatype;
-
+export { KanbanBoardDatatype } from "./datatype";
+export * from "./schema";
 export * from "./useDocumentWithActions";
diff --git a/src/datatypes/kanban/module.ts b/src/datatypes/kanban/module.ts
@@ -0,0 +1,19 @@
+import { DataTypeMetadata, DataTypeWitoutMetaData } from "@/os/datatypes";
+import { Module } from "@/os/modules";
+import { KanbanSquare } from "lucide-react";
+import { KanbanBoardDoc, KanbanBoardDocAnchor } from "./schema";
+
+export default new Module<
+  DataTypeMetadata,
+  DataTypeWitoutMetaData<KanbanBoardDoc, KanbanBoardDocAnchor, undefined>
+>({
+  metadata: {
+    id: "kanban",
+    name: "Kanban Board",
+    icon: KanbanSquare,
+    isExperimental: true,
+  },
+
+  load: () =>
+    import("./datatype").then(({ KanbanBoardDatatype }) => KanbanBoardDatatype),
+});
diff --git a/src/datatypes/kanban/schema.ts b/src/datatypes/kanban/schema.ts
@@ -0,0 +1,24 @@
+import { HasVersionControlMetadata } from "@/os/versionControl/schema";
+
+export type Lane = {
+  id: string;
+  title: string;
+  cardIds: string[];
+};
+
+export type Card = {
+  id: string;
+  title: string;
+  description: string;
+  label: string;
+};
+
+export type KanbanBoardDocAnchor =
+  | { type: "card"; id: string }
+  | { type: "lane"; id: string };
+
+export type KanbanBoardDoc = {
+  title: string;
+  lanes: Lane[];
+  cards: Card[];
+} & HasVersionControlMetadata<never, never>;