@travetto/schema 3.0.0-rc.0 → 3.0.0-rc.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/schema",
   "displayName": "Schema",
-  "version": "3.0.0-rc.0",
+  "version": "3.0.0-rc.1",
   "description": "Data type registry for runtime validation, reflection and binding. ",
   "keywords": [
     "schema",
@@ -28,8 +28,8 @@
     "directory": "module/schema"
   },
   "dependencies": {
-    "@travetto/registry": "^3.0.0-rc.0",
-    "@travetto/transformer": "^3.0.0-rc.0"
+    "@travetto/registry": "^3.0.0-rc.1",
+    "@travetto/transformer": "^3.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"

package/support/transform-util.ts

@@ -140,34 +140,34 @@ export class SchemaTransformUtil {
       params.push(state.factory.createObjectLiteralExpression(attrs));
     }
 
-    const newDecs = [
-      ...(node.decorators ?? []).filter(x => x !== existing),
+    const newModifiers = [
+      ...(node.modifiers ?? []).filter(x => x !== existing),
       state.createDecorator(FIELD_MOD, 'Field', ...params)
     ];
 
     if (ts.isPropertyDeclaration(node)) {
       const comments = DocUtil.describeDocs(node);
       if (comments.description) {
-        newDecs.push(state.createDecorator(COMMON_MOD, 'Describe', state.fromLiteral({
+        newModifiers.push(state.createDecorator(COMMON_MOD, 'Describe', state.fromLiteral({
           description: comments.description
         })));
       }
 
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       return state.factory.updatePropertyDeclaration(node as Exclude<typeof node, T>,
-        newDecs, node.modifiers, node.name, node.questionToken, node.type, node.initializer) as T;
+        newModifiers, node.name, node.questionToken, node.type, node.initializer) as T;
     } else if (ts.isParameter(node)) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       return state.factory.updateParameterDeclaration(node as Exclude<typeof node, T>,
-        newDecs, node.modifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer) as T;
+        newModifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer) as T;
     } else if (ts.isGetAccessorDeclaration(node)) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       return state.factory.updateGetAccessorDeclaration(node as Exclude<typeof node, T>,
-        newDecs, node.modifiers, node.name, node.parameters, node.type, node.body) as T;
+        newModifiers, node.name, node.parameters, node.type, node.body) as T;
     } else {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       return state.factory.updateSetAccessorDeclaration(node as Exclude<typeof node, T>,
-        newDecs, node.modifiers, node.name, node.parameters, node.body) as T;
+        newModifiers, node.name, node.parameters, node.body) as T;
     }
   }
 

package/support/transformer.schema.ts

@@ -39,16 +39,16 @@ export class SchemaTransformer {
    */
   @AfterClass('Schema')
   static finalizeSchema(state: AutoState & TransformerState, node: ts.ClassDeclaration): ts.ClassDeclaration {
-    const decls = [...(node.decorators ?? [])];
+    const modifiers = (node.modifiers ?? []).slice(0);
 
     const comments = DocUtil.describeDocs(node);
 
     if (!state.findDecorator(this, node, 'Schema', SCHEMA_MOD)) {
-      decls.unshift(state.createDecorator(SCHEMA_MOD, 'Schema'));
+      modifiers.unshift(state.createDecorator(SCHEMA_MOD, 'Schema'));
     }
 
     if (comments.description) {
-      decls.push(state.createDecorator(COMMON_MOD, 'Describe', state.fromLiteral({
+      modifiers.push(state.createDecorator(COMMON_MOD, 'Describe', state.fromLiteral({
         title: comments.description
       })));
     }
@@ -58,8 +58,7 @@ export class SchemaTransformer {
 
     return state.factory.updateClassDeclaration(
       node,
-      decls,
-      node.modifiers,
+      modifiers,
       node.name,
       node.typeParameters,
       node.heritageClauses,