@vrplatform/api 1.3.1-1368 → 1.3.1-1419

package/build/module/types.d.ts

@@ -33,22 +33,17 @@ export type ResponseData<T extends ResponseCombinations> = T extends `${infer Me
 } ? Data : never : never : never : never;
 type RequestBodyCombinations = {
     [Path in keyof paths]: {
-        [Method in keyof paths[Path]]: paths[Path][Method] extends never ? never : paths[Path][Method] extends {
-            requestBody: {
-                content: {
-                    'application/json': unknown;
-                };
-            };
-        } ? `${Method & string}:${Path}` : never;
+        [Method in keyof paths[Path]]: paths[Path][Method] extends never ? never : ExtractJsonRequestBody<paths[Path][Method]> extends never ? never : `${Method & string}:${Path}`;
     }[keyof paths[Path]];
 }[keyof paths];
-export type RequestBody<T extends RequestBodyCombinations> = T extends `${infer Method}:${infer Path}` ? Path extends keyof paths ? Method extends keyof paths[Path] ? paths[Path][Method] extends {
-    requestBody: {
-        content: {
-            'application/json': infer Data;
-        };
+type ExtractJsonRequestBody<T> = T extends {
+    requestBody?: infer RequestBody;
+} ? RequestBody extends {
+    content: {
+        'application/json': infer Data;
     };
-} ? Data : never : never : never : never;
+} ? Data : never : never;
+export type RequestBody<T extends RequestBodyCombinations> = T extends `${infer Method}:${infer Path}` ? Path extends keyof paths ? Method extends keyof paths[Path] ? ExtractJsonRequestBody<paths[Path][Method]> : never : never : never;
 type RequestParamCombinations = {
     [Path in keyof paths]: {
         [Method in keyof paths[Path]]: paths[Path][Method] extends never ? never : paths[Path][Method] extends {

package/build/module/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"src/","sources":["types.ts"],"names":[],"mappings":"","sourcesContent":["import type createClient from 'openapi-fetch';\nimport type { paths } from './generated/v1';\n\nexport type ApiClientAuth = {\n  apiKey?: string;\n  sec?: string;\n  tenantId?: string;\n  accessToken?: string;\n};\nexport type ApiClient = ReturnType<typeof createClient<paths>> & {\n  sessionId: string;\n};\ntype ResponseCombinations = {\n  [Path in keyof paths]: {\n    [Method in keyof paths[Path]]: paths[Path][Method] extends never\n      ? never\n      : paths[Path][Method] extends {\n            responses: {\n              200: { content: { 'application/json': unknown } };\n            };\n          }\n        ? `${Method & string}:${Path}`\n        : never;\n  }[keyof paths[Path]];\n}[keyof paths];\n\nexport type ResponseData<T extends ResponseCombinations> =\n  T extends `${infer Method}:${infer Path}`\n    ? Path extends keyof paths\n      ? Method extends keyof paths[Path]\n        ? paths[Path][Method] extends {\n            responses: {\n              200: { content: { 'application/json': infer Data } };\n            };\n          }\n          ? Data\n          : never\n        : never\n      : never\n    : never;\n\ntype RequestBodyCombinations = {\n  [Path in keyof paths]: {\n    [Method in keyof paths[Path]]: paths[Path][Method] extends never\n      ? never\n      : paths[Path][Method] extends {\n            requestBody: {\n              content: { 'application/json': unknown };\n            };\n          }\n        ? `${Method & string}:${Path}`\n        : never;\n  }[keyof paths[Path]];\n}[keyof paths];\n\nexport type RequestBody<T extends RequestBodyCombinations> =\n  T extends `${infer Method}:${infer Path}`\n    ? Path extends keyof paths\n      ? Method extends keyof paths[Path]\n        ? paths[Path][Method] extends {\n            requestBody: {\n              content: { 'application/json': infer Data };\n            };\n          }\n          ? Data\n          : never\n        : never\n      : never\n    : never;\n\ntype RequestParamCombinations = {\n  [Path in keyof paths]: {\n    [Method in keyof paths[Path]]: paths[Path][Method] extends never\n      ? never\n      : paths[Path][Method] extends {\n            parameters: {\n              query?: Record<string, unknown>;\n            };\n          }\n        ? `${Method & string}:${Path}`\n        : never;\n  }[keyof paths[Path]];\n}[keyof paths];\n\nexport type RequestQuery<T extends RequestParamCombinations> =\n  T extends `${infer Method}:${infer Path}`\n    ? Path extends keyof paths\n      ? Method extends keyof paths[Path]\n        ? paths[Path][Method] extends {\n            parameters: {\n              query?: infer Data;\n            };\n          }\n          ? Data\n          : never\n        : never\n      : never\n    : never;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"src/","sources":["types.ts"],"names":[],"mappings":"","sourcesContent":["import type createClient from 'openapi-fetch';\nimport type { paths } from './generated/v1';\n\nexport type ApiClientAuth = {\n  apiKey?: string;\n  sec?: string;\n  tenantId?: string;\n  accessToken?: string;\n};\nexport type ApiClient = ReturnType<typeof createClient<paths>> & {\n  sessionId: string;\n};\ntype ResponseCombinations = {\n  [Path in keyof paths]: {\n    [Method in keyof paths[Path]]: paths[Path][Method] extends never\n      ? never\n      : paths[Path][Method] extends {\n            responses: {\n              200: { content: { 'application/json': unknown } };\n            };\n          }\n        ? `${Method & string}:${Path}`\n        : never;\n  }[keyof paths[Path]];\n}[keyof paths];\n\nexport type ResponseData<T extends ResponseCombinations> =\n  T extends `${infer Method}:${infer Path}`\n    ? Path extends keyof paths\n      ? Method extends keyof paths[Path]\n        ? paths[Path][Method] extends {\n            responses: {\n              200: { content: { 'application/json': infer Data } };\n            };\n          }\n          ? Data\n          : never\n        : never\n      : never\n    : never;\n\ntype RequestBodyCombinations = {\n  [Path in keyof paths]: {\n    [Method in keyof paths[Path]]: paths[Path][Method] extends never\n      ? never\n      : ExtractJsonRequestBody<paths[Path][Method]> extends never\n        ? never\n        : `${Method & string}:${Path}`;\n  }[keyof paths[Path]];\n}[keyof paths];\n\ntype ExtractJsonRequestBody<T> = T extends {\n  requestBody?: infer RequestBody;\n}\n  ? RequestBody extends {\n      content: { 'application/json': infer Data };\n    }\n    ? Data\n    : never\n  : never;\n\nexport type RequestBody<T extends RequestBodyCombinations> =\n  T extends `${infer Method}:${infer Path}`\n    ? Path extends keyof paths\n      ? Method extends keyof paths[Path]\n        ? ExtractJsonRequestBody<paths[Path][Method]>\n        : never\n      : never\n    : never;\n\ntype RequestParamCombinations = {\n  [Path in keyof paths]: {\n    [Method in keyof paths[Path]]: paths[Path][Method] extends never\n      ? never\n      : paths[Path][Method] extends {\n            parameters: {\n              query?: Record<string, unknown>;\n            };\n          }\n        ? `${Method & string}:${Path}`\n        : never;\n  }[keyof paths[Path]];\n}[keyof paths];\n\nexport type RequestQuery<T extends RequestParamCombinations> =\n  T extends `${infer Method}:${infer Path}`\n    ? Path extends keyof paths\n      ? Method extends keyof paths[Path]\n        ? paths[Path][Method] extends {\n            parameters: {\n              query?: infer Data;\n            };\n          }\n          ? Data\n          : never\n        : never\n      : never\n    : never;\n"]}

package/package.json

@@ -6,7 +6,7 @@
     "typings": "build/main/index.d.ts",
     "module": "build/module/index.js"
   },
-  "version": "1.3.1-1368",
+  "version": "1.3.1-1419",
   "description": "",
   "main": "build/main/index.js",
   "module": "build/module/index.js",
@@ -38,7 +38,6 @@
   },
   "devDependencies": {
     "@vrplatform/kysely": "*",
-    "@vrplatform/repository": "*",
     "@vrplatform/common": "*",
     "@vrplatform/bin": "*"
   },

package/src/cache.ts

@@ -1,9 +1,9 @@
-export type CacheEntry<T> = {
+type CacheEntry<T> = {
   value: T;
   expiresAt: number;
 };
 
-export type CacheResult<T, A> = {
+type CacheResult<T, A> = {
   current: (arg: A) => Promise<T>;
   invalidate: () => void;
 };

package/src/error.ts

@@ -17,8 +17,9 @@ export class ApiClientError extends Error {
   }[];
   context: any;
   constructor(public error: E) {
-    if (!error.message)
-      error.message = [
+    const message =
+      error.message ||
+      [
         error.code,
         error.issues
           ?.map((x) =>
@@ -30,7 +31,7 @@ export class ApiClientError extends Error {
       ]
         .filter(hasValue)
         .join(': ');
-    super(error.message);
+    super(message);
 
     this.code = error.code;
     this.issues = error.issues || [];