tsondb 0.7.0 → 0.7.1

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

@@ -1,7 +1,6 @@
-import type { DisplayNameResult } from "../../../shared/utils/displayName.ts";
 import { Lazy } from "../../../shared/utils/lazy.ts";
 import type { Leaves } from "../../../shared/utils/object.ts";
-import type { GetChildInstancesForInstanceId } from "../../utils/displayName.ts";
+import type { DisplayNameCustomizer } from "../../utils/displayName.ts";
 import type { GetNestedDeclarations, GetReferences, Predicate, Serializer, TypeArgumentsResolver, Validator } from "../Node.ts";
 import { NodeKind } from "../Node.ts";
 import type { MemberDecl, ObjectType } from "../types/generic/ObjectType.ts";
@@ -13,15 +12,6 @@ export type GenericEntityDisplayName = string | {
     pathToLocaleMap?: string;
     pathInLocaleMap?: string;
 } | null;
-export type DisplayNameFn<T extends ObjectType = ObjectType> = (params: {
-    instance: AsType<T>;
-    instanceDisplayName: string;
-    instanceDisplayNameLocaleId: string | undefined;
-    locales: string[];
-    getInstanceById: (id: string) => unknown;
-    getDisplayNameForInstanceId: (id: string) => string | undefined;
-    getChildInstancesForInstanceId: GetChildInstancesForInstanceId;
-}) => DisplayNameResult;
 export type EntityDisplayName<T extends TConstraint> = Leaves<AsType<ObjectType<T>>> | {
     /**
      * @default "translations"
@@ -42,7 +32,7 @@ export interface EntityDecl<Name extends string = string, T extends TConstraint
      * @default "name"
      */
     displayName?: EntityDisplayName<T>;
-    displayNameCustomizer?: DisplayNameFn<ObjectType<T>>;
+    displayNameCustomizer?: DisplayNameCustomizer<ObjectType<T>>;
     isDeprecated?: boolean;
 }
 export interface EntityDeclWithParentReference<Name extends string = string, T extends TConstraint = TConstraint, FK extends keyof T & string = keyof T & string> extends EntityDecl<Name, T, FK> {
@@ -57,7 +47,7 @@ export declare const EntityDecl: {
          * @default "name"
          */
         displayName?: EntityDisplayName<T>;
-        displayNameCustomizer?: DisplayNameFn<ObjectType<T>>;
+        displayNameCustomizer?: DisplayNameCustomizer<ObjectType<T>>;
         isDeprecated?: boolean;
     }): EntityDecl<Name, T, undefined>;
     <Name extends string, T extends TConstraint, FK extends keyof T & string>(sourceUrl: string, options: {
@@ -70,7 +60,7 @@ export declare const EntityDecl: {
          * @default "name"
          */
         displayName?: EntityDisplayName<T>;
-        displayNameCustomizer?: DisplayNameFn<ObjectType<T>>;
+        displayNameCustomizer?: DisplayNameCustomizer<ObjectType<T>>;
         isDeprecated?: boolean;
     }): EntityDecl<Name, T, FK>;
 };

package/dist/src/node/server/api/instances.js

@@ -18,7 +18,7 @@ instancesApi.get("/", (req, res) => {
             instances.map(instance => {
                 const { name, localeId } = getDisplayNameFromEntityInstance(
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                req.entitiesByName[entityName], instance.content, req.getInstanceById, getChildInstancesForInstanceId, req.locales);
+                req.entitiesByName[entityName], instance, req.getInstanceById, getChildInstancesForInstanceId, req.locales);
                 return {
                     id: instance.id,
                     name,

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

@@ -1,5 +1,17 @@
-import { type EntityDecl } from "../../node/schema/index.ts";
 import type { GetInstanceById } from "../../node/server/index.ts";
 import { type DisplayNameResult } from "../../shared/utils/displayName.ts";
+import type { InstanceContainer } from "../../shared/utils/instances.ts";
+import { type EntityDecl } from "../schema/declarations/EntityDecl.ts";
+import type { AsType, Type } from "../schema/types/Type.ts";
 export type GetChildInstancesForInstanceId = (parentEntityName: string, parentId: string, childEntityName: string) => unknown[];
-export declare const getDisplayNameFromEntityInstance: (entity: EntityDecl, instance: unknown, getInstanceById: GetInstanceById, getChildInstancesForInstanceId: GetChildInstancesForInstanceId, locales: string[], defaultName?: string, useCustomizer?: boolean) => DisplayNameResult;
+export type DisplayNameCustomizer<T extends Type> = (params: {
+    instance: AsType<T>;
+    instanceId: string;
+    instanceDisplayName: string;
+    instanceDisplayNameLocaleId: string | undefined;
+    locales: string[];
+    getInstanceById: (id: string) => unknown;
+    getDisplayNameForInstanceId: (id: string) => string | undefined;
+    getChildInstancesForInstanceId: GetChildInstancesForInstanceId;
+}) => DisplayNameResult;
+export declare const getDisplayNameFromEntityInstance: (entity: EntityDecl, instanceContainer: InstanceContainer, getInstanceById: GetInstanceById, getChildInstancesForInstanceId: GetChildInstancesForInstanceId, locales: string[], defaultName?: string, useCustomizer?: boolean) => DisplayNameResult;

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

@@ -1,10 +1,11 @@
-import { serializeEntityDecl } from "../../node/schema/index.js";
 import { getSerializedDisplayNameFromEntityInstance, } from "../../shared/utils/displayName.js";
-export const getDisplayNameFromEntityInstance = (entity, instance, getInstanceById, getChildInstancesForInstanceId, locales, defaultName = "", useCustomizer = true) => {
+import { serializeEntityDecl } from "../schema/declarations/EntityDecl.js";
+export const getDisplayNameFromEntityInstance = (entity, instanceContainer, getInstanceById, getChildInstancesForInstanceId, locales, defaultName = "", useCustomizer = true) => {
     if (useCustomizer && entity.displayNameCustomizer) {
-        const calculatedName = getDisplayNameFromEntityInstance(entity, instance, getInstanceById, getChildInstancesForInstanceId, locales, defaultName, false);
+        const calculatedName = getDisplayNameFromEntityInstance(entity, instanceContainer, getInstanceById, getChildInstancesForInstanceId, locales, defaultName, false);
         return entity.displayNameCustomizer({
-            instance: instance,
+            instance: instanceContainer.content,
+            instanceId: instanceContainer.id,
             instanceDisplayName: calculatedName.name,
             instanceDisplayNameLocaleId: calculatedName.localeId,
             locales,
@@ -13,7 +14,7 @@ export const getDisplayNameFromEntityInstance = (entity, instance, getInstanceBy
                 const result = getInstanceById(id);
                 if (result) {
                     const { entity, instance } = result;
-                    return getDisplayNameFromEntityInstance(entity, instance.content, getInstanceById, getChildInstancesForInstanceId, locales, id).name;
+                    return getDisplayNameFromEntityInstance(entity, instance, getInstanceById, getChildInstancesForInstanceId, locales, id).name;
                 }
                 else {
                     return undefined;
@@ -23,6 +24,6 @@ export const getDisplayNameFromEntityInstance = (entity, instance, getInstanceBy
         });
     }
     else {
-        return getSerializedDisplayNameFromEntityInstance(serializeEntityDecl(entity), instance, defaultName, locales);
+        return getSerializedDisplayNameFromEntityInstance(serializeEntityDecl(entity), instanceContainer.content, defaultName, locales);
     }
 };

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

@@ -1,7 +1,7 @@
 import { getDisplayNameFromEntityInstance, } from "../../node/utils/displayName.js";
 export const getInstanceContainerOverview = (entity, instanceContainer, getInstanceById, getChildInstancesForInstanceId, locales) => {
     const { content: _, ...rest } = instanceContainer;
-    const { name: displayName, localeId: displayNameLocaleId } = getDisplayNameFromEntityInstance(entity, instanceContainer.content, getInstanceById, getChildInstancesForInstanceId, locales);
+    const { name: displayName, localeId: displayNameLocaleId } = getDisplayNameFromEntityInstance(entity, instanceContainer, getInstanceById, getChildInstancesForInstanceId, locales);
     return {
         ...rest,
         displayName,

package/package.json

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