ts-codemod-lib 3.4.3 → 3.5.0

package/dist/functions/functions/has-disable-next-line-comment.d.mts.map

@@ -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":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yBAAyB,SAC9B,GAAG,CAAC,IAAI,oBACI,MAAM,KACvB,OAwEF,CAAC"}
+{"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"}

package/dist/functions/functions/has-disable-next-line-comment.mjs

@@ -1,3 +1,4 @@
+import { Arr } from 'ts-data-forge';
 import * as tsm from 'ts-morph';
 import { IGNORE_LINE_COMMENT_PREFIXES } from '../constants/index.mjs';
 
@@ -15,20 +16,25 @@ import { IGNORE_LINE_COMMENT_PREFIXES } from '../constants/index.mjs';
 
 
 export const hasDisableNextLineComment = (node, transformerName) => {
-    const nodeStartLine = node.getStartLineNumber();
+
+
+    const leadingCommentRanges = node.getLeadingCommentRanges();
+    if (Arr.isEmpty(leadingCommentRanges)) {
+        return false;
+    }
+    const lineNumberAt = lineNumberLookup(node.getSourceFile().compilerNode);
+    const nodeStartLine = lineNumberAt(node.getStart());
 
     if (nodeStartLine <= 1) {
         return false;
     }
-    const sourceFile = node.getSourceFile();
-    const leadingCommentRanges = node.getLeadingCommentRanges();
 
     for (let mut_i = leadingCommentRanges.length - 1; mut_i >= 0; mut_i--) {
 
         const commentRange = leadingCommentRanges[mut_i];
 
         const commentEndPos = commentRange.getEnd();
-        const commentEndLine = sourceFile.getLineAndColumnAtPos(commentEndPos).line;
+        const commentEndLine = lineNumberAt(commentEndPos);
 
         if (nodeStartLine === commentEndLine + 1) {
 
@@ -69,4 +75,50 @@ export const hasDisableNextLineComment = (node, transformerName) => {
     }
     return false;
 };
+
+
+
+
+
+
+
+
+
+
+
+
+const lineNumberLookup = (
+
+sourceFile) => {
+    const cached = newlinePositionsCache.get(sourceFile);
+    const newlinePositions = cached ?? newlinePositionsOf(sourceFile.text);
+    if (cached === undefined) {
+        newlinePositionsCache.set(sourceFile, newlinePositions);
+    }
+    return (pos) => countLessThan(newlinePositions, pos) + 1;
+};
+const newlinePositionsCache = new WeakMap();
+const newlinePositionsOf = (text) => {
+    const mut_positions = [];
+    for (let mut_index = text.indexOf('\n'); mut_index !== -1; mut_index = text.indexOf('\n', mut_index + 1)) {
+        mut_positions.push(mut_index);
+    }
+    return mut_positions;
+};
+
+const countLessThan = (sorted, value) => {
+    let mut_low = 0;
+    let mut_high = sorted.length;
+    while (mut_low < mut_high) {
+        const mid = Math.floor((mut_low + mut_high) / 2);
+
+        if (sorted[mid] < value) {
+            mut_low = mid + 1;
+        }
+        else {
+            mut_high = mid;
+        }
+    }
+    return mut_low;
+};
 //# sourceMappingURL=has-disable-next-line-comment.mjs.map

package/dist/functions/functions/has-disable-next-line-comment.mjs.map

@@ -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,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAEhD,8CAA8C;IAC9C,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,qBAAqB;IAE9D,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;IAE5D,yEAAyE;IACzE,KAAK,IAAI,KAAK,GAAG,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACtE,oEAAoE;QACpE,MAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAE,CAAC;QAElD,qDAAqD;QACrD,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;QAE5C,MAAM,cAAc,GAAG,UAAU,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;QAE5E,4DAA4D;QAC5D,IAAI,aAAa,KAAK,cAAc,GAAG,CAAC,EAAE,CAAC;YACzC,0EAA0E;YAC1E,IAAI,YAAY,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;gBACtE,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC;gBAElD,qEAAqE;gBACrE,MAAM,aAAa,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACjE,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC7B,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;oBAChC,iFAAiF;oBACjF,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;wBAClC,OAAO,IAAI,CAAC;oBACd,CAAC;oBAED,oCAAoC;oBACpC,MAAM,WAAW,GAAG,WAAW;yBAC5B,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;yBACzC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;yBAC1B,IAAI,EAAE,CAAC;oBAEV,mEAAmE;oBACnE,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;wBACvB,OAAO,IAAI,CAAC;oBACd,CAAC;oBAED,+DAA+D;oBAC/D,MAAM,kBAAkB,GAAG,WAAW;yBACnC,KAAK,CAAC,GAAG,CAAC;yBACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAE9B,OAAO,kBAAkB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YAED,iEAAiE;YACjE,8DAA8D;YAC9D,6EAA6E;YAC7E,OAAO,KAAK,CAAC;QACf,CAAC;QAED,6EAA6E;QAC7E,IAAI,cAAc,GAAG,aAAa,GAAG,CAAC,EAAE,CAAC;YACvC,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
+{"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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"}

package/dist/functions/functions/wrap-with-parentheses.d.mts

@@ -6,17 +6,17 @@
  * @example
  *
  * ```ts
- * assert.deepStrictEqual(wrapWithParentheses('A'), '(A)');
+ * assert.strictEqual(wrapWithParentheses('A'), '(A)');
  *
  * // already wrapped, so not '((A))'
- * assert.deepStrictEqual(wrapWithParentheses('(A)'), '(A)');
+ * assert.strictEqual(wrapWithParentheses('(A)'), '(A)');
  *
- * assert.deepStrictEqual(wrapWithParentheses('A | B'), '(A | B)');
+ * assert.strictEqual(wrapWithParentheses('A | B'), '(A | B)');
  *
- * assert.deepStrictEqual(wrapWithParentheses('(A | B)'), '(A | B)');
+ * assert.strictEqual(wrapWithParentheses('(A | B)'), '(A | B)');
  *
  * // the outer parentheses do not span everything, so a pair is added
- * assert.deepStrictEqual(wrapWithParentheses('(A) | (B)'), '((A) | (B))');
+ * assert.strictEqual(wrapWithParentheses('(A) | (B)'), '((A) | (B))');
  * ```
  */
 export declare const wrapWithParentheses: (nodeStr: string) => string;

package/dist/functions/utils/index.d.mts

@@ -1,2 +1,3 @@
+export * from './replace-node-with-text.mjs';
 export * from './replace-with-debug.mjs';
 //# sourceMappingURL=index.d.mts.map

package/dist/functions/utils/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC"}

package/dist/functions/utils/index.mjs

@@ -1,2 +1,3 @@
+export * from './replace-node-with-text.mjs';
 export * from './replace-with-debug.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/functions/utils/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../src/functions/utils/index.mts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC"}

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

@@ -0,0 +1,21 @@
+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.
+ *
+ * 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.
+ */
+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

@@ -0,0 +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"}

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

@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+export const replaceNodeWithText = (node, newNodeText) => newNodeText.includes('\n')
+    ? node.replaceWithText(newNodeText)
+    : node.replaceWithText.call(node, newNodeText, node.getProject().createWriter());
+//# sourceMappingURL=replace-node-with-text.mjs.map

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

@@ -0,0 +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"}

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

@@ -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;AAErC,eAAO,MAAM,yBAAyB,SAC9B,GAAG,CAAC,IAAI,eACD,MAAM,KAClB,IAIF,CAAC"}
+{"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"}

package/dist/functions/utils/replace-with-debug.mjs

@@ -1,5 +1,6 @@
+import { replaceNodeWithText } from './replace-node-with-text.mjs';
 export const replaceNodeWithDebugPrint = (node, newNodeText) => {
     console.debug(`${node.getText()} -> ${newNodeText}`);
-    node.replaceWithText(newNodeText);
+    replaceNodeWithText(node, newNodeText);
 };
 //# sourceMappingURL=replace-with-debug.mjs.map

package/dist/functions/utils/replace-with-debug.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"replace-with-debug.mjs","sourceRoot":"","sources":["../../../src/functions/utils/replace-with-debug.mts"],"names":[],"mappings":"AAEA,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,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;AACpC,CAAC,CAAC"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "ts-codemod-lib",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "private": false,
   "keywords": [
     "typescript",
@@ -38,7 +38,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "ts-data-forge": "^14.7.1",
+    "ts-data-forge": "^14.8.0",
     "ts-morph": "^28.0.0",
     "ts-type-forge": "^9.2.2"
   },
@@ -51,13 +51,13 @@
     "dedent": "1.7.2",
     "esbuild": "0.28.2",
     "eslint": "10.12.0",
-    "eslint-config-typed": "5.17.2",
-    "eslint-plugin-ts-data-forge": "0.8.4",
-    "eslint-plugin-ts-fortress": "1.3.1",
-    "eslint-plugin-ts-type-forge": "0.8.6",
+    "eslint-config-typed": "5.19.0",
+    "eslint-plugin-ts-data-forge": "0.9.0",
+    "eslint-plugin-ts-fortress": "1.3.4",
+    "eslint-plugin-ts-type-forge": "0.8.9",
     "jiti": "2.7.0",
     "npm-run-all2": "9.0.3",
-    "playwright": "1.63.0",
+    "playwright": "1.64.0",
     "prettier": "3.9.9",
     "prettier-plugin-organize-imports": "4.3.0",
     "prettier-plugin-packagejson": "3.0.2",
@@ -67,7 +67,7 @@
     "typedoc-github-theme": "0.4.0",
     "typescript": "6.0.3",
     "typescript-native": "npm:typescript@7.0.2",
-    "vite": "8.3.2",
+    "vite": "8.3.3",
     "vitest": "5.0.3"
   },
   "engines": {
@@ -75,7 +75,7 @@
     "pnpm": ">=9.0.0"
   },
   "volta": {
-    "node": "26.11.1"
+    "node": "26.12.0"
   },
   "publishConfig": {
     "access": "public",
@@ -86,11 +86,11 @@
     "check:cspell": "cspell \"**\" --gitignore --gitignore-root ../../ --no-progress",
     "check:dist": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ./scripts/cmd/check-dist.mts",
     "check:ext": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ./scripts/cmd/check-ext.mts",
-    "check:lint": "oxlint . && eslint .",
-    "check:test": "pnpm run z:vitest:node run",
-    "check:test:browser": "pnpm run z:vitest --project='Browser' run",
-    "check:test:cov": "pnpm run z:vitest:node run --coverage",
-    "check:types": "node ../../node_modules/typescript-native/bin/tsc --noEmit",
+    "check:lint": "node ../../tools/scripts/cmd/assert-deps-built.mts && oxlint . && eslint .",
+    "check:test": "node ../../tools/scripts/cmd/assert-deps-built.mts && pnpm run z:vitest:node run",
+    "check:test:browser": "node ../../tools/scripts/cmd/assert-deps-built.mts && pnpm run z:vitest --project='Browser' run",
+    "check:test:cov": "node ../../tools/scripts/cmd/assert-deps-built.mts && pnpm run z:vitest:node run --coverage",
+    "check:types": "node ../../tools/scripts/cmd/assert-deps-built.mts && node ../../node_modules/typescript-native/bin/tsc --noEmit",
     "check-all": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ./scripts/cmd/check-all.mts",
     "clean": "pnpm run /clean:.*/",
     "clean:logs": "npx rimraf ./*.log",
@@ -102,7 +102,7 @@
     "fix:fmt": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ../../libs/ts-repo-utils/src/cmd/format-uncommitted.mts --cwd .",
     "fix:fmt:diff": "tsx --tsconfig ../../tools/configs/tsconfig.tsx.json ../../libs/ts-repo-utils/src/cmd/format-diff-from.mts origin/main --cwd .",
     "fix:fmt:full": "prettier --write .",
-    "fix:lint": "oxlint . --fix && eslint . --fix",
+    "fix:lint": "node ../../tools/scripts/cmd/assert-deps-built.mts && oxlint . --fix && eslint . --fix",
     "fmt": "pnpm run fix:fmt",
     "gen": "run-s gen:index gen:readme gen:jsdoc",
     "gen:index": "run-s gen:index:src fix:fmt",

package/src/functions/ast-transformers/append-as-const.mts

@@ -5,7 +5,10 @@ import {
   hasDisableNextLineComment,
   isAsConstNode,
 } from '../functions/index.mjs';
-import { replaceNodeWithDebugPrint } from '../utils/index.mjs';
+import {
+  replaceNodeWithDebugPrint,
+  replaceNodeWithText,
+} from '../utils/index.mjs';
 import type { TsMorphTransformer } from './types.mjs';
 
 const TRANSFORMER_NAME = 'append-as-const';
@@ -27,7 +30,7 @@ export const appendAsConstTransformer = (
     replaceNode:
       options?.debug === true
         ? replaceNodeWithDebugPrint
-        : (node, newNodeText) => node.replaceWithText(newNodeText),
+        : (node, newNodeText) => replaceNodeWithText(node, newNodeText),
   } as const;
 
   return {
@@ -199,7 +202,10 @@ const transformNode = (
   }
 
   // Skip already type asserted nodes
-  if (tsm.Node.isAsExpression(node) && !isAsConstNode(node)) {
+  if (
+    (tsm.Node.isAsExpression(node) || tsm.Node.isTypeAssertion(node)) &&
+    !isConstAssertionNode(node)
+  ) {
     return;
   }
 
@@ -308,8 +314,21 @@ const transformNode = (
     return;
   }
 
+  // `<const>x` is handled as the `x as const` it means. Appending `as const`
+  // to `x` in place would read as `(<const>x) as const`, and every position
+  // that reaches here already takes an `as` expression.
+  if (tsm.Node.isTypeAssertion(node) && isConstAssertionNode(node)) {
+    const asConstText = `${node.getExpression().getText()} as const` as const;
+
+    options.debugPrint(`${node.getText()} -> ${asConstText}`);
+
+    transformNode(replaceNodeWithText(node, asConstText), context, options);
+
+    return;
+  }
+
   // `as const` node
-  if (isAsConstNode(node)) {
+  if (isConstAssertionNode(node)) {
     if (context.isDirectUnderConstInitializer) {
       // In const variable declarations, remove `as const` first and then re-append it later if needed
 
@@ -424,7 +443,9 @@ const removeAsConstInConstTypeParameterArgs = (
 
     // Cheap syntactic pre-check before touching the type checker
     if (
-      args.every((arg) => !isAsConstNode(skipParenthesizedExpressions(arg)))
+      args.every(
+        (arg) => !isConstAssertionNode(skipParenthesizedExpressions(arg)),
+      )
     ) {
       continue;
     }
@@ -487,7 +508,7 @@ const removeAsConstArgsOfCall = (
     // `f(([1] as const))` is the same argument as `f([1] as const)`.
     const asConst = skipParenthesizedExpressions(argument);
 
-    if (!isAsConstNode(asConst)) {
+    if (!isConstAssertionNode(asConst)) {
       continue;
     }
 
@@ -517,6 +538,31 @@ const removeAsConstArgsOfCall = (
   }
 };
 
+/**
+ * `x as const`, or `<const>x`, the angle-bracket spelling TypeScript treats
+ * identically (outside `.tsx`, where it does not parse).
+ */
+const isConstAssertionNode = (
+  node: tsm.Node,
+): node is tsm.AsExpression | tsm.TypeAssertion => {
+  if (isAsConstNode(node)) {
+    return true;
+  }
+
+  if (!tsm.Node.isTypeAssertion(node)) {
+    return false;
+  }
+
+  const typeNode = node.getTypeNode();
+
+  return (
+    typeNode !== undefined &&
+    typeNode.isKind(tsm.SyntaxKind.TypeReference) &&
+    typeNode.getTypeName().getText() === 'const' &&
+    Arr.isEmpty(typeNode.getTypeArguments())
+  );
+};
+
 /** `node` with the parentheses written around it taken off. */
 const skipParenthesizedExpressions = (node: tsm.Node): tsm.Node =>
   tsm.Node.isParenthesizedExpression(node)
@@ -541,6 +587,11 @@ const resolveSingleSignatureCallTarget = (
   // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
   call: tsm.CallExpression,
 ): ResolvedCallTarget | undefined => {
+  // The callee's type is read as the call sees it, after any `as`,
+  // `satisfies` or `!` around it: that is the signature the argument is
+  // inferred against, and an `as const` has no run-time effect for an inner
+  // layer to contradict.
+  //
   // 0 signatures: the callee is unresolved (e.g. imported, since each file
   // is transformed in an isolated single-file project).
   // 2+ signatures: overloads, where removing `as const` could change which

package/src/functions/ast-transformers/append-as-const.test.mts

@@ -894,6 +894,125 @@ describe(appendAsConstTransformer, () => {
     ])('$name', testFn);
   });
 
+  describe('Callee judged by its type at the call, through type wrappers', () => {
+    test.each([
+      {
+        name: 'widening as to a const type parameter signature should remove as const',
+        source: dedent`
+          const g = <T,>(x: T): T => x;
+          const a = (g as <const T>(x: T) => T)([1, 2] as const);
+        `,
+        expected: dedent`
+          const g = <T,>(x: T): T => x;
+          const a = (g as <const T>(x: T) => T)([1, 2]);
+        `,
+      },
+      {
+        name: 'as to a non-const type parameter signature should keep as const',
+        source: dedent`
+          const g = <const T,>(x: T): T => x;
+          const a = (g as <T>(x: T) => T)([1, 2] as const);
+        `,
+        expected: dedent`
+          const g = <const T,>(x: T): T => x;
+          const a = (g as <T>(x: T) => T)([1, 2] as const);
+        `,
+      },
+      {
+        name: 'satisfies keeps the callee type, so as const should be removed',
+        source: dedent`
+          const g = <const T,>(x: T): T => x;
+          const a = (g satisfies unknown)([1, 2] as const);
+        `,
+        expected: dedent`
+          const g = <const T,>(x: T): T => x;
+          const a = (g satisfies unknown)([1, 2]);
+        `,
+      },
+      {
+        name: 'non-null asserted callee should remove as const',
+        source: dedent`
+          declare const g: (<const T>(x: T) => T) | undefined;
+          const a = g!([1, 2] as const);
+        `,
+        expected: dedent`
+          declare const g: (<const T>(x: T) => T) | undefined;
+          const a = g!([1, 2]);
+        `,
+      },
+      {
+        name: 'parenthesized callee should remove as const',
+        source: dedent`
+          const g = <const T,>(x: T): T => x;
+          const a = ((g))([1, 2] as const);
+        `,
+        expected: dedent`
+          const g = <const T,>(x: T): T => x;
+          const a = ((g))([1, 2]);
+        `,
+      },
+    ])('$name', testFn);
+  });
+
+  describe('Angle-bracket const assertions (<const>x)', () => {
+    test.each([
+      {
+        name: 'should be removed inside an array literal that gets as const',
+        source: 'const c = [<const>[1], 2];',
+        expected: 'const c = [[1], 2] as const;',
+      },
+      {
+        name: 'should be removed inside an object literal that gets as const',
+        source: 'const o = { a: <const>[1] };',
+        expected: 'const o = { a: [1] } as const;',
+      },
+      {
+        name: 'should be spelled as const on a const initializer',
+        source: 'const b = <const>[1, 2];',
+        expected: 'const b = [1, 2] as const;',
+      },
+      {
+        name: 'should be removed from a primitive const initializer',
+        source: "const s = <const>'a';",
+        expected: "const s = 'a';",
+      },
+      {
+        name: 'should be removed inside an outer as const',
+        source: 'const n = [<const>[1], 2] as const;',
+        expected: 'const n = [[1], 2] as const;',
+      },
+      {
+        name: 'const type parameter should remove it from an argument',
+        source: dedent`
+          function f<const T>(x: T): T { return x; }
+          const a = f(<const>[1, 2]);
+          const b = f((<const>[1, 2]));
+        `,
+        expected: dedent`
+          function f<const T>(x: T): T { return x; }
+          const a = f([1, 2]);
+          const b = f([1, 2]);
+        `,
+      },
+      {
+        name: 'non-const type parameter should keep it in an argument',
+        source: dedent`
+          function g<T>(x: T): T { return x; }
+          const a = g(<const>[1, 2]);
+        `,
+        expected: dedent`
+          function g<T>(x: T): T { return x; }
+          const a = g(<const>[1, 2]);
+        `,
+      },
+      {
+        name: 'other angle-bracket assertions should be left as they are',
+        source: 'const d = <readonly number[]>[1, 2];',
+        expected: 'const d = <readonly number[]>[1, 2];',
+      },
+    ])('$name', testFn);
+  });
+
   describe('ignorePrefixes option (mut_ prefix)', () => {
     test.each([
       {

package/src/functions/ast-transformers/convert-interface-to-type.mts

@@ -3,6 +3,7 @@
 import { Arr } from 'ts-data-forge';
 import type * as tsm from 'ts-morph';
 import { hasDisableNextLineComment } from '../functions/index.mjs';
+import { replaceNodeWithText } from '../utils/index.mjs';
 import type { TsMorphTransformer } from './types.mjs';
 
 const TRANSFORMER_NAME = 'convert-interface-to-type';
@@ -91,7 +92,7 @@ export const convertInterfaceToTypeTransformer = (): TsMorphTransformer =>
         const typeAliasText =
           `${jsDocText}${exportKeyword}type ${interfaceName}${typeParamsStr} = ${mut_typeBody};` as const;
 
-        interfaceDecl.replaceWithText(typeAliasText);
+        replaceNodeWithText(interfaceDecl, typeAliasText);
       };
 
       const buildTypeLiteral = (

package/src/functions/ast-transformers/convert-to-readonly.mts

@@ -29,7 +29,10 @@ import {
   wrapWithParentheses,
   type ReadonlyTypeReferenceNode,
 } from '../functions/index.mjs';
-import { replaceNodeWithDebugPrint } from '../utils/index.mjs';
+import {
+  replaceNodeWithDebugPrint,
+  replaceNodeWithText,
+} from '../utils/index.mjs';
 import {
   groupUnionIntersectionTypes,
   invalidDeepReadonlyTypeName,
@@ -72,7 +75,7 @@ export const convertToReadonlyTransformer = (
     replaceNode:
       options?.debug === true
         ? replaceNodeWithDebugPrint
-        : (node, newNodeText) => node.replaceWithText(newNodeText),
+        : (node, newNodeText) => replaceNodeWithText(node, newNodeText),
   } as const;
 
   return {

package/src/functions/ast-transformers/convert-to-readonly.test.mts

@@ -7,9 +7,7 @@ import * as prettierPluginEstree from 'prettier/plugins/estree';
 import * as prettierPluginTypeScript from 'prettier/plugins/typescript';
 import * as prettier from 'prettier/standalone';
 import { expectType } from 'ts-data-forge';
-// Aliased: an import named `DeepReadonly` makes `vitest/prefer-describe-function-title`
-// rewrite `describe('DeepReadonly', ...)` into a reference to this type.
-import type { DeepReadonly as TsTypeForgeDeepReadonly } from 'ts-type-forge';
+import type { DeepReadonly } from 'ts-type-forge';
 import {
   convertToReadonlyTransformer,
   type ReadonlyTransformerOptions,
@@ -3090,34 +3088,25 @@ describe(convertToReadonlyTransformer, () => {
       type B = Readonly<{ b: string[] }>;
 
       // `|` commutes with DeepReadonly, so merging a union is safe.
-      expectType<
-        TsTypeForgeDeepReadonly<A | B>,
-        TsTypeForgeDeepReadonly<A> | TsTypeForgeDeepReadonly<B>
-      >('=');
+      expectType<DeepReadonly<A | B>, DeepReadonly<A> | DeepReadonly<B>>('=');
 
-      expectType<
-        TsTypeForgeDeepReadonly<F | X>,
-        TsTypeForgeDeepReadonly<F> | TsTypeForgeDeepReadonly<X>
-      >('=');
+      expectType<DeepReadonly<F | X>, DeepReadonly<F> | DeepReadonly<X>>('=');
 
       expectType<
-        TsTypeForgeDeepReadonly<readonly string[] | X>,
-        TsTypeForgeDeepReadonly<readonly string[]> | TsTypeForgeDeepReadonly<X>
+        DeepReadonly<readonly string[] | X>,
+        DeepReadonly<readonly string[]> | DeepReadonly<X>
       >('=');
 
       // `&` does not: an intersection is tested as a whole and matches every
       // branch any one member matches. `F & X` hits the function branch and
       // comes back unchanged, leaving `x` mutable.
-      expectType<TsTypeForgeDeepReadonly<F & X>, F & X>('=');
+      expectType<DeepReadonly<F & X>, F & X>('=');
 
-      expectType<
-        TsTypeForgeDeepReadonly<F & X>,
-        TsTypeForgeDeepReadonly<F> & TsTypeForgeDeepReadonly<X>
-      >('!=');
+      expectType<DeepReadonly<F & X>, DeepReadonly<F> & DeepReadonly<X>>('!=');
 
       expectType<
-        TsTypeForgeDeepReadonly<readonly string[] & X>,
-        TsTypeForgeDeepReadonly<readonly string[]> & TsTypeForgeDeepReadonly<X>
+        DeepReadonly<readonly string[] & X>,
+        DeepReadonly<readonly string[]> & DeepReadonly<X>
       >('!=');
 
       // `Readonly` over type literals does commute with `&`, which is what