@travetto/transformer 3.4.1 → 3.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/transformer",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Functionality for AST transformations, with transformer registration, and general utils",
   "keywords": [
     "typescript",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@travetto/manifest": "^3.4.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "travetto": {
     "displayName": "Transformation",

package/src/state.ts

@@ -295,7 +295,7 @@ export class TransformerState implements State {
    * @param type
    */
   generateUniqueIdentifier(node: ts.Node, type: AnyType): string {
-    let unique: string | undefined;
+    let unique: string[] = [];
     let name = type.name && !type.name.startsWith('_') ? type.name : '';
     if (!name && hasEscapedName(node)) {
       name = `${node.name.escapedText}`;
@@ -308,31 +308,31 @@ export class TransformerState implements State {
       const fileName = tgt.getSourceFile().fileName;
 
       if (fileName === this.source.fileName) { // if in same file suffix with location
-        const route: string[] = [];
         let child = node;
         while (child && !ts.isSourceFile(child)) {
           if (ts.isFunctionDeclaration(child) || ts.isMethodDeclaration(child) || ts.isClassDeclaration(child)) {
             if (child.name) {
-              route.push(child.name.getText());
+              unique.push(child.name.getText());
             }
           }
           child = child.parent;
         }
-        if (!route.length) { // Only filename
-          route.push(ts.getLineAndCharacterOfPosition(tgt.getSourceFile(), tgt.getStart()).line.toString());
+        if (!unique.length) { // a top level type
+          unique.push(ts.getLineAndCharacterOfPosition(tgt.getSourceFile(), tgt.getStart()).line.toString());
         }
-        route.unshift(fileName);
-        unique = SystemUtil.naiveHashString(route.join(':'), 12);
       } else {
         // Otherwise treat it as external and add nothing to it
       }
     } catch {
-      // Determine type unique ident
-      const imp = this.#resolver.getFileImportName(this.source.fileName);
-      unique = SystemUtil.naiveHashString(`${imp}${type.name ?? 'unknown'}`, 12);
+      unique = [type.name ?? 'unknown']; // Type is only unique piece
+    }
+
+    if (unique.length) { // Make unique to file
+      unique.unshift(this.#resolver.getFileImportName(this.source.fileName));
+      return `${name}__${SystemUtil.naiveHashString(unique.join(':'), 12)}`;
+    } else {
+      return name;
     }
-    // Otherwise read name with uuid
-    return unique ? `${name}__${unique}` : name;
   }
 
   /**

package/src/util/system.ts

@@ -1,20 +1,5 @@
-import crypto from 'crypto';
-
 export class SystemUtil {
 
-  /**
-   * Generate a random UUID
-   * @param len The length of the uuid to generate
-   */
-  static uuid(len: number = 32): string {
-    const bytes = crypto.randomBytes(Math.ceil(len / 2));
-    // eslint-disable-next-line no-bitwise
-    bytes[6] = (bytes[6] & 0x0f) | 0x40;
-    // eslint-disable-next-line no-bitwise
-    bytes[8] = (bytes[8] & 0x3f) | 0x80;
-    return bytes.toString('hex').substring(0, len);
-  }
-
   /**
    * Naive hashing
    */