@squonk/account-server-client 0.1.13-rc.1 → 0.1.14-rc.1

package/service/service.cjs

@@ -1,100 +1,44 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  __markAsModule(target);
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
-// src/service/service.ts
-__export(exports, {
-  getGetServiceQueryKey: () => getGetServiceQueryKey,
-  getGetServicesQueryKey: () => getGetServicesQueryKey,
-  getService: () => getService,
-  getServices: () => getServices,
-  useGetService: () => useGetService,
-  useGetServices: () => useGetServices
-});
-var import_react_query = __toModule(require("react-query"));
 
-// src/custom-instance.ts
-var import_axios = __toModule(require("axios"));
-var AXIOS_INSTANCE = import_axios.default.create({ baseURL: "" });
-var customInstance = (config, options) => {
-  const source = import_axios.default.CancelToken.source();
-  const promise = AXIOS_INSTANCE(__spreadProps(__spreadValues(__spreadValues({}, config), options), { cancelToken: source.token })).then(({ data }) => data);
-  promise.cancel = () => {
-    source.cancel("Query was cancelled by React Query");
-  };
-  return promise;
-};
+var _chunk3DXYUDZHcjs = require('../chunk-3DXYUDZH.cjs');
 
 // src/service/service.ts
+
+
+var _reactquery = require('react-query');
 var getServices = (options) => {
-  return customInstance({ url: `/service`, method: "get" }, options);
+  return _chunk3DXYUDZHcjs.customInstance.call(void 0, { url: `/service`, method: "get" }, options);
 };
 var getGetServicesQueryKey = () => [`/service`];
 var useGetServices = (options) => {
   const { query: queryOptions, request: requestOptions } = options || {};
-  const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetServicesQueryKey();
+  const queryKey = _nullishCoalesce((queryOptions == null ? void 0 : queryOptions.queryKey), () => ( getGetServicesQueryKey()));
   const queryFn = () => getServices(requestOptions);
-  const query = (0, import_react_query.useQuery)(queryKey, queryFn, queryOptions);
-  return __spreadValues({
+  const query = _reactquery.useQuery.call(void 0, queryKey, queryFn, queryOptions);
+  return _chunk3DXYUDZHcjs.__spreadValues.call(void 0, {
     queryKey
   }, query);
 };
 var getService = (svcid, options) => {
-  return customInstance({ url: `/service/${svcid}`, method: "get" }, options);
+  return _chunk3DXYUDZHcjs.customInstance.call(void 0, { url: `/service/${svcid}`, method: "get" }, options);
 };
 var getGetServiceQueryKey = (svcid) => [`/service/${svcid}`];
 var useGetService = (svcid, options) => {
   const { query: queryOptions, request: requestOptions } = options || {};
-  const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetServiceQueryKey(svcid);
+  const queryKey = _nullishCoalesce((queryOptions == null ? void 0 : queryOptions.queryKey), () => ( getGetServiceQueryKey(svcid)));
   const queryFn = () => getService(svcid, requestOptions);
-  const query = (0, import_react_query.useQuery)(queryKey, queryFn, __spreadValues({ enabled: !!svcid }, queryOptions));
-  return __spreadValues({
+  const query = _reactquery.useQuery.call(void 0, queryKey, queryFn, _chunk3DXYUDZHcjs.__spreadValues.call(void 0, { enabled: !!svcid }, queryOptions));
+  return _chunk3DXYUDZHcjs.__spreadValues.call(void 0, {
     queryKey
   }, query);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getGetServiceQueryKey,
-  getGetServicesQueryKey,
-  getService,
-  getServices,
-  useGetService,
-  useGetServices
-});
+
+
+
+
+
+
+
+exports.getGetServiceQueryKey = getGetServiceQueryKey; exports.getGetServicesQueryKey = getGetServicesQueryKey; exports.getService = getService; exports.getServices = getServices; exports.useGetService = useGetService; exports.useGetServices = useGetServices;
+//# sourceMappingURL=service.cjs.map

package/service/service.cjs.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["../../src/service/service.ts", "../../src/custom-instance.ts"],
-  "sourcesContent": ["/**\n * Generated by orval v6.4.2 \uD83C\uDF7A\n * Do not edit manually.\n * Account Server API\n * The Informatics Matters Account Server API.\n\nA service that provides access to the Account Server, which gives *registered* users access to and management of **Products**, **Organisations**, **Units** and **Users**.\n\n * OpenAPI spec version: 0.1\n */\nimport {\n  useQuery,\n  UseQueryOptions,\n  QueryFunction,\n  UseQueryResult,\n  QueryKey,\n} from \"react-query\";\nimport type {\n  ServicesGetResponse,\n  AsError,\n  ServiceGetResponse,\n} from \"../account-server-api.schemas\";\nimport { customInstance, ErrorType } from \".././custom-instance\";\n\ntype AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (\n  ...args: any\n) => Promise<infer R>\n  ? R\n  : any;\n\ntype SecondParameter<T extends (...args: any) => any> = T extends (\n  config: any,\n  args: infer P\n) => any\n  ? P\n  : never;\n\n/**\n * Gets services known to the Account Server\n\n * @summary Gets all Services\n */\nexport const getServices = (\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServicesGetResponse>(\n    { url: `/service`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServicesQueryKey = () => [`/service`];\n\nexport const useGetServices = <\n  TData = AsyncReturnType<typeof getServices>,\n  TError = ErrorType<AsError | void>\n>(options?: {\n  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;\n  request?: SecondParameter<typeof customInstance>;\n}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>\n    getServices(requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(\n    queryKey,\n    queryFn,\n    queryOptions\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n\n/**\n * Gets a known service\n\n * @summary Gets a specific Service\n */\nexport const getService = (\n  svcid: number,\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServiceGetResponse>(\n    { url: `/service/${svcid}`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServiceQueryKey = (svcid: number) => [`/service/${svcid}`];\n\nexport const useGetService = <\n  TData = AsyncReturnType<typeof getService>,\n  TError = ErrorType<AsError | void>\n>(\n  svcid: number,\n  options?: {\n    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;\n    request?: SecondParameter<typeof customInstance>;\n  }\n): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcid);\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>\n    getService(svcid, requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(\n    queryKey,\n    queryFn,\n    { enabled: !!svcid, ...queryOptions }\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n", "/** Based off the example custom-instance from Orval docs\n * https://github.com/anymaniax/orval/blob/master/samples/react-app-with-react-query/src/api/mutator/custom-instance.ts\n *\n * See https://react-query.tanstack.com/guides/query-cancellation\n *\n * TODO: Considering using Fetch-API instead of axios. This instance will have to change. Could be\n * achieved without changing much using `redaxios`\n * Or use 'ky'\n */\n\nimport Axios, { AxiosError, AxiosRequestConfig } from 'axios';\n\n// ? Need the baseUrl or does it default to ''?\nexport const AXIOS_INSTANCE = Axios.create({ baseURL: '' });\n\n/**\n * Set the access token to be added as the `Authorization: Bearer 'token'` header\n * Useful for client only apps where a proxy API route isn't involved to securely add the access token\n * @param token access token\n */\nexport const setAuthToken = (token: string) => {\n  AXIOS_INSTANCE.defaults.headers.common['Authorization'] = `Bearer ${token}`;\n};\n\n/**\n * Set the url to which request paths are added to.\n * @param baseUrl origin + subpath e.g. 'https://example.com/subpath' or '/subpath'\n */\nexport const setBaseUrl = (baseUrl: string) => {\n  AXIOS_INSTANCE.defaults.baseURL = baseUrl;\n};\n\nexport const customInstance = <TReturn>(\n  config: AxiosRequestConfig,\n  options?: AxiosRequestConfig,\n): Promise<TReturn> => {\n  const source = Axios.CancelToken.source();\n\n  const promise = AXIOS_INSTANCE({ ...config, ...options, cancelToken: source.token }).then(\n    ({ data }) => data,\n  );\n\n  // Promise doesn't have a cancel method but react-query requires this method to make cancellations general.\n  // This can either be a any assertion or a @ts-ignore comment.\n  (promise as any).cancel = () => {\n    source.cancel('Query was cancelled by React Query');\n  };\n\n  return promise;\n};\n\nexport type ErrorType<TError> = AxiosError<TError>;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAUA,yBAMO;;;ACNP,mBAAsD;AAG/C,IAAM,iBAAiB,qBAAM,OAAO,EAAE,SAAS;AAmB/C,IAAM,iBAAiB,CAC5B,QACA,YACqB;AACrB,QAAM,SAAS,qBAAM,YAAY;AAEjC,QAAM,UAAU,eAAe,gDAAK,SAAW,UAAhB,EAAyB,aAAa,OAAO,UAAS,KACnF,CAAC,EAAE,WAAW;AAKhB,EAAC,QAAgB,SAAS,MAAM;AAC9B,WAAO,OAAO;AAAA;AAGhB,SAAO;AAAA;;;ADNF,IAAM,cAAc,CACzB,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,QAAQ,SAC3B;AAAA;AAIG,IAAM,yBAAyB,MAAM,CAAC;AAEtC,IAAM,iBAAiB,CAG5B,YAG4D;AAC5D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY;AAE3C,QAAM,UAA8D,MAClE,YAAY;AAEd,QAAM,QAAQ,iCACZ,UACA,SACA;AAGF,SAAO;AAAA,IACL;AAAA,KACG;AAAA;AASA,IAAM,aAAa,CACxB,OACA,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,SAAS,QAAQ,SACpC;AAAA;AAIG,IAAM,wBAAwB,CAAC,UAAkB,CAAC,YAAY;AAE9D,IAAM,gBAAgB,CAI3B,OACA,YAI2D;AAC3D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY,sBAAsB;AAEjE,QAAM,UAA6D,MACjE,WAAW,OAAO;AAEpB,QAAM,QAAQ,iCACZ,UACA,SACA,iBAAE,SAAS,CAAC,CAAC,SAAU;AAGzB,SAAO;AAAA,IACL;AAAA,KACG;AAAA;",
-  "names": []
-}
+{"version":3,"sources":["../../src/service/service.ts"],"names":[],"mappings":";;;;;;AAUA;AAAA;AAAA;AAkCO,IAAM,cAAc,CACzB,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,QAAQ,SAC3B;AAAA;AAIG,IAAM,yBAAyB,MAAM,CAAC;AAEtC,IAAM,iBAAiB,CAG5B,YAG4D;AAC5D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY;AAE3C,QAAM,UAA8D,MAClE,YAAY;AAEd,QAAM,QAAQ,SACZ,UACA,SACA;AAGF,SAAO;AAAA,IACL;AAAA,KACG;AAAA;AASA,IAAM,aAAa,CACxB,OACA,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,SAAS,QAAQ,SACpC;AAAA;AAIG,IAAM,wBAAwB,CAAC,UAAkB,CAAC,YAAY;AAE9D,IAAM,gBAAgB,CAI3B,OACA,YAI2D;AAC3D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY,sBAAsB;AAEjE,QAAM,UAA6D,MACjE,WAAW,OAAO;AAEpB,QAAM,QAAQ,SACZ,UACA,SACA,iBAAE,SAAS,CAAC,CAAC,SAAU;AAGzB,SAAO;AAAA,IACL;AAAA,KACG;AAAA","sourcesContent":["/**\n * Generated by orval v6.6.0 🍺\n * Do not edit manually.\n * Account Server API\n * The Informatics Matters Account Server API.\n\nA service that provides access to the Account Server, which gives *registered* users access to and management of **Products**, **Organisations**, **Units** and **Users**.\n\n * OpenAPI spec version: 0.1\n */\nimport {\n  useQuery,\n  UseQueryOptions,\n  QueryFunction,\n  UseQueryResult,\n  QueryKey,\n} from \"react-query\";\nimport type {\n  ServicesGetResponse,\n  AsError,\n  ServiceGetResponse,\n} from \"../account-server-api.schemas\";\nimport { customInstance, ErrorType } from \".././custom-instance\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (\n  ...args: any\n) => Promise<infer R>\n  ? R\n  : any;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype SecondParameter<T extends (...args: any) => any> = T extends (\n  config: any,\n  args: infer P\n) => any\n  ? P\n  : never;\n\n/**\n * Gets services known to the Account Server\n\n * @summary Gets all Services\n */\nexport const getServices = (\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServicesGetResponse>(\n    { url: `/service`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServicesQueryKey = () => [`/service`];\n\nexport const useGetServices = <\n  TData = AsyncReturnType<typeof getServices>,\n  TError = ErrorType<AsError | void>\n>(options?: {\n  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;\n  request?: SecondParameter<typeof customInstance>;\n}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>\n    getServices(requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(\n    queryKey,\n    queryFn,\n    queryOptions\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n\n/**\n * Gets a known service\n\n * @summary Gets a specific Service\n */\nexport const getService = (\n  svcid: number,\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServiceGetResponse>(\n    { url: `/service/${svcid}`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServiceQueryKey = (svcid: number) => [`/service/${svcid}`];\n\nexport const useGetService = <\n  TData = AsyncReturnType<typeof getService>,\n  TError = ErrorType<AsError | void>\n>(\n  svcid: number,\n  options?: {\n    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;\n    request?: SecondParameter<typeof customInstance>;\n  }\n): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcid);\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>\n    getService(svcid, requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(\n    queryKey,\n    queryFn,\n    { enabled: !!svcid, ...queryOptions }\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n"]}

package/service/service.d.ts

@@ -1,9 +1,9 @@
 import { UseQueryOptions, QueryKey, UseQueryResult } from 'react-query';
-import { K as customInstance, f as ServicesGetResponse, L as ErrorType, G as AsError, S as ServiceGetResponse } from '../custom-instance-108ca7f1';
+import { K as customInstance, e as ServicesGetResponse, L as ErrorType, G as AsError, S as ServiceGetResponse } from '../custom-instance-7503296b';
 import 'axios';
 
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.

package/service/service.js

@@ -1,41 +1,12 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import {
+  __spreadValues,
+  customInstance
+} from "../chunk-JR7F532L.js";
 
 // src/service/service.ts
 import {
   useQuery
 } from "react-query";
-
-// src/custom-instance.ts
-import Axios from "axios";
-var AXIOS_INSTANCE = Axios.create({ baseURL: "" });
-var customInstance = (config, options) => {
-  const source = Axios.CancelToken.source();
-  const promise = AXIOS_INSTANCE(__spreadProps(__spreadValues(__spreadValues({}, config), options), { cancelToken: source.token })).then(({ data }) => data);
-  promise.cancel = () => {
-    source.cancel("Query was cancelled by React Query");
-  };
-  return promise;
-};
-
-// src/service/service.ts
 var getServices = (options) => {
   return customInstance({ url: `/service`, method: "get" }, options);
 };
@@ -70,3 +41,4 @@ export {
   useGetService,
   useGetServices
 };
+//# sourceMappingURL=service.js.map

package/service/service.js.map

@@ -1,7 +1 @@
-{
-  "version": 3,
-  "sources": ["../../src/service/service.ts", "../../src/custom-instance.ts"],
-  "sourcesContent": ["/**\n * Generated by orval v6.4.2 \uD83C\uDF7A\n * Do not edit manually.\n * Account Server API\n * The Informatics Matters Account Server API.\n\nA service that provides access to the Account Server, which gives *registered* users access to and management of **Products**, **Organisations**, **Units** and **Users**.\n\n * OpenAPI spec version: 0.1\n */\nimport {\n  useQuery,\n  UseQueryOptions,\n  QueryFunction,\n  UseQueryResult,\n  QueryKey,\n} from \"react-query\";\nimport type {\n  ServicesGetResponse,\n  AsError,\n  ServiceGetResponse,\n} from \"../account-server-api.schemas\";\nimport { customInstance, ErrorType } from \".././custom-instance\";\n\ntype AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (\n  ...args: any\n) => Promise<infer R>\n  ? R\n  : any;\n\ntype SecondParameter<T extends (...args: any) => any> = T extends (\n  config: any,\n  args: infer P\n) => any\n  ? P\n  : never;\n\n/**\n * Gets services known to the Account Server\n\n * @summary Gets all Services\n */\nexport const getServices = (\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServicesGetResponse>(\n    { url: `/service`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServicesQueryKey = () => [`/service`];\n\nexport const useGetServices = <\n  TData = AsyncReturnType<typeof getServices>,\n  TError = ErrorType<AsError | void>\n>(options?: {\n  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;\n  request?: SecondParameter<typeof customInstance>;\n}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>\n    getServices(requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(\n    queryKey,\n    queryFn,\n    queryOptions\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n\n/**\n * Gets a known service\n\n * @summary Gets a specific Service\n */\nexport const getService = (\n  svcid: number,\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServiceGetResponse>(\n    { url: `/service/${svcid}`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServiceQueryKey = (svcid: number) => [`/service/${svcid}`];\n\nexport const useGetService = <\n  TData = AsyncReturnType<typeof getService>,\n  TError = ErrorType<AsError | void>\n>(\n  svcid: number,\n  options?: {\n    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;\n    request?: SecondParameter<typeof customInstance>;\n  }\n): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcid);\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>\n    getService(svcid, requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(\n    queryKey,\n    queryFn,\n    { enabled: !!svcid, ...queryOptions }\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n", "/** Based off the example custom-instance from Orval docs\n * https://github.com/anymaniax/orval/blob/master/samples/react-app-with-react-query/src/api/mutator/custom-instance.ts\n *\n * See https://react-query.tanstack.com/guides/query-cancellation\n *\n * TODO: Considering using Fetch-API instead of axios. This instance will have to change. Could be\n * achieved without changing much using `redaxios`\n * Or use 'ky'\n */\n\nimport Axios, { AxiosError, AxiosRequestConfig } from 'axios';\n\n// ? Need the baseUrl or does it default to ''?\nexport const AXIOS_INSTANCE = Axios.create({ baseURL: '' });\n\n/**\n * Set the access token to be added as the `Authorization: Bearer 'token'` header\n * Useful for client only apps where a proxy API route isn't involved to securely add the access token\n * @param token access token\n */\nexport const setAuthToken = (token: string) => {\n  AXIOS_INSTANCE.defaults.headers.common['Authorization'] = `Bearer ${token}`;\n};\n\n/**\n * Set the url to which request paths are added to.\n * @param baseUrl origin + subpath e.g. 'https://example.com/subpath' or '/subpath'\n */\nexport const setBaseUrl = (baseUrl: string) => {\n  AXIOS_INSTANCE.defaults.baseURL = baseUrl;\n};\n\nexport const customInstance = <TReturn>(\n  config: AxiosRequestConfig,\n  options?: AxiosRequestConfig,\n): Promise<TReturn> => {\n  const source = Axios.CancelToken.source();\n\n  const promise = AXIOS_INSTANCE({ ...config, ...options, cancelToken: source.token }).then(\n    ({ data }) => data,\n  );\n\n  // Promise doesn't have a cancel method but react-query requires this method to make cancellations general.\n  // This can either be a any assertion or a @ts-ignore comment.\n  (promise as any).cancel = () => {\n    source.cancel('Query was cancelled by React Query');\n  };\n\n  return promise;\n};\n\nexport type ErrorType<TError> = AxiosError<TError>;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAUA;AAAA;AAAA;;;ACAA;AAGO,IAAM,iBAAiB,MAAM,OAAO,EAAE,SAAS;AAmB/C,IAAM,iBAAiB,CAC5B,QACA,YACqB;AACrB,QAAM,SAAS,MAAM,YAAY;AAEjC,QAAM,UAAU,eAAe,gDAAK,SAAW,UAAhB,EAAyB,aAAa,OAAO,UAAS,KACnF,CAAC,EAAE,WAAW;AAKhB,EAAC,QAAgB,SAAS,MAAM;AAC9B,WAAO,OAAO;AAAA;AAGhB,SAAO;AAAA;;;ADNF,IAAM,cAAc,CACzB,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,QAAQ,SAC3B;AAAA;AAIG,IAAM,yBAAyB,MAAM,CAAC;AAEtC,IAAM,iBAAiB,CAG5B,YAG4D;AAC5D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY;AAE3C,QAAM,UAA8D,MAClE,YAAY;AAEd,QAAM,QAAQ,SACZ,UACA,SACA;AAGF,SAAO;AAAA,IACL;AAAA,KACG;AAAA;AASA,IAAM,aAAa,CACxB,OACA,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,SAAS,QAAQ,SACpC;AAAA;AAIG,IAAM,wBAAwB,CAAC,UAAkB,CAAC,YAAY;AAE9D,IAAM,gBAAgB,CAI3B,OACA,YAI2D;AAC3D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY,sBAAsB;AAEjE,QAAM,UAA6D,MACjE,WAAW,OAAO;AAEpB,QAAM,QAAQ,SACZ,UACA,SACA,iBAAE,SAAS,CAAC,CAAC,SAAU;AAGzB,SAAO;AAAA,IACL;AAAA,KACG;AAAA;",
-  "names": []
-}
+{"version":3,"sources":["../../src/service/service.ts"],"sourcesContent":["/**\n * Generated by orval v6.6.0 🍺\n * Do not edit manually.\n * Account Server API\n * The Informatics Matters Account Server API.\n\nA service that provides access to the Account Server, which gives *registered* users access to and management of **Products**, **Organisations**, **Units** and **Users**.\n\n * OpenAPI spec version: 0.1\n */\nimport {\n  useQuery,\n  UseQueryOptions,\n  QueryFunction,\n  UseQueryResult,\n  QueryKey,\n} from \"react-query\";\nimport type {\n  ServicesGetResponse,\n  AsError,\n  ServiceGetResponse,\n} from \"../account-server-api.schemas\";\nimport { customInstance, ErrorType } from \".././custom-instance\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (\n  ...args: any\n) => Promise<infer R>\n  ? R\n  : any;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype SecondParameter<T extends (...args: any) => any> = T extends (\n  config: any,\n  args: infer P\n) => any\n  ? P\n  : never;\n\n/**\n * Gets services known to the Account Server\n\n * @summary Gets all Services\n */\nexport const getServices = (\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServicesGetResponse>(\n    { url: `/service`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServicesQueryKey = () => [`/service`];\n\nexport const useGetServices = <\n  TData = AsyncReturnType<typeof getServices>,\n  TError = ErrorType<AsError | void>\n>(options?: {\n  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;\n  request?: SecondParameter<typeof customInstance>;\n}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>\n    getServices(requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(\n    queryKey,\n    queryFn,\n    queryOptions\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n\n/**\n * Gets a known service\n\n * @summary Gets a specific Service\n */\nexport const getService = (\n  svcid: number,\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServiceGetResponse>(\n    { url: `/service/${svcid}`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServiceQueryKey = (svcid: number) => [`/service/${svcid}`];\n\nexport const useGetService = <\n  TData = AsyncReturnType<typeof getService>,\n  TError = ErrorType<AsError | void>\n>(\n  svcid: number,\n  options?: {\n    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;\n    request?: SecondParameter<typeof customInstance>;\n  }\n): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcid);\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>\n    getService(svcid, requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(\n    queryKey,\n    queryFn,\n    { enabled: !!svcid, ...queryOptions }\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n"],"mappings":";;;;;;AAUA;AAAA;AAAA;AAkCO,IAAM,cAAc,CACzB,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,QAAQ,SAC3B;AAAA;AAIG,IAAM,yBAAyB,MAAM,CAAC;AAEtC,IAAM,iBAAiB,CAG5B,YAG4D;AAC5D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY;AAE3C,QAAM,UAA8D,MAClE,YAAY;AAEd,QAAM,QAAQ,SACZ,UACA,SACA;AAGF,SAAO;AAAA,IACL;AAAA,KACG;AAAA;AASA,IAAM,aAAa,CACxB,OACA,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,SAAS,QAAQ,SACpC;AAAA;AAIG,IAAM,wBAAwB,CAAC,UAAkB,CAAC,YAAY;AAE9D,IAAM,gBAAgB,CAI3B,OACA,YAI2D;AAC3D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW;AAEpE,QAAM,WAAW,8CAAc,aAAY,sBAAsB;AAEjE,QAAM,UAA6D,MACjE,WAAW,OAAO;AAEpB,QAAM,QAAQ,SACZ,UACA,SACA,iBAAE,SAAS,CAAC,CAAC,SAAU;AAGzB,SAAO;AAAA,IACL;AAAA,KACG;AAAA;","names":[]}

package/src/account-server-api.schemas.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -88,12 +88,6 @@ export interface UserDetail {
   id: string;
 }
 
-export interface UnitDetail {
-  id: string;
-  name: string;
-  owner_id?: string;
-}
-
 export interface ServiceGetResponse {
   id: number;
   kind: string;
@@ -218,10 +212,22 @@ export interface ProductDmStorageDetail {
   coins: ProductDmStorageDetailCoins;
 }
 
+export interface UnitsGetResponse {
+  /** A list of Units
+   */
+  units: OrganisationUnitsGetResponse[];
+}
+
+export interface UnitGetResponse {
+  id: string;
+  name: string;
+  owner_id?: string;
+}
+
 export interface ProductDmProjectTier {
   product: ProductDetail;
   organisation: OrganisationDetail;
-  unit: UnitDetail;
+  unit: UnitGetResponse;
   storage: ProductDmStorageDetail;
   coins: ProductCoinsDetail;
   instance: ProductInstanceDetail;
@@ -231,17 +237,11 @@ export interface ProductDmProjectTier {
 export interface ProductDmStorage {
   product: ProductDetail;
   organisation: OrganisationDetail;
-  unit: UnitDetail;
+  unit: UnitGetResponse;
   storage: ProductDmStorageDetail;
   coins: ProductCoinsDetail;
 }
 
-export interface UnitsGetResponse {
-  /** A list of Units
-   */
-  units: OrganisationUnitsGetResponse[];
-}
-
 export interface UnitProductPostResponse {
   /** The products's unique ID */
   id: string;
@@ -282,7 +282,7 @@ export interface OrganisationUnitsGetResponse {
   organisation: OrganisationDetail;
   /** A list of Units
    */
-  units: UnitDetail[];
+  units: UnitGetResponse[];
 }
 
 export interface OrganisationUnitPostResponse {
@@ -292,7 +292,7 @@ export interface OrganisationUnitPostResponse {
 
 export interface UsersGetResponse {
   organisation?: OrganisationDetail;
-  unit?: UnitDetail;
+  unit?: UnitGetResponse;
   /** The list of Organisation Users
    */
   users: UserDetail[];

package/src/custom-instance.ts

@@ -10,8 +10,7 @@
 
 import Axios, { AxiosError, AxiosRequestConfig } from 'axios';
 
-// ? Need the baseUrl or does it default to ''?
-export const AXIOS_INSTANCE = Axios.create({ baseURL: '' });
+export const AXIOS_INSTANCE = Axios.create();
 
 /**
  * Set the access token to be added as the `Authorization: Bearer 'token'` header

package/src/organisation/organisation.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -26,12 +26,14 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ...args: any
 ) => Promise<infer R>
   ? R
   : any;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
   args: infer P
@@ -144,7 +146,7 @@ export const deleteOrganisation = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<void>(
-    { url: `/organisation/${orgid}`, method: "delete", data: undefined },
+    { url: `/organisation/${orgid}`, method: "delete" },
     options
   );
 };

package/src/product/product.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -29,12 +29,14 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ...args: any
 ) => Promise<infer R>
   ? R
   : any;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
   args: infer P

package/src/service/service.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -22,12 +22,14 @@ import type {
 } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ...args: any
 ) => Promise<infer R>
   ? R
   : any;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
   args: infer P

package/src/unit/unit.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -23,16 +23,19 @@ import type {
   AsError,
   OrganisationUnitPostResponse,
   OrganisationUnitPostBodyBody,
+  UnitGetResponse,
   UnitsGetResponse,
 } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ...args: any
 ) => Promise<infer R>
   ? R
   : any;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
   args: infer P
@@ -144,6 +147,56 @@ export const useCreateOrganisationUnit = <
     TContext
   >(mutationFn, mutationOptions);
 };
+/**
+ * Gets the Unit, assuming you are a member of it. Admin users can see all Units
+
+ * @summary Gets a Unit
+ */
+export const getUnit = (
+  orgid: string,
+  unitid: string,
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<UnitGetResponse>(
+    { url: `/organisation/${orgid}/unit/${unitid}`, method: "get" },
+    options
+  );
+};
+
+export const getGetUnitQueryKey = (orgid: string, unitid: string) => [
+  `/organisation/${orgid}/unit/${unitid}`,
+];
+
+export const useGetUnit = <
+  TData = AsyncReturnType<typeof getUnit>,
+  TError = ErrorType<void | AsError>
+>(
+  orgid: string,
+  unitid: string,
+  options?: {
+    query?: UseQueryOptions<AsyncReturnType<typeof getUnit>, TError, TData>;
+    request?: SecondParameter<typeof customInstance>;
+  }
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
+  const { query: queryOptions, request: requestOptions } = options || {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetUnitQueryKey(orgid, unitid);
+
+  const queryFn: QueryFunction<AsyncReturnType<typeof getUnit>> = () =>
+    getUnit(orgid, unitid, requestOptions);
+
+  const query = useQuery<AsyncReturnType<typeof getUnit>, TError, TData>(
+    queryKey,
+    queryFn,
+    { enabled: !!(orgid && unitid), ...queryOptions }
+  );
+
+  return {
+    queryKey,
+    ...query,
+  };
+};
+
 /**
  * Deletes an Organisational Unit you have access to. Units can only be deleted by Organisation users or Admin users. You cannot delete a Unit that contains Products
 
@@ -155,11 +208,7 @@ export const deleteOrganisationUnit = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<void>(
-    {
-      url: `/organisation/${orgid}/unit/${unitid}`,
-      method: "delete",
-      data: undefined,
-    },
+    { url: `/organisation/${orgid}/unit/${unitid}`, method: "delete" },
     options
   );
 };
@@ -243,7 +292,7 @@ export const createDefaultUnit = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<OrganisationUnitPostResponse>(
-    { url: `/unit`, method: "put", data: undefined },
+    { url: `/unit`, method: "put" },
     options
   );
 };
@@ -285,10 +334,7 @@ export const useCreateDefaultUnit = <
 export const deleteDefaultUnit = (
   options?: SecondParameter<typeof customInstance>
 ) => {
-  return customInstance<void>(
-    { url: `/unit`, method: "delete", data: undefined },
-    options
-  );
+  return customInstance<void>({ url: `/unit`, method: "delete" }, options);
 };
 
 export const useDeleteDefaultUnit = <

package/src/user/user.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v6.4.2 🍺
+ * Generated by orval v6.6.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
@@ -21,12 +21,14 @@ import {
 import type { UsersGetResponse, AsError } from "../account-server-api.schemas";
 import { customInstance, ErrorType } from ".././custom-instance";
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ...args: any
 ) => Promise<infer R>
   ? R
   : any;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type SecondParameter<T extends (...args: any) => any> = T extends (
   config: any,
   args: infer P
@@ -99,11 +101,7 @@ export const addOrganisationUser = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<void>(
-    {
-      url: `/organisation/${orgid}/user/${userid}`,
-      method: "put",
-      data: undefined,
-    },
+    { url: `/organisation/${orgid}/user/${userid}`, method: "put" },
     options
   );
 };
@@ -149,11 +147,7 @@ export const deleteOrganisationUser = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<void>(
-    {
-      url: `/organisation/${orgid}/user/${userid}`,
-      method: "delete",
-      data: undefined,
-    },
+    { url: `/organisation/${orgid}/user/${userid}`, method: "delete" },
     options
   );
 };
@@ -253,7 +247,7 @@ export const addOrganisationUnitUser = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<void>(
-    { url: `/unit/${unitid}/user/${userid}`, method: "put", data: undefined },
+    { url: `/unit/${unitid}/user/${userid}`, method: "put" },
     options
   );
 };
@@ -299,11 +293,7 @@ export const deleteOrganisationUnitUser = (
   options?: SecondParameter<typeof customInstance>
 ) => {
   return customInstance<void>(
-    {
-      url: `/unit/${unitid}/user/${userid}`,
-      method: "delete",
-      data: undefined,
-    },
+    { url: `/unit/${unitid}/user/${userid}`, method: "delete" },
     options
   );
 };