tsondb 0.15.0 → 0.16.0

package/dist/src/node/schema/declarations/EntityDecl.d.ts

@@ -39,7 +39,7 @@ export interface EntityDecl<Name extends string = string, T extends TConstraint
     displayNameCustomizer?: DisplayNameCustomizer;
     isDeprecated?: boolean;
     uniqueConstraints?: UniqueConstraints;
-    customConstraint?: CustomConstraint;
+    customConstraints?: CustomConstraint;
 }
 export interface EntityDeclWithParentReference<Name extends string = string, T extends TConstraint = TConstraint, FK extends Extract<keyof T, string> = Extract<keyof T, string>> extends EntityDecl<Name, T, FK> {
 }
@@ -56,7 +56,7 @@ export declare const EntityDecl: {
         displayNameCustomizer?: TypedDisplayNameCustomizer<Name>;
         isDeprecated?: boolean;
         uniqueConstraints?: UniqueConstraints;
-        customConstraint?: TypedCustomConstraint<Name>;
+        customConstraints?: TypedCustomConstraint<Name>;
     }): EntityDecl<Name, T, undefined>;
     <Name extends string, T extends TConstraint, FK extends Extract<keyof T, string>>(sourceUrl: string, options: {
         name: Name;
@@ -71,7 +71,7 @@ export declare const EntityDecl: {
         displayNameCustomizer?: TypedDisplayNameCustomizer<Name>;
         isDeprecated?: boolean;
         uniqueConstraints?: UniqueConstraints;
-        customConstraint?: TypedCustomConstraint<Name>;
+        customConstraints?: TypedCustomConstraint<Name>;
     }): EntityDecl<Name, T, FK>;
 };
 export { EntityDecl as Entity };

package/dist/src/node/schema/declarations/EntityDecl.js

@@ -9,7 +9,7 @@ export const EntityDecl = (sourceUrl, options) => {
     return {
         ...options,
         displayNameCustomizer: options.displayNameCustomizer, // ignore contravariance of registered entity type
-        customConstraint: options.customConstraint, // ignore contravariance of registered entity type
+        customConstraints: options.customConstraints, // ignore contravariance of registered entity type
         kind: NodeKind.EntityDecl,
         sourceUrl,
         parameters: [],
@@ -58,5 +58,6 @@ export const serializeEntityDecl = ((type) => ({
         ? null
         : type.displayName,
     displayNameCustomizer: type.displayNameCustomizer !== undefined,
+    customConstraints: type.customConstraints !== undefined,
 }));
 export const getReferencesForEntityDecl = (decl, value, inDecl) => getReferencesForObjectType(decl.type.value, value, [...inDecl, decl]);

package/dist/src/node/schema/helpers.d.ts

@@ -2,3 +2,11 @@ import type { RegisteredChildEntityMap, RegisteredEntityMap } from "./externalTy
 export type GetInstanceById = <U extends keyof RegisteredEntityMap>(entity: U, id: string) => RegisteredEntityMap[U] | undefined;
 export type GetAllInstances = <U extends keyof RegisteredEntityMap>(entity: U) => RegisteredEntityMap[U][];
 export type GetAllChildInstancesForParent = <U extends keyof RegisteredChildEntityMap>(entity: U, parentId: RegisteredChildEntityMap[U][2]) => RegisteredChildEntityMap[U][0][];
+/**
+ * Displays the name of an entity instance including its ID. If no display name is found, `undefined` is returned.
+ */
+export type GetDisplayName = (entity: keyof RegisteredEntityMap, id: string) => string | undefined;
+/**
+ * Displays the name of an entity instance including its ID. If no display name is found, only the ID is returned.
+ */
+export type GetDisplayNameWithId = (entity: keyof RegisteredEntityMap, id: string) => string;

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

@@ -1,7 +1,7 @@
 import type { InstanceContainerOverview, InstanceContent } from "../../shared/utils/instances.ts";
 import { type Result } from "../../shared/utils/result.ts";
 import type { RegisteredEntity } from "../schema/externalTypes.ts";
-import type { GetAllChildInstancesForParent, GetAllInstances, GetInstanceById } from "../schema/helpers.ts";
+import type { GetAllChildInstancesForParent, GetAllInstances, GetDisplayName, GetDisplayNameWithId, GetInstanceById } from "../schema/helpers.ts";
 import type { EntityDecl } from "../schema/index.ts";
 import { type DatabaseInMemory } from "./databaseInMemory.ts";
 /**
@@ -17,8 +17,10 @@ export type CustomConstraint = (params: {
     instanceId: string;
     instanceContent: InstanceContent;
     getInstanceById: GetInstanceById;
-    getAllInstance: GetAllInstances;
+    getAllInstances: GetAllInstances;
     getAllChildInstancesForParent: GetAllChildInstancesForParent;
+    getDisplayName: GetDisplayName;
+    getDisplayNameWithId: GetDisplayNameWithId;
 }) => string[];
 /**
  * A constraint that can be defined on an entity to enforce custom validation logic.
@@ -33,8 +35,10 @@ export type TypedCustomConstraint<Name extends string> = (params: {
     instanceId: string;
     instanceContent: RegisteredEntity<Name>;
     getInstanceById: GetInstanceById;
-    getAllInstance: GetAllInstances;
+    getAllInstances: GetAllInstances;
     getAllChildInstancesForParent: GetAllChildInstancesForParent;
+    getDisplayName: GetDisplayName;
+    getDisplayNameWithId: GetDisplayNameWithId;
 }) => string[];
 /**
  * Checks all custom constraints for all provided entities and their instances.

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

@@ -9,20 +9,25 @@ import { getInstanceOfEntityFromDatabaseInMemory, getInstancesOfEntityFromDataba
  * constraint.
  */
 export const checkCustomConstraintsForAllEntities = (db, entitiesByName, instanceOverviewsByEntityName) => {
-    const accessors = {
-        getInstanceById: (entityName, id) => getInstanceOfEntityFromDatabaseInMemory(db, entityName, id),
-        getAllInstance: entityName => getInstancesOfEntityFromDatabaseInMemory(db, entityName),
-        getAllChildInstancesForParent: (entityName, parentId) => {
-            const entity = entitiesByName[entityName];
-            if (!entity || !entity.parentReferenceKey) {
-                return [];
-            }
-            const parentKey = entity.parentReferenceKey;
-            return getInstancesOfEntityFromDatabaseInMemory(db, entityName).filter(instance => deepEqual(instance.content[parentKey], parentId));
-        },
+    const getInstanceById = (entityName, id) => getInstanceOfEntityFromDatabaseInMemory(db, entityName, id)?.content;
+    const getAllInstances = entityName => getInstancesOfEntityFromDatabaseInMemory(db, entityName).map(i => i.content);
+    const getAllChildInstancesForParent = (entityName, parentId) => {
+        const entity = entitiesByName[entityName];
+        if (!entity || !entity.parentReferenceKey) {
+            return [];
+        }
+        const parentKey = entity.parentReferenceKey;
+        return getInstancesOfEntityFromDatabaseInMemory(db, entityName)
+            .filter(instance => deepEqual(instance.content[parentKey], parentId))
+            .map(i => i.content);
+    };
+    const getDisplayName = (entityName, id) => instanceOverviewsByEntityName[entityName]?.find(o => o.id === id)?.displayName;
+    const getDisplayNameWithId = (entityName, id) => {
+        const displayName = getDisplayName(entityName, id);
+        return displayName ? `"${displayName}" (${id})` : id;
     };
     return mapError(Object.values(entitiesByName).reduce((acc, entity) => {
-        const constraintFn = entity.customConstraint;
+        const constraintFn = entity.customConstraints;
         if (!constraintFn) {
             return acc;
         }
@@ -30,7 +35,11 @@ export const checkCustomConstraintsForAllEntities = (db, entitiesByName, instanc
             .map((instance) => [
             instance,
             constraintFn({
-                ...accessors,
+                getInstanceById,
+                getAllInstances,
+                getAllChildInstancesForParent,
+                getDisplayName,
+                getDisplayNameWithId,
                 instanceId: instance.id,
                 instanceContent: instance.content,
             }),

package/dist/src/shared/schema/declarations/EntityDecl.d.ts

@@ -57,6 +57,7 @@ export interface SerializedEntityDecl<Name extends string = string, T extends TS
     displayNameCustomizer: boolean;
     isDeprecated?: boolean;
     uniqueConstraints?: UniqueConstraints;
+    customConstraints: boolean;
 }
 export declare const isSerializedEntityDecl: (node: SerializedNode) => node is SerializedEntityDecl;
 export declare const isSerializedEntityDeclWithParentReference: <Name extends string, T extends TSerializedConstraint, FK extends Extract<keyof T, string> | undefined>(decl: SerializedEntityDecl<Name, T, FK>) => decl is SerializedEntityDecl<Name, T, NonNullable<FK>>;

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

@@ -30,6 +30,23 @@ export const ChildEntitiesTypeInput = props => {
             { entityName, childInstances: [], id: undefined, content: value },
         ]);
     }, [setChildInstances]);
+    const onChildDuplicate = useCallback((index) => {
+        const setChildInstancesAsNew = (childInstances) => childInstances.map(ci => ({
+            ...ci,
+            childInstances: setChildInstancesAsNew(ci.childInstances),
+            id: undefined,
+        }));
+        setChildInstances(old => old[index]
+            ? [
+                ...old,
+                {
+                    ...old[index],
+                    childInstances: setChildInstancesAsNew(old[index].childInstances),
+                    id: undefined,
+                },
+            ]
+            : old);
+    }, [setChildInstances]);
     const onChildRemove = useCallback((index) => {
         setChildInstances(old => removeAt(old, index));
     }, [setChildInstances]);
@@ -39,9 +56,11 @@ export const ChildEntitiesTypeInput = props => {
     if (path === undefined) {
         return _jsx("div", { role: "alert", children: "A child entities type cannot be the root type of a document." });
     }
-    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 => {
+    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, "."] }), _jsxs("div", { class: "container-item-actions", children: [_jsxs("button", { onClick: () => {
+                                                onChildDuplicate(i);
+                                            }, disabled: disabled, children: ["Duplicate Item #", i + 1] }), _jsxs("button", { class: "destructive", onClick: () => {
+                                                onChildRemove(i);
+                                            }, disabled: disabled, children: ["Delete Item #", i + 1] })] })] }), _jsx(TypeInput, { ...props, type: childEntity.type, value: item.content, parentKey: childEntity.parentReferenceKey, onChange: 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);

package/package.json

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

package/public/css/styles.css

@@ -856,6 +856,13 @@ form > .field--container {
   margin: 0.125rem 0 0;
 }
 
+.container-item-actions {
+  flex: none;
+  display: flex;
+  gap: 0.5rem;
+  margin-left: 1rem;
+}
+
 .add-item-container {
   display: flex;
   margin-top: 1rem;