From 70ae8b17d6ce301cfe4d68a0f429710164dda6aa Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 30 Jan 2024 17:08:33 -0500
Subject: [PATCH 01/16] Adds typecheck command and CI step

---
 .github/workflows/test.yml | 14 ++++++++++++++
 package.json               |  1 +
 2 files changed, 15 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ecf7ec911..573c29ae5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,3 +24,17 @@ jobs:
         env:
           NODE_ENV: production
       - run: npm test
+  typecheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18.x"
+      - run: npm ci
+      - run: npm run build
+        env:
+          NODE_ENV: production
+      - run: npm run typecheck
diff --git a/package.json b/package.json
index a5765a133..b432a218d 100644
--- a/package.json
+++ b/package.json
@@ -103,6 +103,7 @@
     "test-watch": "NODE_OPTIONS=--experimental-vm-modules jest --watchAll",
     "test-coverage": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
     "test:browser": "playwright test",
+    "typecheck": "tsc --noEmit",
     "watch": "concurrently npm:serve npm:dev-embed npm:watch-app",
     "watch-app": "cross-env NODE_ENV=development webpack watch --config webpack.app.config.js"
   },

From 551a6dbb8442455579462df94bc145fd857cafca Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 30 Jan 2024 17:06:01 -0500
Subject: [PATCH 02/16] Remove `accounts/types` and clean up bad types

removes accounts/types reference

Updates type of User and Org
---
 src/addons/dispatch/Premium.svelte            |  6 +--
 src/api/test/fixtures/empty.ts                |  2 +-
 .../types/{orgAndUser.d.ts => orgAndUser.ts}  | 14 ++++---
 src/api/types/project.d.ts                    |  2 +
 src/common/UploadOptions.svelte               |  4 +-
 src/pages/app/accounts/types.ts               | 38 -------------------
 src/pages/app/sidebar/DocumentFilters.svelte  |  6 +--
 7 files changed, 20 insertions(+), 52 deletions(-)
 rename src/api/types/{orgAndUser.d.ts => orgAndUser.ts} (74%)
 delete mode 100644 src/pages/app/accounts/types.ts

diff --git a/src/addons/dispatch/Premium.svelte b/src/addons/dispatch/Premium.svelte
index c7829b802..71659e996 100644
--- a/src/addons/dispatch/Premium.svelte
+++ b/src/addons/dispatch/Premium.svelte
@@ -14,7 +14,7 @@
   } from "../../manager/orgsAndUsers.js";
 
   import type { AddOnListItem } from "../types";
-  import type { User } from "../../pages/app/accounts/types";
+  import { type User, isOrg } from "../../api/types/orgAndUser";
 
   export let addon: AddOnListItem;
 
@@ -23,11 +23,11 @@
   let spendingLimitEnabled = false;
   let spendingLimit = 0;
 
-  $: creditBalance = user?.organization
+  $: creditBalance = isOrg(user?.organization)
     ? getCreditBalance(user.organization)
     : 0;
   $: isIndividualOrg =
-    typeof user?.organization !== "string" && user?.organization?.individual;
+    isOrg(user?.organization) && user?.organization?.individual;
   $: isPremium = addon?.parameters?.categories?.includes("premium") ?? false;
   const { amount, unit, price } = addon?.parameters?.cost ?? {};
 
diff --git a/src/api/test/fixtures/empty.ts b/src/api/test/fixtures/empty.ts
index bae10553d..3842ca970 100644
--- a/src/api/test/fixtures/empty.ts
+++ b/src/api/test/fixtures/empty.ts
@@ -1,6 +1,6 @@
 import type { Page } from "../../types/common";
 
-export const emptyList: Page<never> = {
+export const emptyList: Page<undefined> = {
   count: 0,
   next: null,
   previous: null,
diff --git a/src/api/types/orgAndUser.d.ts b/src/api/types/orgAndUser.ts
similarity index 74%
rename from src/api/types/orgAndUser.d.ts
rename to src/api/types/orgAndUser.ts
index 0b293f129..e366fbf59 100644
--- a/src/api/types/orgAndUser.d.ts
+++ b/src/api/types/orgAndUser.ts
@@ -8,7 +8,7 @@ interface PremiumOrgFields {
 }
 
 export interface Org extends Partial<PremiumOrgFields> {
-  id: string;
+  id: number;
   name: string;
   slug: string;
   avatar_url: string;
@@ -27,11 +27,15 @@ export interface IndividualOrg extends Org {
 }
 
 export interface User {
-  id: string;
+  id: number;
   name: Maybe<string>;
   avatar_url: Maybe<string>;
   username: string;
-  organization: string | Org;
-  organizations: string[];
-  admin_organizations: string[];
+  organization: number | Org;
+  organizations: number[];
+  admin_organizations: number[];
+}
+
+export function isOrg(org?: number | Org): org is Org {
+  return org !== undefined && typeof org !== "number";
 }
diff --git a/src/api/types/project.d.ts b/src/api/types/project.d.ts
index 9ce379603..2c35f0bc4 100644
--- a/src/api/types/project.d.ts
+++ b/src/api/types/project.d.ts
@@ -9,4 +9,6 @@ export interface Project {
   private: boolean;
   updated_at: string;
   edit_access: boolean;
+  // TODO: Add 'pinned' field on the server
+  pinned?: boolean;
 }
diff --git a/src/common/UploadOptions.svelte b/src/common/UploadOptions.svelte
index 5f0f06a79..92279727a 100644
--- a/src/common/UploadOptions.svelte
+++ b/src/common/UploadOptions.svelte
@@ -6,7 +6,7 @@
   } from "../api/languages.js";
   import { _ } from "svelte-i18n";
   import Select from "./Select.svelte";
-  import type { Org, User } from "../pages/app/accounts/types.js";
+  import { isOrg, type Org, type User } from "../api/types/orgAndUser";
   import { getMe, getOrganization } from "../api/orgAndUser.js";
   import { onMount } from "svelte";
   import {
@@ -35,7 +35,7 @@
     }
     try {
       let activeOrg = user?.organization;
-      if (typeof activeOrg === "string") {
+      if (!isOrg(activeOrg)) {
         org = (await getOrganization(activeOrg)) as Org;
       } else {
         org = activeOrg;
diff --git a/src/pages/app/accounts/types.ts b/src/pages/app/accounts/types.ts
deleted file mode 100644
index 49b32f391..000000000
--- a/src/pages/app/accounts/types.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-export type Maybe<T> = T | undefined | null;
-
-interface PremiumOrgFields {
-  purchased_credits: number;
-  monthly_credits: number;
-  monthly_credit_allowance: number;
-  credit_reset_date: string;
-}
-
-export interface Org extends Partial<PremiumOrgFields> {
-  id: string;
-  name: string;
-  slug: string;
-  avatar_url: string;
-  individual: boolean;
-  plan: "Free" | "Professional" | "Organization";
-}
-
-export interface GroupOrg extends Org {
-  individual: false;
-  plan: "Free" | "Organization";
-}
-
-export interface IndividualOrg extends Org {
-  individual: true;
-  plan: "Free" | "Professional";
-}
-
-export interface User {
-  id: string;
-  name: Maybe<string>;
-  avatar_url: Maybe<string>;
-  username: string;
-  organization: string | Org;
-  organizations: string[];
-  admin_organizations: string[];
-  feature_level: number;
-}
diff --git a/src/pages/app/sidebar/DocumentFilters.svelte b/src/pages/app/sidebar/DocumentFilters.svelte
index 74439936d..090ccbac3 100644
--- a/src/pages/app/sidebar/DocumentFilters.svelte
+++ b/src/pages/app/sidebar/DocumentFilters.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { _ } from "svelte-i18n";
+  import { Globe16, Infinity16, Lock16, Organization16 } from "svelte-octicons";
+  import { type User, isOrg } from "../../../api/types/orgAndUser";
   import Link from "../../../router/Link.svelte";
   import { allDocumentsUrl, userUrl, orgUrl } from "../../../search/search.js";
-  import { User } from "../accounts/types";
-  import { Globe16, Infinity16, Lock16, Organization16 } from "svelte-octicons";
   import ListItem from "./ListItem.svelte";
 
   export let user: User | null;
@@ -25,7 +25,7 @@
       <Lock16 slot="icon" />
     </ListItem>
   </Link>
-  {#if user.organization != null && typeof user.organization !== "string" && !user.organization.individual}
+  {#if isOrg(user.organization) && !user.organization.individual}
     <Link plusReplace={true} toUrl={orgUrl(user.organization)}>
       <ListItem
         label={$_("projects.orgDocuments", {

From a3069fb6699a540b019b0d28a0bb131e6354ca25 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Tue, 30 Jan 2024 16:53:19 -0500
Subject: [PATCH 03/16] Types the api/project file

---
 src/api/{project.js => project.ts}            | 86 +++++++++++--------
 src/api/types/document.d.ts                   | 43 ++++++++++
 src/api/types/index.ts                        |  4 +
 src/api/types/project.d.ts                    |  8 +-
 src/manager/documents.js                      |  2 +-
 src/manager/projects.js                       |  9 +-
 .../app/sidebar/projects/ProjectList.svelte   |  2 +-
 src/structure/searchParams.js                 | 15 +++-
 8 files changed, 121 insertions(+), 48 deletions(-)
 rename src/api/{project.js => project.ts} (55%)
 create mode 100644 src/api/types/document.d.ts
 create mode 100644 src/api/types/index.ts

diff --git a/src/api/project.js b/src/api/project.ts
similarity index 55%
rename from src/api/project.js
rename to src/api/project.ts
index 25916039b..e1a6397a1 100644
--- a/src/api/project.js
+++ b/src/api/project.ts
@@ -4,37 +4,42 @@
 
 import session from "./session.js";
 import { apiUrl } from "./base.js";
-import { Project } from "@/structure/project.js";
-import { grabAllPages } from "@/util/paginate.js";
+import { grabAllPages } from "../util/paginate.js";
 import { DEFAULT_ORDERING, DEFAULT_EXPAND } from "./common.js";
-import { queryBuilder } from "@/util/url.js";
-import { Results } from "@/structure/results.js";
-import { Document } from "@/structure/document.js";
+import { queryBuilder } from "../util/url.js";
+import type { Page, Project, User, Document, DocumentAccess } from "./types";
 
-export async function newProject(title, description) {
-  // Create a project
+// Create a project
+export async function newProject(title, description): Promise<Project> {
   const { data } = await session.post(apiUrl("projects/"), {
     title,
     description,
   });
-  return new Project(data);
+  return data;
 }
 
-export async function deleteProject(projectId) {
+export async function deleteProject(projectId: number): Promise<void> {
   // Delete the project with the specified id
   await session.delete(apiUrl(`projects/${projectId}/`));
 }
 
-export async function updateProject(projectId, title, description) {
-  // Update a project
+// Update a project
+export async function updateProject(
+  projectId: number,
+  title: string,
+  description: string,
+): Promise<Project> {
   const { data } = await session.patch(apiUrl(`projects/${projectId}/`), {
     title,
     description,
   });
-  return new Project(data);
+  return data;
 }
 
-export async function addDocumentsToProject(projectId, docIds) {
+export async function addDocumentsToProject(
+  projectId: number,
+  docIds: number[],
+): Promise<void> {
   await session.post(
     apiUrl(`projects/${projectId}/documents/`),
     docIds.map((id) => ({
@@ -43,25 +48,34 @@ export async function addDocumentsToProject(projectId, docIds) {
   );
 }
 
-export async function removeDocumentsFromProject(projectId, docIds) {
+export async function removeDocumentsFromProject(
+  projectId: number,
+  docIds: number[],
+): Promise<void> {
   await session.delete(
     apiUrl(
       `projects/${projectId}/documents/?document_id__in=${docIds
-        .map((x) => `${x}`)
+        .map(String)
         .join(",")}`,
     ),
   );
 }
 
-export async function getProjects(userId, expand = DEFAULT_EXPAND) {
+export async function getProjects(
+  userId: number,
+  expand: string = DEFAULT_EXPAND,
+): Promise<Project[]> {
   // Returns all projects
   const projects = await grabAllPages(
     queryBuilder(apiUrl("projects/"), { user: userId, expand }),
   );
-  return projects.map((project) => new Project(project));
+  return projects;
 }
 
-export async function getProjectUsers(projectId, expand = DEFAULT_EXPAND) {
+export async function getProjectUsers(
+  projectId: number,
+  expand: string = DEFAULT_EXPAND,
+): Promise<User[]> {
   const users = await grabAllPages(
     apiUrl(queryBuilder(`projects/${projectId}/users/`, { expand })),
   );
@@ -69,27 +83,24 @@ export async function getProjectUsers(projectId, expand = DEFAULT_EXPAND) {
 }
 
 export async function getProjectDocuments(
-  projectId,
-  extraParams = {},
-  ordering = DEFAULT_ORDERING,
-  expand = DEFAULT_EXPAND + ",document",
-) {
+  projectId: number,
+  extraParams: Record<string, unknown> = {},
+  ordering: string = DEFAULT_ORDERING,
+  expand: string = DEFAULT_EXPAND + ",document",
+): Promise<[string, Page<Document>]> {
   // Return documents with the specified parameters
   const params = { ...extraParams, ordering, expand, version: "2.0" };
   const url = apiUrl(queryBuilder(`projects/${projectId}/documents/`, params));
   const { data } = await session.get(url);
-  data.results = data.results.map(
-    (document) => new Document(document.document),
-  );
-  return new Results(url, data);
+  return [url, data];
 }
 
 export async function addUserToProject(
-  projectId,
-  email,
-  access,
-  expand = DEFAULT_EXPAND,
-) {
+  projectId: number,
+  email: string,
+  access: DocumentAccess,
+  expand: string = DEFAULT_EXPAND,
+): Promise<Page<User>> {
   const { data: user } = await session.post(
     apiUrl(`projects/${projectId}/users/`),
     {
@@ -106,12 +117,19 @@ export async function addUserToProject(
   return data;
 }
 
-export async function updateUserAccess(projectId, userId, access) {
+export async function updateUserAccess(
+  projectId: number,
+  userId: string,
+  access: DocumentAccess,
+): Promise<void> {
   await session.patch(apiUrl(`projects/${projectId}/users/${userId}/`), {
     access,
   });
 }
 
-export async function removeUser(projectId, userId) {
+export async function removeUser(
+  projectId: number,
+  userId: string,
+): Promise<void> {
   await session.delete(apiUrl(`projects/${projectId}/users/${userId}/`));
 }
diff --git a/src/api/types/document.d.ts b/src/api/types/document.d.ts
new file mode 100644
index 000000000..33283c5c1
--- /dev/null
+++ b/src/api/types/document.d.ts
@@ -0,0 +1,43 @@
+import { Nullable } from "./common";
+import { Project } from "./project";
+
+export type DocumentAccess = "public" | "organization" | "private";
+
+export interface DocumentRevision {
+  version: number;
+  user: number;
+  created_at: string;
+  comment: string;
+  url: string;
+}
+
+export interface Document {
+  id: number;
+  access: DocumentAccess;
+  admin_noindex: boolean;
+  asset_url: string;
+  canonical_url: string;
+  created_at: string;
+  data: Record<string, unknown>;
+  description: string;
+  edit_access: boolean;
+  file_hash: string;
+  noindex: boolean;
+  language: string;
+  organization: number;
+  original_extension: string;
+  page_count: number;
+  page_spec: string;
+  projects: Project[];
+  publish_at: Nullable<string>;
+  published_url: string;
+  related_article: string;
+  revision_control: boolean;
+  revisions?: DocumentRevision[];
+  slug: string;
+  source: string;
+  status: "success" | "failure" | "queued" | "in_progress";
+  title: string;
+  updated_at: string;
+  user: number;
+}
diff --git a/src/api/types/index.ts b/src/api/types/index.ts
new file mode 100644
index 000000000..68b5fcdd1
--- /dev/null
+++ b/src/api/types/index.ts
@@ -0,0 +1,4 @@
+export { Page, Nullable, Maybe } from "./common";
+export { User, Org } from "./orgAndUser";
+export { Project } from "./project";
+export { Document, DocumentRevision, DocumentAccess } from "./document";
diff --git a/src/api/types/project.d.ts b/src/api/types/project.d.ts
index 2c35f0bc4..793394b43 100644
--- a/src/api/types/project.d.ts
+++ b/src/api/types/project.d.ts
@@ -1,14 +1,14 @@
 export interface Project {
   id: number;
+  user: number;
   slug: string;
   title: string;
-  user: number;
-  created_at: string;
   description: string;
-  add_remove_access: boolean;
   private: boolean;
+  created_at: string;
   updated_at: string;
   edit_access: boolean;
+  add_remove_access: boolean;
   // TODO: Add 'pinned' field on the server
-  pinned?: boolean;
+  pinned: boolean;
 }
diff --git a/src/manager/documents.js b/src/manager/documents.js
index e1a6c52fc..f49441ecb 100644
--- a/src/manager/documents.js
+++ b/src/manager/documents.js
@@ -14,7 +14,7 @@ import {
 import {
   addDocumentsToProject,
   removeDocumentsFromProject,
-} from "../api/project.js";
+} from "../api/project";
 import { layout, hideAccess, hideRevisions } from "./layout.js";
 import { wrapLoad, wrapSeparate } from "@/util/wrapLoad.js";
 import { showConfirm } from "./confirmDialog.js";
diff --git a/src/manager/projects.js b/src/manager/projects.js
index 5299bbc8f..05124a75f 100644
--- a/src/manager/projects.js
+++ b/src/manager/projects.js
@@ -8,7 +8,8 @@ import {
   addUserToProject,
   updateUserAccess,
   removeUser,
-} from "@/api/project.js";
+} from "@/api/project";
+import { Project } from "../structure/project.js";
 
 import { layout } from "./layout.js";
 import {
@@ -46,19 +47,19 @@ function addUsers(...users) {
 
 export async function initProjects(me) {
   const newProjects = await getProjects(me.id);
-  projects.projects = newProjects;
+  projects.projects = newProjects.map((project) => new Project(project));
 }
 
 export async function createNewProject(title, description) {
   const project = await newProject(title, description);
-  projects.projects = [...projects.projects, project];
+  projects.projects = [...projects.projects, new Project(project)];
 }
 
 export async function editProject(project, title, description) {
   const updatedProject = await updateProject(project.id, title, description);
   projects.projects = projects.projects.map((oldProject) => {
     if (project.id == oldProject.id) {
-      return updatedProject;
+      return new Project(updatedProject);
     } else {
       return oldProject;
     }
diff --git a/src/pages/app/sidebar/projects/ProjectList.svelte b/src/pages/app/sidebar/projects/ProjectList.svelte
index 1a57ad407..c1ec98614 100644
--- a/src/pages/app/sidebar/projects/ProjectList.svelte
+++ b/src/pages/app/sidebar/projects/ProjectList.svelte
@@ -3,7 +3,7 @@
   import { _ } from "svelte-i18n";
 
   import { User } from "../../../../api/types/orgAndUser";
-  import { getProjects } from "../../../../api/project.js";
+  import { getProjects } from "../../../../api/project";
   import { projectUrl } from "../../../../search/search.js";
   import Link from "../../../../router/Link.svelte";
   import Button from "../../../../common/Button.svelte";
diff --git a/src/structure/searchParams.js b/src/structure/searchParams.js
index b3a8d3cb0..a4dc919c5 100644
--- a/src/structure/searchParams.js
+++ b/src/structure/searchParams.js
@@ -1,7 +1,7 @@
 import { Svue } from "svue";
 import { searchDocuments } from "@/api/document.js";
 import { DEFAULT_ORDERING } from "@/api/common.js";
-import { getProjectDocuments } from "@/api/project.js";
+import { getProjectDocuments } from "@/api/project";
 import { cacheAsync } from "@/util/cache.js";
 import { highlight } from "@/search/parse.js";
 
@@ -251,12 +251,19 @@ export class SearchParams extends Svue {
               }
             }
             return [
-              () =>
-                getProjectDocuments(
+              async () => {
+                const [url, data] = await getProjectDocuments(
                   projectEmbedId,
                   { per_page: perPage },
                   ordering,
-                ),
+                );
+                return new Results(url, {
+                  ...data,
+                  results: data.results.map(
+                    (document) => new Document(document),
+                  ),
+                });
+              },
               null,
             ];
           }

From 6b0ba4bb071bef7086ba381f12e11d63eceff9a7 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 11:58:42 -0500
Subject: [PATCH 04/16] Make project pinned type optional

---
 src/api/types/project.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/types/project.d.ts b/src/api/types/project.d.ts
index 793394b43..49b0a6628 100644
--- a/src/api/types/project.d.ts
+++ b/src/api/types/project.d.ts
@@ -10,5 +10,5 @@ export interface Project {
   edit_access: boolean;
   add_remove_access: boolean;
   // TODO: Add 'pinned' field on the server
-  pinned: boolean;
+  pinned?: boolean;
 }

From a45d0c94089874db4936c596d180af5bcba0b64f Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 11:58:56 -0500
Subject: [PATCH 05/16] Types for api/orgAndUser

---
 src/api/{orgAndUser.js => orgAndUser.ts}      | 49 +++++++++++++------
 src/common/UploadOptions.svelte               |  2 +-
 src/common/dialog/OwnerDialog.svelte          |  2 +-
 src/common/dialog/RevisionsDialog.svelte      |  2 +-
 src/common/dialog/UploadEmailDialog.svelte    |  2 +-
 src/manager/orgsAndUsers.js                   |  2 +-
 src/pages/app/SearchInput.svelte              |  2 +-
 .../app/accounts/AccountNavigation.svelte     |  2 +-
 src/viewer/viewer.js                          |  2 +-
 9 files changed, 42 insertions(+), 23 deletions(-)
 rename src/api/{orgAndUser.js => orgAndUser.ts} (63%)

diff --git a/src/api/orgAndUser.js b/src/api/orgAndUser.ts
similarity index 63%
rename from src/api/orgAndUser.js
rename to src/api/orgAndUser.ts
index 811621066..918f07111 100644
--- a/src/api/orgAndUser.js
+++ b/src/api/orgAndUser.ts
@@ -1,10 +1,11 @@
 import session, { cookiesEnabled, getCsrfToken } from "./session.js";
 import { USER_EXPAND, ORG_EXPAND, DEFAULT_EXPAND } from "./common.js";
-import { queryBuilder } from "@/util/url.js";
-import { grabAllPages } from "@/util/paginate.js";
+import { queryBuilder } from "../util/url.js";
+import { grabAllPages } from "../util/paginate.js";
 import { apiUrl } from "./base.js";
+import { Nullable, Org, User } from "./types";
 
-export async function getMe(expand = DEFAULT_EXPAND) {
+export async function getMe(expand = DEFAULT_EXPAND): Promise<Nullable<User>> {
   // Check that the user is logged in via cookies
   if (cookiesEnabled && !getCsrfToken()) return null;
   // Check that the user is logged in via network request
@@ -15,49 +16,64 @@ export async function getMe(expand = DEFAULT_EXPAND) {
   return data;
 }
 
-export async function getUser(id, expand = DEFAULT_EXPAND) {
+export async function getUser(
+  id: number,
+  expand = DEFAULT_EXPAND,
+): Promise<User> {
   const { data } = await session.get(
     queryBuilder(apiUrl(`users/${id}/`), { expand }),
   );
   return data;
 }
 
-export async function changeActiveOrg(orgId) {
+export async function changeActiveOrg(orgId: number): Promise<void> {
   await session.patch(apiUrl(`users/me/`), { organization: orgId });
 }
 
-export async function getOrganization(id, expand = ORG_EXPAND) {
+export async function getOrganization(
+  id: number,
+  expand = ORG_EXPAND,
+): Promise<Org> {
   const { data } = await session.get(
     queryBuilder(apiUrl(`organizations/${id}/`), { expand }),
   );
   return data;
 }
 
-export async function getOrganizations(individual = null, expand = ORG_EXPAND) {
+export async function getOrganizations(
+  individual = null,
+  expand = ORG_EXPAND,
+): Promise<Org[]> {
   const orgs = await grabAllPages(
     queryBuilder(apiUrl(`organizations/`), { individual, expand }),
   );
   return orgs;
 }
 
-export async function getOrganizationsByIds(ids, expand = ORG_EXPAND) {
+export async function getOrganizationsByIds(
+  ids: number[],
+  expand = ORG_EXPAND,
+): Promise<Org[]> {
   const orgs = await grabAllPages(
     queryBuilder(apiUrl(`organizations/`), { id__in: ids, expand }),
   );
   return orgs;
 }
 
-export async function getUsers({ projectIds, orgIds }, expand = USER_EXPAND) {
+export async function getUsers(
+  { projectIds, orgIds }: { projectIds: number[]; orgIds: number[] },
+  expand = USER_EXPAND,
+): Promise<User[]> {
   if (projectIds != null && orgIds != null) {
     throw new Error("Only specify one of project or org ids");
   }
 
   const query = { expand };
   if (projectIds != null) {
-    query["project"] = projectIds.map((id) => `${id}`).join(",");
+    query["project"] = projectIds.map(String).join(",");
   }
   if (orgIds != null) {
-    query["organization"] = orgIds.map((id) => `${id}`).join(",");
+    query["organization"] = orgIds.map(String).join(",");
   }
 
   const users = await grabAllPages(queryBuilder(apiUrl(`users/`), query));
@@ -67,7 +83,7 @@ export async function getUsers({ projectIds, orgIds }, expand = USER_EXPAND) {
 export async function autocompleteOrganizations(
   prefix = "",
   individual = false,
-) {
+): Promise<Org[]> {
   const { data } = await session.get(
     queryBuilder(apiUrl("organizations/"), {
       name__istartswith: prefix,
@@ -78,7 +94,10 @@ export async function autocompleteOrganizations(
   return data.results;
 }
 
-export async function autocompleteUsers(prefix = "", orgIds = null) {
+export async function autocompleteUsers(
+  prefix = "",
+  orgIds = null,
+): Promise<User> {
   const { data } = await session.get(
     queryBuilder(apiUrl("users/"), {
       name__istartswith: prefix,
@@ -89,11 +108,11 @@ export async function autocompleteUsers(prefix = "", orgIds = null) {
   return data.results;
 }
 
-export async function createMailkey() {
+export async function createMailkey(): Promise<string> {
   const { data } = await session.post(apiUrl("users/mailkey/"));
   return data.mailkey;
 }
 
-export async function destroyMailkey() {
+export async function destroyMailkey(): Promise<void> {
   await session.delete(apiUrl("users/mailkey/"));
 }
diff --git a/src/common/UploadOptions.svelte b/src/common/UploadOptions.svelte
index 92279727a..c3563a68e 100644
--- a/src/common/UploadOptions.svelte
+++ b/src/common/UploadOptions.svelte
@@ -7,7 +7,7 @@
   import { _ } from "svelte-i18n";
   import Select from "./Select.svelte";
   import { isOrg, type Org, type User } from "../api/types/orgAndUser";
-  import { getMe, getOrganization } from "../api/orgAndUser.js";
+  import { getMe, getOrganization } from "../api/orgAndUser";
   import { onMount } from "svelte";
   import {
     getUpgradeUrl,
diff --git a/src/common/dialog/OwnerDialog.svelte b/src/common/dialog/OwnerDialog.svelte
index 700581955..234c2443d 100644
--- a/src/common/dialog/OwnerDialog.svelte
+++ b/src/common/dialog/OwnerDialog.svelte
@@ -8,7 +8,7 @@
 
   import { layout } from "@/manager/layout.js";
   import { viewer } from "@/viewer/viewer.js";
-  import { autocompleteUsers } from "@/api/orgAndUser.js";
+  import { autocompleteUsers } from "@/api/orgAndUser";
   import { orgsAndUsers } from "@/manager/orgsAndUsers.js";
   import { changeOwnerForDocuments } from "@/manager/documents.js";
   import { sameProp } from "@/util/array.js";
diff --git a/src/common/dialog/RevisionsDialog.svelte b/src/common/dialog/RevisionsDialog.svelte
index d075deb75..7cafc2b04 100644
--- a/src/common/dialog/RevisionsDialog.svelte
+++ b/src/common/dialog/RevisionsDialog.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { _ } from "svelte-i18n";
-  import { getMe } from "../../api/orgAndUser.js";
+  import { getMe } from "../../api/orgAndUser";
   import {
     isOrgAdmin,
     isPremiumOrg,
diff --git a/src/common/dialog/UploadEmailDialog.svelte b/src/common/dialog/UploadEmailDialog.svelte
index 1979fd604..725cc41d9 100644
--- a/src/common/dialog/UploadEmailDialog.svelte
+++ b/src/common/dialog/UploadEmailDialog.svelte
@@ -1,7 +1,7 @@
 <script>
   import Button from "@/common/Button.svelte";
   import emitter from "@/emit.js";
-  import { createMailkey, destroyMailkey } from "@/api/orgAndUser.js";
+  import { createMailkey, destroyMailkey } from "@/api/orgAndUser";
   import { _ } from "svelte-i18n";
 
   const emit = emitter({
diff --git a/src/manager/orgsAndUsers.js b/src/manager/orgsAndUsers.js
index 8f93b20fa..ab32eccd1 100644
--- a/src/manager/orgsAndUsers.js
+++ b/src/manager/orgsAndUsers.js
@@ -10,7 +10,7 @@ import {
   getUser,
   getUsers,
   getOrganization,
-} from "../api/orgAndUser.js";
+} from "../api/orgAndUser";
 import { SQUARELET_URL } from "../api/auth.js";
 import { projects, initProjects } from "./projects.js";
 import { userUrl, allDocumentsUrl } from "../search/search.js";
diff --git a/src/pages/app/SearchInput.svelte b/src/pages/app/SearchInput.svelte
index c12e26fb8..96696a68a 100644
--- a/src/pages/app/SearchInput.svelte
+++ b/src/pages/app/SearchInput.svelte
@@ -13,7 +13,7 @@
   import {
     autocompleteOrganizations,
     autocompleteUsers,
-  } from "@/api/orgAndUser.js";
+  } from "@/api/orgAndUser";
   import { slugify } from "@/util/string.js";
   import { timeoutify } from "@/util/closure.js";
 
diff --git a/src/pages/app/accounts/AccountNavigation.svelte b/src/pages/app/accounts/AccountNavigation.svelte
index 712320130..b3149c23a 100644
--- a/src/pages/app/accounts/AccountNavigation.svelte
+++ b/src/pages/app/accounts/AccountNavigation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { getMe, getOrganization } from "../../../api/orgAndUser.js";
+  import { getMe, getOrganization } from "../../../api/orgAndUser";
 
   import LanguageMenu from "./LanguageMenu.svelte";
   import HelpMenu from "./HelpMenu.svelte";
diff --git a/src/viewer/viewer.js b/src/viewer/viewer.js
index 54b6cd276..cb56726dd 100644
--- a/src/viewer/viewer.js
+++ b/src/viewer/viewer.js
@@ -1,6 +1,6 @@
 import { Svue } from "svue";
 import { getDocument } from "@/api/document.js";
-import { getMe } from "@/api/orgAndUser.js";
+import { getMe } from "@/api/orgAndUser";
 import { router } from "@/router/router.js";
 import { DEFAULT_EXPAND } from "../api/common.js";
 import { inIframe } from "@/util/iframe.js";

From 01b8befbaaa37da4a0d948117e0ec27a084e480c Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 12:05:02 -0500
Subject: [PATCH 06/16] Uses svelte-check for typechecking in Svelte/TS files

---
 .github/workflows/test.yml |  4 ++--
 package-lock.json          | 49 ++++++++++++++++++++++++--------------
 package.json               |  3 ++-
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 573c29ae5..232e9c977 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
         env:
           NODE_ENV: production
       - run: npm test
-  typecheck:
+  check:
     runs-on: ubuntu-latest
 
     steps:
@@ -37,4 +37,4 @@ jobs:
       - run: npm run build
         env:
           NODE_ENV: production
-      - run: npm run typecheck
+      - run: npm run check
diff --git a/package-lock.json b/package-lock.json
index 04963aa2c..c9c55e068 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,6 +87,7 @@
         "storybook": "7.6.10",
         "storybook-addon-cookie": "^3.2.0",
         "storybook-mock-date-decorator": "^1.0.1",
+        "svelte-check": "^3.6.3",
         "svelte-jester": "^3.0.0",
         "tape": "^5.7.2",
         "ts-jest": "^29.1.2"
@@ -20405,6 +20406,28 @@
         "node": ">=16"
       }
     },
+    "node_modules/svelte-check": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.6.3.tgz",
+      "integrity": "sha512-Q2nGnoysxUnB9KjnjpQLZwdjK62DHyW6nuH/gm2qteFnDk0lCehe/6z8TsIvYeKjC6luKaWxiNGyOcWiLLPSwA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "chokidar": "^3.4.1",
+        "fast-glob": "^3.2.7",
+        "import-fresh": "^3.2.1",
+        "picocolors": "^1.0.0",
+        "sade": "^1.7.4",
+        "svelte-preprocess": "^5.1.0",
+        "typescript": "^5.0.3"
+      },
+      "bin": {
+        "svelte-check": "bin/svelte-check"
+      },
+      "peerDependencies": {
+        "svelte": "^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0"
+      }
+    },
     "node_modules/svelte-dev-helper": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/svelte-dev-helper/-/svelte-dev-helper-1.1.9.tgz",
@@ -20843,31 +20866,32 @@
       "integrity": "sha512-p1RgYhqT/zuVe9Lu8XTIudwk2nNYTLu7V9EFezqmMKjiFcTBMx8WRQRfVNaX5WPXHOGdPXVUYcfsSddCAwFd3Q=="
     },
     "node_modules/svelte-preprocess": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.4.tgz",
-      "integrity": "sha512-ABia2QegosxOGsVlsSBJvoWeXy1wUKSfF7SWJdTjLAbx/Y3SrVevvvbFNQqrSJw89+lNSsM58SipmZJ5SRi5iw==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.3.tgz",
+      "integrity": "sha512-xxAkmxGHT+J/GourS5mVJeOXZzne1FR5ljeOUAMXUkfEhkLEllRreXpbl3dIYJlcJRfL1LO1uIAPpBpBfiqGPw==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/pug": "^2.0.6",
         "detect-indent": "^6.1.0",
-        "magic-string": "^0.27.0",
+        "magic-string": "^0.30.5",
         "sorcery": "^0.11.0",
         "strip-indent": "^3.0.0"
       },
       "engines": {
-        "node": ">= 14.10.0"
+        "node": ">= 16.0.0",
+        "pnpm": "^8.0.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.10.2",
         "coffeescript": "^2.5.1",
         "less": "^3.11.3 || ^4.0.0",
         "postcss": "^7 || ^8",
-        "postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0",
+        "postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
         "pug": "^3.0.0",
         "sass": "^1.26.8",
         "stylus": "^0.55.0",
         "sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0",
-        "svelte": "^3.23.0 || ^4.0.0-next.0 || ^4.0.0",
+        "svelte": "^3.23.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0",
         "typescript": ">=3.9.5 || ^4.0.0 || ^5.0.0"
       },
       "peerDependenciesMeta": {
@@ -20919,17 +20943,6 @@
         "sass": "^1.35.2"
       }
     },
-    "node_modules/svelte-preprocess/node_modules/magic-string": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
-      "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/svelte/node_modules/acorn": {
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
diff --git a/package.json b/package.json
index b432a218d..bb866501c 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "storybook": "7.6.10",
     "storybook-addon-cookie": "^3.2.0",
     "storybook-mock-date-decorator": "^1.0.1",
+    "svelte-check": "^3.6.3",
     "svelte-jester": "^3.0.0",
     "tape": "^5.7.2",
     "ts-jest": "^29.1.2"
@@ -92,6 +93,7 @@
     "build-serve": "cross-env NODE_ENV=production webpack && serve public -l 80 --single",
     "build-analyze": "cross-env NODE_ENV=production-analyze webpack",
     "build-storybook": "storybook build",
+    "check": "svelte-check",
     "dev": "concurrently \"npm:dev-app\" \"npm:dev-embed\"",
     "dev-app": "cross-env NODE_ENV=development SUPPRESS_WARNINGS=1 webpack serve --config webpack.app.config.js",
     "dev-embed": "cross-env NODE_ENV=development webpack --config webpack.embed.config.js",
@@ -103,7 +105,6 @@
     "test-watch": "NODE_OPTIONS=--experimental-vm-modules jest --watchAll",
     "test-coverage": "NODE_OPTIONS=--experimental-vm-modules jest --coverage",
     "test:browser": "playwright test",
-    "typecheck": "tsc --noEmit",
     "watch": "concurrently npm:serve npm:dev-embed npm:watch-app",
     "watch-app": "cross-env NODE_ENV=development webpack watch --config webpack.app.config.js"
   },

From 506d0cb5e11a1e45e3596db577707d5876db1904 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 12:15:39 -0500
Subject: [PATCH 07/16] Update `check` method to include Svelte files

---
 package.json  | 2 +-
 tsconfig.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index bb866501c..723824698 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "build-serve": "cross-env NODE_ENV=production webpack && serve public -l 80 --single",
     "build-analyze": "cross-env NODE_ENV=production-analyze webpack",
     "build-storybook": "storybook build",
-    "check": "svelte-check",
+    "check": "svelte-check --threshold error",
     "dev": "concurrently \"npm:dev-app\" \"npm:dev-embed\"",
     "dev-app": "cross-env NODE_ENV=development SUPPRESS_WARNINGS=1 webpack serve --config webpack.app.config.js",
     "dev-embed": "cross-env NODE_ENV=development webpack --config webpack.embed.config.js",
diff --git a/tsconfig.json b/tsconfig.json
index 1330e4723..89d9ac115 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,6 +15,6 @@
     },
     "downlevelIteration": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.svelte", "src/**/*.js"],
   "exclude": ["public/*"]
 }

From 982c0e9f4fa60841cc56a23c8ffda757b3ee777d Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 12:15:59 -0500
Subject: [PATCH 08/16] Fix type errors

---
 src/addons/dispatch/fields/ArrayField.svelte    | 2 +-
 src/api/types/index.ts                          | 2 +-
 src/pages/app/accounts/AccountNavigation.svelte | 4 ++--
 src/pages/app/accounts/OrgMenu.svelte           | 2 +-
 src/pages/app/accounts/OrgPicker.svelte         | 2 +-
 src/pages/app/accounts/PremiumMenu.svelte       | 2 +-
 src/pages/app/accounts/UserMenu.svelte          | 2 +-
 src/pages/viewer/Sidebar.svelte                 | 2 ++
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/addons/dispatch/fields/ArrayField.svelte b/src/addons/dispatch/fields/ArrayField.svelte
index db3f24472..797e4c50a 100644
--- a/src/addons/dispatch/fields/ArrayField.svelte
+++ b/src/addons/dispatch/fields/ArrayField.svelte
@@ -17,7 +17,7 @@
   };
 
   export let count: number = 1;
-  export let value: [any] = Array(count).fill(null);
+  export let value: any[] = Array(count).fill(null);
 
   $: numItems = value?.length ?? 0;
 
diff --git a/src/api/types/index.ts b/src/api/types/index.ts
index 68b5fcdd1..3748132ee 100644
--- a/src/api/types/index.ts
+++ b/src/api/types/index.ts
@@ -1,4 +1,4 @@
 export { Page, Nullable, Maybe } from "./common";
-export { User, Org } from "./orgAndUser";
+export { User, Org, isOrg } from "./orgAndUser";
 export { Project } from "./project";
 export { Document, DocumentRevision, DocumentAccess } from "./document";
diff --git a/src/pages/app/accounts/AccountNavigation.svelte b/src/pages/app/accounts/AccountNavigation.svelte
index b3149c23a..edb30a259 100644
--- a/src/pages/app/accounts/AccountNavigation.svelte
+++ b/src/pages/app/accounts/AccountNavigation.svelte
@@ -5,7 +5,7 @@
   import HelpMenu from "./HelpMenu.svelte";
   import UserMenu from "./UserMenu.svelte";
   import OrgMenu from "./OrgMenu.svelte";
-  import { User, Org } from "./types";
+  import { User, Org, isOrg } from "../../../api/types";
 
   let user: User | null = null;
   let org: Org | null = null;
@@ -14,7 +14,7 @@
     try {
       user = await getMe();
       const activeOrg = user?.organization;
-      if (typeof activeOrg === "string") {
+      if (!isOrg(activeOrg)) {
         org = await getOrganization(activeOrg);
       } else {
         org = activeOrg;
diff --git a/src/pages/app/accounts/OrgMenu.svelte b/src/pages/app/accounts/OrgMenu.svelte
index 24a97497f..6948a9967 100644
--- a/src/pages/app/accounts/OrgMenu.svelte
+++ b/src/pages/app/accounts/OrgMenu.svelte
@@ -6,7 +6,7 @@
   import Menu from "../../../common/Menu.svelte";
   import MenuTitle from "../../../common/MenuTitle.svelte";
   import Loader from "../../../common/Loader.svelte";
-  import { User, Org } from "./types";
+  import { User, Org } from "../../../api/types";
   import OrgMemberList from "./OrgMemberList.svelte";
   import {
     changeActive,
diff --git a/src/pages/app/accounts/OrgPicker.svelte b/src/pages/app/accounts/OrgPicker.svelte
index cdc0ecc83..cb650d968 100644
--- a/src/pages/app/accounts/OrgPicker.svelte
+++ b/src/pages/app/accounts/OrgPicker.svelte
@@ -7,7 +7,7 @@
   import MenuItem from "../../../common/MenuItem.svelte";
   import Loader from "../../../common/Loader.svelte";
 
-  import { Org } from "./types";
+  import { Org } from "../../../api/types";
 
   export let activeOrg: Org;
   export let loading = false;
diff --git a/src/pages/app/accounts/PremiumMenu.svelte b/src/pages/app/accounts/PremiumMenu.svelte
index a9eb842b0..2e494636b 100644
--- a/src/pages/app/accounts/PremiumMenu.svelte
+++ b/src/pages/app/accounts/PremiumMenu.svelte
@@ -14,7 +14,7 @@
 
   import { Plug16, Organization16 } from "svelte-octicons";
   import { SQUARELET_URL } from "../../../api/auth";
-  import { Org } from "./types";
+  import { Org } from "../../../api/types";
   import MenuInsert from "../../../common/MenuInsert.svelte";
   import {
     isPremiumOrg,
diff --git a/src/pages/app/accounts/UserMenu.svelte b/src/pages/app/accounts/UserMenu.svelte
index 20cf6922a..0c0e2de18 100644
--- a/src/pages/app/accounts/UserMenu.svelte
+++ b/src/pages/app/accounts/UserMenu.svelte
@@ -14,7 +14,7 @@
     SIGN_OUT_URL,
   } from "../../../api/auth.js";
   import { showMailkeySelected } from "../../../manager/manager.js";
-  import { Maybe, User } from "./types";
+  import { Maybe, User } from "../../../api/types";
 
   export let user: Maybe<User>;
 
diff --git a/src/pages/viewer/Sidebar.svelte b/src/pages/viewer/Sidebar.svelte
index 480c173db..784deeca9 100644
--- a/src/pages/viewer/Sidebar.svelte
+++ b/src/pages/viewer/Sidebar.svelte
@@ -125,6 +125,8 @@
     if (document != null && textDoc == null && !loading) {
       loading = true;
       (async () => {
+        // @ts-expect-error session is not typed,
+        // but it does have a getStatic method added to its prototype
         textDoc = await session.getStatic(jsonUrl(document));
         // strip _force if it exists
         ocrEngine = textDoc.pages[0].ocr;

From 0bfcbe82b4b36ad0b9a6b7888ae4dc1bfd66ca4b Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 12:20:34 -0500
Subject: [PATCH 09/16] Fix type imports

---
 src/api/types/{common.d.ts => common.ts}     | 0
 src/api/types/{document.d.ts => document.ts} | 0
 src/api/types/{project.d.ts => project.ts}   | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename src/api/types/{common.d.ts => common.ts} (100%)
 rename src/api/types/{document.d.ts => document.ts} (100%)
 rename src/api/types/{project.d.ts => project.ts} (100%)

diff --git a/src/api/types/common.d.ts b/src/api/types/common.ts
similarity index 100%
rename from src/api/types/common.d.ts
rename to src/api/types/common.ts
diff --git a/src/api/types/document.d.ts b/src/api/types/document.ts
similarity index 100%
rename from src/api/types/document.d.ts
rename to src/api/types/document.ts
diff --git a/src/api/types/project.d.ts b/src/api/types/project.ts
similarity index 100%
rename from src/api/types/project.d.ts
rename to src/api/types/project.ts

From abd4f90d1fd6dd3b46da8ab6f1af7d08e409e4d2 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 12:27:06 -0500
Subject: [PATCH 10/16] Fix TS imports

---
 src/common/dialog/OwnerDialog.svelte       | 2 +-
 src/common/dialog/UploadEmailDialog.svelte | 2 +-
 src/manager/documents.js                   | 2 +-
 src/manager/orgsAndUsers.js                | 2 +-
 src/manager/projects.js                    | 2 +-
 src/pages/app/SearchInput.svelte           | 2 +-
 src/structure/searchParams.js              | 2 +-
 src/viewer/viewer.js                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/common/dialog/OwnerDialog.svelte b/src/common/dialog/OwnerDialog.svelte
index 234c2443d..293f3c5e2 100644
--- a/src/common/dialog/OwnerDialog.svelte
+++ b/src/common/dialog/OwnerDialog.svelte
@@ -8,7 +8,7 @@
 
   import { layout } from "@/manager/layout.js";
   import { viewer } from "@/viewer/viewer.js";
-  import { autocompleteUsers } from "@/api/orgAndUser";
+  import { autocompleteUsers } from "@/api/orgAndUser.ts";
   import { orgsAndUsers } from "@/manager/orgsAndUsers.js";
   import { changeOwnerForDocuments } from "@/manager/documents.js";
   import { sameProp } from "@/util/array.js";
diff --git a/src/common/dialog/UploadEmailDialog.svelte b/src/common/dialog/UploadEmailDialog.svelte
index 725cc41d9..71034f819 100644
--- a/src/common/dialog/UploadEmailDialog.svelte
+++ b/src/common/dialog/UploadEmailDialog.svelte
@@ -1,7 +1,7 @@
 <script>
   import Button from "@/common/Button.svelte";
   import emitter from "@/emit.js";
-  import { createMailkey, destroyMailkey } from "@/api/orgAndUser";
+  import { createMailkey, destroyMailkey } from "@/api/orgAndUser.ts";
   import { _ } from "svelte-i18n";
 
   const emit = emitter({
diff --git a/src/manager/documents.js b/src/manager/documents.js
index f49441ecb..a29b8d037 100644
--- a/src/manager/documents.js
+++ b/src/manager/documents.js
@@ -14,7 +14,7 @@ import {
 import {
   addDocumentsToProject,
   removeDocumentsFromProject,
-} from "../api/project";
+} from "../api/project.ts";
 import { layout, hideAccess, hideRevisions } from "./layout.js";
 import { wrapLoad, wrapSeparate } from "@/util/wrapLoad.js";
 import { showConfirm } from "./confirmDialog.js";
diff --git a/src/manager/orgsAndUsers.js b/src/manager/orgsAndUsers.js
index ab32eccd1..4e7120b9e 100644
--- a/src/manager/orgsAndUsers.js
+++ b/src/manager/orgsAndUsers.js
@@ -10,7 +10,7 @@ import {
   getUser,
   getUsers,
   getOrganization,
-} from "../api/orgAndUser";
+} from "../api/orgAndUser.ts";
 import { SQUARELET_URL } from "../api/auth.js";
 import { projects, initProjects } from "./projects.js";
 import { userUrl, allDocumentsUrl } from "../search/search.js";
diff --git a/src/manager/projects.js b/src/manager/projects.js
index 05124a75f..fed7dd706 100644
--- a/src/manager/projects.js
+++ b/src/manager/projects.js
@@ -8,7 +8,7 @@ import {
   addUserToProject,
   updateUserAccess,
   removeUser,
-} from "@/api/project";
+} from "@/api/project.ts";
 import { Project } from "../structure/project.js";
 
 import { layout } from "./layout.js";
diff --git a/src/pages/app/SearchInput.svelte b/src/pages/app/SearchInput.svelte
index 96696a68a..315710a6a 100644
--- a/src/pages/app/SearchInput.svelte
+++ b/src/pages/app/SearchInput.svelte
@@ -13,7 +13,7 @@
   import {
     autocompleteOrganizations,
     autocompleteUsers,
-  } from "@/api/orgAndUser";
+  } from "@/api/orgAndUser.ts";
   import { slugify } from "@/util/string.js";
   import { timeoutify } from "@/util/closure.js";
 
diff --git a/src/structure/searchParams.js b/src/structure/searchParams.js
index a4dc919c5..2d019d1c7 100644
--- a/src/structure/searchParams.js
+++ b/src/structure/searchParams.js
@@ -1,7 +1,7 @@
 import { Svue } from "svue";
 import { searchDocuments } from "@/api/document.js";
 import { DEFAULT_ORDERING } from "@/api/common.js";
-import { getProjectDocuments } from "@/api/project";
+import { getProjectDocuments } from "@/api/project.ts";
 import { cacheAsync } from "@/util/cache.js";
 import { highlight } from "@/search/parse.js";
 
diff --git a/src/viewer/viewer.js b/src/viewer/viewer.js
index cb56726dd..ae7559a22 100644
--- a/src/viewer/viewer.js
+++ b/src/viewer/viewer.js
@@ -1,6 +1,6 @@
 import { Svue } from "svue";
 import { getDocument } from "@/api/document.js";
-import { getMe } from "@/api/orgAndUser";
+import { getMe } from "@/api/orgAndUser.ts";
 import { router } from "@/router/router.js";
 import { DEFAULT_EXPAND } from "../api/common.js";
 import { inIframe } from "@/util/iframe.js";

From 31af39d66a6cd86127c3b83e790fd383a6b30897 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 12:39:42 -0500
Subject: [PATCH 11/16] Fix issue with isOrg check

---
 src/api/types/orgAndUser.ts                  | 4 ++--
 src/pages/app/sidebar/DocumentFilters.svelte | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/types/orgAndUser.ts b/src/api/types/orgAndUser.ts
index e366fbf59..9ed9b1623 100644
--- a/src/api/types/orgAndUser.ts
+++ b/src/api/types/orgAndUser.ts
@@ -36,6 +36,6 @@ export interface User {
   admin_organizations: number[];
 }
 
-export function isOrg(org?: number | Org): org is Org {
-  return org !== undefined && typeof org !== "number";
+export function isOrg(org?: null | number | Org): org is Org {
+  return org !== undefined && org !== null && typeof org !== "number";
 }
diff --git a/src/pages/app/sidebar/DocumentFilters.svelte b/src/pages/app/sidebar/DocumentFilters.svelte
index 090ccbac3..8220fccee 100644
--- a/src/pages/app/sidebar/DocumentFilters.svelte
+++ b/src/pages/app/sidebar/DocumentFilters.svelte
@@ -25,7 +25,7 @@
       <Lock16 slot="icon" />
     </ListItem>
   </Link>
-  {#if isOrg(user.organization) && !user.organization.individual}
+  {#if isOrg(user.organization) && !user.organization?.individual}
     <Link plusReplace={true} toUrl={orgUrl(user.organization)}>
       <ListItem
         label={$_("projects.orgDocuments", {

From 25f8b61d02ed2e3740b5c2b50cc2c8f9f61a9411 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 13:05:05 -0500
Subject: [PATCH 12/16] Fix TS imports

---
 src/pages/app/accounts/AccountNavigation.svelte | 2 +-
 src/pages/app/accounts/OrgMenu.svelte           | 2 +-
 src/pages/app/accounts/OrgPicker.svelte         | 2 +-
 src/pages/app/accounts/PremiumMenu.svelte       | 2 +-
 src/pages/app/accounts/UserMenu.svelte          | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/app/accounts/AccountNavigation.svelte b/src/pages/app/accounts/AccountNavigation.svelte
index edb30a259..0a802a23f 100644
--- a/src/pages/app/accounts/AccountNavigation.svelte
+++ b/src/pages/app/accounts/AccountNavigation.svelte
@@ -5,7 +5,7 @@
   import HelpMenu from "./HelpMenu.svelte";
   import UserMenu from "./UserMenu.svelte";
   import OrgMenu from "./OrgMenu.svelte";
-  import { User, Org, isOrg } from "../../../api/types";
+  import { User, Org, isOrg } from "../../../api/types/orgAndUser";
 
   let user: User | null = null;
   let org: Org | null = null;
diff --git a/src/pages/app/accounts/OrgMenu.svelte b/src/pages/app/accounts/OrgMenu.svelte
index 6948a9967..786b38993 100644
--- a/src/pages/app/accounts/OrgMenu.svelte
+++ b/src/pages/app/accounts/OrgMenu.svelte
@@ -6,7 +6,7 @@
   import Menu from "../../../common/Menu.svelte";
   import MenuTitle from "../../../common/MenuTitle.svelte";
   import Loader from "../../../common/Loader.svelte";
-  import { User, Org } from "../../../api/types";
+  import { User, Org } from "../../../api/types/orgAndUser";
   import OrgMemberList from "./OrgMemberList.svelte";
   import {
     changeActive,
diff --git a/src/pages/app/accounts/OrgPicker.svelte b/src/pages/app/accounts/OrgPicker.svelte
index cb650d968..9f0116543 100644
--- a/src/pages/app/accounts/OrgPicker.svelte
+++ b/src/pages/app/accounts/OrgPicker.svelte
@@ -7,7 +7,7 @@
   import MenuItem from "../../../common/MenuItem.svelte";
   import Loader from "../../../common/Loader.svelte";
 
-  import { Org } from "../../../api/types";
+  import { Org } from "../../../api/types/orgAndUser";
 
   export let activeOrg: Org;
   export let loading = false;
diff --git a/src/pages/app/accounts/PremiumMenu.svelte b/src/pages/app/accounts/PremiumMenu.svelte
index 2e494636b..13b52a684 100644
--- a/src/pages/app/accounts/PremiumMenu.svelte
+++ b/src/pages/app/accounts/PremiumMenu.svelte
@@ -14,7 +14,7 @@
 
   import { Plug16, Organization16 } from "svelte-octicons";
   import { SQUARELET_URL } from "../../../api/auth";
-  import { Org } from "../../../api/types";
+  import { Org } from "../../../api/types/orgAndUser";
   import MenuInsert from "../../../common/MenuInsert.svelte";
   import {
     isPremiumOrg,
diff --git a/src/pages/app/accounts/UserMenu.svelte b/src/pages/app/accounts/UserMenu.svelte
index 0c0e2de18..460ad5e71 100644
--- a/src/pages/app/accounts/UserMenu.svelte
+++ b/src/pages/app/accounts/UserMenu.svelte
@@ -14,7 +14,8 @@
     SIGN_OUT_URL,
   } from "../../../api/auth.js";
   import { showMailkeySelected } from "../../../manager/manager.js";
-  import { Maybe, User } from "../../../api/types";
+  import { Maybe } from "../../../api/types/common";
+  import { User } from "../../../api/types/orgAndUser";
 
   export let user: Maybe<User>;
 

From 58cbb969ff8afbed1eee57cf7f08da172e1a1cf3 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Thu, 1 Feb 2024 13:05:18 -0500
Subject: [PATCH 13/16] Fix conditional access checks on getCsrfToken()

---
 src/api/session.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/session.js b/src/api/session.js
index fc6267ebd..2f1d5883f 100644
--- a/src/api/session.js
+++ b/src/api/session.js
@@ -20,11 +20,11 @@ try {
 
 export function getCsrfToken() {
   if (typeof window === "undefined" || typeof document === "undefined") return;
-
-  const [key, token] = document.cookie
-    .split(";")
-    .map((c) => c.split("="))
-    .find(([k, v]) => k === CSRF_COOKIE_NAME);
+  const [key, token] =
+    document.cookie
+      ?.split(";")
+      ?.map((c) => c.split("="))
+      ?.find(([k, v]) => k === CSRF_COOKIE_NAME) ?? [];
 
   return token;
 }

From 6661143a78ee90fa6c2bf3513e242423a96efc8d Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Mon, 5 Feb 2024 11:44:58 -0500
Subject: [PATCH 14/16] Makes cookie fn more robust

---
 src/api/session.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/api/session.js b/src/api/session.js
index 2f1d5883f..cf7e7837f 100644
--- a/src/api/session.js
+++ b/src/api/session.js
@@ -24,7 +24,8 @@ export function getCsrfToken() {
     document.cookie
       ?.split(";")
       ?.map((c) => c.split("="))
-      ?.find(([k, v]) => k === CSRF_COOKIE_NAME) ?? [];
+      // in case there's spaces in the cookie string, trim the key
+      ?.find(([k, v]) => k.trim() === CSRF_COOKIE_NAME) ?? [];
 
   return token;
 }

From 7bfd971b2aabbbc1e5ef1b0b8c3cb54b89ac7862 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Mon, 5 Feb 2024 11:53:49 -0500
Subject: [PATCH 15/16] Fix org mock data for storybook

---
 .../stories/AccountNavigation.stories.svelte       |  2 +-
 src/pages/app/accounts/stories/mockData.ts         | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/pages/app/accounts/stories/AccountNavigation.stories.svelte b/src/pages/app/accounts/stories/AccountNavigation.stories.svelte
index 82e5547fb..b6c30320b 100644
--- a/src/pages/app/accounts/stories/AccountNavigation.stories.svelte
+++ b/src/pages/app/accounts/stories/AccountNavigation.stories.svelte
@@ -55,7 +55,7 @@
   name="Pro User, No Orgs"
   parameters={{
     msw: {
-      handlers: [mockGetMe.noOrgs, mockGetOrg.data, mockGetOrgsList.empty],
+      handlers: [mockGetMe.noOrgs, mockGetOrg.pro, mockGetOrgsList.empty],
     },
   }}
 />
diff --git a/src/pages/app/accounts/stories/mockData.ts b/src/pages/app/accounts/stories/mockData.ts
index 1b9ba3d16..b68489498 100644
--- a/src/pages/app/accounts/stories/mockData.ts
+++ b/src/pages/app/accounts/stories/mockData.ts
@@ -31,7 +31,7 @@ export const mockGetMe = {
     ),
   ),
   noOrgs: rest.get(mockMeUrl, (req, res, ctx) =>
-    res(ctx.json({ ...me, organization: "4" })),
+    res(ctx.json({ ...me, organization: 4 })),
   ),
   orgAdmin: rest.get(mockMeUrl, (req, res, ctx) =>
     res(
@@ -126,16 +126,8 @@ export const mockGetOrg = {
   empty: rest.get(mockGetOrgUrl, (req, res, ctx) =>
     res(ctx.json({ next: null, previous: null, results: [] })),
   ),
-  free: rest.get(mockGetOrgUrl, (req, res, ctx) =>
-    res(
-      ctx.json({
-        ...organizations.results.find(
-          ({ id }) => id.toString() === req.params.id,
-        ),
-        plan: "Free",
-      }),
-    ),
-  ),
+  pro: rest.get(mockGetOrgUrl, (req, res, ctx) => res(ctx.json(proOrg))),
+  free: rest.get(mockGetOrgUrl, (req, res, ctx) => res(ctx.json(freeOrg))),
 };
 
 const mockChangeOrgUrl = new URL(`users/me/`, baseApiUrl).toString();

From e25d38e7ea5b7db86f6dd116e775f375440762b5 Mon Sep 17 00:00:00 2001
From: Allan Lasser <lasser.allan@gmail.com>
Date: Mon, 5 Feb 2024 11:59:50 -0500
Subject: [PATCH 16/16] Disable coverage annotations

---
 .github/workflows/coverage.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index a5b45e0a4..e7b30a55c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -19,4 +19,5 @@ jobs:
           NODE_ENV: production
       - uses: ArtiomTr/jest-coverage-report-action@v2
         with:
+          annotations: none
           test-script: npm run test-coverage