@makano/rew 1.2.54 → 1.2.56

package/lib/rew/functions/export.js

@@ -10,7 +10,7 @@ function exportsThe(item, name, context) {
 
 module.exports.pubFunction = function (context) {
 	return function (name, item) {
-		if (name && !item) {
+		if (name && item == null) {
 			item = name;
 			name = null;
 		}

package/lib/rew/functions/import.js

@@ -8,7 +8,9 @@ const jsYaml = require('js-yaml');
 const { execOptions } = require('../const/opt');
 
 const cachedFiles = [];
-
+module.exports.cleanCache = () => {
+	while(cachedFiles.length) cachedFiles.pop();
+};
 const lookUpInOtherApps = (fullPath) => {
 	const con = conf({});
 	const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;

package/lib/rew/pkgs/serve.js

@@ -4,6 +4,7 @@ const { IttyRouter, AutoRouter, Router, createResponse, cors, error, StatusError
 const path = require('path');
 const { run } = require('../main');
 const { runPath } = require('../modules/runtime');
+const { cleanCache } = require('../functions/import');
 module.exports = (context) => {
 
   // http.createServer((req, res) => {
@@ -137,20 +138,24 @@ module.exports = (context) => {
   `;
   
   const defaultSsrBundlerEntry = (file, layouts, data) => `
-  files = "${layouts.join(',')},${file}".split(',')
+  files = "${layouts.length ? layouts.join(',')+',' : ''}${file}".split(',')
 
   renderers = []
+  staticRendering = false
 
   for key, file of files
     renderers.push imp file
+  
+  staticRendering = true if renderers[renderers.length-1].staticRendering
 
-  render = (data) -> 
-    page = renderers.pop().render(data)
+  render = (req, data) -> 
+    target = renderers.pop()
+    page = target.render req, data
     for renderer in renderers
-      page = renderer.render data, page
+      page = renderer.render req, data, page
     page
 
-  exports { render }
+  exports { render, staticRendering }
   `;
 
   function createFileRouter({
@@ -163,7 +168,7 @@ module.exports = (context) => {
     ssrBundlerEntry = defaultSsrBundlerEntry,
   }) {
   
-    const lookUpFiles = ['route', 'page', 'page.s', 'page.ss'];
+    const lookUpFiles = ['route', 'page', 'page.s'];
 
     const params = {};
   
@@ -215,14 +220,30 @@ module.exports = (context) => {
 
     async function renderPage(file, basename, req){
       const page = w.create({ viewportMeta: true });
-      if(basename.endsWith('.s') || basename.endsWith('.ss')){
+      let staticRendering = false;
+      if(basename.endsWith('.s')){
         // SSR is enabled, do only ssr
         const layouts = findLayoutFiles(file, root, false);
         const fileContext = runPath(file, { code: ssrBundlerEntry(file, layouts) }).context.module.exports || {};
         if(typeof fileContext.render !== "function") throw new ReferenceError("Route does not export function render");
-        let pageContent = fileContext.render(req);
+        let pageContent = fileContext.render(req, { page, ...getReqProps(req) });
+        if(fileContext.staticRendering) staticRendering = true;
         if(!w.isNode(pageContent)) throw new TypeError("Route.render does not return an element");
-        page.add(pageContent);
+        if(pageContent?.type?.element == 'head'){
+          page.root.props.children.splice(page.root.props.children.indexOf(page.head), 1);
+          page.head = pageContent;
+          page.root.add(pageContent);
+        } else if(pageContent?.type?.element == 'body'){
+          page.root.props.children.splice(page.root.props.children.indexOf(page.body), 1);
+          page.body = pageContent;
+          page.root.add(pageContent);
+        } else if(pageContent?.type?.element == 'html'){
+          page.root = pageContent;
+          page.body = pageContent.find('body');
+          page.head = pageContent.find('head');
+        } else {
+          page.add(pageContent);
+        }
       } else {
         const layouts = findLayoutFiles(file, root, true);
         const scriptString = await w.bundle(path.join(root, 'bundle.js'), {
@@ -230,8 +251,9 @@ module.exports = (context) => {
           code: bundlerEntry(file, layouts, getReqProps(req))
         });
         page.script(scriptString);
+        staticRendering = true;
       }
-      return html(page.render(basename.endsWith('.ss')));
+      return html(page.render(staticRendering));
     }
   
     async function handleRequest(req, file) {
@@ -257,6 +279,7 @@ module.exports = (context) => {
       const url = new URL(req.url);
       const pathname = basePath ? url.pathname.replace(new RegExp('^'+basePath), '') : url.pathname;
       const file = lookUp(pathname);
+      cleanCache();
   
       if (file) {
         const response = handleRequest(req, file);

package/lib/rew/pkgs/web.js

@@ -165,8 +165,8 @@ function addChildren(nest, child) {
 }
 
 function findChild(nest, prop, value, recurse = false) {
-  let child = nest.props.children.find(element => value ? element.props[prop] == value : element.type.element == prop);
-  if (recurse && !child) return nest.props.children.find(element => findChild(element, prop, value, recurse));
+  let child = nest.props.children.find(element => element instanceof State ? false : value ? element.props[prop] == value : element.type.element == prop);
+  if (recurse && !child) return nest.props.children.find(element => element instanceof State ? false : findChild(element, prop, value, recurse));
   return child;
 }
 
@@ -210,7 +210,7 @@ function renderToString(element, js = false) {
     return renderToString(type(props))
   }
 
-  const children = props?.children || []
+  const children = element instanceof TextNode ? [] : props?.children || []
   const childrenParsed = Array.isArray(children) ? children.map((c) => renderToString(c, js ? 'raw' : false)) : renderToString(children, js ? 'raw' : false)
   const childrenHTML = Array.isArray(childrenParsed) ? childrenParsed.join('') : childrenParsed;
 
@@ -256,11 +256,20 @@ class Page extends Node {
     return this.body.add(...children);
   }
   script(scriptString) {
-    if (typeof scriptString == "object" && scriptString.scr)
+    if (typeof scriptString == "object" && scriptString.src)
       return this.add(createElement('script', { src: scriptString.src }));
     else
       return this.add(createElement('script', null, createTextNode(scriptString)));
   }
+  style(styleString) {
+    if (typeof styleString == "object" && styleString.href)
+      return this.head.add(createElement('link', { href: styleString.href, rel: 'stylesheet' }));
+    else
+      return this.head.add(createElement('style', null, createTextNode(styleString)));
+  }
+  link(rel, href){
+    return this.head.add(createElement('link', { href, rel }));
+  }
   serializeState() {
     const states = {};
     function extractStates(node) {
@@ -285,6 +294,19 @@ class Page extends Node {
     const emitter = ${emitter}
     ${State}
     const states = [];
+
+    function setAttribute(el, key, value){
+      let defVal = value;
+      if(key == 'style'){
+        for(let i in value){
+          const v = value[i];
+          el.style.setProperty(i, value[i]);
+        }
+        return;
+      }
+      el.setAttribute(key, defVal);
+    }
+
     function rehydrate() {
       const initialState = __INITIAL_STATE__;
       
@@ -306,8 +328,8 @@ class Page extends Node {
           Object.keys(node.props).forEach(key => {
             if (key !== 'children') {
               if(key in nodeState){
-                elt.setAttribute(key, getState(nodeState[key].id)?.value ?? nodeState[key]._value);
-              } else elt.setAttribute(key, node.props[key]);
+                setAttribute(elt, key, getState(nodeState[key].id)?.value ?? nodeState[key]._value);
+              } else setAttribute(elt, key, node.props[key]);
             }
           });
           if('data-only-if' in node.props){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.54",
+  "version": "1.2.56",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {