Merge pull request #133 from j4k0xb/fix/invalid-identifiers

fix: invalid identifiers

src/plugins/local-llm-rename/visit-all-identifiers.test.ts

@@ -207,3 +207,36 @@ e.b;
     })
   );
 });
+
+test("should handle invalid identifiers", async () => {
+  const code = `const a = 1`;
+  const result = await visitAllIdentifiers(code, async () => "this.kLength");
+  assert.equal(result, "const thisKLength = 1;");
+});
+
+test("should handle space in identifier name (happens for some reason though it shouldn't)", async () => {
+  const code = `const a = 1`;
+  const result = await visitAllIdentifiers(code, async () => "foo bar");
+  assert.equal(result, "const fooBar = 1;");
+});
+
+test("should handle reserved identifiers", async () => {
+  const code = `const a = 1`;
+  const result = await visitAllIdentifiers(code, async () => "static");
+  assert.equal(result, "const _static = 1;");
+});
+
+test("should handle multiple identifiers named the same", async () => {
+  const code = `
+const a = 1;
+const b = 1;
+`.trim();
+  const result = await visitAllIdentifiers(code, async () => "foo");
+  assert.equal(
+    result,
+    `
+const foo = 1;
+const _foo = 1;
+`.trim()
+  );
+});

src/plugins/local-llm-rename/visit-all-identifiers.ts

@@ -1,6 +1,6 @@
 import { parseAsync, transformFromAstAsync, NodePath } from "@babel/core";
 import * as babelTraverse from "@babel/traverse";
-import { Identifier, isValidIdentifier, Node } from "@babel/types";
+import { Identifier, toIdentifier, Node } from "@babel/types";
 
 const traverse: typeof babelTraverse.default.default = (
   typeof babelTraverse.default === "function"
@@ -39,7 +39,7 @@ export async function visitAllIdentifiers(
     const surroundingCode = await scopeToString(smallestScope);
     const renamed = await visitor(smallestScopeNode.name, surroundingCode);
 
-    let safeRenamed = isValidIdentifier(renamed) ? renamed : `_${renamed}`;
+    let safeRenamed = toIdentifier(renamed);
     while (renames.has(safeRenamed)) {
       safeRenamed = `_${safeRenamed}`;
     }