diff --git a/libraries/adaptive-expressions/etc/adaptive-expressions.api.md b/libraries/adaptive-expressions/etc/adaptive-expressions.api.md index cb06486458..adbca400b7 100644 --- a/libraries/adaptive-expressions/etc/adaptive-expressions.api.md +++ b/libraries/adaptive-expressions/etc/adaptive-expressions.api.md @@ -206,7 +206,7 @@ export class BoolExpression extends ExpressionProperty { // @public export class BoolExpressionConverter { - // Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "Input_2" needs to be exported by the entry point index.d.ts convert(value: Input_2 | BoolExpression): BoolExpression; } @@ -330,7 +330,7 @@ export class Clause extends Expression { // @public export class CommonRegex { static CreateRegex(pattern: string): RegExp; - } +} // @public (undocumented) export class CommonRegexLexer extends Lexer { @@ -1010,7 +1010,7 @@ export interface CommonRegexVisitor extends ParseTreeVisitor { // @public export class ComparisonEvaluator extends ExpressionEvaluator { constructor(type: string, func: (arg0: any[]) => boolean, validator: ValidateExpressionDelegate, verify?: VerifyExpression); - } +} // @public export class Constant extends Expression { @@ -1018,7 +1018,7 @@ export class Constant extends Expression { deepEquals(other: Expression): boolean; toString(): string; value: any; - } +} // @public export function convertCSharpDateTimeToDayjs(fmtString: string): string; @@ -1099,9 +1099,9 @@ export class EnumExpression extends ExpressionProperty { // @public export class EnumExpressionConverter { constructor(enumValue: unknown); - // Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "Input_3" needs to be exported by the entry point index.d.ts convert(value: Input_3 | EnumExpression): EnumExpression; - } +} // @public export type EvaluateExpressionDelegate = (expression: Expression, state: MemoryInterface, options: Options) => ValueWithError; @@ -1518,7 +1518,7 @@ export class ExpressionEvaluator { tryEvaluate: (expression: Expression, state: MemoryInterface, options: Options) => ValueWithError; type: string; validateExpression: (expression: Expression) => void; - } +} // @public export class ExpressionFunctions { @@ -2054,7 +2054,7 @@ export class IntExpression extends ExpressionProperty { // @public export class IntExpressionConverter { - // Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "Input_4" needs to be exported by the entry point index.d.ts convert(value: Input_4 | IntExpression): IntExpression; } @@ -2677,7 +2677,7 @@ export interface MemoryInterface { // @public export class MultivariateNumericEvaluator extends ExpressionEvaluator { constructor(type: string, func: (args: any[]) => number, verify?: VerifyExpression); - } +} // @public (undocumented) export class NameContext extends ParserRuleContext { @@ -2707,8 +2707,7 @@ class Node_2 { toString(builder?: string[], indent?: number): string; tree: TriggerTree; readonly triggers: Trigger[]; - } - +} export { Node_2 as Node } // @public (undocumented) @@ -2789,14 +2788,14 @@ export class NumberExpression extends ExpressionProperty { // @public export class NumberExpressionConverter { - // Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "Input_5" needs to be exported by the entry point index.d.ts convert(value: Input_5 | NumberExpression): NumberExpression; } // @public export class NumberTransformEvaluator extends ExpressionEvaluator { constructor(type: string, func: (args: any[]) => number); - } +} // @public (undocumented) export class NumericAtomContext extends PrimaryExpressionContext { @@ -2814,7 +2813,7 @@ export class NumericAtomContext extends PrimaryExpressionContext { // @public export class NumericEvaluator extends ExpressionEvaluator { constructor(type: string, func: (args: any[]) => any); - } +} // @public export class ObjectExpression extends ExpressionProperty { @@ -2823,7 +2822,7 @@ export class ObjectExpression extends ExpressionProperty { // @public export class ObjectExpressionConverter { - // Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "Input_6" needs to be exported by the entry point index.d.ts convert(value: Input_6 | ObjectExpression): ObjectExpression; } @@ -3102,7 +3101,6 @@ enum ReturnType_2 { Object = 4, String = 8 } - export { ReturnType_2 as ReturnType } // @public (undocumented) @@ -3240,7 +3238,7 @@ export class StringExpression extends ExpressionProperty { // @public export class StringExpressionConverter { - // Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "Input_7" needs to be exported by the entry point index.d.ts convert(value: Input_7 | StringExpression): StringExpression; } @@ -3311,14 +3309,14 @@ export class TextContentContext extends ParserRuleContext { // @public export class TimeTransformEvaluator extends ExpressionEvaluator { constructor(type: string, func: (timestamp: Date, numOfTransformation: number) => Date); - } +} // @public export class TimeZoneConverter { static ianaToWindows(ianaTimeZoneId: string): string; static verifyTimeZoneStr(timezoneStr: string): boolean; static windowsToIana(windowsTimeZoneId: string): string; - } +} // @public export class Trigger { @@ -3329,7 +3327,7 @@ export class Trigger { readonly originalExpression: Expression; relationship(other: Trigger, comparers: PredicateComparers): RelationshipType; toString(builder?: string[], indent?: number): string; - } +} // @public export class TriggerTree { @@ -3345,7 +3343,7 @@ export class TriggerTree { totalTriggers: number; treeToString(indent?: number): string; verifyTree(): Node_2; - } +} // @public (undocumented) export class TripleOpExpContext extends ExpressionContext { @@ -3413,7 +3411,6 @@ export type ValueWithError = { // @public export type VerifyExpression = (value: any, expression: Expression, child: number) => string | undefined; - // (No @packageDocumentation comment for this package) ``` diff --git a/libraries/botbuilder-ai/etc/botbuilder-ai.api.md b/libraries/botbuilder-ai/etc/botbuilder-ai.api.md index 4fb88020a0..9bf6f33b32 100644 --- a/libraries/botbuilder-ai/etc/botbuilder-ai.api.md +++ b/libraries/botbuilder-ai/etc/botbuilder-ai.api.md @@ -63,8 +63,8 @@ export interface AnswerSpanResponse { text: string; } -// Warning: (ae-forgotten-export) The symbol "QnAMakerClient" needs to be exported by the entry point index.d.ts -// Warning: (ae-forgotten-export) The symbol "QnAMakerTelemetryClient" needs to be exported by the entry point index.d.ts +// Warning: (ae-forgotten-export) The symbol "QnAMakerClient_2" needs to be exported by the entry point index.d.ts +// Warning: (ae-forgotten-export) The symbol "QnAMakerTelemetryClient_2" needs to be exported by the entry point index.d.ts // // @public export class CustomQuestionAnswering implements QnAMakerClient_2, QnAMakerTelemetryClient_2 { @@ -94,7 +94,7 @@ export class CustomQuestionAnswering implements QnAMakerClient_2, QnAMakerTeleme [key: string]: number; }): Promise; get telemetryClient(): BotTelemetryClient; - } +} // @public export interface DateTimeSpec { @@ -228,7 +228,7 @@ export class LuisAdaptiveRecognizer extends Recognizer implements LuisAdaptiveRe // (undocumented) static $kind: string; applicationId: StringExpression; - // Warning: (ae-forgotten-export) The symbol "DynamicList" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "DynamicList_2" needs to be exported by the entry point index.d.ts dynamicLists: ArrayExpression; endpoint: StringExpression; endpointKey: StringExpression; @@ -287,7 +287,7 @@ export class LuisBotComponent extends BotComponent { export class LuisComponentRegistration extends ComponentRegistration { constructor(); getDeclarativeTypes(_resourceExplorer: unknown): ComponentDeclarativeTypes[]; - } +} // @public export interface LuisPredictionOptions extends msRest.RequestOptionsBase { @@ -327,7 +327,7 @@ export class LuisRecognizer implements LuisRecognizerTelemetryClient { }>; get telemetryClient(): BotTelemetryClient; static topIntent(results?: RecognizerResult, defaultIntent?: string, minScore?: number): string; - } +} // @public (undocumented) export interface LuisRecognizerOptions { @@ -467,7 +467,7 @@ export class QnAMaker implements QnAMakerClient, QnAMakerTelemetryClient { [key: string]: number; }): Promise; get telemetryClient(): BotTelemetryClient; - } +} // @public (undocumented) export const QNAMAKER_TRACE_LABEL = "QnAMaker Trace"; @@ -499,7 +499,7 @@ export const QnAMakerClientKey: unique symbol; export class QnAMakerComponentRegistration extends ComponentRegistration { constructor(); getDeclarativeTypes(_resourceExplorer: unknown): ComponentDeclarativeTypes[]; - } +} // Warning: (ae-forgotten-export) The symbol "QnAMakerDialogConfiguration" needs to be exported by the entry point index.d.ts // @@ -742,7 +742,6 @@ export function validateExternalEntity(entity: ExternalEntity): void; // @public export function validateListElement(element: ListElement): void; - // (No @packageDocumentation comment for this package) ``` diff --git a/libraries/botbuilder-dialogs-adaptive-runtime-integration-azure-functions/package.json b/libraries/botbuilder-dialogs-adaptive-runtime-integration-azure-functions/package.json index 28fbea4743..10cf5437e2 100644 --- a/libraries/botbuilder-dialogs-adaptive-runtime-integration-azure-functions/package.json +++ b/libraries/botbuilder-dialogs-adaptive-runtime-integration-azure-functions/package.json @@ -33,7 +33,7 @@ "botbuilder-dialogs-adaptive-runtime": "4.1.6", "botbuilder-dialogs-adaptive-runtime-core": "4.1.6", "mime": "^2.5.2", - "zod": "~1.11.17" + "zod": "^3.22.4" }, "scripts": { "build": "tsc -b", diff --git a/libraries/botbuilder-dialogs-adaptive-runtime-integration-express/package.json b/libraries/botbuilder-dialogs-adaptive-runtime-integration-express/package.json index 8f204a7bab..0c287ee3f5 100644 --- a/libraries/botbuilder-dialogs-adaptive-runtime-integration-express/package.json +++ b/libraries/botbuilder-dialogs-adaptive-runtime-integration-express/package.json @@ -43,6 +43,6 @@ "botbuilder-dialogs-adaptive-runtime": "4.1.6", "botbuilder-dialogs-adaptive-runtime-core": "4.1.6", "express": "^4.17.3", - "zod": "~1.11.17" + "zod": "^3.22.4" } } diff --git a/libraries/botbuilder-dialogs-adaptive-runtime-integration-restify/package.json b/libraries/botbuilder-dialogs-adaptive-runtime-integration-restify/package.json index 7ff5a6b5e5..8bb0f5f7a4 100644 --- a/libraries/botbuilder-dialogs-adaptive-runtime-integration-restify/package.json +++ b/libraries/botbuilder-dialogs-adaptive-runtime-integration-restify/package.json @@ -32,7 +32,7 @@ "botbuilder-dialogs-adaptive-runtime": "4.1.6", "botbuilder-dialogs-adaptive-runtime-core": "4.1.6", "restify": "^8.5.1", - "zod": "~1.11.17" + "zod": "^3.22.4" }, "scripts": { "build": "tsc -b", diff --git a/libraries/botbuilder-dialogs-adaptive-runtime/package.json b/libraries/botbuilder-dialogs-adaptive-runtime/package.json index 480d7a1cca..a09b90edda 100644 --- a/libraries/botbuilder-dialogs-adaptive-runtime/package.json +++ b/libraries/botbuilder-dialogs-adaptive-runtime/package.json @@ -41,7 +41,7 @@ "botframework-connector": "4.1.6", "nconf": "0.11.4", "yargs-parser": "^20.2.7", - "zod": "~1.11.17" + "zod": "^3.22.4" }, "devDependencies": { "@types/nconf": "0.10.0", diff --git a/libraries/botbuilder-dialogs-adaptive-runtime/src/configuration.ts b/libraries/botbuilder-dialogs-adaptive-runtime/src/configuration.ts index 8fb0596298..70adb419bd 100644 --- a/libraries/botbuilder-dialogs-adaptive-runtime/src/configuration.ts +++ b/libraries/botbuilder-dialogs-adaptive-runtime/src/configuration.ts @@ -171,8 +171,9 @@ export class Configuration implements CoreConfiguration { try { return t.optional().parse(this.get(path)); } catch (err) { - if (z.instanceof(z.ZodError).check(err)) { - err.errors.forEach((error) => (error.path = [...this.prefix, ...path, ...error.path])); + const zodError = z.instanceof(z.ZodError).safeParse(err); + if (zodError.success) { + zodError.data.errors.forEach((error) => (error.path = [...this.prefix, ...path, ...error.path])); } throw err; diff --git a/libraries/botbuilder-dialogs-adaptive-testing/etc/botbuilder-dialogs-adaptive-testing.api.md b/libraries/botbuilder-dialogs-adaptive-testing/etc/botbuilder-dialogs-adaptive-testing.api.md index 0909a2da3a..8a3aabbbe6 100644 --- a/libraries/botbuilder-dialogs-adaptive-testing/etc/botbuilder-dialogs-adaptive-testing.api.md +++ b/libraries/botbuilder-dialogs-adaptive-testing/etc/botbuilder-dialogs-adaptive-testing.api.md @@ -4,6 +4,8 @@ ```ts +/// + import { Activity } from 'botbuilder-core'; import { BotComponent } from 'botbuilder-core'; import { ClientRequest } from 'http'; @@ -155,7 +157,6 @@ class CustomEvent_2 extends TestAction implements CustomEventConfig name: string; value?: T; } - export { CustomEvent_2 as CustomEvent } // @public (undocumented) @@ -215,14 +216,14 @@ export class MockLuisLoader implements CustomDeserializer); // (undocumented) load(config: LuisAdaptiveRecognizerConfiguration, type: Newable): MockLuisRecognizer; - } +} // @public export class MockLuisRecognizer extends Recognizer { constructor(recognizer: LuisAdaptiveRecognizer, resourceDir: string, name: string); // (undocumented) recognize(dialogContext: DialogContext, activity: Activity, telemetryProperties?: Record, telemetryMetrics?: Record): Promise; - } +} // @public export class MockSettingsMiddleware implements Middleware { @@ -386,7 +387,6 @@ export interface UserTypingConfiguration { user?: string; } - // (No @packageDocumentation comment for this package) ``` diff --git a/libraries/botbuilder-dialogs-adaptive-testing/package.json b/libraries/botbuilder-dialogs-adaptive-testing/package.json index cacf6da29d..ae5e039f55 100644 --- a/libraries/botbuilder-dialogs-adaptive-testing/package.json +++ b/libraries/botbuilder-dialogs-adaptive-testing/package.json @@ -35,7 +35,7 @@ "murmurhash-js": "^1.0.0", "nock": "^11.9.1", "url-parse": "^1.5.9", - "zod": "~1.11.17" + "zod": "^3.22.4" }, "devDependencies": { "botbuilder": "4.1.6", diff --git a/libraries/botbuilder-dialogs-adaptive-testing/src/testActions/userActivity.ts b/libraries/botbuilder-dialogs-adaptive-testing/src/testActions/userActivity.ts index 43bcf3a881..03ec7a83e5 100644 --- a/libraries/botbuilder-dialogs-adaptive-testing/src/testActions/userActivity.ts +++ b/libraries/botbuilder-dialogs-adaptive-testing/src/testActions/userActivity.ts @@ -63,7 +63,7 @@ export class UserActivity extends TestAction implements UserActivityConfiguratio activity.from = { ...activity.from }; activity.from.id = this.user; activity.from.name = this.user; - } else if (z.record(z.unknown()).check(this.activity?.from)) { + } else if (z.record(z.unknown()).safeParse(this.activity?.from).success) { activity.from = { ...this.activity.from }; } diff --git a/libraries/botbuilder-dialogs-adaptive/etc/botbuilder-dialogs-adaptive.api.md b/libraries/botbuilder-dialogs-adaptive/etc/botbuilder-dialogs-adaptive.api.md index 97c297d4c1..38d4cb7a57 100644 --- a/libraries/botbuilder-dialogs-adaptive/etc/botbuilder-dialogs-adaptive.api.md +++ b/libraries/botbuilder-dialogs-adaptive/etc/botbuilder-dialogs-adaptive.api.md @@ -185,7 +185,7 @@ export class AdaptiveDialog extends DialogContainer im get schema(): object; selector: TriggerSelector; triggers: OnCondition[]; - } +} // @public (undocumented) export interface AdaptiveDialogConfiguration extends DialogConfiguration { @@ -538,7 +538,7 @@ export class ChoiceOptionsSet implements ChoiceFactoryOptions, TemplateInterface inlineOrMore?: string; // (undocumented) inlineSeparator?: string; - } +} // @public (undocumented) export enum ChoiceOutputFormat { @@ -552,7 +552,7 @@ export enum ChoiceOutputFormat { export class ChoiceSet extends Array implements TemplateInterface { constructor(obj: any); bind(dialogContext: DialogContext, data?: DialogStateManager): Promise; - } +} // @public export class CodeAction extends Dialog { @@ -827,7 +827,7 @@ export class DialogExpression extends ExpressionProperty { export class DialogExpressionConverter implements Converter { constructor(_resourceExplorer: ResourceExplorer); convert(value: Input | DialogExpression): DialogExpression; - } +} // @public (undocumented) export type DialogProperty = Dialog | DialogExpression | Property; @@ -1251,7 +1251,7 @@ export class IfCondition extends Dialog implements Dia getDependencies(): Dialog[]; protected onComputeId(): string; protected get trueScope(): ActionScope; - } +} // @public (undocumented) export interface IfConditionConfiguration extends DialogConfiguration { @@ -1395,7 +1395,7 @@ export class LanguageGeneratorManager>; static resourceExplorerResolver(locale: string, resourceMapping: Map): ImportResolverDelegate; - } +} // @public export const languageGeneratorManagerKey: unique symbol; @@ -1468,7 +1468,7 @@ export class MostSpecificSelector extends TriggerSelector implements MostSpecifi select(context: ActionContext): Promise; // (undocumented) selector: TriggerSelector; - } +} // @public (undocumented) export interface MostSpecificSelectorConfiguration { @@ -2360,7 +2360,7 @@ export class TemplateEngineLanguageGenerator; // (undocumented) id: string; - } +} // @public (undocumented) export interface TemplateEngineLanguageGeneratorConfiguration { @@ -2494,7 +2494,7 @@ export class UpdateActivity extends Dialog implements // (undocumented) static $kind: string; constructor(); - // Warning: (ae-forgotten-export) The symbol "D" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "D_2" needs to be exported by the entry point index.d.ts activity: TemplateInterface, D_2 & O>; activityId: StringExpression; beginDialog(dc: DialogContext, options?: O): Promise; @@ -2524,7 +2524,6 @@ export class UrlEntityRecognizer extends TextEntityRecognizer { // @public export function useTelemetry(dialogManager: DialogManager, telemetryClient: BotTelemetryClient): DialogManager; - // (No @packageDocumentation comment for this package) ``` diff --git a/libraries/botbuilder-dialogs-declarative/package.json b/libraries/botbuilder-dialogs-declarative/package.json index 8267c7f7f5..8e83bd25a0 100644 --- a/libraries/botbuilder-dialogs-declarative/package.json +++ b/libraries/botbuilder-dialogs-declarative/package.json @@ -31,7 +31,7 @@ "botbuilder-dialogs": "4.1.6", "botbuilder-stdlib": "4.1.6", "chokidar": "^3.4.0", - "zod": "~1.11.17" + "zod": "^3.22.4" }, "devDependencies": { "adaptive-expressions": "4.1.6", diff --git a/libraries/botbuilder-dialogs-declarative/src/componentDeclarativeTypes.ts b/libraries/botbuilder-dialogs-declarative/src/componentDeclarativeTypes.ts index e7ec0cbec9..6ff9196107 100644 --- a/libraries/botbuilder-dialogs-declarative/src/componentDeclarativeTypes.ts +++ b/libraries/botbuilder-dialogs-declarative/src/componentDeclarativeTypes.ts @@ -30,5 +30,5 @@ const componentDeclarativeTypes = z.custom( * @returns {boolean} Type check result. */ export function isComponentDeclarativeTypes(component: unknown): component is ComponentDeclarativeTypes { - return componentDeclarativeTypes.check(component); + return componentDeclarativeTypes.safeParse(component).success; } diff --git a/libraries/botbuilder-dialogs/package.json b/libraries/botbuilder-dialogs/package.json index e2c9be7451..0b44d6c75e 100644 --- a/libraries/botbuilder-dialogs/package.json +++ b/libraries/botbuilder-dialogs/package.json @@ -37,7 +37,7 @@ "globalize": "^1.4.2", "lodash": "^4.17.21", "uuid": "^8.3.2", - "zod": "~1.11.17" + "zod": "^3.22.4" }, "devDependencies": { "@types/globalize": "^1.5.0", diff --git a/libraries/botbuilder-dialogs/src/dialogsBotComponent.ts b/libraries/botbuilder-dialogs/src/dialogsBotComponent.ts index ba2cfbf88f..d4766f6ff6 100644 --- a/libraries/botbuilder-dialogs/src/dialogsBotComponent.ts +++ b/libraries/botbuilder-dialogs/src/dialogsBotComponent.ts @@ -39,7 +39,8 @@ export class DialogsBotComponent extends BotComponent { configureServices(services: ServiceCollection, configuration: Configuration): void { services.composeFactory('memoryScopes', (memoryScopes) => { const rootConfiguration = configuration.get(); - const initialSettings = InitialSettings.check(rootConfiguration) ? rootConfiguration : undefined; + const rootConfigurationParse = InitialSettings.safeParse(rootConfiguration); + const initialSettings = rootConfigurationParse.success ? rootConfigurationParse.data : undefined; return memoryScopes.concat( new TurnMemoryScope(), diff --git a/libraries/botbuilder-dialogs/src/memory/componentMemoryScopes.ts b/libraries/botbuilder-dialogs/src/memory/componentMemoryScopes.ts index a6dd22112f..7211eda896 100644 --- a/libraries/botbuilder-dialogs/src/memory/componentMemoryScopes.ts +++ b/libraries/botbuilder-dialogs/src/memory/componentMemoryScopes.ts @@ -28,5 +28,5 @@ const componentMemoryScopes = z.custom((val: any) => type * @returns {boolean} Type check result. */ export function isComponentMemoryScopes(component: unknown): component is ComponentMemoryScopes { - return componentMemoryScopes.check(component); + return componentMemoryScopes.safeParse(component).success; } diff --git a/libraries/botbuilder-dialogs/src/memory/componentPathResolvers.ts b/libraries/botbuilder-dialogs/src/memory/componentPathResolvers.ts index 09003cc459..11ff2f48ce 100644 --- a/libraries/botbuilder-dialogs/src/memory/componentPathResolvers.ts +++ b/libraries/botbuilder-dialogs/src/memory/componentPathResolvers.ts @@ -29,5 +29,5 @@ const componentPathResolvers = z.custom( * @returns {boolean} Type check result. */ export function isComponentPathResolvers(component: unknown): component is ComponentPathResolvers { - return componentPathResolvers.check(component); + return componentPathResolvers.safeParse(component).success; } diff --git a/libraries/botbuilder-dialogs/src/prompts/userTokenAccess.ts b/libraries/botbuilder-dialogs/src/prompts/userTokenAccess.ts index 1d2533cf08..3aeebc8af2 100644 --- a/libraries/botbuilder-dialogs/src/prompts/userTokenAccess.ts +++ b/libraries/botbuilder-dialogs/src/prompts/userTokenAccess.ts @@ -53,6 +53,8 @@ export async function getUserToken( const userTokenClient = context.turnState.get( (context.adapter as CloudAdapterBase).UserTokenClientKey ); + const extendedUserTokenProvider = ExtendedUserTokenProviderT.safeParse(context.adapter); + if (userTokenClient) { return userTokenClient.getUserToken( context.activity?.from?.id, @@ -60,8 +62,13 @@ export async function getUserToken( context.activity?.channelId, magicCode ); - } else if (ExtendedUserTokenProviderT.check(context.adapter)) { - return context.adapter.getUserToken(context, settings.connectionName, magicCode, settings.oAuthAppCredentials); + } else if (extendedUserTokenProvider.success) { + return extendedUserTokenProvider.data.getUserToken( + context, + settings.connectionName, + magicCode, + settings.oAuthAppCredentials + ); } else { throw new Error('OAuth prompt is not supported by the current adapter'); } @@ -77,10 +84,11 @@ export async function getSignInResource( const userTokenClient = context.turnState.get( (context.adapter as CloudAdapterBase).UserTokenClientKey ); + const extendedUserTokenProvider = ExtendedUserTokenProviderT.safeParse(context.adapter); if (userTokenClient) { return userTokenClient.getSignInResource(settings.connectionName, context.activity, undefined); - } else if (ExtendedUserTokenProviderT.check(context.adapter)) { - return context.adapter.getSignInResource( + } else if (extendedUserTokenProvider.success) { + return extendedUserTokenProvider.data.getSignInResource( context, settings.connectionName, context.activity?.from?.id, @@ -99,14 +107,15 @@ export async function signOutUser(context: TurnContext, settings: OAuthPromptSet const userTokenClient = context.turnState.get( (context.adapter as CloudAdapterBase).UserTokenClientKey ); + const extendedUserTokenProvider = ExtendedUserTokenProviderT.safeParse(context.adapter); if (userTokenClient) { await userTokenClient.signOutUser( context.activity?.from?.id, settings.connectionName, context.activity?.channelId ); - } else if (ExtendedUserTokenProviderT.check(context.adapter)) { - await context.adapter.signOutUser( + } else if (extendedUserTokenProvider.success) { + await extendedUserTokenProvider.data.signOutUser( context, settings.connectionName, context.activity?.from?.id, @@ -128,6 +137,8 @@ export async function exchangeToken( const userTokenClient = context.turnState.get( (context.adapter as CloudAdapterBase).UserTokenClientKey ); + const extendedUserTokenProvider = ExtendedUserTokenProviderT.safeParse(context.adapter); + if (userTokenClient) { return userTokenClient.exchangeToken( context.activity?.from?.id, @@ -135,8 +146,8 @@ export async function exchangeToken( context.activity?.channelId, tokenExchangeRequest ); - } else if (ExtendedUserTokenProviderT.check(context.adapter)) { - return context.adapter.exchangeToken( + } else if (extendedUserTokenProvider.success) { + return extendedUserTokenProvider.data.exchangeToken( context, settings.connectionName, context.activity?.from?.id, @@ -159,10 +170,11 @@ export async function createConnectorClient( const connectorFactory = context.turnState.get( (context.adapter as CloudAdapterBase).ConnectorFactoryKey ); + const connectorClientBuilder = ConnectorClientBuilderT.safeParse(context.adapter); if (connectorFactory) { return connectorFactory.create(serviceUrl, audience); - } else if (ConnectorClientBuilderT.check(context.adapter)) { - return context.adapter.createConnectorClientWithIdentity(serviceUrl, claimsIdentity, audience); + } else if (connectorClientBuilder.success) { + return connectorClientBuilder.data.createConnectorClientWithIdentity(serviceUrl, claimsIdentity, audience); } else { throw new Error('OAuth prompt is not supported by the current adapter'); } diff --git a/libraries/botbuilder/etc/botbuilder.api.md b/libraries/botbuilder/etc/botbuilder.api.md index 8a20feada0..c0d7b94426 100644 --- a/libraries/botbuilder/etc/botbuilder.api.md +++ b/libraries/botbuilder/etc/botbuilder.api.md @@ -167,7 +167,7 @@ export class BotFrameworkAdapter extends BotAdapter implements BotFrameworkHttpA updateActivity(context: TurnContext, activity: Partial): Promise; useNamedPipe(logic: (context: TurnContext) => Promise, pipeName?: string, retryCount?: number, onListen?: () => void): Promise; useWebSocket(req: WebRequest, socket: INodeSocket, head: INodeBuffer, logic: (context: TurnContext) => Promise): Promise; - } +} // @public @deprecated (undocumented) export interface BotFrameworkAdapterSettings { @@ -206,7 +206,7 @@ export class ChannelServiceHandler extends ChannelServiceHandlerBase { protected authenticate(authHeader: string): Promise; // (undocumented) protected readonly channelService: string; - } +} // @public export abstract class ChannelServiceHandlerBase { @@ -280,7 +280,7 @@ export class FileTranscriptStore implements TranscriptStore { getTranscriptActivities(channelId: string, conversationId: string, continuationToken?: string, startDate?: Date): Promise>; listTranscripts(channelId: string, continuationToken?: string): Promise>; logActivity(activity: Activity): Promise; - } +} // @public export class HandoffEventNames { @@ -299,7 +299,7 @@ export class InspectionMiddleware extends InterceptionMiddleware { protected outbound(turnContext: TurnContext, traceActivities: Partial[]): Promise; processCommand(turnContext: TurnContext): Promise; protected traceState(turnContext: TurnContext): Promise; - } +} // @public @deprecated export class InspectionState extends BotState { @@ -316,7 +316,6 @@ interface Request_2 = Record void; export class SetSpeakMiddleware implements Middleware { constructor(voiceName: string | null, fallbackToTextForSpeak: boolean); onTurn(turnContext: TurnContext, next: () => Promise): Promise; - } +} // @public export class SharePointActivityHandler extends ActivityHandler { @@ -383,7 +381,7 @@ export class StatusCodeError extends Error { export class StreamingHttpClient implements HttpClient { constructor(server: IStreamingTransportServer); sendRequest(httpRequest: WebResource): Promise; - } +} // @public export class TeamsActivityHandler extends ActivityHandler { @@ -513,12 +511,12 @@ export function teamsNotifyUser(activity: Partial, alertInMeeting?: bo export class TeamsSSOTokenExchangeMiddleware implements Middleware { constructor(storage: Storage_2, oAuthConnectionName: string); onTurn(context: TurnContext, next: () => Promise): Promise; - } +} // @public export class TokenResolver { static checkForOAuthCards(adapter: BotFrameworkAdapter, context: TurnContext, activity: Activity, log?: string[]): void; - } +} // @public export interface WebRequest { diff --git a/libraries/botframework-schema/etc/botframework-schema.api.md b/libraries/botframework-schema/etc/botframework-schema.api.md index 24bf4bd5be..bc6d54d6a7 100644 --- a/libraries/botframework-schema/etc/botframework-schema.api.md +++ b/libraries/botframework-schema/etc/botframework-schema.api.md @@ -485,14 +485,14 @@ export interface CardAction { // @public export interface CardBarComponent extends BaseCardComponent { componentName: 'cardBar'; - // Warning: (ae-forgotten-export) The symbol "CardImage" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "CardImage_2" needs to be exported by the entry point index.d.ts icon?: CardImage_2; title?: string; } // @public export interface CardButtonBase { - // Warning: (ae-forgotten-export) The symbol "CardAction" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "CardAction_2" needs to be exported by the entry point index.d.ts action: CardAction_2; id?: string; } @@ -1177,7 +1177,6 @@ interface Location_2 { longitude: number; timestamp?: number; } - export { Location_2 as Location } // @public @@ -1639,7 +1638,7 @@ export interface PagedMembersResult { } // @public @deprecated -interface PaymentAddress_2 { +export interface PaymentAddress { addressLine: string[]; city: string; country: string; @@ -1653,15 +1652,12 @@ interface PaymentAddress_2 { sortingCode: string; } -export { PaymentAddress_2 as PaymentAddress } - // @public @deprecated interface PaymentCurrencyAmount_2 { currency: string; currencySystem: string; value: string; } - export { PaymentCurrencyAmount_2 as PaymentCurrencyAmount } // @public @deprecated @@ -1669,7 +1665,7 @@ export interface PaymentDetails { displayItems: PaymentItem_2[]; error: string; modifiers: PaymentDetailsModifier_2[]; - shippingOptions: PaymentShippingOption_2[]; + shippingOptions: PaymentShippingOption[]; total: PaymentItem_2; } @@ -1680,7 +1676,6 @@ interface PaymentDetailsModifier_2 { supportedMethods: string[]; total: PaymentItem_2; } - export { PaymentDetailsModifier_2 as PaymentDetailsModifier } // @public @deprecated @@ -1689,7 +1684,6 @@ interface PaymentItem_2 { label: string; pending: boolean; } - export { PaymentItem_2 as PaymentItem } // @public @deprecated @@ -1697,11 +1691,10 @@ interface PaymentMethodData_2 { data: any; supportedMethods: string[]; } - export { PaymentMethodData_2 as PaymentMethodData } // @public @deprecated -interface PaymentOptions_2 { +export interface PaymentOptions { requestPayerEmail: boolean; requestPayerName: boolean; requestPayerPhone: boolean; @@ -1709,17 +1702,14 @@ interface PaymentOptions_2 { shippingType: string; } -export { PaymentOptions_2 as PaymentOptions } - // @public @deprecated interface PaymentRequest_2 { details: PaymentDetails; expires: string; id: string; methodData: PaymentMethodData_2[]; - options: PaymentOptions_2; + options: PaymentOptions; } - export { PaymentRequest_2 as PaymentRequest } // @public @deprecated @@ -1738,7 +1728,7 @@ export interface PaymentRequestCompleteResult { export interface PaymentRequestUpdate { details: PaymentDetails; id: string; - shippingAddress: PaymentAddress_2; + shippingAddress: PaymentAddress; shippingOption: string; } @@ -1753,22 +1743,19 @@ interface PaymentResponse_2 { methodName: string; payerEmail: string; payerPhone: string; - shippingAddress: PaymentAddress_2; + shippingAddress: PaymentAddress; shippingOption: string; } - export { PaymentResponse_2 as PaymentResponse } // @public @deprecated -interface PaymentShippingOption_2 { +export interface PaymentShippingOption { amount: PaymentCurrencyAmount_2; id: string; label: string; selected: boolean; } -export { PaymentShippingOption_2 as PaymentShippingOption } - // @public export interface Place { address: any; @@ -2558,7 +2545,6 @@ export interface VideoCard { // @public export type ViewResponseType = 'Card' | 'QuickView' | 'NoOp'; - // (No @packageDocumentation comment for this package) ``` diff --git a/libraries/botframework-streaming/etc/botframework-streaming.api.md b/libraries/botframework-streaming/etc/botframework-streaming.api.md index 847524e178..fcf4961804 100644 --- a/libraries/botframework-streaming/etc/botframework-streaming.api.md +++ b/libraries/botframework-streaming/etc/botframework-streaming.api.md @@ -4,6 +4,8 @@ ```ts +/// + import { Duplex } from 'stream'; import { DuplexOptions } from 'stream'; import * as WebSocket_2 from 'ws'; @@ -21,7 +23,7 @@ export class ContentStream { get length(): number; readAsJson(): Promise; readAsString(): Promise; - } +} // @public export class HttpContent { @@ -31,7 +33,7 @@ export class HttpContent { // // (undocumented) headers: IHttpContentHeaders; - } +} // @public export interface INodeBuffer extends Uint8Array { @@ -260,7 +262,7 @@ export interface INodeSocket { once(event: string | symbol, listener: (...args: any[]) => void): this; // (undocumented) pause(): this; - // Warning: (ae-forgotten-export) The symbol "WritableStream" needs to be exported by the entry point index.d.ts + // Warning: (ae-forgotten-export) The symbol "WritableStream_2" needs to be exported by the entry point index.d.ts // // (undocumented) pipe(destination: T, options?: { @@ -430,7 +432,7 @@ export class NamedPipeClient implements IStreamingTransportClient { connect(): Promise; disconnect(): void; send(request: StreamingRequest): Promise; - } +} // @public export class NamedPipeServer implements IStreamingTransportServer { @@ -454,7 +456,7 @@ export class NodeWebSocket implements ISocket { write(buffer: INodeBuffer): void; // (undocumented) protected wsServer: WebSocket_2.Server; - } +} // @public export class NodeWebSocketFactory extends NodeWebSocketFactoryBase { @@ -515,7 +517,7 @@ export class WebSocketClient implements IStreamingTransportClient { connect(): Promise; disconnect(): void; send(request: StreamingRequest): Promise; - } +} // @public export class WebSocketServer implements IStreamingTransportServer { @@ -524,8 +526,7 @@ export class WebSocketServer implements IStreamingTransportServer { get isConnected(): boolean; send(request: StreamingRequest): Promise; start(): Promise; - } - +} // (No @packageDocumentation comment for this package) diff --git a/package.json b/package.json index dfe0e94f9a..36b9a83566 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "devDependencies": { "@azure/logger": "^1.0.2", "@azure/ms-rest-js": "^2.7.0", - "@microsoft/api-extractor": "^7.15.1", + "@microsoft/api-extractor": "^7.38.2", "@standardlabs/downlevel-dts": "^0.7.5", "@standardlabs/is-private": "^1.0.1", "@types/jsonwebtoken": "7.2.8", diff --git a/testing/consumer-test/run.ts b/testing/consumer-test/run.ts index ffbbf83016..c8a0243634 100644 --- a/testing/consumer-test/run.ts +++ b/testing/consumer-test/run.ts @@ -5,7 +5,7 @@ import { promisify } from 'util'; const execp = promisify(exec); -const versions = ['3.8', '3.9', '4.0', '4.1', '4.2', '4.3']; +const versions = ['4.3', '4.4', '4.5', '4.6', '4.7', '4.8']; (async () => { const flags = minimist(process.argv.slice(2), { diff --git a/yarn.lock b/yarn.lock index 88c028701b..e7a453183e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1523,32 +1523,32 @@ dependencies: dotnet-2.0.0 "^1.4.4" -"@microsoft/api-extractor-model@7.13.1": - version "7.13.1" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.13.1.tgz#6dd9c4bd49b5d0d32b44c564a94c34b3c3aa2a87" - integrity sha512-PKAjDmAJ6X07tvqCHSN1PRaKq8bZQXF9QI6WGEMnCHNFWwXUoITOAcvFW0Ol3TzwHO5rLbuy/CqWebfhv8eOtw== - dependencies: - "@microsoft/tsdoc" "0.13.2" - "@microsoft/tsdoc-config" "~0.15.2" - "@rushstack/node-core-library" "3.37.0" - -"@microsoft/api-extractor@^7.15.1": - version "7.15.1" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.15.1.tgz#c3791933367ddded72a2f1d3c437e17fa050eac5" - integrity sha512-PYbGAvxbM5B6HbafXY7tJ4ObYpeUZrZFt9vlN68tpYG/7aeldMLAZSjTyB30VFXaGlArjeEooKZIcs2ZnVAbNg== - dependencies: - "@microsoft/api-extractor-model" "7.13.1" - "@microsoft/tsdoc" "0.13.2" - "@microsoft/tsdoc-config" "~0.15.2" - "@rushstack/node-core-library" "3.37.0" - "@rushstack/rig-package" "0.2.12" - "@rushstack/ts-command-line" "4.7.10" +"@microsoft/api-extractor-model@7.28.2": + version "7.28.2" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.28.2.tgz#91c66dd820ccc70e0c163e06b392d8363f1b9269" + integrity sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig== + dependencies: + "@microsoft/tsdoc" "0.14.2" + "@microsoft/tsdoc-config" "~0.16.1" + "@rushstack/node-core-library" "3.61.0" + +"@microsoft/api-extractor@^7.38.2": + version "7.38.2" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.38.2.tgz#fbc329fbec2b27a160507d08d02b78018fd142ac" + integrity sha512-JOARuhTwOcOMIU0O2czscoJy3ddVzIRhSA9/7T1ALuZSNphgWsPk+Bv4E7AnBDmTV4pP4lBNLtCxEHjjpWaytQ== + dependencies: + "@microsoft/api-extractor-model" "7.28.2" + "@microsoft/tsdoc" "0.14.2" + "@microsoft/tsdoc-config" "~0.16.1" + "@rushstack/node-core-library" "3.61.0" + "@rushstack/rig-package" "0.5.1" + "@rushstack/ts-command-line" "4.17.1" colors "~1.2.1" lodash "~4.17.15" - resolve "~1.17.0" - semver "~7.3.0" + resolve "~1.22.1" + semver "~7.5.4" source-map "~0.6.1" - typescript "~4.2.4" + typescript "~5.0.4" "@microsoft/bf-chatdown@^4.15.0": version "4.15.0" @@ -1679,20 +1679,20 @@ resolved "https://registry.yarnpkg.com/@microsoft/recognizers-text/-/recognizers-text-1.3.1.tgz#eda98a9148101ecdb04ed1424082d472b04aabd9" integrity sha512-HikLoRUgSzM4OKP3JVBzUUp3Q7L4wgI17p/3rERF01HVmopcujY3i6wgx8PenCwbenyTNxjr1AwSDSVuFlYedQ== -"@microsoft/tsdoc-config@~0.15.2": - version "0.15.2" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz#eb353c93f3b62ab74bdc9ab6f4a82bcf80140f14" - integrity sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA== +"@microsoft/tsdoc-config@~0.16.1": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf" + integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw== dependencies: - "@microsoft/tsdoc" "0.13.2" + "@microsoft/tsdoc" "0.14.2" ajv "~6.12.6" jju "~1.4.0" resolve "~1.19.0" -"@microsoft/tsdoc@0.13.2": - version "0.13.2" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz#3b0efb6d3903bd49edb073696f60e90df08efb26" - integrity sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg== +"@microsoft/tsdoc@0.14.2": + version "0.14.2" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb" + integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug== "@netflix/nerror@^1.0.0": version "1.1.3" @@ -1898,33 +1898,31 @@ resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def" integrity sha512-hZNKjKOYsckoOEgBziGMnBcX0M7EtstnCmwz5jZUOUYwlZ+/xxX6z3jPu1XVO2Jivk0eLfuP9GP+vFD49CMetw== -"@rushstack/node-core-library@3.37.0": - version "3.37.0" - resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.37.0.tgz#6e8ebfdbe2829d380bc827bbb450361fb48e142c" - integrity sha512-b0OGvl20zfepytLBnKsOtemtiadNZAVolXxaSYssV9VjXaLPF97oLvtLfwc58BX05ufIsrKZgXatnRo8YeffNg== +"@rushstack/node-core-library@3.61.0": + version "3.61.0" + resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.61.0.tgz#7441a0d2ae5268b758a7a49588a78cd55af57e66" + integrity sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ== dependencies: - "@types/node" "10.17.13" colors "~1.2.1" fs-extra "~7.0.1" import-lazy "~4.0.0" jju "~1.4.0" - resolve "~1.17.0" - semver "~7.3.0" - timsort "~0.3.0" - z-schema "~3.18.3" + resolve "~1.22.1" + semver "~7.5.4" + z-schema "~5.0.2" -"@rushstack/rig-package@0.2.12": - version "0.2.12" - resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.2.12.tgz#c434d62b28e0418a040938226f8913971d0424c7" - integrity sha512-nbePcvF8hQwv0ql9aeQxcaMPK/h1OLAC00W7fWCRWIvD2MchZOE8jumIIr66HGrfG2X1sw++m/ZYI4D+BM5ovQ== +"@rushstack/rig-package@0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.1.tgz#6c9c283cc96b5bb1eae9875946d974ac5429bb21" + integrity sha512-pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA== dependencies: - resolve "~1.17.0" + resolve "~1.22.1" strip-json-comments "~3.1.1" -"@rushstack/ts-command-line@4.7.10": - version "4.7.10" - resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.7.10.tgz#a2ec6efb1945b79b496671ce90eb1be4f1397d31" - integrity sha512-8t042g8eerypNOEcdpxwRA3uCmz0duMo21rG4Z2mdz7JxJeylDmzjlU3wDdef2t3P1Z61JCdZB6fbm1Mh0zi7w== +"@rushstack/ts-command-line@4.17.1": + version "4.17.1" + resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.17.1.tgz#c78db928ce5b93f2e98fd9e14c24f3f3876e57f1" + integrity sha512-2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg== dependencies: "@types/argparse" "1.0.38" argparse "~1.0.9" @@ -2273,11 +2271,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f" integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw== -"@types/node@10.17.13": - version "10.17.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" - integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== - "@types/node@^10.17.27": version "10.17.44" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.44.tgz#3945e6b702cb6403f22b779c8ea9e5c3f44ead40" @@ -4480,7 +4473,12 @@ commander@2.15.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== -commander@^2.19.0, commander@^2.20.0, commander@^2.7.1: +commander@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + +commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -8807,7 +8805,7 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= -lodash.get@^4.0.0, lodash.get@^4.4.2: +lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= @@ -8822,7 +8820,7 @@ lodash.isarray@^3.0.0: resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= -lodash.isequal@^4.0.0, lodash.isequal@^4.5.0: +lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= @@ -11372,7 +11370,7 @@ resolve@^1.13.1, resolve@~1.19.0: is-core-module "^2.1.0" path-parse "^1.0.6" -resolve@^1.14.2, resolve@^1.22.3: +resolve@^1.14.2, resolve@^1.22.3, resolve@~1.22.1: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -11381,13 +11379,6 @@ resolve@^1.14.2, resolve@^1.22.3: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@~1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== - dependencies: - path-parse "^1.0.6" - responselike@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -11673,20 +11664,13 @@ semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semve dependencies: lru-cache "^6.0.0" -semver@^7.5.4: +semver@^7.5.4, semver@~7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" -semver@~7.3.0: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== - dependencies: - lru-cache "^6.0.0" - send@0.17.2: version "0.17.2" resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" @@ -12878,11 +12862,6 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -timsort@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - tinyify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/tinyify/-/tinyify-3.0.0.tgz#99d5f805191558c6d85dacabe634d617da5509e6" @@ -13230,10 +13209,10 @@ typescript@^4.1.0-dev.20201026: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.0-dev.20201102.tgz#e1978890ac063bb3f13d067067905b312c1e0897" integrity sha512-kyL2MUGRx69NgowtHpnabYzNA3N8CR+XW51kL9my6MfSXyrojytW5P4YmaayHGQhWLRmzzdDvHfkf2PQBHgbUw== -typescript@~4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961" - integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg== +typescript@~5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" + integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== uglify-js@^3.1.4: version "3.11.4" @@ -13572,10 +13551,10 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validator@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9" - integrity sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA== +validator@^13.7.0: + version "13.11.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b" + integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ== vary@~1.1.2: version "1.1.2" @@ -14162,16 +14141,21 @@ yn@3.1.1: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -z-schema@~3.18.3: - version "3.18.4" - resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.18.4.tgz#ea8132b279533ee60be2485a02f7e3e42541a9a2" - integrity sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw== +z-schema@~5.0.2: + version "5.0.6" + resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.6.tgz#46d6a687b15e4a4369e18d6cb1c7b8618fc256c5" + integrity sha512-+XR1GhnWklYdfr8YaZv/iu+vY+ux7V5DS5zH1DQf6bO5ufrt/5cgNhVO5qyhsjFXvsqQb/f08DWE9b6uPscyAg== dependencies: - lodash.get "^4.0.0" - lodash.isequal "^4.0.0" - validator "^8.0.0" + lodash.get "^4.4.2" + lodash.isequal "^4.5.0" + validator "^13.7.0" optionalDependencies: - commander "^2.7.1" + commander "^10.0.0" + +zod@^3.22.4: + version "3.22.4" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" + integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== zod@~1.11.17: version "1.11.17"