Merge pull request #5 from ralphv/ralphv-wip

Ralphv wip
ralphv · Aug 8, 2024 · 703f0d5 · 703f0d5
2 parents 72f1384 + 2283207
commit 703f0d5
Show file tree

Hide file tree

Showing 70 changed files with 199 additions and 178 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+*.js text eol=crlf
+*.ts text eol=crlf
+*.json text eol=crlf
diff --git a/.mocharc.json b/.mocharc.json
@@ -2,7 +2,6 @@
   "extension": [
     "ts"
   ],
-  "spec": "tests/**/*.test.ts",
   "require": [
     "tsx"
   ],

diff --git a/Makefile b/Makefile
@@ -14,8 +14,8 @@ test:
 trivy:
 	docker run --rm -v .:/app/ aquasec/trivy fs /app/ --scanners vuln
 
-liquibase-init:
-	mkdir -p liquibase && docker run -u "$$(id -u):$$(id -g)" --rm -it  -v ./liquibase:/app -w /app liquibase:alpine init project
+#liquibase-init:
+#	mkdir -p liquibase && docker run -u "$$(id -u):$$(id -g)" --rm -it  -v ./liquibase:/app -w /app liquibase:alpine init project
 
 .PHONY: docker-compose-integration
 docker-compose-integration:

diff --git a/build.tsconfig.json b/build.tsconfig.json
@@ -18,6 +18,6 @@
     "src/**/*.ts"
   ],
   "exclude": [
-    "node_modules", "dist", "tests", "integration-test"
+    "node_modules", "dist", "tests"
   ]
 }
diff --git a/dist/ascii.d.ts b/dist/ascii.d.ts
@@ -1 +1 @@
-export declare const ascii = "\n                         ..:-==+++++++==-:..                         \n                    .:=++++=-:....:....:-=++++=:.                    \n                ..=++=:.:====-----::-----===-.:-++=..                \n             ..=+=:.   :=+:. .:+..:---+-.  :+=  ..:=+=..             \n            :++:.:.      .-=.--=-:...:=--.:=..      .:++:.           \n          :*=.:==+:       :=-:.--....--.-:+:.      .=*-:=*:          \n        .++..+-..=-.     .:=::. .:::*--:-:--.      :=::+-.+*.        \n      .-*:.+=.   .==..  .-+..-:.   .+:---..-+:. ..==:. .:+::*=.      \n     .++.-+:   .:-+=--=--=+-..:--..*.:-:. ...-==-:..  :----+.=+.     \n    .+=.=-...=-::-:.  .-====::--=*-:::=-:::.-====:::-=-==-.:+:=+.    \n   .+=.=-. .=-..:-..--:....-- ..-=.=-..  .=+:. ..:-: ..:=. .:=-=+.   \n  .=+.=-.:=-.:=.:-.-:.  .:+=-    .:=--  .-:.:+-   .-:   .:=:.:=:+=.  \n .:*.-=..=-+...-:---.  .+-:-.      .=--..-.  ..+:  ::     .:=.:=:*-. \n .*-:=:  ...  .:-.-+:..*:=-.     .-:.---.-:.   .--.-: ..-===++.=--+: \n -*.-=.        .-. ...*... .=#+=*@@@%:=-:.--..  .=+:--:... ..:-:=:*-.\n +-.=:      .*@#=:   --  .:+#@@*=@@@#-:+-. ...::.:+-..  .::. .:-=--+.\n #.:=.      .=%*-.   +. .+@#:::.::..-===-:      .==- .==%#..-=:-=-:#.\n.%.:=     .+@%-:-.   +. .*@*:=++:.=..++--:     .=.--.-.=@%. .:--==.#.\n.# :=  .--.%@@*=.    +. .:#=........--=--:     .=.-:-:. .:@@=.--==.#.\n.% := =%@@@:.:=.     .+ ---==:.   .+--:=-.     :::=..-:. -@@+:=--=.#.\n #.:=.:#@@#.+.        -#.  .-=-::-+-..---   :+. .+:=-.:+-=%#+.:---:#.\n +-.=:..:=-.      .-=..:+.-=..     ..-=-. .=.. :+.  :-..=@@@#:-.=--+.\n -*.-=.-::=+=+-...-:    .+-.-:     .--=.  -:..==.    -:. :*+:-::=:*-.\n .*-:=:.+-...+%+--:.     ..=*-.....+:-    --+-       -:.  ..=..=--+: \n .:*.-=-:.=-.:-:--:.       .:--+*+:+.     .=:.     .:-.  .-- .:=:*-. \n  .=+.==-+@*:=:--.-:..    .:-:--.. :=:..    :=:...:-:...=-  .:=:+=.  \n   .+=.===-..:---===+=.  .-+--:.  ...:-=:...........:=-..  .:=:=+.   \n    .+=.=-..         ..    .---. .=-..:=:..:-==+++=-:..   .:+:=+.    \n     .+=.:+:     ..-++++=:.      =.==++-+=-...+=.   .==...-+.=+.     \n      .=*:.+=.  .-=.    .:+.     =:=--.:-..=:*.       =-:*::*=.      \n        .*+..+-.:=.      .:=      +-::--.  .=#        :*-.+*.        \n          :*=.:=++.      .:=      =.       :-==.      ..=*:          \n            :++:.:.     .-+.      .=:.   .:-. :+-:. .:++:.           \n             ..=*=:.. :**-.        ..-----..:--==::=*=..             \n                ..=++-:.:=+==-----::-----===-.:-+*=..                \n                    .:=+++=--:.........::-=+++=:.                    \n                         ..:-==+++++++==-:..                         \n";
+export declare const ascii = "                                                                     \n                         :::::--=+++==-:::::                         \n                     ::-+###################+-::                     \n                 ::-+##########*+=========++++**+-:-                 \n               ::+%#####*###*++==------=========+**=::               \n             ::*%%#+######+:...:-=++=++=-:..-======+*+::             \n           ::+@%%######-:::=***++=-.     :=+*=.++====++=::           \n          :-%#@@%###+:::=###*++=:           =+=+-**====++-:          \n         :-@@@@%%#+:::*####**+=:             =*:**+%*===++-:         \n        :-@@@%@@#-::=@@####*++=.             :+-:#*+%#+=+++=:        \n       :-%%+%@@%-::+@@@%###*++=.             -+-:+#*#%%++*+*-:       \n       :#@@@@@@-::=#%%@#####**=-            .=*::+#**%%#++*+*-:      \n      :+@@%@@@#:::#@@@@@%####**+-.         -+*:.-***+#%%*+*#++:      \n     -:#@@@%*@*:::#%@%@@@%##**#**+=-:...:=+*+::-+#*#+#%%%+*#*+::     \n     ::%@@*%@@%-::=@@@@@@@@%######**++++*#+:::-+##*#+#%%%**+##-:     \n     :-@@@@@%%*--===%%@@#@%@@%%########*-:::-+*##*#*+#%%%#*###=:     \n     :=@%%@#-::::-----=#%@#@@@%%@%#+-:::::-+*####%#**#%%%#*##%+:     \n     :-@%%+::::=======-:::::::::::::::-=+**##%%##%*+##%%%####%=:     \n     ::%%#:::-%#+++**####**++++++++***#*#**%%%*%%#**#%#%%###%%-:     \n     ::#%-:::#%+++*#%*##*#%#***#%%%%%%#*#%%%#*%%#*+#%#%%####%#::     \n      :+%-::-@+++*#%#*##*%%##******+##%%%#*=##%#*+*%%#%%####%+:      \n       :#-::+%++++%#%*%##**########%%%#*==#%+#**#*#%%%%####%%-:      \n       :-+::=%++*+%%#*#+%%########%#**=+%%###**#+#%%%%####%%-:       \n        :-::-@#+*++%%%#+#*+=*###*++*#%%%%%#**%+*#%%%%####%%=:        \n         ::::*@*+**+#%%%*%######%%%%%%%#***#*+*#%%%%####%%=:         \n          :::-%%*+#*++##%%%%%%%%%%%%#****##+**#%%%%####%%-:          \n           ::::#%*+##*+++*####%%###***##*++**#%%%%###%%+::           \n             :::*%#*+*%#***+++++**###*++*#%#%%%%####%*::             \n               ::-%@%#*+++*******+++**#%%#%%%%###%%=::               \n                 -:-+%%%####****##%%%#%%%%%%###%+-::                 \n                     ::-+%@@%%%%%%%@@@@%%##%+-::                     \n                         :::::----------:::-                         \n";
diff --git a/dist/ascii.js b/dist/ascii.js
@@ -1,42 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ascii = void 0;
-exports.ascii = `
-                         ..:-==+++++++==-:..                         
-                    .:=++++=-:....:....:-=++++=:.                    
-                ..=++=:.:====-----::-----===-.:-++=..                
-             ..=+=:.   :=+:. .:+..:---+-.  :+=  ..:=+=..             
-            :++:.:.      .-=.--=-:...:=--.:=..      .:++:.           
-          :*=.:==+:       :=-:.--....--.-:+:.      .=*-:=*:          
-        .++..+-..=-.     .:=::. .:::*--:-:--.      :=::+-.+*.        
-      .-*:.+=.   .==..  .-+..-:.   .+:---..-+:. ..==:. .:+::*=.      
-     .++.-+:   .:-+=--=--=+-..:--..*.:-:. ...-==-:..  :----+.=+.     
-    .+=.=-...=-::-:.  .-====::--=*-:::=-:::.-====:::-=-==-.:+:=+.    
-   .+=.=-. .=-..:-..--:....-- ..-=.=-..  .=+:. ..:-: ..:=. .:=-=+.   
-  .=+.=-.:=-.:=.:-.-:.  .:+=-    .:=--  .-:.:+-   .-:   .:=:.:=:+=.  
- .:*.-=..=-+...-:---.  .+-:-.      .=--..-.  ..+:  ::     .:=.:=:*-. 
- .*-:=:  ...  .:-.-+:..*:=-.     .-:.---.-:.   .--.-: ..-===++.=--+: 
- -*.-=.        .-. ...*... .=#+=*@@@%:=-:.--..  .=+:--:... ..:-:=:*-.
- +-.=:      .*@#=:   --  .:+#@@*=@@@#-:+-. ...::.:+-..  .::. .:-=--+.
- #.:=.      .=%*-.   +. .+@#:::.::..-===-:      .==- .==%#..-=:-=-:#.
-.%.:=     .+@%-:-.   +. .*@*:=++:.=..++--:     .=.--.-.=@%. .:--==.#.
-.# :=  .--.%@@*=.    +. .:#=........--=--:     .=.-:-:. .:@@=.--==.#.
-.% := =%@@@:.:=.     .+ ---==:.   .+--:=-.     :::=..-:. -@@+:=--=.#.
- #.:=.:#@@#.+.        -#.  .-=-::-+-..---   :+. .+:=-.:+-=%#+.:---:#.
- +-.=:..:=-.      .-=..:+.-=..     ..-=-. .=.. :+.  :-..=@@@#:-.=--+.
- -*.-=.-::=+=+-...-:    .+-.-:     .--=.  -:..==.    -:. :*+:-::=:*-.
- .*-:=:.+-...+%+--:.     ..=*-.....+:-    --+-       -:.  ..=..=--+: 
- .:*.-=-:.=-.:-:--:.       .:--+*+:+.     .=:.     .:-.  .-- .:=:*-. 
-  .=+.==-+@*:=:--.-:..    .:-:--.. :=:..    :=:...:-:...=-  .:=:+=.  
-   .+=.===-..:---===+=.  .-+--:.  ...:-=:...........:=-..  .:=:=+.   
-    .+=.=-..         ..    .---. .=-..:=:..:-==+++=-:..   .:+:=+.    
-     .+=.:+:     ..-++++=:.      =.==++-+=-...+=.   .==...-+.=+.     
-      .=*:.+=.  .-=.    .:+.     =:=--.:-..=:*.       =-:*::*=.      
-        .*+..+-.:=.      .:=      +-::--.  .=#        :*-.+*.        
-          :*=.:=++.      .:=      =.       :-==.      ..=*:          
-            :++:.:.     .-+.      .=:.   .:-. :+-:. .:++:.           
-             ..=*=:.. :**-.        ..-----..:--==::=*=..             
-                ..=++-:.:=+==-----::-----===-.:-+*=..                
-                    .:=+++=--:.........::-=+++=:.                    
-                         ..:-==+++++++==-:..                         
+exports.ascii = `                                                                     
+                         :::::--=+++==-:::::                         
+                     ::-+###################+-::                     
+                 ::-+##########*+=========++++**+-:-                 
+               ::+%#####*###*++==------=========+**=::               
+             ::*%%#+######+:...:-=++=++=-:..-======+*+::             
+           ::+@%%######-:::=***++=-.     :=+*=.++====++=::           
+          :-%#@@%###+:::=###*++=:           =+=+-**====++-:          
+         :-@@@@%%#+:::*####**+=:             =*:**+%*===++-:         
+        :-@@@%@@#-::=@@####*++=.             :+-:#*+%#+=+++=:        
+       :-%%+%@@%-::+@@@%###*++=.             -+-:+#*#%%++*+*-:       
+       :#@@@@@@-::=#%%@#####**=-            .=*::+#**%%#++*+*-:      
+      :+@@%@@@#:::#@@@@@%####**+-.         -+*:.-***+#%%*+*#++:      
+     -:#@@@%*@*:::#%@%@@@%##**#**+=-:...:=+*+::-+#*#+#%%%+*#*+::     
+     ::%@@*%@@%-::=@@@@@@@@%######**++++*#+:::-+##*#+#%%%**+##-:     
+     :-@@@@@%%*--===%%@@#@%@@%%########*-:::-+*##*#*+#%%%#*###=:     
+     :=@%%@#-::::-----=#%@#@@@%%@%#+-:::::-+*####%#**#%%%#*##%+:     
+     :-@%%+::::=======-:::::::::::::::-=+**##%%##%*+##%%%####%=:     
+     ::%%#:::-%#+++**####**++++++++***#*#**%%%*%%#**#%#%%###%%-:     
+     ::#%-:::#%+++*#%*##*#%#***#%%%%%%#*#%%%#*%%#*+#%#%%####%#::     
+      :+%-::-@+++*#%#*##*%%##******+##%%%#*=##%#*+*%%#%%####%+:      
+       :#-::+%++++%#%*%##**########%%%#*==#%+#**#*#%%%%####%%-:      
+       :-+::=%++*+%%#*#+%%########%#**=+%%###**#+#%%%%####%%-:       
+        :-::-@#+*++%%%#+#*+=*###*++*#%%%%%#**%+*#%%%%####%%=:        
+         ::::*@*+**+#%%%*%######%%%%%%%#***#*+*#%%%%####%%=:         
+          :::-%%*+#*++##%%%%%%%%%%%%#****##+**#%%%%####%%-:          
+           ::::#%*+##*+++*####%%###***##*++**#%%%%###%%+::           
+             :::*%#*+*%#***+++++**###*++*#%#%%%%####%*::             
+               ::-%@%#*+++*******+++**#%%#%%%%###%%=::               
+                 -:-+%%%####****##%%%#%%%%%%###%+-::                 
+                     ::-+%@@%%%%%%%@@@@%%##%+-::                     
+                         :::::----------:::-                         
 `;
diff --git a/dist/scripts/create-postgres-scheduled-events.js b/dist/scripts/create-postgres-scheduled-events.js
@@ -25,6 +25,7 @@ void (() => __awaiter(void 0, void 0, void 0, function* () {
         const database = new Database_1.default();
         yield database.initialize();
         console.log(`Done!`);
+        yield Database_1.default.closePool();
     }
     catch (e) {
         console.trace(`Error: ${String(e)}`);

diff --git a/docker/tests/scheduled-events.compose.yaml b/docker/tests/scheduled-events.compose.yaml
@@ -1,5 +1,9 @@
+x-common-env: &common-env
+  restart: always
+
 services:
   kafka:
+    <<: *common-env
     container_name: kafka
     image: confluentinc/confluent-local:7.5.5
     hostname: kafka
@@ -30,9 +34,9 @@ services:
       - "9092:9092"
 
   postgres:
+    <<: *common-env
     container_name: postgres
     image: postgres
-    restart: always
     user: postgres
     ports:
       - "5432:5432"
@@ -48,12 +52,15 @@ services:
       POSTGRES_HOST: postgres
 
   connect:
+    <<: *common-env
     container_name: connect
     build:
       context: .
     depends_on:
-      - kafka
-      - postgres
+      kafka:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
     environment:
       CONNECT_BOOTSTRAP_SERVERS: kafka:29092
       CONNECT_REST_PORT: 8083
@@ -71,19 +78,21 @@ services:
       CONNECT_REST_ADVERTISED_HOST_NAME: "connect"
       CONNECT_LOG4J_LOGGERS: "org.reflections=ERROR"
     healthcheck:
-      test: ["CMD", "curl -f http://localhost:8083/connectors || exit 1"]
+      test: ["CMD", "curl", "-f", "http://localhost:8083/connectors"]
       interval: 10s
       timeout: 10s
-      retries: 5
-      start_period: 60s
+      retries: 10
+      start_period: 20s
     ports:
       - "8083:8083"
 
   sqlpad:
+    <<: *common-env
     container_name: sqlpad
     image: sqlpad/sqlpad:latest
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     ports:
       - "3000:3000"
     environment:
@@ -97,6 +106,7 @@ services:
       SQLPAD_CONNECTIONS__postgres__password: 1q2w3e4r5t6y
 
   kafka-ui:
+    <<: *common-env
     container_name: kafka-ui
     image: 'provectuslabs/kafka-ui:latest'
     ports:
@@ -105,4 +115,12 @@ services:
       - KAFKA_CLUSTERS_0_BOOTSTRAP_SERVERS=kafka:29092
       - KAFKA_CLUSTERS_0_NAME=gallifrey-rules
     depends_on:
-      - kafka
+      kafka:
+        condition: service_healthy
+
+  wait-for-all:
+    image: busybox
+    depends_on:
+      connect:
+        condition: service_healthy
+    entrypoint: ["sh", "-c", "echo 'All services are up, healthy and responsive'; sleep 5"]
diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md
@@ -1,8 +1,15 @@
 # design requirements
 
+before publish:
+publish to npm
+allow Config() to take in the event level config
+create sample app
+publish dinosaurus and polish it
+-- release 0.5.0 beta.
+
+
 avro topics
 distributed locks controlled by event level data
-allow Config() to take in the event level config
 to allow easy modifications of configurations needed per event level. This means
 config needs to assess the data on the spot and not pull that and cache that. 
 (think of how to do that)

diff --git a/package.json b/package.json
@@ -8,11 +8,11 @@
   "scripts": {
     "start": "node --env-file=.env dist/app.js",
     "build": "tsc -p build.tsconfig.json && npm run lint && npm run test",
-    "test": "nyc mocha && rm -rf .nyc_output",
-    "integration-tests": "nyc mocha --max-parallel=1 'integration-tests/**/*.test.ts' && rm -rf .nyc_output # docker compose should be running",
-    "coverage": "nyc --reporter=html --report-dir=./coverage mocha",
-    "integration-coverage": "nyc --reporter=html --report-dir=./coverage mocha --max-parallel=1 'integration-tests/**/*.test.ts'",
-    "lint": "npx eslint ./src ./tests ./integration-tests --fix",
+    "test": "nyc mocha tests/unit/**/*.test.ts && rm -rf .nyc_output",
+    "test:unit": "npm run test",
+    "test:integration": "nyc mocha tests/integration/**/*.test.ts && rm -rf .nyc_output",
+    "coverage": "nyc --reporter=html --report-dir=./coverage mocha tests/**/*.test.ts && rm -rf .nyc_output",
+    "lint": "npx eslint ./src ./tests --fix",
     "doc": "npx typedoc --out typedocs ./src",
     "updateDeps": "npx npm-check-updates -u",
     "build-docker": "docker build -t gallifrey-rules-tools . -f docker/tools.Dockerfile",

diff --git a/...ration-tests/async-actions/ModuleNames.ts → .../integration/async-actions/ModuleNames.ts b/...ration-tests/async-actions/ModuleNames.ts → .../integration/async-actions/ModuleNames.ts
diff --git a/...s/async-actions/e2e.async-actions.test.ts → ...n/async-actions/e2e.async-actions.test.ts b/...s/async-actions/e2e.async-actions.test.ts → ...n/async-actions/e2e.async-actions.test.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-misused-promises,no-async-promise-executor,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unused-vars */
 import { beforeEach } from 'mocha';
 import sinon from 'sinon';
-import { logger } from '../../src/lib/logger';
-import { GallifreyRulesEngine, NamespaceSchema } from '../../src';
+import { logger } from '../../../src/lib/logger';
+import { GallifreyRulesEngine, NamespaceSchema } from '../../../src';
 import path from 'node:path';
 import { namespaceSchema } from './namespace';
 import { createTopics, getSpiedCalls, produceIntoKafka, WaitForCondition } from '../lib/IntegrationUtils';

diff --git a/...-actions/modules/OrdersTopicDispatcher.ts → ...-actions/modules/OrdersTopicDispatcher.ts b/...-actions/modules/OrdersTopicDispatcher.ts → ...-actions/modules/OrdersTopicDispatcher.ts
@@ -1,4 +1,4 @@
-import { EventDispatcherInterface, GallifreyEventType, GallifreyProvider, ProviderType } from '../../../src';
+import { EventDispatcherInterface, GallifreyEventType, GallifreyProvider, ProviderType } from '../../../../src';
 import os from 'os';
 import { ModuleNames } from '../ModuleNames';
 

diff --git a/...nc-actions/modules/ProcessNewOrderRule.ts → ...nc-actions/modules/ProcessNewOrderRule.ts b/...nc-actions/modules/ProcessNewOrderRule.ts → ...nc-actions/modules/ProcessNewOrderRule.ts
@@ -1,4 +1,4 @@
-import { EngineRuleInterface, GallifreyPlugin, PluginType, RuleInterface } from '../../../src';
+import { EngineRuleInterface, GallifreyPlugin, PluginType, RuleInterface } from '../../../../src';
 import { SendEmailActionPayloadType } from './SendEmailAction';
 import { OrdersTopicPayloadType } from './OrdersTopicDispatcher';
 import { ModuleNames } from '../ModuleNames';

diff --git a/.../async-actions/modules/SendEmailAction.ts → .../async-actions/modules/SendEmailAction.ts b/.../async-actions/modules/SendEmailAction.ts → .../async-actions/modules/SendEmailAction.ts
@@ -1,4 +1,4 @@
-import { AsyncAction, AsyncActionInterface, EngineActionInterface, GallifreyPlugin, PluginType } from '../../../src';
+import { AsyncAction, AsyncActionInterface, EngineActionInterface, GallifreyPlugin, PluginType } from '../../../../src';
 import { ModuleNames } from '../ModuleNames';
 import { SpyCalls } from '../../lib/IntegrationUtils';
 

diff --git a/integration-tests/async-actions/namespace.ts → tests/integration/async-actions/namespace.ts b/integration-tests/async-actions/namespace.ts → tests/integration/async-actions/namespace.ts
@@ -1,4 +1,4 @@
-import { NamespaceSchema } from '../../src';
+import { NamespaceSchema } from '../../../src';
 import path from 'node:path';
 import { ModuleNames } from './ModuleNames';
 

diff --git a/...tests/async-actions/new-order-schema.json → ...ation/async-actions/new-order-schema.json b/...tests/async-actions/new-order-schema.json → ...ation/async-actions/new-order-schema.json
diff --git a/...ration-tests/e2e.scheduled-events.test.ts → .../integration/e2e.scheduled-events.test.ts b/...ration-tests/e2e.scheduled-events.test.ts → .../integration/e2e.scheduled-events.test.ts
@@ -1,23 +1,23 @@
 /* eslint-disable @typescript-eslint/no-misused-promises,no-async-promise-executor,@typescript-eslint/no-unsafe-member-access */
 import { beforeEach } from 'mocha';
 import sinon from 'sinon';
-import { logger } from '../src/lib/logger';
-import Database from '../src/database/Database';
+import { logger } from '../../src/lib/logger';
+import Database from '../../src/database/Database';
 import {
     GallifreyEventType,
     GallifreyRulesEngine,
     KafkaConsumerConfig,
     ModuleNames,
     NamespaceSchema,
     NamespaceSchemaConsumer,
-} from '../src';
+} from '../../src';
 import { EachMessagePayload } from 'kafkajs';
 import { expect } from 'chai';
 import path from 'node:path';
-import { ScheduledEventType } from '../src/engine-events/ScheduledEventType';
+import { ScheduledEventType } from '../../src/engine-events/ScheduledEventType';
 import { scheduledEventsConnectorConfig } from './lib/scheduledEventsConnectorConfig';
 import { createTopics } from './lib/IntegrationUtils';
-import { deleteKafkaConnectConnector, deployKafkaConnectConnector } from '../src/lib/Utils';
+import { deleteKafkaConnectConnector, deployKafkaConnectConnector } from '../../src/lib/Utils';
 
 describe('e2e.scheduled events', () => {
     let infoSpy: sinon.SinonSpy;

diff --git a/integration-tests/e2e.test.ts → tests/integration/e2e.test.ts b/integration-tests/e2e.test.ts → tests/integration/e2e.test.ts
@@ -5,16 +5,16 @@ import path from 'node:path';
 import { EachMessagePayload } from 'kafkajs';
 import { beforeEach } from 'mocha';
 import sinon from 'sinon';
-import { logger } from '../src/lib/logger';
+import { logger } from '../../src/lib/logger';
 import {
     GallifreyEventType,
     GallifreyRulesEngine,
     KafkaConsumerConfig,
     NamespaceSchema,
     NamespaceSchemaConsumer,
-} from '../src';
-import { KafkaConsumer } from '../src/KafkaConsumer';
-import { ScheduledEventType } from '../src/engine-events/ScheduledEventType';
+} from '../../src';
+import { KafkaConsumer } from '../../src/KafkaConsumer';
+import { ScheduledEventType } from '../../src/engine-events/ScheduledEventType';
 import { findCallWithText, produceIntoKafka, WaitForCondition } from './lib/IntegrationUtils';
 
 describe('e2e', () => {

diff --git a/integration-tests/e2e/AsyncEntityAction.ts → tests/integration/e2e/AsyncEntityAction.ts b/integration-tests/e2e/AsyncEntityAction.ts → tests/integration/e2e/AsyncEntityAction.ts
@@ -1,4 +1,4 @@
-import { ActionInterface, AsyncAction, EngineActionInterface, GallifreyPlugin, PluginType } from '../../src';
+import { ActionInterface, AsyncAction, EngineActionInterface, GallifreyPlugin, PluginType } from '../../../src';
 
 @AsyncAction
 @GallifreyPlugin(PluginType.Action)

diff --git a/integration-tests/e2e/EntityAction.ts → tests/integration/e2e/EntityAction.ts b/integration-tests/e2e/EntityAction.ts → tests/integration/e2e/EntityAction.ts
@@ -1,4 +1,4 @@
-import { ActionInterface, EngineActionInterface, GallifreyPlugin, PluginType } from '../../src';
+import { ActionInterface, EngineActionInterface, GallifreyPlugin, PluginType } from '../../../src';
 
 @GallifreyPlugin(PluginType.Action)
 export default class EntityAction implements ActionInterface<string, string> {

diff --git a/integration-tests/e2e/EntityDataObject.ts → tests/integration/e2e/EntityDataObject.ts b/integration-tests/e2e/EntityDataObject.ts → tests/integration/e2e/EntityDataObject.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { DataObjectInterface, EngineDataObjectInterface, GallifreyPlugin, PluginType } from '../../src';
+import { DataObjectInterface, EngineDataObjectInterface, GallifreyPlugin, PluginType } from '../../../src';
 
 @GallifreyPlugin(PluginType.DataObject)
 export default class EntityDataObject implements DataObjectInterface<number, string> {

diff --git a/...gration-tests/e2e/ProcessNewEntityRule.ts → ...s/integration/e2e/ProcessNewEntityRule.ts b/...gration-tests/e2e/ProcessNewEntityRule.ts → ...s/integration/e2e/ProcessNewEntityRule.ts
@@ -1,4 +1,4 @@
-import { EngineRuleInterface, GallifreyPlugin, PluginType, RuleInterface } from '../../src';
+import { EngineRuleInterface, GallifreyPlugin, PluginType, RuleInterface } from '../../../src';
 
 @GallifreyPlugin(PluginType.Rule)
 export default class ProcessNewEntityRule implements RuleInterface<any> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
       "extension": [
         "ts"
       ],
-      "spec": "tests/**/*.test.ts",
       "require": [
         "tsx"
       ],
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export declare const ascii = "\n ..:-==+++++++==-:.. \n .:=++++=-:....:....:-=++++=:. \n ..=++=:.:====-----::-----===-.:-++=.. \n ..=+=:. :=+:. .:+..:---+-. :+= ..:=+=.. \n :++:.:. .-=.--=-:...:=--.:=.. .:++:. \n :=.:==+: :=-:.--....--.-:+:. .=-:=: \n .++..+-..=-. .:=::. .:::--:-:--. :=::+-.+. \n .-:.+=. .==.. .-+..-:. .+:---..-+:. ..==:. .:+::=. \n .++.-+: .:-+=--=--=+-..:--...:-:. ...-==-:.. :----+.=+. \n .+=.=-...=-::-:. .-====::--=-:::=-:::.-====:::-=-==-.:+:=+. \n .+=.=-. .=-..:-..--:....-- ..-=.=-.. .=+:. ..:-: ..:=. .:=-=+. \n .=+.=-.:=-.:=.:-.-:. .:+=- .:=-- .-:.:+- .-: .:=:.:=:+=. \n .:.-=..=-+...-:---. .+-:-. .=--..-. ..+: :: .:=.:=:-. \n .-:=: ... .:-.-+:..:=-. .-:.---.-:. .--.-: ..-===++.=--+: \n -.-=. .-. ...... .=#+=@@@%:=-:.--.. .=+:--:... ..:-:=:-.\n +-.=: .@#=: -- .:+#@@=@@@#-:+-. ...::.:+-.. .::. .:-=--+.\n #.:=. .=%-. +. .+@#:::.::..-===-: .==- .==%#..-=:-=-:#.\n.%.:= .+@%-:-. +. .@:=++:.=..++--: .=.--.-.=@%. .:--==.#.\n.# := .--.%@@=. +. .:#=........--=--: .=.-:-:. .:@@=.--==.#.\n.% := =%@@@:.:=. .+ ---==:. .+--:=-. :::=..-:. -@@+:=--=.#.\n #.:=.:#@@#.+. -#. .-=-::-+-..--- :+. .+:=-.:+-=%#+.:---:#.\n +-.=:..:=-. .-=..:+.-=.. ..-=-. .=.. :+. :-..=@@@#:-.=--+.\n -.-=.-::=+=+-...-: .+-.-: .--=. -:..==. -:. :+:-::=:-.\n .-:=:.+-...+%+--:. ..=-.....+:- --+- -:. ..=..=--+: \n .:.-=-:.=-.:-:--:. .:--++:+. .=:. .:-. .-- .:=:-. \n .=+.==-+@:=:--.-:.. .:-:--.. :=:.. :=:...:-:...=- .:=:+=. \n .+=.===-..:---===+=. .-+--:. ...:-=:...........:=-.. .:=:=+. \n .+=.=-.. .. .---. .=-..:=:..:-==+++=-:.. .:+:=+. \n .+=.:+: ..-++++=:. =.==++-+=-...+=. .==...-+.=+. \n .=:.+=. .-=. .:+. =:=--.:-..=:. =-:::=. \n .+..+-.:=. .:= +-::--. .=# :-.+. \n :=.:=++. .:= =. :-==. ..=: \n :++:.:. .-+. .=:. .:-. :+-:. .:++:. \n ..==:.. :*-. ..-----..:--==::==.. \n ..=++-:.:=+==-----::-----===-.:-+*=.. \n .:=+++=--:.........::-=+++=:. \n ..:-==+++++++==-:.. \n";
		export declare const ascii = " \n :::::--=+++==-::::: \n ::-+###################+-:: \n ::-+##########+=========+++++-:- \n ::+%########++==------=========+=:: \n ::%%#+######+:...:-=++=++=-:..-======++:: \n ::+@%%######-:::=*++=-. :=+=.++====++=:: \n :-%#@@%###+:::=###++=: =+=+-====++-: \n :-@@@@%%#+:::####*+=: =:*+%===++-: \n :-@@@%@@#-::=@@####++=. :+-:#+%#+=+++=: \n :-%%+%@@%-::+@@@%###++=. -+-:+##%%+++-: \n :#@@@@@@-::=#%%@#####*=- .=::+#*%%#+++-: \n :+@@%@@@#:::#@@@@@%####+-. -+:.-**+#%%+#++: \n -:#@@@%@:::#%@%@@@%###+=-:...:=++::-+##+#%%%+#+:: \n ::%@@%@@%-::=@@@@@@@@%######*++++#+:::-+###+#%%%+##-: \n :-@@@@@%%--===%%@@#@%@@%%########-:::-+###+#%%%####=: \n :=@%%@#-::::-----=#%@#@@@%%@%#+-:::::-+####%#*#%%%###%+: \n :-@%%+::::=======-:::::::::::::::-=+*##%%##%+##%%%####%=: \n ::%%#:::-%#+++####++++++++**##*%%%%%#*#%#%%###%%-: \n ::#%-:::#%+++#%###%#**#%%%%%%##%%%#%%#+#%#%%####%#:: \n :+%-::-@+++#%###%%##****+##%%%#=##%#+%%#%%####%+: \n :#-::+%++++%#%%##########%%%#==#%+#*##%%%%####%%-: \n :-+::=%+++%%##+%%########%#=+%%####+#%%%%####%%-: \n :-::-@#+++%%%#+#+=###++#%%%%%#%+#%%%%####%%=: \n ::::@+*+#%%%%######%%%%%%%#**#+#%%%%####%%=: \n :::-%%+#++##%%%%%%%%%%%%#*##+#%%%%####%%-: \n ::::#%+##+++####%%###*##++*#%%%%###%%+:: \n :::%#+%#*+++++###++#%#%%%%####%:: \n ::-%@%#+++*****+++#%%#%%%%###%%=:: \n -:-+%%%####****##%%%#%%%%%%###%+-:: \n ::-+%@@%%%%%%%@@@@%%##%+-:: \n :::::----------:::- \n";