@wix/himalaya-cli 0.1569.0 → 0.1571.0

package/templates/retail-store/tier5-src/_shared/program-description.ts

@@ -0,0 +1,11 @@
+import type { WixProgram } from "@himalaya/wix-online-programs";
+
+/** v3 nests the body in description.details; older responses use settings or a
+ * flat description. The body itself may be a Ricos document or serialized text. */
+export function programDescription(program: WixProgram): unknown {
+  const raw = (program as { description?: unknown }).description;
+  const nested = raw && typeof raw === "object" ? raw as { details?: unknown; nodes?: unknown } : undefined;
+  return program.settings?.description ?? nested?.details
+    ?? (typeof raw === "string" || Array.isArray(nested?.nodes) ? raw : undefined)
+    ?? program.details?.description;
+}

package/templates/retail-store/tier5-src/business-contact/index.ts

@@ -0,0 +1,6 @@
+import { createBusinessContactService } from "@himalaya/screens";
+
+// Contact values and the optional public total are build-time source evidence.
+// No owner API, device location, or cross-site source URL is read by this worker.
+const svc = createBusinessContactService();
+export { svc };

package/templates/retail-store/tier5-src/himi-blog-post/index.ts

@@ -9,6 +9,7 @@ import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
 import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
+import { readAccess, assertReadAccess, readAccessDenied, readSignInFlags, NO_READ_SIGN_IN } from "../_shared/member-read.js";
 
 // Offline-first (data-offline): the post body is a public read-through — when the
 // live fetch fails (offline) fall back to the last-synced row the feed cached under
@@ -34,6 +35,7 @@ interface CommentRow {
 }
 
 interface S {
+  signInRequired: boolean; noSignIn: boolean; signInScreenId: string;
   status: "loading" | "ready" | "error";
   id: string;
   title: string;
@@ -214,6 +216,7 @@ function derive(s: S): S {
 }
 
 const baseState: S = derive({
+  ...NO_READ_SIGN_IN, signInScreenId: "himi_account",
   status: "loading",
   id: "",
   title: "",
@@ -280,23 +283,28 @@ async function cachedPostState(s: S, id: string): Promise<S> {
   });
 }
 
-async function loadPostState(s: S): Promise<S> {
+let loadVersion = 0;
+async function loadPostState(s: S): Promise<S | undefined> {
+  const version = ++loadVersion;
+  await svc.prepare();
+  const clean = { ...baseState, signInScreenId: s.signInScreenId };
   const id = inputId();
   if (!id) {
-    return derive({ ...s, status: "ready", emptyText: copyParam("blogPost.notFoundText", "Post not found.") });
+    return derive({ ...clean, status: "ready", emptyText: copyParam("blogPost.notFoundText", "Post not found.") });
   }
   try {
-    const [postResult, commentsResult] = await Promise.allSettled([getPost(id), listBlogComments(id)]);
-    if (postResult.status === "rejected") {
-      return cachedPostState(s, id);
-    }
+    const access = await readAccess();
+    const [postResult, commentsResult] = await Promise.allSettled([getPost(id, {}, { preserveAccessErrors: true }), listBlogComments(id)]);
+    if (postResult.status === "rejected") throw postResult.reason;
+    await assertReadAccess(access);
+    if (version !== loadVersion) return undefined;
     const post = (((postResult.value as unknown as { post?: WixPost }).post) ?? postResult.value) as PostWithExtras;
     const commentsUnavailable = commentsResult.status === "rejected";
     const comments = commentsResult.status === "fulfilled" ? commentsResult.value.map(toCommentRow) : [];
     const cover = imageUrl(post);
     const title = post.title || "Untitled post";
     return derive({
-      ...s,
+      ...clean,
       status: "ready",
       id,
       title,
@@ -319,14 +327,23 @@ async function loadPostState(s: S): Promise<S> {
       errorText: "",
       emptyText: "",
     });
-  } catch {
-    return cachedPostState(s, id);
+  } catch (error) {
+    const flags = await readSignInFlags(error);
+    const failed = derive({ ...clean, ...flags, status: "error", id, errorText: copyParam("blogPost.errorText", "This post could not load.") });
+    if (version !== loadVersion) return undefined;
+    if (readAccessDenied(error)) return failed;
+    const access = await readAccess();
+    const cached = await cachedPostState(clean, id);
+    try { await assertReadAccess(access); }
+    catch { return version === loadVersion ? failed : undefined; }
+    return version === loadVersion ? cached : undefined;
   }
 }
 
 const svc = defineService<S, {
-  load: (s: S, arg?: unknown) => Promise<S>;
-  retry: (s: S) => Promise<S>;
+  prepare: (s: S) => S;
+  load: (s: S, arg?: unknown) => Promise<S | undefined>;
+  retry: (s: S) => Promise<S | undefined>;
   like: (s: S) => Promise<S>;
   unlike: (s: S) => Promise<S>;
   toggleSave: (s: S) => S;
@@ -338,7 +355,12 @@ const svc = defineService<S, {
 }>("himiBlogPost", {
   state: baseState,
   actions: {
-    load: (s, arg) => { stashCopy(arg); return loadPostState(s); },
+    prepare: (s) => ({ ...s, ...baseState }),
+    load: (s, arg) => {
+      stashCopy(arg);
+      const target = (arg as { signInScreenId?: unknown })?.signInScreenId;
+      return loadPostState({ ...s, signInScreenId: target === "himi_sign_in" ? target : s.signInScreenId });
+    },
     retry: (s) => loadPostState({ ...s, status: "loading", errorText: "" }),
     like: async (s) => {
       if (!s.id) return derive({ ...s, actionMessage: copyParam("blogPost.noPostMessage", "No post selected.") });
@@ -409,5 +431,6 @@ const svc = defineService<S, {
   },
 });
 
+svc.prepare();
 svc.load();
 export { svc };

package/templates/retail-store/tier5-src/himi-branded-lite-home/index.ts

@@ -1,3 +1,5 @@
+import { descriptionBody } from "../_shared/rich-body.js";
+import { programDescription } from "../_shared/program-description.js";
 import { fetchMemberBookings, type MemberBookingRow } from "../_shared/member-bookings.js";
 import { hostSiteFromInput, hostedExploreCards, hostedHiddenFlags, type HostedExploreCard } from "../_shared/branded-lite-hosted.js";
 import { memberAccess, assertMemberAccess } from "../_shared/member-access.js";
@@ -675,11 +677,9 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
       .map((p: WixProgram) => {
         const desc = (p as { description?: unknown }).description;
         const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
-        const nestedDetails = desc && typeof desc === "object" ? (desc as { details?: string }).details : undefined;
         const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
         const image = programImage(p);
-        const details = (p.settings?.description ?? nestedDetails ?? (typeof desc === "string" ? desc : "") ?? "")
-          .replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim();
+        const details = descriptionBody(programDescription(p)).bodyText.replace(/\s+/g, " ").trim();
         return {
           id: p.id || name,
           name,

package/templates/retail-store/tier5-src/himi-store-product/index.ts

@@ -19,7 +19,7 @@ import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
 import { isProductSaved, toggleSavedProduct } from "../_shared/himi-store-saved.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
-import { richBody } from "../_shared/rich-body.js";
+import { descriptionBody } from "../_shared/rich-body.js";
 
 /** Live cart size (sum of line-item quantities) for the top-bar cart badge.
  *  Best-effort: a cart error just yields 0 (badge hidden), never fails the screen. */
@@ -74,9 +74,7 @@ function productPolicyBody(product: StoreProduct, kind: "returns" | "shipping"):
   });
   if (!section) return "";
   const html = "plainDescription" in section ? section.plainDescription : undefined;
-  if (html) return plainText(html.replace(/ /gi, " "));
-  if (typeof section.description === "string") return plainText(section.description.replace(/ /gi, " "));
-  return richBody(section.description).bodyText;
+  return descriptionBody(html || section.description).bodyText;
 }
 
 /** The product id `lastProduct` was read for. A pooled screen re-appearing calls
@@ -140,13 +138,12 @@ function optionsHint(groups: StoreOption[], selection: StoreOptionSelection): st
   return copyTemplate("product.optionsChoose", "Choose {options}", { options: missing.join(", ") });
 }
 
-/** The description pair. V3's `description` is a Ricos OBJECT (the HTML `plainText` would throw on it): it
- *  becomes the RichContent document, and `plainDescription` (or the document's own text) the plain copy. A V1
- *  `description` is an HTML string: stripped text, no document. */
+/** Catalog V3 returns Ricos objects or serialized documents; V1 returns HTML.
+ * Keep plainDescription as the independent fallback, never raw document JSON. */
 function productBody(p: StoreProduct): { description: string; descriptionJson: string } {
   const raw = (p as { description?: unknown }).description;
-  const html = plainText(p.plainDescription || (typeof raw === "string" ? raw : ""));
-  const { bodyJson, bodyText } = richBody(typeof raw === "string" ? null : raw, html);
+  const html = descriptionBody(p.plainDescription).bodyText;
+  const { bodyJson, bodyText } = descriptionBody(raw, html);
   return { description: html || bodyText, descriptionJson: bodyJson };
 }
 

package/templates/retail-store-owner/config.ts

@@ -37,7 +37,7 @@ export default defineApp({
     actions: "http://localhost:8190/v1/actions",
     sync: "http://localhost:8190/v1/sync",
   },
-  capabilities: ["live_activity","push","share","secure_storage","open_url","local_database","clipboard","ui","speech","camera","photos","file_picker","files","presigned_upload","app_info","biometrics","wix_platform","animation"],
+  capabilities: ["live_activity","push","share","secure_storage","open_url","local_database","clipboard","ui","speech","camera","photos","file_picker","files","presigned_upload","app_info","biometrics","wix_platform","stream","wix_api"],
   designTokensPath: "./tokens.json",
   // Native fallback; the T5 splash descriptor owns the editable launch appearance.
   splash: {

package/templates/yoga-studio/config.ts

@@ -37,7 +37,7 @@ export default defineApp({
     actions: "http://localhost:8190/v1/actions",
     sync: "http://localhost:8190/v1/sync",
   },
-  capabilities: ["live_activity","push","share","secure_storage","open_url","calendar","local_database","wix_api","wix_platform","app_info","iap","release_control","clipboard","theme"],
+  capabilities: ["push","share","secure_storage","open_url","calendar","local_database","wix_api","wix_platform","app_info","iap","release_control","clipboard","theme","wix_cashier"],
   cache: {
     "rules": [
       {
@@ -81,6 +81,13 @@ export default defineApp({
         "parentScreenId": "himi_account",
         "tabId": "profile"
       },
+      {
+        "screenId": "himi_business_contact",
+        "isPublic": true,
+        "paramKeys": [],
+        "parentScreenId": "himi_account",
+        "tabId": "profile"
+      },
       {
         "screenId": "himi_appearance",
         "isPublic": true,

package/templates/yoga-studio/dev/index.ts

@@ -6581,6 +6581,219 @@ const SCREENS = runtimeSetting({
       "bundleVersion": "0.0.1"
     }
   },
+  "himi_business_contact": {
+    "screenId": "himi_business_contact",
+    "title": "Business contact",
+    "renderer": "sdui_intent",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "payload": {
+      "id": "himi_business_contact.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 16,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "himi_business_contact.section",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 12,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "himi_business_contact.section.directions_copy",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Directions",
+                          "style": "body",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hidden": true
+                      }
+                    },
+                    {
+                      "id": "himi_business_contact.section.unavailable",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Contact details unavailable",
+                          "style": "body",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_business_contact.section.member_count",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "FragmentSlot",
+                        "props": {
+                          "casePath": "$service:businessContact.memberCountCase",
+                          "defaultCase": "unavailable",
+                          "cases": [
+                            {
+                              "id": "one",
+                              "content": {
+                                "id": "himi_business_contact.section.members_one",
+                                "body": {
+                                  "package": "himalaya",
+                                  "type": "HStack",
+                                  "props": {
+                                    "spacing": 4,
+                                    "alignment": "center",
+                                    "children": [
+                                      {
+                                        "id": "himi_business_contact.section.count_one",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "Text",
+                                          "props": {
+                                            "text": "$service:businessContact.memberCount",
+                                            "style": "footnote",
+                                            "collapseWhenEmpty": true
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "id": "himi_business_contact.section.unit_one",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "Text",
+                                          "props": {
+                                            "text": "member",
+                                            "style": "footnote",
+                                            "collapseWhenEmpty": true
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "other",
+                              "content": {
+                                "id": "himi_business_contact.section.members_other",
+                                "body": {
+                                  "package": "himalaya",
+                                  "type": "HStack",
+                                  "props": {
+                                    "spacing": 4,
+                                    "alignment": "center",
+                                    "children": [
+                                      {
+                                        "id": "himi_business_contact.section.count_other",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "Text",
+                                          "props": {
+                                            "text": "$service:businessContact.memberCount",
+                                            "style": "footnote",
+                                            "collapseWhenEmpty": true
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "id": "himi_business_contact.section.unit_other",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "Text",
+                                          "props": {
+                                            "text": "members",
+                                            "style": "footnote",
+                                            "collapseWhenEmpty": true
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "unavailable",
+                              "content": {
+                                "id": "himi_business_contact.section.members_unavailable",
+                                "body": {
+                                  "package": "himalaya",
+                                  "type": "Text",
+                                  "props": {
+                                    "text": "Member count unavailable",
+                                    "style": "footnote",
+                                    "collapseWhenEmpty": true
+                                  }
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hidden": true
+                      }
+                    },
+                    {
+                      "id": "himi_business_contact.section.feedback",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:businessContact.message",
+                          "style": "footnote",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "padding": {
+          "leading": 20,
+          "trailing": 20,
+          "top": 18,
+          "bottom": 28
+        },
+        "onAppear": {
+          "actionId": "tier5.businessContact.load",
+          "args": {
+            "showMemberCount": false
+          }
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/business-contact?integrity=",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "open_url"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
   "himi_appearance": {
     "screenId": "himi_appearance",
     "renderer": "sdui_intent",
@@ -23360,6 +23573,9 @@ const SCREENS = runtimeSetting({
                           "style": "body",
                           "color": "textSecondary"
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiMyEvents.signInRequired"
                       }
                     },
                     {
@@ -23374,6 +23590,32 @@ const SCREENS = runtimeSetting({
                             "actionId": "tier5.himiMyEvents.load"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiMyEvents.signInRequired"
+                      }
+                    },
+                    {
+                      "id": "himi_my_events.retry.sign_in",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiMyEvents.noSignIn"
                       }
                     }
                   ]
@@ -23804,7 +24046,11 @@ const SCREENS = runtimeSetting({
           "bottom": 24
         },
         "onAppear": {
-          "actionId": "tier5.himiMyEvents.load"
+          "actionId": "tier5.himiMyEvents.load",
+          "params": {
+            "signInScreenId": "himi_sign_in",
+            "memberOnly": "1"
+          }
         }
       }
     },
@@ -32546,6 +32792,31 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "hiddenPath": "$service:himiBrandedProgram.hidePriceRetry"
                       }
                     },
+                    {
+                      "id": "himi_program.description_rich",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:himiBrandedProgram.descriptionJson",
+                          "onLink": {
+                            "actionId": "tier5.himiBrandedProgram.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiBrandedProgram.description",
+                                "style": "body",
+                                "color": "textSecondary"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -32557,6 +32828,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "color": "textSecondary",
                           "collapseWhenEmpty": true
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.hasDescriptionJson"
                       }
                     }
                   ]
@@ -36352,6 +36626,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "style": "body",
                           "color": "textSecondary"
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBlogPost.signInRequired"
                       }
                     },
                     {
@@ -36366,6 +36643,32 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "actionId": "tier5.himiBlogPost.retry"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBlogPost.signInRequired"
+                      }
+                    },
+                    {
+                      "id": "himi_blog_post.retry.sign_in",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBlogPost.noSignIn"
                       }
                     }
                   ]
@@ -37070,7 +37373,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
         "onAppear": {
           "actionId": "tier5.himiBlogPost.load",
           "params": {
-            "id": "__HIMI_ID__"
+            "id": "__HIMI_ID__",
+            "signInScreenId": "himi_sign_in"
           }
         }
       }

package/templates/yoga-studio/himalaya.content.json

@@ -34,6 +34,9 @@
     "himi_branded_splash": {
       "displayName": "Splash"
     },
+    "himi_business_contact": {
+      "displayName": "Business contact"
+    },
     "himi_create_post": {
       "displayName": "Create Post"
     },

package/templates/yoga-studio/tier5-src/_shared/member-read.ts

@@ -0,0 +1,52 @@
+import { memberAccess, memberAccessChanged, memberAccessDenied, type MemberAccess } from "./member-access.js";
+import { needsSignIn } from "./branded-load-state.js";
+
+/** Public reads stay public. Capture their reader only to reject a result that
+ * belongs to the identity/site which was active before the request. */
+export interface ReadAccess { member: MemberAccess; tenant: string; }
+export async function readAccess(): Promise<ReadAccess> {
+  const member = await memberAccess();
+  const input = (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input;
+  return { member, tenant: JSON.stringify([input?.__himiPreferenceAccount ?? "", input?.__himiPreferenceBusiness ?? ""]) };
+}
+
+export async function assertReadAccess(access: ReadAccess): Promise<void> {
+  const current = await readAccess();
+  if (current.member.email !== access.member.email || current.member.scope !== access.member.scope || current.tenant !== access.tenant) throw memberAccessChanged();
+}
+
+/** Bridge errors put the actual status first; codes quoted inside the body are data. */
+function httpStatus(error: unknown): string | undefined {
+  return /^HTTP\s*(\d{3})\b/i.exec(String((error as { message?: unknown })?.message ?? error))?.[1];
+}
+
+export const NO_READ_SIGN_IN = { signInRequired: false, noSignIn: true };
+
+/** An authorization refusal must not fall back to a previously cached article. */
+export function readAccessDenied(error: unknown): boolean {
+  let cause = error;
+  for (let depth = 0; cause && depth < 4; depth++) {
+    const status = httpStatus(cause);
+    if (status ? status === "401" || status === "403" : memberAccessDenied(cause) || needsSignIn(cause)) return true;
+    cause = (cause as { cause?: unknown }).cause;
+  }
+  return false;
+}
+
+/** A permission failure alone says nothing about whether signing in can help.
+ * In particular, a private member profile can be unavailable to members too.
+ * Only an authentication refusal for a current visitor offers Sign in. Follow
+ * SDK wrapper causes (blog getPost preserves its original read error there). */
+export async function readSignInFlags(error: unknown): Promise<typeof NO_READ_SIGN_IN> {
+  let authenticationRequired = false;
+  let permissionRefused = false;
+  let cause = error;
+  for (let depth = 0; cause && depth < 4; depth++) {
+    const status = httpStatus(cause);
+    permissionRefused ||= status === "403";
+    authenticationRequired ||= status ? status === "401" : needsSignIn(cause);
+    cause = (cause as { cause?: unknown }).cause;
+  }
+  const signInRequired = !permissionRefused && authenticationRequired && !(await memberAccess()).email;
+  return { signInRequired, noSignIn: !signInRequired };
+}