@storyblok/api-client 1.0.0-alpha.2 → 1.0.0-alpha.3

package/dist/client.d.cts

@@ -304,7 +304,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
           published: string | null;
         }[] | null;
         content: {
-          [x: string]: string | number | boolean | string[] | AssetFieldValueRoot[] | {
+          [x: string]: string | number | boolean | string[] | {
             type: "doc";
             content?: Array<{
               [key: string]: unknown;
@@ -323,7 +323,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
               [key: string]: unknown;
             } | undefined;
             is_external_url?: boolean | undefined;
-          } | {
+          } | AssetFieldValueRoot[] | {
             fieldtype: "multilink";
             id: string;
             url: string;
@@ -482,7 +482,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
           published: string | null;
         }[] | null;
         content: {
-          [x: string]: string | number | boolean | string[] | AssetFieldValueRoot[] | {
+          [x: string]: string | number | boolean | string[] | {
             type: "doc";
             content?: Array<{
               [key: string]: unknown;
@@ -501,7 +501,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
               [key: string]: unknown;
             } | undefined;
             is_external_url?: boolean | undefined;
-          } | {
+          } | AssetFieldValueRoot[] | {
             fieldtype: "multilink";
             id: string;
             url: string;

package/dist/client.d.mts

@@ -304,7 +304,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
           published: string | null;
         }[] | null;
         content: {
-          [x: string]: string | number | boolean | string[] | AssetFieldValueRoot[] | {
+          [x: string]: string | number | boolean | string[] | {
             type: "doc";
             content?: Array<{
               [key: string]: unknown;
@@ -323,7 +323,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
               [key: string]: unknown;
             } | undefined;
             is_external_url?: boolean | undefined;
-          } | {
+          } | AssetFieldValueRoot[] | {
             fieldtype: "multilink";
             id: string;
             url: string;
@@ -482,7 +482,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
           published: string | null;
         }[] | null;
         content: {
-          [x: string]: string | number | boolean | string[] | AssetFieldValueRoot[] | {
+          [x: string]: string | number | boolean | string[] | {
             type: "doc";
             content?: Array<{
               [key: string]: unknown;
@@ -501,7 +501,7 @@ declare const createApiClientBase: <ThrowOnError extends boolean = false, Inline
               [key: string]: unknown;
             } | undefined;
             is_external_url?: boolean | undefined;
-          } | {
+          } | AssetFieldValueRoot[] | {
             fieldtype: "multilink";
             id: string;
             url: string;

package/dist/generated/types/block.d.cts

@@ -3,17 +3,37 @@ import { Component } from "../mapi/_internal.gen.cjs";
 import { Override } from "./_utils.cjs";
 
 //#region src/generated/types/block.d.ts
-/** Wire form: the MAPI object map keyed by field name. This is what `defineBlock` returns. */
-type BlockSchema = Record<string, Field & {
+/**
+ * Ordered array of named fields — the content-shape DSL form `defineBlock`
+ * accepts and returns. A field's position in the array sets the order it appears
+ * in the editor (mapped to the wire `pos` on push).
+ */
+type BlockFields = ReadonlyArray<Field & {
+  name: string;
+  pos?: number;
   required?: boolean;
 }>;
-/** A Storyblok block. */
-type Block<TName extends string = string, TBlockSchema extends BlockSchema = BlockSchema, TIsRoot extends boolean = boolean, TIsNestable extends boolean = boolean, TComponentGroupUuid extends string | null = string | null> = Override<Component, {
+/**
+ * A Storyblok block: a named, ordered set of content fields. Uses the
+ * content-shape DSL `fields` array rather than the MAPI wire `schema` record.
+ */
+type Block<TName extends string = string, TFields extends BlockFields = BlockFields, TIsRoot extends boolean = boolean, TIsNestable extends boolean = boolean> = Override<Omit<Component, 'schema' | 'component_group_uuid'>, {
   name: TName;
-  schema: TBlockSchema;
+  fields: TFields;
   is_root?: TIsRoot;
   is_nestable?: TIsNestable;
-  component_group_uuid?: TComponentGroupUuid;
+  /**
+   * Escape hatch for pinning this block to a Storyblok UI-managed component
+   * group by UUID. Component groups are normally maintained in code via the
+   * schema directory layout; set this only if you intentionally manage groups
+   * in the Storyblok UI, and fill in the group UUID yourself. When set,
+   * `schema push` diffs it and sends it to the Management API; when omitted,
+   * the block's remote group is left untouched.
+   *
+   * @deprecated Prefer maintaining component groups in code through the
+   * directory layout.
+   */
+  component_group_uuid?: string | null;
 }>;
 /**
  * A root {@link Block} (`is_root: true`). Given a union of blocks, narrows to
@@ -25,5 +45,5 @@ type RootBlock<T extends Block = Block & {
   is_root: true;
 }>;
 //#endregion
-export { Block, RootBlock };
+export { Block, BlockFields, RootBlock };
 //# sourceMappingURL=block.d.cts.map

package/dist/generated/types/block.d.mts

@@ -3,17 +3,37 @@ import { Component } from "../mapi/_internal.gen.mjs";
 import { Override } from "./_utils.mjs";
 
 //#region src/generated/types/block.d.ts
-/** Wire form: the MAPI object map keyed by field name. This is what `defineBlock` returns. */
-type BlockSchema = Record<string, Field & {
+/**
+ * Ordered array of named fields — the content-shape DSL form `defineBlock`
+ * accepts and returns. A field's position in the array sets the order it appears
+ * in the editor (mapped to the wire `pos` on push).
+ */
+type BlockFields = ReadonlyArray<Field & {
+  name: string;
+  pos?: number;
   required?: boolean;
 }>;
-/** A Storyblok block. */
-type Block<TName extends string = string, TBlockSchema extends BlockSchema = BlockSchema, TIsRoot extends boolean = boolean, TIsNestable extends boolean = boolean, TComponentGroupUuid extends string | null = string | null> = Override<Component, {
+/**
+ * A Storyblok block: a named, ordered set of content fields. Uses the
+ * content-shape DSL `fields` array rather than the MAPI wire `schema` record.
+ */
+type Block<TName extends string = string, TFields extends BlockFields = BlockFields, TIsRoot extends boolean = boolean, TIsNestable extends boolean = boolean> = Override<Omit<Component, 'schema' | 'component_group_uuid'>, {
   name: TName;
-  schema: TBlockSchema;
+  fields: TFields;
   is_root?: TIsRoot;
   is_nestable?: TIsNestable;
-  component_group_uuid?: TComponentGroupUuid;
+  /**
+   * Escape hatch for pinning this block to a Storyblok UI-managed component
+   * group by UUID. Component groups are normally maintained in code via the
+   * schema directory layout; set this only if you intentionally manage groups
+   * in the Storyblok UI, and fill in the group UUID yourself. When set,
+   * `schema push` diffs it and sends it to the Management API; when omitted,
+   * the block's remote group is left untouched.
+   *
+   * @deprecated Prefer maintaining component groups in code through the
+   * directory layout.
+   */
+  component_group_uuid?: string | null;
 }>;
 /**
  * A root {@link Block} (`is_root: true`). Given a union of blocks, narrows to
@@ -25,5 +45,5 @@ type RootBlock<T extends Block = Block & {
   is_root: true;
 }>;
 //#endregion
-export { Block, RootBlock };
+export { Block, BlockFields, RootBlock };
 //# sourceMappingURL=block.d.mts.map

package/dist/generated/types/field.d.cts

@@ -1,6 +1,6 @@
 import { AssetFieldValue, BlockContentBase, Field, MultilinkFieldValue, PluginFieldValue, RichtextFieldValue, TableFieldValue } from "../overlay/_internal.gen.cjs";
 import { Prettify } from "./_utils.cjs";
-import { Block } from "./block.cjs";
+import { Block, BlockFields } from "./block.cjs";
 
 //#region src/generated/types/field.d.ts
 /**
@@ -11,21 +11,28 @@ import { Block } from "./block.cjs";
 type NoBlocks = false;
 /** True when `T` is the un-narrowed base `Block` (i.e. no specific block was supplied). */
 type IsBaseBlock<T> = [Block] extends [T] ? true : false;
-type RequiredFieldKeys<T> = { [K in keyof T]: T[K] extends {
+/**
+ * Maps a block's ordered `fields` array to its read content object, splitting
+ * required (`required: true`) from optional fields. Each `F` is a member of the
+ * field union, so it provably satisfies `FieldValue`'s `Field` constraint.
+ */
+type ContentFields<TFields extends BlockFields, TBlocks> = Prettify<{ [F in TFields[number] as F extends {
+  required: true;
+} ? F['name'] : never]: FieldValue<F, TBlocks> } & { [F in TFields[number] as F extends {
   required: true;
-} ? K : never }[keyof T];
-type OptionalFieldKeys<T> = Exclude<keyof T, RequiredFieldKeys<T>>;
+} ? never : F['name']]?: FieldValue<F, TBlocks> | null }>;
+/** Input (write) variant of {@link ContentFields}, resolving each field via {@link FieldValueInput}. */
 /**
  * Content object for a single block instance as returned by the Storyblok
  * Content Delivery API. Without a `TBlock` argument, this is the loose
  * runtime shape (any block, `_editable` optional). With a schema-typed
- * `TBlock`, fields are narrowed per the block's schema.
+ * `TBlock`, fields are narrowed per the block's `fields`.
  */
 type BlockContent<TBlock extends Block = Block, TBlocks = NoBlocks> = IsBaseBlock<TBlock> extends true ? BlockContentBase : TBlock extends any ? Prettify<{
   _uid: string;
   component: TBlock['name'];
   _editable?: string;
-} & { [K in RequiredFieldKeys<TBlock['schema']>]: FieldValue<NonNullable<TBlock['schema'][K]>, TBlocks> } & { [K in OptionalFieldKeys<TBlock['schema']>]?: FieldValue<NonNullable<TBlock['schema'][K]>, TBlocks> | null }> : never;
+} & ContentFields<TBlock['fields'], TBlocks>> : never;
 interface FieldTypeValueMap {
   text: string;
   textarea: string;
@@ -50,15 +57,15 @@ type IsNestable<T> = T extends {
 } ? false : T extends {
   is_nestable: true;
 } ? true : true;
-type ApplyWhitelist<TField, TBlocks> = TField extends {
-  component_whitelist: ReadonlyArray<infer TWhitelisted extends string>;
+type ApplyAllow<TField, TBlocks> = TField extends {
+  allow: ReadonlyArray<infer TAllowed extends string>;
 } ? Extract<TBlocks, {
-  name: TWhitelisted;
+  name: TAllowed;
 }> : TBlocks extends any ? IsNestable<TBlocks> extends true ? TBlocks : never : never;
 /** Resolves a field definition to its runtime content value type (read). */
 type FieldValue<TField extends Field = Field, TBlocks = NoBlocks> = Prettify<TField extends {
   type: 'bloks';
-} ? [TBlocks] extends [never] ? BlockContentBase[] : [TBlocks] extends [Block] ? BlockContent<ApplyWhitelist<TField, TBlocks>, TBlocks>[] : BlockContentBase[] : FieldTypeValueMap[TField['type']]>;
+} ? [TBlocks] extends [never] ? BlockContentBase[] : [TBlocks] extends [Block] ? BlockContent<ApplyAllow<TField, TBlocks>, TBlocks>[] : BlockContentBase[] : FieldTypeValueMap[TField['type']]>;
 //#endregion
 export { BlockContent };
 //# sourceMappingURL=field.d.cts.map

package/dist/generated/types/field.d.mts

@@ -1,6 +1,6 @@
 import { AssetFieldValue, BlockContentBase, Field, MultilinkFieldValue, PluginFieldValue, RichtextFieldValue, TableFieldValue } from "../overlay/_internal.gen.mjs";
 import { Prettify } from "./_utils.mjs";
-import { Block } from "./block.mjs";
+import { Block, BlockFields } from "./block.mjs";
 
 //#region src/generated/types/field.d.ts
 /**
@@ -11,21 +11,28 @@ import { Block } from "./block.mjs";
 type NoBlocks = false;
 /** True when `T` is the un-narrowed base `Block` (i.e. no specific block was supplied). */
 type IsBaseBlock<T> = [Block] extends [T] ? true : false;
-type RequiredFieldKeys<T> = { [K in keyof T]: T[K] extends {
+/**
+ * Maps a block's ordered `fields` array to its read content object, splitting
+ * required (`required: true`) from optional fields. Each `F` is a member of the
+ * field union, so it provably satisfies `FieldValue`'s `Field` constraint.
+ */
+type ContentFields<TFields extends BlockFields, TBlocks> = Prettify<{ [F in TFields[number] as F extends {
+  required: true;
+} ? F['name'] : never]: FieldValue<F, TBlocks> } & { [F in TFields[number] as F extends {
   required: true;
-} ? K : never }[keyof T];
-type OptionalFieldKeys<T> = Exclude<keyof T, RequiredFieldKeys<T>>;
+} ? never : F['name']]?: FieldValue<F, TBlocks> | null }>;
+/** Input (write) variant of {@link ContentFields}, resolving each field via {@link FieldValueInput}. */
 /**
  * Content object for a single block instance as returned by the Storyblok
  * Content Delivery API. Without a `TBlock` argument, this is the loose
  * runtime shape (any block, `_editable` optional). With a schema-typed
- * `TBlock`, fields are narrowed per the block's schema.
+ * `TBlock`, fields are narrowed per the block's `fields`.
  */
 type BlockContent<TBlock extends Block = Block, TBlocks = NoBlocks> = IsBaseBlock<TBlock> extends true ? BlockContentBase : TBlock extends any ? Prettify<{
   _uid: string;
   component: TBlock['name'];
   _editable?: string;
-} & { [K in RequiredFieldKeys<TBlock['schema']>]: FieldValue<NonNullable<TBlock['schema'][K]>, TBlocks> } & { [K in OptionalFieldKeys<TBlock['schema']>]?: FieldValue<NonNullable<TBlock['schema'][K]>, TBlocks> | null }> : never;
+} & ContentFields<TBlock['fields'], TBlocks>> : never;
 interface FieldTypeValueMap {
   text: string;
   textarea: string;
@@ -50,15 +57,15 @@ type IsNestable<T> = T extends {
 } ? false : T extends {
   is_nestable: true;
 } ? true : true;
-type ApplyWhitelist<TField, TBlocks> = TField extends {
-  component_whitelist: ReadonlyArray<infer TWhitelisted extends string>;
+type ApplyAllow<TField, TBlocks> = TField extends {
+  allow: ReadonlyArray<infer TAllowed extends string>;
 } ? Extract<TBlocks, {
-  name: TWhitelisted;
+  name: TAllowed;
 }> : TBlocks extends any ? IsNestable<TBlocks> extends true ? TBlocks : never : never;
 /** Resolves a field definition to its runtime content value type (read). */
 type FieldValue<TField extends Field = Field, TBlocks = NoBlocks> = Prettify<TField extends {
   type: 'bloks';
-} ? [TBlocks] extends [never] ? BlockContentBase[] : [TBlocks] extends [Block] ? BlockContent<ApplyWhitelist<TField, TBlocks>, TBlocks>[] : BlockContentBase[] : FieldTypeValueMap[TField['type']]>;
+} ? [TBlocks] extends [never] ? BlockContentBase[] : [TBlocks] extends [Block] ? BlockContent<ApplyAllow<TField, TBlocks>, TBlocks>[] : BlockContentBase[] : FieldTypeValueMap[TField['type']]>;
 //#endregion
 export { BlockContent };
 //# sourceMappingURL=field.d.mts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@storyblok/api-client",
   "type": "module",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "private": false,
   "description": "Storyblok Content Delivery API Client",
   "author": "",
@@ -41,8 +41,8 @@
     "tsdown": "^0.20.3",
     "tsx": "^4.21.0",
     "vitest": "^4.1.3",
-    "@storyblok/management-api-client": "1.0.0-alpha.2",
     "@storyblok/eslint-config": "0.5.1",
+    "@storyblok/management-api-client": "1.0.0-alpha.3",
     "@storyblok/openapi-codegen": "0.0.1"
   },
   "nx": {