@arcblock/did-connect-service 4.1.41 → 4.1.43

package/dist/_generated/asset-manifest.js

@@ -6,7 +6,7 @@ export default {
   "header.js": "header.8703ab26.js",
   "login.css": "login.fa75e481.css",
   "design.css": "design.99dc4ddc.css",
-  "admin.css": "admin.ab0009f2.css",
+  "admin.css": "admin.d99b416e.css",
   "admin-core.js": "admin-core.d42d34ce.js",
-  "admin-extra.js": "admin-extra.c7a0720f.js"
+  "admin-extra.js": "admin-extra.da2c9785.js"
 };

package/dist/app-identity.d.ts

@@ -8,15 +8,20 @@
  * OG text), `BlockletJsHandler` (`__blocklet__.js`), the login page, the homepage and
  * the access-key page name.
  *
- * Layers, highest first (no new layer is introduced here — this is convergence only):
+ * Layers, highest first:
  *
  *   name         instance app:branding.name → instance legacy app:name → package name
  *                → deployment name → built-in default
  *   description  instance app:branding.description (any string, "" included)
  *                → package description → absent
  *   icon         instance app:branding.icon
- *   logos        instance app:logos.<type> (R2 key)
- *   theme        instance app:theme, deep-merged over the built-in palettes
+ *   logos        instance app:logos.<slot> (R2 key) → package logo (square slot, `v` only;
+ *                every type whose fallback chain reaches `square` follows it)
+ *                → fallback-scope app:logos.<slot>
+ *   theme        instance app:theme → package palette → fallback-scope app:theme → default;
+ *                each deep-merged over the built-in palettes by formatThemeForOutput
+ *   passportColor instance app:branding.passportColor → package passportColor
+ *                → fallback-scope app:branding.passportColor → absent
  *
  * connect-service never reads the app package itself (arc#7073 red line 1): the
  * package layer only ever arrives as host-supplied {@link PackageBranding}, and it is
@@ -35,9 +40,26 @@
  * package layer. With no asserted instance (a root / control-plane request), the
  * construction rows ARE the instance's own and are labelled `"instance"`.
  *
- * Precedence note for S5: fallback-scope rows currently OUTRANK the package layer
- * (they sit where instance rows sit, only relabelled) — byte-identical to today. S5
- * must decide explicitly whether the order becomes own instance > package > fallback.
+ * ## Precedence decision (S5): own instance > package > fallback > default
+ *
+ * For the layers S5/S8 add — logos, theme, passportColor — a fallback-scope row (the
+ * deployment's root instance standing in for an app that has no row of its own) ranks
+ * BELOW the package layer. A stand-in row describes a different app; the package is the
+ * app's own declaration, so it must win (this is the arc-side lesson above). Only the
+ * app's OWN instance rows outrank the package (R3: the operator's override wins, and
+ * clearing it falls back to the package).
+ *
+ *   - Logos are resolved per slot: own slot > package slot > fallback slot. The package
+ *     fills only `square`, so a fallback `rect` / `favicon` / splash row is still used
+ *     for its own slot; variant/chain semantics on derived surfaces belong to S7.
+ *   - Theme is one unit: an own configured theme replaces the package palette entirely
+ *     (no merging of the two); a fallback theme is used only when the package has none.
+ *   - The package layer never changes output where it is absent: without a package
+ *     logo/theme/passportColor every surface is byte-identical to S4 (baseline).
+ *
+ * name / description KEEP S4's order (fallback rows > package): changing it would change
+ * existing output on configured deployments, which S5 does not do. Aligning them is a
+ * separate, explicit decision.
  *
  * ## Which layers a surface honors is the caller's input, not a flag
  *
@@ -56,10 +78,9 @@
  *     package / deployment / default layers for name and description.
  *   - The scope (which instance's rows are read) stays where it is today at each call
  *     site; see `readInstanceIdentityRows`.
- *   - Logos and theme are also taken from `inherited` for any slot the request-scope rows
- *     do not configure, so a later layer (package logos in S5, palette in S8) is added
- *     once, in the build-time identity. Today the build-time identity carries no logos or
- *     theme, so this is byte-identical.
+ *   - The package logo / palette / passportColor (S5, S8) enter once, in the build-time
+ *     identity, and reach per-request surfaces through `inherited`, ranked as described
+ *     under "Precedence decision" below.
  */
 import { type AppInfo, type PackageBranding } from "./package-branding.js";
 export type Origin = "instance" | "package" | "deployment" | "default";
@@ -128,16 +149,38 @@ export interface AppIdentity {
         value?: string;
         from: Origin;
     };
-    /** Configured slots. `key` is the R2 key for instance slots; later layers may omit it. */
+    /**
+     * Configured slots. `key` is the R2 key for instance / fallback slots. A package slot
+     * carries no key (connect-service has no package bytes) but `v`, the package logo's
+     * 16-char content fingerprint.
+     */
     logos: Partial<Record<LogoType, {
         from: Origin;
         key?: string;
+        v?: string;
     }>>;
     /** `app:logos.blurhash`, passed through as stored. */
     blurhash?: {
         value: unknown;
         from: Origin;
     };
+    /**
+     * The passport / brand color (`__blocklet__.js` passportColor, OG gradient). Instance
+     * and fallback values pass through as stored; the package value is `#rrggbb`.
+     */
+    passportColor?: {
+        value: unknown;
+        from: Origin;
+    };
+    /**
+     * The package layer (logo / palette / passportColor) as the host supplied it, carried
+     * SEPARATELY from the resolved fields above. A build-time identity may resolve a field
+     * from the instance (e.g. CF `buildHandler` reads app:branding, so its passportColor
+     * is the instance's); per-request resolution reads the package layer from here, so
+     * clearing the instance value falls back to the package rather than to the default.
+     * Absent when the package supplies none of them.
+     */
+    packageLayer?: PackageLayer;
     theme: {
         /** `formatThemeForOutput` of the stored theme (`{}` when none). */
         value: any;
@@ -151,6 +194,14 @@ export interface AppIdentity {
         from: Origin;
     };
 }
+export interface PackageLayer {
+    logo?: {
+        v: string;
+    };
+    /** `formatPackageThemeForOutput` of the package palette. */
+    theme?: any;
+    passportColor?: string;
+}
 /** A stored JSON object row, or `{}` for absent / malformed / non-object rows. */
 export declare function parseSettingObject(raw: string | null | undefined): Record<string, any>;
 export declare function resolveAppIdentity(input: AppIdentityInput): AppIdentity;
@@ -200,6 +251,27 @@ export declare function resolveLogoSlot(identity: AppIdentity, type: string): {
     from: Origin;
     key?: string;
 } | null;
+/**
+ * Whether a derived surface (`__blocklet__.js`) advertises `type`'s own URL (did#248).
+ *
+ * On when `type`'s fallback chain resolves to a slot that is either `type` itself
+ * (configured on the instance / fallback scope, or the package's `square`), or the
+ * package logo reached through the chain — arc serves the package bytes on every path
+ * whose chain reaches it (arc#7077). A D1 slot reached only THROUGH the chain does not
+ * turn a variant on: that is today's output for D1-configured apps, locked by the S1
+ * baseline (`logoSquare` combo), and this rule leaves it unchanged. Splash / og-image
+ * chains never reach `square`, so a package-only app leaves them off.
+ */
+export declare function advertisesLogoSlot(identity: AppIdentity, type: string): boolean;
+/**
+ * The 16-char content fingerprint of a resolved logo slot: the R2 key's last segment
+ * truncated to 16 (an instance / fallback upload), else the package logo's `v` (already
+ * 16 chars, arc#7073 red line 4). One length, one lineage — OG cache keys use it.
+ */
+export declare function logoFingerprint(entry: {
+    key?: string;
+    v?: string;
+} | undefined): string | undefined;
 /** `resolveAppInfo`'s historical signature, now a view over {@link resolveAppIdentity}. */
 export declare function resolveAppInfo(params: {
     brandingRaw: string | null;

package/dist/app-identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-identity.d.ts","sourceRoot":"","sources":["../src/app-identity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-identity.d.ts","sourceRoot":"","sources":["../src/app-identity.ts"],"names":[],"mappings":"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"}

package/dist/app-identity.js

@@ -8,15 +8,20 @@
  * OG text), `BlockletJsHandler` (`__blocklet__.js`), the login page, the homepage and
  * the access-key page name.
  *
- * Layers, highest first (no new layer is introduced here — this is convergence only):
+ * Layers, highest first:
  *
  *   name         instance app:branding.name → instance legacy app:name → package name
  *                → deployment name → built-in default
  *   description  instance app:branding.description (any string, "" included)
  *                → package description → absent
  *   icon         instance app:branding.icon
- *   logos        instance app:logos.<type> (R2 key)
- *   theme        instance app:theme, deep-merged over the built-in palettes
+ *   logos        instance app:logos.<slot> (R2 key) → package logo (square slot, `v` only;
+ *                every type whose fallback chain reaches `square` follows it)
+ *                → fallback-scope app:logos.<slot>
+ *   theme        instance app:theme → package palette → fallback-scope app:theme → default;
+ *                each deep-merged over the built-in palettes by formatThemeForOutput
+ *   passportColor instance app:branding.passportColor → package passportColor
+ *                → fallback-scope app:branding.passportColor → absent
  *
  * connect-service never reads the app package itself (arc#7073 red line 1): the
  * package layer only ever arrives as host-supplied {@link PackageBranding}, and it is
@@ -35,9 +40,26 @@
  * package layer. With no asserted instance (a root / control-plane request), the
  * construction rows ARE the instance's own and are labelled `"instance"`.
  *
- * Precedence note for S5: fallback-scope rows currently OUTRANK the package layer
- * (they sit where instance rows sit, only relabelled) — byte-identical to today. S5
- * must decide explicitly whether the order becomes own instance > package > fallback.
+ * ## Precedence decision (S5): own instance > package > fallback > default
+ *
+ * For the layers S5/S8 add — logos, theme, passportColor — a fallback-scope row (the
+ * deployment's root instance standing in for an app that has no row of its own) ranks
+ * BELOW the package layer. A stand-in row describes a different app; the package is the
+ * app's own declaration, so it must win (this is the arc-side lesson above). Only the
+ * app's OWN instance rows outrank the package (R3: the operator's override wins, and
+ * clearing it falls back to the package).
+ *
+ *   - Logos are resolved per slot: own slot > package slot > fallback slot. The package
+ *     fills only `square`, so a fallback `rect` / `favicon` / splash row is still used
+ *     for its own slot; variant/chain semantics on derived surfaces belong to S7.
+ *   - Theme is one unit: an own configured theme replaces the package palette entirely
+ *     (no merging of the two); a fallback theme is used only when the package has none.
+ *   - The package layer never changes output where it is absent: without a package
+ *     logo/theme/passportColor every surface is byte-identical to S4 (baseline).
+ *
+ * name / description KEEP S4's order (fallback rows > package): changing it would change
+ * existing output on configured deployments, which S5 does not do. Aligning them is a
+ * separate, explicit decision.
  *
  * ## Which layers a surface honors is the caller's input, not a flag
  *
@@ -56,13 +78,12 @@
  *     package / deployment / default layers for name and description.
  *   - The scope (which instance's rows are read) stays where it is today at each call
  *     site; see `readInstanceIdentityRows`.
- *   - Logos and theme are also taken from `inherited` for any slot the request-scope rows
- *     do not configure, so a later layer (package logos in S5, palette in S8) is added
- *     once, in the build-time identity. Today the build-time identity carries no logos or
- *     theme, so this is byte-identical.
+ *   - The package logo / palette / passportColor (S5, S8) enter once, in the build-time
+ *     identity, and reach per-request surfaces through `inherited`, ranked as described
+ *     under "Precedence decision" below.
  */
 import { packageBrandingCacheToken, sanitizePackageBranding, } from "./package-branding.js";
-import { formatThemeForOutput } from "./theme-utils.js";
+import { formatPackageThemeForOutput, formatThemeForOutput } from "./theme-utils.js";
 /** Logo slots (`app:logos.<type>` = R2 key on the instance layer). */
 export const LOGO_TYPES = [
     "square",
@@ -86,6 +107,16 @@ export const IDENTITY_SETTING_KEYS = {
     logos: "app:logos",
     theme: "app:theme",
 };
+function packageLayerOf(branding) {
+    if (!branding)
+        return undefined;
+    const layer = {
+        ...(branding.logo ? { logo: { v: branding.logo.v } } : {}),
+        ...(branding.theme ? { theme: formatPackageThemeForOutput(branding.theme) } : {}),
+        ...(branding.passportColor ? { passportColor: branding.passportColor } : {}),
+    };
+    return Object.keys(layer).length > 0 ? layer : undefined;
+}
 // ─── Parsing ──────────────────────────────────────────────────────────────
 function parseJson(raw) {
     if (!raw)
@@ -140,6 +171,9 @@ export function resolveAppIdentity(input) {
     const instanceFrom = rows.scope === "fallback" ? "deployment" : "instance";
     const inherited = input.inherited;
     const packageBranding = inherited ? undefined : sanitizePackageBranding(input.packageBranding);
+    const isFallback = rows.scope === "fallback";
+    // The package layer: from the host's branding, or carried by the inherited identity.
+    const pkg = inherited ? inherited.packageLayer : packageLayerOf(packageBranding);
     const branding = parseSettingObject(rows.branding);
     const logosRow = parseSettingObject(rows.logos);
     // name
@@ -177,12 +211,18 @@ export function resolveAppIdentity(input) {
         : inherited
             ? { ...inherited.icon }
             : { from: "default" };
-    // logos
+    // logos — per slot: own instance > package > fallback row > inherited
+    const packageSlot = (type) => type === "square" && pkg?.logo ? { from: "package", v: pkg.logo.v } : undefined;
     const logos = {};
     for (const type of LOGO_TYPES) {
         const key = nonEmptyString(logosRow[type]);
-        if (key !== undefined)
-            logos[type] = { from: instanceFrom, key };
+        const fromPackage = packageSlot(type);
+        if (key !== undefined && !isFallback)
+            logos[type] = { from: "instance", key };
+        else if (fromPackage)
+            logos[type] = fromPackage;
+        else if (key !== undefined)
+            logos[type] = { from: "deployment", key };
         else if (inherited?.logos[type])
             logos[type] = { ...inherited.logos[type] };
     }
@@ -204,12 +244,33 @@ export function resolveAppIdentity(input) {
         ...(themeObject && declaredPrefer(themeObject) !== undefined ? { prefer: declaredPrefer(themeObject) } : {}),
         from: themeObject && themeIsConfigured(themeObject) ? instanceFrom : "default",
     };
-    // An inherited NON-default theme (a later layer) fills in when the request-scope row
-    // configures none. A default inherited theme never replaces the computed one, so
-    // bytes stay exactly what the row alone produces today.
-    const theme = ownTheme.from === "default" && inherited && inherited.theme.from !== "default"
-        ? { ...inherited.theme }
-        : ownTheme;
+    // Package palette (formatPackageThemeForOutput: completed from the defaults, with the
+    // derived shades of overridden groups left for MUI to compute).
+    const packageTheme = pkg?.theme ? { value: pkg.theme, from: "package" } : undefined;
+    // own instance > package > fallback row > inherited non-default > default. A default
+    // inherited theme never replaces the computed one, so without a package layer the
+    // bytes stay exactly what the row alone produces (S4).
+    let theme;
+    if (ownTheme.from === "instance")
+        theme = ownTheme;
+    else if (packageTheme)
+        theme = packageTheme;
+    else if (ownTheme.from === "deployment")
+        theme = ownTheme;
+    else if (inherited && inherited.theme.from !== "default")
+        theme = { ...inherited.theme };
+    else
+        theme = ownTheme;
+    // passportColor — own instance > package > fallback row. Nothing but the package
+    // layer is taken from `inherited`: a build-time instance value would be a stale copy
+    // of the row this request re-reads.
+    const rowPassportColor = branding.passportColor || undefined;
+    const packagePassportColor = pkg?.passportColor
+        ? { value: pkg.passportColor, from: "package" }
+        : undefined;
+    const passportColor = rowPassportColor !== undefined && !isFallback
+        ? { value: rowPassportColor, from: "instance" }
+        : packagePassportColor ?? (rowPassportColor !== undefined ? { value: rowPassportColor, from: "deployment" } : undefined);
     const etag = fingerprint([
         rows.branding ?? null,
         rows.legacyName ?? null,
@@ -228,6 +289,8 @@ export function resolveAppIdentity(input) {
         icon,
         logos,
         ...(blurhash ? { blurhash } : {}),
+        ...(passportColor ? { passportColor } : {}),
+        ...(pkg ? { packageLayer: pkg } : {}),
         theme,
     };
 }
@@ -332,6 +395,31 @@ export function resolveLogoSlot(identity, type) {
     }
     return null;
 }
+/**
+ * Whether a derived surface (`__blocklet__.js`) advertises `type`'s own URL (did#248).
+ *
+ * On when `type`'s fallback chain resolves to a slot that is either `type` itself
+ * (configured on the instance / fallback scope, or the package's `square`), or the
+ * package logo reached through the chain — arc serves the package bytes on every path
+ * whose chain reaches it (arc#7077). A D1 slot reached only THROUGH the chain does not
+ * turn a variant on: that is today's output for D1-configured apps, locked by the S1
+ * baseline (`logoSquare` combo), and this rule leaves it unchanged. Splash / og-image
+ * chains never reach `square`, so a package-only app leaves them off.
+ */
+export function advertisesLogoSlot(identity, type) {
+    const hit = resolveLogoSlot(identity, type);
+    return hit !== null && (hit.slot === type || hit.from === "package");
+}
+/**
+ * The 16-char content fingerprint of a resolved logo slot: the R2 key's last segment
+ * truncated to 16 (an instance / fallback upload), else the package logo's `v` (already
+ * 16 chars, arc#7073 red line 4). One length, one lineage — OG cache keys use it.
+ */
+export function logoFingerprint(entry) {
+    if (entry?.key)
+        return entry.key.split("/").pop()?.slice(0, 16);
+    return entry?.v;
+}
 /** `resolveAppInfo`'s historical signature, now a view over {@link resolveAppIdentity}. */
 export function resolveAppInfo(params) {
     return toAppInfo(resolveAppIdentity({

package/dist/app-identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-identity.js","sourceRoot":"","sources":["../src/app-identity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-identity.js","sourceRoot":"","sources":["../src/app-identity.ts"],"names":[],"mappings":"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"}