@travetto/schema 8.0.0-alpha.15 → 8.0.0-alpha.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/schema",
-  "version": "8.0.0-alpha.15",
+  "version": "8.0.0-alpha.17",
   "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.14"
+    "@travetto/registry": "^8.0.0-alpha.16"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^8.0.0-alpha.10"
+    "@travetto/transformer": "^8.0.0-alpha.11"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/service/registry-adapter.ts

@@ -4,7 +4,7 @@ import { RuntimeError, BinaryUtil, castKey, castTo, type Class, describeFunction
 import {
   type SchemaClassConfig, type SchemaMethodConfig, type SchemaFieldConfig,
   type SchemaParameterConfig, type SchemaInputConfig, type SchemaFieldMap, type SchemaCoreConfig,
-  type SchemaBasicType, CONSTRUCTOR_PROPERTY
+  CONSTRUCTOR_PROPERTY
 } from './types.ts';
 
 export type SchemaDiscriminatedInfo = Required<Pick<SchemaClassConfig, 'discriminatedType' | 'discriminatedField' | 'discriminatedBase'>>;
@@ -23,19 +23,13 @@ function assignMetadata<T>(key: symbol, base: SchemaCoreConfig, data: Partial<T>
   return castTo(out);
 }
 
-function combineCore<T extends SchemaCoreConfig>(base: T, config: Partial<T>): T {
-  return safeAssign(base, {
+function combineCore<T extends SchemaCoreConfig>(base: T, config: Partial<T>): Pick<Partial<T>, 'metadata' | 'private' | 'description' | 'examples'> {
+  return {
     ...config.metadata ? { metadata: { ...base.metadata, ...config.metadata } } : {},
     ...config.private ? { private: config.private ?? base.private } : {},
     ...config.description ? { description: config.description || base.description } : {},
     ...config.examples ? { examples: [...(base.examples ?? []), ...(config.examples ?? [])] } : {},
-  });
-}
-
-function ensureBinary<T extends SchemaBasicType>(config?: T): void {
-  if (config?.type) {
-    config.binary = BinaryUtil.isBinaryTypeReference(config.type);
-  }
+  };
 }
 
 function combineInputs<T extends SchemaInputConfig>(base: T, configs: Partial<T>[]): T {
@@ -51,10 +45,9 @@ function combineInputs<T extends SchemaInputConfig>(base: T, configs: Partial<T>
             values: (config.enum?.values ?? base.enum?.values ?? []).toSorted()
           }
         } : {},
+        ...combineCore(base, config)
       });
     }
-    combineCore(base, config);
-    ensureBinary(base);
   }
   return base;
 }
@@ -63,16 +56,15 @@ function combineMethods<T extends SchemaMethodConfig>(base: T, configs: Partial<
   for (const config of configs) {
     safeAssign(base, {
       ...config,
+      ...combineCore(base, config),
       parameters: config.parameters ?? base.parameters,
       validators: [...base.validators, ...(config.validators ?? [])],
     });
-    combineCore(base, config);
     if (config.parameters) {
       for (const param of config.parameters) {
         safeAssign(base.parameters[param.index], param);
       }
     }
-    ensureBinary(config.returnType);
   }
   return base;
 }
@@ -137,11 +129,11 @@ function combineClasses<T extends SchemaClassConfig>(base: T, configs: Partial<T
       ...config,
       ...config.views ? { views: { ...base.views, ...config.views } } : {},
       ...config.validators ? { validators: [...base.validators, ...config.validators] } : {},
+      ...combineCore(base, config),
       interfaces: [...base.interfaces, ...(config.interfaces ?? [])],
       methods: { ...base.methods, ...config.methods },
       fields: { ...base.fields, ...config.fields },
     });
-    combineCore(base, config);
   }
   return base;
 }
@@ -284,11 +276,22 @@ export class SchemaRegistryAdapter implements RegistryAdapter<SchemaClassConfig>
 
     for (const method of Object.values(config.methods)) {
       method.parameters = method.parameters.toSorted((a, b) => (a.index! - b.index!));
+      if (method.returnType?.type) {
+        method.returnType.binary = BinaryUtil.isBinaryTypeReference(method.returnType.type);
+      }
+      for (const input of method.parameters) {
+        if (input.type) {
+          input.binary = BinaryUtil.isBinaryTypeReference(input.type);
+        }
+      }
     }
 
     // Validate if aliases are duplicated
     const aliasMap: Record<string, SchemaFieldConfig> = {};
     for (const field of Object.values(config.fields)) {
+      if (field.type) {
+        field.binary = BinaryUtil.isBinaryTypeReference(field.type);
+      }
       for (const alias of field.aliases ?? []) {
         if (alias in aliasMap && aliasMap[alias].name !== field.name) {
           throw new RuntimeError(

package/support/transformer/util.ts

@@ -40,7 +40,8 @@ export class SchemaTransformUtil {
           const cls = state.factory.createClassDeclaration(
             [
               state.createDecorator(this.SCHEMA_IMPORT, 'Schema', state.fromLiteral({
-                description: type.comment,
+
+                description: type.description,
                 mappedOperation: type.operation,
                 mappedFields: type.fields,
               })),
@@ -71,7 +72,7 @@ class ${uniqueId} extends ${type.mappedClassName} {
           const cls = state.factory.createClassDeclaration(
             [
               state.createDecorator(this.SCHEMA_IMPORT, 'Schema', state.fromLiteral({
-                description: type.comment
+                description: type.description
               })),
             ],
             id,

package/support/transformer.schema.ts

@@ -90,10 +90,11 @@ export class SchemaTransformer {
     const existing = state.findDecorator(this, node, 'Schema', SchemaTransformUtil.SCHEMA_IMPORT);
     const cons = node.members.find(member => ts.isConstructorDeclaration(member));
 
-    const attrs: Record<string, string | boolean | ts.Expression | number | object | unknown[]> = {};
+    const attrs: Record<string, string | boolean | ts.Expression | number | object | unknown[] | undefined> = {};
 
     if (comments.description) {
       attrs.description = comments.description;
+      attrs.examples = comments.examples;
     }
 
     // Extract all interfaces