Skip to content

Commit d5b5b7b

Browse files
committed
feat: deprecate legacy client [NONE]
1 parent ca5bc69 commit d5b5b7b

12 files changed

+218
-29
lines changed

lib/contentful-management.ts

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,31 +57,20 @@ function createClient(params: ClientOptions): ClientAPI
5757
function createClient(
5858
params: ClientOptions,
5959
opts: {
60-
type: 'plain'
60+
// type: 'plain'
6161
defaults?: DefaultParams
6262
}
6363
): PlainClientAPI
64-
// Usually, overloads with more specific signatures should come first but some IDEs are often not able to handle overloads with separate TSDocs correctly
65-
/**
66-
* @deprecated The `alphaFeatures` option is no longer supported. Please use the function without this option.
67-
*/
68-
function createClient(
69-
params: ClientOptions,
70-
opts: {
71-
type?: 'plain'
72-
alphaFeatures: string[]
73-
defaults?: DefaultParams
74-
}
75-
): ClientAPI | PlainClientAPI
64+
7665
function createClient(
7766
params: ClientOptions,
7867
opts: {
79-
type?: 'plain'
68+
type?: 'legacy'
8069
defaults?: DefaultParams
8170
} = {}
8271
): ClientAPI | PlainClientAPI {
8372
const sdkMain =
84-
opts.type === 'plain' ? 'contentful-management-plain.js' : 'contentful-management.js'
73+
opts.type === 'legacy' ? 'contentful-management.js' : 'contentful-management-plain.js'
8574
const userAgent = getUserAgentHeader(
8675
// @ts-expect-error
8776
`${sdkMain}/${__VERSION__}`,
@@ -98,9 +87,9 @@ function createClient(
9887
const makeRequest: MakeRequest = (options: Parameters<MakeRequest>[0]): ReturnType<MakeRequest> =>
9988
adapter.makeRequest({ ...options, userAgent })
10089

101-
if (opts.type === 'plain') {
102-
return createPlainClient(makeRequest, opts.defaults)
103-
} else {
90+
if (opts.type === 'legacy') {
10491
return createContentfulApi(makeRequest) as ClientAPI
92+
} else {
93+
return createPlainClient(makeRequest, opts.defaults)
10594
}
10695
}

lib/create-app-definition-api.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default function createAppDefinitionApi(makeRequest: MakeRequest) {
3939
* .then((appDefinition) => console.log(`App Definition ${appDefinition.sys.id} updated.`))
4040
* .catch(console.error)
4141
* ```
42+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
4243
*/
4344
update: function update() {
4445
const data = this.toPlainObject() as AppDefinitionProps
@@ -67,6 +68,7 @@ export default function createAppDefinitionApi(makeRequest: MakeRequest) {
6768
* .then(() => console.log(`App Definition deleted.`))
6869
* .catch(console.error)
6970
* ```
71+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
7072
*/
7173
delete: function del() {
7274
const data = this.toPlainObject() as AppDefinitionProps
@@ -93,6 +95,7 @@ export default function createAppDefinitionApi(makeRequest: MakeRequest) {
9395
* .then((appBundle) => console.log(appBundle))
9496
* .catch(console.error)
9597
* ```
98+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
9699
*/
97100
getAppBundle(id: string) {
98101
const raw = this.toPlainObject() as AppDefinitionProps
@@ -122,6 +125,7 @@ export default function createAppDefinitionApi(makeRequest: MakeRequest) {
122125
* .then((response) => console.log(response.items))
123126
* .catch(console.error)
124127
* ```
128+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
125129
*/
126130
getAppBundles(query: QueryOptions = {}) {
127131
const raw = this.toPlainObject() as AppDefinitionProps
@@ -147,6 +151,7 @@ export default function createAppDefinitionApi(makeRequest: MakeRequest) {
147151
* .then((appBundle) => console.log(appBundle))
148152
* .catch(console.error)
149153
* ```
154+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
150155
*/
151156
createAppBundle(data: CreateAppBundleProps) {
152157
const raw = this.toPlainObject() as AppDefinitionProps
@@ -177,6 +182,7 @@ export default function createAppDefinitionApi(makeRequest: MakeRequest) {
177182
* .then((appInstallationsForOrg) => console.log(appInstallationsForOrg.items))
178183
* .catch(console.error)
179184
* ```
185+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
180186
*/
181187
getInstallationsForOrg(query: SpaceQueryOptions = {}) {
182188
const raw = this.toPlainObject() as AppDefinitionProps

lib/create-contentful-api.ts

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ import {
2424
} from './entities/environment-template'
2525
import { RawAxiosRequestConfig } from 'axios'
2626

27+
/**
28+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
29+
*/
2730
export type ClientAPI = ReturnType<typeof createClientApi>
2831
type CreateSpaceProps = Omit<SpaceProps, 'sys'> & { defaultLocale?: string }
2932

@@ -58,6 +61,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
5861
* .then((response) => console.log(response.items))
5962
* .catch(console.error)
6063
* ```
64+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
6165
*/
6266
getEnvironmentTemplates: function getEnvironmentTemplates(
6367
organizationId: string,
@@ -90,6 +94,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
9094
* .then((space) => console.log(space))
9195
* .catch(console.error)
9296
* ```
97+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
9398
*/
9499
getEnvironmentTemplate: function getEnvironmentTemplate({
95100
organizationId,
@@ -127,6 +132,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
127132
* .then((environmentTemplate) => console.log(environmentTemplate))
128133
* .catch(console.error)
129134
* ```
135+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
130136
*/
131137
createEnvironmentTemplate: function createEnvironmentTemplate(
132138
organizationId: string,
@@ -153,6 +159,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
153159
* .then((response) => console.log(response.items))
154160
* .catch(console.error)
155161
* ```
162+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
156163
*/
157164
getSpaces: function getSpaces(
158165
query: QueryOptions = {}
@@ -179,6 +186,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
179186
* .then((space) => console.log(space))
180187
* .catch(console.error)
181188
* ```
189+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
182190
*/
183191
getSpace: function getSpace(spaceId: string): Promise<Space> {
184192
return makeRequest({
@@ -206,6 +214,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
206214
* .then((space) => console.log(space))
207215
* .catch(console.error)
208216
* ```
217+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
209218
*/
210219
createSpace: function createSpace(
211220
spaceData: CreateSpaceProps,
@@ -234,6 +243,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
234243
* .then((org) => console.log(org))
235244
* .catch(console.error)
236245
* ```
246+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
237247
*/
238248
getOrganization: function getOrganization(id: string): Promise<Organization> {
239249
return makeRequest({
@@ -257,6 +267,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
257267
* .then(result => console.log(result.items))
258268
* .catch(console.error)
259269
* ```
270+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
260271
*/
261272
getOrganizations: function getOrganizations(
262273
query: PaginationQueryParams['query'] = {}
@@ -282,6 +293,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
282293
* .then(user => console.log(user.firstName))
283294
* .catch(console.error)
284295
* ```
296+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
285297
*/
286298
getCurrentUser: function getCurrentUser<T = UserProps>(params?: QueryParams): Promise<T> {
287299
return makeRequest({
@@ -307,8 +319,8 @@ export default function createClientApi(makeRequest: MakeRequest) {
307319
* .then(appDefinition => console.log(appDefinition.name))
308320
* .catch(console.error)
309321
* ```
322+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
310323
*/
311-
312324
getAppDefinition: function getAppDefinition(
313325
params: GetAppDefinitionParams
314326
): Promise<AppDefinition> {
@@ -341,6 +353,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
341353
* .then(personalAccessToken => console.log(personalAccessToken.token))
342354
* .catch(console.error)
343355
* ```
356+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
344357
*/
345358
createPersonalAccessToken: function createPersonalAccessToken(
346359
data: CreatePersonalAccessTokenProps
@@ -374,6 +387,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
374387
* .then(token => console.log(token.token))
375388
* .catch(console.error)
376389
* ```
390+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
377391
*/
378392
getPersonalAccessToken: function getPersonalAccessToken(tokenId: string) {
379393
return makeRequest({
@@ -399,6 +413,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
399413
* .then(response => console.log(reponse.items))
400414
* .catch(console.error)
401415
* ```
416+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
402417
*/
403418
getPersonalAccessTokens: function getPersonalAccessTokens() {
404419
return makeRequest({
@@ -423,6 +438,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
423438
* .then(token => console.log(token.token))
424439
* .catch(console.error)
425440
* ```
441+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
426442
*/
427443
getAccessToken: function getAccessToken(tokenId: string) {
428444
return makeRequest({
@@ -446,6 +462,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
446462
* .then(response => console.log(reponse.items))
447463
* .catch(console.error)
448464
* ```
465+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
449466
*/
450467
getAccessTokens: function getAccessTokens() {
451468
return makeRequest({
@@ -470,6 +487,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
470487
* .then(response => console.log(reponse.items))
471488
* .catch(console.error)
472489
* ```
490+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
473491
*/
474492
getOrganizationAccessTokens: function getOrganizationAccessTokens(
475493
organizationId: string,
@@ -505,6 +523,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
505523
* .then(result => console.log(result.items))
506524
* .catch(console.error)
507525
* ```
526+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
508527
*/
509528
getOrganizationUsage: function getOrganizationUsage(
510529
organizationId: string,
@@ -541,6 +560,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
541560
* .then(result => console.log(result.items))
542561
* .catch(console.error)
543562
* ```
563+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
544564
*/
545565
getSpaceUsage: function getSpaceUsage(organizationId: string, query: UsageQuery = {}) {
546566
return makeRequest({
@@ -571,6 +591,7 @@ export default function createClientApi(makeRequest: MakeRequest) {
571591
* .then((responseData) => console.log(responseData))
572592
* .catch(console.error)
573593
* ```
594+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
574595
*/
575596
rawRequest: function rawRequest({ url, ...config }: RawAxiosRequestConfig & { url: string }) {
576597
return makeRequest({

lib/create-entry-api.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
5454
* .then((entry) => console.log(`Entry ${entry.sys.id} updated.`))
5555
* .catch(console.error)
5656
* ```
57+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
5758
*/
5859
update: function update() {
5960
const { raw, params } = getParams(this)
@@ -89,6 +90,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
8990
* .then((entry) => console.log(`Entry ${entry.sys.id} updated.`))
9091
* .catch(console.error)
9192
* ```
93+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
9294
*/
9395
patch: function patch(ops: OpPatch[]) {
9496
const { raw, params } = getParams(this)
@@ -145,6 +147,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
145147
* .then((entry) => console.log(`Entry ${entry.sys.id} published.`))
146148
* .catch(console.error)
147149
* ```
150+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
148151
*/
149152
publish: function publish() {
150153
const { raw, params } = getParams(this)
@@ -174,6 +177,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
174177
* .then((entry) => console.log(`Entry ${entry.sys.id} unpublished.`))
175178
* .catch(console.error)
176179
* ```
180+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
177181
*/
178182

179183
unpublish: function unpublish() {
@@ -203,6 +207,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
203207
* .then((entry) => console.log(`Entry ${entry.sys.id} archived.`))
204208
* .catch(console.error)
205209
* ```
210+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
206211
*/
207212
archive: function archive() {
208213
const { params } = getParams(this)
@@ -231,6 +236,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
231236
* .then((entry) => console.log(`Entry ${entry.sys.id} unarchived.`))
232237
* .catch(console.error)
233238
* ```
239+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
234240
*/
235241
unarchive: function unarchive() {
236242
const { params } = getParams(this)
@@ -258,6 +264,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
258264
* .then((snapshots) => console.log(snapshots.items))
259265
* .catch(console.error)
260266
* ```
267+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
261268
*/
262269
getSnapshots: function (query = {}) {
263270
const { params } = getParams(this)
@@ -286,6 +293,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
286293
* .then((snapshot) => console.log(snapshot))
287294
* .catch(console.error)
288295
* ```
296+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
289297
*/
290298
getSnapshot: function (snapshotId: string) {
291299
const { params } = getParams(this)
@@ -317,6 +325,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
317325
* .then((comment) => console.log(comment))
318326
* .catch(console.error)
319327
* ```
328+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
320329
*/
321330
createComment: function (data: CreateCommentProps) {
322331
const { params } = getParams(this)
@@ -349,6 +358,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
349358
* .then((comments) => console.log(comments))
350359
* .catch(console.error)
351360
* ```
361+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
352362
*/
353363
getComments: function () {
354364
const { params } = getParams(this)
@@ -375,6 +385,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
375385
* .then((comment) => console.log(comment))
376386
* .catch(console.error)
377387
* ```
388+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
378389
*/
379390
getComment: function (id: string) {
380391
const { params } = getParams(this)
@@ -410,6 +421,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
410421
* .then((task) => console.log(task))
411422
* .catch(console.error)
412423
* ```
424+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
413425
*/
414426
createTask: function (data: CreateTaskProps) {
415427
const { params } = getParams(this)
@@ -437,6 +449,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
437449
* .then((tasks) => console.log(tasks))
438450
* .catch(console.error)
439451
* ```
452+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
440453
*/
441454
getTasks: function (query = {}) {
442455
const { params } = getParams(this)
@@ -463,6 +476,7 @@ export default function createEntryApi(makeRequest: MakeRequest) {
463476
* .then((task) => console.log(task))
464477
* .catch(console.error)
465478
* ```
479+
* @deprecated The `old` client is deprecated in favor of the `plain` client since version 12.0.0.
466480
*/
467481
getTask: function (id: string) {
468482
const { params } = getParams(this)

0 commit comments

Comments
 (0)