wip

Author: gregblt

jest.config.js

@@ -1,27 +1,32 @@
 module.exports = {
-    preset: 'ts-jest',
-    transform: {
-      '^.+\\.(ts|tsx)?$': 'ts-jest',
-      '^.+\\.(js|jsx)$': 'babel-jest',
-    },
-    "collectCoverage": true,
-    "maxWorkers": 4,
-    "bail": true,
-    "coverageReporters": [
-      "html",
-      "lcov",
-      "text",
-      "cobertura"
-    ],
-    "coverageThreshold": {
-      "global": {
-        "lines": 85
-      }
-    },
-    "reporters": [
-      "default",
-      "jest-junit"
-    ],
-    "runTestsByPath": true,
-    "openHandlesTimeout": 0
-  };
+  testEnvironment: 'node',
+  testMatch: ['**/test/**/*.test.js'],
+  moduleFileExtensions: ['js'],
+  roots: ['<rootDir>/test'],
+  moduleDirectories: ['node_modules', 'lib'],
+  preset: 'ts-jest',
+  transform: {
+    '^.+\\.(ts|tsx)?$': 'ts-jest',
+    '^.+\\.(js|jsx)$': 'babel-jest',
+  },
+  collectCoverage: true,
+  maxWorkers: 4,
+  bail: true,
+  coverageReporters: [
+    "html",
+    "lcov",
+    "text",
+    "cobertura"
+  ],
+  coverageThreshold: {
+    "global": {
+      "lines": 85
+    }
+  },
+  reporters: [
+    "default",
+    "jest-junit"
+  ],
+  runTestsByPath: true,
+  openHandlesTimeout: 0
+};

package-lock.json

@@ -31,6 +31,7 @@
     "url": "https://github.com/gregblt/NoSQLax"
   },
   "dependencies": {
+    "@apidevtools/json-schema-ref-parser": "^11.9.3",
     "ajv": "^8.17.1",
     "nano": "^10.1.4"
   },

package.json

@@ -63,7 +63,7 @@ abstract class ActiveRecordEntity extends BaseEntity {
     }
 
     async save(): Promise<BaseEntity> {
-        return await (this.constructor as typeof ActiveRecordEntity).getRepo().save(this)
+        return await (this.constructor as typeof ActiveRecordEntity).save(this)
     }
 
     // 8. Delete a document
@@ -75,7 +75,7 @@ abstract class ActiveRecordEntity extends BaseEntity {
         if (!this.id) {
             throw new Error("Document does not exist");
         }
-        return await (this.constructor as typeof ActiveRecordEntity).getRepo().delete(this.id);
+        return await (this.constructor as typeof ActiveRecordEntity).delete(this.id);
     }
 
     // Define the extend method to add new query methods

src/core/ActiveRecordEntity.ts

@@ -58,25 +58,6 @@ abstract class BaseEntity implements IBaseEntity {
 
     const schemaProperties = schema?.properties || {};
 
-    // Dynamically add getters and setters based on schema
-    Object.keys(schemaProperties).forEach(property => {
-      Object.defineProperty(this, property, {
-        get() {
-          return this.privateData.get(this)[property];  // Retrieve the field value
-        },
-        set(value) {
-          this.privateData.get(this)[property] = value;  // Assign value to internal variable
-        },
-        enumerable: true,
-        configurable: true
-      });
-    });
-
-    // Initialize properties from schema
-    Object.keys(schemaProperties).forEach(property => {
-      this.privateData.get(this)[property] = data[property];
-    });
-
   }
 
   toJSON() {
@@ -86,34 +67,6 @@ abstract class BaseEntity implements IBaseEntity {
     return data;
   }
 
-  static extractFieldMapFromSchema(schemaOrSchemaId: any, ajvOptions: any): Record<string, string> {
-
-    const fieldMap: Record<string, string> = {};
-
-    // Initialize the AJV instance with options
-    const ajv = new Ajv(ajvOptions || {});
-    let schema: any = schemaOrSchemaId;
-
-
-    // If schemaOrSchemaId is a string (schema ID), fetch the schema
-    if (typeof schemaOrSchemaId === "string") {
-      schema = ajv.getSchema(schemaOrSchemaId); // Retrieve the schema
-      if (!schema) {
-        throw new Error(`Schema with ID ${schemaOrSchemaId} not found.`);
-      }
-    }
-
-    if (schema && schema.properties) {
-      // Only consider top-level properties from the schema
-      for (const key in schema.properties) {
-        fieldMap[key] = key; // Field name matches property name by default
-      }
-    }
-
-    return fieldMap;
-
-  }
-
 
   // Getter for id
   get id(): string | undefined {