@travetto/schema 7.0.4 → 7.0.6

package/README.md

@@ -246,7 +246,7 @@ Within the schema framework, it is possible to add custom validators class level
 
 **Code: Password Validator**
 ```typescript
-import { Schema, Validator, ValidationError } from '@travetto/schema';
+import { Schema, Validator, type ValidationError } from '@travetto/schema';
 
 const passwordValidator = (user: User): ValidationError | undefined => {
   const password = user.password;
@@ -368,7 +368,7 @@ What you can see here is that the `Point` type is now backed by a class that sup
 
 **Code: Simple Custom Type Usage**
 ```typescript
-import { Schema, Point } from '@travetto/schema';
+import { Schema, type Point } from '@travetto/schema';
 
 @Schema()
 export class LocationAware {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/schema",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "type": "module",
   "description": "Data type registry for runtime validation, reflection and binding.",
   "keywords": [
@@ -28,10 +28,10 @@
     "directory": "module/schema"
   },
   "dependencies": {
-    "@travetto/registry": "^7.0.4"
+    "@travetto/registry": "^7.0.6"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^7.0.3"
+    "@travetto/transformer": "^7.0.5"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/bind-util.ts

@@ -1,7 +1,7 @@
-import { castTo, Class, classConstruct, asFull, TypedObject, castKey } from '@travetto/runtime';
+import { castTo, type Class, classConstruct, asFull, TypedObject, castKey } from '@travetto/runtime';
 
 import { DataUtil } from './data.ts';
-import { SchemaInputConfig, SchemaParameterConfig, SchemaFieldMap } from './service/types.ts';
+import type { SchemaInputConfig, SchemaParameterConfig, SchemaFieldMap } from './service/types.ts';
 import { SchemaRegistryIndex } from './service/registry-index.ts';
 
 type BindConfig = {

package/src/data.ts

@@ -1,9 +1,9 @@
 import { isNumberObject, isBooleanObject, isStringObject } from 'node:util/types';
 
-import { asConstructable, castTo, Class, asFull, TypedObject } from '@travetto/runtime';
+import { asConstructable, castTo, type Class, asFull, TypedObject } from '@travetto/runtime';
 import { UnknownType } from './types.ts';
 
-const REGEX_PAT = /[\/](.*)[\/](i|g|m|s)?/;
+const REGEX_PATTERN = /[\/](.*)[\/](i|g|m|s)?/;
 
 /**
  * Utilities for data conversion and binding
@@ -110,9 +110,9 @@ export class DataUtil {
   static toRegex(input: string | RegExp): RegExp {
     if (input instanceof RegExp) {
       return input;
-    } else if (REGEX_PAT.test(input)) {
-      const [, pat, mod] = input.match(REGEX_PAT) ?? [];
-      return new RegExp(pat, mod);
+    } else if (REGEX_PATTERN.test(input)) {
+      const [, pattern, module] = input.match(REGEX_PATTERN) ?? [];
+      return new RegExp(pattern, module);
     } else {
       return new RegExp(input);
     }

package/src/decorator/common.ts

@@ -1,6 +1,6 @@
-import { Class, ClassInstance, getClass } from '@travetto/runtime';
+import { type Class, type ClassInstance, getClass } from '@travetto/runtime';
 
-import { SchemaCoreConfig } from '../service/types.ts';
+import type { SchemaCoreConfig } from '../service/types.ts';
 import { SchemaRegistryIndex } from '../service/registry-index.ts';
 
 /**

package/src/decorator/field.ts

@@ -1,6 +1,6 @@
-import { Any, ClassInstance, getClass } from '@travetto/runtime';
+import { type Any, type ClassInstance, getClass } from '@travetto/runtime';
 
-import { SchemaFieldConfig } from '../service/types.ts';
+import type { SchemaFieldConfig } from '../service/types.ts';
 import { SchemaRegistryIndex } from '../service/registry-index.ts';
 
 type PropType<V> = (<T extends Partial<Record<K, V | Function>>, K extends string>(

package/src/decorator/input.ts

@@ -1,7 +1,7 @@
-import { Any, Class, ClassInstance, getClass } from '@travetto/runtime';
+import { type Any, type Class, type ClassInstance, getClass } from '@travetto/runtime';
 
 import { CommonRegex } from '../validate/regex.ts';
-import { CONSTRUCTOR_PROPERTY, SchemaInputConfig } from '../service/types.ts';
+import { CONSTRUCTOR_PROPERTY, type SchemaInputConfig } from '../service/types.ts';
 import { SchemaRegistryIndex } from '../service/registry-index.ts';
 
 type PropType<V> = (<T extends Partial<Record<K, V | Function>>, K extends string>(

package/src/decorator/method.ts

@@ -1,8 +1,8 @@
-import { Any, castTo, ClassInstance, getClass } from '@travetto/runtime';
+import { type Any, castTo, type ClassInstance, getClass } from '@travetto/runtime';
 
-import { SchemaMethodConfig } from '../service/types';
-import { SchemaRegistryIndex } from '../service/registry-index';
-import { MethodValidatorFn } from '../validate/types';
+import type { SchemaMethodConfig } from '../service/types.ts';
+import { SchemaRegistryIndex } from '../service/registry-index.ts';
+import type { MethodValidatorFn } from '../validate/types.ts';
 
 type MethodDecorator = (instance: ClassInstance, property: string, descriptor: PropertyDescriptor) => PropertyDescriptor | void;
 

package/src/decorator/schema.ts

@@ -1,8 +1,8 @@
-import { castTo, Class, DeepPartial } from '@travetto/runtime';
+import { castTo, type Class, type DeepPartial } from '@travetto/runtime';
 
 import { BindUtil } from '../bind-util.ts';
-import { SchemaClassConfig, ViewFieldsConfig } from '../service/types.ts';
-import { ValidatorFn } from '../validate/types.ts';
+import type { SchemaClassConfig, ViewFieldsConfig } from '../service/types.ts';
+import type { ValidatorFn } from '../validate/types.ts';
 import { SchemaRegistryIndex } from '../service/registry-index.ts';
 
 /**

package/src/name.ts

@@ -1,4 +1,4 @@
-import { SchemaClassConfig } from './service/types.ts';
+import type { SchemaClassConfig } from './service/types.ts';
 
 const ID_REGEX = /(\d{1,100})Δ$/;
 

package/src/service/registry-adapter.ts

@@ -1,11 +1,11 @@
 import type { RegistryAdapter } from '@travetto/registry';
-import { AppError, castKey, castTo, Class, describeFunction, safeAssign } from '@travetto/runtime';
+import { AppError, castKey, castTo, type Class, describeFunction, safeAssign } from '@travetto/runtime';
 
 import {
-  SchemaClassConfig, SchemaMethodConfig, SchemaFieldConfig,
-  SchemaParameterConfig, SchemaInputConfig, SchemaFieldMap, SchemaCoreConfig,
+  type SchemaClassConfig, type SchemaMethodConfig, type SchemaFieldConfig,
+  type SchemaParameterConfig, type SchemaInputConfig, type SchemaFieldMap, type SchemaCoreConfig,
   CONSTRUCTOR_PROPERTY
-} from './types';
+} from './types.ts';
 
 export type SchemaDiscriminatedInfo = Required<Pick<SchemaClassConfig, 'discriminatedType' | 'discriminatedField' | 'discriminatedBase'>>;
 

package/src/service/registry-index.ts

@@ -1,8 +1,8 @@
-import { RegistrationMethods, RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
-import { AppError, castKey, castTo, Class, classConstruct, getParentClass } from '@travetto/runtime';
+import { type RegistrationMethods, type RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
+import { AppError, castKey, castTo, type Class, classConstruct, getParentClass } from '@travetto/runtime';
 
-import { SchemaFieldConfig, SchemaClassConfig } from './types.ts';
-import { SchemaDiscriminatedInfo, SchemaRegistryAdapter } from './registry-adapter.ts';
+import type { SchemaFieldConfig, SchemaClassConfig } from './types.ts';
+import { type SchemaDiscriminatedInfo, SchemaRegistryAdapter } from './registry-adapter.ts';
 
 /**
  * Schema registry index for managing schema configurations across classes

package/src/service/types.ts

@@ -1,6 +1,6 @@
-import { Any, Class, Primitive } from '@travetto/runtime';
+import type { Any, Class, Primitive } from '@travetto/runtime';
 
-import { MethodValidatorFn, ValidatorFn } from '../validate/types.ts';
+import type { MethodValidatorFn, ValidatorFn } from '../validate/types.ts';
 
 type TemplateLiteralPart = string | NumberConstructor | StringConstructor | BooleanConstructor;
 export type TemplateLiteral = { operation: 'and' | 'or', values: (TemplateLiteralPart | TemplateLiteral)[] };

package/src/validate/error.ts

@@ -1,5 +1,5 @@
-import { Class, AppError } from '@travetto/runtime';
-import { ValidationError } from './types.ts';
+import { type Class, AppError } from '@travetto/runtime';
+import type { ValidationError } from './types.ts';
 
 /**
  * Validation results error.

package/src/validate/validator.ts

@@ -1,7 +1,7 @@
-import { castKey, castTo, Class, ClassInstance, TypedObject } from '@travetto/runtime';
+import { castKey, castTo, type Class, type ClassInstance, TypedObject } from '@travetto/runtime';
 
-import { SchemaInputConfig, SchemaFieldMap } from '../service/types.ts';
-import { ValidationError, ValidationKindCore, ValidationResult } from './types.ts';
+import type { SchemaInputConfig, SchemaFieldMap } from '../service/types.ts';
+import type { ValidationError, ValidationKindCore, ValidationResult } from './types.ts';
 import { Messages } from './messages.ts';
 import { isValidationError, TypeMismatchError, ValidationResultError } from './error.ts';
 import { DataUtil } from '../data.ts';

package/support/transformer/util.ts

@@ -1,7 +1,7 @@
 import ts from 'typescript';
 import {
   type AnyType, DeclarationUtil, LiteralUtil,
-  DecoratorUtil, DocUtil, ParamDocumentation, TransformerState, transformCast,
+  DecoratorUtil, DocUtil, type ParamDocumentation, type TransformerState, transformCast,
 } from '@travetto/transformer';
 
 export type ComputeConfig = { type?: AnyType, root?: ts.Node, name?: string, index?: number };

package/support/transformer.schema.ts

@@ -1,10 +1,5 @@
 import ts from 'typescript';
-
-import {
-  TransformerState, OnProperty, OnClass, AfterClass, DocUtil, DeclarationUtil,
-  OnGetter, OnSetter, OnMethod, DecoratorUtil, OnStaticMethod
-} from '@travetto/transformer';
-
+import { type TransformerState, DocUtil, DeclarationUtil, DecoratorUtil, TransformerHandler } from '@travetto/transformer';
 import { SchemaTransformUtil } from './transformer/util.ts';
 
 const CONSTRUCTOR_PROPERTY = 'CONSTRUCTOR';
@@ -25,6 +20,16 @@ interface AutoState {
  */
 export class SchemaTransformer {
 
+  static {
+    TransformerHandler(this, this.startSchema, 'before', 'class', ['Schema']);
+    TransformerHandler(this, this.finalizeSchema, 'after', 'class', ['Schema']);
+    TransformerHandler(this, this.processSchemaMethod, 'before', 'method');
+    TransformerHandler(this, this.processSchemaMethod, 'before', 'static-method');
+    TransformerHandler(this, this.processSchemaField, 'before', 'property');
+    TransformerHandler(this, this.processSchemaGetter, 'before', 'getter');
+    TransformerHandler(this, this.processSchemaSetter, 'before', 'setter');
+  }
+
   static isInvisible(state: AutoState & TransformerState, node: ts.Declaration, isStatic?: boolean): boolean {
     if (!state[InSchema] && !isStatic) {
       return true;
@@ -57,7 +62,6 @@ export class SchemaTransformer {
   /**
    * Track schema on start
    */
-  @OnClass('Schema')
   static startSchema(state: AutoState & TransformerState, node: ts.ClassDeclaration): ts.ClassDeclaration {
     state[AccessorsSymbol] = new Set();
     state[AutoEnrollMethods] = new Set();
@@ -80,7 +84,6 @@ export class SchemaTransformer {
   /**
    * Mark the end of the schema, document
    */
-  @AfterClass('Schema')
   static finalizeSchema(state: AutoState & TransformerState, node: ts.ClassDeclaration): ts.ClassDeclaration {
     const comments = DocUtil.describeDocs(node);
 
@@ -146,8 +149,6 @@ export class SchemaTransformer {
   /**
    * Handle explicitly registered methods
    */
-  @OnMethod()
-  @OnStaticMethod()
   static processSchemaMethod(state: TransformerState & AutoState, node: ts.MethodDeclaration): ts.MethodDeclaration {
     if (
       this.isInvisible(state, node, node.modifiers?.some(m => m.kind === ts.SyntaxKind.StaticKeyword)) &&
@@ -185,7 +186,6 @@ export class SchemaTransformer {
   /**
    * Handle all properties, while in schema
    */
-  @OnProperty()
   static processSchemaField(state: TransformerState & AutoState, node: ts.PropertyDeclaration): ts.PropertyDeclaration {
     if (this.isInvisible(state, node)) {
       return node;
@@ -196,7 +196,6 @@ export class SchemaTransformer {
   /**
    * Handle getters
    */
-  @OnGetter()
   static processSchemaGetter(state: TransformerState & AutoState, node: ts.GetAccessorDeclaration): ts.GetAccessorDeclaration {
     if (this.isInvisible(state, node) || DeclarationUtil.isStatic(node)) {
       return node;
@@ -212,7 +211,6 @@ export class SchemaTransformer {
   /**
    * Handle setters
    */
-  @OnSetter()
   static processSchemaSetter(state: TransformerState & AutoState, node: ts.SetAccessorDeclaration): ts.SetAccessorDeclaration {
     if (this.isInvisible(state, node) || DeclarationUtil.isStatic(node)) {
       return node;