@wix/himalaya-cli 0.822.0 → 0.824.0

package/dist/cli.mjs

@@ -24116,6 +24116,85 @@ var init_FakeServiceProvider = __esm({
   }
 });
 
+// ../../core/web-renderer/src/env.ts
+function isEnvExpr(raw) {
+  return typeof raw === "string" && raw.startsWith(ENV_SENTINEL);
+}
+function sizeClassFromWidth(width) {
+  if (width >= 840) return "expanded";
+  if (width >= 600) return "medium";
+  return "compact";
+}
+function browserSizeClass() {
+  if (typeof window !== "undefined" && typeof window.innerWidth === "number") {
+    return sizeClassFromWidth(window.innerWidth);
+  }
+  return "compact";
+}
+function browserIsRTL() {
+  if (typeof document !== "undefined" && document.documentElement) {
+    const d = (document.documentElement.getAttribute("dir") || "").toLowerCase();
+    if (d === "rtl") return true;
+    if (d === "ltr") return false;
+    if (typeof getComputedStyle === "function") {
+      return getComputedStyle(document.documentElement).direction === "rtl";
+    }
+  }
+  return false;
+}
+function ctxEnv(ctx) {
+  return {
+    scheme: ctx.scheme,
+    reduceMotion: ctx.reduceMotion(),
+    sizeClass: ctx.sizeClass ?? browserSizeClass(),
+    isRTL: ctx.isRTL ?? browserIsRTL()
+  };
+}
+function envValue(key2, env) {
+  switch (key2) {
+    case "reduceMotion":
+      return env.reduceMotion ? "true" : "false";
+    case "colorScheme":
+      return env.scheme;
+    case "sizeClass":
+      return env.sizeClass;
+    case "isRTL":
+      return env.isRTL ? "true" : "false";
+    default:
+      return void 0;
+  }
+}
+function parseEnvExpr(raw) {
+  if (!isEnvExpr(raw)) return null;
+  const rest = raw.slice(ENV_SENTINEL.length);
+  for (const op of ["==", "!="]) {
+    const i = rest.indexOf(op);
+    if (i >= 0) return { key: rest.slice(0, i).trim(), op, operand: rest.slice(i + op.length).trim() };
+  }
+  return { key: rest.trim() };
+}
+function evalEnvExpr(raw, env) {
+  const parsed = parseEnvExpr(raw);
+  if (!parsed) return void 0;
+  const value = envValue(parsed.key, env);
+  if (value === void 0) return void 0;
+  if (!parsed.op) return value;
+  const equal = value.toLowerCase() === (parsed.operand ?? "").toLowerCase();
+  return (parsed.op === "==" ? equal : !equal) ? "true" : "false";
+}
+function envHidden(raw, env) {
+  const resolved = evalEnvExpr(raw, env);
+  if (resolved === void 0) return void 0;
+  const l = resolved.trim().toLowerCase();
+  return l === "true" || l === "1";
+}
+var ENV_SENTINEL;
+var init_env = __esm({
+  "../../core/web-renderer/src/env.ts"() {
+    ENV_SENTINEL = "$env:";
+  }
+});
+
 // ../../core/web-renderer/src/tokens.ts
 function isSerifFamily(family) {
   return !!family && SERIF_FAMILY_RE.test(family);
@@ -25217,85 +25296,6 @@ var init_form_bag = __esm({
   }
 });
 
-// ../../core/web-renderer/src/env.ts
-function isEnvExpr(raw) {
-  return typeof raw === "string" && raw.startsWith(ENV_SENTINEL);
-}
-function sizeClassFromWidth(width) {
-  if (width >= 840) return "expanded";
-  if (width >= 600) return "medium";
-  return "compact";
-}
-function browserSizeClass() {
-  if (typeof window !== "undefined" && typeof window.innerWidth === "number") {
-    return sizeClassFromWidth(window.innerWidth);
-  }
-  return "compact";
-}
-function browserIsRTL() {
-  if (typeof document !== "undefined" && document.documentElement) {
-    const d = (document.documentElement.getAttribute("dir") || "").toLowerCase();
-    if (d === "rtl") return true;
-    if (d === "ltr") return false;
-    if (typeof getComputedStyle === "function") {
-      return getComputedStyle(document.documentElement).direction === "rtl";
-    }
-  }
-  return false;
-}
-function ctxEnv(ctx) {
-  return {
-    scheme: ctx.scheme,
-    reduceMotion: ctx.reduceMotion(),
-    sizeClass: ctx.sizeClass ?? browserSizeClass(),
-    isRTL: ctx.isRTL ?? browserIsRTL()
-  };
-}
-function envValue(key2, env) {
-  switch (key2) {
-    case "reduceMotion":
-      return env.reduceMotion ? "true" : "false";
-    case "colorScheme":
-      return env.scheme;
-    case "sizeClass":
-      return env.sizeClass;
-    case "isRTL":
-      return env.isRTL ? "true" : "false";
-    default:
-      return void 0;
-  }
-}
-function parseEnvExpr(raw) {
-  if (!isEnvExpr(raw)) return null;
-  const rest = raw.slice(ENV_SENTINEL.length);
-  for (const op of ["==", "!="]) {
-    const i = rest.indexOf(op);
-    if (i >= 0) return { key: rest.slice(0, i).trim(), op, operand: rest.slice(i + op.length).trim() };
-  }
-  return { key: rest.trim() };
-}
-function evalEnvExpr(raw, env) {
-  const parsed = parseEnvExpr(raw);
-  if (!parsed) return void 0;
-  const value = envValue(parsed.key, env);
-  if (value === void 0) return void 0;
-  if (!parsed.op) return value;
-  const equal = value.toLowerCase() === (parsed.operand ?? "").toLowerCase();
-  return (parsed.op === "==" ? equal : !equal) ? "true" : "false";
-}
-function envHidden(raw, env) {
-  const resolved = evalEnvExpr(raw, env);
-  if (resolved === void 0) return void 0;
-  const l = resolved.trim().toLowerCase();
-  return l === "true" || l === "1";
-}
-var ENV_SENTINEL;
-var init_env = __esm({
-  "../../core/web-renderer/src/env.ts"() {
-    ENV_SENTINEL = "$env:";
-  }
-});
-
 // ../../core/web-renderer/src/actionParams.ts
 function readService(ref, provider) {
   if (!provider) return void 0;
@@ -33720,6 +33720,7 @@ var init_src3 = __esm({
 var render_descriptor_exports = {};
 __export(render_descriptor_exports, {
   buildRenderTree: () => buildRenderTree,
+  clientEnvFor: () => clientEnvFor,
   collectNativeOnly: () => collectNativeOnly,
   isMissingPlaywrightExecutable: () => isMissingPlaywrightExecutable,
   pngAvailable: () => pngAvailable,
@@ -33728,6 +33729,36 @@ __export(render_descriptor_exports, {
   stabilizePngPage: () => stabilizePngPage,
   withRetry: () => withRetry2
 });
+function hiddenBool2(v) {
+  if (typeof v === "boolean") return v;
+  if (typeof v === "number") return v !== 0;
+  if (typeof v === "string") {
+    const l = v.trim().toLowerCase();
+    return l === "true" || l === "1";
+  }
+  return false;
+}
+function clientEnvFor(scheme, width, isRTL) {
+  return {
+    scheme,
+    reduceMotion: false,
+    sizeClass: width === void 0 ? "compact" : sizeClassFromWidth(width),
+    isRTL: isRTL === true
+  };
+}
+function nodeHidden(modifiers, provider, itemScope, env) {
+  if (modifiers.hidden === true) return true;
+  const hp = modifiers.hiddenPath ?? modifiers.hidden_path;
+  if (typeof hp !== "string" || !hp) return false;
+  const low = hp.trim().toLowerCase();
+  if (low === "true" || low === "1") return true;
+  if (low === "false" || low === "0") return false;
+  if (isEnvExpr(hp)) return env ? envHidden(hp, env) === true : false;
+  if (hp.startsWith("$item") || hp.startsWith("$service:")) {
+    return hiddenBool2(resolveTreeScalar(hp, provider, itemScope));
+  }
+  return false;
+}
 function resolveTreeScalar(v, provider, itemScope) {
   if (typeof v !== "string") return v;
   if (v.startsWith("$item")) {
@@ -33778,7 +33809,7 @@ function collectNativeOnly(node) {
   walk2(node);
   return [...found].sort();
 }
-function buildRenderTree(node, path = "$", provider = null, itemScope = void 0, includeRawProps = false) {
+function buildRenderTree(node, path = "$", provider = null, itemScope = void 0, includeRawProps = false, env = null) {
   if (!node || typeof node !== "object") return null;
   const obj = node;
   const body = obj.body ?? {};
@@ -33818,6 +33849,7 @@ function buildRenderTree(node, path = "$", provider = null, itemScope = void 0,
       insideMediaProperty: false
     });
     if (Object.keys(values).length) out.values = values;
+    if (nodeHidden(modifiers, provider, itemScope, env)) out.hidden = true;
     const itemsPath = props.itemsPath ?? props.items_path;
     if ((type === "LazyList" || type === "Grid") && typeof itemsPath === "string") {
       const local = itemsPath.startsWith("$item.");
@@ -33828,7 +33860,7 @@ function buildRenderTree(node, path = "$", provider = null, itemScope = void 0,
           (el, i) => buildRenderTree(template, `${id}/${type}[${i}]`, provider, {
             ...el && typeof el === "object" ? el : { value: el },
             __index: i
-          }, includeRawProps)
+          }, includeRawProps, env)
         ).filter((c) => c != null);
         if (kids2.length) out.children = kids2;
         return out;
@@ -33844,7 +33876,7 @@ function buildRenderTree(node, path = "$", provider = null, itemScope = void 0,
     if (v && typeof v === "object") {
       const o = v;
       if (o.body && typeof o.body === "object") {
-        const c = buildRenderTree(o, `${id}/${type}`, provider, itemScope, includeRawProps);
+        const c = buildRenderTree(o, `${id}/${type}`, provider, itemScope, includeRawProps, env);
         if (c) children.push(c);
       } else {
         for (const [k, val] of Object.entries(o)) visit(val, `${p}.${k}`);
@@ -33879,7 +33911,8 @@ async function renderDescriptorWeb(descriptor, tokens, scheme, wantPng, services
   const provider = services ? new FakeServiceProvider(services) : null;
   const stickyHeader = isSduiNode(desc.stickyHeader) ? desc.stickyHeader : void 0;
   const stickyFooter = isSduiNode(desc.stickyFooter) ? desc.stickyFooter : void 0;
-  const treeOf = (node, path, prov) => buildRenderTree(node, path, prov, void 0, true);
+  const clientEnv = clientEnvFor(scheme, width, isRTL);
+  const treeOf = (node, path, prov) => buildRenderTree(node, path, prov, void 0, true, clientEnv);
   const renderTree = composeStickyTree(
     treeOf(payload, "$", null) ?? void 0,
     stickyHeader ? treeOf(stickyHeader, "$.stickyHeader", null) : null,
@@ -34019,6 +34052,7 @@ var TREE_TEXT_VALUE_PROPS, MEDIA_PLAYER_QUEUE_PROPERTIES, NATIVE_ONLY_TYPES;
 var init_render_descriptor = __esm({
   "../../core/dev-server/src/render-descriptor.ts"() {
     init_FakeServiceProvider();
+    init_env();
     init_media_value();
     TREE_TEXT_VALUE_PROPS = /* @__PURE__ */ new Set(["text", "title", "label", "value", "placeholder", "message"]);
     MEDIA_PLAYER_QUEUE_PROPERTIES = /* @__PURE__ */ new Set(["items", "itemsPath", "items_path"]);
@@ -36899,7 +36933,12 @@ async function handleWebWix(req, res, state) {
     const target = new URL(requestedPath, "https://www.wixapis.com");
     const query = Object.fromEntries(target.searchParams.entries());
     const started = Date.now();
-    const match = state.wix.mode === "mock" ? matchRuleEx(state.wix.rules, method, target.pathname, { host: target.host, query, body }) : void 0;
+    const matchCtx = { host: target.host, query, headers: forwardedHeaders, body };
+    let match = state.wix.mode === "mock" ? matchRuleEx(state.wix.rules, method, target.pathname, matchCtx) : void 0;
+    if (match && (match.rule.kind ?? "mock") !== "mock") {
+      console.error(`[himalaya-dev] net-mocks: rule "${match.rule.id}" is kind:"${match.rule.kind}", which the web bridge cannot apply \u2014 ignoring it for ${method} ${target.pathname}`);
+      match = matchRuleEx(state.wix.rules.filter((r) => (r.kind ?? "mock") === "mock"), method, target.pathname, matchCtx);
+    }
     if (match && (match.rule.kind ?? "mock") === "mock") {
       const mocked = match.rule.response;
       if (mocked.delayMs) await new Promise((resolve41) => setTimeout(resolve41, mocked.delayMs));
@@ -40390,6 +40429,7 @@ function collectObservations(descriptorOrPayload, state) {
   const out = [];
   const walk2 = (node) => {
     if (!node) return;
+    if (node.hidden) return;
     for (const [field, value] of Object.entries(node.values ?? {})) {
       const enc = value !== null && typeof value === "object" ? JSON.stringify(value) : String(value);
       out.push(`${node.id}.${field}=${enc}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.822.0",
+  "version": "0.824.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -63,5 +63,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "7c2d068c0d6e24b5c57701a69b820866c5307d58348ea185ca243d74"
+  "falconPackageHash": "bf51a9ad9fb88aab7c822b53c24fb64c672c743e513cfb163b2bebd4"
 }