@makano/rew 1.2.78 → 1.2.80

package/lib/rew/cli/helpers.js

@@ -2,6 +2,7 @@ const { CONFIG_PATH } = require("../const/config_path");
 const path = require('path');
 const fs = require('fs');
 const conf = require("../pkgs/conf");
+const { log } = require("./log");
 
 const binpath = path.join(conf({}).create('').root, '.bin');
 const logspath = path.join(conf({}).create('').root, '.logs');

package/lib/rew/const/opt.js

@@ -7,6 +7,7 @@ const execOptions = {
 	useImport: false,
 	cwdAlias: '$',
 	jsxPragma: '__using__.JSX.createElement',
+	jsxPragmaFrag: '__using__.JSX.Fragment',
 	jsx: false,
 	typescript: false,
 	decorators: false,

package/lib/rew/const/usage.js

@@ -1,9 +1,10 @@
 
 
 
+const JSX_FRAGMENT_SYMBOL = Symbol('fragment');
 module.exports.USING_DEFAULT = {
   JSX: {
-    param: (param) => ({ createElement: param }),
+    param: (param, fragment) => ({ createElement: param, Fragment: fragment || param(JSX_FRAGMENT_SYMBOL, { isFragment: true }), fragmentSymbol: JSX_FRAGMENT_SYMBOL }),
     use:  (options) => options.jsx = true
   },
   TYPES: {
@@ -53,6 +54,7 @@ class Namespace extends module.exports.Usage {
   constructor(ns, cb){
     super('namespace');
     if(ns instanceof Namespace.Group){
+      if(ns.onUse) this.onUse = ns.onUse;
       cb = ns.g[1]
       ns = ns.g[0]
     }

package/lib/rew/modules/compiler.js

@@ -20,6 +20,7 @@ function tokenizeCoffeeScript(code) {
 
   while (i < code.length) {
     const char = code[i];
+    const prevChar = code[i - 1];
     const nextChar = code[i + 1];
     const nextNextChar = code[i + 2];
 
@@ -56,7 +57,7 @@ function tokenizeCoffeeScript(code) {
       }
       string += char; // Include closing quote
       tokens.push({ type: 'STRING', value: string });
-    } else if (char === '/' && nextChar !== ' ' && nextChar !== '/' && nextChar !== '*') {
+    } else if (char === '/' && nextChar !== ' ' && nextChar !== '/' && nextChar !== '*' && prevChar !== '<') {
       // Regular expression
       let regex = char;
       i++;
@@ -235,6 +236,9 @@ function compileRewStuff(content, options) {
 				const { use } = USING_DEFAULT[next];
 				use?.(options);
 				nextToken.value = `"${nextToken.value}"`
+
+				const { token: nextNextToken } = gnextToken(i, 3, tokens) || {};
+				if(nextNextToken.value == "as") nextNextToken.value = ",";
 			}
 		}
 
@@ -350,6 +354,7 @@ function compileRewStuff(content, options) {
 		// 	token.value = '```'+token.value.slice(3).slice(0, -3).replace(/\#\{/g, '${')+'```';
 		// }
 
+		// process.stdout.write(token.value);
 		result += token.value;
 		if (hooks.length) {
 			hooks.forEach((hook, ind) => {
@@ -372,27 +377,31 @@ function compileRewStuff(content, options) {
     }
 	}
 
+	// console.log(result);
+
 	return result;
 }
 
 const compileCivetStuff = (file, options) => {
+	const preCompileOptions = {
+		filename: file.path,
+		...options
+	};
+	const prepared = compileRewStuff(file.content, preCompileOptions);
+
 	const compileOptions = {
-		...options,
+		...preCompileOptions,
 		bare: true,
 		filename: file.path,
 		inlineMap: false,
 		js: true
 	};
 
-	const prepared = compileRewStuff(file.content, {
-		filename: file.path,
-		...options
-	});
 	let compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
 
 	return {
 		compiled,
-		options
+		options: preCompileOptions
 	};
 }
 
@@ -410,7 +419,7 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 
 	const babelify = (code, options) => babel.transformSync(code, {
 		presets: [
-			...(doJSX ? [[babelReact, { pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
+			...(doJSX ? [[babelReact, { pragmaFrag: options.jsxPragmaFrag || execOptions.jsxPragmaFrag, pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
 		],
 		plugins: [
 			...(doDecorators ? [[require('@babel/plugin-proposal-decorators'), { version: '2023-05' }], [require('@babel/plugin-proposal-class-properties'), { loose: true }], [require('@babel/plugin-transform-class-static-block'), {}]] : [])

package/lib/rew/modules/context.js

@@ -21,6 +21,7 @@ module.exports.prepareContext = function (
   runPath = () => {},
 ) {
   if (mainFile == "") mainFile = filepath;
+  /** @type {Record<string, any>} */
   let context = {
     module: {
       exports: null,
@@ -126,6 +127,7 @@ module.exports.prepareContext = function (
       childContext.currentNamespace = name.namespace;
       childContext.parentNamespace = context;
       const code = `(${trigger.toString()})()`;
+      if(name.onUse) name.onUse();
       runtime.exec(code, childContext, code, context.module.filepath);
     } else if(name instanceof Usage) {
       const v = name.trigger(...params) || true;

package/lib/rew/pkgs/web.js

@@ -102,6 +102,11 @@ function createTextNode(text) {
 class ElementTypeNode extends nodeType('element') { };
 class ElementNode extends node(ElementTypeNode) { };
 function createElement(type, props, ...children) {
+
+  if(typeof type == "symbol" && props.isFragment){
+    return 'div';
+  }
+
   const flattenChildren = (childrenArray) =>
     childrenArray.flatMap(child => Array.isArray(child) ? flattenChildren(child) : child).map(child => {
       if (typeof child !== 'object') return createTextNode(child.toString());

package/package.json

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