@cntrl-site/sdk 1.14.0 → 1.15.0

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

@@ -24,19 +24,20 @@ exports.FXControlSchema = zod_1.z.discriminatedUnion('type', [
         value: zod_1.z.tuple([zod_1.z.number(), zod_1.z.number()])
     })
 ]);
+const FXParams = zod_1.z.object({
+    url: zod_1.z.string().min(1),
+    hasGLEffect: zod_1.z.boolean().optional(),
+    fragmentShader: zod_1.z.string().nullable(),
+    FXCursor: zod_1.z.object({
+        type: zod_1.z.enum(['mouse', 'manual']),
+        x: zod_1.z.number(),
+        y: zod_1.z.number()
+    }).nullable(),
+    FXControls: zod_1.z.array(exports.FXControlSchema).optional()
+});
 const ImageItemSchema = ItemBase_schema_1.ItemBaseSchema.extend({
     type: zod_1.z.literal(ArticleItemType_1.ArticleItemType.Image),
-    commonParams: zod_1.z.object({
-        url: zod_1.z.string().min(1),
-        hasGLEffect: zod_1.z.boolean().optional(),
-        fragmentShader: zod_1.z.string().nullable(),
-        FXCursor: zod_1.z.object({
-            type: zod_1.z.enum(['mouse', 'manual']),
-            x: zod_1.z.number(),
-            y: zod_1.z.number()
-        }).nullable(),
-        FXControls: zod_1.z.array(exports.FXControlSchema).optional()
-    }),
+    commonParams: FXParams,
     sticky: zod_1.z.record(zod_1.z.object({
         from: zod_1.z.number(),
         to: zod_1.z.number().optional()
@@ -53,9 +54,8 @@ const ImageItemSchema = ItemBase_schema_1.ItemBaseSchema.extend({
 const VideoItemSchema = ItemBase_schema_1.ItemBaseSchema.extend({
     type: zod_1.z.literal(ArticleItemType_1.ArticleItemType.Video),
     commonParams: zod_1.z.object({
-        url: zod_1.z.string().min(1),
         coverUrl: zod_1.z.string().nullable()
-    }),
+    }).merge(FXParams),
     sticky: zod_1.z.record(zod_1.z.object({
         from: zod_1.z.number(),
         to: zod_1.z.number().optional()

package/package.json

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

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

@@ -40,19 +40,21 @@ export const FXControlSchema = z.discriminatedUnion('type',[
   })
 ]) satisfies ZodType<FXControlAny>;
 
+const FXParams = z.object({
+  url: z.string().min(1),
+  hasGLEffect: z.boolean().optional(),
+  fragmentShader: z.string().nullable(),
+  FXCursor: z.object({
+    type: z.enum(['mouse', 'manual']),
+    x: z.number(),
+    y: z.number()
+  }).nullable(),
+  FXControls: z.array(FXControlSchema).optional()
+});
+
 const ImageItemSchema = ItemBaseSchema.extend({
   type: z.literal(ArticleItemType.Image),
-  commonParams: z.object({
-    url: z.string().min(1),
-    hasGLEffect: z.boolean().optional(),
-    fragmentShader: z.string().nullable(),
-    FXCursor: z.object({
-      type: z.enum(['mouse', 'manual']),
-      x: z.number(),
-      y: z.number()
-    }).nullable(),
-    FXControls: z.array(FXControlSchema).optional()
-  }),
+  commonParams: FXParams,
   sticky: z.record(
     z.object({
       from: z.number(),
@@ -74,9 +76,8 @@ const ImageItemSchema = ItemBaseSchema.extend({
 const VideoItemSchema = ItemBaseSchema.extend({
   type: z.literal(ArticleItemType.Video),
   commonParams: z.object({
-    url: z.string().min(1),
     coverUrl: z.string().nullable()
-  }),
+  }).merge(FXParams),
   sticky: z.record(
     z.object({
       from: z.number(),

package/src/types/article/Item.ts

@@ -49,18 +49,17 @@ export interface ItemLayoutParamsMap {
 
 interface MediaCommonParams {
   url: string;
+  hasGLEffect?: boolean;
+  fragmentShader: string | null;
+  FXCursor: FXCursor | null;
+  FXControls?: FXControlAny[];
 }
 
 interface VideoCommonParams extends MediaCommonParams {
   coverUrl: string | null;
 }
 
-interface ImageCommonParams extends MediaCommonParams {
-  hasGLEffect?: boolean;
-  fragmentShader: string | null;
-  FXCursor: FXCursor | null;
-  FXControls?: FXControlAny[];
-}
+interface ImageCommonParams extends MediaCommonParams {}
 
 interface RichTextCommonParams {
   text: string;