@travetto/transformer 2.2.4 → 3.0.0-rc.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/transformer",
   "displayName": "Transformation",
-  "version": "2.2.4",
+  "version": "3.0.0-rc.2",
   "description": "Functionality for AST transformations, with transformer registration, and general utils",
   "keywords": [
     "typescript",
@@ -25,7 +25,7 @@
     "directory": "module/transformer"
   },
   "dependencies": {
-    "@travetto/base": "^2.2.4"
+    "@travetto/base": "^3.0.0-rc.0"
   },
   "publishConfig": {
     "access": "public"

package/src/state.ts

@@ -164,9 +164,9 @@ export class TransformerState implements State {
    * Get list of all #decorators for a node
    */
   getDecoratorList(node: ts.Node): DecoratorMeta[] {
-    return (node.decorators ?? [])
+    return ts.canHaveDecorators(node) ? (ts.getDecorators(node) ?? [])
       .map(dec => this.getDecoratorMeta(dec))
-      .filter(x => !!x.ident);
+      .filter(x => !!x.ident) : [];
   }
 
   /**

package/src/util/decorator.ts

@@ -24,11 +24,14 @@ export class DecoratorUtil {
   /**
    * Replace or add a decorator to a list of decorators
    */
-  static spliceDecorators(node: ts.Node, target: ts.Decorator | undefined, replacements: ts.Decorator[], idx = -1): ts.Decorator[] {
+  static spliceDecorators(node: ts.Node, target: ts.Decorator | undefined, replacements: ts.Decorator[], idx = -1): ts.ModifierLike[] {
+    if (!ts.canHaveDecorators(node)) {
+      return [];
+    }
     if (idx < 0 && target) {
-      idx = node.decorators?.indexOf(target) ?? -1;
+      idx = node.modifiers?.indexOf(target) ?? -1;
     }
-    const out = (node.decorators ?? []).filter(x => x !== target);
+    const out = (node.modifiers ?? []).filter(x => x !== target);
     if (idx < 0) {
       out.push(...replacements);
     } else {

package/src/visitor.ts

@@ -40,6 +40,7 @@ export class VisitorFactory<S extends State = State> {
   #transformers = new Map<TransformerType, TransformerSet<S>>();
   #logTarget: string;
   #getState: (context: ts.TransformationContext, src: ts.SourceFile) => S;
+  #logger: Console | undefined;
 
   constructor(
     getState: (context: ts.TransformationContext, src: ts.SourceFile) => S,
@@ -78,17 +79,21 @@ export class VisitorFactory<S extends State = State> {
     }
   }
 
+  get logger(): Console {
+    this.#logger ??= new console.Console({
+      stdout: createWriteStream(AppCache.toEntryName(this.#logTarget), { flags: 'a' }),
+      inspectOptions: { depth: 4 },
+    });
+    return this.#logger;
+  }
+
   /**
    * Produce a visitor for a given a file
    */
   visitor(): ts.TransformerFactory<ts.SourceFile> {
     return (context: ts.TransformationContext) => (file: ts.SourceFile): ts.SourceFile => {
       try {
-        const c = new console.Console({
-          stdout: createWriteStream(AppCache.toEntryName(this.#logTarget), { flags: 'a' }),
-          inspectOptions: { depth: 4 },
-        });
-
+        const c = this.logger;
         ConsoleManager.set({
           onLog: (level, ctx, args) => c[level](level, ctx, ...LogUtil.collapseNodes(args))
         });
@@ -120,7 +125,7 @@ export class VisitorFactory<S extends State = State> {
         if (!(err instanceof Error)) {
           throw err;
         }
-        console.error('Failed transforming', { error: err, file: file.fileName });
+        console.error('Failed transforming', { error: `${err.message}\n${err.stack}`, file: file.fileName });
         const out = new Error(`Failed transforming: ${file.fileName}: ${err.message}`);
         out.stack = err.stack;
         throw out;