@wix/himalaya-cli 0.1025.0 → 0.1027.0

package/templates/branded-lite/tier5-src/wix-spaces-member-detail/index.ts

@@ -12,8 +12,9 @@ import {
   isFollowingMember,
   type WixMember,
 } from "@himalaya/wix-members";
+import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S {
+interface S extends PresenceFlags {
   status: "loading" | "ready";
   id: string;
   name: string;
@@ -29,9 +30,6 @@ interface S {
   followCount: string;
 }
 
-function inputId(): string {
-  return (globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input?.id ?? "";
-}
 function name(m: WixMember): string {
   const nick = m.profile?.nickname?.trim();
   if (nick) return nick;
@@ -63,11 +61,12 @@ const svc = defineService<S, {
     following: 0,
     followLabel: "Follow",
     followCount: "0 Followers · 0 Following",
+    ...presence("loading"),
   },
   actions: {
     load: async (s) => {
-      const id = inputId();
-      if (!id) return { ...s, status: "ready" };
+      const id = detailInputId();
+      if (!id) return { ...s, status: "ready", ...presence("missing") };
       try {
         const res = await getMember(id);
         const m = ((res as unknown as { member?: WixMember }).member) ?? (res as unknown as WixMember);
@@ -102,9 +101,10 @@ const svc = defineService<S, {
           following,
           followLabel: followLabelFor(isFollowing),
           followCount: followCountFor(followers, following),
+          ...presence("found"),
         };
-      } catch {
-        return { ...s, status: "ready", id };
+      } catch (e) {
+        return { ...s, status: "ready", id, ...presenceAfterError(e) };
       }
     },
     // REAL WRITE: two-state toggle. Flips the relationship and optimistically

package/templates/branded-lite/tier5-src/wix-spaces-photo-albums/index.ts

@@ -1,15 +1,21 @@
 // Tier-5 bundle: Wix Spaces clone — Photo Albums (ON-DEVICE, site-scoped).
 // No albums API wired yet → renders the real empty state, never fabricated rows.
+// The emptyTitle/emptyBody copy is the Spaces clone's LIST screen. An app that opens
+// this for ONE album (branded-lite's gallery "Open album", which passes the album id)
+// renders its own single-album copy and gates it on `noEntity`; opened with no id at
+// all it shows the shared not-found state.
 import { defineService } from "@himalaya/state";
+import { presence, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S { status: "ready"; emptyTitle: string; emptyBody: string }
+interface S extends PresenceFlags { status: "ready"; emptyTitle: string; emptyBody: string }
 
 const svc = defineService<S, { load: (s: S) => S }>("spacesPhotoAlbums", {
   state: {
     status: "ready",
     emptyTitle: "No albums yet",
     emptyBody: "Photo albums shared on this site will appear here.",
+    ...presence("loading"),
   },
-  actions: { load: (s) => s },
+  actions: { load: (s) => ({ ...s, ...presence(detailInputId() ? "found" : "missing") }) },
 });
 export { svc };

package/templates/branded-lite/tier5-src/wix-spaces-plan-detail/index.ts

@@ -2,12 +2,10 @@
 // himalaya.input.id carries the plan id; fetched via getPlan.
 import { defineService } from "@himalaya/state";
 import { getPlan, type WixPlan } from "@himalaya/wix-pricing-plans";
+import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S { status: "loading" | "ready"; name: string; price: string; description: string; perks: string }
+interface S extends PresenceFlags { status: "loading" | "ready"; name: string; price: string; description: string; perks: string }
 
-function inputId(): string {
-  return (globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input?.id ?? "";
-}
 function priceOf(p: WixPlan): string {
   const m = p.pricing?.price as unknown as { formattedAmount?: string; amount?: string; currency?: string } | undefined;
   if (!m) return p.pricing?.freeTrialDays ? "Free trial" : "";
@@ -15,17 +13,17 @@ function priceOf(p: WixPlan): string {
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesPlanDetail", {
-  state: { status: "loading", name: "", price: "", description: "", perks: "" },
+  state: { status: "loading", name: "", price: "", description: "", perks: "", ...presence("loading") },
   actions: {
     load: async (s) => {
-      const id = inputId();
-      if (!id) return { ...s, status: "ready" };
+      const id = detailInputId();
+      if (!id) return { ...s, status: "ready", ...presence("missing") };
       try {
         const res = await getPlan(id);
         const p = ((res as unknown as { plan?: WixPlan }).plan) ?? (res as unknown as WixPlan);
         const perks = (p.perks?.values ?? []).map((v) => `• ${v}`).join("\n");
-        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: p.description || "", perks };
-      } catch { return { ...s, status: "ready" }; }
+        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: p.description || "", perks, ...presence("found") };
+      } catch (e) { return { ...s, status: "ready", ...presenceAfterError(e) }; }
     },
   },
 });

package/templates/branded-lite/tier5-src/wix-spaces-subscription-detail/index.ts

@@ -2,23 +2,23 @@
 import { defineService } from "@himalaya/state";
 import { getPlanOrder, type WixPlanOrder } from "@himalaya/wix-pricing-plans";
 import { formatDateMedium } from "../_shared/engine-intl.js";
+import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S { status: "loading" | "ready"; name: string; subtitle: string; price: string; validity: string }
+interface S extends PresenceFlags { status: "loading" | "ready"; name: string; subtitle: string; price: string; validity: string }
 
-function inputId(): string {
-  return (globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input?.id ?? "";
-}
 
+// Shown by hosts without the shared not-found state (the Spaces clone renders `subtitle`
+// directly); branded-lite hides the whole content block behind `notFound`.
 const EMPTY_DETAIL = "Open a subscription from My Subscriptions — detail needs a plan-order id.";
 const LOAD_FAILED = "This subscription could not be loaded. Try again from My Subscriptions.";
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesSubscriptionDetail", {
-  state: { status: "loading", name: "", subtitle: "", price: "", validity: "" },
+  state: { status: "loading", name: "", subtitle: "", price: "", validity: "", ...presence("loading") },
   actions: {
     load: async (s) => {
-      const id = inputId();
-      // Honest empty (not a blank chrome-only screen) when nav lost the order id.
-      if (!id) return { status: "ready", name: "", subtitle: EMPTY_DETAIL, price: "", validity: "" };
+      const id = detailInputId();
+      // No order id (a stale link, a route opened directly) → the shared not-found state.
+      if (!id) return { status: "ready", name: "", subtitle: EMPTY_DETAIL, price: "", validity: "", ...presence("missing") };
       try {
         const res = await getPlanOrder(id);
         const o = (((res as unknown as { order?: WixPlanOrder }).order) ?? (res as unknown as WixPlanOrder)) as unknown as {
@@ -29,9 +29,10 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesSubscription
         const price = o.pricing?.prices?.[0]?.price?.formattedTotal || "";
         const end = o.currentCycle?.endedDate ? `Renews ${formatDateMedium(new Date(o.currentCycle.endedDate))}` : "";
         return { status: "ready", name: o.planName || "Subscription",
-          subtitle: o.status ? o.status.charAt(0) + o.status.slice(1).toLowerCase() : "", price, validity: end };
-      } catch {
-        return { status: "ready", name: "", subtitle: LOAD_FAILED, price: "", validity: "" };
+          subtitle: o.status ? o.status.charAt(0) + o.status.slice(1).toLowerCase() : "", price, validity: end, ...presence("found") };
+      } catch (e) {
+        const flags = presenceAfterError(e);
+        return { status: "ready", name: "", subtitle: flags.notFound ? "" : LOAD_FAILED, price: "", validity: "", ...flags };
       }
     },
   },

package/templates/branded-lite/tier5-src/wix-spaces-view-profile/index.ts

@@ -3,10 +3,15 @@
 // paint the seeded "apptestercoowner" demo identity when the session is a real
 // member (or a guest — show honesty instead).
 import { defineService } from "@himalaya/state";
-import { dispatch } from "@himalaya/dispatch";
+import { memberAccess } from "../_shared/member-access.js";
 import { getMyData, displayName } from "@himalaya/wix-users";
 
-interface S { status: "loading" | "ready"; name: string; handle: string; about: string; initial: string; photo: string }
+// `needsSignIn` / `noSignIn` drive the shared member gate: a guest gets the
+// gate with a Sign in button and no placeholder profile. `profileHidden` stays true until
+// `load` has resolved a member, so a guest never glimpses the placeholder avatar while
+// the membership check is still running; `hideLoading` is false for exactly that moment,
+// so the screen shows a loading line instead of going blank.
+interface S { status: "loading" | "ready"; name: string; handle: string; about: string; initial: string; photo: string; needsSignIn: boolean; noSignIn: boolean; profileHidden: boolean; hideLoading: boolean }
 
 const EMPTY: S = {
   status: "loading",
@@ -15,18 +20,17 @@ const EMPTY: S = {
   about: "No info to display.",
   initial: "?",
   photo: "",
+  needsSignIn: false,
+  noSignIn: true,
+  profileHidden: true,
+  hideLoading: false,
 };
 
+// The SAME member check create-post and orders use (`memberAccess`: the host's
+// memberIdentity, falling back to wix-users only on hosts that predate that action), so
+// one shared gate never gives two answers in one app.
 async function sessionEmail(): Promise<string> {
-  try {
-    const identity = await dispatch("himi.wix.memberIdentity") as unknown;
-    const direct = identity as { email?: unknown } | null;
-    const wrapped = identity as { payload?: { email?: unknown } } | null;
-    const email = direct?.email ?? wrapped?.payload?.email;
-    return typeof email === "string" ? email.trim() : "";
-  } catch {
-    return "";
-  }
+  return (await memberAccess()).email;
 }
 
 function wixApi() {
@@ -37,7 +41,7 @@ function fromParts(name: string, handleRaw: string, about: string, photo = ""):
   const clean = name.trim();
   const handle = "@" + (handleRaw || clean || "member").replace(/\s+/g, "").replace(/^@+/, "").toLowerCase();
   const initial = (clean.split(/\s+/).filter(Boolean).map((w) => w[0]).join("").slice(0, 2) || "?").toUpperCase();
-  return { status: "ready", name: clean || "Member", handle, about: about || "No info to display.", initial, photo };
+  return { status: "ready", name: clean || "Member", handle, about: about || "No info to display.", initial, photo, needsSignIn: false, noSignIn: true, profileHidden: false, hideLoading: true };
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesViewProfile", {
@@ -48,11 +52,17 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesViewProfile"
       if (!email) {
         return {
           status: "ready",
+          // Kept for hosts without the shared member gate (the Spaces clone renders these
+          // fields directly); branded-lite hides the profile block behind `profileHidden`.
           name: "Sign in to view your profile",
           handle: "",
           about: "Your public profile is available after you sign in from Account.",
           initial: "?",
           photo: "",
+          needsSignIn: true,
+          noSignIn: false,
+          profileHidden: true,
+          hideLoading: true,
         };
       }
       try {