@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/poolFire.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -173,28 +176,22 @@ class PoolFireCalculationRequest extends CalculationRequestBase {
   /**
    * PoolFire calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.PoolRecord[]} poolRecords -  an array of pool records.
-   * @param {number} poolRecordCount - Number of pool records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     poolRecords: Entities.PoolRecord[],
     poolRecordCount: number,
     weather: Entities.Weather,
     substrate: Entities.Substrate,
     flammableParameters: Entities.FlammableParameters
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.poolRecords = poolRecords;
-    this.poolRecordCount = poolRecordCount;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.flammableParameters = flammableParameters;
+    this.material = data.material;
+    this.poolRecords = data.poolRecords;
+    this.poolRecordCount = data.poolRecordCount;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.flammableParameters = data.flammableParameters;
   }
 }
 
@@ -234,14 +231,7 @@ export class PoolFireCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: PoolFireCalculationRequestSchemaData): PoolFireCalculationRequest {
-    return new PoolFireCalculationRequest(
-      data.material,
-      data.poolRecords,
-      data.poolRecordCount,
-      data.weather,
-      data.substrate,
-      data.flammableParameters
-    );
+    return new PoolFireCalculationRequest(data);
   }
 }
 
@@ -258,40 +248,35 @@ export class PoolFireCalculation extends CalculationBase {
   /**
    * Determines the flame produced from an ignited flammable pool.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.PoolRecord[]} poolRecords -  an array of pool records.
-   * @param {number} poolRecordCount - Number of pool records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     poolRecords: Entities.PoolRecord[],
     poolRecordCount: number,
     weather: Entities.Weather,
     substrate: Entities.Substrate,
     flammableParameters: Entities.FlammableParameters
-  ) {
-    super();
-    this.material = material;
-    this.poolRecords = poolRecords;
-    this.poolRecordCount = poolRecordCount;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.flammableParameters = flammableParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.poolRecords = data.poolRecords;
+    this.poolRecordCount = data.poolRecordCount;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.flammableParameters = data.flammableParameters;
   }
 
   async run() {
     try {
-      const request = new PoolFireCalculationRequest(
-        this.material,
-        this.poolRecords,
-        this.poolRecordCount,
-        this.weather,
-        this.substrate,
-        this.flammableParameters
-      );
+      const request = new PoolFireCalculationRequest({
+        material: this.material,
+        poolRecords: this.poolRecords,
+        poolRecordCount: this.poolRecordCount,
+        weather: this.weather,
+        substrate: this.substrate,
+        flammableParameters: this.flammableParameters
+      });
 
       const schema = new PoolFireCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -358,24 +343,22 @@ export class PoolFireCalculationResponse extends CalculationResponseBase {
   /**
    * PoolFire calculation response class.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of pool fire flame records.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -449,13 +432,6 @@ export class PoolFireCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: PoolFireCalculationResponseSchemaData): PoolFireCalculationResponse {
-    return new PoolFireCalculationResponse(
-      data.poolFireFlameResult,
-      data.flameRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new PoolFireCalculationResponse(data);
   }
 }

package/src/calculations/properties.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -165,16 +168,14 @@ class FlashCalculationRequest extends CalculationRequestBase {
   /**
    * Flash calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {Entities.State} materialState -  a state entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     materialState: Entities.State
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.materialState = materialState;
+    this.material = data.material;
+    this.materialState = data.materialState;
   }
 }
 
@@ -206,10 +207,7 @@ export class FlashCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: FlashCalculationRequestSchemaData): FlashCalculationRequest {
-    return new FlashCalculationRequest(
-      data.material,
-      data.materialState
-    );
+    return new FlashCalculationRequest(data);
   }
 }
 
@@ -222,24 +220,23 @@ export class FlashCalculation extends CalculationBase {
    * Calculates fluid properties for a user-defined material where the user has defined the pressure and temperature or pressure and liquid fraction. The model carries out a flash calculation 
 to obtain the fluid properties.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {Entities.State} materialState -  a state entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     materialState: Entities.State
-  ) {
-    super();
-    this.material = material;
-    this.materialState = materialState;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.materialState = data.materialState;
   }
 
   async run() {
     try {
-      const request = new FlashCalculationRequest(
-        this.material,
-        this.materialState
-      );
+      const request = new FlashCalculationRequest({
+        material: this.material,
+        materialState: this.materialState
+      });
 
       const schema = new FlashCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -298,21 +295,20 @@ export class FlashCalculationResponse extends CalculationResponseBase {
   /**
    * Flash calculation response class.
    *
-   * @param {Entities.FlashResult} flashResult - Fluid properties at given conditions.
    */
-  constructor(
+  constructor(data: {
     flashResult: Entities.FlashResult,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.flashResult = flashResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.flashResult = data.flashResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -374,12 +370,6 @@ export class FlashCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: FlashCalculationResponseSchemaData): FlashCalculationResponse {
-    return new FlashCalculationResponse(
-      data.flashResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new FlashCalculationResponse(data);
   }
 }