Skip to content

Commit 2131e98

Browse files
box-sdk-buildbox-sdk-build
authored
fix: Fix variants in metadata query results (box/box-openapi#456) (#349)
1 parent a7d36d7 commit 2131e98

File tree

5 files changed

+64
-22
lines changed

5 files changed

+64
-22
lines changed

‎.codegen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "engineHash": "5b7aecf", "specHash": "915b38a", "version": "1.5.1" }
1+
{ "engineHash": "5b7aecf", "specHash": "b21666d", "version": "1.5.1" }

‎src/schemas/fileFull.generated.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import { serializeUserMini } from './userMini.generated.js';
2020
import { deserializeUserMini } from './userMini.generated.js';
2121
import { serializeFileOrFolderScope } from './fileOrFolderScope.generated.js';
2222
import { deserializeFileOrFolderScope } from './fileOrFolderScope.generated.js';
23-
import { serializeMetadata } from './metadata.generated.js';
24-
import { deserializeMetadata } from './metadata.generated.js';
23+
import { serializeMetadataFull } from './metadataFull.generated.js';
24+
import { deserializeMetadataFull } from './metadataFull.generated.js';
2525
import { serializeDateTime } from '../internal/utils.js';
2626
import { deserializeDateTime } from '../internal/utils.js';
2727
import { FileBaseTypeField } from './fileBase.generated.js';
@@ -35,7 +35,7 @@ import { FileItemStatusField } from './file.generated.js';
3535
import { File } from './file.generated.js';
3636
import { UserMini } from './userMini.generated.js';
3737
import { FileOrFolderScope } from './fileOrFolderScope.generated.js';
38-
import { Metadata } from './metadata.generated.js';
38+
import { MetadataFull } from './metadataFull.generated.js';
3939
import { DateTime } from '../internal/utils.js';
4040
import { BoxSdkError } from '../box/errors.js';
4141
import { SerializedData } from '../serialization/json.js';
@@ -155,7 +155,7 @@ export type FileFullAllowedInviteeRolesField =
155155
export interface FileFullMetadataField {
156156
readonly extraData?: {
157157
readonly [key: string]: {
158-
readonly [key: string]: Metadata;
158+
readonly [key: string]: MetadataFull;
159159
};
160160
};
161161
}
@@ -782,7 +782,7 @@ export function deserializeFileFullMetadataField(
782782
| undefined
783783
| {
784784
readonly [key: string]: {
785-
readonly [key: string]: Metadata;
785+
readonly [key: string]: MetadataFull;
786786
};
787787
} =
788788
val == void 0
@@ -796,7 +796,7 @@ export function deserializeFileFullMetadataField(
796796
? (Object.fromEntries(
797797
Object.entries(v).map(([k, v]: [string, any]) => [
798798
k,
799-
deserializeMetadata(v),
799+
deserializeMetadataFull(v),
800800
])
801801
) as {
802802
readonly [key: string]: any;

‎src/schemas/fileFullOrFolderFull.generated.ts

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { serializeFileFull } from './fileFull.generated.js';
2+
import { deserializeFileFull } from './fileFull.generated.js';
3+
import { serializeFolderFull } from './folderFull.generated.js';
4+
import { deserializeFolderFull } from './folderFull.generated.js';
5+
import { FileFull } from './fileFull.generated.js';
6+
import { FolderFull } from './folderFull.generated.js';
7+
import { BoxSdkError } from '../box/errors.js';
8+
import { SerializedData } from '../serialization/json.js';
9+
import { sdIsEmpty } from '../serialization/json.js';
10+
import { sdIsBoolean } from '../serialization/json.js';
11+
import { sdIsNumber } from '../serialization/json.js';
12+
import { sdIsString } from '../serialization/json.js';
13+
import { sdIsList } from '../serialization/json.js';
14+
import { sdIsMap } from '../serialization/json.js';
15+
export type FileFullOrFolderFull = FileFull | FolderFull;
16+
export function serializeFileFullOrFolderFull(val: any): SerializedData {
17+
if (val.type == 'file') {
18+
return serializeFileFull(val);
19+
}
20+
if (val.type == 'folder') {
21+
return serializeFolderFull(val);
22+
}
23+
throw new BoxSdkError({ message: 'unknown type' });
24+
}
25+
export function deserializeFileFullOrFolderFull(
26+
val: SerializedData
27+
): FileFullOrFolderFull {
28+
if (!sdIsMap(val)) {
29+
throw new BoxSdkError({
30+
message: 'Expecting a map for "FileFullOrFolderFull"',
31+
});
32+
}
33+
if (val.type == 'file') {
34+
return deserializeFileFull(val);
35+
}
36+
if (val.type == 'folder') {
37+
return deserializeFolderFull(val);
38+
}
39+
throw new BoxSdkError({ message: "Can't deserialize FileFullOrFolderFull" });
40+
}

‎src/schemas/folderFull.generated.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import { serializeItems } from './items.generated.js';
2020
import { deserializeItems } from './items.generated.js';
2121
import { serializeFolder } from './folder.generated.js';
2222
import { deserializeFolder } from './folder.generated.js';
23-
import { serializeMetadata } from './metadata.generated.js';
24-
import { deserializeMetadata } from './metadata.generated.js';
23+
import { serializeMetadataFull } from './metadataFull.generated.js';
24+
import { deserializeMetadataFull } from './metadataFull.generated.js';
2525
import { FolderBaseTypeField } from './folderBase.generated.js';
2626
import { FolderBase } from './folderBase.generated.js';
2727
import { FolderMini } from './folderMini.generated.js';
@@ -33,7 +33,7 @@ import { FolderFolderUploadEmailField } from './folder.generated.js';
3333
import { FolderItemStatusField } from './folder.generated.js';
3434
import { Items } from './items.generated.js';
3535
import { Folder } from './folder.generated.js';
36-
import { Metadata } from './metadata.generated.js';
36+
import { MetadataFull } from './metadataFull.generated.js';
3737
import { BoxSdkError } from '../box/errors.js';
3838
import { SerializedData } from '../serialization/json.js';
3939
import { sdIsEmpty } from '../serialization/json.js';
@@ -76,7 +76,7 @@ export interface FolderFullPermissionsField {
7676
export interface FolderFullMetadataField {
7777
readonly extraData?: {
7878
readonly [key: string]: {
79-
readonly [key: string]: Metadata;
79+
readonly [key: string]: MetadataFull;
8080
};
8181
};
8282
}
@@ -296,7 +296,7 @@ export function deserializeFolderFullMetadataField(
296296
| undefined
297297
| {
298298
readonly [key: string]: {
299-
readonly [key: string]: Metadata;
299+
readonly [key: string]: MetadataFull;
300300
};
301301
} =
302302
val == void 0
@@ -310,7 +310,7 @@ export function deserializeFolderFullMetadataField(
310310
? (Object.fromEntries(
311311
Object.entries(v).map(([k, v]: [string, any]) => [
312312
k,
313-
deserializeMetadata(v),
313+
deserializeMetadataFull(v),
314314
])
315315
) as {
316316
readonly [key: string]: any;

‎src/schemas/metadataQueryResults.generated.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { serializeFileOrFolder } from './fileOrFolder.generated.js';
2-
import { deserializeFileOrFolder } from './fileOrFolder.generated.js';
3-
import { FileOrFolder } from './fileOrFolder.generated.js';
1+
import { serializeFileFullOrFolderFull } from './fileFullOrFolderFull.generated.js';
2+
import { deserializeFileFullOrFolderFull } from './fileFullOrFolderFull.generated.js';
3+
import { FileFullOrFolderFull } from './fileFullOrFolderFull.generated.js';
44
import { BoxSdkError } from '../box/errors.js';
55
import { SerializedData } from '../serialization/json.js';
66
import { sdIsEmpty } from '../serialization/json.js';
@@ -17,7 +17,7 @@ export interface MetadataQueryResults {
1717
* By default, this endpoint returns only the most basic info about the
1818
* items. To get additional fields for each item, including any of the
1919
* metadata, use the `fields` attribute in the query. */
20-
readonly entries?: readonly FileOrFolder[];
20+
readonly entries?: readonly FileFullOrFolderFull[];
2121
/**
2222
* The limit that was used for this search. This will be the same as the
2323
* `limit` query parameter unless that value exceeded the maximum value
@@ -34,8 +34,10 @@ export function serializeMetadataQueryResults(
3434
['entries']:
3535
val.entries == void 0
3636
? void 0
37-
: (val.entries.map(function (item: FileOrFolder): SerializedData {
38-
return serializeFileOrFolder(item);
37+
: (val.entries.map(function (
38+
item: FileFullOrFolderFull
39+
): SerializedData {
40+
return serializeFileFullOrFolderFull(item);
3941
}) as readonly any[]),
4042
['limit']: val.limit == void 0 ? void 0 : val.limit,
4143
['next_marker']: val.nextMarker == void 0 ? void 0 : val.nextMarker,
@@ -54,12 +56,12 @@ export function deserializeMetadataQueryResults(
5456
message: 'Expecting array for "entries" of type "MetadataQueryResults"',
5557
});
5658
}
57-
const entries: undefined | readonly FileOrFolder[] =
59+
const entries: undefined | readonly FileFullOrFolderFull[] =
5860
val.entries == void 0
5961
? void 0
6062
: sdIsList(val.entries)
61-
? (val.entries.map(function (itm: SerializedData): FileOrFolder {
62-
return deserializeFileOrFolder(itm);
63+
? (val.entries.map(function (itm: SerializedData): FileFullOrFolderFull {
64+
return deserializeFileFullOrFolderFull(itm);
6365
}) as readonly any[])
6466
: [];
6567
if (!(val.limit == void 0) && !sdIsNumber(val.limit)) {

0 commit comments

Comments
 (0)