tsondb 0.11.0 → 0.11.1

package/dist/src/shared/utils/markdown.js

@@ -583,10 +583,21 @@ const parseActiveBlockRule = (rule, res) => [
     rule.map(res),
 ];
 const parseActiveBlockSyntaxRule = (rule, res) => rule.mapHighlighting(res);
-const parseForBlockRules = (rules, text, ruleParser, remainingRules = rules) => {
+const leadingNewlinesPattern = /^((?:[ \t]*\n)*)/;
+const parseForBlockRules = (rules, text, ruleParser, trimLeadingWhitespace, remainingRules = rules) => {
     if (text.length === 0 || remainingRules[0] === undefined) {
         return [];
     }
+    else if (trimLeadingWhitespace === true) {
+        return parseForBlockRules(rules, text.replace(leadingNewlinesPattern, ""), ruleParser, undefined, remainingRules);
+    }
+    else if (trimLeadingWhitespace) {
+        const matchedText = text.match(leadingNewlinesPattern)?.[0];
+        return [
+            ...(matchedText ? trimLeadingWhitespace(matchedText) : []),
+            ...parseForBlockRules(rules, text.replace(leadingNewlinesPattern, ""), ruleParser, undefined, remainingRules),
+        ];
+    }
     const activeRule = remainingRules[0];
     const res = activeRule.pattern.exec(text);
     if (res && (activeRule.predicate?.(res) ?? true)) {
@@ -598,11 +609,11 @@ const parseForBlockRules = (rules, text, ruleParser, remainingRules = rules) =>
         ];
     }
     else {
-        return parseForBlockRules(rules, text, ruleParser, remainingRules.slice(1));
+        return parseForBlockRules(rules, text, ruleParser, trimLeadingWhitespace, remainingRules.slice(1));
     }
 };
-export const parseBlockMarkdown = (text) => parseForBlockRules(blockRules, text, parseActiveBlockRule);
-export const parseBlockMarkdownForSyntaxHighlighting = (text) => reduceSyntaxNodes(parseForBlockRules(blockRules, text, parseActiveBlockSyntaxRule));
+export const parseBlockMarkdown = (text) => parseForBlockRules(blockRules, text, parseActiveBlockRule, true);
+export const parseBlockMarkdownForSyntaxHighlighting = (text) => reduceSyntaxNodes(parseForBlockRules(blockRules, text, parseActiveBlockSyntaxRule, text => [textNode(text)]));
 export const reduceSyntaxNodes = (nodes) => nodes.reduce((reducedNodes, node, index) => {
     const lastNode = index > 0 ? reducedNodes[reducedNodes.length - 1] : undefined;
     const newLastNode = lastNode ? mergeSyntaxNodes(lastNode, node) : null;

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

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
 import { useLocation, useRoute } from "preact-iso";
 import { useCallback, useContext, useEffect, useMemo, useState } from "preact/hooks";
-import { removeAt } from "../../shared/utils/array.js";
 import { deepEqual } from "../../shared/utils/compare.js";
 import { getSerializedDisplayNameFromEntityInstance } from "../../shared/utils/displayName.js";
 import { toTitleCase } from "../../shared/utils/string.js";
@@ -154,18 +153,6 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
             });
         }
     };
-    const handleOnChildChange = useCallback((index, value) => {
-        setChildInstances(old => old[index] ? old.with(index, { ...old[index], content: value }) : old);
-    }, []);
-    const handleOnChildAdd = useCallback((entityName, value) => {
-        setChildInstances(old => [
-            ...old,
-            { entityName, childInstances: [], id: undefined, content: value },
-        ]);
-    }, []);
-    const handleOnChildRemove = useCallback((index) => {
-        setChildInstances(old => removeAt(old, index));
-    }, []);
     if (!name || (mode === "edit" && !id)) {
         return _jsx(NotFound, {});
     }
@@ -199,5 +186,5 @@ export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSub
                             }
                         }, children: "Delete" }))] }), !id && isLocaleEntity && (_jsxs("div", { class: "field field--id", children: [_jsx("label", { htmlFor: "id", children: "ID" }), _jsx("p", { className: "comment", children: "The instance\u2019s identifier. An IETF language tag (BCP47)." }), _jsx("input", { type: "text", id: "id", value: customId, required: true, pattern: "[a-z]{2,3}(-[A-Z]{2,3})?", placeholder: "en-US, de-DE, \u2026", onInput: event => {
                             setCustomId(event.currentTarget.value);
-                        }, "aria-invalid": idErrors.length > 0 }), _jsx(ValidationErrors, { errors: idErrors })] })), _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TypeInput, { type: entity.type, value: instanceContent, path: undefined, instanceNamesByEntity: instanceNamesByEntity, childInstances: childInstances, getDeclFromDeclName: getDeclFromDeclName, onChange: setInstanceContent, onChildChange: handleOnChildChange, onChildAdd: handleOnChildAdd, onChildRemove: handleOnChildRemove, checkIsLocaleEntity: checkIsLocaleEntity }), _jsx("div", { class: "form-footer btns", children: buttons.map(button => (_jsx("button", { type: "submit", name: button.name, class: button.primary ? "primary" : undefined, disabled: !hasUnsavedChanges, children: button.label }, button.name))) })] })] }));
+                        }, "aria-invalid": idErrors.length > 0 }), _jsx(ValidationErrors, { errors: idErrors })] })), _jsxs("form", { onSubmit: handleSubmit, children: [_jsx(TypeInput, { type: entity.type, value: instanceContent, path: undefined, instanceNamesByEntity: instanceNamesByEntity, childInstances: childInstances, getDeclFromDeclName: getDeclFromDeclName, onChange: setInstanceContent, setChildInstances: setChildInstances, checkIsLocaleEntity: checkIsLocaleEntity }), _jsx("div", { class: "form-footer btns", children: buttons.map(button => (_jsx("button", { type: "submit", name: button.name, class: button.primary ? "primary" : undefined, disabled: !hasUnsavedChanges, children: button.label }, button.name))) })] })] }));
 };

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

@@ -1,9 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
+import { useCallback } from "preact/hooks";
 import { isSerializedEntityDecl } from "../../../shared/schema/declarations/EntityDecl.js";
+import { removeAt } from "../../../shared/utils/array.js";
 import { createTypeSkeleton } from "../../utils/typeSkeleton.js";
 import { TypeInput } from "./TypeInput.js";
 export const ChildEntitiesTypeInput = props => {
-    const { type, path, childInstances, disabled, getDeclFromDeclName, onChildAdd, onChildChange, onChildRemove, } = props;
+    const { type, path, childInstances, disabled, getDeclFromDeclName, setChildInstances } = props;
     const childEntity = getDeclFromDeclName(type.entity);
     const childInstancesForEntity = childInstances
         .map((childInstance, index) => [
@@ -11,6 +13,26 @@ export const ChildEntitiesTypeInput = props => {
         index,
     ])
         .filter(([childInstance]) => childInstance.entityName === type.entity);
+    const onChildChange = useCallback((index, value) => {
+        setChildInstances(old => old[index] ? old.with(index, { ...old[index], content: value }) : old);
+    }, [setChildInstances]);
+    const onGrandChildrenChange = useCallback((index, newChildren) => {
+        setChildInstances(old => old[index]
+            ? old.with(index, {
+                ...old[index],
+                childInstances: newChildren(old[index].childInstances),
+            })
+            : old);
+    }, [setChildInstances]);
+    const onChildAdd = useCallback((entityName, value) => {
+        setChildInstances(old => [
+            ...old,
+            { entityName, childInstances: [], id: undefined, content: value },
+        ]);
+    }, [setChildInstances]);
+    const onChildRemove = useCallback((index) => {
+        setChildInstances(old => removeAt(old, index));
+    }, [setChildInstances]);
     if (childEntity === undefined || !isSerializedEntityDecl(childEntity)) {
         return (_jsxs("div", { role: "alert", children: ["Unresolved entity declaration identifier ", _jsx("code", { children: type.entity })] }));
     }
@@ -21,7 +43,9 @@ export const ChildEntitiesTypeInput = props => {
                                         onChildRemove(i);
                                     }, disabled: disabled, children: "Delete Item" })] }), _jsx(TypeInput, { ...props, type: childEntity.type, value: item.content, parentKey: childEntity.parentReferenceKey, onChange: newItem => {
                                 onChildChange(originalIndex, newItem);
-                            }, childInstances: item.childInstances })] }, i))) })) : (_jsx("p", { class: "empty", children: "No child entities" })), _jsx("div", { class: "add-item-container", children: _jsx("button", { onClick: () => {
+                            }, 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: () => {
                         onChildAdd(type.entity, createTypeSkeleton(getDeclFromDeclName, childEntity.type));
                     }, disabled: disabled, children: "Add Item" }) })] }));
 };

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

@@ -13,9 +13,7 @@ export type TypeInputProps<T, V = unknown> = {
     disabled?: boolean;
     getDeclFromDeclName: GetDeclFromDeclName;
     onChange: (value: V) => void;
-    onChildChange: (index: number, value: unknown) => void;
-    onChildAdd: (entityName: string, value: unknown) => void;
-    onChildRemove: (index: number) => void;
+    setChildInstances: (newInstances: (oldInstances: UnsafeEntityTaggedInstanceContainerWithChildInstances[]) => UnsafeEntityTaggedInstanceContainerWithChildInstances[]) => void;
     checkIsLocaleEntity: (entityName: string) => boolean;
 };
 type Props = TypeInputProps<SerializedType>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",