@arcgis/lumina-compiler 4.34.0-next.121 → 4.34.0-next.123

package/dist/index.js

@@ -3003,7 +3003,7 @@ async function ta(e, t) {
 const ia = /* @__PURE__ */ new Set([
   "@arcgis/arcade-languageservice",
   "@arcgis/components-build-utils",
-  "@arcgis/components-utils",
+  "@arcgis/toolkit",
   "@arcgis/core",
   "@arcgis/core-adapter",
   "@arcgis/languages-api-utils",
@@ -5671,6 +5671,7 @@ const ts = (e, t) => ({
           "@arcgis/lumina",
           "@arcgis/components-controllers",
           "@arcgis/components-utils",
+          "@arcgis/toolkit",
           "@arcgis/core-adapter",
           "@arcgis/map-components",
           "@arcgis/common-components",

package/dist/publicTypes.d.ts

@@ -100,7 +100,7 @@ export type BuildOptions = {
      * New lines are accepted.
      * Do not include // or /* - will be added automatically.
      *
-     * @default require("@arcgis/components-utils").getPreamble()
+     * @default require("@arcgis/toolkit/string").getPreamble()
      *
      * @example
      * ```js

package/dist/testing/failOnConsole.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Based on https://github.com/thomasbrodusch/vitest-fail-on-console/, but
+ * simplified and with our fixes applied:
+ * https://github.com/thomasbrodusch/vitest-fail-on-console/issues/61
+ */
+export declare function failOnConsole(): void;

package/dist/testing/index.js

@@ -1,39 +1,39 @@
 import { render as C } from "lit";
 import { unsafeStatic as m, html as w } from "lit/static-html.js";
-import { devOnly$getLitElementTagNameAndRuntime as $, LitElement as S } from "@arcgis/lumina";
-import { camelToKebab as _ } from "@arcgis/toolkit/string";
-import { onTestFinished as x, expect as E } from "vitest";
-import O from "vitest-fail-on-console";
-import R from "js-beautify";
-import { toFunction as D } from "@arcgis/lumina/controllers";
-async function G(e, { parent: t = document.body, afterConnect: o, dynamicComponents: f, cleanupAfterTest: s = !0 } = {}) {
+import { devOnly$getLitElementTagNameAndRuntime as x, LitElement as O } from "@arcgis/lumina";
+import { camelToKebab as S } from "@arcgis/toolkit/string";
+import { onTestFinished as _, beforeEach as R, afterEach as D, expect as M } from "vitest";
+import b from "chalk";
+import j from "js-beautify";
+import { toFunction as z } from "@arcgis/lumina/controllers";
+async function X(e, { parent: t = document.body, afterConnect: o, dynamicComponents: f, cleanupAfterTest: r = !0 } = {}) {
   const n = document.createElement("div");
-  n.style.display = "contents", t.append(n), s && x(() => j(n)), v(e);
+  n.style.display = "contents", t.append(n), r && _(() => F(n)), v(e);
   const l = f?.some(v);
-  let r;
+  let i;
   if (typeof e == "string")
-    r = w`<${m(e)}></${m(e)}>`;
+    i = w`<${m(e)}></${m(e)}>`;
   else if (typeof e == "function")
     if (p(e)) {
-      const c = $(e).tagName;
-      r = w`<${m(c)}></${m(c)}>`;
+      const a = x(e).tagName;
+      i = w`<${m(a)}></${m(a)}>`;
     } else
-      r = e();
+      i = e();
   else {
     if (l)
       throw new Error(
         'When rendering a dynamically created custom element using Lit\'s html`` function, you must ensure that the custom element class name is unique in the test file, or the class should explicitly have the `static tagName = "some-tag-name";` property with a unique tag name within the test file'
       );
-    r = e;
+    i = e;
   }
-  const i = [];
-  function a(c) {
-    i.push(c.error), c.preventDefault(), c.stopPropagation();
+  const s = [];
+  function c(a) {
+    s.push(a.error), a.preventDefault(), a.stopPropagation();
   }
-  if (window.addEventListener("error", a), C(r, n), window.removeEventListener("error", a), i.length === 1)
-    throw i[0];
-  if (i.length > 1)
-    throw new AggregateError(i, "Multiple errors occurred while creating the custom element");
+  if (window.addEventListener("error", c), C(i, n), window.removeEventListener("error", c), s.length === 1)
+    throw s[0];
+  if (s.length > 1)
+    throw new AggregateError(s, "Multiple errors occurred while creating the custom element");
   const u = L(n), N = g, y = o?.(u);
   y?.then !== void 0 && await y;
   const d = u;
@@ -49,11 +49,11 @@ async function G(e, { parent: t = document.body, afterConnect: o, dynamicCompone
   };
 }
 let g;
-const M = globalThis;
-M.devOnly$luminaComponentRefCallback = (e) => {
+const A = globalThis;
+A.devOnly$luminaComponentRefCallback = (e) => {
   g = e;
 };
-function j(e) {
+function F(e) {
   for (; e.firstChild; )
     e.removeChild(e.firstChild);
   e instanceof HTMLElement && e.remove();
@@ -61,25 +61,25 @@ function j(e) {
 function v(e) {
   if (!p(e))
     return !1;
-  const { runtime: t, tagName: o = e.tagName } = $(e);
+  const { runtime: t, tagName: o = e.tagName } = x(e);
   if (t !== void 0)
     return !1;
-  let s = !1, n = o;
+  let r = !1, n = o;
   if (n === void 0) {
-    const l = _(
+    const l = S(
       /*
        * If name is a single letter, it was probably minified - thus is not
        * stable, thus don't use it. Example: class produced by wrapController()
        */
-      (e.name.length > 1 ? e.name.replaceAll(z, "") : "") || "Test"
-    ), r = l === "test" ? "te-st" : l.includes("-") ? l : `${l}-`;
-    n = r;
-    for (let i = 2, a = customElements.get(n); a !== e && a !== void 0; i += 1)
-      s = !0, n = `${r}-${i}`, a = customElements.get(n);
+      (e.name.length > 1 ? e.name.replaceAll(q, "") : "") || "Test"
+    ), i = l === "test" ? "te-st" : l.includes("-") ? l : `${l}-`;
+    n = i;
+    for (let s = 2, c = customElements.get(n); c !== e && c !== void 0; s += 1)
+      r = !0, n = `${i}-${s}`, c = customElements.get(n);
   }
-  return globalThis.devOnly$luminaRuntime?.customElement(n, e), Object.defineProperty(e.prototype, "tagName", { value: n.toUpperCase() }), s;
+  return globalThis.devOnly$luminaRuntime?.customElement(n, e), Object.defineProperty(e.prototype, "tagName", { value: n.toUpperCase() }), r;
 }
-const p = (e) => typeof e == "function" && "lumina" in e, z = /\d+$/gu;
+const p = (e) => typeof e == "function" && "lumina" in e, q = /\d+$/gu;
 function L(e) {
   for (const t of e.children)
     if ("lumina" in t.constructor)
@@ -91,15 +91,43 @@ function L(e) {
   }
   return e.firstElementChild ?? g?.el;
 }
-function A() {
-  E.addSnapshotSerializer({
+function H() {
+  const e = $("warn"), t = $("error");
+  R(() => {
+    e.beforeEach(), t.beforeEach();
+  }), D(() => {
+    e.afterEach(), t.afterEach();
+  });
+}
+function $(e) {
+  let t = !1;
+  const o = console[e];
+  function f(...r) {
+    o(...r), t = !0;
+  }
+  return {
+    beforeEach() {
+      console[e] = f;
+    },
+    afterEach() {
+      if (t)
+        throw new Error(`[@arcgis/lumina:failOnConsole] Expected test not to call ${b.bold(`console.${e}()`)}.
+    If the ${e} is expected, test for it explicitly by mocking it out using:
+    ${b.bold(`vi.spyOn(console, '${e}').mockImplementation(() => {}) `)}
+    and test that the ${e} occurs.`);
+      console[e] = o;
+    }
+  };
+}
+function P() {
+  M.addSnapshotSerializer({
     // Using duck typing to detect ShadowRoot. Not using instanceof to keep test fast
     test(e) {
       return typeof e == "object" && e !== null && "innerHTML" in e && "onslotchange" in e;
     },
     serialize(e) {
-      const t = e.innerHTML.replaceAll(F, "");
-      return R.html(t, {
+      const t = e.innerHTML.replaceAll(U, "");
+      return j.html(t, {
         /* eslint-disable @typescript-eslint/naming-convention */
         indent_size: 2,
         indent_char: " ",
@@ -112,26 +140,17 @@ function A() {
     }
   });
 }
-const F = /<!--\??(?:lit\$\d+\$)?-->/gu;
-function I() {
-  if (b[T])
-    return;
-  b[T] = !0;
-  const e = { ...console };
-  O({
-    // Workaround for https://github.com/thomasbrodusch/vitest-fail-on-console/issues/61
-    silenceMessage(t, o) {
-      return e[o](t), !1;
-    }
-  }), A();
+const U = /<!--\??(?:lit\$\d+\$)?-->/gu;
+function Y() {
+  T[E] || (T[E] = !0, H(), P());
 }
-const T = Symbol.for("lumina:didSetupTest"), b = globalThis;
-function J(e, t) {
-  class o extends S {
+const E = Symbol.for("lumina:didSetupTest"), T = globalThis;
+function Z(e, t) {
+  class o extends O {
     constructor() {
       super();
-      const s = "prototype" in e ? D(e) : e;
-      this.controller = s(this), Promise.resolve(t?.(this)).catch(console.error);
+      const r = "prototype" in e ? z(e) : e;
+      this.controller = r(this), Promise.resolve(t?.(this)).catch(console.error);
     }
     /*
      * Emitting controller's exports here is useful to let controller tests
@@ -146,7 +165,7 @@ function J(e, t) {
   return o;
 }
 export {
-  G as mount,
-  I as setupLuminaTest,
-  J as wrapController
+  X as mount,
+  Y as setupLuminaTest,
+  Z as wrapController
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcgis/lumina-compiler",
-  "version": "4.34.0-next.121",
+  "version": "4.34.0-next.123",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -18,20 +18,19 @@
   ],
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@arcgis/api-extractor": "4.34.0-next.121",
-    "@arcgis/components-build-utils": "4.34.0-next.121",
-    "@arcgis/toolkit": "4.34.0-next.121",
+    "@arcgis/api-extractor": "4.34.0-next.123",
+    "@arcgis/components-build-utils": "4.34.0-next.123",
+    "@arcgis/toolkit": "4.34.0-next.123",
     "chalk": "^5.4.1",
     "esbuild": "^0.25.5",
     "glob": "^11.0.3",
     "js-beautify": "^1.15.4",
     "mime-types": "^3.0.1",
     "tslib": "^2.8.1",
-    "vite-plugin-dts": "^4.5.4",
-    "vitest-fail-on-console": "^0.7.1"
+    "vite-plugin-dts": "^4.5.4"
   },
   "peerDependencies": {
-    "@arcgis/lumina": "~4.34.0-next.121",
+    "@arcgis/lumina": "~4.34.0-next.123",
     "lit": "^3.3.0",
     "typescript": "~5.8.3",
     "vite": "^7.0.0",