5htp 0.5.9-2 → 0.5.9-4

package/app/index.ts

@@ -24,11 +24,13 @@ type TServiceSetup = {
     id: string,
     name: string,
     config: {},
-    subservices: TServiceSubservices
+    subservices: TServiceSubservices,
+    type: 'service.setup'
 }
 
 type TServiceRef = {
-    refTo: string
+    refTo: string,
+    type: 'service.ref'
 }
 
 type TServiceSubservices = {
@@ -134,6 +136,7 @@ export class App {
 
         return {
             refTo: referenceName,
+            type: 'service.ref'
         }
     }
 
@@ -141,21 +144,19 @@ export class App {
         // { user: app.setup('Core/User') }
         servicePath: string,
         serviceConfig?: {},
-        serviceSubservices?: TServiceSubservices
     ] | [
         // app.setup('User', 'Core/User')
         serviceName: string, 
         servicePath: string,
         serviceConfig?: {},
-        serviceSubservices?: TServiceSubservices
     ]): TServiceSetup {
 
         // Registration to app root
         if (typeof args[1] === 'string') {
             
-            const [name, id, config, subservices] = args;
+            const [name, id, config] = args;
 
-            const service = { id, name, config, subservices } as TServiceSetup
+            const service = { id, name, config, type: 'service.setup' } as TServiceSetup
 
             this.registered[name] = service;
 
@@ -164,9 +165,9 @@ export class App {
         // Scoped to a parent service
         } else {
 
-            const [id, config, subservices] = args;
+            const [id, config] = args;
 
-            const service = { id, config, subservices } as TServiceSetup
+            const service = { id, config, type: 'service.setup' } as TServiceSetup
 
             return service;
         }
@@ -181,27 +182,6 @@ export class App {
             console.log("Loading config file:", configFile);
             require( path.resolve(configDir, configFile) );
         }
-
-        // Wait 2 seconds
-        await new Promise(resolve => setTimeout(resolve, 1000));
-
-        // Load subservices
-        // for (const serviceName in this.registered) {
-        //     const service = this.registered[serviceName];
-
-        //     const subservices = {}
-        //     if (service.subservices) {
-        //         const list = service.subservices( this.registered );
-        //         for (const subservice of list) {
-
-        //             subservices[subservice.name] = list[];
-                    
-        //         }
-        //     }
-        //     service.subservices = subservices;
-        // }
-
-        // console.log("SERVICES", this.registered);
     }
 }
 

package/compiler/index.ts

@@ -34,7 +34,6 @@ type TRegisteredService = {
     name: string,
     instanciation: (parentRef: string) => string,
     priority: number,
-    subservices?: string[]
 }
 
 /*----------------------------------
@@ -216,31 +215,37 @@ export default class Compiler {
             if (serviceConfig.name !== undefined)
                 referencedNames[serviceConfig.id] = serviceConfig.name;
 
-            // Subservices
-            let subservices: string = '';
-            let sortedSubservices: TRegisteredService[] = [];
-            if (serviceConfig.subservices) {
+            const processConfig = (config: any, level: number = 0) => {
 
-                const subservicesList = serviceConfig.subservices;
-                const subservicesCode = Object.entries(subservicesList).map(([name, service]) => 
-                    refService(name, service, level + 1) 
-                );
+                let propsStr = '';
+                for (const key in config) {
+                    const value = config[key];
+
+                    if (!value || typeof value !== 'object')
+                        propsStr += `"${key}":${serialize(value, { space: 4 })},\n`;
+
+                    // Reference to a service
+                    else if (value.type === 'service.setup' || value.type === 'service.ref') // TODO: more reliable way to detect a service reference
+                        propsStr += `${key}:`+ refService(key, value, level + 1).instanciation('instance') + ',\n'
+                    
+                    // Recursion
+                    else if (level <= 4 && !Array.isArray(value))
+                        propsStr += `"${key}":` + processConfig(value, level + 1) + ',\n';
 
-                // Sort by priority
-                sortedSubservices = subservicesCode.sort((a, b) => a.priority - b.priority);
+                    else
+                        propsStr += `"${key}":${serialize(value, { space: 4 })},\n`;
+
+                }
 
-                // Generate code
-                subservices = sortedSubservices.map(s => `${s.name}: ${s.instanciation('instance')},`).join('\n');
+                return `{ ${propsStr} }`;
             }
+            const config = processConfig(serviceConfig.config || {});
 
             // Generate the service instance
             const instanciation = (parentRef: string) => 
                 `new ${serviceMetas.name}( 
                     ${parentRef}, 
-                    ${serialize(serviceConfig.config || {}) || '{}'}, 
-                    (instance: ${serviceMetas.name}) => ({
-                        ${subservices}
-                    }), 
+                    (instance: ${serviceMetas.name}) => (${config}),
                     this 
                 )`
 
@@ -249,7 +254,6 @@ export default class Compiler {
                 name: serviceName,
                 instanciation,
                 priority: serviceConfig.config?.priority || serviceMetas.priority || 0,
-                subservices: sortedSubservices
             };
         }
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.5.9-2",
+	"version": "0.5.9-4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",