Move middleware typing to middleware package

Author: compulim

packages/api/src/hooks/Composer.tsx

@@ -32,6 +32,8 @@ import {
   type OneOrMany,
   type WebChatActivity
 } from 'botframework-webchat-core';
+import { type ActivityMiddleware, type AttachmentMiddleware } from 'botframework-webchat-middleware/legacy';
+import { ReduxStoreComposer } from 'botframework-webchat-redux-store';
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useMemo, useRef, useState, type ComponentType, type ReactNode } from 'react';
 import { Provider } from 'react-redux';
@@ -54,10 +56,8 @@ import ActivitySendStatusComposer from '../providers/ActivitySendStatus/Activity
 import ActivitySendStatusTelemetryComposer from '../providers/ActivitySendStatusTelemetry/ActivitySendStatusTelemetryComposer';
 import ActivityTypingComposer from '../providers/ActivityTyping/ActivityTypingComposer';
 import PonyfillComposer from '../providers/Ponyfill/PonyfillComposer';
-import ActivityMiddleware from '../types/ActivityMiddleware';
 import { type ActivityStatusMiddleware, type RenderActivityStatus } from '../types/ActivityStatusMiddleware';
 import AttachmentForScreenReaderMiddleware from '../types/AttachmentForScreenReaderMiddleware';
-import AttachmentMiddleware from '../types/AttachmentMiddleware';
 import AvatarMiddleware from '../types/AvatarMiddleware';
 import CardActionMiddleware from '../types/CardActionMiddleware';
 import { type ContextOf } from '../types/ContextOf';

packages/api/src/hooks/internal/WebChatAPIContext.ts

@@ -6,13 +6,12 @@ import {
   type sendMessage,
   type setSendBoxAttachments
 } from 'botframework-webchat-core';
+import { type LegacyActivityRenderer, type RenderAttachment } from 'botframework-webchat-middleware/legacy';
 import { createContext, type ComponentType } from 'react';
 
 import { StrictStyleOptions } from '../../StyleOptions';
-import { LegacyActivityRenderer } from '../../types/ActivityMiddleware';
 import { RenderActivityStatus } from '../../types/ActivityStatusMiddleware';
 import { AttachmentForScreenReaderComponentFactory } from '../../types/AttachmentForScreenReaderMiddleware';
-import { RenderAttachment } from '../../types/AttachmentMiddleware';
 import { AvatarComponentFactory } from '../../types/AvatarMiddleware';
 import { PerformCardAction } from '../../types/CardActionMiddleware';
 import { GroupActivities } from '../../types/GroupActivitiesMiddleware';

packages/api/src/hooks/internal/useCreateActivityRendererInternal.ts

@@ -1,7 +1,6 @@
 import { isValidElement, useMemo } from 'react';
+import { type ActivityComponentFactory, type RenderAttachment } from 'botframework-webchat-middleware/legacy';
 
-import { ActivityComponentFactory } from '../../types/ActivityMiddleware';
-import { RenderAttachment } from '../../types/AttachmentMiddleware';
 import useRenderAttachment from '../useRenderAttachment';
 import useWebChatAPIContext from './useWebChatAPIContext';
 

packages/api/src/hooks/useCreateActivityRenderer.ts

@@ -1,4 +1,4 @@
-import { ActivityComponentFactory } from '../types/ActivityMiddleware';
+import { type ActivityComponentFactory } from 'botframework-webchat-middleware/legacy';
 import useCreateActivityRendererInternal from './internal/useCreateActivityRendererInternal';
 
 // The newer useCreateActivityRenderer() hook does not support override renderAttachment().

packages/api/src/hooks/useRenderAttachment.ts

@@ -1,4 +1,4 @@
-import { type RenderAttachment } from '../types/AttachmentMiddleware';
+import { type RenderAttachment } from 'botframework-webchat-middleware/legacy';
 import useWebChatAPIContext from './internal/useWebChatAPIContext';
 
 export default function useRenderAttachment(): RenderAttachment | undefined {

packages/api/src/index.ts

@@ -1,4 +1,10 @@
 // TODO: Move the pattern to re-export.
+import {
+  type ActivityComponentFactory,
+  type ActivityMiddleware,
+  type AttachmentMiddleware,
+  type RenderAttachment
+} from 'botframework-webchat-middleware/legacy';
 import StyleOptions, { StrictStyleOptions } from './StyleOptions';
 import defaultStyleOptions from './defaultStyleOptions';
 import Composer, { ComposerProps } from './hooks/Composer';
@@ -9,12 +15,10 @@ import { type DebouncedNotification, type DebouncedNotifications } from './hooks
 import { type PostActivityFile } from './hooks/useSendFiles';
 import { localize } from './localization/Localize';
 import normalizeStyleOptions from './normalizeStyleOptions';
-import ActivityMiddleware, { type ActivityComponentFactory } from './types/ActivityMiddleware';
 import { type ActivityStatusMiddleware, type RenderActivityStatus } from './types/ActivityStatusMiddleware';
 import AttachmentForScreenReaderMiddleware, {
   AttachmentForScreenReaderComponentFactory
 } from './types/AttachmentForScreenReaderMiddleware';
-import AttachmentMiddleware, { type RenderAttachment } from './types/AttachmentMiddleware';
 import AvatarMiddleware, { type AvatarComponentFactory } from './types/AvatarMiddleware';
 import CardActionMiddleware, { type PerformCardAction } from './types/CardActionMiddleware';
 import { type ContextOf } from './types/ContextOf';

packages/middleware/package.json

@@ -5,6 +5,16 @@
   "main": "./dist/botframework-webchat-middleware.js",
   "types": "./dist/botframework-webchat-middleware.d.ts",
   "exports": {
+    "./legacy": {
+      "import": {
+        "types": "./dist/botframework-webchat-middleware.legacy.d.mts",
+        "default": "./dist/botframework-webchat-middleware.legacy.mjs"
+      },
+      "require": {
+        "types": "./dist/botframework-webchat-middleware.legacy.d.ts",
+        "default": "./dist/botframework-webchat-middleware.legacy.js"
+      }
+    },
     ".": {
       "import": {
         "types": "./dist/botframework-webchat-middleware.d.mts",

packages/middleware/src/internal/createActivityPolyMiddlewareFromLegacy.tsx

@@ -1,7 +1,8 @@
-import { type ActivityMiddleware, type RenderAttachment } from 'botframework-webchat-api';
 import { type WebChatActivity } from 'botframework-webchat-core';
 import { composeEnhancer } from 'handler-chain';
 import React, { type ComponentType, type ReactNode } from 'react';
+import type ActivityMiddleware from '../legacy/activityMiddleware';
+import { type RenderAttachment } from '../legacy/attachmentMiddleware';
 
 import { custom, function_, never, object, optional, pipe, readonly, safeParse, type InferInput } from 'valibot';
 import {

packages/middleware/src/legacy.ts

@@ -0,0 +1,6 @@
+export {
+  type ActivityComponentFactory,
+  type default as ActivityMiddleware,
+  type LegacyActivityRenderer
+} from './legacy/activityMiddleware';
+export { type default as AttachmentMiddleware, type RenderAttachment } from './legacy/attachmentMiddleware';

…ages/api/src/types/ActivityMiddleware.ts …dleware/src/legacy/activityMiddleware.tspackages/api/src/types/ActivityMiddleware.ts renamed to packages/middleware/src/legacy/activityMiddleware.ts packages/api/src/types/ActivityMiddleware.ts renamed to packages/middleware/src/legacy/activityMiddleware.ts

@@ -1,8 +1,8 @@
-// TODO: Move this to botframework-webchat-middleware.
+// TODO: This is moved from /api, need to revisit/rewrite everything in this file.
 import { type WebChatActivity } from 'botframework-webchat-core';
 import { type ReactNode } from 'react';
 
-import { type RenderAttachment } from './AttachmentMiddleware';
+import { type RenderAttachment } from './attachmentMiddleware';
 
 type ActivityProps = {
   hideTimestamp: boolean;