feat(composables)!: remove deprecated wrappers

Author: benjamincanac

src/runtime/composables-v3/useStrapi.ts

@@ -1,6 +1,5 @@
 import type { Strapi3RequestParams } from '../types/v3'
-// @ts-expect-error this import is not available in stubbed version
-import { useStrapi3 } from '#imports'
+import { useStrapiClient } from '#imports'
 
 interface StrapiV3Client<T> {
   count(contentType: string, params?: Strapi3RequestParams): Promise<number>
@@ -12,5 +11,98 @@ interface StrapiV3Client<T> {
 }
 
 export const useStrapi = <T>(): StrapiV3Client<T> => {
-  return useStrapi3()
+  const client = useStrapiClient()
+
+  /**
+   * Count {content-type} entries
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {Strapi3RequestParams} [params] - Query parameters
+   * @returns Promise<number>
+   */
+  const count = (contentType: string, params?: Strapi3RequestParams): Promise<number> => {
+    return client(`/${contentType}/count`, { method: 'GET', params })
+  }
+
+  /**
+   * Get a list of {content-type} entries
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {Strapi3RequestParams} [params] - Query parameters
+   * @returns Promise<T>
+   */
+  const find = <T>(contentType: string, params?: Strapi3RequestParams): Promise<T> => {
+    return client(`/${contentType}`, { method: 'GET', params })
+  }
+
+  /**
+   * Get a specific {content-type} entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {string|number} id - ID of entry
+   * @param  {Strapi3RequestParams} [params] - Query parameters
+   * @returns Promise<T>
+   */
+  const findOne = <T>(contentType: string, id?: string | number | Strapi3RequestParams, params?: Strapi3RequestParams): Promise<T> => {
+    if (typeof id === 'object') {
+      params = id
+      id = undefined
+    }
+
+    const path = [contentType, id].filter(Boolean).join('/')
+
+    return client(path, { method: 'GET', params })
+  }
+
+  /**
+   * Create a {content-type} entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {Record<string, any>} data - Form data
+   * @returns Promise<T>
+   */
+  const create = <T>(contentType: string, data: Partial<T>): Promise<T> => {
+    return client(`/${contentType}`, { method: 'POST', body: data })
+  }
+
+  /**
+   * Update an entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {string|number} id - ID of entry to be updated
+   * @param  {Record<string, any>} data - Form data
+   * @returns Promise<T>
+   */
+  const update = <T>(contentType: string, id: string | number | Partial<T>, data?: Partial<T>): Promise<T> => {
+    if (typeof id === 'object') {
+      data = id
+      id = undefined
+    }
+
+    const path = [contentType, id].filter(Boolean).join('/')
+
+    return client(path, { method: 'PUT', body: data })
+  }
+
+  /**
+   * Delete an entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {string|number} id - ID of entry to be deleted
+   * @returns Promise<T>
+   */
+  const _delete = <T>(contentType: string, id?: string | number): Promise<T> => {
+    const path = [contentType, id].filter(Boolean).join('/')
+
+    return client(path, { method: 'DELETE' })
+  }
+
+  return {
+    count,
+    find,
+    findOne,
+    create,
+    update,
+    delete: _delete
+  }
 }

src/runtime/composables-v3/useStrapi3.ts

@@ -1,5 +1,6 @@
+import type { FetchOptions } from 'ofetch'
 import type { Strapi4ResponseSingle, Strapi4RequestParams, Strapi4ResponseMany } from '../types/v4'
-import { useStrapi4 } from '#imports'
+import { useStrapiClient } from '#imports'
 
 interface StrapiV4Client<T> {
   find<F = T>(contentType: string, params?: Strapi4RequestParams): Promise<Strapi4ResponseMany<F>>
@@ -10,5 +11,86 @@ interface StrapiV4Client<T> {
 }
 
 export const useStrapi = <T>(): StrapiV4Client<T> => {
-  return useStrapi4() as StrapiV4Client<T>
+  const client = useStrapiClient()
+
+  /**
+   * Get a list of {content-type} entries
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {Strapi4RequestParams} [params] - Query parameters
+   * @returns Promise<T>
+   */
+  const find = <T>(contentType: string, params?: Strapi4RequestParams, fetchOptions?: FetchOptions): Promise<Strapi4ResponseMany<T>> => {
+    return client(`/${contentType}`, { method: 'GET', params, ...fetchOptions })
+  }
+
+  /**
+   * Get a specific {content-type} entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {string|number} id - ID of entry
+   * @param  {Strapi4RequestParams} [params] - Query parameters
+   * @returns Promise<T>
+   */
+  const findOne = <T>(contentType: string, id?: string | number | Strapi4RequestParams, params?: Strapi4RequestParams, fetchOptions?: FetchOptions): Promise<Strapi4ResponseSingle<T>> => {
+    if (typeof id === 'object') {
+      params = id
+      id = undefined
+    }
+
+    const path = [contentType, id].filter(Boolean).join('/')
+
+    return client(path, { method: 'GET', params, ...fetchOptions })
+  }
+
+  /**
+   * Create a {content-type} entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {Record<string, any>} data - Form data
+   * @returns Promise<T>
+   */
+  const create = <T>(contentType: string, data: Partial<T>): Promise<Strapi4ResponseSingle<T>> => {
+    return client(`/${contentType}`, { method: 'POST', body: { data } })
+  }
+
+  /**
+   * Update an entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {string|number} id - ID of entry to be updated
+   * @param  {Record<string, any>} data - Form data
+   * @returns Promise<T>
+   */
+  const update = <T>(contentType: string, id: string | number | Partial<T>, data?: Partial<T>): Promise<Strapi4ResponseSingle<T>> => {
+    if (typeof id === 'object') {
+      data = id
+      id = undefined
+    }
+
+    const path = [contentType, id].filter(Boolean).join('/')
+
+    return client(path, { method: 'PUT', body: { data } })
+  }
+
+  /**
+   * Delete an entry
+   *
+   * @param  {string} contentType - Content type's name pluralized
+   * @param  {string|number} id - ID of entry to be deleted
+   * @returns Promise<T>
+   */
+  const _delete = <T>(contentType: string, id?: string | number): Promise<Strapi4ResponseSingle<T>> => {
+    const path = [contentType, id].filter(Boolean).join('/')
+
+    return client(path, { method: 'DELETE' })
+  }
+
+  return {
+    find,
+    findOne,
+    create,
+    update,
+    delete: _delete
+  }
 }