@travetto/schema 5.0.0-rc.10 → 5.0.0-rc.12

package/README.md

@@ -379,7 +379,7 @@ Validation Failed {
 ```
 
 ## Data Utilities
-Data utilities for binding values, and type conversion. Currently [DataUtil](https://github.com/travetto/travetto/tree/main/module/schema/src/data.ts#L10) includes:
+Data utilities for binding values, and type conversion. Currently [DataUtil](https://github.com/travetto/travetto/tree/main/module/schema/src/data.ts#L11) includes:
    *  `deepAssign(a, b, mode ?)` which allows for deep assignment of `b` onto `a`, the `mode` determines how aggressive the assignment is, and how flexible it is.  `mode` can have any of the following values:
       *  `loose`, which is the default is the most lenient. It will not error out, and overwrites will always happen
       *  `coerce`, will attempt to force values from `b` to fit the types of `a`, and if it can't it will error out

package/package.json

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

package/src/data.ts

@@ -1,6 +1,7 @@
 import { isNumberObject as isNum, isBooleanObject as isBool, isStringObject as isStr } from 'node:util/types';
 
 import { asConstructable, castTo, Class, asFull, TypedObject } from '@travetto/runtime';
+import { UnknownType } from './internal/types';
 
 const REGEX_PAT = /[\/](.*)[\/](i|g|m|s)?/;
 
@@ -120,9 +121,11 @@ export class DataUtil {
    */
   static coerceType(input: unknown, type: typeof String, strict?: boolean): string;
   static coerceType(input: unknown, type: typeof Number, strict?: boolean): number;
+  static coerceType(input: unknown, type: typeof BigInt, strict?: boolean): bigint;
   static coerceType(input: unknown, type: typeof Boolean, strict?: boolean): boolean;
   static coerceType(input: unknown, type: typeof Date, strict?: boolean): Date;
   static coerceType(input: unknown, type: typeof RegExp, strict?: boolean): RegExp;
+  static coerceType(input: unknown, type: typeof UnknownType, strict?: boolean): unknown;
   static coerceType<T>(input: unknown, type: Class<T> | Function, strict?: boolean): T;
   static coerceType(input: unknown, type: Class<unknown> | Function, strict = true): unknown {
     // Do nothing
@@ -160,6 +163,20 @@ export class DataUtil {
         }
         return res;
       }
+      case BigInt: {
+        if (typeof input === 'bigint') {
+          return input;
+        }
+        try {
+          return BigInt((typeof input === 'boolean' || typeof input === 'number') ?
+            input : `${input}`.replace(/n$/i, ''));
+        } catch {
+          if (strict) {
+            throw new Error(`Invalid numeric value: ${input}`);
+          }
+          return;
+        }
+      }
       case Boolean: {
         const match = `${input}`.match(/^((?<TRUE>true|yes|1|on)|false|no|off|0)$/i);
         if (strict && !match) {
@@ -184,6 +201,9 @@ export class DataUtil {
           return;
         }
       }
+      case UnknownType: {
+        return input;
+      }
       case Object: {
         if (!strict || this.isPlainObject(input)) {
           return input;

package/src/internal/types.ts

@@ -1 +1,2 @@
-export const AllViewⲐ: unique symbol = Symbol.for('@travetto/schema:all');
+export const AllViewⲐ: unique symbol = Symbol.for('@travetto/schema:all');
+export class UnknownType { }

package/src/service/registry.ts

@@ -255,6 +255,9 @@ class $SchemaRegistry extends MetadataRegistry<ClassConfig, FieldConfig> {
     if (config.specifiers) {
       config.specifiers = [...params[idx]?.specifiers ?? [], ...config.specifiers];
     }
+    if (config.enum?.values) {
+      config.enum.values = config.enum.values.slice().sort();
+    }
 
     params[idx] = {
       // @ts-expect-error
@@ -287,6 +290,9 @@ class $SchemaRegistry extends MetadataRegistry<ClassConfig, FieldConfig> {
     if (config.specifiers) {
       config.specifiers = [...allViewConf.schema[prop].specifiers ?? [], ...config.specifiers];
     }
+    if (config.enum?.values) {
+      config.enum.values = config.enum.values.slice().sort();
+    }
 
     Object.assign(allViewConf.schema[prop], config);
 

package/support/transformer/util.ts

@@ -7,6 +7,7 @@ import {
 const SCHEMA_MOD = '@travetto/schema/src/decorator/schema';
 const FIELD_MOD = '@travetto/schema/src/decorator/field';
 const COMMON_MOD = '@travetto/schema/src/decorator/common';
+const TYPES_FILE = '@travetto/schema/src/internal/types';
 
 export class SchemaTransformUtil {
 
@@ -27,6 +28,10 @@ export class SchemaTransformUtil {
         }
         break;
       }
+      case 'unknown': {
+        const imp = state.importFile(TYPES_FILE);
+        return state.createAccess(imp.ident, 'UnknownType');
+      }
       case 'shape': {
         const uniqueId = state.generateUniqueIdentifier(node, type);
 
@@ -49,7 +54,7 @@ export class SchemaTransformUtil {
                 this.computeField(state, state.factory.createPropertyDeclaration(
                   [], k,
                   v.undefinable || v.nullable ? state.factory.createToken(ts.SyntaxKind.QuestionToken) : undefined,
-                  undefined, undefined
+                  v.key === 'unknown' ? state.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword) : undefined, undefined
                 ), { type: v, root })
               )
           );
@@ -70,7 +75,6 @@ export class SchemaTransformUtil {
         break;
       }
       case 'foreign':
-      case 'unknown':
       default: {
         // Object
       }
@@ -126,8 +130,7 @@ export class SchemaTransformUtil {
     // If we have a union type
     if (primaryExpr.key === 'union') {
       const values = primaryExpr.subTypes.map(x => x.key === 'literal' ? x.value : undefined)
-        .filter(x => x !== undefined && x !== null)
-        .sort();
+        .filter(x => x !== undefined && x !== null);
 
       if (values.length === primaryExpr.subTypes.length) {
         attrs.push(state.factory.createPropertyAssignment('enum', state.fromLiteral({