tsondb 0.5.19 → 0.6.1

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

@@ -0,0 +1,25 @@
+export declare const getResource: <R>(url: string, options: {
+    locales: string[];
+    modifyUrl?: (url: URL) => void;
+    getResult?: (response: Response) => Promise<R>;
+}) => Promise<R>;
+export declare const postResource: <R = void>(url: string, options: {
+    locales: string[];
+    body?: unknown;
+    headers?: HeadersInit;
+    modifyUrl?: (url: URL) => void;
+    getResult?: (response: Response) => Promise<R>;
+}) => Promise<R>;
+export declare const putResource: <R = void>(url: string, options: {
+    locales: string[];
+    body?: unknown;
+    headers?: HeadersInit;
+    modifyUrl?: (url: URL) => void;
+    getResult?: (response: Response) => Promise<R>;
+}) => Promise<R>;
+export declare const deleteResource: <R = void>(url: string, options: {
+    locales: string[];
+    headers?: HeadersInit;
+    modifyUrl?: (url: URL) => void;
+    getResult?: (response: Response) => Promise<R>;
+}) => Promise<R>;

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

@@ -0,0 +1,34 @@
+const request = async (method, url, options) => {
+    const resolvedUrl = new URL(url, window.location.origin);
+    for (const locale of options.locales) {
+        resolvedUrl.searchParams.append("locales", locale);
+    }
+    if (options.modifyUrl) {
+        options.modifyUrl(resolvedUrl);
+    }
+    const headers = new Headers(options.headers);
+    if (options.body && !headers.has("Content-Type")) {
+        headers.append("Content-Type", "application/json");
+    }
+    const response = await fetch(resolvedUrl, {
+        method: method,
+        body: options.body ? JSON.stringify(options.body) : undefined,
+        headers,
+    });
+    if (!response.ok) {
+        throw new Error(await response.text());
+    }
+    return (options.getResult ??
+        (response => {
+            if (response.headers.get("Content-Type")?.startsWith("application/json") === true) {
+                return response.json();
+            }
+            else {
+                return Promise.resolve();
+            }
+        }))(response);
+};
+export const getResource = async (url, options) => request("GET", url, options);
+export const postResource = async (url, options) => request("POST", url, options);
+export const putResource = async (url, options) => request("PUT", url, options);
+export const deleteResource = async (url, options) => request("DELETE", url, options);

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

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

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

@@ -42,6 +42,8 @@ export const createTypeSkeleton = (getDeclFromDeclName, type) => {
                     : { [firstCase[0]]: createTypeSkeleton(getDeclFromDeclName, firstCase[1].type) }),
             };
         }
+        case "ChildEntitiesType":
+            return [];
         default:
             return assertExhaustive(type);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.5.19",
+  "version": "0.6.1",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",
@@ -15,6 +15,7 @@
   "main": "dist/src/index.js",
   "exports": {
     ".": "./dist/src/index.js",
+    "./config": "./dist/src/node/config.js",
     "./renderer/jsonschema": "./dist/src/node/renderers/jsonschema/index.js",
     "./renderer/ts": "./dist/src/node/renderers/ts/index.js",
     "./schema": "./dist/src/node/schema/Schema.js",
@@ -31,26 +32,26 @@
     "release:sign": "commit-and-tag-version --sign --signoff"
   },
   "devDependencies": {
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^9.36.0",
     "@types/debug": "^4.1.12",
     "@types/express": "^5.0.3",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.6.2",
     "commit-and-tag-version": "^12.6.0",
-    "eslint": "^9.35.0",
+    "eslint": "^9.36.0",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "globals": "^16.3.0",
+    "eslint-plugin-react-hooks": "^6.1.0",
+    "globals": "^16.4.0",
     "prettier": "^3.6.2",
-    "tsx": "^4.20.5",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.43.0"
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.45.0"
   },
   "dependencies": {
-    "debug": "^4.4.1",
+    "debug": "^4.4.3",
     "express": "^5.1.0",
-    "preact": "^10.27.1",
-    "preact-iso": "^2.10.0",
-    "simple-cli-args": "^0.1.2",
+    "preact": "^10.27.2",
+    "preact-iso": "^2.11.0",
+    "simple-cli-args": "^0.1.3",
     "simple-git": "^3.28.0",
     "uuid": "^13.0.0"
   },

package/public/css/styles.css

@@ -37,6 +37,7 @@
   --highlight-color: #a08500;
   --highlight-background: #fdfab9;
   --disabled-color: #cdced2;
+  --shadow-color: rgba(53, 56, 58, 0.5);
   --git-status-untracked-color: rgb(13, 149, 101);
   --git-status-untracked-background: rgba(13, 149, 101, 0.15);
   --git-status-added-color: rgb(20, 148, 29);
@@ -52,6 +53,7 @@
   --highlight-color-italic: rgb(41, 155, 96);
   --highlight-color-list-item-marker: rgb(195, 58, 237);
   --highlight-color-table-marker: rgb(237, 58, 118);
+  --highlight-color-attributed: rgb(48, 81, 228);
 }
 
 @media (prefers-color-scheme: dark) {
@@ -84,6 +86,8 @@
     --highlight-color-italic: rgb(130, 230, 178);
     --highlight-color-list-item-marker: rgb(220, 133, 245);
     --highlight-color-table-marker: rgb(244, 135, 171);
+    --highlight-color-attributed: rgb(137, 157, 244);
+    --shadow-color: rgba(0, 0, 0, 0);
   }
 }
 
@@ -99,8 +103,8 @@ body {
 
 #app {
   display: grid;
-  grid-template-columns: 1fr auto;
-  grid-template-areas: "header aside" "main main";
+  grid-template-columns: 1fr;
+  grid-template-areas: "header" "main" "aside";
   gap: 0 1rem;
 }
 
@@ -164,6 +168,16 @@ h2.h1-faded {
   color: var(--tertiary-color);
 }
 
+h3 {
+  margin: 1.6rem 0 0.75rem;
+  font-size: 1.25rem;
+  line-height: 1.2;
+}
+
+p {
+  margin: 0.5rem 0;
+}
+
 a {
   color: var(--color);
 }
@@ -228,6 +242,7 @@ button.destructive:hover {
   color: var(--button-color-destructive-hover);
 }
 
+a.btn[aria-disabled="true"],
 button:disabled {
   background: var(--button-background-disabled);
   color: var(--button-color-disabled);
@@ -257,9 +272,16 @@ select,
   border-radius: 0;
 }
 
-input[aria-invalid="true"],
-textarea[aria-invalid="true"],
-select[aria-invalid="true"] {
+input:disabled,
+textarea:disabled,
+select:disabled {
+  border-color: var(--disabled-color);
+  color: var(--disabled-color);
+}
+
+input[aria-invalid="true"]:not(:disabled),
+textarea[aria-invalid="true"]:not(:disabled),
+select[aria-invalid="true"]:not(:disabled) {
   border-color: var(--error-color);
   color: var(--error-color);
 }
@@ -285,7 +307,7 @@ select[aria-invalid="true"] {
   grid-area: 1 / 1 / 2 / 2;
 }
 
-input[type="checkbox"] {
+:is(input[type="checkbox"], input[type="radio"]) {
   height: 1rem;
   width: 1rem;
   margin: 0.25rem 0.5rem 0 0;
@@ -296,13 +318,28 @@ input[type="checkbox"] {
   appearance: none;
 }
 
-input[type="checkbox"]:checked {
+:is(input[type="checkbox"], input[type="radio"]):disabled {
+  border-color: var(--disabled-color);
+}
+
+input[type="radio"] {
+  border-radius: 50%;
+}
+
+:is(input[type="checkbox"], input[type="radio"]):checked {
   background: var(--color);
 }
 
-input[type="checkbox"]:checked::before {
+:is(input[type="checkbox"], input[type="radio"]):checked:disabled {
+  background: var(--disabled-color);
+}
+
+:is(input[type="checkbox"], input[type="radio"]):checked::before {
   content: "";
   display: block;
+}
+
+input[type="checkbox"]:checked::before {
   border-width: 0 0 0.125rem 0.125rem;
   border-style: solid;
   width: 0.8rem;
@@ -312,6 +349,35 @@ input[type="checkbox"]:checked::before {
   margin: calc(-0.325rem) 0 0 calc(-0.4rem);
 }
 
+input[type="radio"]:checked::before {
+  width: 0.5rem;
+  height: 0.5rem;
+  background-color: var(--background);
+  border-radius: 50%;
+  margin: -0.25rem;
+}
+
+:is(input[type="checkbox"], input[type="radio"]) + * {
+  margin-top: 0.1rem;
+}
+
+:is(input[type="checkbox"], input[type="radio"]):disabled + label,
+:is(input[type="checkbox"], input[type="radio"]):disabled + * label {
+  color: var(--disabled-color);
+}
+
+.field--option {
+  display: flex;
+}
+
+.field--option > :not(input) {
+  flex: 1 1 0;
+}
+
+.field--option + .field--option {
+  margin-top: 0.5rem;
+}
+
 .select-wrapper {
   position: relative;
 }
@@ -373,6 +439,25 @@ select {
   align-items: center;
 }
 
+.entry-groups {
+  list-style-type: " ";
+  padding: 0;
+  margin: 1.5rem 0 0;
+}
+
+.entry-groups-item {
+  padding: 0;
+  margin: 2rem 0 0;
+}
+
+.entry-groups-item__title {
+  margin: 0;
+}
+
+.entry-groups-item .entries {
+  margin: 1rem 0 0;
+}
+
 .entries {
   list-style-type: " ";
   padding: 0;
@@ -514,6 +599,14 @@ select {
   padding: 0.5rem 0.5rem 0.5rem 1rem;
 }
 
+.field--container.field--disabled {
+  color: var(--disabled-color);
+}
+
+.field--container.field--disabled .comment {
+  color: var(--disabled-color);
+}
+
 form > .field--container {
   padding: 0;
   border: none;
@@ -528,8 +621,7 @@ form > .field--container {
 
 .field--container > ul > li,
 .field--container > ol > li {
-  padding-top: 0.5rem;
-  padding-bottom: 0.75rem;
+  padding-block: 0.5rem;
   border-top: 1px solid var(--separator-color);
   display: block;
 }
@@ -590,12 +682,35 @@ form > .field--container {
   color: var(--highlight-color-table-marker);
 }
 
+.preview .attributed {
+  text-decoration-line: underline;
+  text-decoration-style: dashed;
+  text-decoration-color: var(--highlight-color-attributed);
+}
+
+.editor-highlighting .attributed {
+  color: var(--highlight-color-attributed);
+}
+
+.editor-highlighting .attributed__name {
+  font-weight: 700;
+}
+
+.editor-highlighting .attributed__value {
+  font-style: italic;
+}
+
 .help {
   font-size: 0.8rem;
   color: var(--secondary-color);
   margin: 0.25rem 0 0;
 }
 
+:disabled + .help,
+:disabled + .help a {
+  color: var(--disabled-color);
+}
+
 .field--string .preview {
   padding: 1rem;
   background: var(--markdown-background);
@@ -684,7 +799,10 @@ button[type="submit"] {
 
 .description {
   color: var(--secondary-color);
-  margin: 0 0 3rem;
+}
+
+:is(.header-with-btns, h1) + .description {
+  margin-bottom: 3rem;
 }
 
 .comment {
@@ -756,7 +874,6 @@ main:has(.form-footer) {
 }
 
 aside.git {
-  max-width: 30rem;
   grid-area: aside;
 }
 
@@ -766,6 +883,7 @@ aside.git h2 {
 
 @media (min-width: 80rem) {
   aside.git {
+    width: 30rem;
     border-left: 1px solid var(--separator-color);
     padding-left: 1rem;
   }
@@ -877,3 +995,44 @@ aside.git .branch .select-wrapper {
 .git-overlay.git-overlay--open {
   display: block;
 }
+
+dialog {
+  background: var(--background);
+  color: var(--color);
+  border: none;
+  box-shadow: 0 0.5rem 2rem var(--shadow-color);
+  padding: 1.6rem 1.5rem;
+  max-height: calc(100% - 2rem);
+  max-width: calc(100% - 2rem);
+}
+
+dialog::backdrop {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+dialog header :is(h1, h2, h3, h4, h5, h6) {
+  margin: 0;
+}
+
+dialog.settings {
+  max-width: min(calc(100% - 2rem), 36rem);
+}
+
+dialog.settings section.locale-settings ol {
+  padding: 0 0 0 1.5rem;
+  margin: 1rem 0;
+}
+
+dialog.settings section.locale-settings ol li:not(:first-child) {
+  margin-top: 0.5rem;
+}
+
+.locale-content {
+  display: flex;
+  gap: 0.25rem;
+  align-items: center;
+}
+
+.locale-content span {
+  flex: 1 1 0;
+}

package/dist/src/node/schema/types/primitives/NumericType.d.ts

@@ -1,6 +0,0 @@
-import type { FloatType, SerializedFloatType } from "./FloatType.ts";
-import type { IntegerType, SerializedIntegerType } from "./IntegerType.ts";
-export type NumericType = FloatType | IntegerType;
-export type SerializedNumericType = SerializedFloatType | SerializedIntegerType;
-export * from "./FloatType.ts";
-export * from "./IntegerType.ts";

package/dist/src/node/schema/types/primitives/NumericType.js

@@ -1,2 +0,0 @@
-export * from "./FloatType.js";
-export * from "./IntegerType.js";

package/dist/src/node/schema/types/primitives/PrimitiveType.d.ts

@@ -1,6 +0,0 @@
-import type { BooleanType, SerializedBooleanType } from "./BooleanType.ts";
-import type { DateType, SerializedDateType } from "./DateType.ts";
-import type { NumericType, SerializedNumericType } from "./NumericType.ts";
-import type { SerializedStringType, StringType } from "./StringType.ts";
-export type PrimitiveType = BooleanType | DateType | NumericType | StringType;
-export type SerializedPrimitiveType = SerializedBooleanType | SerializedDateType | SerializedNumericType | SerializedStringType;

package/dist/src/node/schema/validation/type.d.ts

@@ -1,4 +0,0 @@
-import type { Validators } from "../Node.ts";
-import type { Type } from "../types/Type.ts";
-export type ValidatorHelpers = Validators;
-export type Validator<T extends Type, Args extends unknown[] = []> = (helpers: ValidatorHelpers, type: T, value: unknown, ...args: Args) => Error[];

package/dist/src/node/schema/validation/type.js

@@ -1 +0,0 @@
-export {};

package/dist/src/node/server/api/instanceOperations.d.ts

@@ -1,6 +0,0 @@
-import type { InstanceContainer } from "../../../shared/utils/instances.ts";
-import type { Result } from "../../../shared/utils/result.ts";
-import type { TSONDBRequestLocals } from "../index.ts";
-export declare const createInstance: (locals: TSONDBRequestLocals, entityName: string, instance: unknown, idQueryParam: unknown) => Promise<Result<InstanceContainer, [code: number, message: string]>>;
-export declare const updateInstance: (locals: TSONDBRequestLocals, entityName: string, instanceId: string, instance: unknown) => Promise<Result<InstanceContainer, [code: number, message: string]>>;
-export declare const deleteInstance: (locals: TSONDBRequestLocals, entityName: string, instanceId: string) => Promise<Result<InstanceContainer, [code: number, message: string]>>;

package/dist/src/node/server/api/instanceOperations.js

@@ -1,93 +0,0 @@
-import { rm, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { v4 as uuidv4 } from "uuid";
-import { removeAt } from "../../../shared/utils/array.js";
-import { error, ok } from "../../../shared/utils/result.js";
-import { validateEntityDecl } from "../../schema/declarations/EntityDecl.js";
-import { createValidators } from "../../schema/Node.js";
-import { getErrorMessageForDisplay } from "../../utils/error.js";
-import { getGitFileStatusFromStatusResult } from "../../utils/git.js";
-import { formatInstance } from "../../utils/instances.js";
-import { updateReferencesToInstances } from "../../utils/references.js";
-export const createInstance = async (locals, entityName, instance, idQueryParam) => {
-    const entity = locals.entitiesByName[entityName];
-    if (entity === undefined) {
-        return error([400, "Entity not found"]);
-    }
-    const validationErrors = validateEntityDecl(createValidators(locals.instancesByEntityName, false), entity, instance);
-    if (validationErrors.length > 0) {
-        return error([400, validationErrors.map(getErrorMessageForDisplay).join("\n\n")]);
-    }
-    if (locals.localeEntity === entity && typeof idQueryParam !== "string") {
-        return error([400, "Missing id for locale entity"]);
-    }
-    const id = locals.localeEntity === entity ? idQueryParam : uuidv4();
-    if (locals.localeEntity === entity &&
-        locals.instancesByEntityName[entity.name]?.some(instance => instance.id === id)) {
-        return error([400, `Duplicate id "${id}" for locale entity`]);
-    }
-    const fileName = `${id}.json`;
-    await writeFile(join(locals.dataRoot, entity.name, fileName), formatInstance(entity, instance), {
-        encoding: "utf-8",
-    });
-    const instanceContainer = {
-        fileName,
-        id,
-        content: instance,
-        gitStatus: locals.gitRoot === undefined
-            ? undefined
-            : getGitFileStatusFromStatusResult(await locals.git.status(), locals.gitRoot, locals.dataRoot, entity.name, fileName),
-    };
-    locals.instancesByEntityName[entity.name] = [
-        ...(locals.instancesByEntityName[entity.name] ?? []),
-        instanceContainer,
-    ];
-    Object.assign(locals.referencesToInstances, updateReferencesToInstances(locals.entitiesByName, locals.referencesToInstances, entity.name, id, undefined, instance));
-    return ok(instanceContainer);
-};
-export const updateInstance = async (locals, entityName, instanceId, instance) => {
-    const instanceContainer = locals.instancesByEntityName[entityName]?.find(instance => instance.id === instanceId);
-    if (instanceContainer === undefined) {
-        return error([404, "Instance not found"]);
-    }
-    const entity = locals.entitiesByName[entityName];
-    if (entity === undefined) {
-        return error([400, "Entity not found"]);
-    }
-    const validationErrors = validateEntityDecl(createValidators(locals.instancesByEntityName, false), entity, instance);
-    if (validationErrors.length > 0) {
-        return error([400, validationErrors.map(getErrorMessageForDisplay).join("\n\n")]);
-    }
-    await writeFile(join(locals.dataRoot, entity.name, instanceContainer.fileName), formatInstance(entity, instance), { encoding: "utf-8" });
-    const oldInstance = instanceContainer.content;
-    instanceContainer.content = instance;
-    instanceContainer.gitStatus =
-        locals.gitRoot === undefined
-            ? undefined
-            : getGitFileStatusFromStatusResult(await locals.git.status(), locals.gitRoot, locals.dataRoot, entity.name, instanceContainer.fileName);
-    Object.assign(locals.referencesToInstances, updateReferencesToInstances(locals.entitiesByName, locals.referencesToInstances, entity.name, instanceId, oldInstance, instance));
-    return ok(instanceContainer);
-};
-export const deleteInstance = async (locals, entityName, instanceId) => {
-    const instances = locals.instancesByEntityName[entityName] ?? [];
-    const instanceContainerIndex = instances.findIndex(instance => instance.id === instanceId);
-    const instanceContainer = instances[instanceContainerIndex];
-    if (instanceContainer === undefined) {
-        return error([404, "Instance not found"]);
-    }
-    if (locals.referencesToInstances[instanceId]?.some(ref => ref !== instanceId)) {
-        return error([400, "Cannot delete instance that is referenced by other instances"]);
-    }
-    try {
-        await rm(join(locals.dataRoot, entityName, instanceContainer.fileName));
-        locals.instancesByEntityName[entityName] = removeAt(instances, instanceContainerIndex);
-        Object.assign(locals.referencesToInstances, updateReferencesToInstances(locals.entitiesByName, locals.referencesToInstances, entityName, instanceId, instanceContainer.content, undefined));
-        return ok(instanceContainer);
-    }
-    catch (err) {
-        return error([
-            500,
-            `Failed to delete instance: ${err instanceof Error ? err.toString() : String(err)}`,
-        ]);
-    }
-};

package/dist/src/shared/config.d.ts

@@ -1,11 +0,0 @@
-import type { Schema } from "../node/schema/Schema.ts";
-import type { Output } from "./output.ts";
-export type Config = {
-    serverOptions?: ServerOptions;
-    schema: Schema;
-    outputs: Output[];
-    dataRootPath: string;
-};
-export type ServerOptions = {
-    port: number;
-};

package/dist/src/shared/config.js

@@ -1 +0,0 @@
-export {};

package/dist/src/web/api.d.ts

@@ -1,24 +0,0 @@
-import type { SerializedEntityDecl } from "../node/schema/declarations/EntityDecl.ts";
-import type { CreateInstanceOfEntityResponseBody, DeleteInstanceOfEntityResponseBody, GetAllDeclarationsResponseBody, GetAllGitBranchesResponseBody, GetAllInstancesOfEntityResponseBody, GetAllInstancesResponseBody, GetDeclarationResponseBody, GetInstanceOfEntityResponseBody, GitStatusResponseBody, UpdateInstanceOfEntityResponseBody } from "../shared/api.ts";
-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>>;
-export declare const getInstancesByEntityName: (name: string) => Promise<GetAllInstancesOfEntityResponseBody>;
-export declare const createInstanceByEntityNameAndId: (name: string, content: unknown, id?: string) => Promise<CreateInstanceOfEntityResponseBody>;
-export declare const getInstanceByEntityNameAndId: (name: string, id: string) => Promise<GetInstanceOfEntityResponseBody>;
-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: () => 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>;