@travetto/transformer 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/transformer",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Functionality for AST transformations, with transformer registration, and general utils",
   "keywords": [
     "typescript",

package/src/state.ts

@@ -295,24 +295,29 @@ export class TransformerState implements State {
    * @param type
    */
   generateUniqueIdentifier(node: ts.Node, type: AnyType): string {
-    let unique: string;
+    let unique: string | undefined;
     try {
       // Tie to source location if possible
       const tgt = DeclarationUtil.getPrimaryDeclarationNode(type.original!);
-      unique = `${ts.getLineAndCharacterOfPosition(tgt.getSourceFile(), tgt.getStart()).line}_${tgt.getEnd() - tgt.getStart()}`;
-      if (tgt.getSourceFile().fileName !== this.source.fileName) { // if in same file
-        unique = `${SystemUtil.naiveHash(tgt.getSourceFile().fileName)}_${unique}`;
+      const fileName = tgt.getSourceFile().fileName;
+
+      if (fileName === this.source.fileName) { // if in same file suffix with location
+        unique = `${ts.getLineAndCharacterOfPosition(tgt.getSourceFile(), tgt.getStart()).line}_${tgt.getEnd() - tgt.getStart()}`;
+      } else {
+        // Otherwise treat it as external and add nothing to it
       }
     } catch {
       // Determine type unique ident
-      unique = SystemUtil.uuid(type.name ? 5 : 10);
+      const imp = this.#resolver.getFileImportName(this.source.fileName);
+      unique = `${SystemUtil.naiveHash(`${imp}${type.name ?? 'unknown'}`)}`;
     }
     // Otherwise read name with uuid
     let name = type.name && !type.name.startsWith('_') ? type.name : '';
     if (!name && hasEscapedName(node)) {
       name = `${node.name.escapedText}`;
     }
-    return `${name}_${unique}`;
+    name ||= 'Shape';
+    return unique ? `${name}_${unique}` : name;
   }
 
   /**