@openrewrite/rewrite 8.91.1 → 8.91.3

package/dist/javascript/parser.js

@@ -93,7 +93,7 @@ function getScriptKindFromFileName(fileName) {
     }
 }
 class JavaScriptParser extends parser_1.Parser {
-    constructor({ ctx, relativeTo, styles, sourceFileCache, } = {}) {
+    constructor({ ctx, relativeTo, styles, sourceFileCache, types, } = {}) {
         super({ ctx, relativeTo });
         this.compilerOptions = {
             target: typescript_1.default.ScriptTarget.Latest,
@@ -114,6 +114,12 @@ class JavaScriptParser extends parser_1.Parser {
             emitDecoratorMetadata: true,
             forceConsistentCasingInFileNames: false,
             jsx: typescript_1.default.JsxEmit.Preserve,
+            // Strictness is a property of the parsed project rather than of the compiler we pin: under
+            // `strictNullChecks` every nullable type carries an extra `null` union constituent.
+            strict: false,
+            // `types` defaults to `[]`, which attributes ambient `@types/*` packages only when named;
+            // `*` enumerates everything under `node_modules/@types`.
+            types: types !== null && types !== void 0 ? types : ["*"],
             baseUrl: relativeTo || process.cwd()
         };
         this.styles = styles;
@@ -329,12 +335,12 @@ class JavaScriptParser extends parser_1.Parser {
                     continue;
                 }
                 try {
-                    yield yield __await((0, mutative_1.create)(new JavaScriptParserVisitor(sourceFile, this.relativePath(input), typeMapping)
+                    yield yield __await(yield __await(this.requirePrintEqualsInput((0, mutative_1.create)(new JavaScriptParserVisitor(sourceFile, this.relativePath(input), typeMapping)
                         .visit(sourceFile), draft => {
                         if (this.styles) {
                             draft.markers = this.styles.reduce((m, s) => (0, markers_1.replaceMarkerByKind)(m, s), draft.markers);
                         }
-                    }));
+                    }), input, escapeLoneSurrogates(sourceFile.getFullText()))));
                 }
                 catch (error) {
                     yield yield __await(this.error(input, error instanceof Error ? error : new Error('Parser threw unknown error: ' + error)));
@@ -557,6 +563,10 @@ class JavaScriptParserVisitor {
     }
     mapModifiers(node) {
         var _a, _b, _c, _d;
+        if (typescript_1.default.isPropertyAssignment(node) || typescript_1.default.isShorthandPropertyAssignment(node)) {
+            const modifiers = node.modifiers;
+            return modifiers ? modifiers.filter(typescript_1.default.isModifier).map(this.mapModifier) : [];
+        }
         if (typescript_1.default.isVariableStatement(node) || typescript_1.default.isModuleDeclaration(node) || typescript_1.default.isClassDeclaration(node) || typescript_1.default.isEnumDeclaration(node)
             || typescript_1.default.isInterfaceDeclaration(node) || typescript_1.default.isPropertyDeclaration(node) || typescript_1.default.isPropertySignature(node) || typescript_1.default.isParameter(node)
             || typescript_1.default.isMethodDeclaration(node) || typescript_1.default.isConstructorDeclaration(node) || typescript_1.default.isArrowFunction(node)
@@ -1056,6 +1066,7 @@ class JavaScriptParserVisitor {
     visitPropertySignature(node) {
         // FIXME We are mapping the literals in things like type ascii = { " ": 32; "!": 33; } to
         //  named variables, which is not a good use of this construct.
+        const initializer = node.initializer;
         return {
             kind: java_1.J.Kind.VariableDeclarations,
             id: (0, uuid_1.randomId)(),
@@ -1073,6 +1084,7 @@ class JavaScriptParserVisitor {
                         draft.markers = this.maybeAddOptionalMarker(draft, node);
                     }),
                     dimensionsAfterName: [],
+                    initializer: initializer && this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(initializer) - 1)), this.visit(initializer)),
                     variableType: this.mapVariableType(node)
                 }, java_1.emptySpace)]
         };
@@ -1259,6 +1271,7 @@ class JavaScriptParserVisitor {
             leadingAnnotations: this.mapDecorators(node),
             modifiers: this.mapModifiers(node),
             nameAnnotations: [],
+            returnTypeExpression: this.mapTypeInfo(node),
             name: Object.assign(Object.assign({}, this.mapIdentifier(constructorKeyword, constructorKeyword.getText(), false)), { type: methodType }),
             parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
             dimensionsAfterName: [],
@@ -1277,6 +1290,7 @@ class JavaScriptParserVisitor {
                 markers: markers_1.emptyMarkers,
                 leadingAnnotations: this.mapDecorators(node),
                 modifiers: this.mapModifiers(node),
+                typeParameters: node.typeParameters && this.mapTypeParametersAsObject(node),
                 returnTypeExpression: this.mapTypeInfo(node),
                 name: name,
                 parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
@@ -1291,6 +1305,7 @@ class JavaScriptParserVisitor {
             markers: markers_1.emptyMarkers,
             leadingAnnotations: this.mapDecorators(node),
             modifiers: this.mapModifiers(node),
+            typeParameters: node.typeParameters && this.mapTypeParametersAsObject(node),
             returnTypeExpression: this.mapTypeInfo(node),
             nameAnnotations: [],
             name: name,
@@ -1311,6 +1326,8 @@ class JavaScriptParserVisitor {
                 markers: markers_1.emptyMarkers,
                 leadingAnnotations: this.mapDecorators(node),
                 modifiers: this.mapModifiers(node),
+                typeParameters: node.typeParameters && this.mapTypeParametersAsObject(node),
+                returnTypeExpression: this.mapTypeInfo(node),
                 name: name,
                 parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
                 body: node.body && this.convert(node.body),
@@ -1324,6 +1341,8 @@ class JavaScriptParserVisitor {
             markers: markers_1.emptyMarkers,
             leadingAnnotations: this.mapDecorators(node),
             modifiers: this.mapModifiers(node),
+            typeParameters: node.typeParameters && this.mapTypeParametersAsObject(node),
+            returnTypeExpression: this.mapTypeInfo(node),
             nameAnnotations: [],
             name: name,
             parameters: this.mapCommaSeparatedList(this.getParameterListNodes(node)),
@@ -3842,6 +3861,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
+            modifiers: this.mapModifiers(node),
             name: this.rightPadded(this.visit(node.name), this.suffix(node.name)),
             assigmentToken: _1.JS.PropertyAssignment.Token.Colon,
             initializer: this.visit(node.initializer)
@@ -3853,6 +3873,7 @@ class JavaScriptParserVisitor {
             id: (0, uuid_1.randomId)(),
             prefix: this.prefix(node),
             markers: markers_1.emptyMarkers,
+            modifiers: this.mapModifiers(node),
             name: this.rightPadded(this.visit(node.name), this.suffix(node.name)),
             assigmentToken: _1.JS.PropertyAssignment.Token.Equals,
             initializer: node.objectAssignmentInitializer && this.visit(node.objectAssignmentInitializer)
@@ -4311,6 +4332,8 @@ class FlowSyntaxNotSupportedError extends SyntaxError {
 }
 const SURR_FIRST = 0xD800;
 const SURR_LAST = 0xDFFF;
+const HIGH_SURR_LAST = 0xDBFF;
+const LOW_SURR_FIRST = 0xDC00;
 /**
  * Extracts invalid UTF-16 surrogate pairs from a string literal's value source.
  * Unmatched UTF-16 surrogate pairs (composed of two escape and code point pairs) are unserializable
@@ -4323,6 +4346,25 @@ const SURR_LAST = 0xDFFF;
  * 1. Unicode escape sequences (\uXXXX) where XXXX is in the surrogate range
  * 2. Raw surrogate characters in the source (character codes 0xD800-0xDFFF)
  */
+/** The form {@link extractSurrogateEscapes} can hold, against which print idempotence is measured. */
+function escapeLoneSurrogates(source) {
+    let escaped = '';
+    for (let j = 0; j < source.length; j++) {
+        const charCode = source.charCodeAt(j);
+        if (charCode >= SURR_FIRST && charCode <= SURR_LAST) {
+            const next = source.charCodeAt(j + 1);
+            if (charCode <= HIGH_SURR_LAST && next >= LOW_SURR_FIRST && next <= SURR_LAST) {
+                escaped += source.charAt(j) + source.charAt(j + 1);
+                j++;
+                continue;
+            }
+            escaped += "\\u" + charCode.toString(16).toUpperCase().padStart(4, '0');
+            continue;
+        }
+        escaped += source.charAt(j);
+    }
+    return escaped;
+}
 function extractSurrogateEscapes(valueSource) {
     const unicodeEscapes = [];
     let cleanedSource = '';
@@ -4343,8 +4385,17 @@ function extractSurrogateEscapes(valueSource) {
                 }
             }
         }
-        // Check for raw surrogate characters in the source
+        // A raw surrogate pair spells one code point — an emoji, say — and is carried as itself. A lone
+        // surrogate is not text on its own and does not survive serialization (#6599), so it is held as a
+        // `\uXXXX` escape and prints back as one.
         if (charCode >= SURR_FIRST && charCode <= SURR_LAST) {
+            const next = valueSource.charCodeAt(j + 1);
+            if (charCode <= HIGH_SURR_LAST && next >= LOW_SURR_FIRST && next <= SURR_LAST) {
+                cleanedSource += c + valueSource.charAt(j + 1);
+                cleanedIndex += 2;
+                j++;
+                continue;
+            }
             const codePoint = charCode.toString(16).toUpperCase().padStart(4, '0');
             unicodeEscapes.push({ valueSourceIndex: cleanedIndex, codePoint });
             continue;