@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/standalones.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);
   }
 
   /**
@@ -169,22 +172,18 @@ class TankFireCalculationRequest extends CalculationRequestBase {
   /**
    * TankFire calculation request class.
    *
-   * @param {Entities.AtmosphericStorageTank} atmosphericStorageTank -  an atmospheric storage tank entity.
-   * @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: {
     atmosphericStorageTank: Entities.AtmosphericStorageTank,
     weather: Entities.Weather,
     substrate: Entities.Substrate,
     flammableParameters: Entities.FlammableParameters
-  ) {
+  }) {
     super();
-    this.atmosphericStorageTank = atmosphericStorageTank;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.flammableParameters = flammableParameters;
+    this.atmosphericStorageTank = data.atmosphericStorageTank;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.flammableParameters = data.flammableParameters;
   }
 }
 
@@ -220,12 +219,7 @@ export class TankFireCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: TankFireCalculationRequestSchemaData): TankFireCalculationRequest {
-    return new TankFireCalculationRequest(
-      data.atmosphericStorageTank,
-      data.weather,
-      data.substrate,
-      data.flammableParameters
-    );
+    return new TankFireCalculationRequest(data);
   }
 }
 
@@ -240,32 +234,29 @@ export class TankFireCalculation extends CalculationBase {
   /**
    * Calculates the flame result and flame coordinates from a pool fire in an open roof tank. The calculations are driven from the atmospheric storage tank entity and are analogous to the standalone pool fire model.
    *
-   * @param {Entities.AtmosphericStorageTank} atmosphericStorageTank -  an atmospheric storage tank entity.
-   * @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: {
     atmosphericStorageTank: Entities.AtmosphericStorageTank,
     weather: Entities.Weather,
     substrate: Entities.Substrate,
     flammableParameters: Entities.FlammableParameters
-  ) {
-    super();
-    this.atmosphericStorageTank = atmosphericStorageTank;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.flammableParameters = flammableParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.atmosphericStorageTank = data.atmosphericStorageTank;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.flammableParameters = data.flammableParameters;
   }
 
   async run() {
     try {
-      const request = new TankFireCalculationRequest(
-        this.atmosphericStorageTank,
-        this.weather,
-        this.substrate,
-        this.flammableParameters
-      );
+      const request = new TankFireCalculationRequest({
+        atmosphericStorageTank: this.atmosphericStorageTank,
+        weather: this.weather,
+        substrate: this.substrate,
+        flammableParameters: this.flammableParameters
+      });
 
       const schema = new TankFireCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -332,24 +323,22 @@ export class TankFireCalculationResponse extends CalculationResponseBase {
   /**
    * TankFire 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 }) {
@@ -423,13 +412,6 @@ export class TankFireCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: TankFireCalculationResponseSchemaData): TankFireCalculationResponse {
-    return new TankFireCalculationResponse(
-      data.poolFireFlameResult,
-      data.flameRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new TankFireCalculationResponse(data);
   }
 }

package/src/calculations/toxics.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);
   }
 
   /**
@@ -177,16 +180,8 @@ class LethalityDistanceCalculationRequest extends CalculationRequestBase {
   /**
    * LethalityDistance calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
@@ -195,16 +190,16 @@ class LethalityDistanceCalculationRequest extends CalculationRequestBase {
     substrate: Entities.Substrate,
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     dispersionParameters: Entities.DispersionParameters
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.dispersionParameters = dispersionParameters;
+    this.material = data.material;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.dispersionParameters = data.dispersionParameters;
   }
 }
 
@@ -248,16 +243,7 @@ export class LethalityDistanceCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: LethalityDistanceCalculationRequestSchemaData): LethalityDistanceCalculationRequest {
-    return new LethalityDistanceCalculationRequest(
-      data.material,
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfig,
-      data.dispersionParameters
-    );
+    return new LethalityDistanceCalculationRequest(data);
   }
 }
 
@@ -275,16 +261,8 @@ export class LethalityDistanceCalculation extends CalculationBase {
   /**
    * Probability of death vs distance from a dispersing toxic cloud, down to the minimum probability of death.  Integrates dose over time at each location and uses probit relations to convert to a probability of death.  A successful dispersion calculation is required as inputfirst.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
@@ -293,30 +271,31 @@ export class LethalityDistanceCalculation extends CalculationBase {
     substrate: Entities.Substrate,
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     dispersionParameters: Entities.DispersionParameters
-  ) {
-    super();
-    this.material = material;
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.dispersionParameters = dispersionParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.dispersionParameters = data.dispersionParameters;
   }
 
   async run() {
     try {
-      const request = new LethalityDistanceCalculationRequest(
-        this.material,
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfig,
-        this.dispersionParameters
-      );
+      const request = new LethalityDistanceCalculationRequest({
+        material: this.material,
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfig: this.dispersionOutputConfig,
+        dispersionParameters: this.dispersionParameters
+      });
 
       const schema = new LethalityDistanceCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -380,21 +359,20 @@ export class LethalityDistanceCalculationResponse extends CalculationResponseBas
   /**
    * LethalityDistance calculation response class.
    *
-   * @param {Entities.ToxicRecord[]} toxicRecords -  an array of toxic records.
    */
-  constructor(
+  constructor(data: {
     toxicRecords: Entities.ToxicRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.toxicRecords = toxicRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.toxicRecords = data.toxicRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -461,12 +439,6 @@ export class LethalityDistanceCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: LethalityDistanceCalculationResponseSchemaData): LethalityDistanceCalculationResponse {
-    return new LethalityDistanceCalculationResponse(
-      data.toxicRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new LethalityDistanceCalculationResponse(data);
   }
 }