5htp 0.6.2-8 → 0.6.2-95

package/compiler/common/babel/routes/routes.ts

@@ -290,7 +290,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         }
         
         // Differenciate back / front
-        if (relativeFileName.startsWith('/client/pages') || relativeFileName.startsWith('/client/components')) {
+        if (relativeFileName.startsWith('/client/pages') || relativeFileName.startsWith('/client/components') || relativeFileName.startsWith('/client/hooks')) {
             file.side = 'front';
         } else if (relativeFileName.startsWith('/server/routes')) {
             file.side = 'back';

package/compiler/index.ts

@@ -34,7 +34,7 @@ type TRegisteredService = {
     id?: string,
     name: string,
     className: string,
-    instanciation: (parentRef: string) => string,
+    instanciation: (parentRef?: string) => string,
     priority: number,
 }
 
@@ -198,7 +198,7 @@ export default class Compiler {
                 const refTo = serviceConfig.refTo;
                 return {
                     name: serviceName,
-                    instanciation: (parentRef: string) => `this.${refTo}`,
+                    instanciation: () => `this.${refTo}`,
                     priority: 0
                 }
             }
@@ -228,7 +228,7 @@ export default class Compiler {
 
                     // 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'
+                        propsStr += `${key}:`+ refService(key, value, level + 1).instanciation() + ',\n'
                     
                     // Recursion
                     else if (level <= 4 && !Array.isArray(value))
@@ -244,10 +244,10 @@ export default class Compiler {
             const config = processConfig(serviceConfig.config || {});
 
             // Generate the service instance
-            const instanciation = (parentRef: string) => 
+            const instanciation = (parentRef?: string) => 
                 `new ${serviceMetas.name}( 
-                    ${parentRef}, 
-                    (instance: ${serviceMetas.name}) => (${config}),
+                    ${parentRef ? `${parentRef},` : ''}
+                    ${config},
                     this 
                 )`
 
@@ -353,7 +353,7 @@ export default class ${appClassIdentifier} extends Application {
 
     // Makke sure the services typigs are reflecting the config and referring to the app
     ${sortedServices.map(service => 
-        `public ${service.name}!: ReturnType<CrossPath["registered"]["${service.id}"]["start"]>;`
+        `public ${service.name}!: ReturnType<${appClassIdentifier}["registered"]["${service.id}"]["start"]>;`
     ).join('\n')}
 
     protected registered = {

package/package.json

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