@travetto/transformer 5.0.2 → 5.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/transformer",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Functionality for AST transformations, with transformer registration, and general utils",
   "keywords": [
     "typescript",
@@ -24,9 +24,9 @@
     "directory": "module/transformer"
   },
   "dependencies": {
-    "@travetto/manifest": "^5.0.1",
+    "@travetto/manifest": "^5.0.2",
     "tslib": "^2.7.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   },
   "travetto": {
     "displayName": "Transformation",

package/src/importer.ts

@@ -29,20 +29,9 @@ export class ImportManager {
     this.#importName = this.#resolver.getFileImportName(source.fileName);
   }
 
-  #getImportFile(spec?: ts.Expression): string | undefined {
-    if (spec && ts.isStringLiteral(spec)) {
-      return spec.text.replace(/^['"]|["']$/g, '');
-    }
-  }
-
   #rewriteModuleSpecifier(spec: ts.Expression | undefined): ts.Expression | undefined {
-    const fileOrImport = this.#getImportFile(spec);
-    if (
-      fileOrImport &&
-      (fileOrImport.startsWith('.') || this.#resolver.isKnownFile(fileOrImport)) &&
-      !/[.]([mc]?js|ts|json)$/.test(fileOrImport)
-    ) {
-      return LiteralUtil.fromLiteral(this.factory, `${fileOrImport}.js`);
+    if (spec && ts.isStringLiteral(spec) && this.isUntypedImport(spec)) {
+      return LiteralUtil.fromLiteral(this.factory, `${spec.text.replace(/['"]/g, '')}.js`);
     }
     return spec;
   }
@@ -52,8 +41,7 @@ export class ImportManager {
       return clause;
     }
 
-    const fileOrImport = this.#getImportFile(spec);
-    if (!(fileOrImport && (fileOrImport.startsWith('.') || this.#resolver.isKnownFile(fileOrImport)))) {
+    if (spec && ts.isStringLiteral(spec) && !this.isKnownImport(spec)) {
       return clause;
     }
 
@@ -83,6 +71,35 @@ export class ImportManager {
     }
   }
 
+  /**
+   * Is a known import an untyped file access
+   * @param fileOrImport
+   */
+  isKnownImport(fileOrImport: ts.StringLiteral | string | undefined): boolean {
+    if (fileOrImport && typeof fileOrImport !== 'string') {
+      if (ts.isStringLiteral(fileOrImport)) {
+        fileOrImport = fileOrImport.text.replace(/['"]g/, '');
+      } else {
+        return false;
+      }
+    }
+
+    return fileOrImport ?
+      (fileOrImport.startsWith('.') || this.#resolver.isKnownFile(fileOrImport)) :
+      false;
+  }
+
+
+  /**
+   * Is a file or import an untyped file access
+   * @param fileOrImport
+   */
+  isUntypedImport(fileOrImport: ts.StringLiteral | string | undefined): boolean {
+    return this.isKnownImport(fileOrImport) &&
+      !/[.](([mc]?[jt]s)|json)['"]?$/
+        .test(typeof fileOrImport === 'string' ? fileOrImport : fileOrImport!.text);
+  }
+
   /**
    * Produces a unique ID for a given file, importing if needed
    */
@@ -190,7 +207,7 @@ export class ImportManager {
             stmt.isTypeOnly,
             stmt.exportClause,
             this.#rewriteModuleSpecifier(stmt.moduleSpecifier),
-            stmt.assertClause
+            stmt.attributes
           ));
         }
       } else if (ts.isImportDeclaration(stmt)) {
@@ -200,7 +217,7 @@ export class ImportManager {
             stmt.modifiers,
             this.#rewriteImportClause(stmt.moduleSpecifier, stmt.importClause)!,
             this.#rewriteModuleSpecifier(stmt.moduleSpecifier)!,
-            stmt.assertClause
+            stmt.attributes
           ));
         }
       } else {

package/src/state.ts

@@ -47,6 +47,14 @@ export class TransformerState implements State {
     this.importName = this.#resolver.getFileImportName(this.file, true);
   }
 
+  /**
+   * Is a file or an import file path known by the framework, but missing an extensions
+   * @param fileOrImport
+   */
+  isUntypedImport(fileOrImport: ts.StringLiteral | string | undefined): boolean {
+    return this.#imports.isUntypedImport(fileOrImport);
+  }
+
   /**
    * Get or import the node or external type
    */

package/src/visitor.ts

@@ -1,10 +1,12 @@
 import ts from 'typescript';
 
-import { ManifestModuleUtil } from '@travetto/manifest';
+import { ManifestModuleFolderType, ManifestModuleUtil } from '@travetto/manifest';
 
 import { DecoratorMeta, TransformerType, NodeTransformer, TransformerSet, State, TransformPhase } from './types/visitor';
 import { CoreUtil } from './util/core';
 
+const COMPILER_SRC = new Set<ManifestModuleFolderType>(['support', 'src', '$index']);
+
 /**
  * AST Visitor Factory, combines all active transformers into a single pass transformer for the ts compiler
  */
@@ -86,6 +88,14 @@ export class VisitorFactory<S extends State = State> {
 
       try {
         const state = this.#getState(context, file);
+        // Skip transforming all the compiler related content
+        if (
+          /@travetto[/](compiler|manifest|transformer)/.test(state.importName) &&
+          COMPILER_SRC.has(ManifestModuleUtil.getFolderKey(state.importName.replace(/@travetto[/][^/]+[/]/, '')))
+        ) {
+          return state.finalize(file);
+        }
+
         let ret = this.visit(state, context, file);
 
         // Process added content