@mittwald/api-models 4.44.0 → 4.44.2

package/dist/esm/app/AppInstallation/AppInstallation.js

@@ -23,7 +23,7 @@ export class AppInstallation extends ReferenceModel {
         const data = await config.behaviors.appInstallation.list(projectId, query);
         return data.map((d) => new AppInstallationListItem(d));
     });
-    getDetailed = provideReact(() => AppInstallation.get(this.id));
+    getDetailed = provideReact(() => AppInstallation.get(this.id), [this.id]);
 }
 // Common class for future extension
 class AppInstallationCommon extends classes((DataModel), AppInstallation) {

package/dist/esm/customer/Customer/Customer.js

@@ -23,7 +23,7 @@ export class Customer extends ReferenceModel {
         assertObjectFound(customer, this, id);
         return customer;
     });
-    getDetailed = provideReact(() => Customer.get(this.id));
+    getDetailed = provideReact(() => Customer.get(this.id), [this.id]);
 }
 // Common class for future extension
 class CustomerCommon extends classes((DataModel), Customer) {

package/dist/esm/domain/Ingress/Ingress.js

@@ -27,7 +27,7 @@ export class Ingress extends ReferenceModel {
         assertObjectFound(ingress, this, id);
         return ingress;
     });
-    getDetailed = provideReact(() => Ingress.get(this.id));
+    getDetailed = provideReact(() => Ingress.get(this.id), [this.id]);
 }
 export class IngressCommon extends classes((DataModel), Ingress) {
     baseUrl;

package/dist/esm/lib/provideReact.js

@@ -1,5 +1,12 @@
 import { reactUsePromise } from "../react/reactUsePromise.js";
-export const provideReact = (loader) => Object.assign(loader, {
-    asResource: (...params) => reactUsePromise.getAsyncResource(loader, params),
-    use: (...params) => reactUsePromise.getAsyncResource(loader, params).use(),
-});
+export const provideReact = (loader, dependencies) => {
+    const getAsyncResource = (params) => reactUsePromise.getAsyncResource(loader, params, {
+        // "stringify" dependencies to be used as loaderId
+        // see https://github.com/mittwald/react-use-promise?tab=readme-ov-file#loaderid
+        loaderId: dependencies ? dependencies.join("|") : undefined,
+    });
+    return Object.assign(loader, {
+        asResource: (...params) => getAsyncResource(params),
+        use: (...params) => getAsyncResource(params).use(),
+    });
+};

package/dist/esm/project/Project/Project.js

@@ -30,7 +30,7 @@ export class Project extends ReferenceModel {
         const { id } = await config.behaviors.project.create(serverId, description);
         return new Project(id);
     }
-    getDetailed = provideReact(() => Project.get(this.id));
+    getDetailed = provideReact(() => Project.get(this.id), [this.id]);
     listIngresses = provideReact(() => Ingress.list({ projectId: this.id }));
     getDefaultIngress = provideReact(async () => {
         const ingresses = await Project.ofId(this.id).listIngresses();

package/dist/esm/server/Server/Server.js

@@ -6,24 +6,24 @@ import assertObjectFound from "../../base/assertObjectFound.js";
 import { Project } from "../../project/index.js";
 import { provideReact } from "../../lib/provideReact.js";
 export class Server extends ReferenceModel {
+    static ofId(id) {
+        return new Server(id);
+    }
     static find = provideReact(async (id) => {
-        const serverData = await config.behaviors.server.find(id);
-        if (serverData !== undefined) {
-            return new ServerDetailed([serverData]);
+        const data = await config.behaviors.server.find(id);
+        if (data !== undefined) {
+            return new ServerDetailed(data);
         }
     });
     static get = provideReact(async (id) => {
-        const server = await ServerDetailed.find(id);
+        const server = await this.find(id);
         assertObjectFound(server, this, id);
         return server;
     });
     static list = provideReact(async (query = {}) => {
         const projectListData = await config.behaviors.server.list(query);
-        return projectListData.map((d) => new ServerListItem([d]));
+        return projectListData.map((d) => new ServerListItem(d));
     });
-    static ofId(id) {
-        return new Server(id);
-    }
     async createProject(...parameters) {
         return Project.create(this.id, ...parameters);
     }
@@ -33,7 +33,7 @@ export class Server extends ReferenceModel {
             serverId: this.id,
         });
     });
-    getDetailed = provideReact(() => ServerDetailed.get(this.id));
+    getDetailed = provideReact(() => Server.get(this.id), [this.id]);
 }
 // Common class for future extension
 class ServerCommon extends classes((DataModel), Server) {
@@ -41,7 +41,13 @@ class ServerCommon extends classes((DataModel), Server) {
         super([data], [data.id]);
     }
 }
-export class ServerListItem extends classes(ServerCommon, (DataModel)) {
-}
 export class ServerDetailed extends classes(ServerCommon, (DataModel)) {
+    constructor(data) {
+        super([data], [data]);
+    }
+}
+export class ServerListItem extends classes(ServerCommon, (DataModel)) {
+    constructor(data) {
+        super([data], [data]);
+    }
 }

package/dist/types/lib/provideReact.d.ts

@@ -1,7 +1,7 @@
 import { AsyncResource } from "../react/reactUsePromise.js";
 type FnParameters = unknown[];
 type AsyncFn<TResult, TParams extends FnParameters> = (...args: TParams) => Promise<TResult>;
-export declare const provideReact: <TValue, TParams extends FnParameters>(loader: AsyncFn<TValue, TParams>) => AsyncResourceVariant<TValue, TParams>;
+export declare const provideReact: <TValue, TParams extends FnParameters>(loader: AsyncFn<TValue, TParams>, dependencies?: string[]) => AsyncResourceVariant<TValue, TParams>;
 export type AsyncResourceVariant<TValue, TParams extends FnParameters> = TParams extends null ? AsyncFn<TValue, TParams> & {
     asResource: () => AsyncResource<TValue>;
 } : AsyncFn<TValue, TParams> & {

package/dist/types/server/Server/Server.d.ts

@@ -1,22 +1,22 @@
 import { ReferenceModel } from "../../base/ReferenceModel.js";
-import { ServerListItemData, ServerData } from "./types.js";
+import { ServerData, ServerListItemData } from "./types.js";
 import { DataModel } from "../../base/DataModel.js";
 import { Project } from "../../project/index.js";
 import { ParamsExceptFirst } from "../../lib/types.js";
 export declare class Server extends ReferenceModel {
-    static find: ((id: string) => Promise<Server | undefined>) & {
-        asResource: (id: string) => import("@mittwald/react-use-promise").AsyncResource<Server | undefined>;
-        use: (id: string) => Server | undefined;
+    static ofId(id: string): Server;
+    static find: ((id: string) => Promise<ServerDetailed | undefined>) & {
+        asResource: (id: string) => import("@mittwald/react-use-promise").AsyncResource<ServerDetailed | undefined>;
+        use: (id: string) => ServerDetailed | undefined;
     };
-    static get: ((id: string) => Promise<Server>) & {
-        asResource: (id: string) => import("@mittwald/react-use-promise").AsyncResource<Server>;
-        use: (id: string) => Server;
+    static get: ((id: string) => Promise<ServerDetailed>) & {
+        asResource: (id: string) => import("@mittwald/react-use-promise").AsyncResource<ServerDetailed>;
+        use: (id: string) => ServerDetailed;
     };
     static list: ((query?: import("@mittwald/api-client").MittwaldAPIV2.Paths.V2Servers.Get.Parameters.Query | undefined) => Promise<ServerListItem[]>) & {
         asResource: (query?: import("@mittwald/api-client").MittwaldAPIV2.Paths.V2Servers.Get.Parameters.Query | undefined) => import("@mittwald/react-use-promise").AsyncResource<ServerListItem[]>;
         use: (query?: import("@mittwald/api-client").MittwaldAPIV2.Paths.V2Servers.Get.Parameters.Query | undefined) => ServerListItem[];
     };
-    static ofId(id: string): Server;
     createProject(...parameters: ParamsExceptFirst<typeof Project.create>): ReturnType<typeof Project.create>;
     listProjects: ((query?: Omit<import("@mittwald/api-client").MittwaldAPIV2.Paths.V2Projects.Get.Parameters.Query | undefined, "serverId"> | undefined) => Promise<readonly import("../../project/index.js").ProjectListItem[]>) & {
         asResource: (query?: Omit<import("@mittwald/api-client").MittwaldAPIV2.Paths.V2Projects.Get.Parameters.Query | undefined, "serverId"> | undefined) => import("@mittwald/react-use-promise").AsyncResource<readonly import("../../project/index.js").ProjectListItem[]>;
@@ -63,10 +63,46 @@ declare const ServerCommon_base: import("polytype").Polytype.ClusteredConstructo
 declare class ServerCommon extends ServerCommon_base {
     constructor(data: ServerListItemData | ServerData);
 }
-declare const ServerListItem_base: import("polytype").Polytype.ClusteredConstructor<[typeof ServerCommon, typeof DataModel<ServerListItemData>]>;
-export declare class ServerListItem extends ServerListItem_base {
-}
-declare const ServerDetailed_base: import("polytype").Polytype.ClusteredConstructor<[typeof ServerCommon, typeof DataModel<ServerData>]>;
+declare const ServerDetailed_base: import("polytype").Polytype.ClusteredConstructor<[typeof ServerCommon, {
+    new (data: {
+        clusterName: string;
+        createdAt: string;
+        customerId: string;
+        description: string;
+        disabledReason?: "suspended" | undefined;
+        id: string;
+        imageRefId?: string | undefined;
+        isReady: boolean;
+        machineType: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectMachineType;
+        readiness: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectDeprecatedServerReadinessStatus;
+        shortId: string;
+        statisticsBaseDomain?: string | undefined;
+        status: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectServerStatus;
+        storage: string;
+    }): DataModel<{
+        clusterName: string;
+        createdAt: string;
+        customerId: string;
+        description: string;
+        disabledReason?: "suspended" | undefined;
+        id: string;
+        imageRefId?: string | undefined;
+        isReady: boolean;
+        machineType: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectMachineType;
+        readiness: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectDeprecatedServerReadinessStatus;
+        shortId: string;
+        statisticsBaseDomain?: string | undefined;
+        status: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectServerStatus;
+        storage: string;
+    }>;
+}]>;
 export declare class ServerDetailed extends ServerDetailed_base {
+    constructor(data: ServerData);
+}
+declare const ServerListItem_base: import("polytype").Polytype.ClusteredConstructor<[typeof ServerCommon, {
+    new (data: import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectServer): DataModel<import("@mittwald/api-client").MittwaldAPIV2.Components.Schemas.ProjectServer>;
+}]>;
+export declare class ServerListItem extends ServerListItem_base {
+    constructor(data: ServerListItemData);
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/api-models",
-  "version": "4.44.0",
+  "version": "4.44.2",
   "author": "Mittwald CM Service GmbH & Co. KG <opensource@mittwald.de>",
   "type": "module",
   "description": "Collection of domain models for coherent interaction with the API",
@@ -71,5 +71,5 @@
       "optional": true
     }
   },
-  "gitHead": "643b93d808723fbfc67f1010a7e9bf365d223f90"
+  "gitHead": "03d7df8f0a9037979a9ce2478a8137911afcff87"
 }