Skip to content

Commit 32a0fd8

Browse files
compulimcompulim
committed
Group exports and fix tsd
1 parent 88deeb1 commit 32a0fd8

27 files changed

Lines changed: 66 additions & 61 deletions

‎packages/bundle/src/boot/actual/full-es5.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { buildInfo as minimalBuildInfo, version } from './minimal';
21
import defaultCreateDirectLine from '../../createDirectLine';
32
import defaultCreateDirectLineAppServiceExtension from '../../createDirectLineAppServiceExtension';
3+
import ReactWebChat from './full';
4+
import { buildInfo as minimalBuildInfo, version } from './minimal';
45

5-
export * from './full';
6-
7-
export const buildInfo = Object.freeze({ ...minimalBuildInfo, variant: 'full-es5' });
6+
const buildInfo = Object.freeze({ ...minimalBuildInfo, variant: 'full-es5' });
87

9-
export const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDirectLine>[0], 'botAgent'>) => {
8+
const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDirectLine>[0], 'botAgent'>) => {
109
(options as any).botAgent &&
1110
console.warn(
1211
'Web Chat: Developers are not currently allowed to set botAgent. See https://github.com/microsoft/BotFramework-WebChat/issues/2119 for more details.'
@@ -15,7 +14,7 @@ export const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDi
1514
return defaultCreateDirectLine({ ...options, botAgent: `WebChat/${version} (ES5)` });
1615
};
1716

18-
export const createDirectLineAppServiceExtension = (
17+
const createDirectLineAppServiceExtension = (
1918
options: Omit<Parameters<typeof defaultCreateDirectLineAppServiceExtension>[0], 'botAgent'>
2019
) => {
2120
(options as any).botAgent &&
@@ -25,3 +24,7 @@ export const createDirectLineAppServiceExtension = (
2524

2625
return defaultCreateDirectLineAppServiceExtension({ ...options, botAgent: `WebChat/${version} (ES5)` });
2726
};
27+
28+
export * from './full';
29+
export { buildInfo, createDirectLine, createDirectLineAppServiceExtension };
30+
export default ReactWebChat;

‎packages/bundle/src/boot/actual/full.ts‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,7 @@ const renderWebChat = coreRenderWebChat.bind(null, ReactWebChat);
3030

3131
const buildInfo = Object.freeze({ ...minimalBuildInfo, variant: 'full' });
3232

33-
export {
34-
Constants,
35-
concatMiddleware,
36-
createBrowserWebSpeechPonyfillFactory,
37-
createStore,
38-
createStoreWithDevTools,
39-
createStoreWithOptions,
40-
decorator,
41-
internal,
42-
testIds,
43-
version
44-
} from './minimal';
45-
46-
export const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDirectLine>[0], 'botAgent'>) => {
33+
const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDirectLine>[0], 'botAgent'>) => {
4734
(options as any).botAgent &&
4835
console.warn(
4936
'Web Chat: Developers are not currently allowed to set botAgent. See https://github.com/microsoft/BotFramework-WebChat/issues/2119 for more details.'
@@ -52,7 +39,7 @@ export const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDi
5239
return defaultCreateDirectLine({ ...options, botAgent: `WebChat/${version} (Full)` });
5340
};
5441

55-
export const createDirectLineAppServiceExtension = (
42+
const createDirectLineAppServiceExtension = (
5643
options: Omit<Parameters<typeof defaultCreateDirectLineAppServiceExtension>[0], 'botAgent'>
5744
) => {
5845
(options as any).botAgent &&
@@ -94,20 +81,34 @@ type StyleOptions = FullBundleStyleOptions;
9481
type StrictStyleOptions = StrictFullBundleStyleOptions;
9582

9683
export default ReactWebChat;
97-
84+
export {
85+
Constants,
86+
concatMiddleware,
87+
createBrowserWebSpeechPonyfillFactory,
88+
createStore,
89+
createStoreWithDevTools,
90+
createStoreWithOptions,
91+
decorator,
92+
internal,
93+
testIds,
94+
version
95+
} from './minimal';
9896
export {
9997
Components,
10098
ReactWebChat,
10199
buildInfo,
102100
createAdaptiveCardsAttachmentForScreenReaderMiddleware,
103101
createAdaptiveCardsAttachmentMiddleware,
104102
createCognitiveServicesSpeechServicesPonyfillFactory,
103+
createDirectLine,
104+
createDirectLineAppServiceExtension,
105105
createDirectLineSpeechAdapters,
106106
createStyleSet,
107107
patchedHooks as hooks,
108108
renderMarkdown,
109109
renderWebChat,
110-
withEmoji
110+
withEmoji,
111+
type AdaptiveCardsPackage,
112+
type StrictStyleOptions,
113+
type StyleOptions
111114
};
112-
113-
export type { AdaptiveCardsPackage, StrictStyleOptions, StyleOptions };

‎packages/bundle/src/boot/actual/minimal.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const buildInfo = Object.freeze({
3131
version
3232
});
3333

34-
export const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDirectLine>[0], 'botAgent'>) => {
34+
const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDirectLine>[0], 'botAgent'>) => {
3535
(options as any).botAgent &&
3636
console.warn(
3737
'Web Chat: Developers are not currently allowed to set botAgent. See https://github.com/microsoft/BotFramework-WebChat/issues/2119 for more details.'
@@ -40,7 +40,7 @@ export const createDirectLine = (options: Omit<Parameters<typeof defaultCreateDi
4040
return defaultCreateDirectLine({ ...options, botAgent: `WebChat/${version} (Minimal)` });
4141
};
4242

43-
export const createDirectLineAppServiceExtension = (
43+
const createDirectLineAppServiceExtension = (
4444
options: Omit<Parameters<typeof defaultCreateDirectLineAppServiceExtension>[0], 'botAgent'>
4545
) => {
4646
(options as any).botAgent &&
@@ -51,19 +51,20 @@ export const createDirectLineAppServiceExtension = (
5151
return defaultCreateDirectLineAppServiceExtension({ ...options, botAgent: `WebChat/${version} (Minimal)` });
5252
};
5353

54-
export default ReactWebChat;
55-
5654
const decorator = Object.freeze({
5755
...apiDecorator,
5856
...componentDecorator
5957
});
6058

59+
export default ReactWebChat;
6160
export {
6261
buildInfo,
6362
Components,
6463
concatMiddleware,
6564
Constants,
6665
createBrowserWebSpeechPonyfillFactory,
66+
createDirectLine,
67+
createDirectLineAppServiceExtension,
6768
createStore,
6869
createStoreWithDevTools,
6970
createStoreWithOptions,
@@ -75,7 +76,7 @@ export {
7576
renderWebChat,
7677
testIds,
7778
version,
78-
withEmoji
79+
withEmoji,
80+
type StrictStyleOptions,
81+
type StyleOptions
7982
};
80-
81-
export { type StrictStyleOptions, type StyleOptions };

‎packages/bundle/src/boot/exports/full-es5.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { buildInfo as actualBuildInfo } from '../actual/full-es5';
1+
import ReactWebChat, { buildInfo as actualBuildInfo } from '../actual/full-es5';
22
import addVersion from '../addVersion';
33

44
export * from '../actual/full-es5';
5-
5+
export default ReactWebChat;
66
export const buildInfo = Object.freeze({ ...actualBuildInfo, variant: 'full-es5' });
77

88
addVersion(buildInfo);

‎packages/bundle/src/boot/exports/full.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { buildInfo as actualBuildInfo } from '../actual/full';
1+
import ReactWebChat, { buildInfo as actualBuildInfo } from '../actual/full';
22
import addVersion from '../addVersion';
33

44
export * from '../actual/full';
5-
5+
export default ReactWebChat;
66
export const buildInfo = Object.freeze({ ...actualBuildInfo, variant: 'full' });
77

88
addVersion(buildInfo);

‎packages/bundle/src/boot/exports/minimal.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { buildInfo as actualBuildInfo } from '../actual/minimal';
1+
import ReactWebChat, { buildInfo as actualBuildInfo } from '../actual/minimal';
22
import addVersion from '../addVersion';
33

44
export * from '../actual/minimal';
5-
5+
export default ReactWebChat;
66
export const buildInfo = Object.freeze({ ...actualBuildInfo, variant: 'minimal' });
77

88
addVersion(buildInfo);

‎packages/bundle/test-d/fail-once/create-direct-line-invalid-bot-agent.test-d.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expectNotAssignable } from 'tsd';
22

3-
import { createDirectLine } from '../../src/module/exports';
3+
import { createDirectLine } from '../../src/boot/exports/full';
44

55
// "botAgent" is a forbidden option.
66
type CreateDirectLineInit = Parameters<typeof createDirectLine>[0];

‎packages/bundle/test-d/fail-once/create-direct-line-invalid-option.test-d.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expectNotAssignable } from 'tsd';
22

3-
import { createDirectLine } from '../../src/module/exports';
3+
import { createDirectLine } from '../../src/boot/exports/full';
44

55
type CreateDirectLineInit = Parameters<typeof createDirectLine>[0];
66

‎packages/bundle/test-d/fail-once/invalid-prop-type-dir.test-d.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { type ComponentType } from 'react';
22
import { expectNotAssignable } from 'tsd';
33

4-
import ReactWebChat from '../../src/module/exports';
4+
import ReactWebChat from '../../src/boot/exports/full';
55

66
type PropsOf<T> = T extends ComponentType<infer P> ? P : never;
77

‎packages/bundle/test-d/fail-once/invalid-style-options-suggested-actions-stacked-overflow.test-d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expectNotAssignable } from 'tsd';
22

3-
import { createStyleSet } from '../../src/module/exports';
3+
import { createStyleSet } from '../../src/boot/exports/full';
44

55
type CreateStyleSetInit = Parameters<typeof createStyleSet>[0];
66

0 commit comments

Comments
 (0)