@openrewrite/rewrite 8.91.0 → 8.91.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/java/formatting-utils.d.ts +8 -5
- package/dist/java/formatting-utils.d.ts.map +1 -1
- package/dist/java/formatting-utils.js +14 -10
- package/dist/java/formatting-utils.js.map +1 -1
- package/dist/java/type.d.ts +2 -0
- package/dist/java/type.d.ts.map +1 -1
- package/dist/java/type.js +5 -0
- package/dist/java/type.js.map +1 -1
- package/dist/javascript/add-import.d.ts +39 -20
- package/dist/javascript/add-import.d.ts.map +1 -1
- package/dist/javascript/add-import.js +513 -243
- package/dist/javascript/add-import.js.map +1 -1
- package/dist/javascript/assertions.d.ts +7 -0
- package/dist/javascript/assertions.d.ts.map +1 -1
- package/dist/javascript/assertions.js +31 -5
- package/dist/javascript/assertions.js.map +1 -1
- package/dist/javascript/comparator.d.ts +5 -0
- package/dist/javascript/comparator.d.ts.map +1 -1
- package/dist/javascript/comparator.js +34 -9
- package/dist/javascript/comparator.js.map +1 -1
- package/dist/javascript/format/format.d.ts.map +1 -1
- package/dist/javascript/format/format.js +8 -9
- package/dist/javascript/format/format.js.map +1 -1
- package/dist/javascript/format/tabs-and-indents-visitor.d.ts +2 -0
- package/dist/javascript/format/tabs-and-indents-visitor.d.ts.map +1 -1
- package/dist/javascript/format/tabs-and-indents-visitor.js +17 -11
- package/dist/javascript/format/tabs-and-indents-visitor.js.map +1 -1
- package/dist/javascript/node-resolution-result.d.ts +19 -1
- package/dist/javascript/node-resolution-result.d.ts.map +1 -1
- package/dist/javascript/node-resolution-result.js +37 -2
- package/dist/javascript/node-resolution-result.js.map +1 -1
- package/dist/javascript/package-exported-types.d.ts.map +1 -1
- package/dist/javascript/package-exported-types.js +56 -72
- package/dist/javascript/package-exported-types.js.map +1 -1
- package/dist/javascript/parser.d.ts.map +1 -1
- package/dist/javascript/parser.js +10 -3
- package/dist/javascript/parser.js.map +1 -1
- package/dist/javascript/recipes/change-import.d.ts.map +1 -1
- package/dist/javascript/recipes/change-import.js +4 -8
- package/dist/javascript/recipes/change-import.js.map +1 -1
- package/dist/javascript/style.d.ts.map +1 -1
- package/dist/javascript/style.js +3 -10
- package/dist/javascript/style.js.map +1 -1
- package/dist/javascript/templating/bindings.d.ts +19 -0
- package/dist/javascript/templating/bindings.d.ts.map +1 -0
- package/dist/javascript/templating/bindings.js +121 -0
- package/dist/javascript/templating/bindings.js.map +1 -0
- package/dist/javascript/templating/comparator.d.ts.map +1 -1
- package/dist/javascript/templating/comparator.js +5 -6
- package/dist/javascript/templating/comparator.js.map +1 -1
- package/dist/javascript/templating/engine.d.ts +18 -7
- package/dist/javascript/templating/engine.d.ts.map +1 -1
- package/dist/javascript/templating/engine.js +70 -42
- package/dist/javascript/templating/engine.js.map +1 -1
- package/dist/javascript/templating/index.d.ts +1 -1
- package/dist/javascript/templating/index.d.ts.map +1 -1
- package/dist/javascript/templating/index.js.map +1 -1
- package/dist/javascript/templating/pattern.d.ts.map +1 -1
- package/dist/javascript/templating/pattern.js +13 -10
- package/dist/javascript/templating/pattern.js.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.d.ts +2 -0
- package/dist/javascript/templating/placeholder-replacement.d.ts.map +1 -1
- package/dist/javascript/templating/placeholder-replacement.js +14 -5
- package/dist/javascript/templating/placeholder-replacement.js.map +1 -1
- package/dist/javascript/templating/rewrite.d.ts.map +1 -1
- package/dist/javascript/templating/rewrite.js +14 -18
- package/dist/javascript/templating/rewrite.js.map +1 -1
- package/dist/javascript/templating/template.d.ts +8 -0
- package/dist/javascript/templating/template.d.ts.map +1 -1
- package/dist/javascript/templating/template.js +43 -3
- package/dist/javascript/templating/template.js.map +1 -1
- package/dist/javascript/templating/types.d.ts +47 -1
- package/dist/javascript/templating/types.d.ts.map +1 -1
- package/dist/javascript/templating/utils.d.ts +5 -0
- package/dist/javascript/templating/utils.d.ts.map +1 -1
- package/dist/javascript/templating/utils.js +17 -0
- package/dist/javascript/templating/utils.js.map +1 -1
- package/dist/javascript/type-mapping.d.ts +1 -0
- package/dist/javascript/type-mapping.d.ts.map +1 -1
- package/dist/javascript/type-mapping.js +52 -2
- package/dist/javascript/type-mapping.js.map +1 -1
- package/dist/rewrite-javascript-version.txt +1 -1
- package/dist/style.d.ts +2 -0
- package/dist/style.d.ts.map +1 -1
- package/dist/style.js +5 -0
- package/dist/style.js.map +1 -1
- package/dist/test/rewrite-test.d.ts +12 -0
- package/dist/test/rewrite-test.d.ts.map +1 -1
- package/dist/test/rewrite-test.js +40 -3
- package/dist/test/rewrite-test.js.map +1 -1
- package/package.json +1 -1
- package/src/java/formatting-utils.ts +14 -10
- package/src/java/type.ts +5 -0
- package/src/javascript/add-import.ts +590 -230
- package/src/javascript/assertions.ts +33 -5
- package/src/javascript/comparator.ts +39 -10
- package/src/javascript/format/format.ts +9 -10
- package/src/javascript/format/tabs-and-indents-visitor.ts +18 -12
- package/src/javascript/node-resolution-result.ts +59 -4
- package/src/javascript/package-exported-types.ts +60 -74
- package/src/javascript/parser.ts +10 -3
- package/src/javascript/recipes/change-import.ts +4 -7
- package/src/javascript/style.ts +3 -11
- package/src/javascript/templating/bindings.ts +129 -0
- package/src/javascript/templating/comparator.ts +5 -6
- package/src/javascript/templating/engine.ts +82 -44
- package/src/javascript/templating/index.ts +2 -0
- package/src/javascript/templating/pattern.ts +16 -15
- package/src/javascript/templating/placeholder-replacement.ts +16 -5
- package/src/javascript/templating/rewrite.ts +16 -18
- package/src/javascript/templating/template.ts +45 -3
- package/src/javascript/templating/types.ts +53 -1
- package/src/javascript/templating/utils.ts +17 -0
- package/src/javascript/type-mapping.ts +54 -2
- package/src/style.ts +5 -0
- package/src/test/rewrite-test.ts +61 -3
|
@@ -28,15 +28,18 @@ export declare function replaceIndentAfterLastNewline(ws: string, newIndent: str
|
|
|
28
28
|
*/
|
|
29
29
|
export declare function spaceContainsNewline(space: J.Space | undefined): boolean;
|
|
30
30
|
/**
|
|
31
|
-
* Normalizes indentation in an entire Space:
|
|
32
|
-
*
|
|
33
|
-
* the opening delimiter that the surrounding whitespace positions.
|
|
31
|
+
* Normalizes indentation in an entire Space: comment lines take `commentIndent` and the line the
|
|
32
|
+
* following token lands on takes `targetIndent`, with the interior lines of a multi-line comment
|
|
33
|
+
* shifting alongside the opening delimiter that the surrounding whitespace positions.
|
|
34
34
|
*
|
|
35
35
|
* @param space The Space to normalize
|
|
36
|
-
* @param targetIndent The indentation
|
|
36
|
+
* @param targetIndent The indentation for the token this Space precedes
|
|
37
|
+
* @param commentIndent The indentation for comment lines, which can sit deeper than the token — a
|
|
38
|
+
* block's `}` closes at the block's own column while the comments ahead of it belong with
|
|
39
|
+
* the block's contents
|
|
37
40
|
* @returns The normalized Space, or the original if unchanged
|
|
38
41
|
*/
|
|
39
|
-
export declare function normalizeSpaceIndent(space: J.Space, targetIndent: string): J.Space;
|
|
42
|
+
export declare function normalizeSpaceIndent(space: J.Space, targetIndent: string, commentIndent?: string): J.Space;
|
|
40
43
|
/**
|
|
41
44
|
* Handles element removal from lists while preserving LST formatting.
|
|
42
45
|
* Automatically applies prefixes from removed elements to the next kept element,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatting-utils.d.ts","sourceRoot":"","sources":["../../src/java/formatting-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAU,CAAC,EAAc,MAAM,SAAS,CAAC;AAGhD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,MAAM,CAKrD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAShG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGnF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAIxE;AAqCD
|
|
1
|
+
{"version":3,"file":"formatting-utils.d.ts","sourceRoot":"","sources":["../../src/java/formatting-utils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAU,CAAC,EAAc,MAAM,SAAS,CAAC;AAGhD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,MAAM,CAKrD;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,GAAG,CAAC,CAAC,KAAK,CAShG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGnF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAIxE;AAqCD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,GAAE,MAAqB,GAAG,CAAC,CAAC,KAAK,CAqCxH;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,uBAAuB,CAAC,CAAC,SAAS,CAAC;IAShC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IARzD,OAAO,CAAC,WAAW,CAAC,CAAI;IACxB,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,YAAY,CAAK;IAEzB;;;OAGG;gBAC0B,4BAA4B,GAAE,OAAe;IAE1E;;OAEG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAK1B;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC;CAY1B"}
|
|
@@ -109,30 +109,34 @@ function marginOf(precedingWhitespace) {
|
|
|
109
109
|
return lastNewline < 0 ? undefined : precedingWhitespace.substring(lastNewline + 1);
|
|
110
110
|
}
|
|
111
111
|
/**
|
|
112
|
-
* Normalizes indentation in an entire Space:
|
|
113
|
-
*
|
|
114
|
-
* the opening delimiter that the surrounding whitespace positions.
|
|
112
|
+
* Normalizes indentation in an entire Space: comment lines take `commentIndent` and the line the
|
|
113
|
+
* following token lands on takes `targetIndent`, with the interior lines of a multi-line comment
|
|
114
|
+
* shifting alongside the opening delimiter that the surrounding whitespace positions.
|
|
115
115
|
*
|
|
116
116
|
* @param space The Space to normalize
|
|
117
|
-
* @param targetIndent The indentation
|
|
117
|
+
* @param targetIndent The indentation for the token this Space precedes
|
|
118
|
+
* @param commentIndent The indentation for comment lines, which can sit deeper than the token — a
|
|
119
|
+
* block's `}` closes at the block's own column while the comments ahead of it belong with
|
|
120
|
+
* the block's contents
|
|
118
121
|
* @returns The normalized Space, or the original if unchanged
|
|
119
122
|
*/
|
|
120
|
-
function normalizeSpaceIndent(space, targetIndent) {
|
|
123
|
+
function normalizeSpaceIndent(space, targetIndent, commentIndent = targetIndent) {
|
|
121
124
|
let changed = false;
|
|
122
|
-
|
|
125
|
+
const lastComment = space.comments.length - 1;
|
|
126
|
+
// Normalize whitespace, which precedes the first comment when there is one
|
|
123
127
|
let newWhitespace = space.whitespace;
|
|
124
128
|
if (space.whitespace.includes("\n")) {
|
|
125
|
-
newWhitespace = replaceIndentAfterLastNewline(space.whitespace, targetIndent);
|
|
129
|
+
newWhitespace = replaceIndentAfterLastNewline(space.whitespace, lastComment < 0 ? targetIndent : commentIndent);
|
|
126
130
|
changed = changed || newWhitespace !== space.whitespace;
|
|
127
131
|
}
|
|
128
132
|
// Normalize comment suffixes and multi-line comment interiors
|
|
129
133
|
const newComments = space.comments.map((comment, i) => {
|
|
130
134
|
const margin = marginOf(i === 0 ? space.whitespace : space.comments[i - 1].suffix);
|
|
131
|
-
let result = margin !== undefined && margin !==
|
|
132
|
-
reindentComment(comment, margin,
|
|
135
|
+
let result = margin !== undefined && margin !== commentIndent && isTextComment(comment) ?
|
|
136
|
+
reindentComment(comment, margin, commentIndent) : comment;
|
|
133
137
|
changed = changed || result !== comment;
|
|
134
138
|
if (result.suffix.includes("\n")) {
|
|
135
|
-
const newSuffix = replaceIndentAfterLastNewline(result.suffix, targetIndent);
|
|
139
|
+
const newSuffix = replaceIndentAfterLastNewline(result.suffix, i === lastComment ? targetIndent : commentIndent);
|
|
136
140
|
if (newSuffix !== result.suffix) {
|
|
137
141
|
changed = true;
|
|
138
142
|
result = Object.assign(Object.assign({}, result), { suffix: newSuffix });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatting-utils.js","sourceRoot":"","sources":["../../src/java/formatting-utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAUH,wCAKC;AAUD,sDASC;AAKD,gDAEC;AAMD,sEAGC;AAKD,oDAIC;
|
|
1
|
+
{"version":3,"file":"formatting-utils.js","sourceRoot":"","sources":["../../src/java/formatting-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/java/type.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export interface Type {
|
|
|
3
3
|
}
|
|
4
4
|
export declare namespace Type {
|
|
5
5
|
const FUNCTION_TYPE_NAME = "\uD835\uDC53";
|
|
6
|
+
const OBJECT_TYPE_NAME = "{}";
|
|
6
7
|
const Kind: {
|
|
7
8
|
Annotation: string;
|
|
8
9
|
AnnotationElementValue: string;
|
|
@@ -148,6 +149,7 @@ export declare namespace Type {
|
|
|
148
149
|
function isPrimitive(type?: Type): type is Type.Primitive;
|
|
149
150
|
function isClass(type?: Type): type is Type.Class;
|
|
150
151
|
function isFunctionType(type?: Type): type is Type.Class;
|
|
152
|
+
function isObjectType(type?: Type): type is Type.Class;
|
|
151
153
|
function isMethod(type?: Type): type is Type.Method;
|
|
152
154
|
function isArray(type?: Type): type is Type.Array;
|
|
153
155
|
function isParameterized(type?: Type): type is Type.Parameterized;
|
package/dist/java/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,IAAI;IACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,yBAAiB,IAAI,CAAC;IACX,MAAM,kBAAkB,iBAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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"}
|
package/dist/java/type.js
CHANGED
|
@@ -20,6 +20,7 @@ const rpc_1 = require("../rpc");
|
|
|
20
20
|
var Type;
|
|
21
21
|
(function (Type) {
|
|
22
22
|
Type.FUNCTION_TYPE_NAME = '𝑓';
|
|
23
|
+
Type.OBJECT_TYPE_NAME = '{}';
|
|
23
24
|
Type.Kind = {
|
|
24
25
|
Annotation: "org.openrewrite.java.tree.JavaType$Annotation",
|
|
25
26
|
AnnotationElementValue: "org.openrewrite.java.tree.JavaType$Annotation$ElementValue",
|
|
@@ -151,6 +152,10 @@ var Type;
|
|
|
151
152
|
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.Class && type.fullyQualifiedName === Type.FUNCTION_TYPE_NAME;
|
|
152
153
|
}
|
|
153
154
|
Type.isFunctionType = isFunctionType;
|
|
155
|
+
function isObjectType(type) {
|
|
156
|
+
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.Class && type.fullyQualifiedName === Type.OBJECT_TYPE_NAME;
|
|
157
|
+
}
|
|
158
|
+
Type.isObjectType = isObjectType;
|
|
154
159
|
function isMethod(type) {
|
|
155
160
|
return (type === null || type === void 0 ? void 0 : type.kind) === Type.Kind.Method;
|
|
156
161
|
}
|
package/dist/java/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/java/type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { JavaScriptVisitor } from "./visitor";
|
|
2
2
|
import { J } from "../java";
|
|
3
3
|
import { JS } from "./tree";
|
|
4
|
+
export type QuoteChar = "'" | '"';
|
|
4
5
|
export declare enum ImportStyle {
|
|
5
6
|
ES6Named = 0,// import { x } from 'module'
|
|
6
7
|
ES6Namespace = 1,// import * as x from 'module'
|
|
@@ -8,8 +9,10 @@ export declare enum ImportStyle {
|
|
|
8
9
|
CommonJS = 3
|
|
9
10
|
}
|
|
10
11
|
export interface AddImportOptions {
|
|
11
|
-
/** The module name (e.g., 'fs', 'react') to import from
|
|
12
|
-
|
|
12
|
+
/** The module name (e.g., 'fs', 'react') to import from.
|
|
13
|
+
* Pass a `J.Literal` to reuse its source form verbatim, which carries the quoting,
|
|
14
|
+
* escapes and unicode form of a specifier being moved from elsewhere in the source. */
|
|
15
|
+
module: string | J.Literal;
|
|
13
16
|
/** Optionally, the specific member to import from the module.
|
|
14
17
|
* If not specified, adds a default import or namespace import.
|
|
15
18
|
* Special values:
|
|
@@ -21,8 +24,14 @@ export interface AddImportOptions {
|
|
|
21
24
|
member?: string;
|
|
22
25
|
/** Optional alias for the imported member.
|
|
23
26
|
* Required when member is 'default' or '*'.
|
|
27
|
+
* Taken verbatim, never deconflicted: a caller that names an alias may already have
|
|
28
|
+
* emitted code using it.
|
|
24
29
|
* Cannot be combined with `sideEffectOnly`. */
|
|
25
30
|
alias?: string;
|
|
31
|
+
/** Preferred local name, deconflicted if the file already binds it. Stands in for `alias` where
|
|
32
|
+
* `member` is 'default' or '*' and the caller wants a name it does not insist on.
|
|
33
|
+
* Cannot be combined with `sideEffectOnly`. */
|
|
34
|
+
preferredName?: string;
|
|
26
35
|
/** If true, only add the import if the member is actually used in the file. Default: true
|
|
27
36
|
* Cannot be combined with `sideEffectOnly`. */
|
|
28
37
|
onlyIfReferenced?: boolean;
|
|
@@ -35,11 +44,18 @@ export interface AddImportOptions {
|
|
|
35
44
|
typeOnly?: boolean;
|
|
36
45
|
/** Optional import style to use. If not specified, auto-detects from file and existing imports */
|
|
37
46
|
style?: ImportStyle;
|
|
47
|
+
/** Quote character for the module specifier. If not specified, detected from the file.
|
|
48
|
+
* A `J.Literal` module carries its own quoting and takes precedence over this. */
|
|
49
|
+
quoteStyle?: QuoteChar;
|
|
38
50
|
}
|
|
39
51
|
/**
|
|
40
52
|
* Register an AddImport visitor to add an import statement to a JavaScript/TypeScript file
|
|
41
53
|
* @param visitor The visitor to add the import addition to
|
|
42
54
|
* @param options Configuration options for the import to add
|
|
55
|
+
* @returns The local name the module is bound to: an existing binding's where one answers this
|
|
56
|
+
* request, otherwise the name the new import will use, suffixed if the file already binds it. `onlyIfReferenced` defaults to true, so
|
|
57
|
+
* the import may never appear, and the name is then what it would have gone by. A side-effect
|
|
58
|
+
* import binds no name and returns `undefined`.
|
|
43
59
|
*
|
|
44
60
|
* @example
|
|
45
61
|
* // Add a named import
|
|
@@ -61,24 +77,37 @@ export interface AddImportOptions {
|
|
|
61
77
|
* // Add a side-effect import
|
|
62
78
|
* maybeAddImport(visitor, { module: 'core-js/stable', sideEffectOnly: true });
|
|
63
79
|
*/
|
|
64
|
-
export declare function maybeAddImport(visitor: JavaScriptVisitor<any>, options: AddImportOptions
|
|
80
|
+
export declare function maybeAddImport(visitor: JavaScriptVisitor<any>, options: AddImportOptions & {
|
|
81
|
+
sideEffectOnly: true;
|
|
82
|
+
}): undefined;
|
|
83
|
+
export declare function maybeAddImport(visitor: JavaScriptVisitor<any>, options: AddImportOptions & {
|
|
84
|
+
sideEffectOnly?: false;
|
|
85
|
+
}): string;
|
|
86
|
+
export declare function maybeAddImport(visitor: JavaScriptVisitor<any>, options: AddImportOptions): string | undefined;
|
|
65
87
|
export declare class AddImport<P> extends JavaScriptVisitor<P> {
|
|
66
88
|
readonly module: string;
|
|
89
|
+
/** Set when the caller supplied the module specifier as a literal; printed verbatim. */
|
|
90
|
+
readonly moduleValueSource?: string;
|
|
91
|
+
readonly moduleUnicodeEscapes?: J.LiteralUnicodeEscape[];
|
|
67
92
|
readonly member?: string;
|
|
68
93
|
readonly alias?: string;
|
|
69
94
|
readonly onlyIfReferenced: boolean;
|
|
70
95
|
readonly sideEffectOnly: boolean;
|
|
71
96
|
readonly typeOnly: boolean;
|
|
72
97
|
readonly style?: ImportStyle;
|
|
73
|
-
|
|
98
|
+
readonly quoteStyle?: QuoteChar;
|
|
99
|
+
/** The local name this import binds; `undefined` for a side-effect import. */
|
|
100
|
+
readonly bindingName?: string;
|
|
74
101
|
/**
|
|
75
|
-
*
|
|
102
|
+
* A default import the request named no local name for, so whatever the file already calls
|
|
103
|
+
* that module answers it.
|
|
76
104
|
*/
|
|
77
|
-
|
|
105
|
+
readonly anyNameAnswers: boolean;
|
|
106
|
+
constructor(options: AddImportOptions, bindingName?: string);
|
|
78
107
|
/**
|
|
79
|
-
*
|
|
108
|
+
* Extract module name from a module specifier literal
|
|
80
109
|
*/
|
|
81
|
-
private
|
|
110
|
+
private getModuleName;
|
|
82
111
|
/**
|
|
83
112
|
* Determine the appropriate import style based on file type and existing imports
|
|
84
113
|
*/
|
|
@@ -100,6 +129,8 @@ export declare class AddImport<P> extends JavaScriptVisitor<P> {
|
|
|
100
129
|
* Check if the import matches what we're trying to add
|
|
101
130
|
*/
|
|
102
131
|
private isMatchingImport;
|
|
132
|
+
/** Whether a binding the file already has serves this request. */
|
|
133
|
+
private answeredBy;
|
|
103
134
|
/**
|
|
104
135
|
* Check if this is a matching CommonJS require statement
|
|
105
136
|
*/
|
|
@@ -138,17 +169,5 @@ export declare class AddImport<P> extends JavaScriptVisitor<P> {
|
|
|
138
169
|
* Find the index where the new import should be inserted
|
|
139
170
|
*/
|
|
140
171
|
private findImportInsertionIndex;
|
|
141
|
-
/**
|
|
142
|
-
* Get the module name from a require() call
|
|
143
|
-
*/
|
|
144
|
-
private getModuleNameFromRequire;
|
|
145
|
-
/**
|
|
146
|
-
* Get the import name from an import specifier
|
|
147
|
-
*/
|
|
148
|
-
private getImportName;
|
|
149
|
-
/**
|
|
150
|
-
* Get the import alias from an import specifier
|
|
151
|
-
*/
|
|
152
|
-
private getImportAlias;
|
|
153
172
|
}
|
|
154
173
|
//# sourceMappingURL=add-import.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-import.d.ts","sourceRoot":"","sources":["../../src/javascript/add-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAa,CAAC,EAAmD,MAAM,SAAS,CAAC;AACxF,OAAO,EAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"add-import.d.ts","sourceRoot":"","sources":["../../src/javascript/add-import.ts"],"names":[],"mappings":"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"}
|