@wix/himalaya-cli 0.1456.0 → 0.1458.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/core.mjs

@@ -9037,7 +9037,9 @@ var screenDescriptorSchema = {
             maxArgDepth: { type: "integer", minimum: 1 },
             maxMessageBytes: { type: "integer", minimum: 1 },
             rateLimitMaxCalls: { type: "integer", minimum: 1 },
-            rateLimitWindowMs: { type: "integer", minimum: 1 }
+            rateLimitWindowMs: { type: "integer", minimum: 1 },
+            // RFC 0073 §4.4 — "" is today's T4 floor; "app_content" raises the caps.
+            profile: { type: "string", enum: ["", "app_content"] }
           }
         },
         contentFilterRules: { type: "string" },
@@ -9069,7 +9071,17 @@ var screenDescriptorSchema = {
         // RFC 0062 §5.8 — the native session bridge (fields 47/48).
         sessionBridge: { type: "boolean" },
         hostedSiteAdapter: { type: "string", enum: ["", "wix", "base44"] },
-        hideHostedSiteMenu: { type: "boolean" }
+        hideHostedSiteMenu: { type: "boolean" },
+        // RFC 0073 §4 — embedded worker-bridged WebViews (fields 52–54).
+        originIsolation: { type: "string", enum: ["", "shared", "per_instance"] },
+        framePolicy: { type: "string", enum: ["", "content"] },
+        storageSeed: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            snapshotPath: { type: "string" }
+          }
+        }
       }
     }
   }
@@ -14124,6 +14136,373 @@ function mergeSiteMenu(nav, site, menu) {
 function siteMenuDrifted(drift) {
   return drift.added.length > 0 || drift.removed.length > 0 || drift.renamed.length > 0;
 }
+
+// ../../core/ts/src/webview-origin.ts
+function hasDotSegment(absolute) {
+  const schemeEnd = absolute.indexOf("://");
+  if (schemeEnd < 0) return false;
+  const hierarchical = absolute.slice(schemeEnd + 3).split(/[?#]/)[0];
+  const pathStart = hierarchical.indexOf("/");
+  if (pathStart < 0) return false;
+  return hierarchical.slice(pathStart).replace(/%2e/g, ".").split("/").some((seg) => seg === "." || seg === "..");
+}
+function rawUrlParts(url) {
+  const trimmed = url.replace(/^[\u0000- ]+|[\u0000- ]+$/g, "");
+  if (/[\\\u0000-\u0020\u007f]/.test(trimmed)) return null;
+  const raw = trimmed;
+  const m = /^([a-z][a-z0-9+.-]*):\/\/([^/?#]*)/i.exec(raw);
+  if (!m) return null;
+  const authority = m[2].slice(m[2].lastIndexOf("@") + 1);
+  let host;
+  let port = "";
+  if (authority.startsWith("[")) {
+    const close = authority.indexOf("]");
+    if (close < 0) return null;
+    host = authority.slice(1, close);
+    const rest = authority.slice(close + 1);
+    if (rest.startsWith(":")) port = rest.slice(1);
+  } else {
+    const colon = authority.lastIndexOf(":");
+    host = colon >= 0 ? authority.slice(0, colon) : authority;
+    port = colon >= 0 ? authority.slice(colon + 1) : "";
+  }
+  host = host.toLowerCase();
+  if (!host) return null;
+  if (port !== "" && !/^\d+$/.test(port)) return null;
+  let parsed;
+  try {
+    parsed = new URL(raw);
+  } catch {
+    return null;
+  }
+  const scheme = m[1].toLowerCase();
+  const bracketless = parsed.hostname.replace(/^\[|\]$/g, "").toLowerCase();
+  if (parsed.protocol !== `${scheme}:` || bracketless !== host) return null;
+  if (parsed.port !== "" && parsed.port !== String(Number(port))) return null;
+  return { absolute: raw.toLowerCase(), host, hostPort: port !== "" ? `${host}:${Number(port)}` : host };
+}
+function webViewOriginAllowed(url, origins) {
+  const u = rawUrlParts(url);
+  if (!u) return false;
+  const { absolute, host, hostPort } = u;
+  for (const o of origins) {
+    const origin = o.toLowerCase();
+    if (origin.endsWith("/") && origin.includes("://")) {
+      if (hasDotSegment(absolute)) continue;
+      const base = origin.slice(0, -1);
+      if (absolute.startsWith(origin) || absolute === base || absolute.startsWith(base + "?") || absolute.startsWith(base + "#")) return true;
+      continue;
+    }
+    if (origin === host || origin === hostPort) return true;
+    if (absolute.startsWith(origin)) {
+      const next = absolute.charAt(origin.length);
+      if (origin.endsWith("/") || next === "" || next === "/" || next === "?" || next === "#") return true;
+    }
+    if (origin.startsWith("*.") || origin.startsWith(".")) {
+      const suffix = origin.startsWith("*.") ? origin.slice(2) : origin.slice(1);
+      if (host === suffix || host.endsWith(`.${suffix}`)) return true;
+    }
+  }
+  return false;
+}
+
+// ../../core/ts/src/webview-embedded.ts
+var MAX_SIMULTANEOUS_BRIDGED_WEBVIEWS = 4;
+var WEBVIEW_EMBEDDED_ENUMS = {
+  bridge: ["", "worker"],
+  originIsolation: ["", "shared", "per_instance"],
+  framePolicy: ["", "content"],
+  profile: ["", "app_content"]
+};
+var isRec = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var byCodeUnit = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+function canonicalJson(value) {
+  return canonicalJsonAt(value, /* @__PURE__ */ new Set());
+}
+function canonicalJsonAt(value, path) {
+  if (value === null || typeof value === "boolean" || typeof value === "string") return JSON.stringify(value);
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) throw new TypeError(`canonicalJson: ${value} is not representable in JSON`);
+    return String(value);
+  }
+  if (typeof value !== "object") throw new TypeError(`canonicalJson: a ${typeof value} is not JSON data`);
+  if (path.has(value)) throw new TypeError("canonicalJson: a cyclic value is not JSON data");
+  path.add(value);
+  try {
+    if (Array.isArray(value)) {
+      const parts = [];
+      for (let i = 0; i < value.length; i++) {
+        if (!(i in value)) throw new TypeError(`canonicalJson: array element ${i} is a hole, which is not JSON data`);
+        const v = value[i];
+        if (v === void 0) throw new TypeError(`canonicalJson: array element ${i} is undefined, which is not JSON data`);
+        parts.push(canonicalJsonAt(v, path));
+      }
+      return `[${parts.join(",")}]`;
+    }
+    const proto = Object.getPrototypeOf(value);
+    if (proto !== Object.prototype && proto !== null) {
+      throw new TypeError(`canonicalJson: a ${value.constructor?.name ?? "non-plain object"} is not JSON data \u2014 pass a plain object, an array, or a primitive`);
+    }
+    const rec = value;
+    const keys = Object.keys(rec).filter((k) => rec[k] !== void 0).sort(byCodeUnit);
+    return `{${keys.map((k) => `${JSON.stringify(k)}:${canonicalJsonAt(rec[k], path)}`).join(",")}}`;
+  } finally {
+    path.delete(value);
+  }
+}
+function canonicalScreenArgs(args) {
+  if (!args) return "";
+  return Object.keys(args).filter((k) => args[k] !== void 0).sort(byCodeUnit).map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(canonicalJson(args[k]))}`).join("&");
+}
+function effectiveWebViewInstanceId(screenId, args, componentId, explicitInstanceId) {
+  if (typeof explicitInstanceId === "string" && explicitInstanceId !== "") return explicitInstanceId;
+  return `${screenId}?${canonicalScreenArgs(args)}/${componentId}`;
+}
+var isComponent = (v) => isRec(v) && isRec(v.body) && typeof v.body.package === "string" && typeof v.body.type === "string";
+var typeOf = (c) => {
+  const body = c.body;
+  return body.package === "himalaya" ? body.type : null;
+};
+var propsOf = (c) => {
+  const p = c.body.props;
+  return isRec(p) ? p : {};
+};
+var hasItemsPath = (props) => typeof props.itemsPath === "string" && props.itemsPath !== "";
+function childComponents(value, path, inTemplate, out) {
+  if (Array.isArray(value)) {
+    value.forEach((v, i) => childComponents(v, `${path}[${i}]`, inTemplate, out));
+    return;
+  }
+  if (!isRec(value)) return;
+  if (isComponent(value)) {
+    out.push({ c: value, path, inTemplate });
+    return;
+  }
+  for (const [k, v] of Object.entries(value)) childComponents(v, `${path}.${k}`, inTemplate || /Template$/.test(k), out);
+}
+function childrenOf(c, path, inTemplate) {
+  const props = propsOf(c);
+  const type = typeOf(c);
+  const boundList = (type === "LazyList" || type === "Grid" || type === "Carousel") && hasItemsPath(props);
+  const out = [];
+  for (const [k, v] of Object.entries(props)) {
+    const templ = inTemplate || /Template$/.test(k) || boundList && k === "items";
+    childComponents(v, `${path}.body.props.${k}`, templ, out);
+  }
+  return out;
+}
+function roots(descriptor) {
+  const out = [];
+  for (const key of ["payload", "stickyHeader", "stickyFooter"]) {
+    const v = descriptor[key];
+    if (isComponent(v)) out.push({ c: v, path: key });
+  }
+  return out;
+}
+function collectWebViews(descriptor) {
+  const sites = [];
+  const visit = (c, path, inTemplate) => {
+    if (typeOf(c) === "WebView") {
+      sites.push({ path, id: typeof c.id === "string" ? c.id : "", props: propsOf(c), inTemplate });
+    }
+    for (const child of childrenOf(c, path, inTemplate)) visit(child.c, child.path, child.inTemplate);
+  };
+  for (const r of roots(descriptor)) visit(r.c, r.path, false);
+  return sites;
+}
+var isBridged = (props) => props.bridge === "worker";
+var configOf = (props) => isRec(props.config) ? props.config : {};
+var isPerInstance = (props) => configOf(props).originIsolation === "per_instance";
+var isLiteral = (v) => typeof v === "string" && v !== "" && !v.startsWith("$");
+var isItemDerived = (v) => typeof v === "string" && /\$item\.[A-Za-z0-9_]/.test(v);
+function mountable(c, inTemplate = false) {
+  const type = typeOf(c);
+  const props = propsOf(c);
+  const repeated = (n) => inTemplate && n > 0 ? Infinity : n;
+  if (type === "WebView") return repeated(isBridged(props) ? 1 : 0);
+  if (type === "LazyList") {
+    let slots = 0;
+    for (const [k, v] of Object.entries(props)) {
+      if (k === "items") continue;
+      const found = [];
+      childComponents(v, "", inTemplate || /Template$/.test(k), found);
+      for (const child of found) slots += mountable(child.c, child.inTemplate);
+    }
+    return slots;
+  }
+  if (type === "Carousel" || type === "Pager") {
+    const pages = type === "Carousel" ? props.items : props.pages;
+    const perPage = Array.isArray(pages) ? pages.map((p) => isComponent(p) ? mountable(p) : 0) : [];
+    const window = typeof props.liveWindow === "number" && props.liveWindow > 0 ? Math.floor(props.liveWindow) : 0;
+    const bound = type === "Carousel" && hasItemsPath(props);
+    if (bound) {
+      const template = perPage[0] ?? 0;
+      if (template === 0) return 0;
+      return repeated(window > 0 ? template * (2 * window + 1) : Infinity);
+    }
+    if (window > 0) return repeated(perPage.sort((a, b) => b - a).slice(0, 2 * window + 1).reduce((a, b) => a + b, 0));
+    return repeated(perPage.reduce((a, b) => a + b, 0));
+  }
+  if (type === "Grid" && hasItemsPath(props)) {
+    const items = props.items;
+    const template = Array.isArray(items) && isComponent(items[0]) ? mountable(items[0]) : 0;
+    return template === 0 ? 0 : Infinity;
+  }
+  let total = 0;
+  for (const child of childrenOf(c, "", inTemplate)) total += mountable(child.c, child.inTemplate);
+  return total;
+}
+function webViewEmbeddedFindings(descriptor) {
+  if (!isRec(descriptor)) return [];
+  const out = [];
+  const screenConfig = isRec(descriptor.webViewConfig) ? descriptor.webViewConfig : {};
+  if (screenConfig.storageSeed !== void 0 && screenConfig.originIsolation !== "per_instance") {
+    out.push({
+      severity: "error",
+      rule: "storage_seed_requires_per_instance",
+      path: "webViewConfig.storageSeed",
+      message: `the screen's webViewConfig sets storageSeed without originIsolation: "per_instance" \u2014 a seed migrates into a per-instance origin only (RFC 0073 \xA74.2)`
+    });
+  }
+  const sites = collectWebViews(descriptor);
+  if (sites.length === 0) return out;
+  const screenId = typeof descriptor.screenId === "string" ? descriptor.screenId : "";
+  const lb = isRec(descriptor.logicBundle) ? descriptor.logicBundle : null;
+  const caps = lb && Array.isArray(lb.declaredCapabilities) ? lb.declaredCapabilities : [];
+  const seen = /* @__PURE__ */ new Map();
+  for (const s of sites) {
+    const { props, path } = s;
+    const config = configOf(props);
+    const bridged = isBridged(props);
+    const security = isRec(config.bridgeSecurity) ? config.bridgeSecurity : {};
+    for (const [field, value, prop] of [
+      ["bridge", props.bridge, "bridge"],
+      ["originIsolation", config.originIsolation, "config.originIsolation"],
+      ["framePolicy", config.framePolicy, "config.framePolicy"],
+      ["profile", security.profile, "config.bridgeSecurity.profile"]
+    ]) {
+      const allowed = WEBVIEW_EMBEDDED_ENUMS[field];
+      if (value === void 0 || typeof value === "string" && allowed.includes(value)) continue;
+      out.push({
+        severity: "error",
+        rule: "unknown_enum_value",
+        path: `${path}.body.props.${prop}`,
+        message: `WebView "${s.id}" sets ${prop}: ${JSON.stringify(value)} \u2014 not one of ${allowed.map((v) => JSON.stringify(v)).join(" | ")}; the hosts read an unknown value as ${JSON.stringify(allowed[0])} (RFC 0073 \xA74)`
+      });
+    }
+    if (bridged && (!lb || !caps.includes("webview"))) {
+      out.push({
+        severity: "error",
+        rule: "bridge_requires_worker",
+        path: `${path}.body.props.bridge`,
+        message: !lb ? `WebView "${s.id}" sets bridge: "worker" but the screen has no logicBundle \u2014 the channel connects the page to the screen's worker (RFC 0073 \xA74.6)` : `WebView "${s.id}" sets bridge: "worker" but logicBundle.declaredCapabilities lacks "webview" (RFC 0073 \xA73, \xA74.6)`
+      });
+    }
+    if ((bridged || isPerInstance(props)) && s.inTemplate && !isItemDerived(props.instanceId)) {
+      out.push({
+        severity: "error",
+        rule: "template_instance_id",
+        path: `${path}.body.props.instanceId`,
+        message: `WebView "${s.id}" is ${bridged ? "bridged" : `per_instance`} inside an item template but its instanceId is not derived from the item (e.g. "$item.id") \u2014 every row would share one ${bridged ? "channel and one origin" : "origin and its storage"} (RFC 0073 \xA74.1)`
+      });
+    }
+    if ((bridged || isPerInstance(props)) && !s.inTemplate) {
+      const explicit = props.instanceId;
+      const effective = isLiteral(explicit) ? explicit : explicit === void 0 || explicit === "" ? effectiveWebViewInstanceId(screenId, void 0, s.id) : null;
+      if (effective !== null) {
+        const first = seen.get(effective);
+        if (first !== void 0) {
+          out.push({
+            severity: "error",
+            rule: "duplicate_instance_id",
+            path: `${path}.body.props.instanceId`,
+            message: `WebView "${s.id}" has the same effective instance_id "${effective}" as ${first} \u2014 two pages on one screen would share a channel and storage (RFC 0073 \xA74.1)`
+          });
+        } else {
+          seen.set(effective, path);
+        }
+      }
+    }
+    if (config.storageSeed !== void 0 && config.originIsolation !== "per_instance") {
+      out.push({
+        severity: "error",
+        rule: "storage_seed_requires_per_instance",
+        path: `${path}.body.props.config.storageSeed`,
+        message: `WebView "${s.id}" sets config.storageSeed without originIsolation: "per_instance" \u2014 a seed migrates into a per-instance origin only (RFC 0073 \xA74.2)`
+      });
+    }
+    if (config.originIsolation === "per_instance" && typeof props.url === "string" && props.url !== "") {
+      out.push({
+        severity: "warning",
+        rule: "per_instance_with_url",
+        path: `${path}.body.props.config.originIsolation`,
+        message: `WebView "${s.id}" sets originIsolation: "per_instance" with a url \u2014 per-instance origins apply to inlineHtml only; a url keeps its own origin (RFC 0073 \xA74.2)`
+      });
+    }
+    if (props.fill === true && (props.height !== void 0 || props.aspectRatio !== void 0 || props.heightPath !== void 0)) {
+      out.push({
+        severity: "warning",
+        rule: "fill_with_height",
+        path: `${path}.body.props.fill`,
+        message: `WebView "${s.id}" sets fill together with height / aspectRatio / heightPath \u2014 fill wins and the others are ignored (RFC 0073 \xA74)`
+      });
+    }
+    if (bridged && isLiteral(props.url)) {
+      const allowed = Array.isArray(config.allowedOrigins) ? config.allowedOrigins.filter((o) => typeof o === "string") : [];
+      if (allowed.length > 0 && !webViewOriginAllowed(props.url, allowed)) {
+        out.push({
+          severity: "warning",
+          rule: "bridged_url_not_allowed",
+          path: `${path}.body.props.url`,
+          message: `WebView "${s.id}" is bridged to a url whose origin is not listed in config.allowedOrigins \u2014 list it to assert the page is app-controlled; web refuses the bridge otherwise (RFC 0073 \xA74.6, \xA78)`
+        });
+      }
+    }
+  }
+  let total = 0;
+  let crossedAt = "";
+  for (const r of roots(descriptor)) {
+    total += mountable(r.c);
+    if (crossedAt === "" && total > MAX_SIMULTANEOUS_BRIDGED_WEBVIEWS) crossedAt = r.path;
+  }
+  if (crossedAt !== "") {
+    out.push({
+      severity: "warning",
+      rule: "too_many_bridged",
+      path: crossedAt,
+      message: `this screen can mount ${Number.isFinite(total) ? total : "an unbounded number of"} worker-bridged WebViews at once (more than ${MAX_SIMULTANEOUS_BRIDGED_WEBVIEWS}) \u2014 put them in a LazyList or a Carousel/Pager with liveWindow (RFC 0073 \xA74.5)`
+    });
+  }
+  return out;
+}
+function webViewEmbeddedAppFindings(screens) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const { screenId, descriptor } of screens) {
+    if (!isRec(descriptor)) continue;
+    for (const s of collectWebViews(descriptor)) {
+      if (!isPerInstance(s.props) || !isLiteral(s.props.instanceId)) continue;
+      const content = [s.props.inlineHtml, s.props.url].find(isLiteral);
+      if (content === void 0) continue;
+      const list = byId.get(s.props.instanceId) ?? [];
+      list.push({ screenId, path: s.path, content });
+      byId.set(s.props.instanceId, list);
+    }
+  }
+  const out = [];
+  for (const [id, uses] of byId) {
+    const screensSeen = new Set(uses.map((u) => u.screenId));
+    const contents = new Set(uses.map((u) => u.content));
+    if (screensSeen.size < 2 || contents.size < 2) continue;
+    out.push({
+      severity: "warning",
+      rule: "instance_id_reused_across_screens",
+      screenId: uses[0].screenId,
+      path: `${uses[0].path}.body.props.instanceId`,
+      message: `per_instance instanceId "${id}" is bound to different content on screens ${[...screensSeen].join(", ")} \u2014 they would share one origin and its storage (RFC 0073 \xA74.1)`
+    });
+  }
+  return out;
+}
 export {
   ALL_ORIENTATIONS,
   APP_ID_PATTERN,
@@ -14156,6 +14535,7 @@ export {
   LAUNCH_MANIFEST_SCHEMA,
   LAUNCH_NAMESPACE,
   LINK_MOUNT_PATHS,
+  MAX_SIMULTANEOUS_BRIDGED_WEBVIEWS,
   OAUTH_IDP_ORIGINS,
   ORIGIN_PARAM_KEYS,
   PACKAGE_SHARE_ID_PATTERN,
@@ -14195,6 +14575,7 @@ export {
   SYSTEM_FONT_FAMILY,
   TONAL_ELEVATION_ALPHA,
   UNIVERSAL_LAUNCH_NAMESPACES,
+  WEBVIEW_EMBEDDED_ENUMS,
   WIDGET_COMPONENTS,
   WIDGET_FAMILIES,
   WIDGET_VOCABULARY,
@@ -14212,6 +14593,8 @@ export {
   buildTokenRegistry,
   buttonHitSlop,
   buttonVariant,
+  canonicalJson,
+  canonicalScreenArgs,
   chassisOuterSize,
   checkTierCaps,
   chooseCandidate,
@@ -14226,6 +14609,7 @@ export {
   defineSitePageScreen,
   defineSiteTab,
   effectiveFieldRule,
+  effectiveWebViewInstanceId,
   errorMessageFor,
   evaluate,
   evaluateAll,
@@ -14313,6 +14697,9 @@ export {
   validateWorkerSubtree,
   validators,
   viewTargetRenderMode,
+  webViewEmbeddedAppFindings,
+  webViewEmbeddedFindings,
+  webViewOriginAllowed,
   widgetSnapshotSchema,
   workerSubtreePolicyErrors,
   workerSubtreeSha256

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/sdui.mjs

@@ -7729,7 +7729,9 @@ var screenDescriptorSchema = {
             maxArgDepth: { type: "integer", minimum: 1 },
             maxMessageBytes: { type: "integer", minimum: 1 },
             rateLimitMaxCalls: { type: "integer", minimum: 1 },
-            rateLimitWindowMs: { type: "integer", minimum: 1 }
+            rateLimitWindowMs: { type: "integer", minimum: 1 },
+            // RFC 0073 §4.4 — "" is today's T4 floor; "app_content" raises the caps.
+            profile: { type: "string", enum: ["", "app_content"] }
           }
         },
         contentFilterRules: { type: "string" },
@@ -7761,7 +7763,17 @@ var screenDescriptorSchema = {
         // RFC 0062 §5.8 — the native session bridge (fields 47/48).
         sessionBridge: { type: "boolean" },
         hostedSiteAdapter: { type: "string", enum: ["", "wix", "base44"] },
-        hideHostedSiteMenu: { type: "boolean" }
+        hideHostedSiteMenu: { type: "boolean" },
+        // RFC 0073 §4 — embedded worker-bridged WebViews (fields 52–54).
+        originIsolation: { type: "string", enum: ["", "shared", "per_instance"] },
+        framePolicy: { type: "string", enum: ["", "content"] },
+        storageSeed: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            snapshotPath: { type: "string" }
+          }
+        }
       }
     }
   }