From f4663038b6df810e8e416e2f07c3ceb113842d5c Mon Sep 17 00:00:00 2001 From: martmull Date: Wed, 12 Nov 2025 11:20:59 +0100 Subject: [PATCH] Rename sdk utils (#15769) Follow ups --- .../twenty-apps/hello-world/src/objects/postCard.ts | 2 +- packages/twenty-cli/src/utils/load-manifest.ts | 12 ++++++++---- packages/twenty-sdk/src/application/index.ts | 2 +- ...ect-metadata.decorator.ts => object.decorator.ts} | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) rename packages/twenty-sdk/src/application/object-metadata/{object-metadata.decorator.ts => object.decorator.ts} (79%) diff --git a/packages/twenty-apps/hello-world/src/objects/postCard.ts b/packages/twenty-apps/hello-world/src/objects/postCard.ts index c915c9aaa5..4ae7468261 100644 --- a/packages/twenty-apps/hello-world/src/objects/postCard.ts +++ b/packages/twenty-apps/hello-world/src/objects/postCard.ts @@ -1,7 +1,7 @@ import { BaseObject, Field, - ObjectMetadata as Object, + Object, FieldType, type FullNameField, type AddressField, diff --git a/packages/twenty-cli/src/utils/load-manifest.ts b/packages/twenty-cli/src/utils/load-manifest.ts index c12a307f16..e15bd34a23 100644 --- a/packages/twenty-cli/src/utils/load-manifest.ts +++ b/packages/twenty-cli/src/utils/load-manifest.ts @@ -171,8 +171,10 @@ const collectObjects = (program: Program) => { const visit = (node: Node) => { if (isClassDeclaration(node) && getDecorators(node)?.length) { const decorators = getDecorators(node); - const objectDec = decorators?.find((d) => - isDecoratorNamed(d, 'ObjectMetadata'), + const objectDec = decorators?.find( + (d) => + isDecoratorNamed(d, 'ObjectMetadata') || + isDecoratorNamed(d, 'Object'), ); if (objectDec) { const cfg = getFirstArgObject(objectDec); @@ -184,8 +186,10 @@ const collectObjects = (program: Program) => { continue; } - const fieldDec = getDecorators(member)?.find((d) => - isDecoratorNamed(d, 'FieldMetadata'), + const fieldDec = getDecorators(member)?.find( + (d) => + isDecoratorNamed(d, 'FieldMetadata') || + isDecoratorNamed(d, 'Field'), ); if (!fieldDec) { diff --git a/packages/twenty-sdk/src/application/index.ts b/packages/twenty-sdk/src/application/index.ts index 765663d97a..eef8610eb6 100644 --- a/packages/twenty-sdk/src/application/index.ts +++ b/packages/twenty-sdk/src/application/index.ts @@ -21,6 +21,6 @@ export { export { FieldType } from './field-metadata/field-type'; export { Field } from './field-metadata/field.decorator'; export { BaseObject } from './object-metadata/base-object'; -export { ObjectMetadata } from './object-metadata/object-metadata.decorator'; +export { Object } from './object-metadata/object.decorator'; export type { ServerlessFunctionConfig } from './serverless-function-config'; export type { SyncableEntityOptions } from './syncable-entity-options.type'; diff --git a/packages/twenty-sdk/src/application/object-metadata/object-metadata.decorator.ts b/packages/twenty-sdk/src/application/object-metadata/object.decorator.ts similarity index 79% rename from packages/twenty-sdk/src/application/object-metadata/object-metadata.decorator.ts rename to packages/twenty-sdk/src/application/object-metadata/object.decorator.ts index f066a96761..1b6d2d1ef2 100644 --- a/packages/twenty-sdk/src/application/object-metadata/object-metadata.decorator.ts +++ b/packages/twenty-sdk/src/application/object-metadata/object.decorator.ts @@ -9,6 +9,6 @@ type ObjectMetadataOptions = SyncableEntityOptions & { icon?: string; }; -export const ObjectMetadata = (_: ObjectMetadataOptions): ClassDecorator => { +export const Object = (_: ObjectMetadataOptions): ClassDecorator => { return () => {}; };