Generalize schemas

app/e2e/scat-css-public-routes.spec.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import type { CrossSectionSetHeading } from "@lxcat/database/dist/css/public";
-import type { CrossSectionSetRaw } from "@lxcat/schema/dist/css/input";
+import type { LTPDocument } from "@lxcat/schema";
 import { expect, test } from "@playwright/test";
 import { readFile } from "fs/promises";
 import {
@@ -68,14 +68,14 @@ test.describe("given 2 dummy sets", () => {
     test.describe("/api/scat-css/[id]", () => {
       test("given no refstyle should return csl", async ({ request }) => {
         const res = await request.get(`/api/scat-css/${setId}`);
-        const set: CrossSectionSetRaw = await res.json();
+        const set: LTPDocument = await res.json();
         const ref0 = Object.values(set.references)[0];
         expect(ref0.id).toEqual("SomeMainId");
       });
 
       test("given bibtex refstyle should return bibtex string", async ({ request }) => {
         const res = await request.get(`/api/scat-css/${setId}?refstyle=bibtex`);
-        const set: CrossSectionSetRaw = await res.json();
+        const set: LTPDocument = await res.json();
         const expected = `@article{MyFamilyNameSome,
 \tauthor = {MyFamilyName, MyGivenName},
 \tjournal = {SomeJournal},
@@ -90,7 +90,7 @@ test.describe("given 2 dummy sets", () => {
 
       test("given apa refstyle should return apa string", async ({ request }) => {
         const res = await request.get(`/api/scat-css/${setId}?refstyle=apa`);
-        const set: CrossSectionSetRaw = await res.json();
+        const set: LTPDocument = await res.json();
         const ref0 = Object.values(set.references)[0];
         const expected =
           "MyFamilyName, M. (n.d.). Some main reference title. In SomeJournal. https://doi.org/10.1109/5.771073\n";

app/package.json

@@ -8,6 +8,7 @@
     "start": "next start",
     "lint": "next lint",
     "format": "dprint fmt",
+    "type-check": "tsc --pretty --noEmit",
     "test": "vitest",
     "test:e2e": "playwright test",
     "annotate": "reuse annotate --license=AGPL-3.0-or-later --copyright='LXCat team' -r --skip-existing --exclude-year src e2e"
@@ -74,7 +75,7 @@
     "unist-util-visit": "^5.0.0",
     "vfile": "^5.3.7",
     "vfile-matter": "^4.0.1",
-    "zod": "^3.22.4"
+    "zod": "3.21.3"
   },
   "devDependencies": {
     "@babel/core": "^7.23.3",
@@ -83,6 +84,8 @@
     "@playwright/test": "1.34.3",
     "@types/cookie": "^0.5.3",
     "@types/deep-equal": "^1.0.3",
+    "@types/json-schema": "^7.0.12",
+    "@types/mdast": "^4.0.0",
     "@types/node": "20.9.0",
     "@types/oidc-provider": "^7.14.0",
     "@types/plotly.js-basic-dist": "^1.54.3",

app/src/ScatteringCrossSection/CSTable.tsx

@@ -43,7 +43,7 @@ export const CSTable = ({ items }: Props) => {
       { isPartOf, ...item },
     ) => ({
       ...item,
-      typeTags: item.reaction.type_tags,
+      typeTags: item.reaction.typeTags,
       reaction: <ReactionSummary {...item.reaction} />,
     })),
   }));

app/src/ScatteringCrossSection/ReactionSummary.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import { State } from "@lxcat/database/dist/shared/types/collections";
-import { Reaction } from "@lxcat/schema/dist/core/reaction";
+import { type Reaction } from "@lxcat/schema/process";
 import { Latex } from "../shared/Latex";
 
 import { reactionAsLatex } from "./reaction";

app/src/ScatteringCrossSection/json-ld.ts

@@ -17,7 +17,7 @@ export const toJSONLD = (section: CrossSectionItem) => {
     name: `Scattering Cross Section of ${reactionAsText(section.reaction)}`,
     keywords: [
       "cross section",
-      ...section.reaction.type_tags,
+      ...section.reaction.typeTags,
       // TODO add more keywords?
     ].join(", "),
     distribution: [

app/src/ScatteringCrossSection/reaction.ts

@@ -3,19 +3,19 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import { State } from "@lxcat/database/dist/shared/types/collections";
-import { Reaction, ReactionEntry } from "@lxcat/schema/dist/core/reaction";
+import { Reaction, ReactionEntry } from "@lxcat/schema/process";
 
 function entryAsLatex(entry: ReactionEntry<State>) {
   if (entry.count === 1) {
-    return entry.state.latex;
+    return entry.state.serialized.latex;
   }
-  return `${entry.count}${entry.state.latex}`;
+  return `${entry.count}${entry.state.serialized.latex}`;
 }
 function entryAsText(entry: ReactionEntry<State>) {
   if (entry.count === 1) {
-    return entry.state.id;
+    return entry.state.serialized.summary;
   }
-  return `${entry.count}${entry.state.id}`;
+  return `${entry.count}${entry.state.serialized.summary}`;
 }
 
 /**

app/src/ScatteringCrossSectionSet/AddForm.tsx

@@ -3,19 +3,22 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 import { OrganizationFromDB } from "@lxcat/database/dist/auth/queries";
-import { CrossSectionSetInputOwned } from "@lxcat/database/dist/css/queries/author_read";
-import { CrossSectionSetRaw } from "@lxcat/schema/dist/css/input";
+import { LTPDocument } from "@lxcat/schema";
 import { useMemo } from "react";
 import { EditForm } from "./EditForm";
 
 interface Props {
-  onSubmit: (newSet: CrossSectionSetInputOwned, newMessage: string) => void;
+  // onSubmit: (newSet: CrossSectionSetInputOwned, newMessage: string) => void;
+  onSubmit: (newSet: any, newMessage: string) => void;
   organizations: OrganizationFromDB[];
 }
 
 export const AddForm = ({ onSubmit, organizations }: Props) => {
-  const newSet: CrossSectionSetRaw = useMemo(() => {
+  const newSet: LTPDocument = useMemo(() => {
     return {
+      $schema: "",
+      url: "",
+      termsOfUse: "",
       name: "",
       description: "",
       complete: false,