Map ts.Identifier

openrewrite · Sep 25, 2024 · 75fc5e7 · 75fc5e7
1 parent bcd7851
commit 75fc5e7
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 6 deletions.
diff --git a/openrewrite/src/javascript/extensions.ts b/openrewrite/src/javascript/extensions.ts
@@ -20,17 +20,17 @@ export function visitRightPadded<P, T>(v: JavaScriptVisitor<P>, right: JRightPad
 }
 
 export function visitJsSpace<P>(v: JavaScriptVisitor<P>, space: Space | null, loc: JsSpace.Location, p: P): Space {
-    throw new Error("Not yet implemented!");
+    return visitSpace(v, space, Space.Location.LANGUAGE_EXTENSION, p);
 }
 
 export function visitJsLeftPadded<P, T>(v: JavaScriptVisitor<P>, left: JLeftPadded<T> | null, loc: JsLeftPadded.Location, p: P): JLeftPadded<T> {
-    throw new Error("Not yet implemented!");
+    return visitLeftPadded(v, left, JLeftPadded.Location.LANGUAGE_EXTENSION, p);
 }
 
 export function visitJsRightPadded<P, T>(v: JavaScriptVisitor<P>, right: JRightPadded<T> | null, loc: JsRightPadded.Location, p: P): JRightPadded<T> {
-    throw new Error("Not yet implemented!");
+    return visitRightPadded(v, right, JRightPadded.Location.LANGUAGE_EXTENSION, p);
 }
 
 export function visitJsContainer<P, T>(v: JavaScriptVisitor<P>, container: JContainer<T> | null, loc: JsContainer.Location, p: P): JContainer<T> {
-    throw new Error("Not yet implemented!");
+    return visitContainer(v, container, JContainer.Location.LANGUAGE_EXTENSION, p);
 }
diff --git a/openrewrite/src/javascript/parser.ts b/openrewrite/src/javascript/parser.ts
@@ -234,6 +234,16 @@ export class JavaScriptParserVisitor {
     }
 
     visitIdentifier(node: ts.Identifier) {
+        let type = this.mapType(node);
+        return new J.Identifier(
+            randomId(),
+            this.prefix(node),
+            Markers.EMPTY,
+            [], // FIXME decorators
+            node.text,
+            type instanceof JavaType.Variable ? type.type : type,
+            type instanceof JavaType.Variable ? type : null
+        )
         return this.visitUnknown(node);
     }
 

diff --git a/openrewrite/src/javascript/tree/support_types.ts b/openrewrite/src/javascript/tree/support_types.ts
@@ -29,6 +29,7 @@ export function isJavaScript(tree: any): tree is JS {
 export function JSMixin<TBase extends Constructor<Object>>(Base: TBase) {
     abstract class JSMixed extends Base implements JS {
         static isTree = true;
+        static isJava = true;
         static isJavaScript = true;
 
         abstract get prefix(): Space;

diff --git a/openrewrite/test/javascript/parser/identifier.test.ts b/openrewrite/test/javascript/parser/identifier.test.ts
@@ -0,0 +1,13 @@
+import {connect, disconnect, javaScript, rewriteRunWithOptions} from '../testHarness';
+
+describe('literal mapping', () => {
+    beforeAll(() => connect());
+    afterAll(() => disconnect());
+
+    test('simple', () => {
+        rewriteRunWithOptions(
+          {normalizeIndent: false},
+          javaScript('foo')
+        );
+    });
+});
diff --git a/openrewrite/test/javascript/parser/variableDeclarations.test.ts b/openrewrite/test/javascript/parser/variableDeclarations.test.ts
@@ -7,7 +7,8 @@ describe('variable declaration mapping', () => {
 
     test('const', () => {
         rewriteRunWithOptions(
-          { validatePrintIdempotence: false},
+          // FIXME not quite there yet
+          {validatePrintIdempotence: false, allowUnknowns: true},
           javaScript(
             //language=javascript
             `

diff --git a/openrewrite/test/javascript/testHarness.ts b/openrewrite/test/javascript/testHarness.ts
@@ -1,15 +1,17 @@
 import {Cursor, PrinterFactory, PrintOutputCapture, SourceFile} from '../../dist/core';
+import * as J from "../../dist/java/tree";
 import * as JS from "../../dist/javascript/tree";
 import dedent from "dedent";
 import {ReceiverContext, RemotePrinterFactory, RemotingContext, SenderContext} from "@openrewrite/rewrite-remote";
 import * as deser from "@openrewrite/rewrite-remote/java/serializers";
 import {JavaScriptReceiver, JavaScriptSender} from "@openrewrite/rewrite-remote/javascript";
 import net from "net";
-import {JavaScriptParser} from "../../dist/javascript";
+import {JavaScriptParser, JavaScriptVisitor} from "../../dist/javascript";
 
 export interface RewriteTestOptions {
     normalizeIndent?: boolean
     validatePrintIdempotence?: boolean
+    allowUnknowns?: boolean
 }
 
 export type SourceSpec = (options: RewriteTestOptions) => void;
@@ -70,6 +72,18 @@ const parser = JavaScriptParser.builder().build();
 export function javaScript(before: string, spec?: (sourceFile: JS.CompilationUnit) => void): SourceSpec {
     return (options: RewriteTestOptions) => {
         const [sourceFile] = parser.parseStrings(options.normalizeIndent ?? true ? dedent(before) : before) as Iterable<JS.CompilationUnit>;
+        if (!(options.allowUnknowns ?? false)) {
+            let unknowns: J.Unknown[] = [];
+            new class extends JavaScriptVisitor<number> {
+                visitUnknown(unknown: J.Unknown, p: number): J.J | null {
+                    unknowns.push(unknown);
+                    return unknown;
+                }
+            }().visit(sourceFile, 0);
+            if (unknowns.length != 0) {
+                throw new Error("No J.Unknown instances were expected: " + unknowns.map(u => u.source.text));
+            }
+        }
         if (options.validatePrintIdempotence ?? true) {
             let printed = print(sourceFile);
             expect(printed).toBe(before);