@stonyx/orm 0.0.2 → 0.0.3

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "",
   "main": "src/main.js",
   "type": "module",

package/src/db.js

@@ -22,7 +22,7 @@ export default class DB {
   }
 
   async init() {
-    this.data = await this.retrieve();
+    await this.retrieve();
 
     const { autosave, saveInterval } = config.orm.db;
 
@@ -36,6 +36,7 @@ export default class DB {
   }
 
   async create() {
+    const { rootPath } = config;
     const { file, schema } = config.orm.db;
 
     if (!file) throw new Error('Configuration Error: ORM DB file path must be defined.');
@@ -43,16 +44,15 @@ export default class DB {
     let dbSchema;
 
     try {
-      dbSchema = await import(schema);
+      dbSchema = (await import(`${rootPath}/${schema}`)).default;
     } catch (error) {
       dbSchema = {};
       log.db('Unable to load DB schema from file, using empty schema instead');
     }
     
-    const data = deepCopy(schema);
-    createFile(file, this.rawData);
+    this.data = deepCopy(dbSchema);
     
-    return data;
+    createFile(`${rootPath}/${file}`, this.rawData);
   }
   
   async save() {
@@ -66,7 +66,9 @@ export default class DB {
   async retrieve() {
     const { file } = config.orm.db;
 
-    return readFile(file, { json: true, missingFileCallback: this.create.bind(this) });
+    const data = await readFile(file, { json: true, missingFileCallback: this.create.bind(this) });
+
+    if (data) this.data = data;
   }
 
   /** TODO: We need ORM specific reload logic that replaces models attributes when loading from DB */

package/src/main.js

@@ -26,7 +26,6 @@ import { kebabCaseToPascalCase, pluralize } from "@stonyx/utils/string";
 import baseTransforms from "./transforms.js";
 
 export default class Orm {
-  ready = this.loadDependencies();
   initialized = false;
   
   models = {};
@@ -35,13 +34,13 @@ export default class Orm {
 
   constructor() {
     if (Orm.instance) return Orm.instance;
+
     Orm.instance = this;
   }
 
-  async loadDependencies() {
+  async init() {
     const { paths } = config.orm;
-
-    await Promise.all(['Model', 'Serializer', 'Transform'].map(type => {
+    const promises = ['Model', 'Serializer', 'Transform'].map(type => {
       const lowerCaseType = type.toLowerCase();
       const path = paths[lowerCaseType];
       if (!path) throw new Error(`Configuration Error: ORM path for "${type}" must be defined.`);
@@ -52,9 +51,12 @@ export default class Orm {
 
         return this[pluralize(lowerCaseType)][alias] = exported;
       }, { ignoreAccessFailure: true, rawName: true });
-    }));
+    });
+
+    promises.push(new DB().init());
 
-    await new DB().init();
+    await Promise.all(promises);
+    
     this.initialized = true;
   }