@travetto/transformer 5.0.0-rc.1 → 5.0.0-rc.3

package/README.md

@@ -104,20 +104,16 @@ export class Test {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TEST = void 0;
 const tslib_1 = require("tslib");
-const Ⲑ_runtime_1 = tslib_1.__importStar(require("@travetto/manifest/src/runtime.js"));
-const Ⲑ_decorator_1 = tslib_1.__importStar(require("@travetto/registry/src/decorator.js"));
-var ᚕf = "@travetto/transformer/doc/upper.js";
-let TEST = class TEST {
-    static Ⲑinit = Ⲑ_runtime_1.RuntimeIndex.registerFunction(TEST, ᚕf, { hash: 649563175, lines: [1, 9] }, { COMPUTEAGE: { hash: 1286718349, lines: [6, 8] } }, false, false);
+const Ⲑ_function_1 = tslib_1.__importStar(require("@travetto/runtime/src/function.js"));
+var ᚕm = ["@travetto/transformer", "doc/upper"];
+class TEST {
+    static Ⲑinit = Ⲑ_function_1.registerFunction(TEST, ᚕm, { hash: 649563175, lines: [1, 9] }, { COMPUTEAGE: { hash: 1286718349, lines: [6, 8, 7] } }, false, false);
     NAME;
     AGE;
     DOB;
     COMPUTEAGE() {
         this['AGE'] = (Date.now() - this.DOB.getTime());
     }
-};
+}
 exports.TEST = TEST;
-exports.TEST = TEST = tslib_1.__decorate([
-    Ⲑ_decorator_1.Register()
-], TEST);
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/transformer",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.3",
   "description": "Functionality for AST transformations, with transformer registration, and general utils",
   "keywords": [
     "typescript",
@@ -24,7 +24,7 @@
     "directory": "module/transformer"
   },
   "dependencies": {
-    "@travetto/manifest": "^5.0.0-rc.1",
+    "@travetto/manifest": "^5.0.0-rc.2",
     "tslib": "^2.6.3",
     "typescript": "^5.5.3"
   },

package/src/manager.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { ManifestIndex, RuntimeIndex } from '@travetto/manifest';
+import { ManifestIndex } from '@travetto/manifest';
 
 import { NodeTransformer } from './types/visitor';
 import { VisitorFactory } from './visitor';
@@ -19,12 +19,12 @@ export class TransformerManager {
    * @returns
    */
   static async create(manifestIndex: ManifestIndex): Promise<TransformerManager> {
-    const transformerFiles = RuntimeIndex.find({ folder: f => f === '$transformer' }).map(f => f.sourceFile);
+    const transformerFiles = manifestIndex.find({ folder: f => f === '$transformer' }).map(f => f.sourceFile);
 
     const transformers: NodeTransformer<TransformerState>[] = [];
 
     for (const file of transformerFiles) { // Exclude based on blacklist
-      const entry = RuntimeIndex.getEntry(file)!;
+      const entry = manifestIndex.getEntry(file)!;
       transformers.push(...getAllTransformers(await import(entry.import), entry.module));
     }
 

package/src/resolver/service.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { path, ManifestIndex, ManifestModuleUtil } from '@travetto/manifest';
+import { path, ManifestIndex, ManifestModuleUtil, IndexedFile } from '@travetto/manifest';
 
 import type { AnyType, TransformResolver } from './types';
 import { TypeCategorize, TypeBuilder } from './builder';
@@ -29,9 +29,9 @@ export class SimpleResolver implements TransformResolver {
   }
 
   /**
-   * Resolve an import name (e.g. @module/path/file) for a file
+   * Resolve an import for a file
    */
-  getFileImportName(file: string, removeExt?: boolean): string {
+  getFileImport(file: string): IndexedFile | undefined {
     let sourceFile = path.toPosix(file);
 
     const type = ManifestModuleUtil.getFileType(file);
@@ -40,11 +40,14 @@ export class SimpleResolver implements TransformResolver {
       sourceFile = `${sourceFile}.ts`;
     }
 
-    const imp =
-      this.#manifestIndex.getEntry(ManifestModuleUtil.getFileType(sourceFile) === 'ts' ? sourceFile : `${sourceFile}.js`)?.import ??
-      this.#manifestIndex.getFromImport(ManifestModuleUtil.sourceToBlankExt(sourceFile).replace(/^.*node_modules\//, ''))?.import ??
-      file;
-
+    return this.#manifestIndex.getEntry(ManifestModuleUtil.getFileType(sourceFile) === 'ts' ? sourceFile : `${sourceFile}.js`) ??
+      this.#manifestIndex.getFromImport(ManifestModuleUtil.sourceToBlankExt(sourceFile).replace(/^.*node_modules\//, ''));
+  }
+  /**
+   * Resolve an import name (e.g. @module/path/file) for a file
+   */
+  getFileImportName(file: string, removeExt?: boolean): string {
+    const imp = this.getFileImport(file)?.import ?? file;
     return removeExt ? ManifestModuleUtil.sourceToBlankExt(imp) : imp;
   }
 

package/src/state.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { path, ManifestIndex } from '@travetto/manifest';
+import { path, ManifestIndex, ManifestModuleUtil } from '@travetto/manifest';
 
 import { ManagedType, AnyType, ForeignType } from './resolver/types';
 import { State, DecoratorMeta, Transformer, ModuleNameⲐ } from './types/visitor';
@@ -33,7 +33,7 @@ export class TransformerState implements State {
 
   #resolver: SimpleResolver;
   #imports: ImportManager;
-  #fileIdent: ts.Identifier;
+  #modIdent: ts.Identifier;
   #manifestIndex: ManifestIndex;
   #syntheticIdentifiers = new Map<string, ts.Identifier>();
   #decorators = new Map<string, ts.PropertyAccessExpression>();
@@ -261,17 +261,18 @@ export class TransformerState implements State {
   /**
    * Get filename identifier, regardless of module system
    */
-  getFilenameIdentifier(): ts.Expression {
-    if (this.#fileIdent === undefined) {
-      this.#fileIdent = this.createIdentifier('ᚕf');
-      const decl = this.factory.createVariableDeclaration(this.#fileIdent, undefined, undefined,
-        this.fromLiteral(this.#resolver.getFileImportName(this.source.fileName) ?? this.source.fileName)
+  getModuleIdentifier(): ts.Expression {
+    if (this.#modIdent === undefined) {
+      this.#modIdent = this.createIdentifier('ᚕm');
+      const entry = this.#resolver.getFileImport(this.source.fileName);
+      const decl = this.factory.createVariableDeclaration(this.#modIdent, undefined, undefined,
+        this.fromLiteral([entry?.module, ManifestModuleUtil.sourceToBlankExt(entry?.relativeFile ?? '')])
       );
       this.addStatements([
         this.factory.createVariableStatement([], this.factory.createVariableDeclarationList([decl]))
       ], -1);
     }
-    return this.#fileIdent;
+    return this.#modIdent;
   }
 
   /**

package/src/util/decorator.ts

@@ -6,20 +6,31 @@ import { CoreUtil } from './core';
  */
 export class DecoratorUtil {
 
+  static #getIdentFromExpression(e: ts.Expression): ts.Identifier {
+    if (ts.isCallExpression(e) && ts.isIdentifier(e.expression)) {
+      return e.expression;
+    } else if (ts.isIdentifier(e)) {
+      return e;
+    } else if (ts.isCallExpression(e) && ts.isPropertyAccessExpression(e.expression) && ts.isIdentifier(e.expression.expression)) {
+      return e.expression.expression;
+    } else if (ts.isPropertyAccessExpression(e) && ts.isCallExpression(e.expression) && ts.isIdentifier(e.expression.expression)) {
+      return e.expression.expression;
+    } else if (ts.isParenthesizedExpression(e)) {
+      return this.#getIdentFromExpression(e.expression);
+    } else {
+      throw new Error('No Identifier');
+    }
+  }
+
   /**
    * Get identifier for a decorator
    */
   static getDecoratorIdent(d: ts.Decorator): ts.Identifier {
-    if (ts.isCallExpression(d.expression) && ts.isIdentifier(d.expression.expression)) {
-      return d.expression.expression;
-    } else if (ts.isIdentifier(d.expression)) {
-      return d.expression;
-    } else if (ts.isCallExpression(d.expression) && ts.isPropertyAccessExpression(d.expression.expression) && ts.isIdentifier(d.expression.expression.expression)) {
-      return d.expression.expression.expression;
-    } else if (ts.isPropertyAccessExpression(d.expression) && ts.isCallExpression(d.expression.expression) && ts.isIdentifier(d.expression.expression.expression)) {
-      return d.expression.expression.expression;
-    } else {
+    const ident = this.#getIdentFromExpression(d.expression);
+    if (!ident) {
       throw new Error('No Identifier');
+    } else {
+      return ident;
     }
   }