@travetto/schema 3.1.0-rc.3 → 3.1.0-rc.5

package/README.md

@@ -81,6 +81,8 @@ This schema provides a powerful base for data binding and validation at runtime.
    *  [@LongText](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L91) same as text, but expects longer form content
    *  [@Readonly](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L58) defines a that field should not be bindable external to the class
    *  [@Writeonly](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L52) defines a that field should not be exported in serialization, but that it can be bound to
+   *  [@Secret](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L64) marks a field as being sensitive.  This is used by certain logging activities to ensure sensitive information is not logged out.
+   *  [@Specifier](https://github.com/travetto/travetto/tree/main/module/schema/src/decorator/field.ts#L206) attributes additional specifiers to a field, allowing for more specification beyond just the field's type.
 Additionally, schemas can be nested to form more complex data structures that are able to bound and validated. 
 
 Just like the class, all fields can be defined with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/schema",
-  "version": "3.1.0-rc.3",
+  "version": "3.1.0-rc.5",
   "description": "Data type registry for runtime validation, reflection and binding.",
   "keywords": [
     "schema",
@@ -27,10 +27,10 @@
     "directory": "module/schema"
   },
   "dependencies": {
-    "@travetto/registry": "^3.1.0-rc.1"
+    "@travetto/registry": "^3.1.0-rc.3"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^3.1.0-rc.2"
+    "@travetto/transformer": "^3.1.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/decorator/field.ts

@@ -28,12 +28,12 @@ function prop<V>(obj: Partial<FieldConfig>): PropType<V> {
  * @param config The field configuration
  * @augments `@travetto/schema:Field`
  */
-export function Field(type: ClassList, config?: Partial<FieldConfig>) {
+export function Field(type: ClassList, ...config: Partial<FieldConfig>[]) {
   return (f: ClassInstance, k: string, idx?: number): void => {
     if (idx !== undefined && typeof idx === 'number') {
-      SchemaRegistry.registerPendingParamConfig(f.constructor, k, idx, type, config);
+      SchemaRegistry.registerPendingParamConfig(f.constructor, k, idx, type, Object.assign({}, ...config));
     } else {
-      SchemaRegistry.registerPendingFieldConfig(f.constructor, k, type, config);
+      SchemaRegistry.registerPendingFieldConfig(f.constructor, k, type, Object.assign({}, ...config));
     }
   };
 }
@@ -83,12 +83,12 @@ export function Enum(values: string[], message?: string): PropType<string | numb
  * Mark the field as indicating it's storing textual data
  * @augments `@travetto/schema:Field`
  */
-export function Text(): PropType<string | string[]> { return prop({ specifier: 'text' }); }
+export function Text(): PropType<string | string[]> { return prop({ specifiers: ['text'] }); }
 /**
  * Mark the field to indicate it's for long form text
  * @augments `@travetto/schema:Field`
  */
-export function LongText(): PropType<string | string[]> { return prop({ specifier: 'text-long' }); }
+export function LongText(): PropType<string | string[]> { return prop({ specifiers: ['text', 'long'] }); }
 
 /**
  * Require the field to match a specific RegExp
@@ -197,3 +197,10 @@ export function Currency(): PropType<number> { return Precision(13, 2); }
 export function Ignore(): PropertyDecorator {
   return (target: Object, property: string | symbol) => { };
 }
+
+/**
+ * Specifier for the field
+ * @param specifiers The specifiers for a field
+ * @augments `@travetto/schema:Field`
+ */
+export function Specifier(...specifiers: string[]): PropType<unknown> { return prop({ specifiers }); }

package/src/service/registry.ts

@@ -253,6 +253,14 @@ class $SchemaRegistry extends MetadataRegistry<ClassConfig, FieldConfig> {
   registerPendingParamFacet(target: Class, method: string, idx: number, config: Partial<FieldConfig>): Class {
     const methods = this.getOrCreatePending(target)!.methods!;
     const params = (methods[method] ??= []);
+
+    if (config.aliases) {
+      config.aliases = [...params[idx]?.aliases ?? [], ...config.aliases];
+    }
+    if (config.specifiers) {
+      config.specifiers = [...params[idx]?.specifiers ?? [], ...config.specifiers];
+    }
+
     params[idx] = {
       // @ts-expect-error
       name: `${method}.${idx}`,
@@ -279,6 +287,12 @@ class $SchemaRegistry extends MetadataRegistry<ClassConfig, FieldConfig> {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       allViewConf.schema[prop] = {} as FieldConfig;
     }
+    if (config.aliases) {
+      config.aliases = [...allViewConf.schema[prop].aliases ?? [], ...config.aliases];
+    }
+    if (config.specifiers) {
+      config.specifiers = [...allViewConf.schema[prop].specifiers ?? [], ...config.specifiers];
+    }
 
     Object.assign(allViewConf.schema[prop], config);
 

package/src/service/types.ts

@@ -115,7 +115,7 @@ export interface FieldConfig extends DescribableConfig {
   /**
    * Does the field have a specialization
    */
-  specifier?: string;
+  specifiers?: string[];
   /**
    * The numeric precision
    */

package/support/transform-util.ts

@@ -140,12 +140,18 @@ export class SchemaTransformUtil {
     if (!existing) {
       const resolved = this.toConcreteType(state, typeExpr, node, config.root);
       params.push(resolved);
+      if (attrs.length) {
+        params.push(state.factory.createObjectLiteralExpression(attrs));
+      }
     } else {
-      params.push(...DecoratorUtil.getArguments(existing) ?? []);
-    }
-
-    if (attrs.length) {
+      const args = DecoratorUtil.getArguments(existing) ?? [];
+      if (args.length > 0) {
+        params.push(args[0]);
+      }
       params.push(state.factory.createObjectLiteralExpression(attrs));
+      if (args.length > 1) {
+        params.push(...args.slice(1));
+      }
     }
 
     const newModifiers = [