@blocklet/sdk 1.8.65-beta-db7f2529 → 1.8.65

package/lib/types/notification.d.ts

@@ -59,7 +59,19 @@ export interface TMessage {
     };
     type: string;
 }
-export type TNotification = TNotificationItem | TNotificationConnect | TNotificationFeed;
+export interface TNotification {
+    actions?: TNotificationAction[];
+    attachments?: TNotificationAttachment[];
+    blocks?: TNotificationAttachment[];
+    body?: string;
+    checkUrl?: string;
+    data?: object;
+    feedType?: string;
+    severity?: 'normal' | 'success' | 'error' | 'warning';
+    title?: string;
+    type?: 'notification' | 'connect' | 'feed' | 'hi';
+    url?: string;
+}
 export interface TNotificationAction {
     bgColor?: string;
     color?: string;
@@ -67,39 +79,11 @@ export interface TNotificationAction {
     name: string;
     title?: string;
 }
-export type TNotificationAttachment = {
-    data: TDataAsset;
-    type: 'asset';
-} | {
-    data: TDataVC;
-    type: 'vc';
-} | {
-    data: TDataToken;
-    type: 'token';
-} | {
-    data: TDataText;
-    type: 'text';
-} | {
-    data: TDataImage;
-    type: 'image';
-} | {
-    data: TDataTransaction;
-    type: 'transaction';
-} | {
-    data: TDataDapp;
-    type: 'dapp';
-} | {
-    data: TDataLink;
-    type: 'link';
-} | {
-    fields?: {
-        data: TDataText;
-        type: 'text';
-    }[];
-    type: 'section';
-} | {
-    type: 'divider';
-};
+export interface TNotificationAttachment {
+    data?: any;
+    fields?: any;
+    type: 'asset' | 'vc' | 'token' | 'text' | 'image' | 'divider' | 'transaction' | 'dapp' | 'link' | 'section';
+}
 export interface TNotificationConnect {
     checkUrl?: string;
     type?: 'connect';
@@ -110,7 +94,7 @@ export interface TNotificationFeed {
     feedType: string;
     type?: 'feed';
 }
-export type TNotificationInput = TNotification[] | TNotification;
+export type TNotificationInput = TNotification[];
 export interface TNotificationItem {
     actions?: TNotificationAction[];
     attachments?: TNotificationAttachment[];

package/lib/validators/notification.d.ts

@@ -14,13 +14,13 @@ declare const transactionSchema: JOI.ObjectSchema<any>;
 declare const dappSchema: JOI.ObjectSchema<any>;
 declare const linkSchema: JOI.ObjectSchema<any>;
 declare const actionSchema: JOI.ObjectSchema<any>;
-declare const attachmentSchema: JOI.AlternativesSchema<any>;
+declare const attachmentSchema: JOI.ObjectSchema<any>;
 declare const notificationTypeSchema: JOI.ObjectSchema<any>;
 declare const connectTypeSchema: JOI.ObjectSchema<any>;
 declare const feedTypeSchema: JOI.ObjectSchema<any>;
-declare const notificationSchema: JOI.AlternativesSchema<any>;
+declare const notificationSchema: JOI.ObjectSchema<any>;
 declare const messageSchema: JOI.ObjectSchema<any>;
-declare const inputNotificationSchema: JOI.AlternativesSchema<any>;
+declare const inputNotificationSchema: JOI.ArraySchema<any[]>;
 declare const optionSchema: JOI.ObjectSchema<any>;
 declare const channelEventSchema: JOI.StringSchema<string>;
 export declare const validateReceiver: any;
@@ -59,8 +59,8 @@ declare const _default: {
     linkSchema: JOI.ObjectSchema<any>;
     imageSchema: JOI.ObjectSchema<any>;
     dappSchema: JOI.ObjectSchema<any>;
-    attachmentSchema: JOI.AlternativesSchema<any>;
-    notificationSchema: JOI.AlternativesSchema<any>;
+    attachmentSchema: JOI.ObjectSchema<any>;
+    notificationSchema: JOI.ObjectSchema<any>;
     messageSchema: JOI.ObjectSchema<any>;
     optionSchema: JOI.ObjectSchema<any>;
     channelEventSchema: JOI.StringSchema<string>;

package/lib/validators/notification.js

@@ -107,42 +107,31 @@ const actionSchema = Joi.object({
     link: Joi.string().uri(),
 }).meta({ className: 'TNotificationAction' });
 exports.actionSchema = actionSchema;
-const attachmentSchema = Joi.alternatives()
-    .try(Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.ASSET).required(),
-    data: assetSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.VC).required(),
-    data: vcSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.TOKEN).required(),
-    data: tokenSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.TEXT).required(),
-    data: textSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.IMAGE).required(),
-    data: imageSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.TRANSACTION).required(),
-    data: transactionSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.DAPP).required(),
-    data: dappSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.LINK).required(),
-    data: linkSchema,
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.SECTION).required(),
-    fields: Joi.array().items(Joi.object({
-        type: Joi.string().valid(ATTACHMENT_TYPES.TEXT).required(),
-        data: textSchema,
-    })),
-}), Joi.object({
-    type: Joi.string().valid(ATTACHMENT_TYPES.DIVIDER).required(),
-}))
-    .required()
-    .meta({ className: 'TNotificationAttachment' });
+const attachmentSchema = Joi.object({
+    type: Joi.string()
+        .valid(...Object.values(ATTACHMENT_TYPES))
+        .required(),
+    data: Joi.when('type', {
+        switch: [
+            { is: ATTACHMENT_TYPES.ASSET, then: assetSchema },
+            { is: ATTACHMENT_TYPES.VC, then: vcSchema },
+            { is: ATTACHMENT_TYPES.TOKEN, then: tokenSchema },
+            { is: ATTACHMENT_TYPES.TEXT, then: textSchema },
+            { is: ATTACHMENT_TYPES.IMAGE, then: imageSchema },
+            { is: ATTACHMENT_TYPES.TRANSACTION, then: transactionSchema },
+            { is: ATTACHMENT_TYPES.DAPP, then: dappSchema },
+            { is: ATTACHMENT_TYPES.LINK, then: linkSchema },
+            { is: ATTACHMENT_TYPES.DIVIDER, then: Joi.object({}) },
+        ],
+    }),
+    fields: Joi.when('type', {
+        is: ATTACHMENT_TYPES.SECTION,
+        then: Joi.array().items(Joi.object({
+            type: Joi.string().valid(ATTACHMENT_TYPES.TEXT).required(),
+            data: textSchema,
+        })),
+    }),
+}).meta({ className: 'TNotificationAttachment' });
 exports.attachmentSchema = attachmentSchema;
 const notificationTypeSchema = Joi.object({
     type: Joi.string().valid(TYPES.NOTIFICATION),
@@ -172,8 +161,22 @@ const feedTypeSchema = Joi.object({
     .required()
     .meta({ className: 'TNotificationFeed' });
 exports.feedTypeSchema = feedTypeSchema;
-const notificationSchema = Joi.alternatives()
-    .try(notificationTypeSchema, connectTypeSchema, feedTypeSchema)
+const notificationSchema = Joi.object({
+    type: Joi.string().valid(...Object.values(TYPES)),
+    // feed type
+    feedType: Joi.string(),
+    data: Joi.object(),
+    // connect type
+    url: Joi.string().uri(),
+    checkUrl: Joi.string(),
+    // notification type
+    title: Joi.string(),
+    body: Joi.string(),
+    severity: Joi.string().valid(...Object.values(SEVERITIES)),
+    blocks: Joi.array().items(attachmentSchema).default([]),
+    attachments: Joi.array().items(attachmentSchema).default([]),
+    actions: Joi.array().items(actionSchema).default([]),
+})
     .required()
     .meta({ className: 'TNotification' });
 exports.notificationSchema = notificationSchema;
@@ -190,15 +193,13 @@ const messageSchema = Joi.object({
     .meta({ className: 'TMessage', unknownType: 'any' });
 exports.messageSchema = messageSchema;
 const receiverSchema = Joi.DID().trim().required().meta({ className: 'TReceiver' });
-const inputNotificationSchema = Joi.alternatives()
-    .try(Joi.array().items(notificationSchema), notificationSchema)
+const inputNotificationSchema = Joi.array()
+    .items(notificationSchema)
+    .single()
     .required()
     .meta({ className: 'TNotificationInput' });
 exports.inputNotificationSchema = inputNotificationSchema;
-const inputReceiverSchema = Joi.alternatives()
-    .try(Joi.array().items(receiverSchema), receiverSchema)
-    .required()
-    .meta({ className: 'TReceiverInput' });
+const inputReceiverSchema = Joi.array().items(receiverSchema).single().required().meta({ className: 'TReceiverInput' });
 const optionSchema = Joi.object({
     keepForOfflineUser: Joi.boolean(),
 })

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.65-beta-db7f2529",
+  "version": "1.8.65",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,13 +26,13 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.65-beta-db7f2529",
-    "@abtnode/constant": "1.8.65-beta-db7f2529",
+    "@abtnode/client": "1.8.65",
+    "@abtnode/constant": "1.8.65",
     "@arcblock/did-auth": "1.18.42",
     "@arcblock/jwt": "1.18.42",
     "@arcblock/ws": "1.18.42",
-    "@blocklet/constant": "1.8.65-beta-db7f2529",
-    "@blocklet/meta": "1.8.65-beta-db7f2529",
+    "@blocklet/constant": "1.8.65",
+    "@blocklet/meta": "1.8.65",
     "@did-connect/authenticator": "^2.1.34",
     "@did-connect/handler": "^2.1.34",
     "@nedb/core": "^2.1.5",
@@ -68,5 +68,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "b9cd53d1db3535a691aebed2ff6f9053376d46dc"
+  "gitHead": "69b608353fbbdb7c61f9ccb10965a1d0c55c45f2"
 }