@travetto/transformer 3.0.0-rc.1 → 3.0.0-rc.11

package/src/visitor.ts

@@ -1,11 +1,6 @@
-import * as ts from 'typescript';
-import { createWriteStream } from 'fs';
-
-import { ConsoleManager } from '@travetto/base/src/console';
-import { AppCache } from '@travetto/boot';
+import ts from 'typescript';
 
 import { DecoratorMeta, TransformerType, NodeTransformer, TransformerSet, State, TransformPhase } from './types/visitor';
-import { LogUtil } from './util/log';
 import { CoreUtil } from './util/core';
 
 /**
@@ -28,25 +23,24 @@ export class VisitorFactory<S extends State = State> {
       return 'class';
     } else if (ts.isParameter(node)) {
       return 'parameter';
-    } else if (ts.isFunctionDeclaration(node) || (ts.isFunctionExpression(node) && !ts.isArrowFunction(node))) {
+    } else if ((ts.isFunctionDeclaration(node) && node.body) || (ts.isFunctionExpression(node) && !ts.isArrowFunction(node))) {
       return 'function';
     } else if (ts.isGetAccessor(node)) {
       return 'getter';
     } else if (ts.isSetAccessor(node)) {
       return 'setter';
+    } else if (ts.isSourceFile(node)) {
+      return 'file';
     }
   }
 
   #transformers = new Map<TransformerType, TransformerSet<S>>();
-  #logTarget: string;
   #getState: (context: ts.TransformationContext, src: ts.SourceFile) => S;
 
   constructor(
     getState: (context: ts.TransformationContext, src: ts.SourceFile) => S,
-    transformers: NodeTransformer<S, TransformerType, ts.Node>[],
-    logTarget = 'compiler.log'
+    transformers: NodeTransformer<S, TransformerType, ts.Node>[]
   ) {
-    this.#logTarget = logTarget;
     this.#getState = getState;
     this.#init(transformers);
   }
@@ -83,17 +77,11 @@ export class VisitorFactory<S extends State = State> {
    */
   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 },
-        });
-
-        ConsoleManager.set({
-          onLog: (level, ctx, args) => c[level](level, ctx, ...LogUtil.collapseNodes(args))
-        });
+      if (!file.fileName.endsWith('.ts')) { // Skip all non-ts files
+        return file;
+      }
 
-        console.debug('Processing', { file: file.fileName, pid: process.pid });
+      try {
         const state = this.#getState(context, file);
         let ret = this.visit(state, context, file);
 
@@ -101,12 +89,11 @@ export class VisitorFactory<S extends State = State> {
         const changed = state.added.size;
         let statements: ts.NodeArray<ts.Statement> | ts.Statement[] = ret.statements;
         while (state.added.size) {
-          for (const [k, all] of [...state.added]) {
-            const idx = k === -1 ? state.added.size : k;
+          for (const [idx, all] of [...state.added].sort(([idxA], [idxB]) => idxB - idxA)) {
             statements = [
-              ...statements.slice(0, idx),
+              ...statements.slice(0, Math.max(idx, 0)),
               ...all.map(v => this.visit(state, context, v)),
-              ...statements.slice(idx)
+              ...statements.slice(Math.max(idx, 0))
             ];
             state.added.delete(idx);
           }
@@ -120,12 +107,10 @@ 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;
-      } finally {
-        ConsoleManager.clear(); // Reset logging
       }
     };
   }

package/index.ts

@@ -1,7 +0,0 @@
-export * from './src/state';
-export * from './src/visitor';
-export * from './src/register';
-export * from './src/types/visitor';
-export * from './src/types/shared';
-export { AnyType } from './src/resolver/types';
-export * from './src/util';

package/src/util/index.ts

@@ -1,6 +0,0 @@
-export * from './core';
-export * from './declaration';
-export * from './decorator';
-export * from './doc';
-export * from './literal';
-export * from './log';

package/test-support/util.ts

@@ -1,57 +0,0 @@
-import * as ts from 'typescript';
-import { readFileSync } from 'fs';
-
-import { FsUtil, ScanFs } from '@travetto/boot';
-import { Util } from '@travetto/base';
-
-import { VisitorFactory, TransformerState, getAllTransformers } from '..';
-
-/**
- * Utils for testing transformers
- */
-export class TransformerTestUtil {
-  /**
-   * Compile a single file from a folder
-   */
-  static async compile(folder: string, file?: string): Promise<string> {
-
-    const tsconfigObj = await import('@travetto/boot/tsconfig.trv.json');
-
-    const prog = ts.createProgram({
-      options: ts.convertCompilerOptionsFromJson(tsconfigObj, '').options,
-      rootNames: (await ScanFs.scanDir({ testFile: f => f.startsWith('src/') && f.endsWith('.ts') }, folder))
-        .filter(x => x.stats?.isFile())
-        .filter(x => !file || x.file.endsWith(file))
-        .map(x => x.file),
-    });
-    const log = `${folder}/.trv_compiler.log`;
-
-    await FsUtil.unlinkRecursive(log);
-
-    const transformers =
-      (await ScanFs.scanDir({ testFile: f => f.startsWith('support/transformer') }, folder))
-        .filter(x => x.stats?.isFile())
-        .map(x => import(x.file).then(getAllTransformers));
-
-    const visitor = new VisitorFactory(
-      (ctx, src) => new TransformerState(src, ctx.factory, prog.getTypeChecker()),
-      (await Promise.all(transformers)).flat(),
-      log
-    );
-
-    const out = await new Promise<string>(res => {
-      prog.emit(prog.getSourceFile(`src/${file}`), (__, data) => res(data), undefined, false,
-        { before: [visitor.visitor()] }
-      );
-    });
-
-    await Util.wait('1s'); // Wait for file buffer to sync
-    try {
-      console.info(readFileSync(log, 'utf8'));
-    } catch { }
-
-    await FsUtil.unlinkRecursive(log);
-
-    return out;
-  }
-}