@cntrl-site/sdk 1.5.2 → 1.5.3

package/lib/schemas/article/Item.schema.js

@@ -128,22 +128,7 @@ const YoutubeEmbedItemSchema = ItemBase_schema_1.ItemBaseSchema.extend({
         hover: zod_1.z.record(ItemState_schema_1.EmbedHoverStateParamsSchema)
     })
 });
-const GroupItemSchema = ItemBase_schema_1.ItemBaseSchema.extend({
-    type: zod_1.z.literal(ArticleItemType_1.ArticleItemType.Group),
-    commonParams: zod_1.z.object({}),
-    itemsIds: zod_1.z.array(zod_1.z.string()),
-    sticky: zod_1.z.record(zod_1.z.object({
-        from: zod_1.z.number(),
-        to: zod_1.z.number().optional()
-    }).nullable()),
-    layoutParams: zod_1.z.record(zod_1.z.object({
-        opacity: zod_1.z.number().nonnegative()
-    })),
-    state: zod_1.z.object({
-        hover: zod_1.z.record(ItemState_schema_1.GroupHoverStateParamsSchema)
-    })
-});
-exports.ItemSchema = zod_1.z.discriminatedUnion('type', [
+exports.ItemSchema = zod_1.z.lazy(() => zod_1.z.discriminatedUnion('type', [
     ImageItemSchema,
     VideoItemSchema,
     RectangleItemSchema,
@@ -151,5 +136,19 @@ exports.ItemSchema = zod_1.z.discriminatedUnion('type', [
     RichTextItem_schema_1.RichTextItemSchema,
     VimeoEmbedItemSchema,
     YoutubeEmbedItemSchema,
-    GroupItemSchema
-]);
+    ItemBase_schema_1.ItemBaseSchema.extend({
+        type: zod_1.z.literal(ArticleItemType_1.ArticleItemType.Group),
+        commonParams: zod_1.z.object({}),
+        items: zod_1.z.array(exports.ItemSchema),
+        sticky: zod_1.z.record(zod_1.z.object({
+            from: zod_1.z.number(),
+            to: zod_1.z.number().optional()
+        }).nullable()),
+        layoutParams: zod_1.z.record(zod_1.z.object({
+            opacity: zod_1.z.number().nonnegative()
+        })),
+        state: zod_1.z.object({
+            hover: zod_1.z.record(ItemState_schema_1.GroupHoverStateParamsSchema)
+        })
+    })
+]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntrl-site/sdk",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Generic SDK for use in public websites.",
   "main": "lib/index.js",
   "types": "src/index.ts",

package/src/schemas/article/Item.schema.ts

@@ -1,7 +1,9 @@
 import { z, ZodType } from 'zod';
 import {
-  CustomItem, GroupItem,
+  CustomItem,
+  GroupItem,
   ImageItem,
+  ItemAny,
   RectangleItem,
   VideoItem,
   VimeoEmbedItem,
@@ -166,27 +168,7 @@ const YoutubeEmbedItemSchema = ItemBaseSchema.extend({
   })
 }) satisfies ZodType<YoutubeEmbedItem>;
 
-const GroupItemSchema =  ItemBaseSchema.extend({
-  type: z.literal(ArticleItemType.Group),
-  commonParams: z.object({}),
-  itemsIds: z.array(z.string()),
-  sticky: z.record(
-    z.object({
-      from: z.number(),
-      to: z.number().optional()
-    }).nullable(),
-  ),
-  layoutParams: z.record(
-    z.object({
-      opacity: z.number().nonnegative()
-    })
-  ),
-  state: z.object({
-    hover: z.record(GroupHoverStateParamsSchema)
-  })
-}) satisfies ZodType<GroupItem>;
-
-export const ItemSchema = z.discriminatedUnion('type', [
+export const ItemSchema: ZodType<ItemAny> = z.lazy(() => z.discriminatedUnion('type', [
   ImageItemSchema,
   VideoItemSchema,
   RectangleItemSchema,
@@ -194,5 +176,23 @@ export const ItemSchema = z.discriminatedUnion('type', [
   RichTextItemSchema,
   VimeoEmbedItemSchema,
   YoutubeEmbedItemSchema,
-  GroupItemSchema
-]);
+  ItemBaseSchema.extend({
+    type: z.literal(ArticleItemType.Group),
+    commonParams: z.object({}),
+    items: z.array(ItemSchema),
+    sticky: z.record(
+      z.object({
+        from: z.number(),
+        to: z.number().optional()
+      }).nullable(),
+    ),
+    layoutParams: z.record(
+      z.object({
+        opacity: z.number().nonnegative()
+      })
+    ),
+    state: z.object({
+      hover: z.record(GroupHoverStateParamsSchema)
+    })
+  })
+]));