@travetto/transformer 3.4.0-rc.2 → 3.4.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

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

package/src/state.ts

@@ -296,28 +296,43 @@ export class TransformerState implements State {
    */
   generateUniqueIdentifier(node: ts.Node, type: AnyType): string {
     let unique: string | undefined;
+    let name = type.name && !type.name.startsWith('_') ? type.name : '';
+    if (!name && hasEscapedName(node)) {
+      name = `${node.name.escapedText}`;
+    }
+    name ||= 'Shape';
+
     try {
       // Tie to source location if possible
       const tgt = DeclarationUtil.getPrimaryDeclarationNode(type.original!);
       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()}`;
+        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());
+            }
+          }
+          child = child.parent;
+        }
+        if (!route.length) { // Only filename
+          route.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.naiveHash(`${imp}${type.name ?? 'unknown'}`)}`;
+      unique = SystemUtil.naiveHashString(`${imp}${type.name ?? 'unknown'}`, 12);
     }
     // Otherwise read name with uuid
-    let name = type.name && !type.name.startsWith('_') ? type.name : '';
-    if (!name && hasEscapedName(node)) {
-      name = `${node.name.escapedText}`;
-    }
-    name ||= 'Shape';
-    return unique ? `${name}_${unique}` : name;
+    return unique ? `${name}__${unique}` : name;
   }
 
   /**

package/src/util/system.ts

@@ -28,4 +28,8 @@ export class SystemUtil {
 
     return Math.abs(hash);
   }
+
+  static naiveHashString(text: string, length: number): string {
+    return this.naiveHash(text).toString().padStart(length, '0').substring(0, length);
+  }
 }