adapt

package-lock.json

@@ -22,7 +22,7 @@
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-prettier": "^3.4.1",
         "prettier": "^2.4.1",
-        "schemastery": "^2.0.0",
+        "schemastery": "^2.1.0",
         "typescript": "^4.5.2"
       },
       "peerDependencies": {
@@ -1541,9 +1541,9 @@
       }
     },
     "node_modules/schemastery": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.0.0.tgz",
-      "integrity": "sha512-g628Fvc8cY3Laoyz+v45qZGiClwhTj0MsiGF+tSVlUh+hqYf6kVkTaWdIHNGhfj11h9QzRrs0A4wfvQZuHg3iA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.1.0.tgz",
+      "integrity": "sha512-D5wGNn5lc8GnhTzSl2ClH6RwUB69NMUrIXn6qWJVZSSq1fJtEodL9zXoJUbzoLQlL7rGMuO6entajhZvJY25Tw==",
       "dev": true
     },
     "node_modules/semver": {
@@ -2932,9 +2932,9 @@
       }
     },
     "schemastery": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.0.0.tgz",
-      "integrity": "sha512-g628Fvc8cY3Laoyz+v45qZGiClwhTj0MsiGF+tSVlUh+hqYf6kVkTaWdIHNGhfj11h9QzRrs0A4wfvQZuHg3iA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.1.0.tgz",
+      "integrity": "sha512-D5wGNn5lc8GnhTzSl2ClH6RwUB69NMUrIXn6qWJVZSSq1fJtEodL9zXoJUbzoLQlL7rGMuO6entajhZvJY25Tw==",
       "dev": true
     },
     "semver": {

package.json

@@ -29,7 +29,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
     "prettier": "^2.4.1",
-    "schemastery": "^2.0.0",
+    "schemastery": "^2.1.0",
     "typescript": "^4.5.2"
   },
   "peerDependencies": {

src/decorators/define-property.ts

@@ -8,21 +8,21 @@ import {
   transformSingle,
 } from '../utility/transformer';
 import Schema from 'schemastery';
+import { kSchema } from '../utility/kschema';
 
 export function SchemaProperty(options: SchemaOptions = {}): PropertyDecorator {
   return (obj, key) => {
     const nativeType = Reflect.getMetadata('design:type', obj, key);
-    const nativeTypeString = getStringFromNativeType(nativeType);
+    // const nativeTypeString = getStringFromNativeType(nativeType);
     if (!options.type) {
-      if (nativeTypeString && nativeTypeString !== 'array') {
-        options.type =
-          nativeTypeString === 'class' ? nativeType : nativeTypeString;
+      if (nativeType !== Array) {
+        options.type = nativeType;
       } else {
         options.type = 'any';
       }
     }
     if (
-      nativeTypeString === 'array' &&
+      nativeType === Array &&
       options.array !== false &&
       options.schema?.type !== 'tuple'
     ) {
@@ -32,7 +32,7 @@ export function SchemaProperty(options: SchemaOptions = {}): PropertyDecorator {
     if (
       options.type &&
       typeof options.type !== 'string' &&
-      typeof (options.type as Schema<any>).type === 'string'
+      (options.type as Schema<any>)[kSchema]
     ) {
       const cl = options.type as ClassType<any>;
       let dec: PropertyDecorator;

src/decorators/register.ts

@@ -8,14 +8,12 @@ import Schema from 'schemastery';
 import { reflector } from '../metadata/reflector';
 import _ from 'lodash';
 import { Metadata } from '../metadata/metadata';
+import { kSchema } from '../utility/kschema';
 
 function getBasePropertySchemaFromOptions(options: SchemaOptions) {
   if (options.schema) {
     return options.schema;
   }
-  if (typeof options.type !== 'string') {
-    return schemaFromClass(options.type);
-  }
   switch (options.type as string) {
     case 'any':
       return Schema.any();
@@ -30,7 +28,7 @@ function getBasePropertySchemaFromOptions(options: SchemaOptions) {
     case 'object':
       return Schema.object({}).default({});
     default:
-      return Schema.any();
+      return Schema.from(options.type);
   }
 }
 
@@ -89,7 +87,7 @@ export function schemaFromClass<T>(cl: ClassType<T>): Schema<Partial<T>, T> {
   return schema;
 }
 
-const schemaFields: (keyof Schema.Base)[] = [
+const schemaFields: (keyof Schema)[] = [
   'type',
   'inner',
   'list',
@@ -99,6 +97,16 @@ const schemaFields: (keyof Schema.Base)[] = [
   'meta',
 ];
 
+const schemaFunctions: (keyof Schema)[] = [
+  'toJSON',
+  'required',
+  'hidden',
+  'adaptive',
+  'default',
+  'comment',
+  'description',
+];
+
 function applySchemaForClass<T>(
   originalClass: ClassType<T>,
   instance: T,
@@ -139,6 +147,16 @@ export function SchemaClass<T>(originalClass: ClassType<T>) {
     // @ts-ignore
     newClass[field] = schema[field];
   }
+  for (const functionField of schemaFunctions) {
+    if (newClass[functionField]) {
+      continue;
+    }
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    newClass[functionField] = Schema.prototype[functionField];
+  }
+
+  newClass[kSchema] = true;
   return newClass;
 }
 

src/def/interfaces.ts

@@ -9,6 +9,8 @@ export type SchemaType =
   | 'object'
   | 'any'
   | 'never'
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  | Function
   | { new (...args: any[]): any };
 
 export interface SchemaClassOptions extends Schema.Meta<any> {

src/utility/kschema.ts

+import Schema from 'schemastery';
+
+function getKSchema(): symbol {
+  return Object.getOwnPropertySymbols(Schema.prototype).find(
+    (s) => s.toString() === 'Symbol(schemastery)',
+  );
+}
+
+export const kSchema = getKSchema();

src/utility/transformer.ts

@@ -2,6 +2,7 @@ import { Metadata } from '../metadata/metadata';
 import { ClassType } from '../def';
 import Schema from 'schemastery';
 import _ from 'lodash';
+import { kSchema } from './kschema';
 
 export function SetTransformer(transformer: (val: any) => any) {
   return Metadata.set('Transformer', transformer);
@@ -11,7 +12,7 @@ export function transformSingle<T>(
   cl: ClassType<T> & Partial<Schema>,
   val: any,
 ) {
-  if (typeof cl.type === 'string') {
+  if (cl[kSchema]) {
     return new cl(val);
   } else {
     return val;