Clean up

Author: compulim

packages/api/package.json

@@ -73,7 +73,7 @@
     "botframework-webchat-cldr-data": "development",
     "botframework-webchat-core": "production",
     "botframework-webchat-react-valibot": "development",
-    "botframework-webchat-store": "development"
+    "botframework-webchat-redux-store": "development"
   },
   "pinDependencies": {
     "@babel/cli": [

packages/core/package.json

@@ -39,9 +39,9 @@
     "url": "https://github.com/microsoft/BotFramework-WebChat/issues"
   },
   "files": [
+    "./*.js",
     "./dist/**/*",
-    "./src/**/*",
-    "*.js"
+    "./src/**/*"
   ],
   "homepage": "https://github.com/microsoft/BotFramework-WebChat/packages/core#readme",
   "tsd": {

packages/core/src/actions/clearSuggestedActions.ts

@@ -11,10 +11,10 @@ const clearSuggestedActionsActionSchema = pipe(
 
 type ClearSuggestedActionsAction = InferOutput<typeof clearSuggestedActionsActionSchema>;
 
-export default function clearSuggestedActions() {
+export default function clearSuggestedActions(): ClearSuggestedActionsAction {
   return {
     type: CLEAR_SUGGESTED_ACTIONS
-  } satisfies ClearSuggestedActionsAction;
+  };
 }
 
 export { CLEAR_SUGGESTED_ACTIONS, clearSuggestedActionsActionSchema, type ClearSuggestedActionsAction };

packages/core/src/actions/registerActionSink.ts

@@ -12,11 +12,12 @@ const registerActionSinkActionSchema = object({
 
 type RegisterActionSinkAction = InferOutput<typeof registerActionSinkActionSchema>;
 
-export default function registerActionSink(sink: (action: Action) => void): RegisterActionSinkAction {
+function registerActionSink(sink: (action: Action) => void): RegisterActionSinkAction {
   return {
     payload: { sink },
     type: REGISTER_ACTION_SINK
-  } satisfies RegisterActionSinkAction;
+  };
 }
 
+export default registerActionSink;
 export { REGISTER_ACTION_SINK, registerActionSinkActionSchema, type RegisterActionSinkAction };

packages/core/src/actions/setSuggestedActions.ts

@@ -32,7 +32,7 @@ export default function setSuggestedActions(
   return {
     type: SET_SUGGESTED_ACTIONS,
     payload: { originActivity, suggestedActions }
-  } satisfies SetSuggestedActionsAction;
+  };
 }
 
 export { SET_SUGGESTED_ACTIONS, setSuggestedActionsActionSchema, type SetSuggestedActionsAction };

packages/core/src/actions/unregisterActionSink.ts

@@ -12,11 +12,12 @@ const unregisterActionSinkActionSchema = object({
 
 type UnregisterActionSinkAction = InferOutput<typeof unregisterActionSinkActionSchema>;
 
-export default function unregisterActionSink(sink: (action: Action) => void): UnregisterActionSinkAction {
+function unregisterActionSink(sink: (action: Action) => void): UnregisterActionSinkAction {
   return {
     payload: { sink },
     type: UNREGISTER_ACTION_SINK
-  } satisfies UnregisterActionSinkAction;
+  };
 }
 
+export default unregisterActionSink;
 export { UNREGISTER_ACTION_SINK, unregisterActionSinkActionSchema, type UnregisterActionSinkAction };

packages/core/src/sagas/actionSinkSaga.ts

@@ -1,25 +1,38 @@
 import { type Action } from 'redux';
 import { take, takeEvery } from 'redux-saga/effects';
-import { parse } from 'valibot';
+import { safeParse } from 'valibot';
 
-import { REGISTER_ACTION_SINK, type RegisterActionSinkAction } from '../actions/registerActionSink';
+import {
+  REGISTER_ACTION_SINK,
+  registerActionSinkActionSchema,
+  type RegisterActionSinkAction
+} from '../actions/registerActionSink';
 import { UNREGISTER_ACTION_SINK, unregisterActionSinkActionSchema } from '../actions/unregisterActionSink';
 
 export default function* actionSinkSaga() {
   yield takeEvery(
     ({ type }) => type === REGISTER_ACTION_SINK,
-    function* ({ payload: { sink } }: RegisterActionSinkAction) {
-      for (;;) {
-        const action: Action = yield take();
+    function* (action: RegisterActionSinkAction) {
+      const result = safeParse(registerActionSinkActionSchema, action);
 
-        if (
-          action.type === UNREGISTER_ACTION_SINK &&
-          parse(unregisterActionSinkActionSchema, action).payload.sink === sink
-        ) {
-          break;
-        }
+      if (result.success) {
+        const {
+          payload: { sink }
+        } = result.output;
+
+        for (;;) {
+          const action: Action = yield take();
+
+          if (action.type === UNREGISTER_ACTION_SINK) {
+            const result = safeParse(unregisterActionSinkActionSchema, action);
 
-        sink(action);
+            if (result.success && result.output.payload.sink === sink) {
+              break;
+            }
+          }
+
+          sink(action);
+        }
       }
     }
   );

packages/react-valibot/src/reactNode.ts

@@ -10,8 +10,11 @@ function reactNode<
 function reactNode<
   const TMessage extends ErrorMessage<CustomIssue> | undefined = ErrorMessage<CustomIssue> | undefined
 >(message?: TMessage): CustomSchema<ReactNode, TMessage> {
-  // TODO: Why do we need force cast?
-  return custom<ReactNode, TMessage>(() => true, message as TMessage);
+  return custom<ReactNode, TMessage>(
+    () => true,
+    // TODO: Probably lacking some undefined checks, thus, we need to force cast.
+    message as TMessage
+  );
 }
 
 export default reactNode;

packages/redux-store/src/suggestedActions/private/SuggestedActionsContext.ts

@@ -5,7 +5,7 @@ type SuggestedActionsContextType = Readonly<{
   useSuggestedActions: () => readonly [
     readonly DirectLineCardAction[],
     Dispatch<SetStateAction<readonly DirectLineCardAction[]>>,
-    Readonly<{ activity: WebChatActivity | undefined }>
+    Readonly<{ activity: undefined | WebChatActivity }>
   ];
 }>;