Merge pull request #47 from PxaMMaxP/refactoring/search-class

Refactoring/search class

Author: 0xMax42

.eslintrc

@@ -137,7 +137,8 @@
         "contexts": [
           "FunctionDeclaration",
           "MethodDefinition",
-          "ClassDeclaration"
+          "ClassDeclaration",
+          "ClassExpression"
         ],
         "descriptionStyle": "body",
         "exemptedBy": ["deprecated"]

jest.config.coverage.js

@@ -1,7 +1,8 @@
 module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
-    testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
+    testMatch: ['**/__tests__/**/*.test.ts', '**/?(*.)+(test).ts'],
+    testPathIgnorePatterns: ['\\.spec\\.ts$', '\\.performance\\.test\\.ts$'],
     moduleNameMapper: {
         '^src/(.*)$': '<rootDir>/src/$1',
     },

jest.config.js

@@ -1,7 +1,8 @@
 module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
-    testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
+    testMatch: ['**/__tests__/**/*.test.ts', '**/?(*.)+(test).ts'],
+    testPathIgnorePatterns: ['\\.spec\\.ts$', '\\.performance\\.test\\.ts$'],
     moduleDirectories: ['node_modules', 'src'],
     moduleNameMapper: {
         '^src/(.*)$': '<rootDir>/src/$1',

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "prj",
   "name": "Prj Plugin",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "minAppVersion": "0.15.0",
   "description": "Prj Plugin - Project, Document, and Task Management",
   "author": "M. Passarello",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-prj-plugin",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Prj Plugin - Project, Document, and Task Management",
   "main": "main.js",
   "scripts": {
@@ -17,12 +17,12 @@
     "lint:fix": "eslint --fix --ext .ts .",
     "format": "prettier --write .",
     "version:show": "node -e \"console.log(require('./package.json').version)\"",
-    "test": "jest --testPathIgnorePatterns=\\.performance\\.test\\.ts$",
+    "test": "jest",
     "test:file": "jest --watch --onlyChanged --coverage=true --verbose",
-    "test:verbose": "jest --verbose --testPathIgnorePatterns=\\.performance\\.test\\.ts$",
-    "test:watch": "jest --watch --onlyChanged --verbose --testPathIgnorePatterns=\\.performance\\.test\\.ts$",
+    "test:verbose": "jest --verbose",
+    "test:watch": "jest --watch --onlyChanged --verbose",
     "test:performance": "jest --config jest.config.performance.js --runInBand --verbose",
-    "test:coverage": "jest --config jest.config.coverage.js --coverage --testPathIgnorePatterns=\\.performance\\.test\\.ts$"
+    "test:coverage": "jest --config jest.config.coverage.js --coverage"
   },
   "keywords": [],
   "author": "",

src/libs/BlockRenderComponents/TableBlockRenderComponent.ts

@@ -10,7 +10,8 @@ import RedrawableBlockRenderComponent from './RedrawableBlockRenderComponent';
 import { IProcessorSettings } from '../../interfaces/IProcessorSettings';
 import Helper from '../Helper';
 import MetadataCache, { FileMetadata } from '../MetadataCache';
-import Search from '../Search/Search';
+import { ISearch } from '../Search/interfaces/ISearch';
+import { Search } from '../Search/Search';
 import Table, { RowsState, TableHeader } from '../Table';
 
 /**
@@ -444,7 +445,7 @@ export type BlockRenderSettings = {
      * Search terms array used to filter the models.
      * If undefined, no search filter is applied.
      */
-    search: Search | undefined;
+    search: ISearch | undefined;
 
     /**
      * The search text.

src/libs/DependencyInjection/DIContainer.ts

@@ -0,0 +1,35 @@
+import { IDIContainer, IDIContainer_ } from './interfaces/IDIContainer';
+
+/**
+ * Dependency Injection Container
+ */
+const DIContainer_: IDIContainer_ = class DIContainer implements IDIContainer {
+    private _dependencies = new Map<string, unknown>();
+
+    /**
+     * Register a dependency
+     * @param identifier The identifier of the dependency
+     * @param dependency The dependency to register
+     */
+    public register<T>(identifier: string, dependency: T): void {
+        this._dependencies.set(identifier, dependency);
+    }
+
+    /**
+     * Resolve a dependency
+     * @param identifier The identifier of the dependency
+     * @returns The resolved dependency
+     * @throws Error if the dependency is not found
+     */
+    public resolve<T>(identifier: string): T {
+        const dependency = this._dependencies.get(identifier);
+
+        if (!dependency) {
+            throw new Error(`Dependency ${identifier} not found`);
+        }
+
+        return dependency as T;
+    }
+};
+
+export { DIContainer_ as DIContainer };

src/libs/DependencyInjection/__tests__/DIContainer.test.ts

@@ -0,0 +1,4 @@
+import { test_IDIContainer } from './IDIContainer.spec';
+import { DIContainer } from '../DIContainer';
+
+test_IDIContainer(DIContainer);

src/libs/DependencyInjection/__tests__/IDIContainer.spec.ts

@@ -0,0 +1,35 @@
+import { IDIContainer_, IDIContainer } from '../interfaces/IDIContainer';
+
+/**
+ * Test the implementation of a DIContainer
+ * @param Container The DIContainer implementation to test.
+ * Must implement {@link IDIContainer}, {@link IDIContainer_}
+ */
+export function test_IDIContainer(Container: IDIContainer_) {
+    describe('IDIContainer Implementation Tests', () => {
+        let container: IDIContainer;
+
+        beforeEach(() => {
+            container = new Container();
+        });
+
+        it('should register and resolve a dependency', () => {
+            const identifier = 'myDependency';
+            const dependency = { value: 42 };
+
+            container.register(identifier, dependency);
+
+            const resolvedDependency =
+                container.resolve<typeof dependency>(identifier);
+            expect(resolvedDependency).toBe(dependency);
+        });
+
+        it('should throw an error when resolving a non-registered dependency', () => {
+            const identifier = 'nonExistentDependency';
+
+            expect(() => container.resolve<unknown>(identifier)).toThrow();
+        });
+
+        // Add more tests as necessary
+    });
+}

src/libs/DependencyInjection/interfaces/IDIContainer.ts

@@ -0,0 +1,24 @@
+/**
+ * Dependency Injection Container Constructor Interface
+ */
+export interface IDIContainer_ {
+    new (): IDIContainer;
+}
+
+/**
+ * Dependency Injection Container Interface
+ */
+export interface IDIContainer {
+    /**
+     * Register a dependency
+     * @param identifier The identifier of the dependency
+     * @param dependency The dependency to register
+     */
+    register<T>(identifier: string, dependency: T): void;
+
+    /**
+     * Resolve a dependency
+     * @param identifier The identifier of the dependency
+     */
+    resolve<T>(identifier: string): T;
+}