@steedos/service-package-loader 2.5.5 → 2.6.1-beta.2

package/index.js

@@ -8,7 +8,7 @@ const path = require('path');
 const _ = require('lodash');
 const fs = require("fs");
 const metaDataCore = require('@steedos/metadata-core');
-const { registerMetadataConfigs, loadStandardMetadata, loadRouters } = require('@steedos/metadata-registrar');
+const { registerMetadataConfigs, loadStandardMetadata, loadRouters, canLoadMetadata } = require('@steedos/metadata-registrar');
 const loadFlowFile = new metaDataCore.LoadFlowFile();
 
 /**
@@ -106,6 +106,9 @@ module.exports = {
             }
         },
         sendPackageFlowToDb: async function(packagePath, name) {
+            if(!canLoadMetadata('Flow')){
+                return ;
+            }
             const flows = loadFlowFile.load(path.join(packagePath, '**'));
             for (const apiName in flows) {
                 const flow = flows[apiName];
@@ -128,11 +131,12 @@ module.exports = {
                 return;
             }
             const { path : _path } = packageInfo;
-
             this.loadPackagePublicFiles(_path);
             if(_path){
                 this.sendPackageFlowToDb(_path)
-                processLoader.sendPackageProcessToDb(_path);
+                if(canLoadMetadata('Process')){
+                    processLoader.sendPackageProcessToDb(_path);
+                }
             }
         },
         loadPackageMetadataFiles: async function (packagePath, name, datasourceName) {
@@ -142,17 +146,27 @@ module.exports = {
                 datasourceName = 'default';
             }
             if(this.objectql){
-                await this.initDataSource(packagePath, datasourceName);
                 await loadStandardMetadata(name, datasourceName);
+                await this.initDataSource(packagePath, datasourceName);
             }
             await registerMetadataConfigs(packagePath, datasourceName, name);
-            await triggerLoader.load(this.broker, packagePath, name);
-            await processTriggerLoader.load(this.broker, packagePath, name);
-            await triggerYmlLoader.load(this.broker, packagePath, name);
+            if(canLoadMetadata('Trigger')){
+                await triggerLoader.load(this.broker, packagePath, name);
+            }
+            if(canLoadMetadata('ProcessTrigger')){
+                await processTriggerLoader.load(this.broker, packagePath, name);
+            }
+            if(canLoadMetadata('TriggerYml')){
+                await triggerYmlLoader.load(this.broker, packagePath, name);
+            }
             if(this.core){
-                this.core.loadClientScripts();
-                const routersInfo = await this.loadPackageRouters(packagePath, name);
-                await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo});
+                if(canLoadMetadata('ClientJS')){
+                    this.core.loadClientScripts();
+                }
+                if(canLoadMetadata('Router')){
+                    const routersInfo = await this.loadPackageRouters(packagePath, name);
+                    await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo});
+                }
             }
             await this.broker.emit(`translations.object.change`, {});
             return;
@@ -178,6 +192,9 @@ module.exports = {
         },
         loadPackagePublicFiles: {
             handler(packagePath) {
+                if(!canLoadMetadata('PublicFolder')){
+                    return ;
+                }
                 if (!this.settings.packageInfo.loadPublicFolder) {
                     return;
                 }
@@ -189,7 +206,6 @@ module.exports = {
                 } catch (error) {
                     return
                 }
-
                 try {
                     const express = require('express');
                     this.settings.loadedPackagePublicFiles = true;
@@ -200,6 +216,7 @@ module.exports = {
                             routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
                         }
                         const cacheTime = 86400000 * 1; // one day
+                        // console.log(`static router`, routerPath, publicPath)
                         router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
                         // WebApp.connectHandlers.use(router);
                     } catch (error) {
@@ -254,7 +271,7 @@ module.exports = {
                     
                 }    
             }
-    
+            
             await this.loadPackageMetadataServices(_path);
     
             // await this.loadPackagePublicFiles(_path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.5.5",
+  "version": "2.6.1-beta.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,9 +10,9 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "2.5.5",
-    "@steedos/metadata-registrar": "2.5.5",
-    "@steedos/router": "2.5.5",
+    "@steedos/metadata-core": "2.6.1-beta.2",
+    "@steedos/metadata-registrar": "2.6.1-beta.2",
+    "@steedos/router": "2.6.1-beta.2",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f1e15b667da1e140e3003bf836d56cd6e36c79e3"
+  "gitHead": "9051772a001ba99aeaf026680ef171d508e92b8f"
 }