ts-codemod-lib 3.4.4 → 3.5.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/README.md +26 -7
- package/dist/functions/ast-transformers/append-as-const.d.mts.map +1 -1
- package/dist/functions/ast-transformers/append-as-const.mjs +6 -3
- package/dist/functions/ast-transformers/append-as-const.mjs.map +1 -1
- package/dist/functions/ast-transformers/convert-interface-to-type.d.mts.map +1 -1
- package/dist/functions/ast-transformers/convert-interface-to-type.mjs +2 -1
- package/dist/functions/ast-transformers/convert-interface-to-type.mjs.map +1 -1
- package/dist/functions/ast-transformers/convert-to-readonly.d.mts +10 -0
- package/dist/functions/ast-transformers/convert-to-readonly.d.mts.map +1 -1
- package/dist/functions/ast-transformers/convert-to-readonly.mjs +120 -16
- package/dist/functions/ast-transformers/convert-to-readonly.mjs.map +1 -1
- package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.d.mts +7 -1
- package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.d.mts.map +1 -1
- package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mjs +25 -2
- package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mjs.map +1 -1
- package/dist/functions/ast-transformers/replace-any-with-unknown.d.mts.map +1 -1
- package/dist/functions/ast-transformers/replace-any-with-unknown.mjs +3 -2
- package/dist/functions/ast-transformers/replace-any-with-unknown.mjs.map +1 -1
- package/dist/functions/ast-transformers/replace-record-with-unknown-record.d.mts.map +1 -1
- package/dist/functions/ast-transformers/replace-record-with-unknown-record.mjs +6 -5
- package/dist/functions/ast-transformers/replace-record-with-unknown-record.mjs.map +1 -1
- package/dist/functions/functions/has-disable-next-line-comment.d.mts.map +1 -1
- package/dist/functions/functions/has-disable-next-line-comment.mjs +56 -4
- package/dist/functions/functions/has-disable-next-line-comment.mjs.map +1 -1
- package/dist/functions/utils/index.d.mts +1 -0
- package/dist/functions/utils/index.d.mts.map +1 -1
- package/dist/functions/utils/index.mjs +1 -0
- package/dist/functions/utils/index.mjs.map +1 -1
- package/dist/functions/utils/replace-node-with-text.d.mts +21 -0
- package/dist/functions/utils/replace-node-with-text.d.mts.map +1 -0
- package/dist/functions/utils/replace-node-with-text.mjs +22 -0
- package/dist/functions/utils/replace-node-with-text.mjs.map +1 -0
- package/dist/functions/utils/replace-with-debug.d.mts.map +1 -1
- package/dist/functions/utils/replace-with-debug.mjs +2 -1
- package/dist/functions/utils/replace-with-debug.mjs.map +1 -1
- package/package.json +25 -25
- package/src/functions/ast-transformers/append-as-const.mts +9 -3
- package/src/functions/ast-transformers/convert-interface-to-type.mts +2 -1
- package/src/functions/ast-transformers/convert-to-readonly.mts +187 -22
- package/src/functions/ast-transformers/convert-to-readonly.test.mts +430 -32
- package/src/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mts +36 -5
- package/src/functions/ast-transformers/replace-any-with-unknown.mts +3 -2
- package/src/functions/ast-transformers/replace-record-with-unknown-record.mts +7 -5
- package/src/functions/functions/has-disable-next-line-comment.mts +79 -6
- package/src/functions/functions/has-disable-next-line-comment.test.mts +96 -0
- package/src/functions/utils/index.mts +1 -0
- package/src/functions/utils/replace-node-with-text.mts +37 -0
- package/src/functions/utils/replace-node-with-text.test.mts +89 -0
- package/src/functions/utils/replace-with-debug.mts +2 -1
package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.d.mts
CHANGED
|
@@ -11,11 +11,17 @@ import { type AtomicTypeNode, type ReadonlyArrayTypeNode, type ReadonlyTupleType
|
|
|
11
11
|
* member that `Readonly` still means something to (see `staysOutsideReadonly`):
|
|
12
12
|
* taking such a member out of the `Readonly` it was written under would drop
|
|
13
13
|
* its readonly-ness.
|
|
14
|
+
*
|
|
15
|
+
* `keptUnwrapped` names the further type literals the caller leaves unwrapped
|
|
16
|
+
* (one with a property of an ignored prefix, such as `mut_`), which stay out of
|
|
17
|
+
* that group as one with a call or construct signature does — except under a
|
|
18
|
+
* `Readonly` intersection with a member that may be an array.
|
|
14
19
|
*/
|
|
15
|
-
export declare const groupUnionIntersectionTypes: (types: readonly tsm.TypeNode[], { operator, underReadonly, deepReadonlyTypeName, }: Readonly<{
|
|
20
|
+
export declare const groupUnionIntersectionTypes: (types: readonly tsm.TypeNode[], { operator, underReadonly, deepReadonlyTypeName, keptUnwrapped, }: Readonly<{
|
|
16
21
|
operator: '&' | '|';
|
|
17
22
|
underReadonly: boolean;
|
|
18
23
|
deepReadonlyTypeName: string;
|
|
24
|
+
keptUnwrapped?: (node: tsm.TypeLiteralNode) => boolean;
|
|
19
25
|
}>) => Readonly<{
|
|
20
26
|
primitives: Readonly<{
|
|
21
27
|
firstPosition: number;
|
package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-union-types.d.mts","sourceRoot":"","sources":["../../../../src/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAML,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC/B,MAAM,2BAA2B,CAAC;AAEnC
|
|
1
|
+
{"version":3,"file":"group-union-types.d.mts","sourceRoot":"","sources":["../../../../src/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAML,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC/B,MAAM,2BAA2B,CAAC;AAEnC;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,2BAA2B,UAE/B,SAAS,GAAG,CAAC,QAAQ,EAAE,qEAM3B,QAAQ,CAAC;IACV,QAAQ,EAAE,GAAG,GAAG,GAAG,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAE7B,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,KAAK,OAAO,CAAC;CACxD,CAAC,KACD,QAAQ,CAAC;IACV,UAAU,EACN,QAAQ,CAAC;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,SAAS,cAAc,EAAE,CAAC;KAClC,CAAC,GACF,SAAS,CAAC;IAEd,eAAe,EACX,QAAQ,CAAC;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,SAAS,CACZ,GAAG,CAAC,aAAa,GACjB,GAAG,CAAC,aAAa,GACjB,qBAAqB,GACrB,qBAAqB,CACxB,EAAE,CAAC;KACL,CAAC,GACF,SAAS,CAAC;IAEd,YAAY,EACR,QAAQ,CAAC;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,SAAS,GAAG,CAAC,QAAQ,EAAE,CAAC;KAChC,CAAC,GACF,SAAS,CAAC;IAEd,MAAM,EACF,QAAQ,CAAC;QACP,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,SAAS,GAAG,CAAC,QAAQ,EAAE,CAAC;KAChC,CAAC,GACF,SAAS,CAAC;CACf,CAqIA,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,oCAAoC,SAEzC,GAAG,CAAC,QAAQ,YACR,GAAG,GAAG,GAAG,KAClB,IAAI,IAAI,yBAE4D,CAAC"}
|
|
@@ -12,15 +12,37 @@ import { hasCallOrConstructSignature, isAtomicTypeNode, isReadonlyTupleOrArrayTy
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
15
20
|
export const groupUnionIntersectionTypes = (
|
|
16
21
|
|
|
17
|
-
types, { operator, underReadonly, deepReadonlyTypeName, }) => {
|
|
22
|
+
types, { operator, underReadonly, deepReadonlyTypeName, keptUnwrapped = () => false, }) => {
|
|
18
23
|
const mut_grouped = {
|
|
19
24
|
primitives: undefined,
|
|
20
25
|
arraysAndTuples: undefined,
|
|
21
26
|
typeLiterals: undefined,
|
|
22
27
|
others: undefined,
|
|
23
28
|
};
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
const honoursKeptUnwrapped = !underReadonly ||
|
|
35
|
+
operator === '|' ||
|
|
36
|
+
types.every((t_) => {
|
|
37
|
+
const t = removeParentheses(t_);
|
|
38
|
+
return (isAtomicTypeNode(t) ||
|
|
39
|
+
t.isKind(tsm.SyntaxKind.ArrayType) ||
|
|
40
|
+
t.isKind(tsm.SyntaxKind.TupleType) ||
|
|
41
|
+
isReadonlyTupleOrArrayTypeNode(t) ||
|
|
42
|
+
t.isKind(tsm.SyntaxKind.TypeLiteral) ||
|
|
43
|
+
isMergeableReadonlyTypeReferenceNode(t, operator) ||
|
|
44
|
+
staysOutsideReadonly(t, deepReadonlyTypeName));
|
|
45
|
+
});
|
|
24
46
|
for (const [i, t_] of types.entries()) {
|
|
25
47
|
const t = removeParentheses(t_);
|
|
26
48
|
|
|
@@ -56,7 +78,8 @@ types, { operator, underReadonly, deepReadonlyTypeName, }) => {
|
|
|
56
78
|
|
|
57
79
|
|
|
58
80
|
if ((t.isKind(tsm.SyntaxKind.TypeLiteral) &&
|
|
59
|
-
!hasCallOrConstructSignature(t)
|
|
81
|
+
!hasCallOrConstructSignature(t) &&
|
|
82
|
+
!(honoursKeptUnwrapped && keptUnwrapped(t))) ||
|
|
60
83
|
isMergeableReadonlyTypeReferenceNode(t, operator) ||
|
|
61
84
|
(underReadonly && !staysOutsideReadonly(t, deepReadonlyTypeName))) {
|
|
62
85
|
if (mut_grouped.typeLiterals === undefined) {
|
package/dist/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-union-types.mjs","sourceRoot":"","sources":["../../../../src/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EACL,2BAA2B,EAC3B,gBAAgB,EAChB,8BAA8B,EAC9B,2BAA2B,EAC3B,iBAAiB,GAKlB,MAAM,2BAA2B,CAAC;AAEnC
|
|
1
|
+
{"version":3,"file":"group-union-types.mjs","sourceRoot":"","sources":["../../../../src/functions/ast-transformers/readonly-transformer-helpers/group-union-types.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-any-with-unknown.d.mts","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-any-with-unknown.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replace-any-with-unknown.d.mts","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-any-with-unknown.mts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAItD,eAAO,MAAM,gCAAgC,QAAO,kBAQvC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as tsm from 'ts-morph';
|
|
2
2
|
import { hasDisableNextLineComment, isSpreadNamedTupleMemberNode, isSpreadParameterNode, } from '../functions/index.mjs';
|
|
3
|
+
import { replaceNodeWithText } from '../utils/index.mjs';
|
|
3
4
|
const TRANSFORMER_NAME = 'replace-any-with-unknown';
|
|
4
5
|
export const replaceAnyWithUnknownTransformer = () => ({
|
|
5
6
|
name: TRANSFORMER_NAME,
|
|
@@ -22,10 +23,10 @@ const transformNode = (node) => {
|
|
|
22
23
|
(isSpreadParameterNode(parent) ||
|
|
23
24
|
|
|
24
25
|
isSpreadNamedTupleMemberNode(parent))) {
|
|
25
|
-
anyKeywordNode
|
|
26
|
+
replaceNodeWithText(anyKeywordNode, 'readonly unknown[]');
|
|
26
27
|
return;
|
|
27
28
|
}
|
|
28
|
-
anyKeywordNode
|
|
29
|
+
replaceNodeWithText(anyKeywordNode, 'unknown');
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
32
|
for (const child of node.getChildren()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-any-with-unknown.mjs","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-any-with-unknown.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"replace-any-with-unknown.mjs","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-any-with-unknown.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAGzD,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAEpD,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAuB,EAAE,CACvE,CAAC;IACC,IAAI,EAAE,gBAAgB;IACtB,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;QACvB,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;YAC3C,aAAa,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;CACF,CAAU,CAAC;AAEd,MAAM,aAAa,GAAG,CAAC,IAAc,EAAQ,EAAE;IAC7C,IAAI,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC;QACtD,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAEtD,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAI,CAAC;QAE5B,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;QAE1C,IACE,MAAM,KAAK,SAAS;YACpB,2DAA2D;YAC3D,CAAC,qBAAqB,CAAC,MAAM,CAAC;gBAC5B,kEAAkE;gBAClE,4BAA4B,CAAC,MAAM,CAAC,CAAC,EACvC,CAAC;YACD,mBAAmB,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;YAE1D,OAAO;QACT,CAAC;QAED,mBAAmB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAE/C,OAAO;IACT,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACvC,aAAa,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-record-with-unknown-record.d.mts","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-record-with-unknown-record.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replace-record-with-unknown-record.d.mts","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-record-with-unknown-record.mts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAQtD;;;;;;;GAOG;AACH,eAAO,MAAM,yCAAyC,QAChD,kBAaS,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { Arr } from 'ts-data-forge';
|
|
3
3
|
import * as tsm from 'ts-morph';
|
|
4
4
|
import { hasDisableNextLineComment } from '../functions/index.mjs';
|
|
5
|
+
import { replaceNodeWithText } from '../utils/index.mjs';
|
|
5
6
|
const TRANSFORMER_NAME = 'replace-record-with-unknown-record';
|
|
6
7
|
const UNKNOWN_RECORD_MODULE = 'ts-type-forge';
|
|
7
8
|
const UNKNOWN_RECORD_NAME = 'UnknownRecord';
|
|
@@ -58,7 +59,7 @@ const processInterfaceDeclaration = (interfaceDecl) => {
|
|
|
58
59
|
!interfaceDecl.hasDefaultKeyword()) {
|
|
59
60
|
const exportPrefix = interfaceDecl.hasExportKeyword() ? 'export ' : '';
|
|
60
61
|
const interfaceName = interfaceDecl.getName();
|
|
61
|
-
interfaceDecl
|
|
62
|
+
replaceNodeWithText(interfaceDecl, `${exportPrefix}type ${interfaceName} = UnknownRecord;`);
|
|
62
63
|
return true;
|
|
63
64
|
}
|
|
64
65
|
|
|
@@ -84,7 +85,7 @@ const visitTypeNode = (node) => {
|
|
|
84
85
|
if (Arr.isFixedLengthArray(1, members) &&
|
|
85
86
|
Arr.isFixedLengthArray(1, indexSigs) &&
|
|
86
87
|
isStringUnknownIndexSignature(indexSigs[0])) {
|
|
87
|
-
node
|
|
88
|
+
replaceNodeWithText(node, 'UnknownRecord');
|
|
88
89
|
return true;
|
|
89
90
|
}
|
|
90
91
|
|
|
@@ -102,7 +103,7 @@ const visitTypeNode = (node) => {
|
|
|
102
103
|
if (Arr.isFixedLengthArray(1, members) &&
|
|
103
104
|
Arr.isFixedLengthArray(1, indexSigs) &&
|
|
104
105
|
isStringUnknownIndexSignature(indexSigs[0])) {
|
|
105
|
-
node
|
|
106
|
+
replaceNodeWithText(node, 'UnknownRecord');
|
|
106
107
|
return true;
|
|
107
108
|
}
|
|
108
109
|
return members
|
|
@@ -152,7 +153,7 @@ const replaceIfRecordUnknown = (node) => {
|
|
|
152
153
|
if (Arr.isFixedLengthArray(2, typeArgs) &&
|
|
153
154
|
typeArgs[0].getText() === 'string' &&
|
|
154
155
|
typeArgs[1].getText() === 'unknown') {
|
|
155
|
-
node
|
|
156
|
+
replaceNodeWithText(node, 'UnknownRecord');
|
|
156
157
|
return true;
|
|
157
158
|
}
|
|
158
159
|
|
|
@@ -170,7 +171,7 @@ const replaceIfRecordUnknown = (node) => {
|
|
|
170
171
|
if (Arr.isFixedLengthArray(2, innerTypeArgs) &&
|
|
171
172
|
innerTypeArgs[0].getText() === 'string' &&
|
|
172
173
|
innerTypeArgs[1].getText() === 'unknown') {
|
|
173
|
-
node
|
|
174
|
+
replaceNodeWithText(node, 'UnknownRecord');
|
|
174
175
|
return true;
|
|
175
176
|
}
|
|
176
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-record-with-unknown-record.mjs","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-record-with-unknown-record.mts"],"names":[],"mappings":"AAAA,sGAAsG;AACtG,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"replace-record-with-unknown-record.mjs","sourceRoot":"","sources":["../../../src/functions/ast-transformers/replace-record-with-unknown-record.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"has-disable-next-line-comment.d.mts","sourceRoot":"","sources":["../../../src/functions/functions/has-disable-next-line-comment.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"has-disable-next-line-comment.d.mts","sourceRoot":"","sources":["../../../src/functions/functions/has-disable-next-line-comment.mts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yBAAyB,SAC9B,GAAG,CAAC,IAAI,oBACI,MAAM,KACvB,OA8EF,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Arr } from 'ts-data-forge';
|
|
1
2
|
import * as tsm from 'ts-morph';
|
|
2
3
|
import { IGNORE_LINE_COMMENT_PREFIXES } from '../constants/index.mjs';
|
|
3
4
|
|
|
@@ -15,20 +16,25 @@ import { IGNORE_LINE_COMMENT_PREFIXES } from '../constants/index.mjs';
|
|
|
15
16
|
|
|
16
17
|
|
|
17
18
|
export const hasDisableNextLineComment = (node, transformerName) => {
|
|
18
|
-
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
const leadingCommentRanges = node.getLeadingCommentRanges();
|
|
22
|
+
if (Arr.isEmpty(leadingCommentRanges)) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
const lineNumberAt = lineNumberLookup(node.getSourceFile().compilerNode);
|
|
26
|
+
const nodeStartLine = lineNumberAt(node.getStart());
|
|
19
27
|
|
|
20
28
|
if (nodeStartLine <= 1) {
|
|
21
29
|
return false;
|
|
22
30
|
}
|
|
23
|
-
const sourceFile = node.getSourceFile();
|
|
24
|
-
const leadingCommentRanges = node.getLeadingCommentRanges();
|
|
25
31
|
|
|
26
32
|
for (let mut_i = leadingCommentRanges.length - 1; mut_i >= 0; mut_i--) {
|
|
27
33
|
|
|
28
34
|
const commentRange = leadingCommentRanges[mut_i];
|
|
29
35
|
|
|
30
36
|
const commentEndPos = commentRange.getEnd();
|
|
31
|
-
const commentEndLine =
|
|
37
|
+
const commentEndLine = lineNumberAt(commentEndPos);
|
|
32
38
|
|
|
33
39
|
if (nodeStartLine === commentEndLine + 1) {
|
|
34
40
|
|
|
@@ -69,4 +75,50 @@ export const hasDisableNextLineComment = (node, transformerName) => {
|
|
|
69
75
|
}
|
|
70
76
|
return false;
|
|
71
77
|
};
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
const lineNumberLookup = (
|
|
91
|
+
|
|
92
|
+
sourceFile) => {
|
|
93
|
+
const cached = newlinePositionsCache.get(sourceFile);
|
|
94
|
+
const newlinePositions = cached ?? newlinePositionsOf(sourceFile.text);
|
|
95
|
+
if (cached === undefined) {
|
|
96
|
+
newlinePositionsCache.set(sourceFile, newlinePositions);
|
|
97
|
+
}
|
|
98
|
+
return (pos) => countLessThan(newlinePositions, pos) + 1;
|
|
99
|
+
};
|
|
100
|
+
const newlinePositionsCache = new WeakMap();
|
|
101
|
+
const newlinePositionsOf = (text) => {
|
|
102
|
+
const mut_positions = [];
|
|
103
|
+
for (let mut_index = text.indexOf('\n'); mut_index !== -1; mut_index = text.indexOf('\n', mut_index + 1)) {
|
|
104
|
+
mut_positions.push(mut_index);
|
|
105
|
+
}
|
|
106
|
+
return mut_positions;
|
|
107
|
+
};
|
|
108
|
+
|
|
109
|
+
const countLessThan = (sorted, value) => {
|
|
110
|
+
let mut_low = 0;
|
|
111
|
+
let mut_high = sorted.length;
|
|
112
|
+
while (mut_low < mut_high) {
|
|
113
|
+
const mid = Math.floor((mut_low + mut_high) / 2);
|
|
114
|
+
|
|
115
|
+
if (sorted[mid] < value) {
|
|
116
|
+
mut_low = mid + 1;
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
mut_high = mid;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return mut_low;
|
|
123
|
+
};
|
|
72
124
|
//# sourceMappingURL=has-disable-next-line-comment.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"has-disable-next-line-comment.mjs","sourceRoot":"","sources":["../../../src/functions/functions/has-disable-next-line-comment.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,IAAc,EACd,eAAwB,EACf,EAAE;IACX,MAAM,
|
|
1
|
+
{"version":3,"file":"has-disable-next-line-comment.mjs","sourceRoot":"","sources":["../../../src/functions/functions/has-disable-next-line-comment.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type * as tsm from 'ts-morph';
|
|
2
|
+
/**
|
|
3
|
+
* `node.replaceWithText(newNodeText)`, sparing a one-line text the indentation
|
|
4
|
+
* lookup.
|
|
5
|
+
*
|
|
6
|
+
* `replaceWithText` writes the text through a writer whose indentation it
|
|
7
|
+
* looks up first, for the lines after the first one, and the lookup reparses
|
|
8
|
+
* the whole file in the language service: on top of the reparse every
|
|
9
|
+
* replacement makes anyway, once per replacement, so it is quadratic in the
|
|
10
|
+
* size of the file. A text with no `\n` has no line after the first, the
|
|
11
|
+
* indentation is never applied, and a plain writer from the same project
|
|
12
|
+
* writes the same text — so the lookup is skipped. A multi-line text takes
|
|
13
|
+
* the original path.
|
|
14
|
+
*
|
|
15
|
+
* The writer is passed as `replaceWithText`'s second argument, which its
|
|
16
|
+
* declaration leaves out and ts-morph passes itself when it sets an
|
|
17
|
+
* expression. Were it ever dropped, the method would look the indentation up
|
|
18
|
+
* as before: slower, never different.
|
|
19
|
+
*/
|
|
20
|
+
export declare const replaceNodeWithText: (node: tsm.Node, newNodeText: string) => tsm.Node;
|
|
21
|
+
//# sourceMappingURL=replace-node-with-text.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replace-node-with-text.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/replace-node-with-text.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,mBAAmB,SACxB,GAAG,CAAC,IAAI,eACD,MAAM,KAClB,GAAG,CAAC,IAOA,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
export const replaceNodeWithText = (node, newNodeText) => newNodeText.includes('\n')
|
|
20
|
+
? node.replaceWithText(newNodeText)
|
|
21
|
+
: node.replaceWithText.call(node, newNodeText, node.getProject().createWriter());
|
|
22
|
+
//# sourceMappingURL=replace-node-with-text.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"replace-node-with-text.mjs","sourceRoot":"","sources":["../../../src/functions/utils/replace-node-with-text.mts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAc,EACd,WAAmB,EACT,EAAE,CACZ,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;IACxB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;IACnC,CAAC,CAAE,IAAI,CAAC,eAA6C,CAAC,IAAI,CACtD,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,CACjC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-with-debug.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/replace-with-debug.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"replace-with-debug.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/replace-with-debug.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,yBAAyB,SAC9B,GAAG,CAAC,IAAI,eACD,MAAM,KAClB,IAIF,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { replaceNodeWithText } from './replace-node-with-text.mjs';
|
|
1
2
|
export const replaceNodeWithDebugPrint = (node, newNodeText) => {
|
|
2
3
|
console.debug(`${node.getText()} -> ${newNodeText}`);
|
|
3
|
-
node
|
|
4
|
+
replaceNodeWithText(node, newNodeText);
|
|
4
5
|
};
|
|
5
6
|
//# sourceMappingURL=replace-with-debug.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-with-debug.mjs","sourceRoot":"","sources":["../../../src/functions/utils/replace-with-debug.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replace-with-debug.mjs","sourceRoot":"","sources":["../../../src/functions/utils/replace-with-debug.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,IAAc,EACd,WAAmB,EACb,EAAE;IACR,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,WAAW,EAAE,CAAC,CAAC;IAErD,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AACzC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ts-codemod-lib",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"keywords": [
|
|
6
6
|
"typescript",
|
|
@@ -38,27 +38,27 @@
|
|
|
38
38
|
"LICENSE"
|
|
39
39
|
],
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"ts-data-forge": "^14.
|
|
41
|
+
"ts-data-forge": "^14.10.0",
|
|
42
42
|
"ts-morph": "^28.0.0",
|
|
43
43
|
"ts-type-forge": "^9.2.2"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@types/node": "26.6.
|
|
47
|
-
"@vitest/browser-playwright": "5.0.
|
|
48
|
-
"@vitest/coverage-v8": "5.0.
|
|
49
|
-
"@vitest/ui": "5.0.
|
|
50
|
-
"cspell": "10.
|
|
46
|
+
"@types/node": "26.6.5",
|
|
47
|
+
"@vitest/browser-playwright": "5.0.5",
|
|
48
|
+
"@vitest/coverage-v8": "5.0.5",
|
|
49
|
+
"@vitest/ui": "5.0.5",
|
|
50
|
+
"cspell": "10.4.0",
|
|
51
51
|
"dedent": "1.7.2",
|
|
52
52
|
"esbuild": "0.28.2",
|
|
53
|
-
"eslint": "10.
|
|
54
|
-
"eslint-config-typed": "5.
|
|
55
|
-
"eslint-plugin-ts-data-forge": "0.
|
|
56
|
-
"eslint-plugin-ts-fortress": "1.3.
|
|
57
|
-
"eslint-plugin-ts-type-forge": "0.8.
|
|
53
|
+
"eslint": "10.13.0",
|
|
54
|
+
"eslint-config-typed": "5.20.1",
|
|
55
|
+
"eslint-plugin-ts-data-forge": "0.10.4",
|
|
56
|
+
"eslint-plugin-ts-fortress": "1.3.9",
|
|
57
|
+
"eslint-plugin-ts-type-forge": "0.8.14",
|
|
58
58
|
"jiti": "2.7.0",
|
|
59
|
-
"npm-run-all2": "9.0.
|
|
60
|
-
"playwright": "1.64.
|
|
61
|
-
"prettier": "3.9.
|
|
59
|
+
"npm-run-all2": "9.0.4",
|
|
60
|
+
"playwright": "1.64.1",
|
|
61
|
+
"prettier": "3.9.10",
|
|
62
62
|
"prettier-plugin-organize-imports": "4.3.0",
|
|
63
63
|
"prettier-plugin-packagejson": "3.0.2",
|
|
64
64
|
"ts-repo-utils": "10.7.1",
|
|
@@ -67,15 +67,15 @@
|
|
|
67
67
|
"typedoc-github-theme": "0.4.0",
|
|
68
68
|
"typescript": "6.0.3",
|
|
69
69
|
"typescript-native": "npm:typescript@7.0.2",
|
|
70
|
-
"vite": "8.3.
|
|
71
|
-
"vitest": "5.0.
|
|
70
|
+
"vite": "8.3.5",
|
|
71
|
+
"vitest": "5.0.5"
|
|
72
72
|
},
|
|
73
73
|
"engines": {
|
|
74
|
-
"node": ">=22.
|
|
74
|
+
"node": ">=22.23.4",
|
|
75
75
|
"pnpm": ">=9.0.0"
|
|
76
76
|
},
|
|
77
77
|
"volta": {
|
|
78
|
-
"node": "26.
|
|
78
|
+
"node": "26.12.1"
|
|
79
79
|
},
|
|
80
80
|
"publishConfig": {
|
|
81
81
|
"access": "public",
|
|
@@ -86,11 +86,11 @@
|
|
|
86
86
|
"check:cspell": "cspell \"**\" --gitignore --gitignore-root ../../ --no-progress",
|
|
87
87
|
"check:dist": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ./scripts/cmd/check-dist.mts",
|
|
88
88
|
"check:ext": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ./scripts/cmd/check-ext.mts",
|
|
89
|
-
"check:lint": "oxlint . && eslint .",
|
|
90
|
-
"check:test": "pnpm run z:vitest:node run",
|
|
91
|
-
"check:test:browser": "pnpm run z:vitest --project='Browser' run",
|
|
92
|
-
"check:test:cov": "pnpm run z:vitest:node run --coverage",
|
|
93
|
-
"check:types": "node ../../node_modules/typescript-native/bin/tsc --noEmit",
|
|
89
|
+
"check:lint": "node ../../tools/scripts/cmd/assert-deps-built.mts && oxlint . && eslint .",
|
|
90
|
+
"check:test": "node ../../tools/scripts/cmd/assert-deps-built.mts && pnpm run z:vitest:node run",
|
|
91
|
+
"check:test:browser": "node ../../tools/scripts/cmd/assert-deps-built.mts && pnpm run z:vitest --project='Browser' run",
|
|
92
|
+
"check:test:cov": "node ../../tools/scripts/cmd/assert-deps-built.mts && pnpm run z:vitest:node run --coverage",
|
|
93
|
+
"check:types": "node ../../tools/scripts/cmd/assert-deps-built.mts && node ../../node_modules/typescript-native/bin/tsc --noEmit",
|
|
94
94
|
"check-all": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ./scripts/cmd/check-all.mts",
|
|
95
95
|
"clean": "pnpm run /clean:.*/",
|
|
96
96
|
"clean:logs": "npx rimraf ./*.log",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
"fix:fmt": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ../../libs/ts-repo-utils/src/cmd/format-uncommitted.mts --cwd .",
|
|
103
103
|
"fix:fmt:diff": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ../../libs/ts-repo-utils/src/cmd/format-diff-from.mts origin/main --cwd .",
|
|
104
104
|
"fix:fmt:full": "prettier --write .",
|
|
105
|
-
"fix:lint": "oxlint . --fix && eslint . --fix",
|
|
105
|
+
"fix:lint": "node ../../tools/scripts/cmd/assert-deps-built.mts && oxlint . --fix && eslint . --fix",
|
|
106
106
|
"fmt": "pnpm run fix:fmt",
|
|
107
107
|
"gen": "run-s gen:index gen:readme gen:jsdoc",
|
|
108
108
|
"gen:index": "run-s gen:index:src fix:fmt",
|
|
@@ -5,7 +5,10 @@ import {
|
|
|
5
5
|
hasDisableNextLineComment,
|
|
6
6
|
isAsConstNode,
|
|
7
7
|
} from '../functions/index.mjs';
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
replaceNodeWithDebugPrint,
|
|
10
|
+
replaceNodeWithText,
|
|
11
|
+
} from '../utils/index.mjs';
|
|
9
12
|
import type { TsMorphTransformer } from './types.mjs';
|
|
10
13
|
|
|
11
14
|
const TRANSFORMER_NAME = 'append-as-const';
|
|
@@ -13,6 +16,9 @@ const TRANSFORMER_NAME = 'append-as-const';
|
|
|
13
16
|
export const appendAsConstTransformer = (
|
|
14
17
|
options?: AppendAsConstTransformerOptions,
|
|
15
18
|
): TsMorphTransformer => {
|
|
19
|
+
// The ESLint counterpart is `ignoredMutablePattern` in
|
|
20
|
+
// `libs/eslint-config-typed/src/rules/eslint-functional-rules.mts`; change
|
|
21
|
+
// the two together.
|
|
16
22
|
const ignorePrefixes = ISet.create(
|
|
17
23
|
options?.ignorePrefixes ?? ['mut_', '#mut_', '_mut_', 'draft'],
|
|
18
24
|
);
|
|
@@ -27,7 +33,7 @@ export const appendAsConstTransformer = (
|
|
|
27
33
|
replaceNode:
|
|
28
34
|
options?.debug === true
|
|
29
35
|
? replaceNodeWithDebugPrint
|
|
30
|
-
: (node, newNodeText) => node
|
|
36
|
+
: (node, newNodeText) => replaceNodeWithText(node, newNodeText),
|
|
31
37
|
} as const;
|
|
32
38
|
|
|
33
39
|
return {
|
|
@@ -319,7 +325,7 @@ const transformNode = (
|
|
|
319
325
|
|
|
320
326
|
options.debugPrint(`${node.getText()} -> ${asConstText}`);
|
|
321
327
|
|
|
322
|
-
transformNode(node
|
|
328
|
+
transformNode(replaceNodeWithText(node, asConstText), context, options);
|
|
323
329
|
|
|
324
330
|
return;
|
|
325
331
|
}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import { Arr } from 'ts-data-forge';
|
|
4
4
|
import type * as tsm from 'ts-morph';
|
|
5
5
|
import { hasDisableNextLineComment } from '../functions/index.mjs';
|
|
6
|
+
import { replaceNodeWithText } from '../utils/index.mjs';
|
|
6
7
|
import type { TsMorphTransformer } from './types.mjs';
|
|
7
8
|
|
|
8
9
|
const TRANSFORMER_NAME = 'convert-interface-to-type';
|
|
@@ -91,7 +92,7 @@ export const convertInterfaceToTypeTransformer = (): TsMorphTransformer =>
|
|
|
91
92
|
const typeAliasText =
|
|
92
93
|
`${jsDocText}${exportKeyword}type ${interfaceName}${typeParamsStr} = ${mut_typeBody};` as const;
|
|
93
94
|
|
|
94
|
-
interfaceDecl
|
|
95
|
+
replaceNodeWithText(interfaceDecl, typeAliasText);
|
|
95
96
|
};
|
|
96
97
|
|
|
97
98
|
const buildTypeLiteral = (
|