Merge pull request #93 from nibble-4bits/refactor-18

Refactor 18

Author: nibble-4bits

.github/workflows/pr-run-tests.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Install dependencies
         run: npm ci
       - name: Run tests

.github/workflows/prepare-for-release.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: npm ci

.github/workflows/publish-package.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: npm ci

__tests__/intrinsicFunctions/StatesHash.test.ts

@@ -75,7 +75,7 @@ describe('States.Hash intrinsic function', () => {
       expect(funcCallWrapper).toThrow(StatesRuntimeError);
     });
 
-    test('should throw error if passed hashing algorithm is not one of the supported algorithms', () => {
+    test('should throw error if passed hash algorithm is not one of the supported algorithms', () => {
       const func = new StatesHash();
       const input = {};
       const context = {};

package-lock.json

@@ -46,32 +46,31 @@
   "scripts": {
     "test": "jest",
     "build": "tsup && rm build/main.d.cts",
+    "build:watch": "tsup --watch",
     "prettier": "prettier --check \"src/**/*.ts\"",
     "prettier:fix": "prettier --write \"src/**/*.ts\"",
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint --fix \"src/**/*.ts\""
   },
   "devDependencies": {
-    "@types/crypto-js": "^4.2.1",
-    "@types/jest": "^29.5.11",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^18.19.3",
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
-    "@typescript-eslint/parser": "^6.20.0",
-    "eslint": "^8.56.0",
+    "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.17.4",
+    "@types/node": "^18.19.33",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "prettier": "^3.2.4",
-    "ts-jest": "^29.1.1",
-    "tsup": "^8.0.1",
-    "typescript": "^5.3.3"
+    "prettier": "^3.2.5",
+    "ts-jest": "^29.1.3",
+    "tsup": "^8.0.2",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.481.0",
-    "@aws-sdk/credential-providers": "^3.481.0",
+    "@aws-sdk/client-lambda": "^3.583.0",
+    "@aws-sdk/credential-providers": "^3.583.0",
     "asl-validator": "^3.8.2",
     "commander": "^11.1.0",
-    "crypto-js": "^4.2.0",
     "jsonpath-plus": "^7.2.0",
     "lodash": "^4.17.21",
     "p-limit": "^3.1.0",

package.json

@@ -121,7 +121,7 @@ export class StateExecutor {
         nextState,
         isEndState,
       } = await this.stateHandlers[this.stateDefinition.Type](
-        // @ts-expect-error Indexing `this.stateActions` by non-literal value produces a `never` type for the `this.stateDefinition` parameter of the handler being called
+        // @ts-expect-error Indexing `this.stateHandlers` by non-literal value produces a `never` type for the `this.stateDefinition` parameter of the handler being called
         this.stateDefinition,
         rawInput,
         processedInput,

src/stateMachine/StateExecutor.ts

@@ -1,13 +1,9 @@
 import type { IntrinsicFunctionDefinition } from '../../typings/IntrinsicFunctionsImplementation';
-import type { HashingAlgorithm } from '../../typings/IntrinsicFunctions';
+import type { HashAlgorithm } from '../../typings/IntrinsicFunctions';
 import type { JSONValue } from '../../typings/JSONValue';
 import { StatesRuntimeError } from '../../error/predefined/StatesRuntimeError';
 import { BaseIntrinsicFunction } from './BaseIntrinsicFunction';
-import md5 from 'crypto-js/md5.js';
-import sha1 from 'crypto-js/sha1.js';
-import sha256 from 'crypto-js/sha256.js';
-import sha384 from 'crypto-js/sha384.js';
-import sha512 from 'crypto-js/sha512.js';
+import { md5, sha1, sha256, sha384, sha512 } from '../../util/hash';
 
 class StatesHash extends BaseIntrinsicFunction {
   protected readonly funcDefinition: IntrinsicFunctionDefinition;
@@ -29,32 +25,32 @@ class StatesHash extends BaseIntrinsicFunction {
     };
   }
 
-  protected execute(str: string, algorithm: HashingAlgorithm): JSONValue {
+  protected execute(str: string, algorithm: HashAlgorithm): JSONValue {
     if (str.length > 10000) {
       throw new StatesRuntimeError(
         `Intrinsic function ${this.funcDefinition.name} cannot hash a string with more than 10,000 characters`
       );
     }
 
-    const algorithms: HashingAlgorithm[] = ['MD5', 'SHA-1', 'SHA-256', 'SHA-384', 'SHA-512'];
+    const algorithms: HashAlgorithm[] = ['MD5', 'SHA-1', 'SHA-256', 'SHA-384', 'SHA-512'];
     const supportedAlgorithms = algorithms.join(', ');
     if (!algorithms.includes(algorithm)) {
       throw new StatesRuntimeError(
-        `Unsupported hashing algorithm provided to intrinsic function ${this.funcDefinition.name}. The supported algorithms are: ${supportedAlgorithms}`
+        `Unsupported hash algorithm '${algorithm}' provided to intrinsic function ${this.funcDefinition.name}. The supported algorithms are: ${supportedAlgorithms}`
       );
     }
 
     switch (algorithm) {
       case 'MD5':
-        return md5(str).toString();
+        return md5.getDigest(str);
       case 'SHA-1':
-        return sha1(str).toString();
+        return sha1.getDigest(str);
       case 'SHA-256':
-        return sha256(str).toString();
+        return sha256.getDigest(str);
       case 'SHA-384':
-        return sha384(str).toString();
+        return sha384.getDigest(str);
       case 'SHA-512':
-        return sha512(str).toString();
+        return sha512.getDigest(str);
     }
   }
 }

src/stateMachine/intrinsicFunctions/StatesHash.ts

@@ -18,4 +18,4 @@ export type IntrinsicFunctionName =
   | 'States.StringSplit'
   | 'States.UUID';
 
-export type HashingAlgorithm = 'MD5' | 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512';
+export type HashAlgorithm = 'MD5' | 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512';

src/typings/IntrinsicFunctions.ts

@@ -0,0 +1,11 @@
+import { MD5 } from './hash/MD5';
+import { SHA1 } from './hash/SHA1';
+import { SHA256 } from './hash/SHA256';
+import { SHA384 } from './hash/SHA384';
+import { SHA512 } from './hash/SHA512';
+
+export const md5 = new MD5();
+export const sha1 = new SHA1();
+export const sha256 = new SHA256();
+export const sha384 = new SHA384();
+export const sha512 = new SHA512();