tsondb 0.2.0 → 0.3.0

package/lib/ModelContainer.js

@@ -1,3 +1,4 @@
+import Debug from "debug";
 import { mkdir } from "fs/promises";
 import { join } from "path";
 import { getEntities } from "./Schema.js";
@@ -6,6 +7,7 @@ import { createServer } from "./server/index.js";
 import { parallelizeErrors } from "./shared/utils/validation.js";
 import { getErrorMessageForDisplay, wrapErrorsIfAny } from "./utils/error.js";
 import { getInstancesByEntityName } from "./utils/instances.js";
+const debug = Debug("tsondb:schema");
 export const ModelContainer = (options) => ({
     ...options,
 });
@@ -24,12 +26,12 @@ export const generateOutputs = async (modelContainer) => {
 const _validate = async (entities, instancesByEntityName) => {
     const errors = entities.flatMap(entity => parallelizeErrors(instancesByEntityName[entity.name].map(instance => wrapErrorsIfAny(`in file "${entity.name}/${instance.fileName}"`, validateEntityDecl(createValidators(instancesByEntityName), entity, instance.content)))));
     if (errors.length === 0) {
-        console.log("All entities are valid");
+        debug("All entities are valid");
     }
     else {
-        console.error("Errors:\n");
+        debug("Errors:\n");
         for (const error of errors) {
-            console.error(getErrorMessageForDisplay(error) + "\n");
+            debug(getErrorMessageForDisplay(error) + "\n");
         }
         throw new Error("Validation failed");
     }
@@ -37,27 +39,27 @@ const _validate = async (entities, instancesByEntityName) => {
 export const validate = async (modelContainer) => {
     const entities = getEntities(modelContainer.schema);
     await prepareFolders(modelContainer, entities);
-    const instancesByEntityName = await getInstancesByEntityName(modelContainer, entities);
+    const instancesByEntityName = await getInstancesByEntityName(modelContainer.dataRootPath, entities);
     return _validate(entities, instancesByEntityName);
 };
 export const generateAndValidate = async (modelContainer) => {
     await generateOutputs(modelContainer);
     const entities = getEntities(modelContainer.schema);
     await prepareFolders(modelContainer, entities);
-    const instancesByEntityName = await getInstancesByEntityName(modelContainer, entities);
+    const instancesByEntityName = await getInstancesByEntityName(modelContainer.dataRootPath, entities);
     await _validate(entities, instancesByEntityName);
 };
 export const serve = async (modelContainer) => {
     const entities = getEntities(modelContainer.schema);
     await prepareFolders(modelContainer, entities);
-    const instancesByEntityName = await getInstancesByEntityName(modelContainer, entities);
+    const instancesByEntityName = await getInstancesByEntityName(modelContainer.dataRootPath, entities);
     createServer(modelContainer, instancesByEntityName);
 };
 export const generateValidateAndServe = async (modelContainer) => {
     await generateOutputs(modelContainer);
     const entities = getEntities(modelContainer.schema);
     await prepareFolders(modelContainer, entities);
-    const instancesByEntityName = await getInstancesByEntityName(modelContainer, entities);
+    const instancesByEntityName = await getInstancesByEntityName(modelContainer.dataRootPath, entities);
     await _validate(entities, instancesByEntityName);
     createServer(modelContainer, instancesByEntityName);
 };

package/lib/client/api.d.ts

@@ -1,5 +1,5 @@
 import { SerializedEntityDecl } from "../schema/declarations/EntityDecl.js";
-import { CreateInstanceOfEntityResponseBody, DeleteInstanceOfEntityResponseBody, GetAllDeclarationsResponseBody, GetAllInstancesOfEntityResponseBody, GetAllInstancesResponseBody, GetDeclarationResponseBody, GetInstanceOfEntityResponseBody, UpdateInstanceOfEntityResponseBody } from "../shared/api.js";
+import { CreateInstanceOfEntityResponseBody, DeleteInstanceOfEntityResponseBody, GetAllDeclarationsResponseBody, GetAllGitBranchesResponseBody, GetAllInstancesOfEntityResponseBody, GetAllInstancesResponseBody, GetDeclarationResponseBody, GetInstanceOfEntityResponseBody, GitStatusResponseBody, UpdateInstanceOfEntityResponseBody } from "../shared/api.js";
 export declare const getAllDeclarations: (kind?: "Entity" | "Enum" | "TypeAlias") => Promise<GetAllDeclarationsResponseBody>;
 export declare const getAllEntities: () => Promise<GetAllDeclarationsResponseBody<SerializedEntityDecl>>;
 export declare const getEntityByName: (name: string) => Promise<GetDeclarationResponseBody<SerializedEntityDecl>>;
@@ -9,3 +9,16 @@ export declare const getInstanceByEntityNameAndId: (name: string, id: string) =>
 export declare const updateInstanceByEntityNameAndId: (name: string, id: string, content: unknown) => Promise<UpdateInstanceOfEntityResponseBody>;
 export declare const deleteInstanceByEntityNameAndId: (name: string, id: string) => Promise<DeleteInstanceOfEntityResponseBody>;
 export declare const getAllInstances: (locales: string[]) => Promise<GetAllInstancesResponseBody>;
+export declare const getGitStatus: (locales: string[]) => Promise<GitStatusResponseBody>;
+export declare const stageAllFiles: () => Promise<void>;
+export declare const stageAllFilesOfEntity: (entityName: string) => Promise<void>;
+export declare const stageFileOfEntity: (entityName: string, id: string) => Promise<void>;
+export declare const unstageAllFiles: () => Promise<void>;
+export declare const unstageAllFilesOfEntity: (entityName: string) => Promise<void>;
+export declare const unstageFileOfEntity: (entityName: string, id: string) => Promise<void>;
+export declare const commitStagedFiles: (message: string) => Promise<DeleteInstanceOfEntityResponseBody>;
+export declare const pushCommits: () => Promise<DeleteInstanceOfEntityResponseBody>;
+export declare const pullCommits: () => Promise<DeleteInstanceOfEntityResponseBody>;
+export declare const getBranches: () => Promise<GetAllGitBranchesResponseBody>;
+export declare const createBranch: (branchName: string) => Promise<void>;
+export declare const switchBranch: (branchName: string) => Promise<void>;

package/lib/client/api.js

@@ -81,3 +81,122 @@ export const getAllInstances = async (locales) => {
     }
     return response.json();
 };
+export const getGitStatus = async (locales) => {
+    const url = new URL("/api/git/status", window.location.origin);
+    for (const locale of locales) {
+        url.searchParams.append("locales", locale);
+    }
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return response.json();
+};
+export const stageAllFiles = async () => {
+    const response = await fetch(`/api/git/stage`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const stageAllFilesOfEntity = async (entityName) => {
+    const response = await fetch(`/api/git/stage/${entityName}`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const stageFileOfEntity = async (entityName, id) => {
+    const response = await fetch(`/api/git/stage/${entityName}/${id}`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const unstageAllFiles = async () => {
+    const response = await fetch(`/api/git/unstage`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const unstageAllFilesOfEntity = async (entityName) => {
+    const response = await fetch(`/api/git/unstage/${entityName}`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const unstageFileOfEntity = async (entityName, id) => {
+    const response = await fetch(`/api/git/unstage/${entityName}/${id}`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const commitStagedFiles = async (message) => {
+    const response = await fetch(`/api/git/commit`, {
+        method: "POST",
+        body: JSON.stringify({ message }),
+        headers: {
+            "Content-Type": "application/json",
+        },
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return response.json();
+};
+export const pushCommits = async () => {
+    const response = await fetch(`/api/git/push`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return response.json();
+};
+export const pullCommits = async () => {
+    const response = await fetch(`/api/git/pull`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return response.json();
+};
+export const getBranches = async () => {
+    const response = await fetch(`/api/git/branch`, {
+        method: "GET",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return response.json();
+};
+export const createBranch = async (branchName) => {
+    const response = await fetch(`/api/git/branch`, {
+        method: "POST",
+        body: JSON.stringify({ branchName }),
+        headers: {
+            "Content-Type": "application/json",
+        },
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};
+export const switchBranch = async (branchName) => {
+    const response = await fetch(`/api/git/branch/${branchName}`, {
+        method: "POST",
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+};

package/lib/client/components/Git.d.ts

@@ -0,0 +1,2 @@
+import { FunctionComponent } from "preact";
+export declare const Git: FunctionComponent;

package/lib/client/components/Git.js

@@ -0,0 +1,116 @@
+import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
+import { useEffect, useState } from "preact/hooks";
+import { getGitStatusForDisplay, getLabelForGitStatus, isChangedInIndex, isChangedInWorkingDir, } from "../../shared/utils/git.js";
+import { commitStagedFiles, createBranch, getAllEntities, getBranches, getGitStatus, pullCommits, pushCommits, stageAllFiles, stageFileOfEntity, switchBranch, unstageAllFiles, unstageFileOfEntity, } from "../api.js";
+const filterFilesForDisplay = (predicate, entities, data) => Object.entries(data.instances)
+    .map(([entityName, instances]) => [
+    entityName,
+    entities.find(entity => entity.name === entityName)?.namePlural ?? entityName,
+    instances
+        .filter(instance => instance.gitStatus !== undefined && predicate(instance.gitStatus))
+        .sort((a, b) => a.displayName.localeCompare(b.displayName)),
+])
+    .filter(([_1, _2, instances]) => instances.length > 0)
+    .sort((a, b) => a[1].localeCompare(b[1]));
+const GitFileList = ({ filesByEntity, onFile, isIndex = false }) => filesByEntity.length === 0 ? (_jsx("p", { class: "no-changes", children: "No changes" })) : (_jsx("ul", { class: "git-entity-list", children: filesByEntity.map(([entityName, entityNamePlural, instances]) => (_jsxs("li", { class: "git-entity-list-item", children: [_jsx("span", { class: "title", children: entityNamePlural }), _jsx("ul", { class: "git-instance-list", children: instances.map(instance => {
+                    const gitStatusForDisplay = getGitStatusForDisplay(instance.gitStatus);
+                    return (_jsxs("li", { class: "git-instance-list-item", children: [_jsx("span", { class: "title", children: instance.displayName }), _jsx("span", { class: `git-status git-status--${gitStatusForDisplay}`, title: getLabelForGitStatus(gitStatusForDisplay), children: gitStatusForDisplay }), _jsx("button", { onClick: () => {
+                                    onFile(entityName, instance);
+                                }, children: isIndex ? "Unstage" : "Stage" })] }, instance.fileName));
+                }) })] }, entityName))) }));
+export const Git = () => {
+    const [isOpen, setIsOpen] = useState(false);
+    const [commitsAhead, setCommitsAhead] = useState(0);
+    const [commitsBehind, setCommitsBehind] = useState(0);
+    const [commitMessage, setCommitMessage] = useState("");
+    const [indexFiles, setIndexFiles] = useState([]);
+    const [workingTreeFiles, setWorkingTreeFiles] = useState([]);
+    const [entities, setEntities] = useState([]);
+    const [allBranches, setAllBranches] = useState([]);
+    const [currentBranch, setCurrentBranch] = useState("");
+    const updateGitStatus = (localEntities) => Promise.all([getGitStatus(["de-DE"]), getBranches()]).then(([statusData, branchesData]) => {
+        setIndexFiles(filterFilesForDisplay(isChangedInIndex, localEntities, statusData));
+        setWorkingTreeFiles(filterFilesForDisplay(isChangedInWorkingDir, localEntities, statusData));
+        setCommitsAhead(statusData.commitsAhead);
+        setCommitsBehind(statusData.commitsBehind);
+        setAllBranches(branchesData.allBranches);
+        setCurrentBranch(branchesData.currentBranch);
+    });
+    useEffect(() => {
+        getAllEntities().then(async (data) => {
+            const entitiesFromServer = data.declarations.map(decl => decl.declaration);
+            setEntities(entitiesFromServer);
+            return updateGitStatus(entitiesFromServer);
+        });
+    }, []);
+    const stage = (entityName, instance) => {
+        stageFileOfEntity(entityName, instance.id).then(() => updateGitStatus(entities));
+    };
+    const stageAll = () => {
+        stageAllFiles().then(() => updateGitStatus(entities));
+    };
+    const unstage = (entityName, instance) => {
+        unstageFileOfEntity(entityName, instance.id).then(() => updateGitStatus(entities));
+    };
+    const unstageAll = () => {
+        unstageAllFiles().then(() => updateGitStatus(entities));
+    };
+    const commit = () => {
+        if (commitMessage.length > 0 &&
+            indexFiles.length > 0 &&
+            confirm("Do you want to commit all staged files?")) {
+            commitStagedFiles(commitMessage).then(() => {
+                setCommitMessage("");
+                return updateGitStatus(entities);
+            });
+        }
+    };
+    const push = () => {
+        pushCommits()
+            .then(() => {
+            alert("Pushed commits successfully");
+            return updateGitStatus(entities);
+        })
+            .catch(error => {
+            console.error("Error pushing commits:", error);
+        });
+    };
+    const pull = () => {
+        pullCommits()
+            .then(() => {
+            alert("Pulled commits successfully");
+            return updateGitStatus(entities);
+        })
+            .catch(error => {
+            console.error("Error pulling commits:", error);
+        });
+    };
+    const onCreateBranch = () => {
+        const newBranchName = prompt("Enter new branch name:");
+        if (!newBranchName) {
+            alert("Branch name cannot be empty");
+            return;
+        }
+        if (allBranches.includes(newBranchName)) {
+            alert("Branch name already exists");
+            return;
+        }
+        createBranch(newBranchName)
+            .then(() => {
+            return updateGitStatus(entities);
+        })
+            .catch(error => {
+            alert("Error switching branch: " + error);
+        });
+    };
+    const onSwitchBranch = (event) => {
+        switchBranch(event.currentTarget.value)
+            .then(() => {
+            return updateGitStatus(entities);
+        })
+            .catch(error => {
+            alert("Error switching branch: " + error);
+        });
+    };
+    return (_jsxs("aside", { class: "git", children: [_jsx("h2", { class: "h1-faded", children: "Version Control" }), _jsx("button", { onClick: () => setIsOpen(b => !b), children: "File changes" }), _jsxs("div", { className: `git-overlay ${isOpen ? "git-overlay--open" : ""}`, children: [_jsxs("div", { class: "sync", children: [_jsxs("button", { onClick: push, children: ["Push", commitsAhead > 0 ? ` (${commitsAhead})` : ""] }), _jsxs("button", { onClick: pull, children: ["Pull", commitsBehind > 0 ? ` (${commitsBehind})` : ""] })] }), _jsxs("div", { className: "branch", children: [_jsx("div", { className: "select-wrapper", children: _jsx("select", { value: currentBranch, onInput: onSwitchBranch, children: allBranches.map(branch => (_jsx("option", { value: branch, children: branch }, branch))) }) }), _jsx("button", { onClick: onCreateBranch, children: "New branch" })] }), _jsxs("div", { class: "commit", children: [_jsx("input", { type: "text", value: commitMessage, onInput: event => setCommitMessage(event.currentTarget.value), placeholder: "added X to instance Y, \u2026" }), _jsx("button", { onClick: commit, disabled: commitMessage.length === 0 || indexFiles.length === 0, children: "Commit" })] }), _jsxs("div", { className: "git-section-title", children: [_jsx("h3", { children: "Files to be committed" }), _jsx("button", { onClick: unstageAll, children: "Unstage all" })] }), _jsx(GitFileList, { filesByEntity: indexFiles, isIndex: true, onFile: unstage }), _jsxs("div", { className: "git-section-title", children: [_jsx("h3", { children: "Working tree changes" }), _jsx("button", { onClick: stageAll, children: "Stage all" })] }), _jsx(GitFileList, { filesByEntity: workingTreeFiles, onFile: stage })] })] }));
+};

package/lib/client/components/Layout.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "preact/jsx-runtime";
+import { Git } from "./Git.js";
 export const Layout = ({ breadcrumbs, children }) => {
-    return (_jsxs(_Fragment, { children: [_jsx("header", { children: _jsx("nav", { children: _jsx("ol", { children: breadcrumbs.map(({ url, label }) => (_jsx("li", { children: _jsx("a", { href: url, children: label }) }))) }) }) }), _jsx("main", { children: children })] }));
+    return (_jsxs(_Fragment, { children: [_jsx("header", { children: _jsx("nav", { children: _jsx("ol", { children: breadcrumbs.map(({ url, label }) => (_jsx("li", { children: _jsx("a", { href: url, children: label }) }))) }) }) }), _jsx(Git, {}), _jsx("main", { children: children })] }));
 };

package/lib/client/components/typeInputs/ArrayTypeInput.js

@@ -1,4 +1,5 @@
 import { jsxs as _jsxs, jsx as _jsx } from "preact/jsx-runtime";
+import { removeAt } from "../../../shared/utils/array.js";
 import { validateArrayConstraints } from "../../../shared/validation/array.js";
 import { createTypeSkeleton } from "../../utils/typeSkeleton.js";
 import { TypeInput } from "./TypeInput.js";
@@ -6,5 +7,5 @@ import { ValidationErrors } from "./utils/ValidationErrors.js";
 export const ArrayTypeInput = ({ type, value, instanceNamesByEntity, getDeclFromDeclName, onChange, }) => {
     const errors = validateArrayConstraints(type, value);
     const isTuple = typeof type.minItems === "number" && type.minItems === type.maxItems;
-    return (_jsxs("div", { class: "field field--container field--array", children: [value.length > 0 && (_jsx("ol", { children: value.map((item, i) => (_jsxs("li", { class: "container-item array-item", children: [isTuple ? null : (_jsxs("div", { className: "container-item-header", children: [_jsxs("div", { className: "container-item-title", children: [i + 1, "."] }), _jsx("button", { class: "destructive", onClick: () => onChange([...value.slice(0, i), ...value.slice(i + 1)]), disabled: type.minItems !== undefined && value.length <= type.minItems, children: "Delete Item" })] })), _jsx(TypeInput, { type: type.items, value: item, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newItem => onChange([...value.slice(0, i), newItem, ...value.slice(i + 1)]) })] }, i))) })), isTuple ? null : (_jsx("div", { class: "add-item-container", children: _jsx("button", { onClick: () => onChange([...value, createTypeSkeleton(getDeclFromDeclName, type.items)]), disabled: type.maxItems !== undefined && value.length >= type.maxItems, children: "Add Item" }) })), _jsx(ValidationErrors, { errors: errors })] }));
+    return (_jsxs("div", { class: "field field--container field--array", children: [value.length > 0 && (_jsx("ol", { children: value.map((item, i) => (_jsxs("li", { class: "container-item array-item", children: [isTuple ? null : (_jsxs("div", { className: "container-item-header", children: [_jsxs("div", { className: "container-item-title", children: [i + 1, "."] }), _jsx("button", { class: "destructive", onClick: () => onChange(removeAt(value, i)), disabled: type.minItems !== undefined && value.length <= type.minItems, children: "Delete Item" })] })), _jsx(TypeInput, { type: type.items, value: item, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newItem => onChange(value.with(i, newItem)) })] }, i))) })), isTuple ? null : (_jsx("div", { class: "add-item-container", children: _jsx("button", { onClick: () => onChange([...value, createTypeSkeleton(getDeclFromDeclName, type.items)]), disabled: type.maxItems !== undefined && value.length >= type.maxItems, children: "Add Item" }) })), _jsx(ValidationErrors, { errors: errors })] }));
 };

package/lib/client/components/typeInputs/EnumTypeInput.d.ts

@@ -0,0 +1,13 @@
+import { FunctionComponent } from "preact";
+import { SerializedEnumType } from "../../../schema/types/generic/EnumType.js";
+import { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
+import { GetDeclFromDeclName } from "../../hooks/useSecondaryDeclarations.js";
+type Props = {
+    type: SerializedEnumType;
+    value: unknown;
+    instanceNamesByEntity: InstanceNamesByEntity;
+    getDeclFromDeclName: GetDeclFromDeclName;
+    onChange: (value: unknown) => void;
+};
+export declare const EnumTypeInput: FunctionComponent<Props>;
+export {};

package/lib/client/components/typeInputs/{utils/EnumDeclField.js → EnumTypeInput.js}

@@ -1,11 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
-import { discriminatorKey } from "../../../../shared/enum.js";
-import { toTitleCase } from "../../../../shared/utils/string.js";
-import { createTypeSkeleton } from "../../../utils/typeSkeleton.js";
-import { Select } from "../../Select.js";
-import { TypeInput } from "../TypeInput.js";
-import { MismatchingTypeError } from "./MismatchingTypeError.js";
-export const EnumDeclField = ({ decl, value, instanceNamesByEntity, getDeclFromDeclName, onChange, }) => {
+import { discriminatorKey } from "../../../shared/enum.js";
+import { toTitleCase } from "../../../shared/utils/string.js";
+import { createTypeSkeleton } from "../../utils/typeSkeleton.js";
+import { Select } from "../Select.js";
+import { TypeInput } from "./TypeInput.js";
+import { MismatchingTypeError } from "./utils/MismatchingTypeError.js";
+export const EnumTypeInput = ({ type, value, instanceNamesByEntity, getDeclFromDeclName, onChange, }) => {
     if (typeof value !== "object" ||
         value === null ||
         Array.isArray(value) ||
@@ -13,11 +13,11 @@ export const EnumDeclField = ({ decl, value, instanceNamesByEntity, getDeclFromD
         typeof value[discriminatorKey] !== "string") {
         return _jsx(MismatchingTypeError, { expected: "enumeration value", actual: value });
     }
-    const enumValues = Object.keys(decl.values);
+    const enumValues = Object.keys(type.values);
     const activeEnumCase = value[discriminatorKey];
-    const caseMember = decl.values[activeEnumCase];
+    const caseMember = type.values[activeEnumCase];
     return (_jsxs("div", { class: "field field--enum", children: [_jsx(Select, { value: activeEnumCase, onInput: event => {
-                    const caseMember = decl.values[event.currentTarget.value];
+                    const caseMember = type.values[event.currentTarget.value];
                     if (caseMember?.type == null) {
                         onChange({
                             [discriminatorKey]: event.currentTarget.value,

package/lib/client/components/typeInputs/IncludeIdentifierTypeInput.js

@@ -1,18 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
-import { assertExhaustive } from "../../../shared/utils/typeSafety.js";
 import { TypeInput } from "./TypeInput.js";
-import { EnumDeclField } from "./utils/EnumDeclField.js";
 export const IncludeIdentifierTypeInput = ({ type, value, instanceNamesByEntity, getDeclFromDeclName, onChange, }) => {
     const decl = getDeclFromDeclName(type.reference);
     if (decl === undefined) {
         return (_jsxs("div", { role: "alert", children: ["Unresolved declaration identifier ", _jsx("code", { children: type.reference })] }));
     }
-    switch (decl.kind) {
-        case "EnumDecl":
-            return (_jsx(EnumDeclField, { decl: decl, value: value, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: onChange }));
-        case "TypeAliasDecl":
-            return (_jsx(TypeInput, { type: decl.type, value: value, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: onChange }));
-        default:
-            return assertExhaustive(decl);
-    }
+    return (_jsx(TypeInput, { type: decl.type, value: value, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: onChange }));
 };

package/lib/client/components/typeInputs/TypeInput.js

@@ -3,6 +3,7 @@ import { assertExhaustive } from "../../../shared/utils/typeSafety.js";
 import { ArrayTypeInput } from "./ArrayTypeInput.js";
 import { BooleanTypeInput } from "./BooleanTypeInput.js";
 import { DateTypeInput } from "./DateTypeInput.js";
+import { EnumTypeInput } from "./EnumTypeInput.js";
 import { FloatTypeInput } from "./FloatTypeInput.js";
 import { GenericArgumentIdentifierTypeInput } from "./GenericTypeArgumentIdentifierTypeInput.js";
 import { IncludeIdentifierTypeInput } from "./IncludeIdentifierTypeInput.js";
@@ -81,6 +82,8 @@ export const TypeInput = ({ type, value, instanceNamesByEntity, getDeclFromDeclN
             else {
                 return _jsx(MismatchingTypeError, { expected: "entity map", actual: value });
             }
+        case "EnumType":
+            return (_jsx(EnumTypeInput, { type: type, value: value, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: onChange }));
         default:
             return assertExhaustive(type);
     }

package/lib/client/components/typeInputs/utils/Markdown.js

@@ -1,34 +1,5 @@
 import { jsx as _jsx } from "preact/jsx-runtime";
-const bold = /\*\*(.+?)\*\*/;
-const italic = /\*(.+?)\*/;
-const boldItalic = /\*\*\*(.+?)\*\*\*/;
-const parseBlockMarkdown = (text) => text.split(/\n{2,}/).map(par => ({ kind: "paragraph", content: parseInlineMarkdown(par) }));
-const parseForPattern = (pattern, kind, text, nextPatterns = []) => {
-    const res = pattern.exec(text);
-    if (res) {
-        const { index } = res;
-        const before = text.slice(0, index);
-        const after = text.slice(index + res[0].length);
-        const inner = res[1];
-        const innerNode = nextPatterns.length > 0
-            ? parseForPattern(nextPatterns[0][1], nextPatterns[0][0], inner, nextPatterns.slice(1))
-            : [{ kind, content: [{ kind: "text", content: inner }] }];
-        return [
-            ...(before.length > 0 ? [{ kind: "text", content: before }] : []),
-            { kind, content: innerNode },
-            ...(after.length > 0 ? parseForPattern(pattern, kind, after) : []),
-        ];
-    }
-    else {
-        return nextPatterns.length > 0
-            ? parseForPattern(nextPatterns[0][1], nextPatterns[0][0], text, nextPatterns.slice(1))
-            : [{ kind: "text", content: text }];
-    }
-};
-const parseInlineMarkdown = (text) => parseForPattern(boldItalic, "boldItalic", text, [
-    ["bold", bold],
-    ["italic", italic],
-]);
+import { parseBlockMarkdown, } from "../../../../shared/utils/markdown.js";
 export const Markdown = ({ string }) => {
     const blocks = parseBlockMarkdown(string);
     return blocks.map((block, i) => _jsx(BlockMarkdown, { node: block }, `md-block-${i}`));
@@ -49,8 +20,6 @@ const InlineMarkdown = ({ node }) => {
             return (_jsx("strong", { children: node.content.map((inline, i) => (_jsx(InlineMarkdown, { node: inline }, i))) }));
         case "italic":
             return (_jsx("em", { children: node.content.map((inline, i) => (_jsx(InlineMarkdown, { node: inline }, i))) }));
-        case "boldItalic":
-            return (_jsx("strong", { children: _jsx("em", { children: node.content.map((inline, i) => (_jsx(InlineMarkdown, { node: inline }, i))) }) }));
         case "text":
             return node.content;
     }

package/lib/client/hooks/useAPIResource.d.ts

@@ -0,0 +1 @@
+export declare const useAPIResource: <T, A extends any[]>(apiFn: (...args: A) => Promise<T>, ...args: A) => [T | undefined, () => Promise<void>];

package/lib/client/hooks/useAPIResource.js

@@ -0,0 +1,2 @@
+import { useMappedAPIResource } from "./useMappedAPIResource.js";
+export const useAPIResource = (apiFn, ...args) => useMappedAPIResource(apiFn, data => data, ...args);

package/lib/client/hooks/useMappedAPIResource.d.ts

@@ -0,0 +1 @@
+export declare const useMappedAPIResource: <T, A extends any[], U>(apiFn: (...args: A) => Promise<T>, mapFn: (data: T) => U, ...args: A) => [U | undefined, () => Promise<void>];

package/lib/client/hooks/useMappedAPIResource.js

@@ -0,0 +1,19 @@
+import { useCallback, useEffect, useState } from "preact/hooks";
+export const useMappedAPIResource = (apiFn, mapFn, ...args) => {
+    const [data, setData] = useState();
+    const fetchData = () => apiFn(...args)
+        .then(result => {
+        setData(mapFn(result));
+    })
+        .catch(err => {
+        console.log(err);
+    });
+    useEffect(() => {
+        fetchData();
+    }, []);
+    const reload = useCallback(() => {
+        setData(undefined);
+        return fetchData();
+    }, [apiFn, ...args]);
+    return [data, reload];
+};

package/lib/client/routes/Entity.js

@@ -1,25 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
 import { useRoute } from "preact-iso";
-import { useEffect, useState } from "preact/hooks";
+import { useEffect } from "preact/hooks";
 import { getDisplayNameFromEntityInstance } from "../../shared/utils/displayName.js";
+import { getGitStatusForDisplay, getLabelForGitStatus } from "../../shared/utils/git.js";
 import { deleteInstanceByEntityNameAndId, getEntityByName, getInstancesByEntityName, } from "../api.js";
 import { Layout } from "../components/Layout.js";
+import { useAPIResource } from "../hooks/useAPIResource.js";
+import { useMappedAPIResource } from "../hooks/useMappedAPIResource.js";
 import { NotFound } from "./NotFound.js";
 export const Entity = () => {
     const { params: { name }, query: { created }, } = useRoute();
-    const [entity, setEntity] = useState();
-    const [instances, setInstances] = useState();
+    const [entity] = useAPIResource(getEntityByName, name ?? "");
+    const [instances, reloadInstances] = useMappedAPIResource(getInstancesByEntityName, data => data.instances, name ?? "");
     useEffect(() => {
-        if (name) {
-            Promise.all([getEntityByName(name), getInstancesByEntityName(name)])
-                .then(([entityData, instancesData]) => {
-                setEntity(entityData);
-                setInstances(instancesData.instances);
-            })
-                .catch(error => {
-                console.error("Error fetching entities:", error);
-            });
-        }
         if (created) {
             const instanceElement = document.getElementById(`instance-${created}`);
             if (instanceElement) {
@@ -33,15 +26,16 @@ export const Entity = () => {
     if (!entity || !instances) {
         return (_jsxs("div", { children: [_jsx("h1", { children: name }), _jsx("p", { className: "loading", children: "Loading \u2026" })] }));
     }
-    return (_jsxs(Layout, { breadcrumbs: [{ url: "/", label: "Home" }], children: [_jsxs("div", { class: "header-with-btns", children: [_jsx("h1", { children: name }), _jsx("a", { class: "btn btn--primary", href: `/entities/${entity.declaration.name}/instances/create`, children: "Add" })] }), entity.declaration.comment && _jsx("p", { className: "description", children: entity.declaration.comment }), _jsxs("p", { children: [instances.length, " instance", instances.length === 1 ? "" : "s"] }), _jsx("ul", { class: "instances", children: instances.map(instance => (_jsxs("li", { id: `instance-${instance.id}`, class: `instance-item ${created === instance.id ? "instance-item--created" : ""}`, children: [_jsx("h2", { children: getDisplayNameFromEntityInstance(entity.declaration, instance.content, instance.id) }), _jsx("p", { "aria-hidden": true, class: "id", children: instance.id }), _jsxs("div", { className: "btns", children: [_jsx("a", { href: `/entities/${entity.declaration.name}/instances/${instance.id}`, class: "btn", children: "Edit" }), _jsx("button", { class: "destructive", onClick: () => {
-                                        if (confirm("Are you sure you want to delete this instance?")) {
-                                            deleteInstanceByEntityNameAndId(entity.declaration.name, instance.id)
-                                                .then(() => {
-                                                setInstances(instances.filter(i => i.id !== instance.id));
-                                            })
-                                                .catch(error => {
-                                                alert("Error deleting instance:\n\n" + error);
-                                            });
-                                        }
-                                    }, children: "Delete" })] })] }, instance.id))) })] }));
+    return (_jsxs(Layout, { breadcrumbs: [{ url: "/", label: "Home" }], children: [_jsxs("div", { class: "header-with-btns", children: [_jsx("h1", { children: name }), _jsx("a", { class: "btn btn--primary", href: `/entities/${entity.declaration.name}/instances/create`, children: "Add" })] }), entity.declaration.comment && _jsx("p", { className: "description", children: entity.declaration.comment }), _jsxs("p", { children: [instances.length, " instance", instances.length === 1 ? "" : "s"] }), _jsx("ul", { class: "instances", children: instances.map(instance => {
+                    const gitStatusForDisplay = getGitStatusForDisplay(instance.gitStatus);
+                    return (_jsxs("li", { id: `instance-${instance.id}`, class: `instance-item ${created === instance.id ? "instance-item--created" : ""} ${gitStatusForDisplay === undefined ? "" : `git-status--${gitStatusForDisplay}`}`, children: [_jsx("h2", { children: getDisplayNameFromEntityInstance(entity.declaration, instance.content, instance.id) }), _jsx("p", { "aria-hidden": true, class: "id", children: instance.id }), gitStatusForDisplay !== undefined && (_jsx("p", { class: `git-status git-status--${gitStatusForDisplay}`, title: getLabelForGitStatus(gitStatusForDisplay), children: gitStatusForDisplay })), _jsxs("div", { className: "btns", children: [_jsx("a", { href: `/entities/${entity.declaration.name}/instances/${instance.id}`, class: "btn", children: "Edit" }), _jsx("button", { class: "destructive", onClick: () => {
+                                            if (confirm("Are you sure you want to delete this instance?")) {
+                                                deleteInstanceByEntityNameAndId(entity.declaration.name, instance.id)
+                                                    .then(() => reloadInstances())
+                                                    .catch(error => {
+                                                    alert("Error deleting instance:\n\n" + error);
+                                                });
+                                            }
+                                        }, children: "Delete" })] })] }, instance.id));
+                }) })] }));
 };

package/lib/client/routes/Home.js

@@ -1,18 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
-import { useEffect, useState } from "preact/hooks";
 import { toTitleCase } from "../../shared/utils/string.js";
 import { getAllEntities } from "../api.js";
 import { Layout } from "../components/Layout.js";
+import { useMappedAPIResource } from "../hooks/useMappedAPIResource.js";
 export const Home = () => {
-    const [entities, setEntities] = useState([]);
-    useEffect(() => {
-        getAllEntities()
-            .then(data => {
-            setEntities(data.declarations.sort((a, b) => a.declaration.name.localeCompare(b.declaration.name)));
-        })
-            .catch(error => {
-            console.error("Error fetching entities:", error);
-        });
-    }, []);
-    return (_jsxs(Layout, { breadcrumbs: [{ url: "/", label: "Home" }], children: [_jsx("h1", { children: "Entities" }), _jsx("ul", { class: "entities", children: entities.map(entity => (_jsxs("li", { class: "entity-item", children: [_jsxs("div", { className: "title", children: [_jsx("h2", { children: toTitleCase(entity.declaration.name) }), entity.declaration.comment && _jsx("p", { children: entity.declaration.comment })] }), _jsxs("p", { class: "meta", children: [entity.instanceCount, " instance", entity.instanceCount === 1 ? "" : "s"] }), _jsx("div", { className: "btns", children: _jsx("a", { href: `/entities/${entity.declaration.name}`, class: "btn", children: "View" }) })] }, entity.declaration.name))) })] }));
+    const [entities] = useMappedAPIResource(getAllEntities, data => data.declarations.sort((a, b) => a.declaration.name.localeCompare(b.declaration.name)));
+    return (_jsxs(Layout, { breadcrumbs: [{ url: "/", label: "Home" }], children: [_jsx("h1", { children: "Entities" }), _jsx("ul", { class: "entities", children: (entities ?? []).map(entity => (_jsxs("li", { class: "entity-item", children: [_jsxs("div", { className: "title", children: [_jsx("h2", { children: toTitleCase(entity.declaration.name) }), entity.declaration.comment && _jsx("p", { children: entity.declaration.comment })] }), _jsxs("p", { class: "meta", children: [entity.instanceCount, " instance", entity.instanceCount === 1 ? "" : "s"] }), _jsx("div", { className: "btns", children: _jsx("a", { href: `/entities/${entity.declaration.name}`, class: "btn", children: "View" }) })] }, entity.declaration.name))) })] }));
 };