@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Current Test File with Vitest",
+      "autoAttachChildProcesses": true,
+      "skipFiles": ["<node_internals>/**", "**/node_modules/**"],
+      "program": "${workspaceRoot}/node_modules/vitest/vitest.mjs",
+      "args": ["run", "--test-timeout=0", "${relativeFile}"],
+      "smartStep": true,
+      "console": "integratedTerminal"
+    }
+  ]
+}

package/azure-test-folder-job.yml

@@ -11,7 +11,7 @@ jobs:
       - checkout: self
       - task: NodeTool@0
         inputs:
-          versionSpec: "16.x"
+          versionSpec: "18.x"
         displayName: "Install Node.js"
 
       - script: |
@@ -23,7 +23,7 @@ jobs:
         displayName: "Compile TypeScript"
 
       - script: |
-          npm run test -- tests/${{ parameters.testFolder }} --ci --coverage --passWithNoTests
+          npm run test -- tests/${{ parameters.testFolder }}
         displayName: "Run unit tests"
         env:
           PWS_ACCESS_TOKEN: $(PWS_ACCESS_TOKEN)

package/index.ts

@@ -6,10 +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:12
 * Template:  templates/typescriptpws/index.razor.
- ***********************************************************************/
+***********************************************************************/
 
 export * from "./src/constants";
 export * from "./src/entities";

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@dnv-plant/typescriptpws",
-  "version": "1.0.86",
+  "version": "1.0.88",
   "description": "Integrate Phast models with our versatile APIs for enhanced customization and efficiency.",
   "main": "index.ts",
   "scripts": {
-    "test": "jest"
+    "test": "vitest",
+    "test:ui": "vitest --ui"
   },
   "keywords": [],
   "author": "DNV <software.support@dnv.com> (www.dnv.com)",
@@ -13,12 +14,12 @@
     "axios": "^1.7.9",
     "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",
+    "p-limit": "^6.2.0",
     "typescript": "^5.7.3"
   },
   "devDependencies": {
-  "@types/jsonwebtoken": "^9.0.8",
-  "@types/jest": "^29.5.14",
-  "jest": "^29.7.0",
-  "ts-jest": "^29.3.0"
+    "@types/jsonwebtoken": "^9.0.8",
+    "@vitest/ui": "^3.2.4",
+    "vitest": "^3.2.4"
   }
 }

package/src/calculations/applicationTools.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);
   }
 
   /**
@@ -163,13 +166,12 @@ class MixtureConstantPropertiesCalculationRequest extends CalculationRequestBase
   /**
    * MixtureConstantProperties calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity representing a mixture.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material
-  ) {
+  }) {
     super();
-    this.material = material;
+    this.material = data.material;
   }
 }
 
@@ -199,9 +201,7 @@ export class MixtureConstantPropertiesCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: MixtureConstantPropertiesCalculationRequestSchemaData): MixtureConstantPropertiesCalculationRequest {
-    return new MixtureConstantPropertiesCalculationRequest(
-      data.material
-    );
+    return new MixtureConstantPropertiesCalculationRequest(data);
   }
 }
 
@@ -212,20 +212,20 @@ export class MixtureConstantPropertiesCalculation extends CalculationBase {
   /**
    * Calculates constant fluid properties for a mixture.
    *
-   * @param {Entities.Material} material -  a material entity representing a mixture.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material
-  ) {
-    super();
-    this.material = material;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
   }
 
   async run() {
     try {
-      const request = new MixtureConstantPropertiesCalculationRequest(
-        this.material
-      );
+      const request = new MixtureConstantPropertiesCalculationRequest({
+        material: this.material
+      });
 
       const schema = new MixtureConstantPropertiesCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -284,21 +284,20 @@ export class MixtureConstantPropertiesCalculationResponse extends CalculationRes
   /**
    * MixtureConstantProperties calculation response class.
    *
-   * @param {Entities.MixtureConstantPropertiesResult} mixConstantPropResult - Constant properties of the mixture.
    */
-  constructor(
+  constructor(data: {
     mixConstantPropResult: Entities.MixtureConstantPropertiesResult,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.mixConstantPropResult = mixConstantPropResult;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.mixConstantPropResult = data.mixConstantPropResult;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -360,12 +359,6 @@ export class MixtureConstantPropertiesCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: MixtureConstantPropertiesCalculationResponseSchemaData): MixtureConstantPropertiesCalculationResponse {
-    return new MixtureConstantPropertiesCalculationResponse(
-      data.mixConstantPropResult,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new MixtureConstantPropertiesCalculationResponse(data);
   }
 }