@travetto/transformer 5.0.0-rc.4 → 5.0.0-rc.5

package/README.md

@@ -105,7 +105,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TEST = void 0;
 const tslib_1 = require("tslib");
 const Ⲑ_function_1 = tslib_1.__importStar(require("@travetto/runtime/src/function.js"));
-var ᚕm = ["@travetto/transformer", "doc/upper"];
+var ᚕm = ["@travetto/transformer", "doc/upper.ts"];
 class TEST {
     static Ⲑinit = Ⲑ_function_1.registerFunction(TEST, ᚕm, { hash: 649563175, lines: [1, 9] }, { COMPUTEAGE: { hash: 1286718349, lines: [6, 8, 7] } }, false, false);
     NAME;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/transformer",
-  "version": "5.0.0-rc.4",
+  "version": "5.0.0-rc.5",
   "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.3",
+    "@travetto/manifest": "^5.0.0-rc.4",
     "tslib": "^2.6.3",
     "typescript": "^5.5.3"
   },

package/src/importer.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { PackageUtil, path } from '@travetto/manifest';
+import { ManifestModuleUtil, PackageUtil, path } from '@travetto/manifest';
 
 import { AnyType, TransformResolver, ManagedType } from './resolver/types';
 import { ImportUtil } from './util/import';
@@ -104,6 +104,10 @@ export class ImportManager {
   importFile(file: string, name?: string): Import {
     file = this.#resolver.getFileImportName(file);
 
+    if (file.endsWith('.ts') && !file.endsWith('.d.ts')) {
+      file = ManifestModuleUtil.withOutputExtension(file);
+    }
+
     // Allow for node classes to be imported directly
     if (/@types\/node/.test(file)) {
       file = PackageUtil.resolveImport(file.replace(/.*@types\/node\//, '').replace(D_OR_D_TS_EXT_RE, ''));

package/src/manager.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { ManifestIndex } from '@travetto/manifest';
+import { ManifestIndex, ManifestModuleUtil } from '@travetto/manifest';
 
 import { NodeTransformer } from './types/visitor';
 import { VisitorFactory } from './visitor';
@@ -25,7 +25,7 @@ export class TransformerManager {
 
     for (const file of transformerFiles) { // Exclude based on blacklist
       const entry = manifestIndex.getEntry(file)!;
-      transformers.push(...getAllTransformers(await import(entry.import), entry.module));
+      transformers.push(...getAllTransformers(await import(ManifestModuleUtil.withOutputExtension(entry.import)), entry.module));
     }
 
     for (const x of transformers) {

package/src/resolver/service.ts

@@ -41,14 +41,15 @@ export class SimpleResolver implements TransformResolver {
     }
 
     return this.#manifestIndex.getEntry(ManifestModuleUtil.getFileType(sourceFile) === 'ts' ? sourceFile : `${sourceFile}.js`) ??
-      this.#manifestIndex.getFromImport(ManifestModuleUtil.sourceToBlankExt(sourceFile).replace(/^.*node_modules\//, ''));
+      this.#manifestIndex.getFromImport(ManifestModuleUtil.withoutSourceExtension(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;
+    return removeExt ? ManifestModuleUtil.withoutSourceExtension(imp) : imp;
   }
 
   /**

package/src/state.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { path, ManifestIndex, ManifestModuleUtil } from '@travetto/manifest';
+import { path, ManifestIndex } from '@travetto/manifest';
 
 import { ManagedType, AnyType, ForeignType } from './resolver/types';
 import { State, DecoratorMeta, Transformer, ModuleNameⲐ } from './types/visitor';
@@ -266,7 +266,7 @@ export class TransformerState implements State {
       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.fromLiteral([entry?.module, entry?.relativeFile ?? ''])
       );
       this.addStatements([
         this.factory.createVariableStatement([], this.factory.createVariableDeclarationList([decl]))