@cntrl-site/sdk 1.5.2 → 1.5.4

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

@@ -11,7 +11,12 @@ const ImageItemSchema = ItemBase_schema_1.ItemBaseSchema.extend({
     commonParams: zod_1.z.object({
         url: zod_1.z.string().min(1),
         hasGLEffect: zod_1.z.boolean().optional(),
-        fragmentShader: zod_1.z.string().optional()
+        fragmentShader: zod_1.z.string().optional(),
+        FXCursor: zod_1.z.object({
+            type: zod_1.z.enum(['mouse', 'manual']),
+            x: zod_1.z.number(),
+            y: zod_1.z.number()
+        }).optional()
     }),
     sticky: zod_1.z.record(zod_1.z.object({
         from: zod_1.z.number(),
@@ -128,22 +133,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 +141,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.4",
   "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,
@@ -21,7 +23,12 @@ const ImageItemSchema = ItemBaseSchema.extend({
   commonParams: z.object({
     url: z.string().min(1),
     hasGLEffect: z.boolean().optional(),
-    fragmentShader: z.string().optional()
+    fragmentShader: z.string().optional(),
+    FXCursor: z.object({
+      type: z.enum(['mouse', 'manual']),
+      x: z.number(),
+      y: z.number()
+    }).optional()
   }),
   sticky: z.record(
     z.object({
@@ -166,27 +173,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 +181,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)
+    })
+  })
+]));

package/src/types/article/Item.ts

@@ -44,11 +44,18 @@ interface MediaCommonParams {
   url: string;
 }
 
+interface FXCursor {
+  type: 'mouse' | 'manual';
+  x: number;
+  y: number;
+}
+
 interface VideoCommonParams extends MediaCommonParams {}
 
 interface ImageCommonParams extends MediaCommonParams {
   hasGLEffect?: boolean;
   fragmentShader?: string;
+  cursor?: FXCursor;
 }
 
 interface RichTextCommonParams {