tsondb 0.3.0 → 0.5.0

package/lib/{schema → node/schema}/declarations/EnumDecl.js

@@ -1,19 +1,16 @@
-import { Lazy } from "../../utils/lazy.js";
+import { Lazy } from "../../../shared/utils/lazy.js";
 import { NodeKind } from "../Node.js";
-import { serializeTypeParameter, } from "../parameters/TypeParameter.js";
+import { serializeTypeParameter } from "../TypeParameter.js";
 import { EnumType, getNestedDeclarationsInEnumType, getReferencesForEnumType, resolveTypeArgumentsInEnumType, serializeEnumType, validateEnumType, } from "../types/generic/EnumType.js";
-import { getTypeArgumentsRecord, validateDeclName, } from "./Declaration.js";
+import { setParent } from "../types/Type.js";
+import { getTypeArgumentsRecord, validateDeclName } from "./Declaration.js";
 export const GenEnumDecl = (sourceUrl, options) => {
     validateDeclName(options.name);
     const decl = {
         ...options,
         kind: NodeKind.EnumDecl,
         sourceUrl,
-        type: Lazy.of(() => {
-            const type = EnumType(options.values(...options.parameters));
-            type.parent = decl;
-            return type;
-        }),
+        type: Lazy.of(() => setParent(EnumType(options.values(...options.parameters)), decl)),
     };
     return decl;
 };
@@ -25,11 +22,7 @@ export const EnumDecl = (sourceUrl, options) => {
         kind: NodeKind.EnumDecl,
         sourceUrl,
         parameters: [],
-        type: Lazy.of(() => {
-            const type = EnumType(options.values());
-            type.parent = decl;
-            return type;
-        }),
+        type: Lazy.of(() => setParent(EnumType(options.values()), decl)),
     };
     return decl;
 };

package/lib/{schema → node/schema}/declarations/TypeAliasDecl.d.ts

@@ -1,9 +1,10 @@
-import { Lazy } from "../../utils/lazy.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../Node.js";
-import { SerializedTypeParameter, TypeParameter } from "../parameters/TypeParameter.js";
-import { SerializedType, Type } from "../types/Type.js";
-import { ValidatorHelpers } from "../validation/type.js";
-import { BaseDecl, GetNestedDeclarations, SerializedBaseDecl, TypeArguments } from "./Declaration.js";
+import { Lazy } from "../../../shared/utils/lazy.js";
+import type { GetReferences, Node, Serializer } from "../Node.js";
+import { NodeKind } from "../Node.js";
+import type { SerializedTypeParameter, TypeParameter } from "../TypeParameter.js";
+import type { SerializedType, Type } from "../types/Type.js";
+import type { ValidatorHelpers } from "../validation/type.js";
+import type { BaseDecl, GetNestedDeclarations, SerializedBaseDecl, TypeArguments } from "./Declaration.js";
 export interface TypeAliasDecl<Name extends string = string, T extends Type = Type, Params extends TypeParameter[] = TypeParameter[]> extends BaseDecl<Name, Params> {
     kind: NodeKind["TypeAliasDecl"];
     type: Lazy<T>;
@@ -29,7 +30,7 @@ export declare const TypeAliasDecl: <Name extends string, T extends Type>(source
     type: () => T;
 }) => TypeAliasDecl<Name, T, []>;
 export { TypeAliasDecl as TypeAlias };
-export declare const isTypeAliasDecl: (node: Node) => node is TypeAliasDecl<string, Type, TypeParameter[]>;
+export declare const isTypeAliasDecl: (node: Node) => node is TypeAliasDecl;
 export declare const getNestedDeclarationsInTypeAliasDecl: GetNestedDeclarations<TypeAliasDecl>;
 export declare const validateTypeAliasDecl: <Params extends TypeParameter[]>(helpers: ValidatorHelpers, decl: TypeAliasDecl<string, Type, Params>, args: TypeArguments<Params>, value: unknown) => Error[];
 export declare const resolveTypeArgumentsInTypeAliasDecl: <Params extends TypeParameter[]>(decl: TypeAliasDecl<string, Type, Params>, args: TypeArguments<Params>) => TypeAliasDecl<string, Type, []>;

package/lib/{schema → node/schema}/declarations/TypeAliasDecl.js

@@ -1,19 +1,15 @@
-import { Lazy } from "../../utils/lazy.js";
+import { Lazy } from "../../../shared/utils/lazy.js";
 import { NodeKind } from "../Node.js";
-import { serializeTypeParameter, } from "../parameters/TypeParameter.js";
-import { getReferencesForType, resolveTypeArgumentsInType, serializeType, validate, } from "../types/Type.js";
-import { getNestedDeclarations, getTypeArgumentsRecord, validateDeclName, } from "./Declaration.js";
+import { serializeTypeParameter } from "../TypeParameter.js";
+import { getReferencesForType, resolveTypeArgumentsInType, serializeType, setParent, validate, } from "../types/Type.js";
+import { getNestedDeclarations, getTypeArgumentsRecord, validateDeclName } from "./Declaration.js";
 export const GenTypeAliasDecl = (sourceUrl, options) => {
     validateDeclName(options.name);
     const decl = {
         ...options,
         kind: NodeKind.TypeAliasDecl,
         sourceUrl,
-        type: Lazy.of(() => {
-            const type = options.type(...options.parameters);
-            type.parent = decl;
-            return type;
-        }),
+        type: Lazy.of(() => setParent(options.type(...options.parameters), decl)),
     };
     return decl;
 };
@@ -25,11 +21,7 @@ export const TypeAliasDecl = (sourceUrl, options) => {
         kind: NodeKind.TypeAliasDecl,
         sourceUrl,
         parameters: [],
-        type: Lazy.of(() => {
-            const type = options.type();
-            type.parent = decl;
-            return type;
-        }),
+        type: Lazy.of(() => setParent(options.type(), decl)),
     };
     return decl;
 };

package/lib/{schema → node/schema}/index.d.ts

@@ -3,19 +3,19 @@ export * from "./declarations/EntityDecl.js";
 export * from "./declarations/EnumDecl.js";
 export * from "./declarations/TypeAliasDecl.js";
 export * from "./Node.js";
-export * from "./parameters/TypeParameter.js";
+export * from "./TypeParameter.js";
 export * from "./types/generic/ArrayType.js";
-export { EnumCase } from "./types/generic/EnumType.js";
+export * from "./types/generic/EnumType.js";
 export * from "./types/generic/ObjectType.js";
 export * from "./types/primitives/BooleanType.js";
 export * from "./types/primitives/DateType.js";
 export * from "./types/primitives/FloatType.js";
 export * from "./types/primitives/IntegerType.js";
 export * from "./types/primitives/NumericType.js";
-export * from "./types/primitives/PrimitiveType.js";
+export type * from "./types/primitives/PrimitiveType.js";
 export * from "./types/primitives/StringType.js";
-export * from "./types/references/GenericArgumentIdentifierType.js";
 export * from "./types/references/IncludeIdentifierType.js";
 export * from "./types/references/NestedEntityMapType.js";
 export * from "./types/references/ReferenceIdentifierType.js";
+export * from "./types/references/TypeArgumentType.js";
 export * from "./types/Type.js";

package/lib/{schema → node/schema}/index.js

@@ -3,19 +3,18 @@ export * from "./declarations/EntityDecl.js";
 export * from "./declarations/EnumDecl.js";
 export * from "./declarations/TypeAliasDecl.js";
 export * from "./Node.js";
-export * from "./parameters/TypeParameter.js";
+export * from "./TypeParameter.js";
 export * from "./types/generic/ArrayType.js";
-export { EnumCase } from "./types/generic/EnumType.js";
+export * from "./types/generic/EnumType.js";
 export * from "./types/generic/ObjectType.js";
 export * from "./types/primitives/BooleanType.js";
 export * from "./types/primitives/DateType.js";
 export * from "./types/primitives/FloatType.js";
 export * from "./types/primitives/IntegerType.js";
 export * from "./types/primitives/NumericType.js";
-export * from "./types/primitives/PrimitiveType.js";
 export * from "./types/primitives/StringType.js";
-export * from "./types/references/GenericArgumentIdentifierType.js";
 export * from "./types/references/IncludeIdentifierType.js";
 export * from "./types/references/NestedEntityMapType.js";
 export * from "./types/references/ReferenceIdentifierType.js";
+export * from "./types/references/TypeArgumentType.js";
 export * from "./types/Type.js";

package/lib/node/schema/types/Type.d.ts

@@ -0,0 +1,54 @@
+import type { Decl } from "../declarations/Declaration.js";
+import type { BaseNode, GetReferences, Serializer } from "../Node.js";
+import type { Validator } from "../validation/type.js";
+import type { ArrayType, SerializedArrayType } from "./generic/ArrayType.js";
+import type { EnumType, SerializedEnumType } from "./generic/EnumType.js";
+import type { MemberDecl, ObjectType, SerializedMemberDecl, SerializedObjectType } from "./generic/ObjectType.js";
+import type { BooleanType, SerializedBooleanType } from "./primitives/BooleanType.js";
+import type { DateType, SerializedDateType } from "./primitives/DateType.js";
+import type { FloatType, SerializedFloatType } from "./primitives/FloatType.js";
+import type { IntegerType, SerializedIntegerType } from "./primitives/IntegerType.js";
+import type { PrimitiveType, SerializedPrimitiveType } from "./primitives/PrimitiveType.js";
+import type { SerializedStringType, StringType } from "./primitives/StringType.js";
+import type { IncludeIdentifierType, SerializedIncludeIdentifierType } from "./references/IncludeIdentifierType.js";
+import type { NestedEntityMapType, SerializedNestedEntityMapType } from "./references/NestedEntityMapType.js";
+import type { ReferenceIdentifierType, SerializedReferenceIdentifierType } from "./references/ReferenceIdentifierType.js";
+import type { SerializedTypeArgumentType, TypeArgumentType } from "./references/TypeArgumentType.js";
+export interface BaseType extends BaseNode {
+    /**
+     * The parent node of this type will be set when the type is used in a declaration or nested in another type.
+     */
+    parent?: Type | Decl;
+}
+export interface SerializedBaseType extends BaseNode {
+}
+export type Type = PrimitiveType | ArrayType | ObjectType | TypeArgumentType | ReferenceIdentifierType | IncludeIdentifierType | NestedEntityMapType | EnumType;
+export type SerializedType = SerializedPrimitiveType | SerializedArrayType | SerializedObjectType | SerializedTypeArgumentType | SerializedReferenceIdentifierType | SerializedIncludeIdentifierType | SerializedNestedEntityMapType | SerializedEnumType;
+export declare const validate: Validator<Type>;
+export declare const resolveTypeArgumentsInType: (args: Record<string, Type>, type: Type) => Type;
+export declare function walkTypeNodeTree(callbackFn: (type: Type) => void, type: Type): void;
+export type AsType<T extends Type> = T extends ArrayType<infer I> ? AsType<I>[] : T extends ObjectType<infer P> ? {
+    [K in keyof P]: P[K] extends MemberDecl<Type, true> ? AsType<P[K]["type"]> : AsType<P[K]["type"]> | undefined;
+} : T extends BooleanType ? boolean : T extends DateType ? Date : T extends FloatType ? number : T extends IntegerType ? number : T extends StringType ? string : T extends TypeArgumentType ? unknown : T extends IncludeIdentifierType ? unknown : T extends NestedEntityMapType ? unknown : T extends ReferenceIdentifierType ? unknown : never;
+export type SerializedAsType<T extends SerializedType> = T extends SerializedArrayType<infer I> ? SerializedAsType<I>[] : T extends SerializedObjectType<infer P> ? {
+    [K in keyof P]: P[K] extends SerializedMemberDecl<SerializedType, true> ? SerializedAsType<P[K]["type"]> : SerializedAsType<P[K]["type"]> | undefined;
+} : T extends SerializedBooleanType ? boolean : T extends SerializedDateType ? Date : T extends SerializedFloatType ? number : T extends SerializedIntegerType ? number : T extends SerializedStringType ? string : T extends SerializedTypeArgumentType ? unknown : T extends SerializedIncludeIdentifierType ? unknown : T extends SerializedNestedEntityMapType ? unknown : T extends SerializedReferenceIdentifierType ? unknown : never;
+export type AsNode<T> = T extends (infer I)[] ? ArrayType<AsNode<I>> : T extends Record<string, unknown> ? ObjectType<{
+    [K in keyof T]: T[K] extends MemberDecl ? T[K] : T extends null | undefined ? MemberDecl<AsNode<NonNullable<T[K]>>, false> : MemberDecl<AsNode<T[K]>, true>;
+}> : T extends string ? StringType : T extends number ? FloatType : T extends boolean ? BooleanType : never;
+export declare const getParentDecl: (type: Type) => Decl | undefined;
+/**
+ * Sets the `parent` property of the passed `type` to the passed `parentNode`.
+ *
+ * The property is set on the instance. It does not create a new instance.
+ */
+export declare const setParent: <T extends BaseType>(type: Omit<T, "parent">, parentNode: Type | Decl) => T;
+export declare const removeParentKey: <T extends BaseType>(type: T) => Omit<T, "parent">;
+export declare const findTypeAtPath: (type: Type, path: string[]) => Type | undefined;
+export declare const serializeType: Serializer<Type, SerializedType>;
+export declare const getReferencesForType: GetReferences<Type>;
+/**
+ * Format the structure of a value to always look the same when serialized as JSON.
+ */
+export type StructureFormatter<T extends Type> = (type: T, value: unknown) => unknown;
+export declare const formatValue: StructureFormatter<Type>;

package/lib/{schema → node/schema}/types/Type.js

@@ -1,4 +1,4 @@
-import { assertExhaustive } from "../../shared/utils/typeSafety.js";
+import { assertExhaustive } from "../../../shared/utils/typeSafety.js";
 import { isDecl } from "../declarations/Declaration.js";
 import { NodeKind } from "../Node.js";
 import { formatArrayValue, getReferencesForArrayType, resolveTypeArgumentsInArrayType, serializeArrayType, validateArrayType, } from "./generic/ArrayType.js";
@@ -9,10 +9,10 @@ import { formatDateValue, getReferencesForDateType, serializeDateType, validateD
 import { formatFloatValue, getReferencesForFloatType, serializeFloatType, validateFloatType, } from "./primitives/FloatType.js";
 import { formatIntegerValue, getReferencesForIntegerType, serializeIntegerType, validateIntegerType, } from "./primitives/IntegerType.js";
 import { formatStringValue, getReferencesForStringType, serializeStringType, validateStringType, } from "./primitives/StringType.js";
-import { formatGenericArgumentIdentifierValue, getReferencesForGenericArgumentIdentifierType, resolveTypeArgumentsInGenericArgumentIdentifierType, serializeGenericArgumentIdentifierType, validateGenericArgumentIdentifierType, } from "./references/GenericArgumentIdentifierType.js";
 import { formatIncludeIdentifierValue, getReferencesForIncludeIdentifierType, resolveTypeArgumentsInIncludeIdentifierType, serializeIncludeIdentifierType, validateIncludeIdentifierType, } from "./references/IncludeIdentifierType.js";
 import { formatNestedEntityMapValue, getReferencesForNestedEntityMapType, resolveTypeArgumentsInNestedEntityMapType, serializeNestedEntityMapType, validateNestedEntityMapType, } from "./references/NestedEntityMapType.js";
 import { formatReferenceIdentifierValue, getReferencesForReferenceIdentifierType, resolveTypeArgumentsInReferenceIdentifierType, serializeReferenceIdentifierType, validateReferenceIdentifierType, } from "./references/ReferenceIdentifierType.js";
+import { formatTypeArgumentValue, getReferencesForTypeArgumentType, resolveTypeArgumentsInTypeArgumentType, serializeTypeArgumentType, validateTypeArgumentType, } from "./references/TypeArgumentType.js";
 export const validate = (helpers, type, value) => {
     switch (type.kind) {
         case NodeKind.ArrayType:
@@ -29,8 +29,8 @@ export const validate = (helpers, type, value) => {
             return validateIntegerType(helpers, type, value);
         case NodeKind.StringType:
             return validateStringType(helpers, type, value);
-        case NodeKind.GenericArgumentIdentifierType:
-            return validateGenericArgumentIdentifierType(helpers, type, value);
+        case NodeKind.TypeArgumentType:
+            return validateTypeArgumentType(helpers, type, value);
         case NodeKind.ReferenceIdentifierType:
             return validateReferenceIdentifierType(helpers, type, value);
         case NodeKind.IncludeIdentifierType:
@@ -55,8 +55,8 @@ export const resolveTypeArgumentsInType = (args, type) => {
         case NodeKind.IntegerType:
         case NodeKind.StringType:
             return type;
-        case NodeKind.GenericArgumentIdentifierType:
-            return resolveTypeArgumentsInGenericArgumentIdentifierType(args, type);
+        case NodeKind.TypeArgumentType:
+            return resolveTypeArgumentsInTypeArgumentType(args, type);
         case NodeKind.ReferenceIdentifierType:
             return resolveTypeArgumentsInReferenceIdentifierType(args, type);
         case NodeKind.IncludeIdentifierType:
@@ -73,29 +73,45 @@ export function walkTypeNodeTree(callbackFn, type) {
     switch (type.kind) {
         case NodeKind.ArrayType:
             callbackFn(type);
-            return walkTypeNodeTree(callbackFn, type.items);
+            {
+                walkTypeNodeTree(callbackFn, type.items);
+                return;
+            }
         case NodeKind.ObjectType:
             callbackFn(type);
-            return Object.values(type.properties).forEach(prop => walkTypeNodeTree(callbackFn, prop.type));
+            {
+                Object.values(type.properties).forEach(prop => {
+                    walkTypeNodeTree(callbackFn, prop.type);
+                });
+                return;
+            }
         case NodeKind.NestedEntityMapType:
             callbackFn(type);
-            return walkTypeNodeTree(callbackFn, type.type.value);
+            {
+                walkTypeNodeTree(callbackFn, type.type.value);
+                return;
+            }
         case NodeKind.BooleanType:
         case NodeKind.DateType:
         case NodeKind.FloatType:
         case NodeKind.IntegerType:
         case NodeKind.StringType:
-        case NodeKind.GenericArgumentIdentifierType:
+        case NodeKind.TypeArgumentType:
         case NodeKind.ReferenceIdentifierType:
-        case NodeKind.IncludeIdentifierType:
-            return callbackFn(type);
+        case NodeKind.IncludeIdentifierType: {
+            callbackFn(type);
+            return;
+        }
         case NodeKind.EnumType:
             callbackFn(type);
-            return Object.values(type.values).forEach(value => {
-                if (value.type) {
-                    walkTypeNodeTree(callbackFn, value.type);
-                }
-            });
+            {
+                Object.values(type.values).forEach(value => {
+                    if (value.type) {
+                        walkTypeNodeTree(callbackFn, value.type);
+                    }
+                });
+                return;
+            }
         default:
             return assertExhaustive(type);
     }
@@ -111,11 +127,25 @@ export const getParentDecl = (type) => {
         return getParentDecl(type.parent);
     }
 };
+/**
+ * Sets the `parent` property of the passed `type` to the passed `parentNode`.
+ *
+ * The property is set on the instance. It does not create a new instance.
+ */
+export const setParent = (type, parentNode) => {
+    ;
+    type.parent = parentNode;
+    return type;
+};
+export const removeParentKey = (type) => {
+    const { parent: _parent, ...rest } = type;
+    return rest;
+};
 export const findTypeAtPath = (type, path) => {
-    if (path.length === 0) {
+    const [head, ...tail] = path;
+    if (head === undefined) {
         return type;
     }
-    const [head, ...tail] = path;
     if (type.kind === NodeKind.ObjectType) {
         const prop = type.properties[head];
         if (prop) {
@@ -143,8 +173,8 @@ export const serializeType = type => {
             return serializeIntegerType(type);
         case NodeKind.StringType:
             return serializeStringType(type);
-        case NodeKind.GenericArgumentIdentifierType:
-            return serializeGenericArgumentIdentifierType(type);
+        case NodeKind.TypeArgumentType:
+            return serializeTypeArgumentType(type);
         case NodeKind.ReferenceIdentifierType:
             return serializeReferenceIdentifierType(type);
         case NodeKind.IncludeIdentifierType:
@@ -157,10 +187,6 @@ export const serializeType = type => {
             return assertExhaustive(type);
     }
 };
-export const removeParentKey = (type) => {
-    const { parent: _parent, ...rest } = type;
-    return rest;
-};
 export const getReferencesForType = (type, value) => {
     switch (type.kind) {
         case NodeKind.ArrayType:
@@ -177,8 +203,8 @@ export const getReferencesForType = (type, value) => {
             return getReferencesForIntegerType(type, value);
         case NodeKind.StringType:
             return getReferencesForStringType(type, value);
-        case NodeKind.GenericArgumentIdentifierType:
-            return getReferencesForGenericArgumentIdentifierType(type, value);
+        case NodeKind.TypeArgumentType:
+            return getReferencesForTypeArgumentType(type, value);
         case NodeKind.ReferenceIdentifierType:
             return getReferencesForReferenceIdentifierType(type, value);
         case NodeKind.IncludeIdentifierType:
@@ -207,8 +233,8 @@ export const formatValue = (type, value) => {
             return formatIntegerValue(type, value);
         case NodeKind.StringType:
             return formatStringValue(type, value);
-        case NodeKind.GenericArgumentIdentifierType:
-            return formatGenericArgumentIdentifierValue(type, value);
+        case NodeKind.TypeArgumentType:
+            return formatTypeArgumentValue(type, value);
         case NodeKind.IncludeIdentifierType:
             return formatIncludeIdentifierValue(type, value);
         case NodeKind.NestedEntityMapType:

package/lib/{schema → node/schema}/types/generic/ArrayType.d.ts

@@ -1,7 +1,8 @@
-import { GetNestedDeclarations } from "../../declarations/Declaration.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, SerializedType, StructureFormatter, Type } from "../Type.js";
+import type { GetNestedDeclarations } from "../../declarations/Declaration.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, SerializedType, StructureFormatter, Type } from "../Type.js";
 export interface ArrayType<T extends Type = Type> extends BaseType {
     kind: NodeKind["ArrayType"];
     minItems?: number;

package/lib/{schema → node/schema}/types/generic/ArrayType.js

@@ -1,10 +1,10 @@
-import { parallelizeErrors } from "../../../shared/utils/validation.js";
-import { validateArrayConstraints } from "../../../shared/validation/array.js";
+import { parallelizeErrors } from "../../../../shared/utils/validation.js";
+import { validateArrayConstraints } from "../../../../shared/validation/array.js";
 import { wrapErrorsIfAny } from "../../../utils/error.js";
 import { getNestedDeclarations } from "../../declarations/Declaration.js";
 import { NodeKind } from "../../Node.js";
 import { validateOption } from "../../validation/options.js";
-import { formatValue, getReferencesForType, removeParentKey, resolveTypeArgumentsInType, serializeType, validate, } from "../Type.js";
+import { formatValue, getReferencesForType, removeParentKey, resolveTypeArgumentsInType, serializeType, setParent, validate, } from "../Type.js";
 export const ArrayType = (items, options = {}) => {
     const type = {
         ...options,
@@ -13,7 +13,7 @@ export const ArrayType = (items, options = {}) => {
         maxItems: validateOption(options.maxItems, "maxItems", option => Number.isInteger(option) && option >= 0),
         items,
     };
-    items.parent = type;
+    setParent(type.items, type);
     return type;
 };
 export { ArrayType as Array };
@@ -25,7 +25,7 @@ export const validateArrayType = (helpers, type, value) => {
     }
     return parallelizeErrors([
         ...validateArrayConstraints(type, value),
-        ...value.map((item, index) => wrapErrorsIfAny(`at index ${index}`, validate(helpers, type.items, item))),
+        ...value.map((item, index) => wrapErrorsIfAny(`at index ${index.toString()}`, validate(helpers, type.items, item))),
     ]);
 };
 export const resolveTypeArgumentsInArrayType = (args, type) => ArrayType(resolveTypeArgumentsInType(args, type.items), {

package/lib/{schema → node/schema}/types/generic/EnumType.d.ts

@@ -1,7 +1,8 @@
-import { GetNestedDeclarations } from "../../declarations/Declaration.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, SerializedType, StructureFormatter, Type } from "../Type.js";
+import type { GetNestedDeclarations } from "../../declarations/Declaration.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, SerializedType, StructureFormatter, Type } from "../Type.js";
 export interface EnumType<T extends Record<string, EnumCaseDecl> = Record<string, EnumCaseDecl>> extends BaseType {
     kind: NodeKind["EnumType"];
     values: T;

package/lib/{schema → node/schema}/types/generic/EnumType.js

@@ -1,4 +1,4 @@
-import { discriminatorKey } from "../../../shared/enum.js";
+import { discriminatorKey } from "../../../../shared/enum.js";
 import { getNestedDeclarations } from "../../declarations/Declaration.js";
 import { NodeKind } from "../../Node.js";
 import { formatValue, getReferencesForType, removeParentKey, resolveTypeArgumentsInType, serializeType, validate, } from "../Type.js";
@@ -27,11 +27,15 @@ export const validateEnumType = (helpers, type, value) => {
     }
     const caseName = value[discriminatorKey];
     if (!(caseName in type.values)) {
-        return [TypeError(`discriminator "${caseName}" is not a valid enum case`)];
+        return [
+            TypeError(`discriminator "${caseName}" is not a valid enum case, possible cases are: ${Object.keys(type.values).join(", ")}`),
+        ];
     }
     const unknownKeyErrors = actualKeys.flatMap(actualKey => actualKey === discriminatorKey || actualKey in type.values
         ? []
-        : [TypeError(`key "${actualKey}" is not the discriminator key or a valid enum case`)]);
+        : [
+            TypeError(`key "${actualKey}" is not the discriminator key "${caseName}" or a valid enum case, possible cases are: ${Object.keys(type.values).join(", ")}`),
+        ]);
     if (unknownKeyErrors.length > 0) {
         return unknownKeyErrors;
     }
@@ -74,7 +78,9 @@ export const getReferencesForEnumType = (type, value) => typeof value === "objec
     value[discriminatorKey] in type.values &&
     type.values[value[discriminatorKey]]?.type == null &&
     value[discriminatorKey] in value
-    ? getReferencesForType(type.values[value[discriminatorKey]].type, value[value[discriminatorKey]])
+    ? getReferencesForType(
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    type.values[value[discriminatorKey]].type, value[value[discriminatorKey]])
     : [];
 export const formatEnumType = (type, value) => {
     if (typeof value === "object" &&

package/lib/{schema → node/schema}/types/generic/ObjectType.d.ts

@@ -1,14 +1,15 @@
-import { ObjectConstraints } from "../../../shared/validation/object.js";
-import { GetNestedDeclarations } from "../../declarations/Declaration.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, SerializedType, StructureFormatter, Type } from "../Type.js";
-type TConstraint = Record<string, MemberDecl<Type, boolean>>;
+import type { ObjectConstraints } from "../../../../shared/validation/object.js";
+import type { GetNestedDeclarations } from "../../declarations/Declaration.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, SerializedType, StructureFormatter, Type } from "../Type.js";
+type TConstraint = Record<string, MemberDecl>;
 export interface ObjectType<T extends TConstraint = TConstraint> extends BaseType, ObjectConstraints {
     kind: NodeKind["ObjectType"];
     properties: T;
 }
-type TSerializedConstraint = Record<string, SerializedMemberDecl<SerializedType, boolean>>;
+type TSerializedConstraint = Record<string, SerializedMemberDecl>;
 export interface SerializedObjectType<T extends TSerializedConstraint = TSerializedConstraint> extends SerializedBaseType, ObjectConstraints {
     kind: NodeKind["ObjectType"];
     properties: T;

package/lib/{schema → node/schema}/types/generic/ObjectType.js

@@ -1,11 +1,11 @@
-import { sortObjectKeys } from "../../../shared/utils/object.js";
-import { parallelizeErrors } from "../../../shared/utils/validation.js";
-import { validateObjectConstraints } from "../../../shared/validation/object.js";
+import { sortObjectKeys } from "../../../../shared/utils/object.js";
+import { parallelizeErrors } from "../../../../shared/utils/validation.js";
+import { validateObjectConstraints } from "../../../../shared/validation/object.js";
 import { wrapErrorsIfAny } from "../../../utils/error.js";
 import { getNestedDeclarations } from "../../declarations/Declaration.js";
 import { NodeKind } from "../../Node.js";
 import { validateOption } from "../../validation/options.js";
-import { getReferencesForType, removeParentKey, resolveTypeArgumentsInType, serializeType, validate, } from "../Type.js";
+import { formatValue, getReferencesForType, removeParentKey, resolveTypeArgumentsInType, serializeType, setParent, validate, } from "../Type.js";
 const keyPattern = /^[a-zA-Z0-9][a-zA-Z0-9_]*$/;
 export const ObjectType = (properties, options = {}) => {
     const type = {
@@ -19,7 +19,8 @@ export const ObjectType = (properties, options = {}) => {
         if (!keyPattern.test(key)) {
             throw new TypeError(`Invalid object key "${key}". Object keys must not start with an underscore and may only contain letters, digits and underscores. (Pattern: ${keyPattern.source})`);
         }
-        properties[key].type.parent = type;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        setParent(properties[key].type, type);
     });
     return type;
 };
@@ -34,6 +35,7 @@ export const validateObjectType = (helpers, type, value) => {
     return parallelizeErrors([
         ...validateObjectConstraints(type, expectedKeys, value),
         ...expectedKeys.map(key => {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             const prop = type.properties[key];
             if (prop.isRequired && !(key in value)) {
                 return TypeError(`missing required property "${key}"`);
@@ -68,8 +70,13 @@ export const serializeObjectType = type => ({
     ])),
 });
 export const getReferencesForObjectType = (type, value) => typeof value === "object" && value !== null
-    ? Object.entries(value).flatMap(([key, propValue]) => key in type.properties ? getReferencesForType(type.properties[key].type, propValue) : [])
+    ? Object.entries(value).flatMap(([key, propValue]) => 
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    key in type.properties ? getReferencesForType(type.properties[key].type, propValue) : [])
     : [];
 export const formatObjectValue = (type, value) => typeof value === "object" && value !== null && !Array.isArray(value)
-    ? sortObjectKeys(value, Object.keys(type.properties))
+    ? sortObjectKeys(Object.fromEntries(Object.entries(value).map(([key, item]) => [
+        key,
+        type.properties[key] ? formatValue(type.properties[key].type, item) : item,
+    ])), Object.keys(type.properties))
     : value;

package/lib/{schema → node/schema}/types/primitives/BooleanType.d.ts

@@ -1,6 +1,7 @@
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
 export interface BooleanType extends BaseType {
     kind: NodeKind["BooleanType"];
 }

package/lib/{schema → node/schema}/types/primitives/DateType.d.ts

@@ -1,7 +1,8 @@
-import { DateConstraints } from "../../../shared/validation/date.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
+import type { DateConstraints } from "../../../../shared/validation/date.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
 export interface DateType extends BaseType, DateConstraints {
     kind: NodeKind["DateType"];
 }

package/lib/{schema → node/schema}/types/primitives/DateType.js

@@ -1,4 +1,4 @@
-import { validateDateConstraints } from "../../../shared/validation/date.js";
+import { validateDateConstraints } from "../../../../shared/validation/date.js";
 import { NodeKind } from "../../Node.js";
 import { removeParentKey } from "../Type.js";
 export const DateType = (options) => ({

package/lib/{schema → node/schema}/types/primitives/FloatType.d.ts

@@ -1,7 +1,8 @@
-import { RangeBound } from "../../../shared/validation/number.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
+import type { RangeBound } from "../../../../shared/validation/number.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
 export interface FloatType extends BaseType {
     kind: NodeKind["FloatType"];
     minimum?: RangeBound;

package/lib/{schema → node/schema}/types/primitives/FloatType.js

@@ -1,4 +1,4 @@
-import { validateNumberConstraints } from "../../../shared/validation/number.js";
+import { validateNumberConstraints } from "../../../../shared/validation/number.js";
 import { NodeKind } from "../../Node.js";
 import { removeParentKey } from "../Type.js";
 export const FloatType = (options = {}) => ({

package/lib/{schema → node/schema}/types/primitives/IntegerType.d.ts

@@ -1,7 +1,8 @@
-import { RangeBound } from "../../../shared/validation/number.js";
-import { GetReferences, Node, NodeKind, Serializer } from "../../Node.js";
-import { Validator } from "../../validation/type.js";
-import { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
+import type { RangeBound } from "../../../../shared/validation/number.js";
+import type { GetReferences, Node, Serializer } from "../../Node.js";
+import { NodeKind } from "../../Node.js";
+import type { Validator } from "../../validation/type.js";
+import type { BaseType, SerializedBaseType, StructureFormatter } from "../Type.js";
 export interface IntegerType extends BaseType {
     kind: NodeKind["IntegerType"];
     minimum?: RangeBound;

package/lib/{schema → node/schema}/types/primitives/IntegerType.js

@@ -1,4 +1,4 @@
-import { validateNumberConstraints } from "../../../shared/validation/number.js";
+import { validateNumberConstraints } from "../../../../shared/validation/number.js";
 import { NodeKind } from "../../Node.js";
 import { validateOption } from "../../validation/options.js";
 import { removeParentKey } from "../Type.js";