tsondb 0.12.3 → 0.12.6

package/dist/src/web/components/Layout.js

@@ -6,7 +6,7 @@ import { Settings } from "./Settings.js";
 export const Layout = ({ breadcrumbs, children }) => {
     const [_1, setIsGitOpen] = useContext(GitContext);
     const [isGitAlwaysOpen, _2] = useSetting("gitSidebar");
-    return (_jsxs(_Fragment, { children: [_jsxs("header", { children: [_jsx("nav", { children: _jsx("ol", { children: breadcrumbs.map(({ url, label }) => (_jsx("li", { children: _jsx("a", { href: url, children: label }) }, url))) }) }), _jsxs("div", { class: "nav-buttons", children: [_jsx("button", { class: `git-toggle${!isGitAlwaysOpen ? " git-toggle--no-sidebar" : ""}`, onClick: () => {
+    return (_jsxs(_Fragment, { children: [_jsxs("header", { children: [_jsx("nav", { children: _jsx("ol", { children: breadcrumbs.map(({ url, label }) => (_jsx("li", { children: _jsx("a", { href: url, children: label }) }, url))) }) }), _jsxs("div", { class: "nav-buttons", children: [_jsx("a", { href: "/search", class: "btn", children: "Search" }), _jsx("button", { class: `git-toggle${!isGitAlwaysOpen ? " git-toggle--no-sidebar" : ""}`, onClick: () => {
                                     setIsGitOpen(b => !b);
                                 }, children: "File changes" }), _jsx(Settings, {})] })] }), _jsx("main", { children: children })] }));
 };

package/dist/src/web/components/git/GitStatusIndicator.js

@@ -2,5 +2,5 @@ import { jsx as _jsx } from "preact/jsx-runtime";
 import { getGitStatusForDisplay, getLabelForGitStatus, } from "../../../shared/utils/git.js";
 export const GitStatusIndicator = ({ status }) => {
     const gitStatusForDisplay = getGitStatusForDisplay(status);
-    return (_jsx("span", { class: `git-status git-status--${gitStatusForDisplay ?? ""}`, title: getLabelForGitStatus(gitStatusForDisplay), children: gitStatusForDisplay }));
+    return gitStatusForDisplay === undefined ? null : (_jsx("span", { class: `git-status git-status--${gitStatusForDisplay}`, title: getLabelForGitStatus(gitStatusForDisplay), children: gitStatusForDisplay }));
 };

package/dist/src/web/components/typeInputs/ChildEntitiesTypeInput.js

@@ -42,7 +42,7 @@ export const ChildEntitiesTypeInput = props => {
     return (_jsxs("div", { class: "field field--container field--array", children: [childInstancesForEntity.length > 0 ? (_jsx("ol", { children: childInstancesForEntity.map(([item, originalIndex], i) => (_jsxs("li", { class: "container-item array-item", children: [_jsxs("div", { className: "container-item-header", children: [_jsxs("div", { className: "container-item-title", children: [i + 1, "."] }), _jsx("button", { class: "destructive", onClick: () => {
                                         onChildRemove(i);
                                     }, disabled: disabled, children: "Delete Item" })] }), _jsx(TypeInput, { ...props, type: childEntity.type, value: item.content, parentKey: childEntity.parentReferenceKey, onChange: newItem => {
-                                onChildChange(originalIndex, newItem);
+                                onChildChange(originalIndex, newItem); // guaranteed to be an object because of the ObjectType in the child entity
                             }, childInstances: item.childInstances, setChildInstances: newChildInstances => {
                                 onGrandChildrenChange(originalIndex, newChildInstances);
                             } })] }, i))) })) : (_jsx("p", { class: "empty", children: "No child entities" })), _jsx("div", { class: "add-item-container", children: _jsx("button", { onClick: () => {

package/dist/src/web/components/typeInputs/FloatTypeInput.d.ts

@@ -1,5 +1,5 @@
 import type { FunctionComponent } from "preact";
-import type { SerializedFloatType } from "../../../shared/schema/types/FloatType.ts";
+import { type SerializedFloatType } from "../../../shared/schema/types/FloatType.ts";
 import type { TypeInputProps } from "./TypeInput.tsx";
 type Props = TypeInputProps<SerializedFloatType, number>;
 export declare const FloatTypeInput: FunctionComponent<Props>;

package/dist/src/web/components/typeInputs/FloatTypeInput.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
 import { useState } from "preact/hooks";
+import { DEFAULT_FRACTION_DIGITS, } from "../../../shared/schema/types/FloatType.js";
 import { validateNumberConstraints } from "../../../shared/validation/number.js";
 import { MismatchingTypeError } from "./utils/MismatchingTypeError.js";
 import { ValidationErrors } from "./utils/ValidationErrors.js";
@@ -15,5 +16,5 @@ export const FloatTypeInput = ({ type, value, disabled, onChange }) => {
                     if (!Number.isNaN(numericValue)) {
                         onChange(numericValue);
                     }
-                }, step: 0.01, "aria-invalid": errors.length > 0, disabled: disabled }), _jsx(ValidationErrors, { disabled: disabled, errors: errors })] }));
+                }, step: 1 / Math.pow(10, type.fractionDigits ?? DEFAULT_FRACTION_DIGITS), "aria-invalid": errors.length > 0, disabled: disabled }), _jsx(ValidationErrors, { disabled: disabled, errors: errors })] }));
 };

package/dist/src/web/hooks/useGitClient.js

@@ -59,7 +59,6 @@ export const useGitClient = () => {
                 })));
                 setIsDetached(branchesData.isDetached);
                 setLatestCommit(statusData.latestCommit);
-                console.log(statusData.latestCommit);
             }
             catch (error) {
                 logAndAlertError(error, "Error updating git status: ");

package/dist/src/web/hooks/useMappedAPIResource.js

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from "preact/hooks";
+import { logAndAlertError } from "../utils/debug.js";
 export const useMappedAPIResource = (apiFn, mapFn, ...args) => {
     const [data, setData] = useState();
     const fetchData = useCallback(() => apiFn(...args).then(result => {
@@ -7,10 +8,7 @@ export const useMappedAPIResource = (apiFn, mapFn, ...args) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [apiFn, mapFn, ...args]);
     useEffect(() => {
-        fetchData().catch((err) => {
-            console.log(err);
-            alert(err);
-        });
+        fetchData().catch(logAndAlertError);
     }, [fetchData]);
     const reload = useCallback(fetchData, [fetchData]);
     return [data, reload];

package/dist/src/web/index.js

@@ -20,6 +20,7 @@ import { Entity } from "./routes/Entity.js";
 import { Home } from "./routes/Home.js";
 import { Instance } from "./routes/Instance.js";
 import { NotFound } from "./routes/NotFound.js";
+import { Search } from "./routes/Search.js";
 const mapEntities = (data) => data.declarations
     .map(decl => ({ ...decl, isLocaleEntity: decl.declaration.name === data.localeEntity }))
     .sort((a, b) => a.declaration.name.localeCompare(b.declaration.name));
@@ -33,7 +34,7 @@ const App = ({ config }) => {
             alert("Error reloading entities: " + String(error));
         });
     }, [location.path, reloadEntities]);
-    return (_jsx(ConfigContext.Provider, { value: config, children: _jsx(SettingsContext.Provider, { value: settingsContext, children: _jsx(GitContext.Provider, { value: [isGitOpen, setIsGitOpen], children: _jsx(LocationProvider, { children: _jsx(EntitiesContext.Provider, { value: { entities: entities ?? [], reloadEntities }, children: _jsxs(ContextProviderWrapper, { context: GitClientContext, useValue: useGitClient, children: [_jsx(LoadingOverlay, {}), _jsxs(Router, { children: [_jsx(Route, { path: "/", component: Home }), _jsx(Route, { path: "/entities/:name", component: Entity }), _jsx(Route, { path: "/entities/:name/instances/create", component: CreateInstance }), _jsx(Route, { path: "/entities/:name/instances/:id", component: Instance }), _jsx(Route, { default: true, component: NotFound })] }), _jsx(Git, {})] }) }) }) }) }) }));
+    return (_jsx(ConfigContext.Provider, { value: config, children: _jsx(SettingsContext.Provider, { value: settingsContext, children: _jsx(GitContext.Provider, { value: [isGitOpen, setIsGitOpen], children: _jsx(LocationProvider, { children: _jsx(EntitiesContext.Provider, { value: { entities: entities ?? [], reloadEntities }, children: _jsxs(ContextProviderWrapper, { context: GitClientContext, useValue: useGitClient, children: [_jsx(LoadingOverlay, {}), _jsxs(Router, { children: [_jsx(Route, { path: "/", component: Home }), _jsx(Route, { path: "/search", component: Search }), _jsx(Route, { path: "/entities/:name", component: Entity }), _jsx(Route, { path: "/entities/:name/instances/create", component: CreateInstance }), _jsx(Route, { path: "/entities/:name/instances/:id", component: Instance }), _jsx(Route, { default: true, component: NotFound })] }), _jsx(Git, {})] }) }) }) }) }) }));
 };
 const config = await getWebConfig();
 const root = document.getElementById("app");

package/dist/src/web/routes/Search.d.ts

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

package/dist/src/web/routes/Search.js

@@ -0,0 +1,56 @@
+import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
+import { useCallback, useEffect, useState } from "preact/hooks";
+import { getGitStatusForDisplay } from "../../shared/utils/git.js";
+import { toTitleCase } from "../../shared/utils/string.js";
+import { deleteInstanceByEntityNameAndId } from "../api/declarations.js";
+import { searchInstances } from "../api/search.js";
+import { GitStatusIndicator } from "../components/git/GitStatusIndicator.js";
+import { Layout } from "../components/Layout.js";
+import { useSetting } from "../hooks/useSettings.js";
+import { logAndAlertError } from "../utils/debug.js";
+import { homeTitle } from "./Home.js";
+const MIN_CHARACTERS = 3;
+export const Search = () => {
+    const [locales] = useSetting("displayedLocales");
+    const [query, setQuery] = useState(() => new URLSearchParams(window.location.search).get("q") ?? "");
+    const [results, setResults] = useState();
+    const search = useCallback(() => {
+        const url = new URL(window.location.href);
+        if (url.searchParams.get("q") !== query) {
+            if (query.length === 0) {
+                url.searchParams.delete("q");
+            }
+            else {
+                url.searchParams.set("q", query);
+            }
+            window.history.pushState({}, "", url);
+        }
+        if (query.length >= MIN_CHARACTERS) {
+            searchInstances(locales, query)
+                .then(res => {
+                setResults(res.results);
+            })
+                .catch(logAndAlertError);
+        }
+    }, [locales, query]);
+    useEffect(() => {
+        document.title = "Search — TSONDB";
+        search();
+    }, [search]);
+    return (_jsxs(Layout, { breadcrumbs: [{ url: "/", label: homeTitle }], children: [_jsx("h1", { children: "Search" }), _jsx("input", { type: "search", name: "q", value: query, onInput: event => {
+                    setQuery(event.currentTarget.value);
+                } }), query.length < MIN_CHARACTERS ? (_jsx("p", { class: "help", children: "Provide at least 3 characters in the search field to start the search" })) : (results && (_jsxs("section", { class: "search-results", children: [_jsx("h2", { children: "Results" }), results.length === 0 ? (_jsx("p", { class: "empty", children: "No results" })) : (_jsx("ul", { class: "entries entries--instances", children: results.map(([entityName, instance]) => {
+                            const gitStatusForDisplay = getGitStatusForDisplay(instance.gitStatus);
+                            return (_jsxs("li", { id: `instance-${instance.id}`, class: `entries-item${gitStatusForDisplay === undefined
+                                    ? ""
+                                    : ` git-status--${gitStatusForDisplay}`}`, children: [_jsxs("h2", { class: "entries-item__title", children: [instance.displayName, _jsx("span", { "aria-hidden": true, class: "entries-item__title-entity", children: toTitleCase(entityName) })] }), _jsx("p", { "aria-hidden": true, class: "entries-item__subtitle entries-item__subtitle--id", children: instance.id }), _jsxs("div", { class: "entries-item__side", children: [_jsx(GitStatusIndicator, { status: instance.gitStatus }), _jsxs("div", { class: "btns", children: [_jsx("a", { href: `/entities/${entityName}/instances/${instance.id}`, class: "btn", children: "Edit" }), _jsx("button", { class: "destructive", onClick: () => {
+                                                            if (confirm("Are you sure you want to delete this instance?")) {
+                                                                deleteInstanceByEntityNameAndId(locales, entityName, instance.id)
+                                                                    .then(() => {
+                                                                    search();
+                                                                })
+                                                                    .catch(logAndAlertError);
+                                                            }
+                                                        }, children: "Delete" })] })] })] }, instance.id));
+                        }) }))] })))] }));
+};

package/dist/src/web/utils/typeSkeleton.d.ts

@@ -1,3 +1,3 @@
-import type { SerializedType } from "../../shared/schema/types/Type.ts";
+import type { SerializedAsType, SerializedType } from "../../shared/schema/types/Type.ts";
 import type { GetDeclFromDeclName } from "../hooks/useSecondaryDeclarations.ts";
-export declare const createTypeSkeleton: (getDeclFromDeclName: GetDeclFromDeclName, type: SerializedType) => unknown;
+export declare const createTypeSkeleton: <T extends SerializedType>(getDeclFromDeclName: GetDeclFromDeclName, type: T) => SerializedAsType<T>;

package/dist/src/web/utils/typeSkeleton.js

@@ -4,7 +4,7 @@ export const createTypeSkeleton = (getDeclFromDeclName, type) => {
         case "BooleanType":
             return false;
         case "DateType":
-            return type.time === true ? new Date().toISOString() : new Date().toDateString();
+            return (type.time === true ? new Date().toISOString() : new Date().toDateString());
         case "FloatType":
             return 0.0;
         case "IntegerType":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.12.3",
+  "version": "0.12.6",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",
@@ -44,10 +44,10 @@
     "prettier": "^3.6.2",
     "tsx": "^4.20.6",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.4"
+    "typescript-eslint": "^8.48.0"
   },
   "dependencies": {
-    "@preact/signals": "^2.5.0",
+    "@preact/signals": "^2.5.1",
     "debug": "^4.4.3",
     "express": "^5.1.0",
     "preact": "^10.27.2",

package/public/css/styles.css

@@ -589,6 +589,12 @@ select {
   }
 }
 
+.entries-item__title-entity {
+  font-weight: 400;
+  color: var(--color-foreground-secondary);
+  padding-left: 0.5em;
+}
+
 .entries-item__subtitle--id {
   font-family: var(--font-mono);
 }
@@ -1205,3 +1211,7 @@ dialog[open]:has(> .loading-overlay--open)::backdrop {
 .object-item--translation button {
   align-self: center;
 }
+
+section.search-results {
+  margin-top: 3.6rem;
+}

package/dist/src/node/utils/instanceOperations.d.ts

@@ -1,14 +0,0 @@
-import type { InstancesByEntityName } from "../../shared/utils/instances.ts";
-import { type Result } from "../../shared/utils/result.ts";
-import type { EntityDecl } from "../schema/declarations/EntityDecl.js";
-import { type ReferencesToInstances } from "./references.ts";
-export declare const createNewId: () => `${string}-${string}-${string}-${string}-${string}`;
-export declare const checkCreateInstancePossible: (localeEntity: EntityDecl | undefined, instancesByEntityName: InstancesByEntityName, entity: EntityDecl, instanceContent: unknown, customId: unknown) => Result<string, [code: number, message: string]>;
-export declare const createInstance: (dataRoot: string, localeEntity: EntityDecl | undefined, instancesByEntityName: InstancesByEntityName, entity: EntityDecl, instanceContent: unknown, customId: unknown) => Promise<Result<string, [code: number, message: string]>>;
-export declare const checkUpdateInstancePossible: (instancesByEntityName: InstancesByEntityName, entity: EntityDecl, instanceContent: unknown) => Result<void, [code: number, message: string]>;
-export declare const checkCreateNonLocaleInstancePossible: (instancesByEntityName: InstancesByEntityName, entity: EntityDecl, instanceContent: unknown) => Result<void, [code: number, message: string]>;
-export declare const unsafeWriteInstance: (dataRoot: string, entity: EntityDecl, instanceId: string, instanceContent: unknown) => Promise<Result<string, [code: number, message: string]>>;
-export declare const updateInstance: (dataRoot: string, instancesByEntityName: InstancesByEntityName, entity: EntityDecl, instanceId: string, instanceContent: unknown) => Promise<Result<string, [code: number, message: string]>>;
-export declare const checkDeleteInstancePossible: (referencesToInstances: ReferencesToInstances, instanceId: string) => Result<void, [code: number, message: string]>;
-export declare const unsafeDeleteInstance: (dataRoot: string, entityName: string, instanceId: string) => Promise<Result<string, [code: number, message: string]>>;
-export declare const deleteInstance: (dataRoot: string, referencesToInstances: ReferencesToInstances, entityName: string, instanceId: string) => Promise<Result<string, [code: number, message: string]>>;

package/dist/src/node/utils/instanceOperations.js

@@ -1,88 +0,0 @@
-import { randomUUID } from "node:crypto";
-import { error, isOk, map, ok } from "../../shared/utils/result.js";
-import { createValidators, validateEntityDecl } from "../schema/index.js";
-import { getErrorMessageForDisplay } from "./error.js";
-import * as Files from "./files.js";
-import { isReferencedByOtherInstances } from "./references.js";
-export const createNewId = () => randomUUID();
-export const checkCreateInstancePossible = (localeEntity, instancesByEntityName, entity, instanceContent, customId) => {
-    const newInstanceId = entity === localeEntity ? customId : createNewId();
-    if (typeof newInstanceId !== "string") {
-        return error([400, `New identifier "${String(newInstanceId)}" is not a string`]);
-    }
-    if (localeEntity === entity &&
-        instancesByEntityName[entity.name]?.some(instance => instance.id === newInstanceId)) {
-        return error([400, `Duplicate id "${newInstanceId}" for locale entity`]);
-    }
-    return map(checkUpdateInstancePossible(instancesByEntityName, entity, instanceContent), () => newInstanceId);
-};
-export const createInstance = async (dataRoot, localeEntity, instancesByEntityName, entity, instanceContent, customId) => {
-    const prerequisiteCheckResult = checkCreateInstancePossible(localeEntity, instancesByEntityName, entity, instanceContent, customId);
-    if (isOk(prerequisiteCheckResult)) {
-        const newInstanceId = prerequisiteCheckResult.value;
-        return unsafeWriteInstance(dataRoot, entity, newInstanceId, instanceContent);
-    }
-    else {
-        return prerequisiteCheckResult;
-    }
-};
-export const checkUpdateInstancePossible = (instancesByEntityName, entity, instanceContent) => {
-    const validationErrors = validateEntityDecl(createValidators(instancesByEntityName, false), [], entity, instanceContent);
-    if (validationErrors.length > 0) {
-        return error([400, validationErrors.map(getErrorMessageForDisplay).join("\n\n")]);
-    }
-    else {
-        return ok();
-    }
-};
-export const checkCreateNonLocaleInstancePossible = checkUpdateInstancePossible;
-export const unsafeWriteInstance = async (dataRoot, entity, instanceId, instanceContent) => {
-    try {
-        await Files.writeInstance(dataRoot, entity, instanceId, instanceContent);
-        return ok(instanceId);
-    }
-    catch (err) {
-        return error([
-            500,
-            `Failed to write instance: ${err instanceof Error ? err.toString() : String(err)}`,
-        ]);
-    }
-};
-export const updateInstance = async (dataRoot, instancesByEntityName, entity, instanceId, instanceContent) => {
-    const prerequisiteCheckResult = checkUpdateInstancePossible(instancesByEntityName, entity, instanceContent);
-    if (isOk(prerequisiteCheckResult)) {
-        return unsafeWriteInstance(dataRoot, entity, instanceId, instanceContent);
-    }
-    else {
-        return prerequisiteCheckResult;
-    }
-};
-export const checkDeleteInstancePossible = (referencesToInstances, instanceId) => {
-    if (isReferencedByOtherInstances(referencesToInstances, instanceId)) {
-        return error([400, "Cannot delete instance that is referenced by other instances"]);
-    }
-    else {
-        return ok();
-    }
-};
-export const unsafeDeleteInstance = async (dataRoot, entityName, instanceId) => {
-    try {
-        await Files.deleteInstance(dataRoot, entityName, instanceId);
-        return ok(instanceId);
-    }
-    catch (err) {
-        return error([
-            500,
-            `Failed to delete instance: ${err instanceof Error ? err.toString() : String(err)}`,
-        ]);
-    }
-};
-export const deleteInstance = async (dataRoot, referencesToInstances, entityName, instanceId) => {
-    const prerequisiteCheckResult = checkDeleteInstancePossible(referencesToInstances, instanceId);
-    if (isOk(prerequisiteCheckResult)) {
-        return unsafeDeleteInstance(dataRoot, entityName, instanceId);
-    }
-    else {
-        return prerequisiteCheckResult;
-    }
-};

package/dist/src/node/utils/instances.d.ts

@@ -1,6 +0,0 @@
-import type { StatusResult } from "simple-git";
-import type { InstancesByEntityName } from "../../shared/utils/instances.ts";
-import type { EntityDecl } from "../schema/declarations/EntityDecl.js";
-export declare const getInstancesByEntityName: (dataRoot: string, entities: readonly EntityDecl[]) => Promise<InstancesByEntityName>;
-export declare const attachGitStatusToInstancesByEntityName: (instancesByEntityName: InstancesByEntityName, dataRoot: string, gitRoot: string, gitStatus: StatusResult) => void;
-export declare const formatInstance: (entity: EntityDecl, instanceContent: unknown) => string;

package/dist/src/node/utils/instances.js

@@ -1,29 +0,0 @@
-import child_process from "node:child_process";
-import { readdir, readFile } from "node:fs/promises";
-import { basename, extname, join } from "node:path";
-import { platform } from "node:process";
-import { promisify } from "node:util";
-import { mapAsync } from "../../shared/utils/async.js";
-import { formatValue } from "../schema/index.js";
-import { getFileNameForId } from "./files.js";
-import { getGitFileStatusFromStatusResult } from "./git.js";
-const exec = promisify(child_process.exec);
-const ulimit = platform === "win32" ? 2048 : Number.parseInt((await exec("ulimit -n")).stdout);
-export const getInstancesByEntityName = async (dataRoot, entities) => Object.fromEntries((await mapAsync(entities, async (entity) => {
-    const entityDir = join(dataRoot, entity.name);
-    const instanceFileNames = await readdir(entityDir);
-    const instances = await mapAsync(instanceFileNames, async (instanceFileName) => ({
-        id: basename(instanceFileName, extname(instanceFileName)),
-        content: JSON.parse(await readFile(join(entityDir, instanceFileName), "utf-8")),
-    }), ulimit);
-    return [entity.name, instances];
-}, 1)).toSorted(([a], [b]) => a.localeCompare(b)));
-export const attachGitStatusToInstancesByEntityName = (instancesByEntityName, dataRoot, gitRoot, gitStatus) => {
-    Object.entries(instancesByEntityName).forEach(([entityName, instances]) => {
-        instancesByEntityName[entityName] = instances.map(instanceContainer => ({
-            ...instanceContainer,
-            gitStatus: getGitFileStatusFromStatusResult(gitStatus, gitRoot, dataRoot, entityName, getFileNameForId(instanceContainer.id)),
-        }));
-    });
-};
-export const formatInstance = (entity, instanceContent) => JSON.stringify(formatValue(entity.type.value, instanceContent), undefined, 2) + "\n";