@arcgis/codemod 5.2.0-next.8 → 5.2.0-next.84

package/dist/{cli-mQ3ZNyiH.js → cli-3BztOTDV.js}

@@ -1,18 +1,21 @@
 import { log as h } from "@arcgis/toolkit/log";
-import { Command as $ } from "@commander-js/extra-typings";
-import { statSync as K } from "node:fs";
-import { getCwd as I, path as e, existsAsync as U, gitIgnoreFileToGlobs as L, asyncFindPath as E, toPosixPathSeparators as N, asyncRetrievePackageJson as J } from "@arcgis/components-build-utils";
+import { Command as K } from "@commander-js/extra-typings";
+import { statSync as U } from "node:fs";
+import { getCwd as F, path as e, toPosixPathSeparators as J } from "@arcgis/node-toolkit/path";
 import "ts-morph";
-import i from "typescript";
-import { glob as _ } from "tinyglobby";
-import { identity as W } from "@arcgis/toolkit/function";
-import { styleText as B } from "node:util";
+import a from "typescript";
+import { existsAsync as B, asyncFindPath as W } from "@arcgis/node-toolkit/file";
+import { asyncRetrievePackageJson as M } from "@arcgis/node-toolkit/packageJson";
+import { glob as T } from "tinyglobby";
+import { gitIgnoreFileToGlobs as $ } from "@arcgis/node-toolkit/glob";
+import { identity as L } from "@arcgis/toolkit/function";
+import { styleText as S } from "node:util";
 const q = (t, o, n) => {
   const r = t[o];
-  return r ? typeof r == "function" ? r() : Promise.resolve(r) : new Promise((a, c) => {
-    (typeof queueMicrotask == "function" ? queueMicrotask : setTimeout)(c.bind(null, /* @__PURE__ */ new Error("Unknown variable dynamic import: " + o + (o.split("/").length !== n ? ". Note that variables only represent file names one level deep." : ""))));
+  return r ? typeof r == "function" ? r() : Promise.resolve(r) : new Promise((c, i) => {
+    (typeof queueMicrotask == "function" ? queueMicrotask : setTimeout)(i.bind(null, /* @__PURE__ */ new Error("Unknown variable dynamic import: " + o + (o.split("/").length !== n ? ". Note that variables only represent file names one level deep." : ""))));
   });
-}, ge = {
+}, ye = {
   allowImportingTsExtensions: !0,
   allowJs: !0,
   allowArbitraryExtensions: !0,
@@ -22,13 +25,13 @@ const q = (t, o, n) => {
   forceConsistentCasingInFileNames: !1,
   isolatedModules: !1,
   isolatedDeclarations: !1,
-  jsx: i.JsxEmit.Preserve,
+  jsx: a.JsxEmit.Preserve,
   lib: ["lib.esnext.d.ts", "lib.dom.d.ts"],
-  module: i.ModuleKind.ESNext,
-  moduleResolution: i.ModuleResolutionKind.Bundler,
-  moduleDetection: i.ModuleDetectionKind.Auto,
+  module: a.ModuleKind.ESNext,
+  moduleResolution: a.ModuleResolutionKind.Bundler,
+  moduleDetection: a.ModuleDetectionKind.Auto,
   strict: !1,
-  target: i.ScriptTarget.ESNext,
+  target: a.ScriptTarget.ESNext,
   resolveJsonModule: !0,
   esModuleInterop: !0
 }, j = {
@@ -43,13 +46,13 @@ async function z() {
 }
 async function H() {
   const t = [];
-  let o, n = I(), r = e.dirname(n);
+  let o, n = F(), r = e.dirname(n);
   do {
     o = r;
-    const a = e.join(o, ".gitignore");
-    if (await U(a)) {
-      n = e.dirname(a);
-      const w = e.relative(n, I()).split("/"), y = L(a);
+    const c = e.join(o, ".gitignore");
+    if (await B(c)) {
+      n = e.dirname(c);
+      const w = e.relative(n, F()).split("/"), y = $(c);
       for (const f of y) {
         const m = (f.startsWith("!") ? f.slice(1) : f).split("*")[0].split("/");
         let p = !0;
@@ -66,7 +69,8 @@ async function H() {
   return { ignorePatterns: t, globRoot: n };
 }
 async function Q(t) {
-  return (await _("**/.gitignore", {
+  return (await T("**/.gitignore", {
+    cwd: F(),
     // Gitignore files are unlikely to be symbolic links
     followSymbolicLinks: !1,
     // Don't look for ignore files in these places for speed:
@@ -81,15 +85,15 @@ async function Q(t) {
     // Not applicable for our glob pattern
     expandDirectories: !1
   })).flatMap((n) => {
-    const r = e.relative(t, e.dirname(n)), a = L(n), c = [];
-    for (const w of a)
-      w.startsWith("!") || c.push(e.join(r, w));
-    return c;
+    const r = e.relative(t, e.dirname(n)), c = $(n), i = [];
+    for (const w of c)
+      w.startsWith("!") || i.push(e.join(r, w));
+    return i;
   });
 }
 const V = ["js", "jsx", "mjs", "cjs"], X = ["ts", "tsx", "mts", "cts"], Y = ["json"], Z = `**/*.{${[...V, ...X, ...Y].join(",")}}`;
 async function ee() {
-  const t = await z(), o = e.join(process.cwd(), Z), n = await _(o, {
+  const t = await z(), o = e.join(process.cwd(), Z), n = await T(o, {
     cwd: t.globRoot,
     ignore: t.ignorePatterns,
     // The files we are looking for are unlikely to be symbolic links
@@ -102,9 +106,9 @@ async function ee() {
   });
   let r = e.relative(t.globRoot, process.cwd());
   r !== "" && (r += "/");
-  const a = e.join(e.resolve(t.globRoot), "/"), c = a.length + r.length, w = [], y = [], f = /* @__PURE__ */ new Set();
+  const c = e.join(e.resolve(t.globRoot), "/"), i = c.length + r.length, w = [], y = [], f = /* @__PURE__ */ new Set();
   for (const s of n) {
-    const l = a + s;
+    const l = c + s;
     if (s.endsWith(".json")) {
       const d = e.basename(s);
       d === "package.json" ? w.push(l) : (d.startsWith("tsconfig.") || d.startsWith("jsconfig.")) && y.push(l);
@@ -113,57 +117,57 @@ async function ee() {
       f.add(d);
     }
   }
-  let v = await E("tsconfig.json", e.dirname(process.cwd()));
-  v !== void 0 && (v = N(v), y.push(v)), y.sort((s, l) => {
+  let v = await W("tsconfig.json", e.dirname(process.cwd()));
+  v !== void 0 && (v = J(v), y.push(v)), y.sort((s, l) => {
     const d = l.split("/").length - s.split("/").length;
     if (d !== 0)
       return d;
     const b = e.basename(s), u = e.basename(l);
     return b === u ? 0 : b.endsWith("tsconfig.json") ? -1 : u.endsWith("tsconfig.json") ? 1 : b.endsWith("tsconfig.build.json") ? -1 : u.endsWith("tsconfig.build.json") ? 1 : b.localeCompare(u);
   });
-  let m = await E("package.json");
-  m !== void 0 && (m = N(m));
+  let m = await W("package.json");
+  m !== void 0 && (m = J(m));
   const p = [], g = /* @__PURE__ */ new Set();
-  return await Promise.all(
+  if (await Promise.all(
     y.map(async (s) => {
-      const l = e.relative(process.cwd(), s), d = i.readConfigFile(s, i.sys.readFile);
+      const l = e.relative(process.cwd(), s), d = a.readConfigFile(s, a.sys.readFile);
       if (d.error !== void 0) {
         h(
           "error",
           l,
-          i.formatDiagnosticsWithColorAndContext([d.error], {
-            getCanonicalFileName: W,
-            getCurrentDirectory: i.sys.getCurrentDirectory,
-            getNewLine: () => i.sys.newLine
+          a.formatDiagnosticsWithColorAndContext([d.error], {
+            getCanonicalFileName: L,
+            getCurrentDirectory: a.sys.getCurrentDirectory,
+            getNewLine: () => a.sys.newLine
           })
         );
         return;
       }
-      const b = e.basename(l), u = i.parseJsonConfigFileContent(
+      const b = e.basename(l), u = a.parseJsonConfigFileContent(
         d.config,
-        i.sys,
+        a.sys,
         e.dirname(s),
         void 0,
         b
-      ), T = 18003;
-      u.errors.filter((P) => P.code !== T).length > 0 && h(
+      ), A = 18003;
+      u.errors.filter((P) => P.code !== A).length > 0 && h(
         "warn",
         l,
-        i.formatDiagnosticsWithColorAndContext(u.errors, {
-          getCanonicalFileName: W,
-          getCurrentDirectory: i.sys.getCurrentDirectory,
-          getNewLine: () => i.sys.newLine
+        a.formatDiagnosticsWithColorAndContext(u.errors, {
+          getCanonicalFileName: L,
+          getCurrentDirectory: a.sys.getCurrentDirectory,
+          getNewLine: () => a.sys.newLine
         })
       );
-      const F = s === v, A = l === b, k = u.fileNames.filter((P) => {
-        const D = P.slice(c);
-        return f.delete(D) ? (g.add(D), !0) : g.has(D) || D.endsWith(".json") || P.includes("node_modules") ? !1 : !F;
+      const I = s === v, G = l === b, N = u.fileNames.filter((P) => {
+        const D = P.slice(i);
+        return f.delete(D) ? (g.add(D), !0) : g.has(D) || D.endsWith(".json") || P.includes("node_modules") ? !1 : !I;
       });
-      if (k.length === 0)
+      if (N.length === 0)
         return;
-      y.length === 1 && (F || A) && f.clear();
-      const R = e.dirname(s);
-      let C = R, x = m;
+      y.length === 1 && (I || G) && f.clear();
+      const k = e.dirname(s);
+      let C = k, x = m;
       do {
         const P = e.join(C, "package.json");
         if (w.includes(P)) {
@@ -171,37 +175,43 @@ async function ee() {
           break;
         }
       } while (C !== t.globRoot && (C = e.dirname(C)));
-      const G = x === void 0 ? void 0 : { filePath: x, contents: await J(e.dirname(x)) }, O = {
+      const E = x === void 0 ? void 0 : { filePath: x, contents: await M(e.dirname(x)) }, O = {
         typeScriptConfig: {
           filePath: s,
           compilerOptions: u.options
         },
-        packageJson: G,
-        cwd: R,
-        filePaths: k
+        packageJson: E,
+        logName: S("blue", E?.contents?.name ?? k),
+        cwd: k,
+        filePaths: N
       };
       p.push(O);
     })
-  ), f.size > 0 && p.push({
-    typeScriptConfig: void 0,
-    packageJson: m === void 0 ? void 0 : {
+  ), f.size > 0) {
+    const s = m === void 0 ? void 0 : {
       filePath: m,
-      contents: await J(e.dirname(m))
-    },
-    cwd: process.cwd(),
-    filePaths: Array.from(f).map((s) => e.join(process.cwd(), s))
-  }), p.sort((s, l) => s.cwd.localeCompare(l.cwd)), j.projectsData = p, p;
+      contents: await M(e.dirname(m))
+    };
+    p.push({
+      typeScriptConfig: void 0,
+      packageJson: s,
+      cwd: process.cwd(),
+      logName: S("blue", s?.contents?.name ?? process.cwd()),
+      filePaths: Array.from(f).map((l) => e.join(process.cwd(), l))
+    });
+  }
+  return p.sort((s, l) => s.cwd.localeCompare(l.cwd)), j.projectsData = p, p;
 }
-let M = !1;
+let _ = !1;
 function te() {
-  M || (M = !0, process.exitCode !== void 0 && process.exitCode !== 0 ? h(
+  _ || (_ = !0, process.exitCode !== void 0 && process.exitCode !== 0 ? h(
     "warn",
     j.codemodName,
     "One or more exceptions occurred during the codemod run. Please review the output above."
   ) : h(
     "info",
     j.codemodName,
-    `${B("green", "Codemod completed successfully.")} Recommended next steps:
+    `${S("green", "Codemod completed successfully.")} Recommended next steps:
 - Review the codemod changes.
 - If your project uses ESLint, run ESLint autofix on the changed files.
 - If your project uses Prettier, run Prettier on the changed files.
@@ -217,40 +227,40 @@ async function oe(t, o) {
   }
   await t.run(n), te();
 }
-const S = new $();
-S.name("@arcgis/codemod").description("Codemod for migrating or refactoring usages of ArcGIS Maps SDK for JavaScript");
-S.command("run").description("Run a single codemod").argument("<codemodName>", "Name of the transform").argument("[path]", "Directory to transform", process.cwd()).action(ne);
+const R = new K();
+R.name("@arcgis/codemod").description("Codemod for migrating or refactoring usages of ArcGIS Maps SDK for JavaScript");
+R.command("run").description("Run a single codemod").argument("<codemodName>", "Name of the transform").argument("[path]", "Directory to transform", process.cwd()).action(ne);
 async function ne(t, o) {
-  const n = K(o, { throwIfNoEntry: !1 });
+  const n = U(o, { throwIfNoEntry: !1 });
   if (n === void 0) {
     h("error", "@arcgis/codemod", `Failed to find the target path: ${o}`), process.exitCode = 1;
     return;
   }
   const r = n.isFile();
   process.chdir(r ? e.dirname(o) : o);
-  let a;
+  let c;
   try {
-    a = await q(/* @__PURE__ */ Object.assign({ "./codemods/arcgis-toolkit/codemod.ts": () => import("./codemod-wiEaN6_r.js"), "./codemods/refactor-out-esri-namespace/codemod.ts": () => import("./codemod-ul_pPsIY.js") }), `./codemods/${t}/codemod.ts`, 4);
-  } catch (c) {
+    c = await q(/* @__PURE__ */ Object.assign({ "./codemods/api-extractor-strict-mode/codemod.ts": () => import("./codemod-Bz1NfItD.js"), "./codemods/node-toolkit/codemod.ts": () => import("./codemod-8GvQmmZV.js"), "./codemods/refactor-out-esri-namespace/codemod.ts": () => import("./codemod-Xx_q11AP.js"), "./codemods/toolkit-5.2-renames/codemod.ts": () => import("./codemod-CzsItZhZ.js") }), `./codemods/${t}/codemod.ts`, 4);
+  } catch (i) {
     if (
       // direct Node execution
-      typeof c == "object" && c !== null && "code" in c && c.code === "ERR_MODULE_NOT_FOUND" || // Vite build execution
-      String(c).includes("Unknown variable dynamic import:")
+      typeof i == "object" && i !== null && "code" in i && i.code === "ERR_MODULE_NOT_FOUND" && "url" in i && typeof i.url == "string" && i.url.endsWith(`${e.sep}${t}${e.sep}codemod.ts`) || // Vite build execution
+      String(i).includes("Unknown variable dynamic import:")
     ) {
       h("error", "@arcgis/codemod", `Can't find codemod by name "${t}".`), process.exitCode = 1;
       return;
     } else
-      throw c;
+      throw i;
   }
-  if (typeof a.codemod != "object" || a.codemod === null) {
+  if (typeof c.codemod != "object" || c.codemod === null) {
     h("error", "@arcgis/codemod", `Can't find codemod by name "${t}".`), process.exitCode = 1;
     return;
   }
-  await oe(a.codemod, t);
+  await oe(c.codemod, S("blue", t));
 }
-S.parse();
+R.parse();
 export {
-  ge as d,
+  ye as d,
   j as g,
   te as p
 };

package/dist/cli.js

@@ -1,5 +1,6 @@
-import "./cli-mQ3ZNyiH.js";
+import "./cli-3BztOTDV.js";
 import "@arcgis/toolkit/log";
 import "@commander-js/extra-typings";
 import "node:fs";
-import "@arcgis/components-build-utils";
+import "@arcgis/node-toolkit/path";
+import "node:util";

package/dist/codemod-8GvQmmZV.js

@@ -0,0 +1,140 @@
+var p = (i, o) => (o = Symbol[i]) ? o : /* @__PURE__ */ Symbol.for("Symbol." + i), f = (i) => {
+  throw TypeError(i);
+};
+var g = (i, o, a) => {
+  if (o != null) {
+    typeof o != "object" && typeof o != "function" && f("Object expected");
+    var n, t;
+    a && (n = o[p("asyncDispose")]), n === void 0 && (n = o[p("dispose")], a && (t = n)), typeof n != "function" && f("Object not disposable"), t && (n = function() {
+      try {
+        t.call(this);
+      } catch (r) {
+        return Promise.reject(r);
+      }
+    }), i.push([a, n, o]);
+  } else a && i.push([a]);
+  return o;
+}, m = (i, o, a) => {
+  var n = typeof SuppressedError == "function" ? SuppressedError : function(e, s, c, l) {
+    return l = Error(c), l.name = "SuppressedError", l.error = e, l.suppressed = s, l;
+  }, t = (e) => o = a ? new n(e, o, "An error was suppressed during disposal") : (a = !0, e), r = (e) => {
+    for (; e = i.pop(); )
+      try {
+        var s = e[1] && e[1].call(e[2]);
+        if (e[0]) return Promise.resolve(s).then(r, (c) => (t(c), r()));
+      } catch (c) {
+        t(c);
+      }
+    if (a) throw o;
+  };
+  return r();
+};
+import { f as h, p as P } from "./actions-CakrAPrI.js";
+import { log as k } from "@arcgis/toolkit/log";
+import { writeFile as u } from "node:fs/promises";
+import { c as y } from "./useProjectInstance-DiZc_C2o.js";
+import { p as x, g as J } from "./cli-3BztOTDV.js";
+async function v(i, o) {
+  const a = /* @__PURE__ */ new Set();
+  for (const n of i) {
+    const t = n.packageJson;
+    if (t === void 0 || a.has(t.filePath))
+      continue;
+    a.add(t.filePath);
+    const r = t.contents;
+    try {
+      const e = await o(r, t.filePath);
+      r !== e && await u(t.filePath, `${JSON.stringify(e, null, 2)}
+`, "utf8");
+    } catch (e) {
+      process.exitCode = 1, k(
+        "error",
+        h(t.filePath),
+        `Error occurred while migrating: ${String(e)}`,
+        typeof e == "object" && e !== null && "stack" in e ? { detail: { stack: e.stack } } : void 0
+      );
+    }
+  }
+}
+function D(i, o) {
+  for (const a of ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"]) {
+    const n = i[a];
+    if (n) {
+      const t = o(n, a);
+      t !== n && (i = { ...i, [a]: t });
+    }
+  }
+  return i;
+}
+const d = "@arcgis/components-build-utils", S = {
+  [d]: {
+    existsAsync: { do: "rename", specifier: "@arcgis/node-toolkit/file" },
+    // Command-string helpers require manual tokenization before using command-plus-args helpers.
+    sh: { do: "rename", specifier: "@arcgis/node-toolkit/shell" },
+    // sp was removed from node-toolkit; collectOutputSync is the closest return-value replacement.
+    sp: { do: "rename", name: "collectOutputSync", specifier: "@arcgis/node-toolkit/shell" },
+    asyncSh: { do: "rename", specifier: "@arcgis/node-toolkit/shell" },
+    findPath: { do: "rename", specifier: "@arcgis/node-toolkit/file" },
+    asyncFindPath: { do: "rename", specifier: "@arcgis/node-toolkit/file" },
+    createFileIfNotExists: { do: "rename", specifier: "@arcgis/node-toolkit/file" },
+    gitIgnoreFileToGlobs: { do: "rename", specifier: "@arcgis/node-toolkit/glob" },
+    gitIgnoreToGlob: { do: "rename", specifier: "@arcgis/node-toolkit/glob" },
+    isPosix: { do: "rename", specifier: "@arcgis/node-toolkit/path" },
+    toPosixPathSeparators: { do: "rename", specifier: "@arcgis/node-toolkit/path" },
+    normalizePath: { do: "rename", specifier: "@arcgis/node-toolkit/path" },
+    toSystemPathSeparators: { do: "rename", specifier: "@arcgis/node-toolkit/path" },
+    getCwd: { do: "rename", specifier: "@arcgis/node-toolkit/path" },
+    path: { do: "rename", specifier: "@arcgis/node-toolkit/path" },
+    PackageJson: { do: "rename", specifier: "@arcgis/node-toolkit/packageJson" },
+    retrievePackageJson: { do: "rename", specifier: "@arcgis/node-toolkit/packageJson" },
+    asyncRetrievePackageJson: { do: "rename", specifier: "@arcgis/node-toolkit/packageJson" },
+    fetchPackageLocation: { do: "rename", specifier: "@arcgis/node-toolkit/packageJson" },
+    detectPackageManager: { do: "rename", specifier: "@arcgis/node-toolkit/packageJson" },
+    DependencyManagementOptions: {
+      do: "rename",
+      specifier: "@arcgis/node-toolkit/vite/externalizeDependenciesPlugin"
+    },
+    vitePresetPlugin: { do: "rename", specifier: "@arcgis/node-toolkit/vite/presetPlugin" },
+    externalizeDependencies: {
+      do: "rename",
+      specifier: "@arcgis/node-toolkit/vite/externalizeDependenciesPlugin"
+    }
+  }
+}, C = {
+  meta: {
+    needsTypeInformation: !1
+  },
+  async run(i) {
+    await v(
+      i,
+      (r) => D(
+        r,
+        (e) => e[d] ? {
+          ...e,
+          [d]: void 0,
+          "@arcgis/node-toolkit": e[d]
+        } : e
+      )
+    );
+    for (const r of i) {
+      var o = [];
+      try {
+        const e = g(o, y(r));
+        for (const s of e.getCodemodFiles())
+          P(s, S);
+      } catch (a) {
+        var n = a, t = !0;
+      } finally {
+        m(o, n, t);
+      }
+    }
+    x(), k(
+      "info",
+      J.codemodName,
+      "Next step: run npm install/pnpm install/yarn install to get @arcgis/node-toolkit package installed."
+    );
+  }
+};
+export {
+  C as codemod
+};