spice-js 2.5.2 → 2.5.6

package/build/bootstrap/event.js

@@ -6,9 +6,11 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var EventEmitter = require("events").EventEmitter;
+var EventEmitter = require("events");
 
-var myEmitter = new EventEmitter();
+class MyEmitter extends EventEmitter {}
+
+var myEmitter = new MyEmitter();
 spice.EventEmitter = myEmitter;
 
 var eventingManifest = require(_path.default.resolve(_path.default.join(spice.root_path, "/eventing/manifest.js")));
@@ -17,7 +19,6 @@ _lodash.default.each(eventingManifest.default, entry => {
   var topic = new entry.event().topic;
   var Processor = spice.config.event.providers[new entry.event().driver || spice.config.event.default_driver];
   var processor = new Processor();
-  console.log(processor);
 
   _lodash.default.each(entry.handlers, handler => {
     processor.on(topic, new handler().handle);

package/build/bootstrap/map.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+try {
+  var resources = ["models", "controllers"];
+  console.log(":::::::::::::STARTING MAP:::::::::::::");
+  resources.every(resource => {
+    var paths = _path.default.join(spice.root_path, resource);
+
+    spice[resource] = {};
+
+    require("fs").readdirSync(paths).forEach(
+    /*#__PURE__*/
+    function () {
+      var _ref = _asyncToGenerator(function* (file) {
+        console.log("Loading:", file);
+        spice[resource][file.split(".")[0]] = (yield Promise.resolve("".concat(_path.default.join(paths, file))).then(s => _interopRequireWildcard(require(s)))).default;
+      });
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+  });
+} catch (error) {
+  console.log(error);
+}

package/build/events/providers/SocketEventDriver.js

@@ -5,24 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _socket = _interopRequireDefault(require("socket.io-client"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class SpiceEventDriver {
-  dispatch() {
-    var {
-      topic,
-      data
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+//import io from "socket.io-client";
+class SocketEventDriver {
+  /*dispatch({ topic, data } = {}) {
     spice.io.broadcast(topic, data);
   }
-
-  on(topic, callback) {
-    var socket = (0, _socket.default)("http://localhost:3005");
+   on(topic, callback) {
+    var socket = io("http://localhost:3005");
     socket.on(topic, callback);
-  }
-
+  }*/
 }
 
-exports.default = SpiceEventDriver;
+exports.default = SocketEventDriver;

package/build/events/providers/SpiceEventDriver.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-class SocketEventDriver {
+class SpiceEventDriver {
   dispatch() {
     var {
       topic,
@@ -20,4 +20,4 @@ class SocketEventDriver {
 
 }
 
-exports.default = SocketEventDriver;
+exports.default = SpiceEventDriver;

package/build/index.js

@@ -210,6 +210,14 @@ class Spice {
         spice.config = yield require("./loaders/config")();
         io.attach(app);
         spice.io = io;
+        io.on("message", (ctx, data) => {
+          console.log("client sent data to message endpoint", data);
+        });
+
+        app._io.on("connection", sock => {
+          console.log("Connection Up", sock);
+        });
+
         app.use(koaSwagger({
           hideTopbar: true,
           title: "Spice JS",

package/build/loaders/index.js

@@ -17,7 +17,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var ordered_modules = ["logger", "error", "database", "views", "routes"];
+var ordered_modules = ["map", "logger", "error", "database", "views", "routes"];
 
 function load() {
   return _load.apply(this, arguments);
@@ -35,6 +35,8 @@ function _load() {
           console.log('APP Bootstrap directory', app_bootstrap_path); */
 
 
+      console.log("Loading Ordered Files", ordered_modules);
+
       for (var file of ordered_modules) {
         var mod = require(_path.default.join(bootstrap_path, file));
 

package/build/models/SpiceModel.js

@@ -314,7 +314,7 @@ class SpiceModel {
     }
 
     if (omit.length > 0) {
-      working_properties = _.omit(this.props, pick);
+      working_properties = _.omit(this.props, omit);
     }
 
     for (var i in working_properties) {
@@ -857,7 +857,7 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute = _asyncToGenerator(function* (data) {
-                          return yield _this10.mapToObject(data, properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          return yield _this10.mapToObject(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x) {
@@ -878,7 +878,8 @@ class SpiceModel {
                       when: properties[i].map.when || "read",
                       execute: function () {
                         var _execute2 = _asyncToGenerator(function* (data) {
-                          return yield _this10.mapToObjectArray(data, properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
+                          console.log(_.isString(properties[i].map.reference), _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, spice.models, properties[i].map.reference);
+                          return yield _this10.mapToObjectArray(data, _.isString(properties[i].map.reference) ? spice.models[properties[i].map.reference] : properties[i].map.reference, i, properties[i].map.destination || i, properties[i]);
                         });
 
                         function execute(_x2) {

package/gulpfile.js

@@ -1,34 +1,37 @@
-var gulp = require('gulp');
-var babel = require('gulp-babel');
+var gulp = require("gulp");
+var babel = require("gulp-babel");
 var paths = {};
-paths.src = './src/**/*.js';
+paths.src = "./src/**/*.js";
 
-gulp.task('build_spice', () =>
-  gulp.src(paths.src)
-    .pipe(babel({
-      presets: [
-        [
-          "@babel/preset-env",
-          {
-            "targets": {
-              "esmodules": true,
-              "node": "current",
+gulp.task("build_spice", () =>
+  gulp
+    .src(paths.src)
+    .pipe(
+      babel({
+        presets: [
+          [
+            "@babel/preset-env",
+            {
+              loose: true,
+              targets: {
+                esmodules: true,
+                node: "current",
+              },
             },
-
-          },
+          ],
+        ],
+        plugins: [
+          ["@babel/plugin-proposal-class-properties", { loose: true }],
+          ["@babel/plugin-proposal-export-namespace-from", { loose: true }],
+          ["@babel/plugin-proposal-export-default-from", { loose: true }],
         ],
-      ],
-      plugins: [
-        ['@babel/plugin-proposal-class-properties', { "loose": true }],
-        "@babel/plugin-proposal-export-namespace-from",
-        "@babel/plugin-proposal-export-default-from",
-      ],
-    }))
-    .pipe(gulp.dest('build'))
+      })
+    )
+    .pipe(gulp.dest("build"))
 );
 
 // Default task
-gulp.task('default', gulp.series('build_spice'));
-gulp.task('watch', function () {
-  gulp.watch(paths.src, gulp.series('build_spice'));
+gulp.task("default", gulp.series("build_spice"));
+gulp.task("watch", function () {
+  gulp.watch(paths.src, gulp.series("build_spice"));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.5.2",
+  "version": "2.5.6",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/bootstrap/event.js

@@ -1,9 +1,9 @@
 import path from "path";
 import _ from "lodash";
-const EventEmitter = require("events").EventEmitter;
-const myEmitter = new EventEmitter();
+const EventEmitter = require("events");
+class MyEmitter extends EventEmitter { }
+const myEmitter = new MyEmitter();
 spice.EventEmitter = myEmitter;
-
 let eventingManifest = require(path.resolve(
   path.join(spice.root_path, "/eventing/manifest.js")
 ));
@@ -16,7 +16,6 @@ _.each(eventingManifest.default, (entry) => {
       new entry.event().driver || spice.config.event.default_driver
     ];
   let processor = new Processor();
-  console.log(processor);
   _.each(entry.handlers, (handler) => {
     processor.on(topic, new handler().handle);
   });

package/src/bootstrap/map.js

@@ -0,0 +1,20 @@
+import path from "path";
+
+try {
+  let resources = ["models", "controllers"];
+  console.log(":::::::::::::STARTING MAP:::::::::::::");
+  resources.every((resource) => {
+    let paths = path.join(spice.root_path, resource);
+    spice[resource] = {};
+    require("fs")
+      .readdirSync(paths)
+      .forEach(async function (file) {
+        console.log("Loading:", file);
+        spice[resource][file.split(".")[0]] = (
+          await import(path.join(paths, file))
+        ).default;
+      });
+  });
+} catch (error) {
+  console.log(error);
+}

package/src/events/providers/SocketEventDriver.js

@@ -1,11 +1,11 @@
-import io from "socket.io-client";
-export default class SpiceEventDriver {
-  dispatch({ topic, data } = {}) {
+//import io from "socket.io-client";
+export default class SocketEventDriver {
+  /*dispatch({ topic, data } = {}) {
     spice.io.broadcast(topic, data);
   }
 
   on(topic, callback) {
     var socket = io("http://localhost:3005");
     socket.on(topic, callback);
-  }
+  }*/
 }

package/src/events/providers/SpiceEventDriver.js

@@ -1,4 +1,4 @@
-export default class SocketEventDriver {
+export default class SpiceEventDriver {
   dispatch({ topic, data } = {}) {
     spice.EventEmitter.emit(topic, data);
   }

package/src/index.js

@@ -74,6 +74,12 @@ export default class Spice {
 
       io.attach(app);
       spice.io = io;
+      io.on("message", (ctx, data) => {
+        console.log("client sent data to message endpoint", data);
+      });
+      app._io.on("connection", (sock) => {
+        console.log("Connection Up", sock);
+      });
       app.use(
         koaSwagger({
           hideTopbar: true,

package/src/loaders/index.js

@@ -2,7 +2,7 @@ import path from "path";
 import fs from "fs";
 import _ from "lodash";
 
-let ordered_modules = ["logger", "error", "database", "views", "routes"];
+let ordered_modules = ["map", "logger", "error", "database", "views", "routes"];
 export async function load() {
   try {
     /* console.log('loading from array')*/
@@ -10,14 +10,14 @@ export async function load() {
     let bootstrap_path = path.resolve(
       path.join(spice.module_root_path, "/bootstrap")
     );
-    
+
     let app_bootstrap_path = path.resolve(
       path.join(spice.root_path, "/bootstrap")
     );
 
     /* console.log('MODULE Bootstrap directory', bootstrap_path);
         console.log('APP Bootstrap directory', app_bootstrap_path); */
-
+    console.log("Loading Ordered Files", ordered_modules);
     for (let file of ordered_modules) {
       let mod = require(path.join(bootstrap_path, file));
       if (_.isFunction(mod)) {

package/src/models/SpiceModel.js

@@ -242,7 +242,10 @@ export default class SpiceModel {
     return _.join(returnVal, "|");
   }
 
-  getValidationRules(method = "POST", { complete = false, pick = [], omit = [] } = {}) {
+  getValidationRules(
+    method = "POST",
+    { complete = false, pick = [], omit = [] } = {}
+  ) {
     let rules = {};
     let filters = {};
     let working_properties = this.props;
@@ -251,7 +254,7 @@ export default class SpiceModel {
     }
 
     if (omit.length > 0) {
-      working_properties = _.omit(this.props, pick);
+      working_properties = _.omit(this.props, omit);
     }
 
     for (let i in working_properties) {
@@ -743,14 +746,17 @@ export default class SpiceModel {
               case "string": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  execute: async (data) =>
-                    await this.mapToObject(
+                  execute: async (data) => {
+                    return await this.mapToObject(
                       data,
-                      properties[i].map.reference,
+                      _.isString(properties[i].map.reference)
+                        ? spice.models[properties[i].map.reference]
+                        : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
                       properties[i]
-                    ),
+                    );
+                  },
                 });
                 break;
               }
@@ -758,14 +764,25 @@ export default class SpiceModel {
               case "array": {
                 this.addModifier({
                   when: properties[i].map.when || "read",
-                  execute: async (data) =>
-                    await this.mapToObjectArray(
+                  execute: async (data) => {
+                    console.log(
+                      _.isString(properties[i].map.reference),
+                      _.isString(properties[i].map.reference)
+                        ? spice.models[properties[i].map.reference]
+                        : properties[i].map.reference,
+                      spice.models,
+                      properties[i].map.reference
+                    );
+                    return await this.mapToObjectArray(
                       data,
-                      properties[i].map.reference,
+                      _.isString(properties[i].map.reference)
+                        ? spice.models[properties[i].map.reference]
+                        : properties[i].map.reference,
                       i,
                       properties[i].map.destination || i,
                       properties[i]
-                    ),
+                    );
+                  },
                 });
                 break;
               }