@travetto/schema 8.0.0-alpha.19 → 8.0.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/schema",
-  "version": "8.0.0-alpha.19",
+  "version": "8.0.0-alpha.20",
   "type": "module",
   "description": "Data type registry for runtime validation, reflection and binding.",
   "keywords": [
@@ -28,10 +28,10 @@
     "directory": "module/schema"
   },
   "dependencies": {
-    "@travetto/registry": "^8.0.0-alpha.18"
+    "@travetto/registry": "^8.0.0-alpha.19"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^8.0.0-alpha.12"
+    "@travetto/transformer": "^8.0.0-alpha.13"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/bind-util.ts

@@ -20,6 +20,16 @@ function isInstance<T>(value: unknown): value is T {
  */
 export class BindUtil {
 
+  /**
+   * Utility to make a property accessor enumerable at runtime
+   */
+  static registerAccessor(instance: any, property: string): void {
+    Object.defineProperty(instance, property, {
+      ...Object.getOwnPropertyDescriptor(Object.getPrototypeOf(instance), property),
+      enumerable: true
+    });
+  }
+
   /**
    * Coerce a value to match the field config type
    * @param config The field config to coerce to
@@ -153,6 +163,10 @@ export class BindUtil {
       const instance = classConstruct<T & { type?: string }>(resolvedCls);
 
       for (const key of TypedObject.keys(instance)) { // Do not retain undefined fields
+        const descriptor = Object.getOwnPropertyDescriptor(instance, key);
+        if (descriptor?.get) {
+          continue;
+        }
         if (instance[key] === undefined) {
           delete instance[key];
         }
@@ -244,13 +258,6 @@ export class BindUtil {
           }
 
           input[castKey<T>(schemaFieldName)] = castTo(value);
-
-          if (field.accessor) {
-            Object.defineProperty(input, schemaFieldName, {
-              ...adapter.getAccessorDescriptor(schemaFieldName),
-              enumerable: true
-            });
-          }
         }
       }
     }

package/src/service/types.ts

@@ -232,7 +232,7 @@ export interface SchemaFieldConfig extends SchemaInputConfig {
   /**
    * Is this field a getter or setter
    */
-  accessor?: string;
+  accessor?: boolean;
 }
 
 export type ViewFieldsConfig<T> = { with: Extract<(keyof T), string>[] } | { without: Extract<(keyof T), string>[] };

package/support/transformer/util.ts

@@ -14,6 +14,7 @@ export class SchemaTransformUtil {
   static INPUT_IMPORT = '@travetto/schema/src/decorator/input.ts';
   static COMMON_IMPORT = '@travetto/schema/src/decorator/common.ts';
   static TYPES_IMPORT = '@travetto/schema/src/types.ts';
+  static BIND_UTIL_IMPORT = '@travetto/schema/src/bind-util.ts';
 
   /**
    * Produce concrete type given transformer type
@@ -365,4 +366,21 @@ class ${uniqueId} extends ${type.mappedClassName} {
     const finalReturnType = SchemaTransformUtil.ensureType(state, innerReturnType ?? returnType, node);
     return finalReturnType ? [state.fromLiteral({ returnType: finalReturnType })] : [];
   }
+
+  /**
+   * Helper to create inline defineProperty statement for accessors
+   */
+  static createAccessorDefineProperty(state: TransformerState, accessorName: string): ts.Statement {
+    const bindUtilImport = state.importFile(this.BIND_UTIL_IMPORT);
+    return state.factory.createExpressionStatement(
+      state.factory.createCallExpression(
+        state.createAccess(bindUtilImport.identifier, 'BindUtil', 'registerAccessor'),
+        undefined,
+        [
+          state.factory.createThis(),
+          state.factory.createStringLiteral(accessorName)
+        ]
+      )
+    );
+  }
 }

package/support/transformer.schema.ts

@@ -6,6 +6,7 @@ const CONSTRUCTOR_PROPERTY = 'CONSTRUCTOR';
 const InSchema = Symbol();
 const IsOptIn = Symbol();
 const AccessorsSymbol = Symbol();
+const GettersSymbol = Symbol();
 const AutoEnrollMethods = Symbol();
 
 interface AutoState {
@@ -13,6 +14,7 @@ interface AutoState {
   [IsOptIn]?: boolean;
   [AutoEnrollMethods]?: Set<string>;
   [AccessorsSymbol]?: Set<string>;
+  [GettersSymbol]?: Set<string>;
 }
 
 /**
@@ -64,6 +66,7 @@ export class SchemaTransformer {
    */
   static startSchema(state: AutoState & TransformerState, node: ts.ClassDeclaration): ts.ClassDeclaration {
     state[AccessorsSymbol] = new Set();
+    state[GettersSymbol] = new Set();
     state[AutoEnrollMethods] = new Set();
     state[InSchema] = true;
 
@@ -130,9 +133,40 @@ export class SchemaTransformer {
       params = [...params, state.fromLiteral(attrs)];
     }
 
+    let newMembers = node.members;
+    const accessors = state[GettersSymbol] ? [...state[GettersSymbol]] : [];
+    if (accessors.length > 0) {
+      node = DeclarationUtil.ensureConstructor(state.factory, node);
+
+      const accessorStatements = accessors.map(accessorName =>
+        SchemaTransformUtil.createAccessorDefineProperty(state, accessorName)
+      );
+
+      const consIndex = node.members.findIndex(member => ts.isConstructorDeclaration(member));
+      const consNode = node.members[consIndex] as ts.ConstructorDeclaration;
+      const insertIndex = DeclarationUtil.getConstructorInsertIndex(consNode);
+      const newStatements = [
+        ...consNode.body?.statements.slice(0, insertIndex) ?? [],
+        ...accessorStatements,
+        ...consNode.body?.statements.slice(insertIndex) ?? []
+      ];
+      const updatedCons = state.factory.updateConstructorDeclaration(
+        consNode,
+        consNode.modifiers,
+        consNode.parameters,
+        state.factory.createBlock(newStatements, true)
+      );
+      newMembers = ts.factory.createNodeArray([
+        ...node.members.slice(0, consIndex),
+        updatedCons,
+        ...node.members.slice(consIndex + 1)
+      ]);
+    }
+
     delete state[InSchema];
     delete state[IsOptIn];
     delete state[AccessorsSymbol];
+    delete state[GettersSymbol];
     delete state[AutoEnrollMethods];
 
     return state.factory.updateClassDeclaration(
@@ -143,7 +177,7 @@ export class SchemaTransformer {
       node.name,
       node.typeParameters,
       node.heritageClauses,
-      node.members
+      newMembers
     );
   }
 
@@ -201,6 +235,7 @@ export class SchemaTransformer {
     if (this.isInvisible(state, node) || DeclarationUtil.isStatic(node)) {
       return node;
     }
+    state[GettersSymbol]?.add(node.name.getText());
     if (state[AccessorsSymbol]?.has(node.name.getText())) {
       return node;
     } else {