Skip to content

Commit 698872d

Browse files
committed
Regenerating schemas after merging 'Refine the varying schemas for ImplementationMetadata #1177'
1 parent e0475e7 commit 698872d

2 files changed

Lines changed: 18 additions & 25 deletions

File tree

src/bridging/BridgingTypes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,8 +1059,8 @@ export interface ConnectionStep6ConnectedAgentsUpdatePayload {
10591059
*/
10601060
export interface DesktopAgentImplementationMetadata {
10611061
/**
1062-
* Used in Desktop Agent Bridging to attribute or target a message to a
1063-
* particular Desktop Agent.
1062+
* Used in Desktop Agent Bridging to attribute or target a message to a particular Desktop
1063+
* Agent.
10641064
*/
10651065
desktopAgent: string;
10661066
/**

src/bridging/BridgingZodSchemas.ts

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,6 @@ export const TypeSchema = z.enum([
441441
]);
442442
export type Type = z.infer<typeof TypeSchema>;
443443

444-
export const BaseImplementationMetadataOptionalFeaturesSchema = z.object({
445-
"DesktopAgentBridging": z.boolean(),
446-
"OriginatingAppMetadata": z.boolean(),
447-
"UserChannelMembershipAPIs": z.boolean(),
448-
});
449-
export type BaseImplementationMetadataOptionalFeatures = z.infer<typeof BaseImplementationMetadataOptionalFeaturesSchema>;
450-
451444
export const AgentResponseMetadataSchema = z.object({
452445
"requestUuid": z.string(),
453446
"responseUuid": z.string(),
@@ -562,12 +555,12 @@ export const ConnectionStep3HandshakeMetaSchema = z.object({
562555
});
563556
export type ConnectionStep3HandshakeMeta = z.infer<typeof ConnectionStep3HandshakeMetaSchema>;
564557

565-
export const ImplementationMetadataOptionalFeaturesSchema = z.object({
558+
export const OptionalFeaturesSchema = z.object({
566559
"DesktopAgentBridging": z.boolean(),
567560
"OriginatingAppMetadata": z.boolean(),
568561
"UserChannelMembershipAPIs": z.boolean(),
569562
});
570-
export type ImplementationMetadataOptionalFeatures = z.infer<typeof ImplementationMetadataOptionalFeaturesSchema>;
563+
export type OptionalFeatures = z.infer<typeof OptionalFeaturesSchema>;
571564

572565
export const ConnectionStep4AuthenticationFailedMetaSchema = z.object({
573566
"requestUuid": z.string(),
@@ -588,6 +581,15 @@ export const ConnectionStep6ConnectedAgentsUpdateMetaSchema = z.object({
588581
});
589582
export type ConnectionStep6ConnectedAgentsUpdateMeta = z.infer<typeof ConnectionStep6ConnectedAgentsUpdateMetaSchema>;
590583

584+
export const DesktopAgentImplementationMetadataSchema = z.object({
585+
"desktopAgent": z.string(),
586+
"fdc3Version": z.string(),
587+
"optionalFeatures": OptionalFeaturesSchema,
588+
"provider": z.string(),
589+
"providerVersion": z.union([z.null(), z.string()]).optional(),
590+
});
591+
export type DesktopAgentImplementationMetadata = z.infer<typeof DesktopAgentImplementationMetadataSchema>;
592+
591593
export const FindInstancesAgentErrorResponseMetaSchema = z.object({
592594
"requestUuid": z.string(),
593595
"responseUuid": z.string(),
@@ -1175,7 +1177,6 @@ export type RaiseIntentAgentResponseMeta = z.infer<typeof RaiseIntentAgentRespon
11751177
export const IntentResolutionSchema = z.object({
11761178
"intent": z.string(),
11771179
"source": AppIdentifierSchema,
1178-
"version": z.union([z.null(), z.string()]).optional(),
11791180
});
11801181
export type IntentResolution = z.infer<typeof IntentResolutionSchema>;
11811182

@@ -1280,14 +1281,6 @@ export const ContextSchema = z.object({
12801281
});
12811282
export type Context = z.infer<typeof ContextSchema>;
12821283

1283-
export const BaseImplementationMetadataSchema = z.object({
1284-
"fdc3Version": z.string(),
1285-
"optionalFeatures": BaseImplementationMetadataOptionalFeaturesSchema,
1286-
"provider": z.string(),
1287-
"providerVersion": z.union([z.null(), z.string()]).optional(),
1288-
});
1289-
export type BaseImplementationMetadata = z.infer<typeof BaseImplementationMetadataSchema>;
1290-
12911284
export const AgentErrorResponseMessageSchema = z.object({
12921285
"meta": AgentResponseMetadataSchema,
12931286
"payload": ErrorResponseMessagePayloadSchema,
@@ -1360,13 +1353,13 @@ export const ConnectionStep2HelloSchema = z.object({
13601353
});
13611354
export type ConnectionStep2Hello = z.infer<typeof ConnectionStep2HelloSchema>;
13621355

1363-
export const ImplementationMetadataElementSchema = z.object({
1356+
export const ConnectingAgentImplementationMetadataSchema = z.object({
13641357
"fdc3Version": z.string(),
1365-
"optionalFeatures": ImplementationMetadataOptionalFeaturesSchema,
1358+
"optionalFeatures": OptionalFeaturesSchema,
13661359
"provider": z.string(),
13671360
"providerVersion": z.union([z.null(), z.string()]).optional(),
13681361
});
1369-
export type ImplementationMetadataElement = z.infer<typeof ImplementationMetadataElementSchema>;
1362+
export type ConnectingAgentImplementationMetadata = z.infer<typeof ConnectingAgentImplementationMetadataSchema>;
13701363

13711364
export const ConnectionStep4AuthenticationFailedSchema = z.object({
13721365
"meta": ConnectionStep4AuthenticationFailedMetaSchema,
@@ -1377,7 +1370,7 @@ export type ConnectionStep4AuthenticationFailed = z.infer<typeof ConnectionStep4
13771370

13781371
export const ConnectionStep6ConnectedAgentsUpdatePayloadSchema = z.object({
13791372
"addAgent": z.union([z.null(), z.string()]).optional(),
1380-
"allAgents": z.array(ImplementationMetadataElementSchema),
1373+
"allAgents": z.array(DesktopAgentImplementationMetadataSchema),
13811374
"channelsState": z.union([z.record(z.string(), z.array(ContextElementSchema)), z.null()]).optional(),
13821375
"removeAgent": z.union([z.null(), z.string()]).optional(),
13831376
});
@@ -1770,7 +1763,7 @@ export type BroadcastBridgeRequest = z.infer<typeof BroadcastBridgeRequestSchema
17701763
export const ConnectionStep3HandshakePayloadSchema = z.object({
17711764
"authToken": z.union([z.null(), z.string()]).optional(),
17721765
"channelsState": z.record(z.string(), z.array(ContextElementSchema)),
1773-
"implementationMetadata": ImplementationMetadataElementSchema,
1766+
"implementationMetadata": ConnectingAgentImplementationMetadataSchema,
17741767
"requestedName": z.string(),
17751768
});
17761769
export type ConnectionStep3HandshakePayload = z.infer<typeof ConnectionStep3HandshakePayloadSchema>;

0 commit comments

Comments
 (0)