@wix/zero-config-implementation 1.50.0 → 1.52.0

package/dist/index.js

@@ -11119,7 +11119,7 @@ function Dh(t) {
     r.shift();
   return r.join(" ").slice(0, Wg);
 }
-const { DATA_TYPE: Rt } = zn;
+const { DATA_TYPE: It } = zn;
 function _8(t, e) {
   const r = t.get(e);
   if (!r) return [];
@@ -11163,18 +11163,18 @@ function _1(t, e, r, n, i) {
     case "semantic":
       return K8({ dataItem: t, resolvedType: e, propUsages: n, propPath: i }), Mr(void 0);
     default:
-      return t.dataType = Rt.text, t.text = {}, Mr(void 0);
+      return t.dataType = It.text, t.text = {}, Mr(void 0);
   }
 }
 function H8(t, e, r, n) {
   const i = e.value?.toLowerCase() || r.type.toLowerCase();
-  i.includes("string") ? n?.some((s) => s.attribute === "dir") ? t.dataType = Rt.direction : n?.some((s) => s.attribute === "href" && s.element === "a" && !s.concatenated) ? t.dataType = Rt.webUrl : n?.some((s) => s.attribute === "id") ? t.dataType = Rt.guid : n?.some((s) => s.attribute === "pattern") ? t.dataType = Rt.regex : (t.dataType = Rt.text, t.text = {}) : i.includes("number") ? (t.dataType = Rt.number, t.number = {}) : i.includes("boolean") ? t.dataType = Rt.booleanValue : (t.dataType = Rt.text, t.text = {});
+  i.includes("string") ? n?.some((s) => s.attribute === "dir") ? t.dataType = It.direction : n?.some((s) => s.attribute === "href" && s.element === "a" && !s.concatenated) ? t.dataType = It.webUrl : n?.some((s) => s.attribute === "id") ? t.dataType = It.guid : n?.some((s) => s.attribute === "pattern") ? t.dataType = It.regex : (t.dataType = It.text, t.text = {}) : i.includes("number") ? (t.dataType = It.number, t.number = {}) : i.includes("boolean") ? t.dataType = It.booleanValue : (t.dataType = It.text, t.text = {});
 }
 function G8(t) {
-  t.dataType = Rt.text, t.text = {};
+  t.dataType = It.text, t.text = {};
 }
 function V8(t) {
-  t.dataType = Rt.textEnum, t.textEnum = {
+  t.dataType = It.textEnum, t.textEnum = {
     options: []
   };
 }
@@ -11185,7 +11185,7 @@ function U8(t, e, r, n) {
         props: { phase: "conversion", isDefect: !0 }
       })
     );
-  t.dataType = Rt.arrayItems;
+  t.dataType = It.arrayItems;
   const i = {}, s = _1(
     i,
     e.elementType,
@@ -11197,12 +11197,10 @@ function U8(t, e, r, n) {
     r,
     n
   );
-  return s.isErr() ? s : (t.arrayItems = {
-    dataItem: i
-  }, Mr(void 0));
+  return s.isErr() ? s : (t.arrayItems = i.dataType === It.data && i.data ? { data: i.data } : { dataItem: i }, Mr(void 0));
 }
 function W8(t, e, r, n) {
-  if (t.dataType = Rt.data, e.properties) {
+  if (t.dataType = It.data, e.properties) {
     const i = {};
     for (const [s, a] of Object.entries(e.properties)) {
       const o = n ? `${n}.${s}` : s, u = M2(a, void 0, r, o);
@@ -11221,25 +11219,25 @@ function W8(t, e, r, n) {
 }
 function $8(t, e, r) {
   if (!e.types || e.types.length === 0)
-    return t.dataType = Rt.text, t.text = {}, Mr(void 0);
+    return t.dataType = It.text, t.text = {}, Mr(void 0);
   const n = e.types.filter((o) => o.value !== "undefined" && o.value !== "null");
   if (n.length === 0)
-    return t.dataType = Rt.text, t.text = {}, Mr(void 0);
+    return t.dataType = It.text, t.text = {}, Mr(void 0);
   if (n.length <= 2 && n.every(
     (o) => o.kind === "literal" && (o.value === !0 || o.value === !1)
   ))
-    return t.dataType = Rt.booleanValue, Mr(void 0);
+    return t.dataType = It.booleanValue, Mr(void 0);
   if (n.every(
     (o) => o.kind === "literal" && typeof o.value == "string"
   ))
-    return t.dataType = Rt.textEnum, t.textEnum = {
+    return t.dataType = It.textEnum, t.textEnum = {
       options: n.map((o) => ({
         value: String(o.value || ""),
         displayName: Dh(String(o.value || ""))
       })).filter((o) => o.value)
     }, Mr(void 0);
   const a = n[0];
-  return a ? _1(t, a, r) : (t.dataType = Rt.text, t.text = {}, Mr(void 0));
+  return a ? _1(t, a, r) : (t.dataType = It.text, t.text = {}, Mr(void 0));
 }
 function K8({
   dataItem: t,
@@ -11249,22 +11247,22 @@ function K8({
 }) {
   const i = e.value, s = e.source;
   if (s === "@types/react" || s === "react") {
-    i === "ReactNode" || i === "ReactElement" ? t.dataType = Rt.container : (t.dataType = Rt.text, t.text = {});
+    i === "ReactNode" || i === "ReactElement" ? t.dataType = It.container : (t.dataType = It.text, t.text = {});
     return;
   }
-  if (s === "@wix/public-schemas") {
+  if (s === "@wix/public-schemas" || s === "@wix/editor-react-types") {
     const a = L2[i];
-    a ? (t.dataType = Rt[a], j8({ dataItem: t, builderType: a, propUsages: r, propPath: n })) : (t.dataType = Rt.text, t.text = {});
+    a ? (t.dataType = It[a], j8({ dataItem: t, builderType: a, propUsages: r, propPath: n })) : (t.dataType = It.text, t.text = {});
     return;
   }
-  t.dataType = Rt.text, t.text = {};
+  t.dataType = It.text, t.text = {};
 }
 const hE = {
-  onclick: Rt.onClick,
-  onchange: Rt.onChange,
-  onkeypress: Rt.onKeyPress,
-  onkeyup: Rt.onKeyUp,
-  onsubmit: Rt.onSubmit
+  onclick: It.onClick,
+  onchange: It.onChange,
+  onkeypress: It.onKeyPress,
+  onkeyup: It.onKeyUp,
+  onsubmit: It.onSubmit
 };
 function z8(t, e, r) {
   if (r)
@@ -11280,7 +11278,7 @@ function z8(t, e, r) {
     t.dataType = n;
     return;
   }
-  t.dataType = Rt.function, t.function = {};
+  t.dataType = It.function, t.function = {};
 }
 function j8({
   dataItem: t,
@@ -11290,7 +11288,7 @@ function j8({
 }) {
   switch (e) {
     case "link":
-      t.dataType = Rt.link, t.link = {
+      t.dataType = It.link, t.link = {
         linkTypes: [
           zn.LINK_TYPE.externalLink,
           zn.LINK_TYPE.anchorLink,
@@ -11308,12 +11306,12 @@ function j8({
       };
       break;
     case "image":
-      t.dataType = Rt.image, t.image = {
+      t.dataType = It.image, t.image = {
         category: r3.IMAGE_CATEGORY.IMAGE
       };
       break;
     case "a11y":
-      t.dataType = Rt.a11y, t.a11y = {
+      t.dataType = It.a11y, t.a11y = {
         attributes: O8(r, n)
       };
       break;
@@ -12272,7 +12270,7 @@ function f5(t, e) {
   const n = r.getName(), i = G1(r, e);
   if (i === "@types/react" || i === "react")
     return U2.has(n) ? { kind: "semantic", value: n, source: i } : void 0;
-  if (i === "@wix/public-schemas")
+  if (i === "@wix/public-schemas" || i === "@wix/editor-react-types")
     return W2(n) ? { kind: "semantic", value: n, source: i } : void 0;
 }
 function m5(t, e) {
@@ -12334,7 +12332,7 @@ function g5({
         value: n,
         source: u
       };
-    if (u === "@wix/public-schemas" && W2(n))
+    if ((u === "@wix/public-schemas" || u === "@wix/editor-react-types") && W2(n))
       return {
         kind: "semantic",
         value: n,
@@ -36541,7 +36539,7 @@ class Bv extends Ag {
 `, `@${this[Qi]}supports ${this.conditionText} {${e}}`;
   }
 }
-const It = {
+const Rt = {
   html: "http://www.w3.org/1999/xhtml",
   svg: "http://www.w3.org/2000/svg",
   mathML: "http://www.w3.org/1998/Math/MathML",
@@ -36635,7 +36633,7 @@ class PS {
     if (this[oc].has(r))
       throw new this.#e.DOMException("Failed to execute 'define' on 'CustomElementRegistry': this constructor has already been used with this registry");
     const i = ps.asciiUpperCase(e);
-    r.prototype[h] = this.#e, r.prototype[q] = this.#e.document, r.prototype[Ne] = i, r.prototype[Xe] = e, r.prototype[we] = It.html;
+    r.prototype[h] = this.#e, r.prototype[q] = this.#e.document, r.prototype[Ne] = i, r.prototype[Xe] = e, r.prototype[we] = Rt.html;
     const s = /* @__PURE__ */ new Set(), a = r.observedAttributes;
     if (Array.isArray(a))
       for (const u of a)
@@ -43790,15 +43788,15 @@ We should not end up here and it is therefore a bug in Happy DOM. Please report
       for (; u = o.exec(e); )
         if (u[1] && u[2] || u[3] && u[5] === '"' || u[6] && u[8] === "'" || u[9]) {
           const l = u[1] || u[3] || u[6] || u[9] || "", c = u[2] || u[4] || u[7] || "", d = c ? Qr.decodeHTMLAttributeValue(c) : "", m = this.nextElement[Ke];
-          if (this.nextElement[we] === It.svg) {
+          if (this.nextElement[we] === Rt.svg) {
             const g = l.split(":");
             let y = null;
             switch (g[0]) {
               case "xmlns":
-                y = !g[1] || g[1] === "xlink" ? It.xmlns : null;
+                y = !g[1] || g[1] === "xlink" ? Rt.xmlns : null;
                 break;
               case "xlink":
-                y = It.xlink;
+                y = Rt.xlink;
                 break;
             }
             if (!m.getNamedItemNS(y, g[1] ?? l)) {
@@ -43851,7 +43849,7 @@ We should not end up here and it is therefore a bug in Happy DOM. Please report
       (!s || s.contentModel !== ne.rawText) && this.nextElement !== o && this.nextElement !== u && this.nextElement !== l && (o && (this.currentNode === this.rootNode || this.currentNode === o || this.currentNode === u && c >= tr.body) ? (c < tr.body && (this.documentStructure.level = tr.afterBody), l[lt](this.nextElement, !0)) : this.currentNode[lt](this.nextElement, !0));
     } else
       this.currentNode[lt](this.nextElement, !0);
-    !this.documentStructure || this.nextElement !== this.documentStructure.nodes.body || this.documentStructure.level <= tr.body ? (this.currentNode = this.nextElement, this.nodeStack.push(this.currentNode), this.tagNameStack.push(n), this.documentStructure && this.nextElement === this.documentStructure.nodes.body && (this.documentStructure.level = tr.afterBody), s?.contentModel === ne.noDescendants || r && this.currentNode[we] === It.svg ? (this.nodeStack.pop(), this.tagNameStack.pop(), this.currentNode = this.nodeStack[this.nodeStack.length - 1] || this.rootNode, this.readState = pr.any) : this.readState = s?.contentModel === ne.rawText ? pr.rawTextElement : pr.any) : this.readState = pr.any, this.startTagIndex = this.markupRegExp.lastIndex;
+    !this.documentStructure || this.nextElement !== this.documentStructure.nodes.body || this.documentStructure.level <= tr.body ? (this.currentNode = this.nextElement, this.nodeStack.push(this.currentNode), this.tagNameStack.push(n), this.documentStructure && this.nextElement === this.documentStructure.nodes.body && (this.documentStructure.level = tr.afterBody), s?.contentModel === ne.noDescendants || r && this.currentNode[we] === Rt.svg ? (this.nodeStack.pop(), this.tagNameStack.pop(), this.currentNode = this.nodeStack[this.nodeStack.length - 1] || this.rootNode, this.readState = pr.any) : this.readState = s?.contentModel === ne.rawText ? pr.rawTextElement : pr.any) : this.readState = pr.any, this.startTagIndex = this.markupRegExp.lastIndex;
   }
   /**
    * Parses end tag.
@@ -43859,7 +43857,7 @@ We should not end up here and it is therefore a bug in Happy DOM. Please report
    * @param tagName Tag name.
    */
   parseEndTag(e) {
-    const r = this.currentNode[we] === It.html ? ps.asciiUpperCase(e) : Xb[ps.asciiLowerCase(e)]?.localName || e, n = this.tagNameStack.lastIndexOf(r);
+    const r = this.currentNode[we] === Rt.html ? ps.asciiUpperCase(e) : Xb[ps.asciiLowerCase(e)]?.localName || e, n = this.tagNameStack.lastIndexOf(r);
     n !== -1 && (this.nodeStack.splice(n, this.nodeStack.length - n), this.tagNameStack.splice(n, this.tagNameStack.length - n), this.currentNode = this.nodeStack[this.nodeStack.length - 1] || this.rootNode);
   }
   /**
@@ -43918,9 +43916,9 @@ We should not end up here and it is therefore a bug in Happy DOM. Please report
   getStartTagElement(e) {
     const r = ps.asciiLowerCase(e), n = this.currentNode[we];
     if (r === "svg")
-      return this.rootDocument.createElementNS(It.svg, "svg");
-    if (n === It.svg)
-      return this.rootDocument.createElementNS(It.svg, Xb[r]?.localName || e);
+      return this.rootDocument.createElementNS(Rt.svg, "svg");
+    if (n === Rt.svg)
+      return this.rootDocument.createElementNS(Rt.svg, Xb[r]?.localName || e);
     switch (r) {
       case "html":
         return this.documentStructure ? (this.documentStructure.level < tr.documentElement && (this.documentStructure.level = tr.documentElement), this.documentStructure.nodes.documentElement ?? null) : null;
@@ -43929,7 +43927,7 @@ We should not end up here and it is therefore a bug in Happy DOM. Please report
       case "body":
         return this.documentStructure ? (this.documentStructure.level < tr.body && (this.documentStructure.level = tr.body), this.documentStructure.nodes.body ?? null) : null;
       default:
-        return this.rootDocument.createElementNS(It.html, r);
+        return this.rootDocument.createElementNS(Rt.html, r);
     }
   }
   /**
@@ -45148,7 +45146,7 @@ let _l = class extends _e {
    * @returns Element.
    */
   createElement(e, r) {
-    return this.createElementNS(It.html, ps.asciiLowerCase(String(e)), r);
+    return this.createElementNS(Rt.html, ps.asciiLowerCase(String(e)), r);
   }
   /**
    * Creates an element with the specified namespace URI and qualified name.
@@ -45165,10 +45163,10 @@ let _l = class extends _e {
       throw new i.DOMException("Failed to execute 'createElementNS' on 'Document': The qualified name provided is empty.");
     const s = r.split(":"), a = s[1] ?? s[0], o = s[1] ? s[0] : null;
     switch (e) {
-      case It.svg:
+      case Rt.svg:
         const u = Xb[r.toLowerCase()], l = u && u.localName === r ? i[u.className] : i.SVGElement, c = vn.createNode(this, l);
         return c[Ne] = r, c[Xe] = a, c[Dt] = o, c[we] = e, c[ms] = n && n.is ? String(n.is) : null, c;
-      case It.html:
+      case Rt.html:
         const d = i.customElements[Pa]?.get(n && n.is ? String(n.is) : r);
         if (d) {
           const x = new d.elementClass();
@@ -45443,7 +45441,7 @@ class zt {
    * @returns Matching element.
    */
   static getElementsByTagNameNS(e, r, n) {
-    const i = r === It.html && e[q][fn] === "text/html" ? n.toUpperCase() : n, s = n === "*", a = (u, l) => {
+    const i = r === Rt.html && e[q][fn] === "text/html" ? n.toUpperCase() : n, s = n === "*", a = (u, l) => {
       const c = [];
       for (const d of u[Qe]) {
         (s || d[Ne] === i) && d[we] === r && c.push(d), d[qr].push(l);
@@ -45603,7 +45601,7 @@ class Um {
    * @returns Item.
    */
   getNamedItem(e) {
-    return e = String(e), this[ft][we] === It.html && this[ft][q][fn] === "text/html" ? this[Ri].get(ps.asciiLowerCase(e))?.[0] || null : this[Ri].get(e)?.[0] || null;
+    return e = String(e), this[ft][we] === Rt.html && this[ft][q][fn] === "text/html" ? this[Ri].get(ps.asciiLowerCase(e))?.[0] || null : this[Ri].get(e)?.[0] || null;
   }
   /**
    * Returns item by name and namespace.
@@ -46421,7 +46419,7 @@ class Do extends _e {
    * @param value Value.
    */
   setAttribute(e, r) {
-    if (qQ.validateAttributeName(e, this[q][fn], { method: "setAttribute", instance: "Element" }), e = String(e), this[we] === It.html) {
+    if (qQ.validateAttributeName(e, this[q][fn], { method: "setAttribute", instance: "Element" }), e = String(e), this[we] === Rt.html) {
       const i = this[q].createAttribute(e);
       i[Se] = String(r), this[Ke][To](i);
     } else {
@@ -46429,10 +46427,10 @@ class Do extends _e {
       let s = null;
       switch (i[0]) {
         case "xmlns":
-          s = !i[1] || i[1] === "xlink" ? It.xmlns : null;
+          s = !i[1] || i[1] === "xlink" ? Rt.xmlns : null;
           break;
         case "xlink":
-          s = It.xlink;
+          s = Rt.xlink;
           break;
       }
       const a = vn.createNode(this[q], this[h].Attr);
@@ -60032,10 +60030,10 @@ class FZ {
       case j.elementNode:
         const i = e, s = i[Xe];
         let a = "";
-        const o = this.#t(i, n), u = i[we] === It.html ? i[Dt] : this.#r(i, o), l = `${u ? u + ":" : ""}${s}`, c = u ? r : i[we] || r, d = this.#n(i, u, r, n), m = c === It.html && s === "template" ? e.content[pe] : e[pe];
+        const o = this.#t(i, n), u = i[we] === Rt.html ? i[Dt] : this.#r(i, o), l = `${u ? u + ":" : ""}${s}`, c = u ? r : i[we] || r, d = this.#n(i, u, r, n), m = c === Rt.html && s === "template" ? e.content[pe] : e[pe];
         for (const z of m)
           a += this.#e(z, c, o);
-        return !a && c === It.html && un[s.toLowerCase()]?.contentModel === ne.noDescendants ? `<${l}${d} />` : !a && c !== It.html ? `<${l}${d}/>` : `<${l}${d}>${a}</${l}>`;
+        return !a && c === Rt.html && un[s.toLowerCase()]?.contentModel === ne.noDescendants ? `<${l}${d} />` : !a && c !== Rt.html ? `<${l}${d}/>` : `<${l}${d}>${a}</${l}>`;
       case _e.DOCUMENT_FRAGMENT_NODE:
       case _e.DOCUMENT_NODE:
         let g = "";
@@ -60066,7 +60064,7 @@ class FZ {
   #t(e, r) {
     const n = new Map(r);
     for (const i of e[Ke][Ee].values())
-      i[we] === It.xmlns && i[Dt] && n.set(i[Se], i[Xe]);
+      i[we] === Rt.xmlns && i[Dt] && n.set(i[Se], i[Xe]);
     return n;
   }
   /**
@@ -60106,7 +60104,7 @@ class FZ {
     let s = "", a = "";
     const o = /* @__PURE__ */ new Set();
     for (const u of e[Ke][Ee].values())
-      u[we] === It.xmlns ? r && u[Xe] === r && e[we] ? (a += ` xmlns:${r}="${Qr.encodeXMLAttributeValue(e[we])}"`, o.add(e[we])) : !r && u[Be] === "xmlns" && e[we] ? (a += ` xmlns="${Qr.encodeXMLAttributeValue(e[we])}"`, o.add(e[we])) : (a += ` ${u[Be]}="${Qr.encodeXMLAttributeValue(u[Se])}"`, o.add(u[Se])) : s += ` ${u[Be]}="${Qr.encodeXMLAttributeValue(u[Se])}"`;
+      u[we] === Rt.xmlns ? r && u[Xe] === r && e[we] ? (a += ` xmlns:${r}="${Qr.encodeXMLAttributeValue(e[we])}"`, o.add(e[we])) : !r && u[Be] === "xmlns" && e[we] ? (a += ` xmlns="${Qr.encodeXMLAttributeValue(e[we])}"`, o.add(e[we])) : (a += ` ${u[Be]}="${Qr.encodeXMLAttributeValue(u[Se])}"`, o.add(u[Se])) : s += ` ${u[Be]}="${Qr.encodeXMLAttributeValue(u[Se])}"`;
     return e[we] && n !== e[we] && !o.has(e[we]) && (r && !i?.has(e[we]) ? a += ` xmlns:${r}="${Qr.encodeXMLAttributeValue(e[we])}"` : !r && n !== e[we] && (a += ` xmlns="${Qr.encodeXMLAttributeValue(e[we])}"`)), a + s;
   }
 }
@@ -60388,7 +60386,7 @@ let TZ = class extends _l {
 }, xZ = class extends ax {
   [Ne] = "IMG";
   [Xe] = "img";
-  [we] = It.html;
+  [we] = Rt.html;
   /**
    * Constructor.
    *
@@ -60401,7 +60399,7 @@ let TZ = class extends _l {
 }, DZ = class extends Qv {
   [Ne] = "AUDIO";
   [Xe] = "audio";
-  [we] = It.html;
+  [we] = Rt.html;
   /**
    * Constructor.
    *
@@ -61334,7 +61332,7 @@ var ct;
 (function(t) {
   t.any = "any", t.startTag = "startTag", t.comment = "comment", t.documentType = "documentType", t.processingInstruction = "processingInstruction", t.error = "error";
 })(ct || (ct = {}));
-const KZ = Object.values(It);
+const KZ = Object.values(Rt);
 class zZ {
   window;
   rootNode = null;
@@ -61508,10 +61506,10 @@ class zZ {
           let y = null;
           switch (g[0]) {
             case "xmlns":
-              y = It.xmlns;
+              y = Rt.xmlns;
               break;
             case "xlink":
-              y = It.xlink;
+              y = Rt.xlink;
               break;
           }
           if (m.getNamedItemNS(y, g[1] ?? l))
@@ -61573,11 +61571,11 @@ class zZ {
   parseError(e, r) {
     let n = this.rootNode.documentElement;
     if (!n) {
-      const u = this.rootNode.createElementNS(It.html, "html"), l = this.rootNode.createElementNS(It.html, "body");
+      const u = this.rootNode.createElementNS(Rt.html, "html"), l = this.rootNode.createElementNS(Rt.html, "body");
       u.appendChild(l), n = l, this.rootNode[lt](u, !0);
     }
     const i = e.split(`
-`), s = i[i.length - 1].length + 1, a = `error on line ${i.length} at column ${s}: ${r || "Unknown error"}`, o = this.rootNode.createElementNS(It.html, "parsererror");
+`), s = i[i.length - 1].length + 1, a = `error on line ${i.length} at column ${s}: ${r || "Unknown error"}`, o = this.rootNode.createElementNS(Rt.html, "parsererror");
     o.setAttribute("style", "display: block; white-space: pre; border: 2px solid #c77; padding: 0 1em 0 1em; margin: 1em; background-color: #fdd; color: black"), o.innerHTML = `<h3>This page contains the following errors:</h3><div style="font-family:monospace;font-size:12px">${a}</div><h3>Below is a rendering of the page up to the first error.</h3>`, n.insertBefore(o, n.firstChild);
   }
   /**

package/package.json

@@ -4,7 +4,7 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "version": "1.50.0",
+  "version": "1.52.0",
   "description": "Core library for extracting component manifests from JS and CSS files",
   "type": "module",
   "main": "dist/index.js",
@@ -85,5 +85,5 @@
       ]
     }
   },
-  "falconPackageHash": "15350286a134883c84b7fb2738d2553d8eedbec024f0d1cb444a40ca"
+  "falconPackageHash": "d79f39cbaf17443575eb80d74b33b419a0a85de96a14adddaa66f97c"
 }

package/src/converters/data-item-builder.test.ts

@@ -0,0 +1,80 @@
+import { describe, expect, it } from 'vitest'
+import type { PropInfo, ResolvedType } from '../information-extractors/ts/types'
+import { buildDataItem } from './data-item-builder'
+
+const stringType: ResolvedType = { kind: 'primitive', value: 'string' }
+const numberType: ResolvedType = { kind: 'primitive', value: 'number' }
+
+const objectElementType: ResolvedType = {
+  kind: 'object',
+  properties: {
+    name: { name: 'name', type: 'string', required: false, resolvedType: stringType },
+    age: { name: 'age', type: 'number', required: false, resolvedType: numberType },
+  },
+}
+
+const buildArrayProp = (elementType: ResolvedType): PropInfo => ({
+  name: 'items',
+  type: 'Array',
+  required: false,
+  resolvedType: { kind: 'array', elementType },
+})
+
+describe('buildDataItem — arrayItems oneof branching', () => {
+  it('uses the `data` branch when the array element is a multi-field object', () => {
+    const result = buildDataItem(buildArrayProp(objectElementType))
+    expect(result.isOk()).toBe(true)
+    const dataItem = result._unsafeUnwrap()
+
+    expect(dataItem.dataType).toBe('arrayItems')
+    expect(dataItem.arrayItems?.dataItem).toBeUndefined()
+    expect(dataItem.arrayItems?.data).toBeDefined()
+    expect(Object.keys(dataItem.arrayItems?.data?.items ?? {})).toEqual(['name', 'age'])
+    expect(dataItem.arrayItems?.data?.items?.name?.dataType).toBe('text')
+    expect(dataItem.arrayItems?.data?.items?.age?.dataType).toBe('number')
+  })
+
+  it('uses the `dataItem` branch for a primitive element type', () => {
+    const result = buildDataItem(buildArrayProp(stringType))
+    expect(result.isOk()).toBe(true)
+    const dataItem = result._unsafeUnwrap()
+
+    expect(dataItem.dataType).toBe('arrayItems')
+    expect(dataItem.arrayItems?.data).toBeUndefined()
+    expect(dataItem.arrayItems?.dataItem).toBeDefined()
+    expect(dataItem.arrayItems?.dataItem?.dataType).toBe('text')
+  })
+
+  it('uses the `dataItem` branch for a semantic element type (e.g. Image)', () => {
+    const semanticImage: ResolvedType = {
+      kind: 'semantic',
+      value: 'Image',
+      source: '@wix/public-schemas',
+    }
+    const result = buildDataItem(buildArrayProp(semanticImage))
+    expect(result.isOk()).toBe(true)
+    const dataItem = result._unsafeUnwrap()
+
+    expect(dataItem.arrayItems?.data).toBeUndefined()
+    expect(dataItem.arrayItems?.dataItem?.dataType).toBe('image')
+  })
+
+  it('uses the `dataItem` branch for a nested array element (string[][])', () => {
+    const innerArray: ResolvedType = { kind: 'array', elementType: stringType }
+    const result = buildDataItem(buildArrayProp(innerArray))
+    expect(result.isOk()).toBe(true)
+    const dataItem = result._unsafeUnwrap()
+
+    expect(dataItem.arrayItems?.data).toBeUndefined()
+    expect(dataItem.arrayItems?.dataItem?.dataType).toBe('arrayItems')
+    expect(dataItem.arrayItems?.dataItem?.arrayItems?.dataItem?.dataType).toBe('text')
+  })
+
+  it('does not double-wrap object elements (no `dataItem.dataType: data` artefact)', () => {
+    const result = buildDataItem(buildArrayProp(objectElementType))
+    const arrayItems = result._unsafeUnwrap().arrayItems
+    // Regression: previously we emitted arrayItems.dataItem.dataType === 'data',
+    // adding an extra wrapping layer. The schema oneof requires `data` directly.
+    expect(arrayItems?.dataItem).toBeUndefined()
+  })
+})

package/src/converters/data-item-builder.ts

@@ -233,9 +233,12 @@ function handleArrayType(
     return result
   }
 
-  dataItem.arrayItems = {
-    dataItem: elementDataItem,
-  }
+  // ArrayItems is a oneof: use `data` when each element is a multi-field object,
+  // and `dataItem` when each element is a single typed value (primitive, semantic, nested array).
+  dataItem.arrayItems =
+    elementDataItem.dataType === DATA_TYPE.data && elementDataItem.data
+      ? { data: elementDataItem.data }
+      : { dataItem: elementDataItem }
 
   return ok(undefined)
 }
@@ -370,7 +373,7 @@ function handleSemanticType({
   }
 
   // Wix public-schemas (Builder) types - map directly to DATA_TYPE via explicit lookup
-  if (source === '@wix/public-schemas') {
+  if (source === '@wix/public-schemas' || source === '@wix/editor-react-types') {
     const dataTypeKey = WIX_TYPE_TO_DATA_TYPE[semanticValue]
     if (dataTypeKey) {
       dataItem.dataType = DATA_TYPE[dataTypeKey]

package/src/information-extractors/ts/utils/semantic-type-resolver.ts

@@ -74,7 +74,7 @@ function checkForSemanticType(
   }
 
   // Check Wix types - only ones that map to DATA_TYPE keys
-  if (packageName === '@wix/public-schemas') {
+  if (packageName === '@wix/public-schemas' || packageName === '@wix/editor-react-types') {
     if (isValidWixSemanticType(symbolName)) {
       return { kind: 'semantic', value: symbolName, source: packageName }
     }
@@ -196,7 +196,7 @@ function resolveTypeBody({
     }
 
     // Check Wix types - only ones that map to DATA_TYPE keys
-    if (packageName === '@wix/public-schemas') {
+    if (packageName === '@wix/public-schemas' || packageName === '@wix/editor-react-types') {
       if (isValidWixSemanticType(typeString)) {
         return {
           kind: 'semantic',