@nx/devkit 23.0.0-beta.24 → 23.0.0-beta.25

package/dist/src/migrations/update-23-0-0/rename-create-nodes-v2-types.js

@@ -55,20 +55,28 @@ function rewriteCreateNodesV2Types(source) {
     const sourceFile = ts.createSourceFile('tmp.ts', source, ts.ScriptTarget.Latest, 
     /* setParentNodes */ true, ts.ScriptKind.TSX);
     const changes = [];
+    // Local bindings whose name changes as a result of rewriting a non-aliased
+    // import specifier (e.g. `import { CreateNodesV2 }` -> `import { CreateNodes }`).
+    // Every in-body reference to such a binding must be renamed too, otherwise the
+    // rewritten import leaves a dangling reference to the old name.
+    const localRenames = new Map();
     for (const stmt of sourceFile.statements) {
         if (ts.isImportDeclaration(stmt)) {
-            collectImportRewrite(sourceFile, stmt, changes);
+            collectImportRewrite(sourceFile, stmt, changes, localRenames);
         }
         else if (ts.isExportDeclaration(stmt)) {
             collectExportRewrite(sourceFile, stmt, changes);
         }
     }
+    if (localRenames.size > 0) {
+        collectUsageRewrites(sourceFile, localRenames, changes);
+    }
     return changes.length > 0 ? (0, string_change_1.applyChangesToString)(source, changes) : source;
 }
 function isDevkitSpecifier(node) {
     return ts.isStringLiteral(node) && node.text === DEVKIT_SPECIFIER;
 }
-function collectImportRewrite(sourceFile, stmt, changes) {
+function collectImportRewrite(sourceFile, stmt, changes, localRenames) {
     if (!isDevkitSpecifier(stmt.moduleSpecifier)) {
         return;
     }
@@ -76,8 +84,62 @@ function collectImportRewrite(sourceFile, stmt, changes) {
     if (!namedBindings || !ts.isNamedImports(namedBindings)) {
         return;
     }
+    // A non-aliased specifier (`{ CreateNodesV2 }`) renames the local binding, so
+    // its in-body references must be rewritten as well. An aliased specifier
+    // (`{ CreateNodesV2 as Foo }`) keeps the local name `Foo`, so it does not.
+    for (const el of namedBindings.elements) {
+        if (el.propertyName) {
+            continue;
+        }
+        const canonical = exports.CREATE_NODES_V2_TYPE_RENAMES.get(el.name.text);
+        if (canonical) {
+            localRenames.set(el.name.text, canonical);
+        }
+    }
     rewriteNamedBindings(sourceFile, namedBindings, changes);
 }
+/**
+ * Renames in-body references (type annotations, value usages) of bindings that
+ * were renamed by an import rewrite. References inside import/export
+ * declarations are left to the binding rewrite, and member positions
+ * (`foo.CreateNodesV2`, `NS.CreateNodesV2`) are not standalone references to the
+ * imported binding, so they are skipped.
+ */
+function collectUsageRewrites(sourceFile, localRenames, changes) {
+    const visit = (node) => {
+        if (ts.isIdentifier(node) &&
+            localRenames.has(node.text) &&
+            isRenameableReference(node)) {
+            const start = node.getStart(sourceFile);
+            changes.push({ type: string_change_1.ChangeType.Delete, start, length: node.getEnd() - start }, {
+                type: string_change_1.ChangeType.Insert,
+                index: start,
+                text: localRenames.get(node.text),
+            });
+        }
+        ts.forEachChild(node, visit);
+    };
+    ts.forEachChild(sourceFile, visit);
+}
+function isRenameableReference(id) {
+    const parent = id.parent;
+    // `foo.CreateNodesV2` — the member name is not the imported binding.
+    if (ts.isPropertyAccessExpression(parent) && parent.name === id) {
+        return false;
+    }
+    // `NS.CreateNodesV2` in a type position — same reasoning.
+    if (ts.isQualifiedName(parent) && parent.right === id) {
+        return false;
+    }
+    // Anything inside an import/export declaration is handled by the binding
+    // rewrite; skip it here to avoid touching the specifier twice.
+    for (let n = id; n; n = n.parent) {
+        if (ts.isImportDeclaration(n) || ts.isExportDeclaration(n)) {
+            return false;
+        }
+    }
+    return true;
+}
 function collectExportRewrite(sourceFile, stmt, changes) {
     if (!stmt.moduleSpecifier || !isDevkitSpecifier(stmt.moduleSpecifier)) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "23.0.0-beta.24",
+  "version": "23.0.0-beta.25",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "jest": "30.3.0",
-    "nx": "23.0.0-beta.24"
+    "nx": "23.0.0-beta.25"
   },
   "peerDependencies": {
     "nx": ">= 22 <= 24 || ^23.0.0-0"
@@ -69,7 +69,8 @@
     "access": "public"
   },
   "nx-migrations": {
-    "migrations": "./migrations.json"
+    "migrations": "./migrations.json",
+    "supportsOptionalUpdates": true
   },
   "exports": {
     ".": {