@cmssy/core 10.2.0 → 10.3.0

package/dist/internal.cjs

@@ -819,14 +819,6 @@ function localizedPath(slug, locale, defaultLocale) {
 }
 
 // src/block-context.ts
-function blockPageOf(page) {
-  if (!page?.slug) return void 0;
-  return {
-    id: page.id,
-    slug: page.slug,
-    pageType: page.pageType ?? null
-  };
-}
 function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, forms, extra) {
   return {
     locale: {
@@ -838,7 +830,18 @@ function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, for
     forms,
     ...extra?.auth ? { auth: extra.auth } : {},
     ...extra?.workspace ? { workspace: extra.workspace } : {},
-    ...extra?.page ? { page: extra.page } : {}
+    // Identity only, and only when the page has one. A page fetched by an older
+    // SDK has no slug, and then a block gets no `page` at all rather than one
+    // with a hole in it: "I don't know where I am" has to stay distinguishable
+    // from "I am at /".
+    ...extra?.page?.slug ? {
+      page: {
+        id: extra.page.id,
+        slug: extra.page.slug,
+        pageType: extra.page.pageType ?? null
+      }
+    } : {},
+    ...extra?.app ? { app: extra.app } : {}
   };
 }
 
@@ -945,7 +948,6 @@ exports.RECORDS_BY_IDS_QUERY = RECORDS_BY_IDS_QUERY;
 exports.SITE_CONFIG_QUERY = SITE_CONFIG_QUERY;
 exports.SUBMIT_FORM_MUTATION = SUBMIT_FORM_MUTATION;
 exports.asBucket = asBucket;
-exports.blockPageOf = blockPageOf;
 exports.buildBlockContext = buildBlockContext;
 exports.buildLocaleSwitchHref = buildLocaleSwitchHref;
 exports.cachedWorkspaceId = cachedWorkspaceId;

package/dist/internal.d.cts

@@ -1,5 +1,5 @@
 export { f as fetchLayouts, c as fetchPage, d as fetchPageById, e as fetchPageMeta, g as fetchPages, n as normalizeSlug, r as resolveApiUrl, h as resolvePublicUrl } from './content-client-D0EdiqbQ.cjs';
-import { CmssyPageData, CmssyBlockPage, CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
+import { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
 import { G as GraphqlRequestOptions } from './locale-rhYcXU5z.cjs';
 export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from './locale-rhYcXU5z.cjs';
@@ -13,14 +13,6 @@ declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: Stri
 declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  public {\n    form {\n      get(formId: $formId) {\n        id\n        name\n        slug\n        description\n        fields {\n          id name fieldType label placeholder helpText\n          defaultValue width order showWhen requiredWhen\n          options { value label disabled }\n          validation { required minLength maxLength minValue maxValue pattern customMessage }\n        }\n        settings {\n          actionType submitButtonLabel successMessage errorMessage\n          redirectUrl requireLogin enableCaptcha\n        }\n      }\n    }\n  }\n}";
 declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  public {\n    form {\n      submit(formId: $formId, input: $input) {\n        success message submissionId redirectUrl accessToken customer\n      }\n    }\n  }\n}";
 
-/**
- * The identity half of a fetched page, for `context.page`.
- *
- * A page fetched by an older SDK - or by a consumer that builds `CmssyPageData`
- * itself - has no slug, and then a block gets no `page` at all rather than one
- * with a hole in it: `context.page ? … : …` is a question a block can answer.
- */
-declare function blockPageOf(page: CmssyPageData | null | undefined): CmssyBlockPage | undefined;
 declare function buildBlockContext(locale: string, defaultLocale: string, enabledLocales?: string[], isPreview?: boolean, forms?: Record<string, CmssyFormDefinition>, extra?: BuildBlockContextExtra): CmssyBlockContext;
 
 declare function getBlockContentForLanguage(content: unknown, locale: string, defaultLocale?: string, availableLocales?: string[]): Record<string, unknown>;
@@ -70,4 +62,4 @@ declare function resolveRelationContent(config: CmssyClientConfig, entries: Rela
 
 declare function cmssySecretsMatch(a: string, b: string): Promise<boolean>;
 
-export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, blockPageOf, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };
+export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };

package/dist/internal.d.ts

@@ -1,5 +1,5 @@
 export { f as fetchLayouts, c as fetchPage, d as fetchPageById, e as fetchPageMeta, g as fetchPages, n as normalizeSlug, r as resolveApiUrl, h as resolvePublicUrl } from './content-client-D0EdiqbQ.js';
-import { CmssyPageData, CmssyBlockPage, CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
+import { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
 import { G as GraphqlRequestOptions } from './locale-XintNd0n.js';
 export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from './locale-XintNd0n.js';
@@ -13,14 +13,6 @@ declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: Stri
 declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  public {\n    form {\n      get(formId: $formId) {\n        id\n        name\n        slug\n        description\n        fields {\n          id name fieldType label placeholder helpText\n          defaultValue width order showWhen requiredWhen\n          options { value label disabled }\n          validation { required minLength maxLength minValue maxValue pattern customMessage }\n        }\n        settings {\n          actionType submitButtonLabel successMessage errorMessage\n          redirectUrl requireLogin enableCaptcha\n        }\n      }\n    }\n  }\n}";
 declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  public {\n    form {\n      submit(formId: $formId, input: $input) {\n        success message submissionId redirectUrl accessToken customer\n      }\n    }\n  }\n}";
 
-/**
- * The identity half of a fetched page, for `context.page`.
- *
- * A page fetched by an older SDK - or by a consumer that builds `CmssyPageData`
- * itself - has no slug, and then a block gets no `page` at all rather than one
- * with a hole in it: `context.page ? … : …` is a question a block can answer.
- */
-declare function blockPageOf(page: CmssyPageData | null | undefined): CmssyBlockPage | undefined;
 declare function buildBlockContext(locale: string, defaultLocale: string, enabledLocales?: string[], isPreview?: boolean, forms?: Record<string, CmssyFormDefinition>, extra?: BuildBlockContextExtra): CmssyBlockContext;
 
 declare function getBlockContentForLanguage(content: unknown, locale: string, defaultLocale?: string, availableLocales?: string[]): Record<string, unknown>;
@@ -70,4 +62,4 @@ declare function resolveRelationContent(config: CmssyClientConfig, entries: Rela
 
 declare function cmssySecretsMatch(a: string, b: string): Promise<boolean>;
 
-export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, blockPageOf, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };
+export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };

package/dist/internal.js

@@ -817,14 +817,6 @@ function localizedPath(slug, locale, defaultLocale) {
 }
 
 // src/block-context.ts
-function blockPageOf(page) {
-  if (!page?.slug) return void 0;
-  return {
-    id: page.id,
-    slug: page.slug,
-    pageType: page.pageType ?? null
-  };
-}
 function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, forms, extra) {
   return {
     locale: {
@@ -836,7 +828,18 @@ function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, for
     forms,
     ...extra?.auth ? { auth: extra.auth } : {},
     ...extra?.workspace ? { workspace: extra.workspace } : {},
-    ...extra?.page ? { page: extra.page } : {}
+    // Identity only, and only when the page has one. A page fetched by an older
+    // SDK has no slug, and then a block gets no `page` at all rather than one
+    // with a hole in it: "I don't know where I am" has to stay distinguishable
+    // from "I am at /".
+    ...extra?.page?.slug ? {
+      page: {
+        id: extra.page.id,
+        slug: extra.page.slug,
+        pageType: extra.page.pageType ?? null
+      }
+    } : {},
+    ...extra?.app ? { app: extra.app } : {}
   };
 }
 
@@ -935,4 +938,4 @@ function cmssyCspHeaders(options) {
   };
 }
 
-export { CMSSY_LOCALE_HEADER, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, blockPageOf, buildBlockContext, buildLocaleSwitchHref, cachedWorkspaceId, clearWorkspaceIdCache, cmssyCspHeaders, cmssySecretsMatch, collectFormIds, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, getBlockContentForLanguage, isDevelopment, localeForPath, localeForPathname, localesFromSiteConfig, localizeHref, localizeHtmlLinks, localizedPath, normalizeRelationContent, normalizeSlug, resolveApiUrl, resolveForms, resolveInitialTarget, resolvePublicUrl, resolveRelationContent, resolveSiteLocales, resolveWorkspaceId, splitCmssyLocale, splitLocaleFromPath, toCspOrigin };
+export { CMSSY_LOCALE_HEADER, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, buildBlockContext, buildLocaleSwitchHref, cachedWorkspaceId, clearWorkspaceIdCache, cmssyCspHeaders, cmssySecretsMatch, collectFormIds, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, getBlockContentForLanguage, isDevelopment, localeForPath, localeForPathname, localesFromSiteConfig, localizeHref, localizeHtmlLinks, localizedPath, normalizeRelationContent, normalizeSlug, resolveApiUrl, resolveForms, resolveInitialTarget, resolvePublicUrl, resolveRelationContent, resolveSiteLocales, resolveWorkspaceId, splitCmssyLocale, splitLocaleFromPath, toCspOrigin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/core",
-  "version": "10.2.0",
+  "version": "10.3.0",
   "description": "Framework-agnostic cmssy gateway: GraphQL client, block/field system, editor protocol. No React, no Next.",
   "keywords": [
     "cmssy",
@@ -62,7 +62,7 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.30.0",
+    "@cmssy/types": "0.31.0",
     "jose": "^6.2.3"
   },
   "scripts": {