@cmssy/core 10.1.0 → 10.2.0

package/dist/index.d.cts

@@ -3,7 +3,7 @@ export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlReque
 export { C as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, a as FetchLikeResponse, b as FetchPageOptions, R as RetryPolicy } from './content-client-D0EdiqbQ.cjs';
 import * as _cmssy_types from '@cmssy/types';
 import { FieldOptions, TypedField, BlockPropsSchema, InferBlockContent, RelationMode, CmssyModelRecord, VerifyCmssyWebhookOptions, CmssyWebhookEvent } from '@cmssy/types';
-export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup } from '@cmssy/types';
+export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup } from '@cmssy/types';
 
 type Declared<O> = O extends {
     required: true;

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlReque
 export { C as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, a as FetchLikeResponse, b as FetchPageOptions, R as RetryPolicy } from './content-client-D0EdiqbQ.js';
 import * as _cmssy_types from '@cmssy/types';
 import { FieldOptions, TypedField, BlockPropsSchema, InferBlockContent, RelationMode, CmssyModelRecord, VerifyCmssyWebhookOptions, CmssyWebhookEvent } from '@cmssy/types';
-export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup } from '@cmssy/types';
+export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup } from '@cmssy/types';
 
 type Declared<O> = O extends {
     required: true;

package/dist/internal.cjs

@@ -120,6 +120,8 @@ var PUBLIC_PAGE_QUERY = `query PublicPage($workspaceSlug: String!, $slug: String
     page {
       get(workspaceSlug: $workspaceSlug, slug: $slug, previewSecret: $previewSecret) {
         id
+        slug
+        pageType
         blocks { id type content style advanced }
         publishedBlocks { id type content style advanced }
       }
@@ -131,6 +133,8 @@ var PUBLIC_PAGE_DEV_QUERY = `query PublicPage($workspaceSlug: String!, $slug: St
     page {
       get(workspaceSlug: $workspaceSlug, slug: $slug, previewSecret: $previewSecret, devPreview: $devPreview) {
         id
+        slug
+        pageType
         blocks { id type content style advanced }
         publishedBlocks { id type content style advanced }
       }
@@ -142,6 +146,8 @@ var PUBLIC_PAGE_BY_ID_QUERY = `query PublicPageById($workspaceSlug: String!, $pa
     page {
       getById(workspaceSlug: $workspaceSlug, pageId: $pageId) {
         id
+        slug
+        pageType
         publishedBlocks { id type content style advanced }
       }
     }
@@ -225,7 +231,12 @@ async function fetchPage(config, path, options = {}) {
   if (!page) return null;
   const draft = previewSecret !== null || devPreview;
   const blocks = (draft ? page.blocks : page.publishedBlocks) ?? [];
-  return { id: page.id, blocks };
+  return {
+    id: page.id,
+    blocks,
+    slug: page.slug ?? slug,
+    pageType: page.pageType ?? null
+  };
 }
 async function fetchPageById(config, pageId, options = {}) {
   const data = await postGraphql(
@@ -241,7 +252,12 @@ async function fetchPageById(config, pageId, options = {}) {
   );
   const page = data?.public?.page?.getById;
   if (!page) return null;
-  return { id: page.id, blocks: page.publishedBlocks ?? [] };
+  return {
+    id: page.id,
+    blocks: page.publishedBlocks ?? [],
+    ...page.slug ? { slug: page.slug } : {},
+    pageType: page.pageType ?? null
+  };
 }
 async function fetchPages(config, options = {}) {
   const data = await postGraphql(
@@ -803,6 +819,14 @@ 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: {
@@ -813,7 +837,8 @@ function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, for
     isPreview: isPreview ?? false,
     forms,
     ...extra?.auth ? { auth: extra.auth } : {},
-    ...extra?.workspace ? { workspace: extra.workspace } : {}
+    ...extra?.workspace ? { workspace: extra.workspace } : {},
+    ...extra?.page ? { page: extra.page } : {}
   };
 }
 
@@ -920,6 +945,7 @@ 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 { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
+import { CmssyPageData, CmssyBlockPage, 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,6 +13,14 @@ 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>;
@@ -62,4 +70,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, 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, blockPageOf, 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 { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
+import { CmssyPageData, CmssyBlockPage, 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,6 +13,14 @@ 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>;
@@ -62,4 +70,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, 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, blockPageOf, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };

package/dist/internal.js

@@ -118,6 +118,8 @@ var PUBLIC_PAGE_QUERY = `query PublicPage($workspaceSlug: String!, $slug: String
     page {
       get(workspaceSlug: $workspaceSlug, slug: $slug, previewSecret: $previewSecret) {
         id
+        slug
+        pageType
         blocks { id type content style advanced }
         publishedBlocks { id type content style advanced }
       }
@@ -129,6 +131,8 @@ var PUBLIC_PAGE_DEV_QUERY = `query PublicPage($workspaceSlug: String!, $slug: St
     page {
       get(workspaceSlug: $workspaceSlug, slug: $slug, previewSecret: $previewSecret, devPreview: $devPreview) {
         id
+        slug
+        pageType
         blocks { id type content style advanced }
         publishedBlocks { id type content style advanced }
       }
@@ -140,6 +144,8 @@ var PUBLIC_PAGE_BY_ID_QUERY = `query PublicPageById($workspaceSlug: String!, $pa
     page {
       getById(workspaceSlug: $workspaceSlug, pageId: $pageId) {
         id
+        slug
+        pageType
         publishedBlocks { id type content style advanced }
       }
     }
@@ -223,7 +229,12 @@ async function fetchPage(config, path, options = {}) {
   if (!page) return null;
   const draft = previewSecret !== null || devPreview;
   const blocks = (draft ? page.blocks : page.publishedBlocks) ?? [];
-  return { id: page.id, blocks };
+  return {
+    id: page.id,
+    blocks,
+    slug: page.slug ?? slug,
+    pageType: page.pageType ?? null
+  };
 }
 async function fetchPageById(config, pageId, options = {}) {
   const data = await postGraphql(
@@ -239,7 +250,12 @@ async function fetchPageById(config, pageId, options = {}) {
   );
   const page = data?.public?.page?.getById;
   if (!page) return null;
-  return { id: page.id, blocks: page.publishedBlocks ?? [] };
+  return {
+    id: page.id,
+    blocks: page.publishedBlocks ?? [],
+    ...page.slug ? { slug: page.slug } : {},
+    pageType: page.pageType ?? null
+  };
 }
 async function fetchPages(config, options = {}) {
   const data = await postGraphql(
@@ -801,6 +817,14 @@ 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: {
@@ -811,7 +835,8 @@ function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, for
     isPreview: isPreview ?? false,
     forms,
     ...extra?.auth ? { auth: extra.auth } : {},
-    ...extra?.workspace ? { workspace: extra.workspace } : {}
+    ...extra?.workspace ? { workspace: extra.workspace } : {},
+    ...extra?.page ? { page: extra.page } : {}
   };
 }
 
@@ -910,4 +935,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, 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, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/core",
-  "version": "10.1.0",
+  "version": "10.2.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.29.0",
+    "@cmssy/types": "0.30.0",
     "jose": "^6.2.3"
   },
   "scripts": {