notherbase-fs 3.0.7 → 3.0.9

package/controllers/creation.js

@@ -85,7 +85,7 @@ export default class Creation {
     page = async (req, res, next) => {
         let main = `${req.contentPath}`;
 
-        main += `/${req.params.page}/index.ejs`;
+        main += `/pages/${req.params.page}/index.ejs`;
 
         try {
             if (fs.existsSync(main)) {

package/controllers/spirit-world.js

@@ -47,24 +47,14 @@ export default class SpiritWorld {
     }
 
     load = async (req, res) => {
-        let user = await req.db.User.recallOne(req.session.currentUser);
-
         let parent = null;
-        if (req.query.scope === "local" && user) parent = user.id;
 
-        let spirit = await req.db.Spirit.recallOne({
-            route: req.query.route,
-            service: req.query.service,
-            scope: req.query.scope,
-            parent: parent
-        });
+        if (req.query.scope === "local") {
+            let user = await req.db.User.recallOne(req.session.currentUser);
+            parent = user.id;
+        } 
 
-        if (!spirit) spirit = await req.db.Spirit.create({
-            route: req.query.route,
-            service: req.query.service,
-            scope: req.query.scope,
-            parent: parent
-        }, {});
+        let spirit = await req.db.Spirit.recallOne(req.query.service, parent);
 
         if (!spirit.memory.data) spirit.memory.data = {};
 
@@ -73,7 +63,7 @@ export default class SpiritWorld {
 
     serve = async (req, res) => {
         try {
-            let scriptPath = `${req.contentPath}${req.body.route}/${req.body.data.script}.js`;
+            let scriptPath = `${req.contentPath}${req.body.data.route}/${req.body.data.script}.js`;
             
             let script, result = null;
 

package/models/item.js

@@ -5,10 +5,8 @@ export default class Item extends Spirit {
         let spirit = new Item(name);
 
         spirit.memory = await Spirit.db.create({
-            route: "/",
             service: "items",
             parent: null,
-            scope: "global",
             _lastUpdate: Date.now(),
             data: {
                 name,
@@ -24,10 +22,8 @@ export default class Item extends Spirit {
         let spirit = new Item();
 
         let found = await Spirit.db.find({
-            route: "/",
             service: "items",
-            parent: null,
-            scope: "global"
+            parent: null
         });
 
         if (found) {
@@ -41,14 +37,7 @@ export default class Item extends Spirit {
     static recallOne = async (name) => {
         let spirit = new Item(name);
 
-        let query = Spirit.buildQuery({
-            route: "/",
-            service: "items",
-            parent: null,
-            scope: "global"
-        }, {
-            name: name
-        });
+        let query = Spirit.buildQuery("items", { name });
 
         let found = await Spirit.db.findOne(query);
 
@@ -61,14 +50,7 @@ export default class Item extends Spirit {
     }
 
     static delete = async (name) => {
-        let found = await Spirit.db.findAndDelete(Spirit.buildQuery({
-            route: "/",
-            service: "items",
-            parent: null,
-            scope: "global"
-        }, {
-            name: name
-        }));
+        let found = await Spirit.db.findAndDelete(Spirit.buildQuery("items", { name }));
 
         return found.deletedCount;
     }

package/models/spirit.js

@@ -3,9 +3,7 @@ import mongoose from "mongoose";
 export default class Spirit {
     static db = mongoose.model('spirits', new mongoose.Schema({
         _lastUpdate: Number,
-        route: String,
         service: String,
-        scope: String,
         parent: { 
             type: mongoose.Schema.Types.ObjectId, 
             ref: "spirits",
@@ -14,16 +12,14 @@ export default class Spirit {
         data: {}
     }));
 
-    static buildQuery = (options = {}, data = {}, id = null) => {
-        let query = {};
-        
-        if (id) query = {
-            _id: id
-        };
-        if (options) query = {
-            ...query,
-            ...options
+    static buildQuery = (service, data = null, parent = null, id = null) => {
+        let query = {
+            service: service,
+            parent: parent
         };
+        
+        if (id) query._id = id;
+
         if (data){
             let keys = Object.keys(data);
             for (let i = 0; i < keys.length; i++) {
@@ -34,11 +30,12 @@ export default class Spirit {
         return query;
     }
 
-    static create = async (options, data) => {
+    static create = async (service, data = {}, parent = null) => {
         let spirit = new Spirit();
 
         spirit.memory = await Spirit.db.create({
-            ...options,
+            service,
+            parent,
             _lastUpdate: Date.now(),
             data: data
         });
@@ -46,54 +43,36 @@ export default class Spirit {
         return spirit;
     }
 
-    static recall = async (options = {}, data = {}, id = null) => {
+    static recallAll = async (service) => {
         let spirit = new Spirit();
 
-        let query = Spirit.buildQuery(options, data, id);
-
-        let found = await Spirit.db.find(query);
+        let query = Spirit.buildQuery(service);
 
-        if (found) {
-            spirit.memory = found;
-            if (!spirit.memory.data) spirit.memory.data = {};
-            
-            return spirit;
-        }
-        else return null;
-    }
-
-    static recallOne = async (options = {}, data = {}, id = null) => {
-        let spirit = new Spirit();
-
-        let query = Spirit.buildQuery(options, data, id);
-
-        let found = await Spirit.db.findOne(query);
+        let found = await Spirit.db.find({
+            service: service
+        });
 
         if (found) {
             spirit.memory = found;
-            if (!spirit.memory.data) spirit.memory.data = {};
             
             return spirit;
         }
         else return null;
     }
 
-    static recallOrCreate = async (options = {}, queryData = {}, initdata = {}) => {
+    static recallOne = async (service, parent = null, data = {}, id = null) => {
         let spirit = new Spirit();
 
-        let query = Spirit.buildQuery(options, queryData);
+        let query = Spirit.buildQuery(service, data, parent, id);
 
         let found = await Spirit.db.findOne(query);
 
         if (found) {
             spirit.memory = found;
-            if (!spirit.memory.data) spirit.memory.data = {};
-            
             return spirit;
         }
         else {
-            options._lastUpdate = Date.now();
-            let newSpirit = await Spirit.create(options, initdata);
+            let newSpirit = await Spirit.create(service, {}, parent);
             return newSpirit;
         }
     }

package/models/user.js

@@ -3,34 +3,19 @@ import Item from "./item.js";
 import bcrypt from "bcrypt";
 
 export default class User extends Spirit {
-    static recallOne = async (target = null, username = null, id = null) => {
-        let spirit = new User(target, id);
+    static recallOne = async (email = null, username = null, id = null) => {
+        let spirit = new User(email, id);
 
         let query = null;
 
-        if (target) {
-            query = Spirit.buildQuery({
-                route: "/",
-                service: "user",
-                scope: "global",
-                parent: null
-            }, { email: target });
+        if (email) {
+            query = Spirit.buildQuery("user", { email: email });
         }
         else if (username) {
-            query = Spirit.buildQuery({
-                route: "/",
-                service: "user",
-                scope: "global",
-                parent: null
-            }, { username: username });
+            query = Spirit.buildQuery("user", { username: username });
         }
         else if (id) {
-            query = Spirit.buildQuery({
-                route: "/",
-                service: "user",
-                scope: "global",
-                parent: null
-            }, null, id);
+            query = Spirit.buildQuery("user", null, null, id);
         }
         
         let found = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {

package/test/the-front/check/index.ejs

@@ -5,9 +5,26 @@
 <button onclick="base.do('add-more-gold')">+3</button>
 <button onclick="base.do('subtract-gold')">-30</button>
 <button onclick="base.do('emailTime')">email</button>
+<input type="text" id="test" placeholder="Loading...">
+<button onclick="saveInput()">Save</button>
 
 <hr>
 
 <a href="/the-front">
     Go to The Front
-</a>
+</a>
+
+<script>
+    const $inp = $("input#test");
+
+    base.load("test-save3").then((res) => {
+        if (res.text) $inp.attr("placeholder", res.text);
+        else  $inp.attr("placeholder", "No Input Saved");
+    })
+
+    const saveInput = function saveInput() {
+        let inp = $inp.val();
+
+        base.do("save-input", { text: inp });
+    }
+</script>

package/test/the-front/check/save-input.js

@@ -0,0 +1,7 @@
+export default async (req, user) => {
+    let spirit = await req.db.Spirit.recallOne("test-save3", user.id);
+
+    await spirit.commit({
+        text: req.body.data.text
+    });
+}

package/views/scripts/base.js

@@ -288,23 +288,22 @@ class Base {
         return response;
     }
 
-    do = async (what, data = null, route = window.location.pathname) => {
-        let response = Base.commune("/s/serve", {
+    do = async (what, data = null) => {
+        console.log(window.location.pathname);
+        let response = await Base.commune("/s/serve", {
             script: what,
-            ...data
-        }, {
-            route
+            ...data,
+            route: window.location.pathname
         });
 
         this.playerInventory.refresh();
         this.playerAttributes.refresh();
-
-        await response;
+        
         return response;
     }
 
     load = async (service, scope = "local") => {
-        let response = await $.get("/s/load", { service, scope, route: window.location.pathname });
+        let response = await $.get("/s/load", { service, scope });
 
         return response;
     }