@steedos/service-package-loader 2.5.3-beta.21 → 2.5.3-beta.23

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, canLoadMetadata } = require('@steedos/metadata-registrar');
+const { registerMetadataConfigs, loadStandardMetadata, loadRouters } = require('@steedos/metadata-registrar');
 const loadFlowFile = new metaDataCore.LoadFlowFile();
 
 /**
@@ -106,9 +106,6 @@ 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];
@@ -131,12 +128,11 @@ module.exports = {
                 return;
             }
             const { path : _path } = packageInfo;
+
             this.loadPackagePublicFiles(_path);
             if(_path){
                 this.sendPackageFlowToDb(_path)
-                if(canLoadMetadata('Process')){
-                    processLoader.sendPackageProcessToDb(_path);
-                }
+                processLoader.sendPackageProcessToDb(_path);
             }
         },
         loadPackageMetadataFiles: async function (packagePath, name, datasourceName) {
@@ -146,27 +142,17 @@ module.exports = {
                 datasourceName = 'default';
             }
             if(this.objectql){
-                await loadStandardMetadata(name, datasourceName);
                 await this.initDataSource(packagePath, datasourceName);
+                await loadStandardMetadata(name, datasourceName);
             }
             await registerMetadataConfigs(packagePath, datasourceName, 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);
-            }
+            await triggerLoader.load(this.broker, packagePath, name);
+            await processTriggerLoader.load(this.broker, packagePath, name);
+            await triggerYmlLoader.load(this.broker, packagePath, name);
             if(this.core){
-                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});
-                }
+                this.core.loadClientScripts();
+                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;
@@ -192,9 +178,6 @@ module.exports = {
         },
         loadPackagePublicFiles: {
             handler(packagePath) {
-                if(!canLoadMetadata('PublicFolder')){
-                    return ;
-                }
                 if (!this.settings.packageInfo.loadPublicFolder) {
                     return;
                 }
@@ -206,6 +189,7 @@ module.exports = {
                 } catch (error) {
                     return
                 }
+
                 try {
                     const express = require('express');
                     this.settings.loadedPackagePublicFiles = true;
@@ -216,7 +200,6 @@ 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) {
@@ -271,7 +254,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.3-beta.21",
+  "version": "2.5.3-beta.23",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,9 +10,9 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "2.5.3-beta.21",
-    "@steedos/metadata-registrar": "2.5.3-beta.21",
-    "@steedos/router": "2.5.3-beta.21",
+    "@steedos/metadata-core": "2.5.3-beta.23",
+    "@steedos/metadata-registrar": "2.5.3-beta.23",
+    "@steedos/router": "2.5.3-beta.23",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b4313a2ef5d18ef1cf9271bd3c89b2d6fe52d65b"
+  "gitHead": "8fd9cf35d29f8f71e11790bd010bf5b045e7ebc4"
 }