tsondb 0.7.6 → 0.7.7

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

@@ -39,6 +39,13 @@ import type { Type } from "./types/Type.ts";
 export type { BaseNode } from "../../shared/schema/Node.ts";
 export { NodeKind };
 export type Node = Decl | Type | TypeParameter;
+export type NestedDecl = Decl | NestedEntity;
+export type NestedEntity = {
+    kind: "NestedEntity";
+    sourceUrl: string;
+    name: string;
+    type: NestedEntityMapType;
+};
 export declare const reduceNodes: <R>(reducer: (parentNodes: Node[], node: Node, collectedResults: R[]) => R[], nodes: readonly Node[], options?: {
     initialResults?: R[];
     followIncludes?: boolean;
@@ -55,7 +62,7 @@ export interface Validators {
 }
 export declare const createValidators: (instancesByEntityName: InstancesByEntityName, useStyling: boolean, checkReferentialIntegrity?: boolean) => Validators;
 export type Predicate<T extends Node> = (node: Node) => node is T;
-export type GetNestedDeclarations<T extends Node = Node> = (addedDecls: Decl[], node: T) => Decl[];
+export type GetNestedDeclarations<T extends Node = Node> = (addedDecls: NestedDecl[], node: T, parentDecl: Decl | undefined) => NestedDecl[];
 export declare const getNestedDeclarations: GetNestedDeclarations;
 export type Validator<T extends Node = Node> = (helpers: Validators, node: T, value: unknown) => Error[];
 export type ValidatorOfParamDecl<T extends Node = Node> = (helpers: Validators, node: T, typeArgs: Type[], value: unknown) => Error[];

package/dist/src/node/schema/Node.js

@@ -91,42 +91,58 @@ export const createValidators = (instancesByEntityName, useStyling, checkReferen
             ]
         : () => [],
 });
-export const getNestedDeclarations = (addedDecls, node) => {
+export const getNestedDeclarations = (addedDecls, node, parentDecl) => {
     switch (node.kind) {
         case NodeKind.EntityDecl:
-            return getNestedDeclarationsInEntityDecl(addedDecls, node);
+            return addedDecls.includes(node)
+                ? addedDecls
+                : getNestedDeclarationsInEntityDecl([...addedDecls, node], node, parentDecl);
         case NodeKind.EnumDecl:
-            return getNestedDeclarationsInEnumDecl(addedDecls, node);
+            return addedDecls.includes(node)
+                ? addedDecls
+                : getNestedDeclarationsInEnumDecl([...addedDecls, node], node, parentDecl);
         case NodeKind.TypeAliasDecl:
-            return getNestedDeclarationsInTypeAliasDecl(addedDecls, node);
+            return addedDecls.includes(node)
+                ? addedDecls
+                : getNestedDeclarationsInTypeAliasDecl([...addedDecls, node], node, parentDecl);
         case NodeKind.ArrayType:
-            return getNestedDeclarationsInArrayType(addedDecls, node);
+            return getNestedDeclarationsInArrayType(addedDecls, node, parentDecl);
         case NodeKind.ObjectType:
-            return getNestedDeclarationsInObjectType(addedDecls, node);
+            return getNestedDeclarationsInObjectType(addedDecls, node, parentDecl);
         case NodeKind.BooleanType:
-            return getNestedDeclarationsInBooleanType(addedDecls, node);
+            return getNestedDeclarationsInBooleanType(addedDecls, node, parentDecl);
         case NodeKind.DateType:
-            return getNestedDeclarationsInDateType(addedDecls, node);
+            return getNestedDeclarationsInDateType(addedDecls, node, parentDecl);
         case NodeKind.FloatType:
-            return getNestedDeclarationsInFloatType(addedDecls, node);
+            return getNestedDeclarationsInFloatType(addedDecls, node, parentDecl);
         case NodeKind.IntegerType:
-            return getNestedDeclarationsInIntegerType(addedDecls, node);
+            return getNestedDeclarationsInIntegerType(addedDecls, node, parentDecl);
         case NodeKind.StringType:
-            return getNestedDeclarationsInStringType(addedDecls, node);
+            return getNestedDeclarationsInStringType(addedDecls, node, parentDecl);
         case NodeKind.TypeArgumentType:
-            return getNestedDeclarationsInTypeArgumentType(addedDecls, node);
+            return getNestedDeclarationsInTypeArgumentType(addedDecls, node, parentDecl);
         case NodeKind.ReferenceIdentifierType:
-            return getNestedDeclarationsInReferenceIdentifierType(addedDecls, node);
+            return getNestedDeclarationsInReferenceIdentifierType(addedDecls, node, parentDecl);
         case NodeKind.IncludeIdentifierType:
-            return getNestedDeclarationsInIncludeIdentifierType(addedDecls, node);
+            return getNestedDeclarationsInIncludeIdentifierType(addedDecls, node, parentDecl);
         case NodeKind.NestedEntityMapType:
-            return getNestedDeclarationsInNestedEntityMapType(addedDecls, node);
+            return addedDecls.some(addedDecl => addedDecl.kind === "NestedEntity" && addedDecl.type === node)
+                ? addedDecls
+                : getNestedDeclarationsInNestedEntityMapType([
+                    ...addedDecls,
+                    {
+                        kind: "NestedEntity",
+                        sourceUrl: parentDecl?.sourceUrl ?? "",
+                        name: node.name,
+                        type: node,
+                    },
+                ], node, parentDecl);
         case NodeKind.EnumType:
-            return getNestedDeclarationsInEnumType(addedDecls, node);
+            return getNestedDeclarationsInEnumType(addedDecls, node, parentDecl);
         case NodeKind.TypeParameter:
-            return getNestedDeclarationsInTypeParameter(addedDecls, node);
+            return getNestedDeclarationsInTypeParameter(addedDecls, node, parentDecl);
         case NodeKind.ChildEntitiesType:
-            return getNestedDeclarationsInChildEntitiesType(addedDecls, node);
+            return getNestedDeclarationsInChildEntitiesType(addedDecls, node, parentDecl);
         default:
             return assertExhaustive(node);
     }

package/dist/src/node/schema/Schema.js

@@ -152,29 +152,33 @@ const checkChildEntitiesProvideCorrectPathToParentReferenceIdentifierType = (dec
         }
     }
 };
-const addDeclarations = (existingDecls, declsToAdd, nested) => declsToAdd.reduce((accDecls, decl) => {
+const addDeclarations = (existingDecls, declsToAdd) => declsToAdd.reduce((accDecls, decl) => {
     if (!accDecls.includes(decl)) {
-        checkDuplicateIdentifier(accDecls, decl);
-        const nestedDecls = nested ? getNestedDeclarations(accDecls, decl) : [];
-        return addDeclarations([...accDecls, decl], nestedDecls, false);
+        return getNestedDeclarations(accDecls, decl.kind === "NestedEntity" ? decl.type : decl, undefined);
     }
     return accDecls;
 }, existingDecls);
 export const Schema = (declarations, localeEntity) => {
     debug("creating schema from %d declarations", declarations.length);
     debug("collecting nested declarations ...");
-    const allDecls = addDeclarations([], localeEntity ? declarations.concat(localeEntity) : declarations, true);
+    const allDecls = addDeclarations([], localeEntity ? declarations.concat(localeEntity) : declarations);
+    debug("found %d nested declarations", allDecls.length);
+    debug("checking for duplicate identifiers ...");
+    allDecls.forEach((decl, declIndex) => {
+        checkDuplicateIdentifier(allDecls.slice(0, declIndex), decl);
+    });
+    const allDeclsWithoutNestedEntities = allDecls.filter(decl => decl.kind !== "NestedEntity");
     debug("checking name shadowing ...");
-    checkParameterNamesShadowing(allDecls);
+    checkParameterNamesShadowing(allDeclsWithoutNestedEntities);
     debug("checking entity display name paths ...");
-    checkEntityDisplayNamePaths(allDecls, localeEntity);
+    checkEntityDisplayNamePaths(allDeclsWithoutNestedEntities, localeEntity);
     debug("checking child entities ...");
-    checkChildEntitiesProvideCorrectPathToParentReferenceIdentifierType(allDecls);
+    checkChildEntitiesProvideCorrectPathToParentReferenceIdentifierType(allDeclsWithoutNestedEntities);
     debug("checking child entity types ...");
-    checkChildEntityTypes(localeEntity, allDecls);
+    checkChildEntityTypes(localeEntity, allDeclsWithoutNestedEntities);
     debug("created schema, no integrity violations found");
     return {
-        declarations: allDecls,
+        declarations: allDeclsWithoutNestedEntities,
         localeEntity,
     };
 };

package/dist/src/node/schema/TypeParameter.js

@@ -4,7 +4,7 @@ export const Param = (name, constraint) => ({
     name,
     constraint,
 });
-export const getNestedDeclarationsInTypeParameter = (addedDecls, param) => (param.constraint ? getNestedDeclarations(addedDecls, param.constraint) : addedDecls);
+export const getNestedDeclarationsInTypeParameter = (addedDecls, param, parentDecl) => param.constraint ? getNestedDeclarations(addedDecls, param.constraint, parentDecl) : addedDecls;
 export const resolveTypeArgumentsInTypeParameter = (_args, param) => param;
 export const serializeTypeParameter = type => ({
     ...type,

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

@@ -26,7 +26,7 @@ export const EntityDecl = (sourceUrl, options) => {
 export { EntityDecl as Entity };
 export const isEntityDecl = node => node.kind === NodeKind.EntityDecl;
 export const isEntityDeclWithParentReference = (decl) => decl.parentReferenceKey !== undefined;
-export const getNestedDeclarationsInEntityDecl = (isDeclAdded, decl) => getNestedDeclarationsInObjectType(isDeclAdded, decl.type.value);
+export const getNestedDeclarationsInEntityDecl = (isDeclAdded, decl) => getNestedDeclarationsInObjectType(isDeclAdded, decl.type.value, decl);
 export const validateEntityDecl = (helpers, decl, value) => validateType(helpers, decl.type.value, value);
 export const resolveTypeArgumentsInEntityDecl = (_args, decl) => EntityDecl(decl.sourceUrl, {
     ...decl,

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

@@ -28,7 +28,7 @@ export const EnumDecl = (sourceUrl, options) => {
 };
 export { EnumDecl as Enum };
 export const isEnumDecl = node => node.kind === NodeKind.EnumDecl;
-export const getNestedDeclarationsInEnumDecl = (addedDecls, decl) => getNestedDeclarationsInEnumType(addedDecls, decl.type.value);
+export const getNestedDeclarationsInEnumDecl = (addedDecls, decl) => getNestedDeclarationsInEnumType(addedDecls, decl.type.value, decl);
 export const validateEnumDecl = (helpers, decl, args, value) => validateEnumType(helpers, resolveTypeArgumentsInEnumType(getTypeArgumentsRecord(decl, args), decl.type.value), value);
 export const resolveTypeArgumentsInEnumDecl = (args, decl) => EnumDecl(decl.sourceUrl, {
     name: decl.name,

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

@@ -26,7 +26,7 @@ export const TypeAliasDecl = (sourceUrl, options) => {
 };
 export { TypeAliasDecl as TypeAlias };
 export const isTypeAliasDecl = node => node.kind === NodeKind.TypeAliasDecl;
-export const getNestedDeclarationsInTypeAliasDecl = (addedDecls, decl) => getNestedDeclarations(addedDecls, decl.type.value);
+export const getNestedDeclarationsInTypeAliasDecl = (addedDecls, decl) => getNestedDeclarations(addedDecls, decl.type.value, decl);
 export const validateTypeAliasDecl = ((helpers, decl, args, value) => validateType(helpers, resolveTypeArguments(getTypeArgumentsRecord(decl, args), decl.type.value), value));
 export const resolveTypeArgumentsInTypeAliasDecl = (args, decl) => TypeAliasDecl(decl.sourceUrl, {
     ...decl,

package/dist/src/node/schema/types/generic/ArrayType.js

@@ -14,7 +14,7 @@ export const ArrayType = (items, options = {}) => ({
 });
 export { ArrayType as Array };
 export const isArrayType = node => node.kind === NodeKind.ArrayType;
-export const getNestedDeclarationsInArrayType = (addedDecls, type) => getNestedDeclarations(addedDecls, type.items);
+export const getNestedDeclarationsInArrayType = (addedDecls, type, parentDecl) => getNestedDeclarations(addedDecls, type.items, parentDecl);
 export const validateArrayType = (helpers, type, value) => {
     if (!Array.isArray(value)) {
         return [TypeError(`expected an array, but got ${json(value, helpers.useStyling)}`)];

package/dist/src/node/schema/types/generic/EnumType.js

@@ -9,7 +9,7 @@ export const EnumType = (values) => ({
     values,
 });
 export const isEnumType = node => node.kind === NodeKind.EnumType;
-export const getNestedDeclarationsInEnumType = (addedDecls, type) => Object.values(type.values).reduce((acc, caseMember) => caseMember.type === null ? acc : getNestedDeclarations(acc, caseMember.type), addedDecls);
+export const getNestedDeclarationsInEnumType = (addedDecls, type, parentDecl) => Object.values(type.values).reduce((acc, caseMember) => caseMember.type === null ? acc : getNestedDeclarations(acc, caseMember.type, parentDecl), addedDecls);
 export const validateEnumType = (helpers, type, value) => {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
         return [TypeError(`expected an object, but got ${json(value, helpers.useStyling)}`)];

package/dist/src/node/schema/types/generic/ObjectType.js

@@ -25,7 +25,7 @@ export const ObjectType = (properties, options = {}) => {
 };
 export { ObjectType as Object };
 export const isObjectType = node => node.kind === NodeKind.ObjectType;
-export const getNestedDeclarationsInObjectType = (addedDecls, type) => Object.values(type.properties).reduce((acc, prop) => getNestedDeclarations(acc, prop.type), addedDecls);
+export const getNestedDeclarationsInObjectType = (addedDecls, type, parentDecl) => Object.values(type.properties).reduce((acc, prop) => getNestedDeclarations(acc, prop.type, parentDecl), addedDecls);
 export const validateObjectType = (helpers, type, value) => {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
         return [TypeError(`expected an object, but got ${json(value, helpers.useStyling)}`)];

package/dist/src/node/schema/types/references/ChildEntitiesType.js

@@ -7,7 +7,7 @@ export const ChildEntitiesType = (entity) => ({
 });
 export { ChildEntitiesType as ChildEntities };
 export const isChildEntitiesType = node => node.kind === NodeKind.ChildEntitiesType;
-export const getNestedDeclarationsInChildEntitiesType = (addedDecls, type) => getNestedDeclarations([type.entity, ...addedDecls], type.entity);
+export const getNestedDeclarationsInChildEntitiesType = (addedDecls, type, parentDecl) => getNestedDeclarations(addedDecls, type.entity, parentDecl);
 export const validateChildEntitiesType = () => [];
 export const resolveTypeArgumentsInChildEntitiesType = (_args, type) => type;
 export const serializeChildEntitiesType = type => ({

package/dist/src/node/schema/types/references/IncludeIdentifierType.js

@@ -16,9 +16,9 @@ export const IncludeIdentifierType = (reference) => ({
 export { IncludeIdentifierType as IncludeIdentifier };
 export const isIncludeIdentifierType = node => node.kind === NodeKind.IncludeIdentifierType;
 const isNoGenericIncludeIdentifierType = (node) => node.args.length === 0 && node.reference.parameters.length === 0;
-export const getNestedDeclarationsInIncludeIdentifierType = (addedDecls, type) => type.args.reduce((accAddedDecls, arg) => getNestedDeclarations(accAddedDecls, arg), addedDecls.includes(type.reference)
+export const getNestedDeclarationsInIncludeIdentifierType = (addedDecls, type, parentDecl) => type.args.reduce((accAddedDecls, arg) => getNestedDeclarations(accAddedDecls, arg, parentDecl), addedDecls.includes(type.reference)
     ? addedDecls
-    : getNestedDeclarations([type.reference, ...addedDecls], type.reference));
+    : getNestedDeclarations(addedDecls, type.reference, parentDecl));
 export const validateIncludeIdentifierType = (helpers, type, value) => validateDecl(helpers, type.reference, type.args, value);
 export const resolveTypeArgumentsInIncludeIdentifierType = ((args, type) => (isNoGenericIncludeIdentifierType(type)
     ? type

package/dist/src/node/schema/types/references/NestedEntityMapType.d.ts

@@ -1,6 +1,8 @@
 import { Lazy } from "../../../../shared/utils/lazy.ts";
-import type { EntityDecl } from "../../declarations/EntityDecl.ts";
-import type { TypeAliasDecl } from "../../declarations/TypeAliasDecl.ts";
+import type { DisplayNameCustomizer } from "../../../utils/displayName.ts";
+import type { EntityDecl } from "../../declarations/EntityDecl.js";
+import { type EntityDisplayName } from "../../declarations/EntityDecl.js";
+import type { TypeAliasDecl } from "../../declarations/TypeAliasDecl.js";
 import type { GetNestedDeclarations, GetReferences, Predicate, Serializer, TypeArgumentsResolver, Validator } from "../../Node.ts";
 import { NodeKind } from "../../Node.ts";
 import type { MemberDecl, ObjectType } from "../generic/ObjectType.ts";
@@ -11,15 +13,23 @@ type PossibleType<T extends TConstraint> = ObjectType<T> | IncludeIdentifier<[],
 export interface NestedEntityMapType<Name extends string = string, T extends TConstraint = TConstraint> extends BaseType {
     kind: NodeKind["NestedEntityMapType"];
     name: Name;
+    namePlural: string;
     comment?: string;
     secondaryEntity: EntityDecl;
     type: Lazy<PossibleType<T>>;
 }
 export declare const NestedEntityMapType: <Name extends string, T extends TConstraint>(options: {
     name: Name;
+    namePlural: string;
     comment?: string;
     secondaryEntity: EntityDecl;
     type: PossibleType<T>;
+    /**
+     * @default "name"
+     */
+    displayName?: EntityDisplayName<T>;
+    displayNameCustomizer?: DisplayNameCustomizer<ObjectType<T>>;
+    isDeprecated?: boolean;
 }) => NestedEntityMapType<Name, T>;
 export { NestedEntityMapType as NestedEntityMap };
 export declare const isNestedEntityMapType: Predicate<NestedEntityMapType>;

package/dist/src/node/schema/types/references/NestedEntityMapType.js

@@ -3,7 +3,7 @@ import { sortObjectKeysAlphabetically } from "../../../../shared/utils/object.js
 import { parallelizeErrors } from "../../../../shared/utils/validation.js";
 import { wrapErrorsIfAny } from "../../../utils/error.js";
 import { entity, json, key as keyColor } from "../../../utils/errorFormatting.js";
-import {} from "../../declarations/Declaration.js";
+import {} from "../../declarations/EntityDecl.js";
 import { getNestedDeclarations, NodeKind, resolveTypeArguments, validateType } from "../../Node.js";
 import { getReferencesForObjectType, isObjectType, serializeObjectType, } from "../generic/ObjectType.js";
 import { formatValue } from "../Type.js";
@@ -26,7 +26,7 @@ const _NestedEntityMapType = (options) => {
     return nestedEntityMapType;
 };
 export const isNestedEntityMapType = node => node.kind === NodeKind.NestedEntityMapType;
-export const getNestedDeclarationsInNestedEntityMapType = (addedDecls, type) => getNestedDeclarations(addedDecls.includes(type.secondaryEntity) ? addedDecls : [type.secondaryEntity, ...addedDecls], type.type.value);
+export const getNestedDeclarationsInNestedEntityMapType = (addedDecls, type, parentDecl) => getNestedDeclarations(getNestedDeclarations(addedDecls, type.secondaryEntity, parentDecl), type.type.value, parentDecl);
 export const validateNestedEntityMapType = (helpers, type, value) => {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
         return [TypeError(`expected an object, but got ${json(value, helpers.useStyling)}`)];

package/dist/src/node/schema/types/references/ReferenceIdentifierType.js

@@ -6,9 +6,9 @@ export const ReferenceIdentifierType = (entity) => ({
 });
 export { ReferenceIdentifierType as ReferenceIdentifier };
 export const isReferenceIdentifierType = (node) => node.kind === NodeKind.ReferenceIdentifierType;
-export const getNestedDeclarationsInReferenceIdentifierType = (addedDecls, type) => addedDecls.includes(type.entity)
+export const getNestedDeclarationsInReferenceIdentifierType = (addedDecls, type, parentDecl) => addedDecls.includes(type.entity)
     ? addedDecls
-    : getNestedDeclarations([...addedDecls, type.entity], type.entity);
+    : getNestedDeclarations(addedDecls, type.entity, parentDecl);
 export const validateReferenceIdentifierType = (helpers, type, value) => validateType(helpers, createEntityIdentifierType(), value).concat(helpers.checkReferentialIntegrity({
     name: type.entity.name,
     value: value,

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

@@ -27,6 +27,8 @@ export interface SerializedEntityDecl<Name extends string = string, T extends TC
     isDeprecated?: boolean;
 }
 export declare const isSerializedEntityDecl: (node: SerializedNode) => node is SerializedEntityDecl;
+export declare const isSerializedEntityDeclWithParentReference: <Name extends string, T extends TConstraint, FK extends (keyof T & string) | undefined>(decl: SerializedEntityDecl<Name, T, FK>) => decl is SerializedEntityDecl<Name, T, NonNullable<FK>>;
+export declare const isSerializedEntityDeclWithoutParentReference: <Name extends string, T extends TConstraint>(decl: SerializedEntityDecl<Name, T>) => decl is SerializedEntityDecl<Name, T, undefined>;
 export declare const resolveTypeArgumentsInSerializedEntityDecl: SerializedTypeArgumentsResolver<SerializedEntityDecl>;
 export declare const getReferencesForSerializedEntityDecl: GetReferencesSerialized<SerializedEntityDecl>;
 export {};

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

@@ -1,6 +1,8 @@
 import { NodeKind, resolveSerializedTypeArguments, } from "../Node.js";
 import { getReferencesForSerializedObjectType, } from "../types/ObjectType.js";
 export const isSerializedEntityDecl = (node) => node.kind === NodeKind.EntityDecl;
+export const isSerializedEntityDeclWithParentReference = (decl) => decl.parentReferenceKey !== undefined;
+export const isSerializedEntityDeclWithoutParentReference = (decl) => decl.parentReferenceKey === undefined;
 export const resolveTypeArgumentsInSerializedEntityDecl = (decls, _args, decl) => ({
     ...decl,
     type: resolveSerializedTypeArguments(decls, {}, decl.type),

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

@@ -1,4 +1,4 @@
-import type { GetReferencesSerialized, NodeKind, SerializedTypeArgumentsResolver } from "../Node.ts";
+import { NodeKind, type GetReferencesSerialized, type SerializedNode, type SerializedTypeArgumentsResolver } from "../Node.js";
 import type { SerializedTypeParameter } from "../TypeParameter.ts";
 import { type SerializedEnumCaseDecl, type SerializedEnumType } from "../types/EnumType.ts";
 import type { SerializedBaseDecl } from "./Declaration.ts";
@@ -7,5 +7,6 @@ export interface SerializedEnumDecl<Name extends string = string, T extends Reco
     type: SerializedEnumType<T>;
     isDeprecated?: boolean;
 }
+export declare const isSerializedEnumDecl: (node: SerializedNode) => node is SerializedEnumDecl;
 export declare const resolveTypeArgumentsInSerializedEnumDecl: SerializedTypeArgumentsResolver<SerializedEnumDecl>;
 export declare const getReferencesForSerializedEnumDecl: GetReferencesSerialized<SerializedEnumDecl>;

package/dist/src/shared/schema/declarations/EnumDecl.js

@@ -1,4 +1,6 @@
+import { NodeKind, } from "../Node.js";
 import { getReferencesForSerializedEnumType, resolveTypeArgumentsInSerializedEnumType, } from "../types/EnumType.js";
+export const isSerializedEnumDecl = (node) => node.kind === NodeKind.EnumDecl;
 export const resolveTypeArgumentsInSerializedEnumDecl = (decls, args, decl) => {
     return {
         ...decl,

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

@@ -1,4 +1,4 @@
-import { type GetReferencesSerialized, type NodeKind, type SerializedTypeArgumentsResolver } from "../Node.ts";
+import { NodeKind, type GetReferencesSerialized, type SerializedNode, type SerializedTypeArgumentsResolver } from "../Node.ts";
 import type { SerializedTypeParameter } from "../TypeParameter.ts";
 import type { SerializedType } from "../types/Type.ts";
 import type { SerializedBaseDecl } from "./Declaration.ts";
@@ -7,5 +7,6 @@ export interface SerializedTypeAliasDecl<Name extends string = string, T extends
     type: T;
     isDeprecated?: boolean;
 }
+export declare const isSerializedTypeAliasDecl: (node: SerializedNode) => node is SerializedTypeAliasDecl;
 export declare const resolveTypeArgumentsInSerializedTypeAliasDecl: SerializedTypeArgumentsResolver<SerializedTypeAliasDecl>;
 export declare const getReferencesForSerializedTypeAliasDecl: GetReferencesSerialized<SerializedTypeAliasDecl>;

package/dist/src/shared/schema/declarations/TypeAliasDecl.js

@@ -1,4 +1,5 @@
-import { getReferencesSerialized, resolveSerializedTypeArguments, } from "../Node.js";
+import { getReferencesSerialized, NodeKind, resolveSerializedTypeArguments, } from "../Node.js";
+export const isSerializedTypeAliasDecl = (node) => node.kind === NodeKind.TypeAliasDecl;
 export const resolveTypeArgumentsInSerializedTypeAliasDecl = (decls, args, decl) => ({
     ...decl,
     parameters: [],

package/dist/src/web/components/InstanceRouteSkeleton.d.ts

@@ -34,6 +34,11 @@ export type InstanceRouteSkeletonTitleBuilder = (values: {
 }) => string | undefined;
 type Props = {
     mode: "create" | "edit";
+    buttons: {
+        label: string;
+        name: string;
+        primary?: boolean;
+    }[];
     init: InstanceRouteSkeletonInitializer;
     titleBuilder: InstanceRouteSkeletonTitleBuilder;
     onSubmit: InstanceRouteSkeletonOnSubmitHandler;

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

@@ -15,7 +15,7 @@ import { NotFound } from "../routes/NotFound.js";
 import { Layout } from "./Layout.js";
 import { TypeInput } from "./typeInputs/TypeInput.js";
 import { ValidationErrors } from "./typeInputs/utils/ValidationErrors.js";
-export const InstanceRouteSkeleton = ({ mode, init, titleBuilder, onSubmit, }) => {
+export const InstanceRouteSkeleton = ({ mode, buttons, init, titleBuilder, onSubmit, }) => {
     const { params: { name, id }, } = useRoute();
     const [locales] = useSetting("displayedLocales");
     const [getDeclFromDeclName, declsLoaded] = useGetDeclFromDeclName();
@@ -31,7 +31,7 @@ export const InstanceRouteSkeleton = ({ mode, init, titleBuilder, onSubmit, }) =
                 "Not found — TSONDB";
     }, [entity, id, instanceContent, locales, titleBuilder]);
     useEffect(() => {
-        if (entity && instanceContent === undefined) {
+        if (entity && instanceContent === undefined && declsLoaded) {
             init({ locales, entity, instanceId: id, setInstanceContent, getDeclFromDeclName })
                 .then(() => id
                 ? getChildInstancesForInstanceByEntityName(locales, entity.name, id).then(result => {
@@ -42,7 +42,7 @@ export const InstanceRouteSkeleton = ({ mode, init, titleBuilder, onSubmit, }) =
                 console.error("Error initializing instance route skeleton:", error);
             });
         }
-    }, [entity, getDeclFromDeclName, id, init, instanceContent, locales, name]);
+    }, [entity, declsLoaded, getDeclFromDeclName, id, init, instanceContent, locales, name]);
     const handleSubmit = (event) => {
         event.preventDefault();
         if (entity && instanceContent !== undefined) {
@@ -110,5 +110,5 @@ export const InstanceRouteSkeleton = ({ mode, init, titleBuilder, onSubmit, }) =
                             }
                         }, 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 }), _jsx("div", { class: "form-footer btns", children: _jsx("button", { type: "submit", name: "save", class: "primary", children: "Save" }) })] })] }));
+                        }, "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 }), _jsx("div", { class: "form-footer btns", children: buttons.map(button => (_jsx("button", { type: "submit", name: button.name, class: button.primary ? "primary" : undefined, children: button.label }, button.name))) })] })] }));
 };

package/dist/src/web/components/typeInputs/utils/MismatchingTypeError.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs } from "preact/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "preact/jsx-runtime";
 export const MismatchingTypeError = ({ expected, actual }) => {
-    return (_jsxs("div", { role: "alert", children: ["Expected value of type ", expected, ", but got ", JSON.stringify(actual)] }));
+    return (_jsxs("div", { role: "alert", children: ["Expected value of type ", expected, ", but got", " ", _jsx("code", { children: actual === undefined ? "undefined" : JSON.stringify(actual) })] }));
 };

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

@@ -1,4 +1,7 @@
 import { useCallback, useEffect, useState } from "preact/hooks";
+import { isSerializedEntityDeclWithParentReference } from "../../shared/schema/declarations/EntityDecl.js";
+import { isSerializedEnumDecl } from "../../shared/schema/declarations/EnumDecl.js";
+import { isSerializedTypeAliasDecl } from "../../shared/schema/declarations/TypeAliasDecl.js";
 import { getAllDeclarations } from "../api/declarations.js";
 import { useSetting } from "./useSettings.js";
 export const useGetDeclFromDeclName = () => {
@@ -9,9 +12,9 @@ export const useGetDeclFromDeclName = () => {
             .then(data => {
             setSecondaryDeclarations(data.declarations
                 .map(decl => decl.declaration)
-                .filter((decl) => decl.kind === "EnumDecl" ||
-                decl.kind === "TypeAliasDecl" ||
-                decl.parentReferenceKey !== undefined));
+                .filter(decl => isSerializedEnumDecl(decl) ||
+                isSerializedTypeAliasDecl(decl) ||
+                isSerializedEntityDeclWithParentReference(decl)));
         })
             .catch((error) => {
             if (error instanceof Error) {

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

@@ -9,7 +9,6 @@ const defaultSettingsFromConfig = (config) => ({
     displayedLocales: config.defaultLocales.length > 0 ? config.defaultLocales : defaultSettings.displayedLocales,
 });
 export const useSettings = (config) => {
-    console.log("useSettings");
     const [settings, setSettings] = useState(() => Object.fromEntries(Object.entries(defaultSettingsFromConfig(config)).map(([key, initialValue]) => {
         const item = localStorage.getItem(key);
         if (item) {

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

@@ -13,27 +13,28 @@ const titleBuilder = ({ entity }) => {
 };
 const onSubmit = async ({ locales, entity, buttonName, instanceContent, isLocaleEntity, customId, childInstances, setInstanceContent, setCustomId, route, getDeclFromDeclName, }) => {
     try {
-        const createdInstance = await createInstanceByEntityNameAndId(locales, entity.name, {
-            childInstances,
-            entityName: entity.name,
-            content: instanceContent,
-            id: undefined,
-        }, isLocaleEntity ? customId : undefined);
-        switch (buttonName) {
-            case "saveandcontinue": {
-                route(`/entities/${entity.name}/instances/${createdInstance.instance.id}`);
-                break;
-            }
-            case "saveandaddanother": {
-                setInstanceContent(createTypeSkeleton(getDeclFromDeclName, entity.type));
-                setCustomId("");
-                alert(`Instance of entity ${entity.name} created successfully with identifier ${createdInstance.instance.id}. You can add another instance now.`);
-                break;
-            }
-            case "save":
-            default: {
-                route(`/entities/${entity.name}?created=${encodeURIComponent(createdInstance.instance.id)}`);
-                break;
+        if (buttonName) {
+            const createdInstance = await createInstanceByEntityNameAndId(locales, entity.name, {
+                childInstances,
+                entityName: entity.name,
+                content: instanceContent,
+                id: undefined,
+            }, isLocaleEntity ? customId : undefined);
+            switch (buttonName) {
+                case "saveandcontinue": {
+                    route(`/entities/${entity.name}/instances/${createdInstance.instance.id}`);
+                    break;
+                }
+                case "saveandaddanother": {
+                    setInstanceContent(createTypeSkeleton(getDeclFromDeclName, entity.type));
+                    setCustomId("");
+                    alert(`Instance of entity ${entity.name} created successfully with identifier ${createdInstance.instance.id}. You can add another instance now.`);
+                    break;
+                }
+                case "save": {
+                    route(`/entities/${entity.name}?created=${encodeURIComponent(createdInstance.instance.id)}`);
+                    break;
+                }
             }
         }
     }
@@ -43,4 +44,8 @@ const onSubmit = async ({ locales, entity, buttonName, instanceContent, isLocale
         }
     }
 };
-export const CreateInstance = () => (_jsx(InstanceRouteSkeleton, { mode: "create", init: init, titleBuilder: titleBuilder, onSubmit: onSubmit }));
+export const CreateInstance = () => (_jsx(InstanceRouteSkeleton, { mode: "create", buttons: [
+        { label: "Save", name: "save", primary: true },
+        { label: "Save and continue", name: "saveandcontinue" },
+        { label: "Save and add another", name: "saveandaddanother" },
+    ], init: init, titleBuilder: titleBuilder, onSubmit: onSubmit }));

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

@@ -21,23 +21,35 @@ const titleBuilder = ({ locales, entity, instanceId, instanceContent, }) => {
     }
     return undefined;
 };
-const onSubmit = async ({ locales, entity, instanceId, instanceContent, buttonName, childInstances, }) => {
-    if (instanceId && buttonName === "save") {
-        try {
+const onSubmit = async ({ locales, entity, instanceId, instanceContent, buttonName, childInstances, route, }) => {
+    try {
+        if (instanceId && buttonName) {
             await updateInstanceByEntityNameAndId(locales, entity.name, instanceId, {
                 childInstances,
                 entityName: entity.name,
                 content: instanceContent,
                 id: instanceId,
             });
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                alert(`Error updating instance:\n\n${error}`);
+            switch (buttonName) {
+                case "saveandcontinue": {
+                    break;
+                }
+                case "save": {
+                    route(`/entities/${entity.name}`);
+                    break;
+                }
             }
         }
     }
+    catch (error) {
+        if (error instanceof Error) {
+            alert(`Error updating instance:\n\n${error}`);
+        }
+    }
 };
 export const Instance = () => {
-    return (_jsx(InstanceRouteSkeleton, { mode: "edit", init: init, titleBuilder: titleBuilder, onSubmit: onSubmit }));
+    return (_jsx(InstanceRouteSkeleton, { mode: "edit", buttons: [
+            { label: "Save", name: "save", primary: true },
+            { label: "Save and continue", name: "saveandcontinue" },
+        ], init: init, titleBuilder: titleBuilder, onSubmit: onSubmit }));
 };

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

@@ -43,7 +43,7 @@ export const createTypeSkeleton = (getDeclFromDeclName, type) => {
             };
         }
         case "ChildEntitiesType":
-            return [];
+            return undefined;
         default:
             return assertExhaustive(type);
     }

package/package.json

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