Refactoring (#72)

* Refactoring * Add moduleNameMapper for @akd-studios/framework * Update version to 0.6.0 in package.json * Update devDependencies versions in package.json * Update @microsoft/api-extractor version * Update Node version to 18.x in GitHub Actions workflow
akdasa-studios · Jan 26, 2024 · 95a684f · 95a684f
1 parent a332d34
commit 95a684f
Show file tree

Hide file tree

Showing 32 changed files with 2,008 additions and 1,629 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
       - name: 📦 Install Node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           registry-url: 'https://npm.pkg.github.com'
           cache: npm
 
@@ -47,7 +47,7 @@ jobs:
       - name: 📦 Install Node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           registry-url: 'https://npm.pkg.github.com'
           cache: npm
 

diff --git a/api-extractor.json b/api-extractor.json
@@ -7,7 +7,7 @@
     "overrideTsconfig": {
       "compilerOptions": {
         "paths": {
-          "@lib/*": [
+          "@akd-studios/framework/*": [
             "./temp/*"
           ]
         }

diff --git a/jest.config.js b/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
     '<rootDir>/tests/**/*.spec.ts'
   ],
   moduleNameMapper: {
-    '^@lib/(.*)': '<rootDir>/lib/$1',
+    '^@akd-studios/framework/(.*)': '<rootDir>/lib/$1',
     '^@tests/(.*)': '<rootDir>/tests/$1',
   }
 }
diff --git a/lib/commands/Command.ts b/lib/commands/Command.ts
@@ -1,4 +1,4 @@
-import { AnyResult } from '@lib/core'
+import { type AnyResult } from '@akd-studios/framework/core'
 
 
 /**
@@ -19,7 +19,7 @@ export interface Command<
    * Reverts the command.
    * @param context The context in which the command is reverted.
    */
-  revert(context: TContext)
+  revert(context: TContext): Promise<void>
 }
 
 /**

diff --git a/lib/commands/ExecutionStack.ts b/lib/commands/ExecutionStack.ts
@@ -1,5 +1,4 @@
-import { AnyCommand } from './Command'
-import { Transaction } from './Transaction'
+import { type AnyCommand, Transaction } from '@akd-studios/framework/commands'
 
 
 /**

diff --git a/lib/commands/Processor.ts b/lib/commands/Processor.ts
@@ -1,7 +1,5 @@
-import { AnyResult, Event } from '@lib/core'
-import { AnyCommand, Command } from './Command'
-import { ExecutionStack } from './ExecutionStack'
-import { Transaction } from './Transaction'
+import { type AnyResult, Event } from '@akd-studios/framework/core'
+import { type AnyCommand, type Command, ExecutionStack, Transaction } from '@akd-studios/framework/commands'
 
 
 /**

diff --git a/lib/domain/models/Aggregate.ts b/lib/domain/models/Aggregate.ts
@@ -1,5 +1,4 @@
-import { Entity } from './Entity'
-import { Identity } from './Identity'
+import { Entity, Identity } from '@akd-studios/framework/domain/models'
 
 
 /**

diff --git a/lib/domain/models/Builder.ts b/lib/domain/models/Builder.ts
@@ -1,4 +1,4 @@
-import { Result } from '../../core'
+import { Result } from '@akd-studios/framework/core'
 
 /**
  * Builds a new instance of the specified type or returns a failure result.

diff --git a/lib/domain/models/Entity.ts b/lib/domain/models/Entity.ts
@@ -1,6 +1,4 @@
-import { Identity } from './Identity'
-import { Equalable, Identifiable } from './Interfaces'
-
+import { type Equalable, type Identifiable, Identity } from '@akd-studios/framework/domain/models'
 
 /**
  * Base class for all entities.

diff --git a/lib/domain/models/Identity.ts b/lib/domain/models/Identity.ts
@@ -36,6 +36,8 @@ export class Identity<
   /**
    * Identity brand
    */
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   private __type__: TIdentityType
 }
 

diff --git a/lib/domain/models/Interfaces.ts b/lib/domain/models/Interfaces.ts
@@ -1,5 +1,4 @@
-import { Identity } from './Identity'
-
+import { Identity } from '@akd-studios/framework/domain/models'
 
 /**
  * Identifiable is an interface for all objects that have an identity.

diff --git a/lib/domain/models/Value.ts b/lib/domain/models/Value.ts
@@ -1,4 +1,5 @@
-import { Equalable } from './Interfaces'
+import { type Equalable } from '@akd-studios/framework/domain/models'
+
 
 export class Value<TValueType> implements Equalable<Value<TValueType>> {
   /**
@@ -12,12 +13,16 @@ export class Value<TValueType> implements Equalable<Value<TValueType>> {
       this.__type__ === value.__type__ &&
       // Stryker disable next-line all
       Object.keys(this).length === Object.keys(value).length &&
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
       Object.keys(this).every(key => this[key] === value[key])
     )
   }
 
   /**
    * Value type
    */
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
   private __type__: TValueType
 }
diff --git a/lib/domain/models/index.ts b/lib/domain/models/index.ts
@@ -1,6 +1,6 @@
+export * from './Entity'
 export * from './Aggregate'
 export * from './Builder'
-export * from './Entity'
 export * from './Identity'
 export * from './Interfaces'
 export * from './Value'
diff --git a/lib/persistence/Query.ts b/lib/persistence/Query.ts
@@ -1,4 +1,4 @@
-import { Aggregate, AnyIdentity } from '../domain'
+import { Aggregate, type AnyIdentity } from '@akd-studios/framework/domain/models'
 
 /**
  * Comparison operators. These are used to compare a field with a value.

diff --git a/lib/persistence/Repository.ts b/lib/persistence/Repository.ts
@@ -1,5 +1,6 @@
-import { Aggregate, AnyIdentity } from '../domain/models'
-import { Query } from '../persistence'
+import { Aggregate, type AnyIdentity } from '@akd-studios/framework/domain'
+import { type Query } from '@akd-studios/framework/persistence'
+
 
 export interface ResultSetSlice {
   start: number

diff --git a/lib/persistence/memory/InMemoryQueryProcessor.ts b/lib/persistence/memory/InMemoryQueryProcessor.ts
@@ -1,5 +1,6 @@
-import { Aggregate, AnyIdentity, Identity, Value } from '../../domain/models'
-import { Binding, Expression, LogicalOperators, Operators, Predicate, Query } from '../Query'
+import { Aggregate, type AnyIdentity, Identity, Value } from '@akd-studios/framework/domain/models'
+import { type Binding, Expression, LogicalOperators, Operators, Predicate, type Query } from '@akd-studios/framework/persistence'
+
 
 export class InMemoryQueryProcessor<
   TEntity extends Aggregate<AnyIdentity>
@@ -116,6 +117,8 @@ export class InMemoryQueryProcessor<
     const fields = f.split('.')
     let value = o
     for (const field of fields) {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
       value = value[field]
     }
     return value

diff --git a/lib/persistence/memory/InMemoryRepository.ts b/lib/persistence/memory/InMemoryRepository.ts
@@ -1,6 +1,5 @@
-import { Aggregate, AnyIdentity } from '../../domain/models'
-import { Query } from '../Query'
-import { QueryOptions, Repository, ResultSet } from '../Repository'
+import { Aggregate, type AnyIdentity } from '@akd-studios/framework/domain/models'
+import { type Query, type QueryOptions, type Repository, ResultSet } from '@akd-studios/framework/persistence'
 import { InMemoryQueryProcessor } from './InMemoryQueryProcessor'