@arcgis/codemod 6.0.0-next.2 → 6.0.0-next.4

package/dist/chunks/index2.js

@@ -1,143 +1,160 @@
-var k = (e, o) => (o = Symbol[e]) ? o : /* @__PURE__ */ Symbol.for("Symbol." + e), N = (e) => {
-  throw TypeError(e);
+var N = (a, o) => (o = Symbol[a]) ? o : /* @__PURE__ */ Symbol.for("Symbol." + a), h = (a) => {
+  throw TypeError(a);
 };
-var h = (e, o, a) => {
+var D = (a, o, t) => {
   if (o != null) {
-    typeof o != "object" && typeof o != "function" && N("Object expected");
-    var s, t;
-    a && (s = o[k("asyncDispose")]), s === void 0 && (s = o[k("dispose")], a && (t = s)), typeof s != "function" && N("Object not disposable"), t && (s = function() {
+    typeof o != "object" && typeof o != "function" && h("Object expected");
+    var c, e;
+    t && (c = o[N("asyncDispose")]), c === void 0 && (c = o[N("dispose")], t && (e = c)), typeof c != "function" && h("Object not disposable"), e && (c = function() {
       try {
-        t.call(this);
-      } catch (c) {
-        return Promise.reject(c);
+        e.call(this);
+      } catch (i) {
+        return Promise.reject(i);
       }
-    }), e.push([a, s, o]);
-  } else a && e.push([a]);
+    }), a.push([t, c, o]);
+  } else t && a.push([t]);
   return o;
-}, w = (e, o, a) => {
-  var s = typeof SuppressedError == "function" ? SuppressedError : function(n, p, r, m) {
-    return m = Error(r), m.name = "SuppressedError", m.error = n, m.suppressed = p, m;
-  }, t = (n) => o = a ? new s(n, o, "An error was suppressed during disposal") : (a = !0, n), c = (n) => {
-    for (; n = e.pop(); )
+}, w = (a, o, t) => {
+  var c = typeof SuppressedError == "function" ? SuppressedError : function(s, r, m, d) {
+    return d = Error(m), d.name = "SuppressedError", d.error = s, d.suppressed = r, d;
+  }, e = (s) => o = t ? new c(s, o, "An error was suppressed during disposal") : (t = !0, s), i = (s) => {
+    for (; s = a.pop(); )
       try {
-        var p = n[1] && n[1].call(n[2]);
-        if (n[0]) return Promise.resolve(p).then(c, (r) => (t(r), c()));
-      } catch (r) {
-        t(r);
+        var r = s[1] && s[1].call(s[2]);
+        if (s[0]) return Promise.resolve(r).then(i, (m) => (e(m), i()));
+      } catch (m) {
+        e(m);
       }
-    if (a) throw o;
+    if (t) throw o;
   };
-  return c();
+  return i();
 };
-import { log as D } from "@arcgis/toolkit/log";
-import { path as S } from "@arcgis/node-toolkit/path";
-import { styleText as $ } from "node:util";
+import { log as y } from "@arcgis/toolkit/log";
+import { path as $ } from "@arcgis/node-toolkit/path";
+import { styleText as b } from "node:util";
 import P from "typescript";
-import { f as g } from "./log.js";
-import { r as v } from "./cli.js";
-import { c as x } from "./useProjectInstance.js";
-import { g as C, s as T, e as R, a as y, b, p as j, f as E } from "./hardcodedBehavior.js";
-import { loadCodeowners as F } from "@arcgis/node-toolkit/codeowners";
-async function V(e, o) {
-  await v(
+import { f as u } from "./log.js";
+import { r as x } from "./cli.js";
+import { c as J } from "./useProjectInstance.js";
+import { g as O, e as S, a as v, b as C, p as T, d as A, f as K, h as R, j } from "./classification.js";
+import { loadCodeowners as M } from "@arcgis/node-toolkit/codeowners";
+import { s as E, d as z, g as F, b as I } from "./hardcodedBehavior.js";
+async function oe(a, o) {
+  await x(
     {
       meta: { needsTypeInformation: !0, needsFooter: !1 },
-      run(a) {
-        O(a, o);
+      run(t) {
+        L(t, o);
       }
     },
     "deprecations audit-definitions",
-    e
+    a
   );
 }
-function O(e, o) {
-  const a = [], s = /* @__PURE__ */ new Map(), t = /* @__PURE__ */ new Set(), c = C();
-  for (const i of e) {
-    var n = [];
+function L(a, o) {
+  const t = [], c = /* @__PURE__ */ new Map(), e = /* @__PURE__ */ new Set(), i = O();
+  for (const n of a) {
+    var s = [];
     try {
-      if (T(i.packageJson?.contents.name)) {
-        const d = i.packageJson?.filePath;
-        d !== void 0 && !t.has(d) && (t.add(d), D(
+      if (E(n.packageJson?.contents.name)) {
+        const p = n.packageJson?.filePath;
+        p !== void 0 && !e.has(p) && (e.add(p), y(
           "warn",
-          g(d),
-          `Skipping excluded package \`${i.packageJson?.contents.name ?? i.cwd}\`.`
+          u(p),
+          `Skipping excluded package \`${n.packageJson?.contents.name ?? n.cwd}\`.`
         ));
         continue;
       }
-      const f = h(n, x(i, !1));
-      const J = i.packageJson?.contents.name ?? g(i.cwd);
-      for (const d of f.getCodemodFiles()) {
-        if (R(
-          y(d.compilerNode.fileName, c.repositoryRoot)
+      const l = D(s, J(n, !1));
+      const f = n.packageJson?.contents.name ?? u(n.cwd);
+      for (const p of l.getCodemodFiles()) {
+        if (z(
+          S(p.compilerNode.fileName, i.repositoryRoot)
         ))
           continue;
-        const l = S.dirname(d.compilerNode.fileName), u = s.get(l) ?? b(l, J);
-        s.set(l, u), a.push(...z(d.compilerNode, u));
+        const g = $.dirname(p.compilerNode.fileName), k = c.get(g) ?? F(g, f);
+        c.set(g, k), t.push(...Q(p.compilerNode, k));
       }
-    } catch (p) {
-      var r = p, m = !0;
+    } catch (r) {
+      var m = r, d = !0;
     } finally {
-      w(n, r, m);
+      w(s, m, d);
     }
   }
   if (o)
-    I(a, c);
+    q(t, i);
   else
-    for (const i of a) {
-      const f = $(
+    for (const n of t) {
+      const l = b(
         "blue",
-        `${g(i.sourceFileName)}:${i.line}:${i.column}`
-      );
-      D("warn", f, `\`${i.name}\` is deprecated.${i.reason ? ` ${i.reason}` : ""}`);
+        `${u(n.sourceFileName)}:${n.line}:${n.column}`
+      ), f = v({
+        api: n.name,
+        memberOf: n.memberOf,
+        apiKind: n.apiKind
+      }), p = C(n.apiKind, "parentheses");
+      y("warn", l, `\`${f}\`${p} is deprecated.${n.reason ? ` ${n.reason}` : ""}`);
     }
-  j(
+  T(
     "definitions",
-    a.length,
-    new Set(a.map(({ sourceFileName: i }) => i)).size,
-    new Set(a.map(({ package: i }) => i)).size
+    t.length,
+    new Set(t.map(({ sourceFileName: n }) => n)).size,
+    new Set(t.map(({ package: n }) => n)).size
   );
 }
-function z(e, o) {
-  const a = /* @__PURE__ */ new Map();
-  function s(t) {
-    const c = P.getJSDocDeprecatedTag(t), n = A(t);
-    if (c !== void 0 && n !== void 0) {
-      const p = n.getStart(e), { line: r, character: m } = e.getLineAndCharacterOfPosition(p);
-      a.set(`${p}:${n.getWidth(e)}`, {
+function Q(a, o) {
+  const t = /* @__PURE__ */ new Map(), c = A([a.fileName], o);
+  function e(i) {
+    const s = P.getJSDocDeprecatedTag(i), r = W(i);
+    if (s !== void 0 && r !== void 0) {
+      const m = r.getStart(a), { line: d, character: n } = a.getLineAndCharacterOfPosition(m);
+      t.set(`${m}:${r.getWidth(a)}`, {
         package: o,
-        name: n.getText(e),
-        reason: c.comment === void 0 ? void 0 : E(c.comment),
-        sourceFileName: e.fileName,
-        line: r + 1,
-        column: m + 1
+        module: c,
+        name: j(i, r.getText(a)),
+        ...R(i),
+        reason: s.comment === void 0 ? void 0 : I(s.comment),
+        sourceFileName: a.fileName,
+        line: d + 1,
+        column: n + 1
       });
     }
-    P.forEachChild(t, s);
+    P.forEachChild(i, e);
   }
-  return s(e), [...a.values()].sort((t, c) => t.line - c.line || t.column - c.column);
+  return e(a), [...t.values()].sort((i, s) => i.line - s.line || i.column - s.column);
 }
-function A(e) {
-  return e.name;
+function W(a) {
+  return a.name;
 }
-function I(e, o) {
-  const a = F(), s = {
+function q(a, o) {
+  const t = M(), c = {
     kind: "definitions",
     repository: o.repository,
     ref: o.ref,
-    findings: e.map((t) => ({
-      package: t.package,
-      api: t.name,
-      reason: t.reason ?? null,
-      file: y(t.sourceFileName, o.repositoryRoot),
-      line: t.line,
-      column: t.column,
-      codeowners: a?.getOwners(t.sourceFileName) ?? []
+    findings: a.map((e) => ({
+      package: e.package,
+      api: e.name,
+      module: e.module,
+      apiKind: e.apiKind,
+      memberOf: e.memberOf,
+      category: K({
+        package: e.package,
+        api: e.name,
+        memberOf: e.memberOf,
+        module: e.module,
+        reason: e.reason ?? null
+      }),
+      reason: e.reason ?? null,
+      file: S(e.sourceFileName, o.repositoryRoot),
+      line: e.line,
+      column: e.column,
+      codeowners: t?.getOwners(e.sourceFileName) ?? []
     }))
   };
-  process.stdout.write(`${JSON.stringify(s, void 0, 2)}
+  process.stdout.write(`${JSON.stringify(c, void 0, 2)}
 `);
 }
 export {
-  V as auditDeprecatedDefinitions,
-  z as collectDeprecatedApiDefinitions
+  oe as auditDeprecatedDefinitions,
+  Q as collectDeprecatedApiDefinitions
 };

package/dist/chunks/sync.js

@@ -1,12 +1,13 @@
-import { readFile as f } from "node:fs/promises";
-import { log as h } from "@arcgis/toolkit/log";
-import { a as m, b as g, d as c, e as d } from "./format.js";
-import { collectOutput as u } from "@arcgis/node-toolkit/shell";
-class l {
+import { readFile as d } from "node:fs/promises";
+import { log as c } from "@arcgis/toolkit/log";
+import { l as $, m as l, n as p } from "./classification.js";
+import { c as g, i as f } from "./format.js";
+import { collectOutput as h } from "@arcgis/node-toolkit/shell";
+class w {
   constructor(s, e = !1) {
     this.changes = [], this.#i = /* @__PURE__ */ new Map(), this.#n = -1;
-    const [i, t, o, ...r] = s.split("/");
-    if (i === void 0 || t === void 0 || o === void 0 || r.length > 0)
+    const [i, t, o, ...a] = s.split("/");
+    if (i === void 0 || t === void 0 || o === void 0 || a.length > 0)
       throw new Error(`Invalid repository: ${s}`);
     this.#e = i, this.#s = `${t}/${o}`, this.dryRun = e;
   }
@@ -17,7 +18,7 @@ class l {
   async #t(s, e, i) {
     if (process.env.VITEST !== void 0)
       throw new Error("GitHub requests are disabled while running Vitest.");
-    const t = await u(
+    const t = await h(
       "gh",
       ["api", "--hostname", this.#e, "--method", s, e, ...i === void 0 ? [] : ["--input", "-"]],
       i === void 0 ? {} : { input: JSON.stringify(i) }
@@ -25,7 +26,7 @@ class l {
     return t === "" ? void 0 : JSON.parse(t);
   }
   async listOpenIssues(s) {
-    const e = await u("gh", [
+    const e = await h("gh", [
       "api",
       "--hostname",
       this.#e,
@@ -44,14 +45,14 @@ class l {
   async createIssue(s, e, i, t) {
     if (this.dryRun) {
       const o = this.#n--;
-      return this.#i.set(o, s), this.changes.push(`CREATE issue: ${s}`), { number: o, title: s, body: e, assignees: i.map((r) => ({ login: r })) };
+      return this.#i.set(o, s), this.changes.push(`CREATE issue: ${s}`), { number: o, title: s, body: e, assignees: i.map((a) => ({ login: a })) };
     }
     return await this.#t("POST", `/repos/${this.#s}/issues`, {
       title: s,
       body: e,
       assignees: i,
       labels: t,
-      type: m
+      type: $
     });
   }
   async updateIssueBody(s, e) {
@@ -64,7 +65,7 @@ class l {
   async listComments(s) {
     if (this.#i.has(s))
       return [];
-    const e = await u("gh", [
+    const e = await h("gh", [
       "api",
       "--hostname",
       this.#e,
@@ -99,31 +100,26 @@ class l {
     await this.#t("DELETE", `/repos/${this.#s}/issues/comments/${s}`);
   }
 }
-async function k(n, s, e = 0, i, t = []) {
-  const o = w(await f(n, "utf8")), r = y(g(o), e, i), a = new l(o.repository, s);
-  await $(r, a, t), s && process.stdout.write(`${E(r)}
+const y = /^(  (?:- )?https:\/\/[^/\s]+\/[^/\s]+\/[^/\s]+\/blob\/)[a-f0-9]{40}(\/\S+#L\d+)$/gmu;
+async function A(n, s, e = 0, i, t = []) {
+  const o = l(await d(n, "utf8")), a = E(g(o), e, i), r = new w(o.repository, s);
+  await I(a, r, t), s && process.stdout.write(`${T(a)}
 `);
 }
-function y(n, s, e) {
+function E(n, s, e) {
   return n.slice(s, e === void 0 ? void 0 : s + e);
 }
-async function $(n, s, e = []) {
+async function I(n, s, e = []) {
   const i = /* @__PURE__ */ new Map();
   for (const t of n) {
     let o = i.get(t.title);
     o === void 0 && (o = await s.listOpenIssues(t.title), i.set(t.title, o));
-    const r = I(o, t);
-    let a;
-    r === void 0 ? (a = (await s.createIssue(t.title, t.chunks[0], t.assignees, e)).number, s.dryRun || h("info", c, `Created issue #${a}: ${t.title}`)) : (a = r.number, r.body !== t.chunks[0] && (await s.updateIssueBody(a, t.chunks[0]), s.dryRun || h("info", c, `Updated issue #${a}: ${t.title}`))), await T(s, a, t.chunks.slice(1)), t.changes.push(...s.changes.splice(0));
+    const a = C(o, t);
+    let r;
+    a === void 0 ? (r = (await s.createIssue(t.title, t.chunks[0], t.assignees, e)).number, s.dryRun || c("info", p, `Created issue #${r}: ${t.title}`)) : (r = a.number, u(a.body) !== u(t.chunks[0]) && (await s.updateIssueBody(r, t.chunks[0]), s.dryRun || c("info", p, `Updated issue #${r}: ${t.title}`))), await v(s, r, t.chunks.slice(1)), t.changes.push(...s.changes.splice(0));
   }
 }
-function w(n) {
-  const s = JSON.parse(n);
-  if (s.kind !== "usages" && s.kind !== "definitions" || typeof s.repository != "string" || typeof s.ref != "string" || !Array.isArray(s.findings))
-    throw new Error("Invalid deprecation audit JSON.");
-  return s;
-}
-function E(n) {
+function T(n) {
   return n.map(
     (s) => `ACTIONS: ${s.changes.length === 0 ? "No changes" : s.changes.join("; ")}
 
@@ -139,27 +135,30 @@ ${e}`).join(`
 
 `);
 }
-function I(n, s) {
-  const e = p(s.chunks[0]);
-  return n.find((i) => i.title === s.title && p(i.body) === e);
+function C(n, s) {
+  const e = m(s.chunks[0]);
+  return n.find((i) => i.title === s.title && m(i.body) === e);
 }
-function p(n) {
+function m(n) {
   const s = n?.split(`
 `, 1)[0];
-  return s?.startsWith(d) === !0 ? s : void 0;
+  return s?.startsWith(f) === !0 ? s : void 0;
+}
+function u(n) {
+  return n?.replace(y, "$1<sha>$2");
 }
-async function T(n, s, e) {
-  const i = (await n.listComments(s)).filter(({ body: t }) => t.startsWith(d));
+async function v(n, s, e) {
+  const i = (await n.listComments(s)).filter(({ body: t }) => t.startsWith(f));
   for (const [t, o] of e.entries()) {
-    const r = i[t];
-    r === void 0 ? await n.createComment(s, o) : r.body !== o && await n.updateComment(r.id, o);
+    const a = i[t];
+    a === void 0 ? await n.createComment(s, o) : u(a.body) !== u(o) && await n.updateComment(a.id, o);
   }
   for (const t of i.slice(e.length))
     await n.deleteComment(t.id);
 }
 export {
-  E as formatDryRun,
-  y as sliceIssuePlans,
-  k as syncDeprecationIssues,
-  $ as synchronizeIssuePlans
+  T as formatDryRun,
+  E as sliceIssuePlans,
+  A as syncDeprecationIssues,
+  I as synchronizeIssuePlans
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcgis/codemod",
-  "version": "6.0.0-next.2",
+  "version": "6.0.0-next.4",
   "description": "A codemod toolkit for updating and modernizing ArcGIS Maps SDK for JavaScript codebases.",
   "type": "module",
   "exports": {
@@ -11,9 +11,9 @@
   ],
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@arcgis/api-extractor": "6.0.0-next.2",
-    "@arcgis/node-toolkit": "6.0.0-next.2",
-    "@arcgis/toolkit": "6.0.0-next.2",
+    "@arcgis/api-extractor": "6.0.0-next.4",
+    "@arcgis/node-toolkit": "6.0.0-next.4",
+    "@arcgis/toolkit": "6.0.0-next.4",
     "@commander-js/extra-typings": "^15.0.0",
     "commander": "^15.0.0",
     "tinyglobby": "~0.2.17",