tsondb 0.1.3 → 0.3.0

package/lib/utils/render.js

@@ -1,8 +1,34 @@
 import { EOL } from "node:os";
+import { mergeObjects } from "../shared/utils/object.js";
 export const prefixLines = (prefix, text, includeEmptyLines = false) => text
     .split(EOL)
     .map(line => (includeEmptyLines || line.length > 0 ? prefix + line : line))
     .join(EOL);
 export const applyIndentation = (indentLevel, text, spaces) => prefixLines(" ".repeat(spaces * indentLevel), text);
 export const joinSyntax = (...syntaxes) => syntaxes.filter(syntax => syntax !== undefined).join("");
-export const syntax = (strings, ...values) => strings.reduce((acc, str, i) => acc + str.replace(/\n/g, EOL) + (values[i] !== undefined ? values[i] : ""), "");
+const emptyRenderResult = [{}, ""];
+export const combineSyntaxes = (syntaxes, separator = "") => syntaxes
+    .filter(syntax => syntax !== undefined)
+    .reduce((acc, value, i) => typeof value === "string"
+    ? [acc[0], acc[1] + (i === 0 ? "" : separator) + value]
+    : [mergeArraysByKey(acc[0], value[0]), acc[1] + (i === 0 ? "" : separator) + value[1]], emptyRenderResult);
+const mergeArraysByKey = (...arrayGroups) => arrayGroups.reduce((acc, arrayGroup) => mergeObjects(acc, arrayGroup, (a, b) => a.concat(b)), {});
+export const syntax = (strings, ...values) => strings.reduce((acc, str, i) => {
+    const nextValue = values[i];
+    if (typeof nextValue === "string") {
+        return [acc[0], acc[1] + str.replace(/\n/g, EOL) + nextValue];
+    }
+    else if (Array.isArray(nextValue)) {
+        return [
+            mergeArraysByKey(acc[0], nextValue[0]),
+            acc[1] + str.replace(/\n/g, EOL) + nextValue[1],
+        ];
+    }
+    else {
+        return [acc[0], acc[1] + str.replace(/\n/g, EOL)];
+    }
+}, emptyRenderResult);
+export const indent = (spaces, indentLevel, text) => [
+    text[0],
+    prefixLines(" ".repeat(spaces * indentLevel), text[1]),
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.1.3",
+  "version": "0.3.0",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",
@@ -13,7 +13,6 @@
   "exports": {
     ".": "./lib/index.js",
     "./renderer/jsonschema": "./lib/renderers/jsonschema/index.js",
-    "./renderer/md": "./lib/renderers/md/index.js",
     "./renderer/ts": "./lib/renderers/ts/index.js",
     "./modelcontainer": "./lib/ModelContainer.js",
     "./schema": "./lib/Schema.js",
@@ -26,6 +25,7 @@
     "release": "commit-and-tag-version"
   },
   "devDependencies": {
+    "@types/debug": "^4.1.12",
     "@types/express": "^5.0.1",
     "@types/node": "^22.13.14",
     "commit-and-tag-version": "^12.5.1",
@@ -34,13 +34,19 @@
     "typescript": "^5.8.2"
   },
   "dependencies": {
+    "debug": "^4.4.0",
     "express": "^5.1.0",
     "preact": "^10.26.5",
     "preact-iso": "^2.9.1",
+    "simple-git": "^3.27.0",
+    "supports-color": "^10.0.0",
     "uuid": "^11.1.0"
   },
   "repository": "github:elyukai/tsondb",
   "bugs": {
     "url": "https://github.com/elyukai/tsondb/issues"
+  },
+  "engines": {
+    "node": ">=21.2.0"
   }
 }

package/public/css/styles.css

@@ -9,6 +9,7 @@
     "Courier New", monospace;
   --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
   --background: white;
+  --markdown-background: #e1e3e7;
   --color: black;
   --error-color: #9d1212;
   --separator-color: #e9e5eb;
@@ -39,6 +40,28 @@ body {
   padding: 1.5rem;
   line-height: 1.4;
   background: var(--background);
+  z-index: 1;
+}
+
+#app {
+  display: grid;
+  grid-template-columns: 1fr auto;
+  grid-template-areas: "header aside" "main main";
+  gap: 0 1rem;
+}
+
+@media (min-width: 80rem) {
+  #app {
+    grid-template-columns: 1fr auto;
+    grid-template-areas: "header header" "main aside";
+  }
+}
+
+header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  grid-area: header;
 }
 
 header nav ol {
@@ -49,6 +72,10 @@ header nav ol {
   margin: 0;
 }
 
+main {
+  grid-area: main;
+}
+
 h1 {
   margin: 2rem 0 1.5rem;
   font-size: 2.5rem;
@@ -67,6 +94,18 @@ h1 .id {
   margin-top: 0.25rem;
 }
 
+h2 {
+  margin: 1.8rem 0 1.25rem;
+  font-size: 1.75rem;
+  line-height: 1.1;
+}
+
+h2.h1-faded {
+  margin: 2rem 0 1.5rem;
+  font-size: 2.5rem;
+  color: var(--tertiary-color);
+}
+
 a {
   color: var(--color);
 }
@@ -137,7 +176,9 @@ button.destructive:disabled {
   cursor: not-allowed;
 }
 
-input, select {
+input,
+textarea,
+select {
   font-family: var(--font-sans);
   border: 1px solid var(--color);
   padding: 0.5rem;
@@ -149,6 +190,7 @@ input, select {
 }
 
 input[aria-invalid="true"],
+textarea[aria-invalid="true"],
 select[aria-invalid="true"] {
   border-color: var(--error-color);
   color: var(--error-color);
@@ -181,6 +223,11 @@ input[type="checkbox"]:checked::before {
   margin: calc(-0.2rem - 1px) 0 0 calc(-0.275rem - 1px);
 }
 
+textarea {
+  min-height: 5rem;
+  resize: vertical;
+}
+
 .select-wrapper {
   position: relative;
 }
@@ -364,6 +411,34 @@ form > .field--container {
   padding-bottom: 0;
 }
 
+.field--string {
+  display: flex;
+  gap: 1rem;
+  align-items: start;
+}
+
+.field--string .editor {
+  flex: 1 1 0;
+}
+
+.field--string .preview {
+  padding: 1rem;
+  background: var(--markdown-background);
+  flex: 1 1 0;
+}
+
+.field--string .preview p {
+  margin: 0.5rem 0 0;
+}
+
+.field--string .preview > :first-child {
+  margin-top: 0;
+}
+
+.field--string .preview > :last-child {
+  margin-bottom: 0;
+}
+
 .container-item-header {
   display: flex;
   align-items: center;
@@ -416,3 +491,165 @@ button[type="submit"] {
   color: var(--secondary-color);
   margin: 0.5rem 0 0;
 }
+
+.git-status {
+  width: 1.75rem;
+  height: 1.75rem;
+  border-radius: 2px;
+  text-align: center;
+  line-height: 1.75rem;
+  margin: 0;
+  font-weight: 600;
+}
+
+.instance-item .git-status {
+  margin-top: 0.3rem;
+}
+
+.git-status.git-status--U {
+  color: rgb(13, 149, 101);
+  background: rgba(13, 149, 101, 0.15);
+}
+
+.git-status.git-status--A {
+  color: rgb(20, 148, 29);
+  background: rgba(20, 148, 29, 0.15);
+}
+
+.git-status.git-status--M {
+  color: rgb(196, 155, 18);
+  background: rgba(196, 155, 18, 0.15);
+}
+
+.git-status.git-status--D {
+  color: rgb(135, 22, 11);
+  background: rgba(135, 22, 11, 0.15);
+}
+
+.git-status.git-status--R {
+  color: rgb(20, 97, 148);
+  background: rgba(20, 97, 148, 0.15);
+}
+
+aside.git {
+  max-width: 30rem;
+  grid-area: aside;
+}
+
+aside.git h2 {
+  display: none;
+}
+
+@media (min-width: 80rem) {
+  aside.git {
+    border-left: 1px solid var(--separator-color);
+    padding-left: 1rem;
+  }
+
+  aside.git h2 {
+    display: block;
+  }
+
+  aside.git > button {
+    display: none;
+  }
+}
+
+aside.git h3 {
+  font-size: 1.25rem;
+  margin: 0;
+}
+
+aside.git ul {
+  list-style-type: " ";
+  padding: 0;
+  margin: 0;
+  display: block;
+}
+
+aside.git .git-entity-list-item > .title {
+  margin: 1rem 0 0.5rem;
+}
+
+aside.git .git-instance-list-item {
+  display: flex;
+  justify-content: space-between;
+  margin: 0.25rem 0 0;
+  gap: 0.25rem;
+}
+
+aside.git li .title {
+  display: block;
+  margin: 0.25rem 0;
+  flex: 1 1 0;
+}
+
+aside.git li.git-entity-list-item > .title {
+  font-weight: 600;
+}
+
+aside.git li button {
+  padding: 0 0.5rem;
+  line-height: 1.75rem;
+  height: 1.75rem;
+}
+
+aside.git .git-section-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 0.5rem;
+  margin: 1rem 0 0.5rem;
+}
+
+aside.git .git-section-title h2 {
+  margin: 0;
+}
+
+aside.git p.no-changes {
+  color: var(--tertiary-color);
+  margin: 0;
+}
+
+aside.git .commit,
+aside.git .sync,
+aside.git .branch {
+  display: flex;
+  gap: 0.5rem;
+}
+
+aside.git .sync,
+aside.git .branch {
+  margin-bottom: 1rem;
+}
+
+aside.git .commit input,
+aside.git .branch .select-wrapper {
+  flex: 1 1 0;
+}
+
+.git-overlay {
+  display: none;
+  position: absolute;
+  right: 1.5rem;
+  box-shadow: 0 0.5rem 2rem rgba(160, 163, 165, 0.5);
+  z-index: 1000;
+  padding: 1rem;
+  background: var(--background);
+  overflow-y: auto;
+  max-height: calc(90vh - 5rem);
+}
+
+@media (min-width: 80rem) {
+  .git-overlay {
+    display: block;
+    position: static;
+    box-shadow: none;
+    padding: 0.5rem 0 0;
+    max-height: none;
+  }
+}
+
+.git-overlay.git-overlay--open {
+  display: block;
+}

package/lib/client/components/typeInputs/utils/EnumDeclField.d.ts

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

package/lib/server/instanceOperations.d.ts

@@ -1,7 +0,0 @@
-import { ModelContainer } from "../ModelContainer.js";
-import { EntityDecl } from "../schema/declarations/EntityDecl.js";
-import { InstanceContainer, InstancesByEntityName } from "../shared/utils/instances.js";
-import { Result } from "../utils/result.js";
-export declare const createInstance: (modelContainer: ModelContainer, entitiesByName: Record<string, EntityDecl>, instancesByEntityName: InstancesByEntityName, entityName: string, instance: unknown, idQueryParam: unknown) => Promise<Result<InstanceContainer, [code: number, message: string]>>;
-export declare const updateInstance: (modelContainer: ModelContainer, entitiesByName: Record<string, EntityDecl>, instancesByEntityName: InstancesByEntityName, entityName: string, id: string, instance: unknown) => Promise<Result<InstanceContainer, [code: number, message: string]>>;
-export declare const deleteInstance: (modelContainer: ModelContainer, instancesByEntityName: InstancesByEntityName, entityName: string, id: string) => Promise<Result<InstanceContainer, [code: number, message: string]>>;

package/lib/server/instanceOperations.js

@@ -1,67 +0,0 @@
-import { rm, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { v4 as uuidv4 } from "uuid";
-import { validateEntityDecl } from "../schema/declarations/EntityDecl.js";
-import { createValidators } from "../schema/Node.js";
-import { getErrorMessageForDisplay } from "../utils/error.js";
-import { error, ok } from "../utils/result.js";
-export const createInstance = async (modelContainer, entitiesByName, instancesByEntityName, entityName, instance, idQueryParam) => {
-    const entity = entitiesByName[entityName];
-    const validationErrors = validateEntityDecl(createValidators(instancesByEntityName), entity, instance);
-    if (validationErrors.length > 0) {
-        return error([400, validationErrors.map(getErrorMessageForDisplay).join("\n\n")]);
-    }
-    if (modelContainer.schema.localeEntity === entity && typeof idQueryParam !== "string") {
-        return error([400, "Missing id for locale entity"]);
-    }
-    const id = modelContainer.schema.localeEntity === entity ? idQueryParam : uuidv4();
-    if (modelContainer.schema.localeEntity === entity &&
-        instancesByEntityName[entity.name].some(instance => instance.id === id)) {
-        return error([400, `Duplicate id "${id}" for locale entity`]);
-    }
-    const fileName = `${id}.json`;
-    await writeFile(join(modelContainer.dataRootPath, entity.name, fileName), JSON.stringify(instance, undefined, 2), { encoding: "utf-8" });
-    const instanceContainer = {
-        fileName,
-        id,
-        content: instance,
-    };
-    instancesByEntityName[entity.name] = [
-        ...(instancesByEntityName[entity.name] ?? []),
-        instanceContainer,
-    ];
-    return ok(instanceContainer);
-};
-export const updateInstance = async (modelContainer, entitiesByName, instancesByEntityName, entityName, id, instance) => {
-    const instanceContainer = instancesByEntityName[entityName]?.find(instance => instance.id === id);
-    if (instanceContainer === undefined) {
-        return error([404, "Instance not found"]);
-    }
-    const entity = entitiesByName[entityName];
-    const validationErrors = validateEntityDecl(createValidators(instancesByEntityName), entity, instance);
-    if (validationErrors.length > 0) {
-        return error([400, validationErrors.map(getErrorMessageForDisplay).join("\n\n")]);
-    }
-    await writeFile(join(modelContainer.dataRootPath, entity.name, instanceContainer.fileName), JSON.stringify(instance, undefined, 2), { encoding: "utf-8" });
-    instanceContainer.content = instance;
-    return ok(instanceContainer);
-};
-export const deleteInstance = async (modelContainer, instancesByEntityName, entityName, id) => {
-    const instances = instancesByEntityName[entityName] ?? [];
-    const instanceContainerIndex = instances.findIndex(instance => instance.id === id);
-    const instanceContainer = instances[instanceContainerIndex];
-    if (instanceContainer === undefined) {
-        return error([404, "Instance not found"]);
-    }
-    try {
-        await rm(join(modelContainer.dataRootPath, entityName, instanceContainer.fileName));
-        instancesByEntityName[entityName] = [
-            ...instances.slice(0, instanceContainerIndex),
-            ...instances.slice(instanceContainerIndex + 1),
-        ];
-        return ok(instanceContainer);
-    }
-    catch (err) {
-        return error([500, `Failed to delete instance: ${err}`]);
-    }
-};