binhend 2.1.8 → 2.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",

package/src/binh.js

@@ -5,7 +5,7 @@ const createCSD = require('./csd');
 const cors = require('./cors');
 const { server } = require('./server');
 const { loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError } = require('./api');
-const { ConfigLoader } = require('./configuration');
+const { ConfigLoader, config } = require('./configuration');
 const { WebBuilder } = require('./web');
 const { binh } = require('./web/component.method');
 const { HttpCodes } = require('./utils/httpCodes');
@@ -15,14 +15,13 @@ const { HTTPS } = require('./https');
 require('./alias');
 
 module.exports = {
-    config: {},
     typeOf,
     security,
     createCSD,
     cors,
     server,
     loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError,
-    ConfigLoader,
+    ConfigLoader, config,
     WebBuilder,
     binh,
     HttpCodes,

package/src/configuration.js

@@ -123,4 +123,4 @@ function failed(error, source) {
     return {};
 };
 
-module.exports = { ConfigLoader };
+module.exports = { ConfigLoader, config: {} };

package/src/web/code.js

@@ -54,7 +54,10 @@ function getDependencyDelaration(component) {
 
     for (var filePath in dependencies) {
         var { name, url, type } = dependencies[filePath];
-        if (name) {
+        if (name && type === 'service') {
+            codes.push(` ${name} = this.${type}('${url}')`);
+        }
+        else if (name) {
             codes.push(` ${name} = Binh.${type}('${url}')`);
         }
     }
@@ -92,20 +95,32 @@ function getMetadataOfDependencies(component) {
     return component.dependencies;
 }
 
-function generateOptionCode(component, varname) {
-    var options = component.options, urls = [];
+function generateOptionCode(component, baseCode) {
+    var options = component.options;
+
+    if (!options) return ''; // TODO remove this line, seem like always have this object 'options'
 
-    if (!options) return '';
+    var cssUrls = [], serviceUrls = [];
 
+    // CSS
     component.type === 'ui' && options.csses.forEach(function(cssModule) {
-        urls.push(JSON.stringify(cssModule.url));
+        cssUrls.push(JSON.stringify(cssModule.url));
+    });
+
+    if (cssUrls.length) {
+        baseCode += `.style([${cssUrls.join(',')}])`;
+    }
+
+    // Services
+    options.services.forEach(function(serviceModule) {
+        serviceUrls.push(serviceModule.url);
     });
 
-    if (urls.length) {
-        return `${varname}.style([${urls.join(',')}])`;
+    if (serviceUrls.length) {
+        baseCode += `.service(['${serviceUrls.join("', '")}'])`;
     }
 
-    return '';
+    return baseCode;
 }
 
 function getRelativeFilePath(filePath, rootPath) {

package/src/web/component.build.js

@@ -70,6 +70,7 @@ function lazyload(paths) {
     processEachFile(paths, buildLazyCode, copyExternalComponentFiles);
 }
 
+/** case of components or modules are required from node_modules installed by NPM */
 function copyExternalComponentFiles({ outputRootPath }) {
     var cache = copyExternalComponentFiles.cache,
         csses = copyExternalComponentFiles.csses;

package/src/web/component.format.js

@@ -1,4 +1,4 @@
-const { config } = require('binhend');
+const { config } = require('../configuration');
 const { readFileSync } = require('fs');
 const { parse } = require('path');
 const { scanNestedFiles, cloneFileIfNew, printError, makeFullDirPath, writeToFileIfNew } = require('./component.file');

package/src/web/component.method.js

@@ -81,7 +81,7 @@ binh.component = function(context, ui, service, style) {
     component.htmltags = [];
     component.svgtags = [];
     component.links = [];
-    component.options = { csses: [] };
+    component.options = { csses: [], services: [] };
     component.vars = {};
     component.varname = getVariableName(component.filename);
     component.as = alias;
@@ -98,6 +98,10 @@ binh.final = function(module) {
             component.vars[childComponent.filename] = childComponent.alias;
             delete childComponent.alias;
         }
+
+        if (childComponent.type === 'service') {
+            component.options.services.push(childComponent);
+        }
     });
 };