5htp 0.4.6 → 0.5.9-2

package/{src/compiler → compiler}/common/babel/routes/routes.ts

@@ -39,17 +39,24 @@ module.exports = (options: TOptions) => (
     [Plugin, options]
 )
 
+const clientServices = ['Router'];
+// Others will be called via app.<Service> (backend) or api.post(<path>, <params>) (frontend)
+
+const routerMethods = ['get', 'post', 'put', 'delete', 'patch'];
+
 /*----------------------------------
 - PLUGIN
 ----------------------------------*/
 function Plugin(babel, { app, side, debug }: TOptions) {
 
+    //debug = true;
+
     const t = babel.types as typeof types;
 
     /*
         - Wrap route.get(...) with (app: Application) => { }
         - Inject chunk ID into client route options
-        - Transform aoi.fetch:
+        - Transform api.fetch:
         
         Input:
         const { stats } = api.fetch({
@@ -78,7 +85,8 @@ function Plugin(babel, { app, side, debug }: TOptions) {
             // Replace by:      nothing
             ImportDeclaration(path) {
                 
-                if (!this.file.process)
+                const shouldTransformImports = this.file.process;
+                if (!shouldTransformImports)
                     return;
                 
                 if (path.node.source.value !== '@app')
@@ -92,7 +100,12 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                     if (specifier.imported.type !== 'Identifier')
                         continue;
 
-                    this.file.importedServices[ specifier.local.name ] = specifier.imported.name;
+                    const serviceName = specifier.imported.name;
+
+                    if (clientServices.includes(serviceName))
+                        this.file.importedServices[ specifier.local.name ] = serviceName;
+                    else
+                        this.file.importedServices[ specifier.local.name ] = 'app';
                 }
 
                 // Remove this import
@@ -100,9 +113,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
 
             },
 
-            // Find Router definitions
-            // Test:            Router.xxx()
-            // Replace by:      nothing
+            // Transform services service calls
             CallExpression(path) {
 
                 if (!this.file.process)
@@ -112,36 +123,121 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                 const callee = path.node.callee
                 if (!(
                     callee.type === 'MemberExpression'
-                    &&
-                    callee.object.type === 'Identifier'
-                    &&
-                    callee.property.type === 'Identifier'
-                    &&
-                    // Should be at the root of the document
-                    path.parent.type === 'ExpressionStatement'
-                    &&
-                    path.parentPath.parent.type === 'Program'
-                    // And make reference to a service
-                    &&
-                    (callee.object.name in this.file.importedServices)
                 ))
                     return;
 
-                const routeDef: TRouteDefinition = {
-                    definition: path.node,
-                    dataFetchers: []
-                }
+                // Create full path
+                const completePath: string[] = [];
+                let currCallee: types.MemberExpression = callee;
+                while (1) {
 
-                // Adjust
-                if (this.file.side === 'front') {
-                    transformDataFetchers(path, this, routeDef);
+                    if (currCallee.property.type === 'Identifier')
+                        completePath.unshift(currCallee.property.name);
+
+                    if (currCallee.object.type === 'MemberExpression')
+                        currCallee = currCallee.object;
+                    else {
+
+                        if (currCallee.object.type === 'Identifier')
+                            completePath.unshift(currCallee.object.name);
+
+                        break;
+                    }
                 }
+
+                // If we actually call a service
+                const serviceName = completePath[0];
+
+                /*
+                    Router.page: wrap with export const __register = ({ Router }) => Router.page(...)
+                */
+                if (
+                    serviceName === 'Router' 
+                    && 
+                    callee.property.type === 'Identifier' 
+                    && 
+                    ['page', 'error', ...routerMethods].includes(callee.property.name)
+                ) {
+
+                    // Should be at the root of the document
+                    if (!(
+                        path.parent.type === 'ExpressionStatement'
+                        &&
+                        path.parentPath.parent.type === 'Program'
+                    ))
+                        return;
+
+                    const routeDef: TRouteDefinition = {
+                        definition: path.node,
+                        dataFetchers: []
+                    }
+
+                    // Adjust
+                    if (this.file.side === 'front') {
+                        transformDataFetchers(path, this, routeDef);
+                    }
+                        
+                    // Add to the list of route definitons to wrap
+                    this.file.routeDefinitions.push(routeDef);
+
+                    // Delete the route def since it will be replaced by a wrapper
+                    path.replaceWithMultiple([]);
+
+                /* [client] Backend Service calls: Transform to api.post( <method path>, <params> )
+
+                    Events.Create( form.data ).then(res => toast.success(res.message))
+                    =>
+                    api.post( '/api/events/create', form.data ).then(res => toast.success(res.message))
+                */
+                } else if (this.file.side === 'front') {
                     
-                // Add to the list of route definitons to wrap
-                this.file.routeDefinitions.push(routeDef);
+                    const isAService = (
+                        serviceName in this.file.importedServices
+                        &&
+                        serviceName[0] === serviceName[0].toUpperCase()
+                    );
+                    if(!isAService)
+                        return;
+
+                    if (side === 'client') {
 
-                // Delete the route def since it will be replaced by a wrapper
-                path.replaceWithMultiple([]);
+                        // Get complete call path
+                        const apiPath = '/api/' + completePath.join('/');
+                        
+                        // Replace by api.post( <method path>, <params> )
+                        const apiPostArgs: types.CallExpression["arguments"] = [t.stringLiteral(apiPath)];
+                        if (path.node.arguments.length === 1)
+                            apiPostArgs.push( path.node.arguments[0] );
+
+                        path.replaceWith(
+                            t.callExpression(
+                                t.memberExpression(
+                                    t.identifier('api'), t.identifier('post')
+                                ), apiPostArgs
+                            )
+                        )
+                    } else {
+
+                        // Rebuild member expression from completePath, adding a api prefix
+                        let newCallee = t.memberExpression(
+                            t.identifier('app'),
+                            t.identifier(completePath[0])
+                        );
+                        for (let i = 1; i < completePath.length; i++) {
+                            newCallee = t.memberExpression(
+                                newCallee,
+                                t.identifier(completePath[i])
+                            );
+                        }
+                        
+                        // Replace by app.<service>.<method>(...)
+                        path.replaceWith(
+                            t.callExpression(
+                                newCallee, [...path.node.arguments]
+                            )
+                        )
+                    }
+                }
                
             },
             Program: {
@@ -153,7 +249,6 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                     const wrappedrouteDefs = wrapRouteDefs( this.file );
                     if (wrappedrouteDefs)
                         path.pushContainer('body', [wrappedrouteDefs])
-                    
                 }
             }
         }
@@ -175,8 +270,8 @@ function Plugin(babel, { app, side, debug }: TOptions) {
             relativeFileName = filename.substring( cli.paths.appRoot.length );
         if (filename.startsWith( cli.paths.coreRoot ))
             relativeFileName = filename.substring( cli.paths.coreRoot.length );
-        if (filename.startsWith('/node_modules/5htp-core/'))
-            relativeFileName = filename.substring( '/node_modules/5htp-core/'.length );
+        /*if (filename.startsWith('/node_modules/5htp-core/'))
+            relativeFileName = filename.substring( '/node_modules/5htp-core/'.length );*/
         
         // The file isn't a route definition
         if (relativeFileName === undefined) {
@@ -185,9 +280,9 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         }
         
         // Differenciate back / front
-        if (relativeFileName.startsWith('/src/client/pages')) {
+        if (relativeFileName.startsWith('/client/pages')) {
             file.side = 'front';
-        } else if (relativeFileName.startsWith('/src/server/routes')) {
+        } else if (relativeFileName.startsWith('/server/routes')) {
             file.side = 'back';
         } else 
             file.process = false;
@@ -201,12 +296,13 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         routeDef: TRouteDefinition 
     ) {
         path.traverse({
+            // api.load => move data fetchers to route.options.data
+            // So the router is able to load data before rendering the component
             CallExpression(path) {
 
                 const callee = path.node.callee
 
-                // api.load => move data fetchers to route.options.data
-                // So the router is able to load data before rendering the component
+                // Detect api.fetch
                 if (!(
                     callee.type === 'MemberExpression'
                     &&
@@ -220,11 +316,23 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                 ))
                     return;
 
+                /*  Reference data fetchers
+                    {
+                        stats: api.get(...)
+                    }
+                */
                 routeDef.dataFetchers.push(
                     ...path.node.arguments[0].properties
                 );
 
-                // Delete routerDefContext node
+                /*  Replace the: 
+                        const { stats } = api.fetch({
+                            stats: api.get(...)
+                        })
+
+                    by:
+                        const { stats } = context.data.stats;
+                */
                 path.replaceWith(
                     t.memberExpression(
                         t.identifier( routeDef.contextName || 'context' ),
@@ -235,7 +343,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         }, routerDefContext);
     }
 
-    function injectOptions( 
+    function enrichRouteOptions( 
         routeDef: TRouteDefinition,
         routeArgs: types.CallExpression["arguments"],
         filename: string
@@ -251,7 +359,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
 
         // Generate page chunk id
         const { filepath, chunkId } = cli.paths.getPageChunk(app, filename);
-        debug && console.log(`[routes]`, filename, '=>', chunkId);
+        debug && console.log(`[routes]`, filename.replace(cli.paths.appRoot + '/client/pages', ''));
 
         // Create new options to add in route.options
         const newProperties = [
@@ -361,12 +469,14 @@ function Plugin(babel, { app, side, debug }: TOptions) {
         if (importedServicesList.length === 0)
             return;
 
-        let exportValue: types.Expression | types.BlockStatement;
+        const definitions: types.BlockStatement["body"] = [];
         if (file.side === 'front') {
 
             // Limit to one route def per file
             const routesDefCount = file.routeDefinitions.length;
-            if (routesDefCount !== 1)
+            if (routesDefCount === 0)
+                return;
+            else if (routesDefCount > 1)
                 throw new Error(`Frontend route definition files (/client/pages/**/**.ts) can contain only one route definition. 
                     ${routesDefCount} were given in ${file.path}.`);
 
@@ -379,7 +489,7 @@ function Plugin(babel, { app, side, debug }: TOptions) {
             if (callee.object.name === 'Router') {
 
                 // Inject chunk id in options (2nd arg)
-                const newRouteArgs = injectOptions(routeDef, routeArgs, file.path);
+                const newRouteArgs = enrichRouteOptions(routeDef, routeArgs, file.path);
                 if (newRouteArgs === 'ALREADY_PROCESSED')
                     return;
 
@@ -388,47 +498,85 @@ function Plugin(babel, { app, side, debug }: TOptions) {
 
             // Force babel to create new fresh nodes
             // If we directy use statementParent, it will not be included in the final compiler code
-            exportValue = t.callExpression(
-                t.memberExpression(
-                    t.identifier( callee.object.name ),
-                    callee.property,
-                ),
-                [routePath, ...routeArgs]
+            definitions.push( 
+                t.returnStatement(
+                t.callExpression(
+                    t.memberExpression(
+                        t.identifier( callee.object.name ),
+                            callee.property,
+                        ),
+                        [routePath, ...routeArgs]
+                    )
+                )
             )
 
         } else {
 
-            exportValue = t.blockStatement([
+            definitions.push(
                 // Without spread = react jxx need additionnal loader
                 ...file.routeDefinitions.map( def => 
                     t.expressionStatement(def.definition)
                 ),
-            ])
+            )
         }
 
-        const exportDeclaration = t.exportNamedDeclaration( 
-            t.variableDeclaration('const', [
-                t.variableDeclarator(
-                    t.identifier('__register'),
-                    t.arrowFunctionExpression(
-                        [
-                            t.objectPattern(
-                                importedServicesList.map(([ local, imported ]) => 
-                                    t.objectProperty(
-                                        t.identifier( local ),
-                                        t.identifier( imported ),
+        /*
+            ({ Router, app: { Events } }}) => {
+                ...
+            }
+        */
+            const appSpread: types.ObjectProperty[] = []
+            const servicesSpread: types.ObjectProperty[] = [
+                t.objectProperty(
+                    t.identifier('app'),
+                    t.identifier('app'),
+                )
+            ]
+            for (const [local, imported] of importedServicesList) {
+                if (imported === 'app') 
+                    appSpread.push(
+                        t.objectProperty(
+                            t.identifier(local),
+                            t.identifier(local),
+                        )
+                    )
+                else
+                    servicesSpread.push(
+                        t.objectProperty(
+                            t.identifier(local),
+                            t.identifier(imported),
+                        )
+                    )   
+            }
+            
+            // export const __register = ({ Router, app }) => { ... }
+            const exportDeclaration = t.exportNamedDeclaration( 
+                t.variableDeclaration('const', [
+                    t.variableDeclarator(
+                        t.identifier('__register'),
+                        t.arrowFunctionExpression(
+                            [
+                                t.objectPattern(servicesSpread)
+                            ], 
+                            t.blockStatement([
+                                // const { Events } = app;
+                                t.variableDeclaration('const', [
+                                    t.variableDeclarator(
+                                        t.objectPattern(appSpread),
+                                        t.identifier('app')
                                     )
-                                )
-                            )
-                        ], 
-                        exportValue
+                                ]),
+                                // Router.post(....)
+                                ...definitions,
+                            ])
+                        )
                     )
-                )
-            ])
-        );
+                ])
+            );
+                    
 
-        /*(file.side === 'front' && file.path.includes('/headhunter/talents/index.tsx')) 
-            && console.log( file.path, generate(exportDeclaration).code );*/
+        /*(file.path.includes('client/pages/convert/auth/login.tsx')) 
+        && console.log( file.path, generate(exportDeclaration).code );*/
 
         return exportDeclaration;
     }

package/{src/compiler → compiler}/common/files/style.ts

@@ -18,16 +18,16 @@ module.exports = (app: App, dev: Boolean, client: boolean) => {
 
         // Process external/third-party styles
         {
-            exclude: [/*process.env.framework + '/kernel', */app.paths.src],
+            exclude: [app.paths.root],
             loader: 'css-loader',
             options: {
                 sourceMap: dev
             },
         },
 
-        // Process internal/project styles (from src folder)
+        // Process internal/project styles (from root folder)
         {
-            include: [/*process.env.framework + '/kernel', */app.paths.src],
+            include: [app.paths.root],
             loader: 'css-loader',
             options: {
                 // CSS Loader https://github.com/webpack/css-loader

package/{src/compiler → compiler}/common/plugins/indexage/icones-svg/index.ts

@@ -38,10 +38,10 @@ export default class IconesSVG extends Indexeur {
         super();
 
         this.formats = ['woff2'];
-        this.dossierIcones = cli.paths.core.src + '/client/assets/icons/';
+        this.dossierIcones = cli.paths.core.root + '/client/assets/icons/';
         this.dossierSortie = app.paths.bin + '/public/'; 
         
-        this.cacheTypes = cli.paths.core.src + '/types/icons.d.ts';
+        this.cacheTypes = cli.paths.core.root + '/types/icons.d.ts';
         this.cacheIndex = this.dossierIcones + 'index.json';
 
         if (fs.existsSync(this.cacheIndex)) {