tsondb 0.3.0 → 0.5.0

package/lib/{client → web}/components/typeInputs/ArrayTypeInput.js

@@ -7,5 +7,11 @@ 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(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 })] }));
+    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 → web}/components/typeInputs/BooleanTypeInput.d.ts

@@ -1,5 +1,5 @@
-import { FunctionComponent } from "preact";
-import { SerializedBooleanType } from "../../../schema/types/primitives/BooleanType.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedBooleanType } from "../../../node/schema/types/primitives/BooleanType.js";
 type Props = {
     type: SerializedBooleanType;
     value: boolean;

package/lib/{client → web}/components/typeInputs/DateTypeInput.d.ts

@@ -1,5 +1,5 @@
-import { FunctionComponent } from "preact";
-import { SerializedDateType } from "../../../schema/types/primitives/DateType.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedDateType } from "../../../node/schema/types/primitives/DateType.js";
 type Props = {
     type: SerializedDateType;
     value: string;

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

@@ -0,0 +1,13 @@
+import type { FunctionComponent } from "preact";
+import type { SerializedEnumType } from "../../../node/schema/types/generic/EnumType.js";
+import type { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
+import type { 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 → web}/components/typeInputs/EnumTypeInput.js

@@ -29,7 +29,7 @@ export const EnumTypeInput = ({ type, value, instanceNamesByEntity, getDeclFromD
                             [event.currentTarget.value]: createTypeSkeleton(getDeclFromDeclName, caseMember.type),
                         });
                     }
-                }, children: enumValues.map(enumValue => (_jsx("option", { value: enumValue, selected: enumValue === activeEnumCase, children: toTitleCase(enumValue) }))) }), caseMember?.type == null ? null : (_jsx("div", { className: "associated-type", children: _jsx(TypeInput, { type: caseMember.type, value: value[activeEnumCase], instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newValue => {
+                }, children: enumValues.map(enumValue => (_jsx("option", { value: enumValue, selected: enumValue === activeEnumCase, children: toTitleCase(enumValue) }, enumValue))) }), caseMember?.type == null ? null : (_jsx("div", { className: "associated-type", children: _jsx(TypeInput, { type: caseMember.type, value: value[activeEnumCase], instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newValue => {
                         onChange({
                             [discriminatorKey]: activeEnumCase,
                             [activeEnumCase]: newValue,

package/lib/{client → web}/components/typeInputs/FloatTypeInput.d.ts

@@ -1,5 +1,5 @@
-import { FunctionComponent } from "preact";
-import { SerializedFloatType } from "../../../schema/types/primitives/FloatType.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedFloatType } from "../../../node/schema/types/primitives/FloatType.js";
 type Props = {
     type: SerializedFloatType;
     value: number;

package/lib/web/components/typeInputs/GenericTypeArgumentIdentifierTypeInput.d.ts

@@ -0,0 +1,7 @@
+import type { FunctionComponent } from "preact";
+import type { SerializedTypeArgumentType } from "../../../node/schema/types/references/TypeArgumentType.js";
+type Props = {
+    type: SerializedTypeArgumentType;
+};
+export declare const TypeArgumentTypeInput: FunctionComponent<Props>;
+export {};

package/lib/{client → web}/components/typeInputs/GenericTypeArgumentIdentifierTypeInput.js

@@ -1,4 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
-export const GenericArgumentIdentifierTypeInput = ({ type }) => {
+export const TypeArgumentTypeInput = ({ type }) => {
     return (_jsxs("div", { role: "alert", children: ["Unresolved type argument ", _jsx("code", { children: type.argument.name })] }));
 };

package/lib/web/components/typeInputs/IncludeIdentifierTypeInput.d.ts

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

package/lib/{client → web}/components/typeInputs/IntegerTypeInput.d.ts

@@ -1,5 +1,5 @@
-import { FunctionComponent } from "preact";
-import { SerializedIntegerType } from "../../../schema/types/primitives/IntegerType.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedIntegerType } from "../../../node/schema/types/primitives/IntegerType.js";
 type Props = {
     type: SerializedIntegerType;
     value: number;

package/lib/web/components/typeInputs/NestedEntityMapTypeInput.d.ts

@@ -0,0 +1,13 @@
+import type { FunctionComponent } from "preact";
+import type { SerializedNestedEntityMapType } from "../../../node/schema/types/references/NestedEntityMapType.js";
+import type { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
+import type { GetDeclFromDeclName } from "../../hooks/useSecondaryDeclarations.js";
+type Props = {
+    type: SerializedNestedEntityMapType;
+    value: Record<string, unknown>;
+    instanceNamesByEntity: InstanceNamesByEntity;
+    getDeclFromDeclName: GetDeclFromDeclName;
+    onChange: (value: Record<string, unknown>) => void;
+};
+export declare const NestedEntityMapTypeInput: FunctionComponent<Props>;
+export {};

package/lib/{client → web}/components/typeInputs/NestedEntityMapTypeInput.js

@@ -11,11 +11,16 @@ export const NestedEntityMapTypeInput = ({ type, value, instanceNamesByEntity, g
         .slice()
         .filter(instance => !existingKeys.includes(instance.id))
         .sort((a, b) => a.name.localeCompare(b.name));
-    return (_jsxs("div", { class: "field field--container field--nestedentitymap", children: [existingKeys.length > 0 && (_jsx("ul", { children: Object.entries(value).map(([key, item]) => (_jsxs("li", { class: "container-item dict-item", children: [_jsxs("div", { className: "container-item-header", children: [_jsx("div", { className: "container-item-title", children: _jsxs("span", { children: [_jsx("strong", { children: instanceNamesByEntity[type.secondaryEntity].find(instance => instance.id === key)?.name ?? key }), " ", _jsx("span", { className: "id", children: key })] }) }), _jsx("div", { className: "btns", children: _jsx("button", { class: "destructive", onClick: () => {
+    return (_jsxs("div", { class: "field field--container field--nestedentitymap", children: [existingKeys.length > 0 && (_jsx("ul", { children: Object.entries(value).map(([key, item]) => (_jsxs("li", { class: "container-item dict-item", children: [_jsxs("div", { className: "container-item-header", children: [_jsx("div", { className: "container-item-title", children: _jsxs("span", { children: [_jsx("strong", { children: instanceNamesByEntity[type.secondaryEntity]?.find(instance => instance.id === key)?.name ?? key }), " ", _jsx("span", { className: "id", children: key })] }) }), _jsx("div", { className: "btns", children: _jsx("button", { class: "destructive", onClick: () => {
                                             const newObj = { ...value };
+                                            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                                             delete newObj[key];
                                             onChange(newObj);
-                                        }, children: "Delete Key" }) })] }), _jsx(TypeInput, { type: type.type, value: item, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newItem => onChange(sortObjectKeysAlphabetically({ ...value, [key]: newItem })) })] }, key))) })), _jsxs("div", { class: "add-item-container", children: [_jsxs(Select, { value: newKey, onInput: event => setNewKey(event.currentTarget.value), disabled: secondaryInstances.length === 0, children: [secondaryInstances.length === 0 ? (_jsx("option", { value: "", disabled: true, children: "No instances available" })) : (_jsx("option", { value: "", disabled: true, children: "No selected instance" })), secondaryInstances.map(instance => (_jsx("option", { value: instance.id, children: instance.name })))] }), _jsx("button", { onClick: () => {
+                                        }, children: "Delete Key" }) })] }), _jsx(TypeInput, { type: type.type, value: item, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newItem => {
+                                onChange(sortObjectKeysAlphabetically({ ...value, [key]: newItem }));
+                            } })] }, key))) })), _jsxs("div", { class: "add-item-container", children: [_jsxs(Select, { value: newKey, onInput: event => {
+                            setNewKey(event.currentTarget.value);
+                        }, disabled: secondaryInstances.length === 0, children: [secondaryInstances.length === 0 ? (_jsx("option", { value: "", disabled: true, children: "No instances available" })) : (_jsx("option", { value: "", disabled: true, children: "No selected instance" })), secondaryInstances.map(instance => (_jsx("option", { value: instance.id, children: instance.name }, instance.id)))] }), _jsx("button", { onClick: () => {
                             onChange(sortObjectKeysAlphabetically({
                                 ...value,
                                 [newKey]: createTypeSkeleton(getDeclFromDeclName, type.type),

package/lib/{client → web}/components/typeInputs/ObjectTypeInput.d.ts

@@ -1,7 +1,7 @@
-import { FunctionComponent } from "preact";
-import { SerializedObjectType } from "../../../schema/types/generic/ObjectType.js";
-import { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
-import { GetDeclFromDeclName } from "../../hooks/useSecondaryDeclarations.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedObjectType } from "../../../node/schema/types/generic/ObjectType.js";
+import type { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
+import type { GetDeclFromDeclName } from "../../hooks/useSecondaryDeclarations.js";
 type Props = {
     type: SerializedObjectType;
     value: Record<string, unknown>;

package/lib/{client → web}/components/typeInputs/ObjectTypeInput.js

@@ -14,7 +14,10 @@ export const ObjectTypeInput = ({ type, value, instanceNamesByEntity, getDeclFro
                                         }, Object.keys(type.properties)));
                                     }, children: "Add Property" })) : (_jsx("button", { class: "destructive", onClick: () => {
                                         const newObj = { ...value };
+                                        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                                         delete newObj[key];
                                         onChange(newObj);
-                                    }, children: "Remove Property" }))] }), memberDecl.isRequired || value[key] !== undefined ? (_jsx(TypeInput, { type: memberDecl.type, value: value[key], instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newItem => onChange(sortObjectKeys({ ...value, [key]: newItem }, Object.keys(type.properties))) })) : null] }, key))) }), _jsx(ValidationErrors, { errors: errors })] }));
+                                    }, children: "Remove Property" }))] }), memberDecl.isRequired || value[key] !== undefined ? (_jsx(TypeInput, { type: memberDecl.type, value: value[key], instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: newItem => {
+                                onChange(sortObjectKeys({ ...value, [key]: newItem }, Object.keys(type.properties)));
+                            } })) : null] }, key))) }), _jsx(ValidationErrors, { errors: errors })] }));
 };

package/lib/{client → web}/components/typeInputs/ReferenceIdentifierTypeInput.d.ts

@@ -1,6 +1,6 @@
-import { FunctionComponent } from "preact";
-import { SerializedReferenceIdentifierType } from "../../../schema/types/references/ReferenceIdentifierType.js";
-import { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedReferenceIdentifierType } from "../../../node/schema/types/references/ReferenceIdentifierType.js";
+import type { InstanceNamesByEntity } from "../../hooks/useInstanceNamesByEntity.js";
 type Props = {
     type: SerializedReferenceIdentifierType;
     value: string;

package/lib/web/components/typeInputs/ReferenceIdentifierTypeInput.js

@@ -0,0 +1,11 @@
+import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
+import { Select } from "../Select.js";
+import { ValidationErrors } from "./utils/ValidationErrors.js";
+export const ReferenceIdentifierTypeInput = ({ type, value, instanceNamesByEntity, onChange, }) => {
+    const instances = (instanceNamesByEntity[type.entity] ?? [])
+        .slice()
+        .sort((a, b) => a.name.localeCompare(b.name));
+    return (_jsxs("div", { class: "field", children: [_jsxs(Select, { value: value, onInput: event => {
+                    onChange(event.currentTarget.value);
+                }, disabled: instances.length === 0, "aria-invalid": !value, children: [instances.length === 0 ? (_jsx("option", { value: "", disabled: true, children: "No instances available" })) : (_jsx("option", { value: "", disabled: true, children: "No selected instance" })), instances.map(instance => (_jsx("option", { value: instance.id, children: instance.name }, instance.id)))] }), _jsx(ValidationErrors, { errors: !value ? [ReferenceError("no reference provided")] : [] })] }));
+};

package/lib/{client → web}/components/typeInputs/StringTypeInput.d.ts

@@ -1,5 +1,5 @@
-import { FunctionComponent } from "preact";
-import { SerializedStringType } from "../../../schema/types/primitives/StringType.js";
+import type { FunctionComponent } from "preact";
+import type { SerializedStringType } from "../../../node/schema/types/primitives/StringType.js";
 type Props = {
     type: SerializedStringType;
     value: string;

package/lib/web/components/typeInputs/TypeInput.d.ts

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

package/lib/{client → web}/components/typeInputs/TypeInput.js

@@ -5,7 +5,7 @@ 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 { TypeArgumentTypeInput } from "./GenericTypeArgumentIdentifierTypeInput.js";
 import { IncludeIdentifierTypeInput } from "./IncludeIdentifierTypeInput.js";
 import { IntegerTypeInput } from "./IntegerTypeInput.js";
 import { NestedEntityMapTypeInput } from "./NestedEntityMapTypeInput.js";
@@ -64,8 +64,8 @@ export const TypeInput = ({ type, value, instanceNamesByEntity, getDeclFromDeclN
             else {
                 return _jsx(MismatchingTypeError, { expected: "object", actual: value });
             }
-        case "GenericArgumentIdentifierType":
-            return _jsx(GenericArgumentIdentifierTypeInput, { type: type });
+        case "TypeArgumentType":
+            return _jsx(TypeArgumentTypeInput, { type: type });
         case "ReferenceIdentifierType":
             if (typeof value === "string") {
                 return (_jsx(ReferenceIdentifierTypeInput, { type: type, value: value, instanceNamesByEntity: instanceNamesByEntity, onChange: onChange }));

package/lib/{client → web}/components/typeInputs/utils/Markdown.d.ts

@@ -1,4 +1,4 @@
-import { FunctionalComponent } from "preact";
+import type { FunctionalComponent } from "preact";
 type Props = {
     string: string;
 };

package/lib/{client → web}/components/typeInputs/utils/Markdown.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "preact/jsx-runtime";
-import { parseBlockMarkdown, } from "../../../../shared/utils/markdown.js";
+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}`));
+    return blocks.map((block, i) => _jsx(BlockMarkdown, { node: block }, `md-block-${i.toString()}`));
 };
 const BlockMarkdown = ({ node }) => {
     switch (node.kind) {

package/lib/{client → web}/components/typeInputs/utils/MismatchingTypeError.d.ts

@@ -1,4 +1,4 @@
-import { FunctionComponent } from "preact";
+import type { FunctionComponent } from "preact";
 type Props = {
     expected: string;
     actual: unknown;

package/lib/{client → web}/components/typeInputs/utils/ValidationErrors.d.ts

@@ -1,4 +1,4 @@
-import { FunctionComponent } from "preact";
+import type { FunctionComponent } from "preact";
 type Props = {
     errors: Error[];
 };

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

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

package/lib/{client → web}/hooks/useAPIResource.js

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

package/lib/{client → web}/hooks/useEntityFromRoute.d.ts

@@ -1,4 +1,4 @@
-import { SerializedEntityDecl } from "../../schema/declarations/EntityDecl.js";
+import type { SerializedEntityDecl } from "../../node/schema/declarations/EntityDecl.js";
 export declare const useEntityFromRoute: () => {
     entity: SerializedEntityDecl;
     isLocaleEntity: boolean;

package/lib/{client → web}/hooks/useEntityFromRoute.js

@@ -10,7 +10,7 @@ export const useEntityFromRoute = () => {
                 .then(data => {
                 setEntityData(data);
             })
-                .catch(error => {
+                .catch((error) => {
                 console.error("Error fetching data:", error);
             });
         }

package/lib/{client → web}/hooks/useInstanceNamesByEntity.d.ts

@@ -1,3 +1,3 @@
-import { GetAllInstancesResponseBody } from "../../shared/api.js";
+import type { GetAllInstancesResponseBody } from "../../shared/api.js";
 export type InstanceNamesByEntity = GetAllInstancesResponseBody["instances"];
 export declare const useInstanceNamesByEntity: (locales?: string[]) => [InstanceNamesByEntity, () => void];

package/lib/{client → web}/hooks/useInstanceNamesByEntity.js

@@ -1,18 +1,20 @@
-import { useEffect, useState } from "preact/hooks";
+import { useCallback, useEffect, useState } from "preact/hooks";
 import { getAllInstances } from "../api.js";
 export const useInstanceNamesByEntity = (locales = []) => {
     const [instanceNamesByEntity, setInstanceNamesByEntity] = useState({});
-    const updateInstanceNamesByEntity = () => {
+    const updateInstanceNamesByEntity = useCallback(() => {
         getAllInstances(locales)
             .then(data => {
             setInstanceNamesByEntity(data.instances);
         })
-            .catch(error => {
-            console.error("Error fetching data:", error);
+            .catch((error) => {
+            if (error instanceof Error) {
+                console.error("Error fetching data:", error.toString());
+            }
         });
-    };
+    }, [locales.toString()]);
     useEffect(() => {
         updateInstanceNamesByEntity();
-    }, []);
+    }, [updateInstanceNamesByEntity]);
     return [instanceNamesByEntity, updateInstanceNamesByEntity];
 };

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

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

package/lib/{client → web}/hooks/useMappedAPIResource.js

@@ -1,19 +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 => {
+    const fetchData = useCallback(() => apiFn(...args).then(result => {
         setData(mapFn(result));
-    })
-        .catch(err => {
-        console.log(err);
-    });
+    }), 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [apiFn, mapFn, ...args]);
     useEffect(() => {
-        fetchData();
-    }, []);
+        fetchData().catch((err) => {
+            console.log(err);
+        });
+    }, [fetchData]);
     const reload = useCallback(() => {
         setData(undefined);
         return fetchData();
-    }, [apiFn, ...args]);
+    }, [fetchData]);
     return [data, reload];
 };

package/lib/{client → web}/hooks/useSecondaryDeclarations.d.ts

@@ -1,3 +1,3 @@
-import { SerializedSecondaryDecl } from "../../schema/declarations/Declaration.js";
+import type { SerializedSecondaryDecl } from "../../node/schema/declarations/Declaration.js";
 export type GetDeclFromDeclName = (name: string) => SerializedSecondaryDecl | undefined;
 export declare const useGetDeclFromDeclName: () => GetDeclFromDeclName;

package/lib/{client → web}/hooks/useSecondaryDeclarations.js

@@ -9,8 +9,10 @@ export const useGetDeclFromDeclName = () => {
                 .map(decl => decl.declaration)
                 .filter((decl) => decl.kind === "EnumDecl" || decl.kind === "TypeAliasDecl"));
         })
-            .catch(error => {
-            console.error("Error fetching data:", error);
+            .catch((error) => {
+            if (error instanceof Error) {
+                console.error("Error fetching data:", error.toString());
+            }
         });
     }, []);
     const getDeclFromDeclName = useCallback((name) => secondaryDeclarations.find(decl => decl.name === name), [secondaryDeclarations]);

package/lib/{client → web}/routes/CreateInstance.d.ts

@@ -1,2 +1,2 @@
-import { FunctionalComponent } from "preact";
+import type { FunctionalComponent } from "preact";
 export declare const CreateInstance: FunctionalComponent;

package/lib/{client → web}/routes/CreateInstance.js

@@ -48,8 +48,10 @@ export const CreateInstance = () => {
                     route(`/entities/${entity.name}?created=${encodeURIComponent(createdInstance.instance.id)}`);
                 }
             })
-                .catch(error => {
-                alert(`Error updating instance:\n\n${error}`);
+                .catch((error) => {
+                if (error instanceof Error) {
+                    alert(`Error creating instance:\n\n${error.toString()}`);
+                }
             });
         }
     };

package/lib/web/routes/Entity.d.ts

@@ -0,0 +1,2 @@
+import type { FunctionalComponent } from "preact";
+export declare const Entity: FunctionalComponent;

package/lib/{client → web}/routes/Entity.js

@@ -1,17 +1,17 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
 import { useRoute } from "preact-iso";
 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";
+const mapInstances = (data) => data.instances;
 export const Entity = () => {
     const { params: { name }, query: { created }, } = useRoute();
     const [entity] = useAPIResource(getEntityByName, name ?? "");
-    const [instances, reloadInstances] = useMappedAPIResource(getInstancesByEntityName, data => data.instances, name ?? "");
+    const [instances, reloadInstances] = useMappedAPIResource(getInstancesByEntityName, mapInstances, name ?? "");
     useEffect(() => {
         if (created) {
             const instanceElement = document.getElementById(`instance-${created}`);
@@ -19,7 +19,7 @@ export const Entity = () => {
                 instanceElement.scrollIntoView({ behavior: "smooth", block: "center" });
             }
         }
-    }, []);
+    }, [created]);
     if (!name) {
         return _jsx(NotFound, {});
     }
@@ -28,12 +28,14 @@ export const Entity = () => {
     }
     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: () => {
+                    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: instance.displayName }), _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);
+                                                    .catch((error) => {
+                                                    if (error instanceof Error) {
+                                                        alert("Error deleting instance:\n\n" + error.toString());
+                                                    }
                                                 });
                                             }
                                         }, children: "Delete" })] })] }, instance.id));

package/lib/web/routes/Home.d.ts

@@ -0,0 +1,2 @@
+import type { FunctionalComponent } from "preact";
+export declare const Home: FunctionalComponent;

package/lib/{client → web}/routes/Home.js

@@ -3,7 +3,8 @@ import { toTitleCase } from "../../shared/utils/string.js";
 import { getAllEntities } from "../api.js";
 import { Layout } from "../components/Layout.js";
 import { useMappedAPIResource } from "../hooks/useMappedAPIResource.js";
+const mapEntities = (data) => data.declarations.sort((a, b) => a.declaration.name.localeCompare(b.declaration.name));
 export const Home = () => {
-    const [entities] = useMappedAPIResource(getAllEntities, data => data.declarations.sort((a, b) => a.declaration.name.localeCompare(b.declaration.name)));
+    const [entities] = useMappedAPIResource(getAllEntities, mapEntities);
     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))) })] }));
 };

package/lib/{client → web}/routes/Instance.d.ts

@@ -1,2 +1,2 @@
-import { FunctionalComponent } from "preact";
+import type { FunctionalComponent } from "preact";
 export declare const Instance: FunctionalComponent;

package/lib/{client → web}/routes/Instance.js

@@ -26,22 +26,23 @@ export const Instance = () => {
                 setInstance(instanceData.instance);
                 setOriginalInstance(instanceData.instance);
             })
-                .catch(error => {
+                .catch((error) => {
                 console.error("Error fetching entities:", error);
             });
         }
-    }, []);
+    }, [id, name]);
     const handleSubmit = (event) => {
         event.preventDefault();
         if (name && id && instance) {
             updateInstanceByEntityNameAndId(name, id, instance.content)
                 .then(updatedInstance => {
-                0;
                 setInstance(updatedInstance.instance);
                 setOriginalInstance(updatedInstance.instance);
             })
-                .catch(error => {
-                alert(`Error updating instance:\n\n${error}`);
+                .catch((error) => {
+                if (error instanceof Error) {
+                    alert(`Error updating instance:\n\n${error}`);
+                }
             });
         }
     };
@@ -65,9 +66,14 @@ export const Instance = () => {
                                     .then(() => {
                                     route(`/entities/${name}`);
                                 })
-                                    .catch(error => {
-                                    alert("Error deleting instance:\n\n" + error);
+                                    .catch((error) => {
+                                    if (error instanceof Error) {
+                                        alert("Error deleting instance:\n\n" + error.toString());
+                                    }
                                 });
                             }
-                        }, children: "Delete" })] }), _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TypeInput, { type: entityFromRoute.entity.type, value: instance.content, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: value => setInstance(container => ({ ...container, content: value })) }), _jsx("button", { type: "submit", disabled: !hasChanges, class: "primary", children: "Save" })] })] }));
+                        }, children: "Delete" })] }), _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TypeInput, { type: entityFromRoute.entity.type, value: instance.content, instanceNamesByEntity: instanceNamesByEntity, getDeclFromDeclName: getDeclFromDeclName, onChange: value => {
+                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                            setInstance(container => ({ ...container, content: value }));
+                        } }), _jsx("button", { type: "submit", disabled: !hasChanges, class: "primary", children: "Save" })] })] }));
 };

package/lib/{client → web}/routes/NotFound.d.ts

@@ -1,2 +1,2 @@
-import { FunctionalComponent } from "preact";
+import type { FunctionalComponent } from "preact";
 export declare const NotFound: FunctionalComponent;

package/lib/web/utils/typeSkeleton.d.ts

@@ -0,0 +1,3 @@
+import type { SerializedType } from "../../node/schema/types/Type.js";
+import type { GetDeclFromDeclName } from "../hooks/useSecondaryDeclarations.js";
+export declare const createTypeSkeleton: (getDeclFromDeclName: GetDeclFromDeclName, type: SerializedType) => unknown;

package/lib/{client → web}/utils/typeSkeleton.js

@@ -17,7 +17,7 @@ export const createTypeSkeleton = (getDeclFromDeclName, type) => {
             return Object.fromEntries(Object.entries(type.properties).flatMap(([key, memberDecl]) => memberDecl.isRequired
                 ? [[key, createTypeSkeleton(getDeclFromDeclName, memberDecl.type)]]
                 : []));
-        case "GenericArgumentIdentifierType":
+        case "TypeArgumentType":
             return undefined;
         case "ReferenceIdentifierType":
             return "";
@@ -32,6 +32,9 @@ export const createTypeSkeleton = (getDeclFromDeclName, type) => {
             return {};
         case "EnumType": {
             const firstCase = Object.entries(type.values)[0];
+            if (firstCase === undefined) {
+                return {};
+            }
             return {
                 kind: firstCase[0],
                 ...(firstCase[1].type === null