before moving to openapi-fetch

iliadwebdev · Nov 24, 2024 · 7767d11 · 7767d11
1 parent fff278c
commit 7767d11
Show file tree

Hide file tree

Showing 15 changed files with 13,067 additions and 31 deletions.
diff --git a/apps/iliad-server-showcase/src/@types/api.d.ts b/apps/iliad-server-showcase/src/@types/api.d.ts
diff --git a/apps/iliad-server-showcase/src/@types/components.d.ts b/apps/iliad-server-showcase/src/@types/components.d.ts
@@ -1,5 +1,5 @@
 // This file is generated by a script (typeSync.ts) in the associate Strapi instance. Do not modify it directly.
-// Generated on: Sun, 24 Nov 2024 01:41:31 GMT
+// Generated on: Sun, 24 Nov 2024 20:30:40 GMT
 
 import type { Schema, Attribute } from '@strapi/strapi';
 

diff --git a/apps/iliad-server-showcase/src/@types/contentTypes.d.ts b/apps/iliad-server-showcase/src/@types/contentTypes.d.ts
@@ -1,5 +1,5 @@
 // This file is generated by a script (typeSync.ts) in the associate Strapi instance. Do not modify it directly.
-// Generated on: Sun, 24 Nov 2024 01:41:31 GMT
+// Generated on: Sun, 24 Nov 2024 20:30:40 GMT
 
 import type { Schema, Attribute } from '@strapi/strapi';
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/strapi-adapter/lib/index.js b/packages/strapi-adapter/lib/index.js
@@ -1,24 +1,24 @@
 import {
   StrapiInstance_default
-} from "./chunk-7CRJWFUA.js";
+} from "./chunk-WF6KSB3W.js";
 import {
   legacy_default
-} from "./chunk-LYSBQDE6.js";
+} from "./chunk-ZNKW75SW.js";
 import "./chunk-7P62754R.js";
 import "./chunk-AZ7NCBCO.js";
 import "./chunk-FW7Y72NA.js";
-import "./chunk-Q76N7JTV.js";
+import "./chunk-K4LGOHM2.js";
 import "./chunk-6TCAKOC4.js";
-import "./chunk-L3CB575P.js";
-import "./chunk-2QSIRKTA.js";
-import "./chunk-EWC3LOEU.js";
+import "./chunk-PPEM5JLR.js";
+import "./chunk-PPCCCJ27.js";
+import "./chunk-AANWBPDY.js";
+import "./chunk-ZB2YJ3PK.js";
+import "./chunk-VP54ABXQ.js";
 import "./chunk-KX23GZAT.js";
-import "./chunk-6LFT4IRP.js";
 import "./chunk-4AHPJ27J.js";
 import {
   utils_default
 } from "./chunk-EGZ6UF72.js";
-import "./chunk-AANWBPDY.js";
 import "./chunk-6R3UZR5R.js";
 import "./chunk-HKNJOMU2.js";
 import "./chunk-PKBMQBKP.js";

diff --git a/packages/strapi-adapter/package.json b/packages/strapi-adapter/package.json
@@ -32,6 +32,8 @@
     "deasync": "^0.1.30",
     "deepmerge": "^4.3.1",
     "multiple-extend": "^0.1.3",
+    "openapi-fetch": "^0.13.0",
+    "openapi-typescript-helpers": "^0.0.15",
     "pretty-bytes": "^6.1.1",
     "qs": "^6.13.1",
     "resolve-tspaths": "^0.8.22",

diff --git a/packages/strapi-adapter/src/@types/strapi.ts b/packages/strapi-adapter/src/@types/strapi.ts
@@ -153,3 +153,9 @@ export type StrapiResponse<T extends Common.UID.ContentType> =
   | APIResponse<T>;
 
 export type { Common, Attribute, Utils };
+
+// declare module "@strapi/strapi" {
+//   export module Shared {
+//     export interface Paths {}
+//   }
+// }
diff --git a/packages/strapi-adapter/src/strapiAdapter/ContentTypeSync/data.ts b/packages/strapi-adapter/src/strapiAdapter/ContentTypeSync/data.ts
@@ -9,5 +9,6 @@ export const defaultContentTypesSyncOptions: Recursive_OptionalFieldsOf<ContentT
     names: {
       contentTypes: "contentTypes.d.ts",
       components: "components.d.ts",
+      api: "api.d.ts",
     },
   };
diff --git a/packages/strapi-adapter/src/strapiAdapter/ContentTypeSync/types.ts b/packages/strapi-adapter/src/strapiAdapter/ContentTypeSync/types.ts
@@ -1,4 +1,4 @@
-export type ContentTypesResponse = [string, string];
+export type ContentTypesResponse = Array<string>;
 
 export type ContentTypesSyncOptions = {
   blockOnFirstDownload?: boolean;
@@ -9,6 +9,7 @@ export type ContentTypesSyncOptions = {
   names?: {
     contentTypes?: string;
     components?: string;
+    api?: string;
   };
 };
 

diff --git a/packages/strapi-adapter/src/strapiAdapter/ContentTypeSync/utils.ts b/packages/strapi-adapter/src/strapiAdapter/ContentTypeSync/utils.ts
@@ -20,7 +20,7 @@ function writeContentTypes(
   data: ContentTypesResponse
 ): StandardResponse<string> {
   const { outDir, names } = options;
-  const [components, contentTypes] = data;
+  const [api, components, contentTypes] = data;
 
   console.log("writing content types");
   try {
@@ -30,6 +30,9 @@ function writeContentTypes(
     fs.writeFileSync(`${outDir}/${names.components}`, components, {
       encoding: "utf8",
     });
+    fs.writeFileSync(`${outDir}/${names.api}`, api, {
+      encoding: "utf8",
+    });
   } catch (error) {
     console.error("Error writing content types", error);
     return {
@@ -40,10 +43,10 @@ function writeContentTypes(
     };
   }
 
-  const contentTypesSize = Buffer.byteLength(contentTypes, "utf8");
-  const componentsSize = Buffer.byteLength(components, "utf8");
+  const diskSize = prettyBytes(
+    data.reduce((acc, curr) => acc + Buffer.byteLength(curr, "utf8"), 0)
+  );
 
-  const diskSize = prettyBytes(contentTypesSize + componentsSize);
   return { data: diskSize };
 }
 

diff --git a/packages/strapi-adapter/src/strapiAdapter/StrapiAdapter/index.ts b/packages/strapi-adapter/src/strapiAdapter/StrapiAdapter/index.ts
@@ -18,6 +18,9 @@ import {
   QueryStringEntry,
   CrudQueryFull,
   CTUID,
+  // OPENAPI TYPINGS
+  HttpMethod,
+  FetchResponse,
 } from "./types";
 import { Feature, FeatureParams } from "../Feature";
 import { StrapiUtils } from "@utils";
@@ -43,43 +46,45 @@ class StrapiAdapter extends Feature {
   }
 
   private normalizedFetch<T>(
-    method: RequestInit["method"],
+    method: HttpMethod,
     url: string | URL,
     options: RequestInit = {}
-  ): Promise<StandardResponse<T>> {
+  ): Promise<
+    StandardResponse<FetchResponse<Paths[Path][Method], Init, Media>>
+  > {
     return this.hermes.fetch<T>(normalizeUrl(url), {
       ...options,
       method,
     });
   }
 
   // REST OPERATIONS
-  public async get<R>(
+  public async GET<R>(
     url: string | URL,
     options?: any
   ): Promise<StandardResponse<R>> {
-    return this.normalizedFetch<R>("GET", url, options);
+    return this.normalizedFetch<R>("get", url, options);
   }
 
-  public async post<R>(
+  public async POST<R>(
     url: string | URL,
     options?: any
   ): Promise<StandardResponse<R>> {
-    return this.normalizedFetch<R>("POST", url, options);
+    return this.normalizedFetch<R>("post", url, options);
   }
 
-  public async put<R>(
+  public async PUT<R>(
     url: string | URL,
     options?: any
   ): Promise<StandardResponse<R>> {
-    return this.normalizedFetch<R>("PUT", url, options);
+    return this.normalizedFetch<R>("put", url, options);
   }
 
-  private async deleteREST<R>(
+  private async DELETE<R>(
     url: string | URL,
     options?: any
   ): Promise<StandardResponse<R>> {
-    return this.normalizedFetch<R>("DELETE", url, options);
+    return this.normalizedFetch<R>("delete", url, options);
   }
 
   // CRUD OPERATIONS
@@ -97,7 +102,7 @@ class StrapiAdapter extends Feature {
       query: params,
     });
 
-    return this.get<APIResponseData<UID>>(url);
+    return this.GET<APIResponseData<UID>>(url);
   }
 
   public async find<
@@ -112,7 +117,7 @@ class StrapiAdapter extends Feature {
       query: params,
     });
 
-    return this.get<APIResponseCollection<UID>>(url);
+    return this.GET<APIResponseCollection<UID>>(url);
   }
 
   public async create<
@@ -132,7 +137,7 @@ class StrapiAdapter extends Feature {
       body: JSON.stringify({ data }),
     };
 
-    return this.post<APIResponseData<UID>>(url, options);
+    return this.POST<APIResponseData<UID>>(url, options);
   }
 
   public async update<
@@ -153,7 +158,7 @@ class StrapiAdapter extends Feature {
       body: JSON.stringify({ data }),
     };
 
-    return this.put<APIResponseData<UID>>(url, options);
+    return this.PUT<APIResponseData<UID>>(url, options);
   }
 
   public async delete<
@@ -168,7 +173,7 @@ class StrapiAdapter extends Feature {
       endpoint,
     });
 
-    return this.deleteREST<APIResponseData<UID>>(url);
+    return this.DELETE<APIResponseData<UID>>(url);
   }
 
   // FINISH CRUD OPERATIONS, THEN MAKE RAW REST OPERATIONS.

diff --git a/packages/strapi-adapter/src/strapiAdapter/StrapiAdapter/types/index.ts b/packages/strapi-adapter/src/strapiAdapter/StrapiAdapter/types/index.ts
@@ -91,3 +91,8 @@ export type QueryStringEntry<TContentTypeUID extends CTUID> =
   | Params.Pick<TContentTypeUID, "populate">
   | string
   | "*";
+
+// ========================================
+// OPENAI TYPES
+// ========================================
+export * from "./openapi";