ts-codemod-lib 4.0.0 → 4.1.0

package/dist/functions/functions/wrap-with-parentheses.mjs

@@ -1,17 +1,4 @@
-import { asUint32, range } from 'ts-data-forge';
-const parenDepthDelta = (char) => {
-    switch (char) {
-        case '(':
-            return 1;
-        case ')':
-            return -1;
-
-
-        case undefined:
-        default:
-            return 0;
-    }
-};
+import * as tsm from 'ts-morph';
 
 
 
@@ -25,22 +12,23 @@ const parenDepthDelta = (char) => {
 
 
 
-const isWrappedWithParentheses = (str) => {
-    const trimmed = str.trim();
-    if (!trimmed.startsWith('(') || !trimmed.endsWith(')')) {
-        return false;
-    }
 
 
-    let mut_depth = 0;
-    for (const mut_i of range(0, asUint32(trimmed.length))) {
-        mut_depth += parenDepthDelta(trimmed.at(mut_i));
 
-        if (mut_depth === 0 && mut_i < trimmed.length - 1) {
-            return false;
-        }
-    }
-    return true;
+
+
+
+
+
+export const wrapWithParentheses = (nodeStr) => {
+    const trimmed = nodeStr.trim();
+    return isWrappedWithParentheses(trimmed)
+        ? trimmed
+        : `(${trimmed})`;
+};
+const initialScanState = {
+    parenDepth: 0,
+    openBraces: '',
 };
 
 
@@ -48,14 +36,46 @@ const isWrappedWithParentheses = (str) => {
 
 
 
+const untrustedTokens = new Set([
+    tsm.ts.SyntaxKind.SlashToken,
+    tsm.ts.SyntaxKind.SlashEqualsToken,
+    tsm.ts.SyntaxKind.Unknown,
+]);
 
 
 
 
 
+const scanStep = new Map([
+    [
+        tsm.ts.SyntaxKind.OpenParenToken,
+        (state) => ({ ...state, parenDepth: state.parenDepth + 1 }),
+    ],
+    [
+        tsm.ts.SyntaxKind.CloseParenToken,
+        (state) => ({ ...state, parenDepth: state.parenDepth - 1 }),
+    ],
+    [
+        tsm.ts.SyntaxKind.OpenBraceToken,
+        (state) => ({ ...state, openBraces: `${state.openBraces}{` }),
+    ],
+    [
+        tsm.ts.SyntaxKind.TemplateHead,
+        (state) => ({ ...state, openBraces: `${state.openBraces}$` }),
+    ],
+    [
+        tsm.ts.SyntaxKind.CloseBraceToken,
+        (state, scanner) => 
 
 
 
+        state.openBraces.endsWith('$') &&
+            scanner.reScanTemplateToken( false) !==
+                tsm.ts.SyntaxKind.TemplateTail
+            ? state
+            : { ...state, openBraces: state.openBraces.slice(0, -1) },
+    ],
+]);
 
 
 
@@ -63,10 +83,45 @@ const isWrappedWithParentheses = (str) => {
 
 
 
-export const wrapWithParentheses = (nodeStr) => {
-    const trimmed = nodeStr.trim();
-    return isWrappedWithParentheses(trimmed)
-        ? trimmed
-        : `(${trimmed})`;
+
+
+
+
+
+
+
+
+
+
+
+
+
+const isWrappedWithParentheses = (str) => {
+    const trimmed = str.trim();
+    if (!trimmed.startsWith('(') || !trimmed.endsWith(')')) {
+        return false;
+    }
+    const scanner = tsm.ts.createScanner(tsm.ts.ScriptTarget.Latest, 
+     true, tsm.ts.LanguageVariant.Standard, trimmed);
+    let mut_state = initialScanState;
+    for (let mut_token = scanner.scan(); mut_token !== tsm.ts.SyntaxKind.EndOfFileToken; mut_token = scanner.scan()) {
+
+
+        if (untrustedTokens.has(mut_token)) {
+            return false;
+        }
+        mut_state = scanStep.get(mut_token)?.(mut_state, scanner) ?? mut_state;
+
+        if (scanner.isUnterminated()) {
+            return false;
+        }
+
+
+        if (mut_state.parenDepth === 0 && scanner.getTokenEnd() < trimmed.length) {
+            return false;
+        }
+    }
+
+    return mut_state.parenDepth === 0;
 };
 //# sourceMappingURL=wrap-with-parentheses.mjs.map

package/dist/functions/functions/wrap-with-parentheses.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-with-parentheses.mjs","sourceRoot":"","sources":["../../../src/functions/functions/wrap-with-parentheses.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAU,EAAE;IAC3D,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,GAAG;YACN,OAAO,CAAC,CAAC;QAEX,KAAK,GAAG;YACN,OAAO,CAAC,CAAC,CAAC;QAEZ,sEAAsE;QACtE,0DAA0D;QAC1D,KAAK,SAAS,CAAC;QACf;YACE,OAAO,CAAC,CAAC;IACb,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAW,EAAE;IACxD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAE3B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,4DAA4D;IAC5D,6DAA6D;IAC7D,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACvD,SAAS,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAEhD,kFAAkF;QAClF,IAAI,SAAS,KAAK,CAAC,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;IAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAE/B,OAAO,wBAAwB,CAAC,OAAO,CAAC;QACtC,CAAC,CAAC,OAAO;QACT,CAAC,CAAE,IAAI,OAAO,GAAa,CAAC;AAChC,CAAC,CAAC"}
+{"version":3,"file":"wrap-with-parentheses.mjs","sourceRoot":"","sources":["../../../src/functions/functions/wrap-with-parentheses.mts"],"names":[],"mappings":"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"}

package/dist/functions/utils/replace-node-with-text.d.mts

@@ -3,19 +3,18 @@ import type * as tsm from 'ts-morph';
  * `node.replaceWithText(newNodeText)`, sparing a one-line text the indentation
  * lookup.
  *
- * `replaceWithText` writes the text through a writer whose indentation it
- * looks up first, for the lines after the first one, and the lookup reparses
- * the whole file in the language service: on top of the reparse every
- * replacement makes anyway, once per replacement, so it is quadratic in the
- * size of the file. A text with no `\n` has no line after the first, the
- * indentation is never applied, and a plain writer from the same project
- * writes the same text — so the lookup is skipped. A multi-line text takes
- * the original path.
+ * `replaceWithText` writes the text through a writer whose indentation it looks
+ * up first, for the lines after the first one, and the lookup reparses the
+ * whole file in the language service: on top of the reparse every replacement
+ * makes anyway, once per replacement, so it is quadratic in the size of the
+ * file. A text with no `\n` has no line after the first, the indentation is
+ * never applied, and a plain writer from the same project writes the same text
+ * — so the lookup is skipped. A multi-line text takes the original path.
  *
  * The writer is passed as `replaceWithText`'s second argument, which its
- * declaration leaves out and ts-morph passes itself when it sets an
- * expression. Were it ever dropped, the method would look the indentation up
- * as before: slower, never different.
+ * declaration leaves out and ts-morph passes itself when it sets an expression.
+ * Were it ever dropped, the method would look the indentation up as before:
+ * slower, never different.
  */
 export declare const replaceNodeWithText: (node: tsm.Node, newNodeText: string) => tsm.Node;
 //# sourceMappingURL=replace-node-with-text.d.mts.map

package/dist/functions/utils/replace-node-with-text.d.mts.map

@@ -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"}
+{"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;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,mBAAmB,SACxB,GAAG,CAAC,IAAI,eACD,MAAM,KAClB,GAAG,CAAC,IAOA,CAAC"}

package/dist/functions/utils/replace-node-with-text.mjs

@@ -15,7 +15,6 @@
 
 
 
-
 export const replaceNodeWithText = (node, newNodeText) => newNodeText.includes('\n')
     ? node.replaceWithText(newNodeText)
     : node.replaceWithText.call(node, newNodeText, node.getProject().createWriter());

package/dist/functions/utils/replace-node-with-text.mjs.map

@@ -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"}
+{"version":3,"file":"replace-node-with-text.mjs","sourceRoot":"","sources":["../../../src/functions/utils/replace-node-with-text.mts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-codemod-lib",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "private": false,
   "keywords": [
     "typescript",
@@ -38,30 +38,30 @@
     "LICENSE"
   ],
   "dependencies": {
-    "ts-data-forge": "^14.10.0",
+    "ts-data-forge": "^14.11.0",
     "ts-morph": "^28.0.0",
     "ts-type-forge": "^9.2.2"
   },
   "devDependencies": {
     "@types/node": "26.6.5",
     "@vitest/browser-playwright": "5.0.5",
-    "@vitest/coverage-v8": "5.0.5",
+    "@vitest/coverage-istanbul": "5.0.5",
     "@vitest/ui": "5.0.5",
     "cspell": "10.4.0",
     "dedent": "1.7.2",
     "esbuild": "0.28.2",
     "eslint": "10.13.0",
-    "eslint-config-typed": "6.0.0",
-    "eslint-plugin-ts-data-forge": "0.10.4",
-    "eslint-plugin-ts-fortress": "1.3.9",
-    "eslint-plugin-ts-type-forge": "0.8.14",
+    "eslint-config-typed": "7.5.0",
+    "eslint-plugin-ts-data-forge": "0.10.10",
+    "eslint-plugin-ts-fortress": "1.3.14",
+    "eslint-plugin-ts-type-forge": "0.8.19",
     "jiti": "2.7.0",
     "npm-run-all2": "9.0.4",
     "playwright": "1.64.1",
     "prettier": "3.9.10",
     "prettier-plugin-organize-imports": "4.3.0",
     "prettier-plugin-packagejson": "3.0.2",
-    "ts-repo-utils": "10.7.1",
+    "ts-repo-utils": "10.7.3",
     "tsx": "4.23.15",
     "typedoc": "0.28.20",
     "typedoc-github-theme": "0.4.0",
@@ -75,7 +75,7 @@
     "pnpm": ">=9.0.0"
   },
   "volta": {
-    "node": "26.12.1"
+    "node": "26.13.0"
   },
   "publishConfig": {
     "access": "public",