@makano/rew 1.3.5 → 1.3.7

package/lib/rew/modules/compiler.js

@@ -283,6 +283,40 @@ function useImp(token, options){
 	return '';
 }
 
+function mapTokensToStrings(tokens) {
+  const result = [];
+  let current = '';
+  let inBrackets = false;
+
+  tokens.forEach(token => {
+    if (token.type === 'OTHER' && token.value === '{') {
+      if (current) {
+        result.push(current.trim());
+        current = '';
+      }
+      inBrackets = true;
+      current += token.value + ' ';
+    } else if (token.type === 'OTHER' && token.value === '}') {
+      current += token.value;
+      result.push(current.trim());
+      current = '';
+      inBrackets = false;
+    } else if(token.type === 'OTHER' && token.value === ',' && !inBrackets){
+			return;
+		} else {
+      current += token.value;
+      if (!inBrackets) {
+        result.push(current.trim());
+        current = '';
+      } else {
+        current += ' ';
+      }
+    }
+  });
+
+  return result;
+}
+
 function updateAliases(aliases, o = execOptions._syntaxAliases){
 	for(let h in o){
 		for(let i in o[h]){
@@ -293,6 +327,17 @@ function updateAliases(aliases, o = execOptions._syntaxAliases){
 	return aliases;
 }
 
+function insertAt(array, index, ...values) {
+  if (index > array.length) {
+    index = array.length;
+  } else if (index < 0) {
+    index = 0;
+  }
+  array.splice(index, 0, ...values);
+
+  return array;
+}
+
 function compileRewStuff(content, options) {
 	straceLog('TOKENIZE() for CURRENTFILE');
 	const tokens = tokenizeCoffeeScript(content);
@@ -318,7 +363,7 @@ function compileRewStuff(content, options) {
     if ((token.type === "COMMENT" && multilineDeclare) || (token.type !== "COMMENT" && multilineDeclare)) {
       if(token.type === "COMMENT"){
 				multilineDeclareBuffer.push(token.value.startsWith('###') ? token.value.slice(3) : token.value.slice(1));
-				if (token.value.includes(';')) {
+				if (token.value.trim().endsWith(';')) {
 					multilineDeclare = false;
 					const combinedDeclaration = multilineDeclareBuffer.join('\n');
 					declareAlias(aliases, { ...token, value: combinedDeclaration });
@@ -454,6 +499,27 @@ function compileRewStuff(content, options) {
 				if(useImp(nextToken, options)) updateAliases(aliases);
 				result += `inc ${nextToken.value}`;
 				i += n;
+			} else if (nextToken.type === 'OTHER' && nextToken.value == "(") {
+				const closingBraceToken = fnextToken(ind, tokens, 'OTHER', ')');
+				let lastindex = ind;
+				if (closingBraceToken) {
+					const namesTokens = tokens.slice(ind, closingBraceToken.ti);
+					const next = gnextToken(closingBraceToken.ti, 1, tokens);
+					let exports = [];
+					if(next?.token?.value == 'as'){
+						const ebraceOpen = gnextToken(next.token.ti, 1, tokens);
+						const ebraceClose = fnextToken(ebraceOpen.ti, tokens, 'OTHER', ')');
+						const exportsTokens = tokens.slice(ebraceOpen.ti+1, ebraceClose.ti);
+						exports = mapTokensToStrings(exportsTokens.filter(token => token.type !== 'WHITESPACE'));
+						lastindex = ebraceClose.ti;
+					} else lastindex = closingBraceToken.ti;
+					const statements = namesTokens.filter(token => token.type !== 'WHITESPACE').map((token, index) => {
+						return tokenizeCoffeeScript(`\nimport `+ (exports[index] ? `${exports[index].startsWith('@') ? '* as '+ exports[index].slice(1) : exports[index]} from ${token.value};` : `${token.value}`))
+					});
+					i = lastindex+1;
+					insertAt(tokens, i, ...statements.flat());
+					continue;
+				}
 			} else if (nextToken.value === '{') {
 				const closingBraceToken = fnextToken(ind, tokens, 'OTHER', '}');
 				const nameToken = fnextToken(ind, tokens, 'STRING');
@@ -617,7 +683,8 @@ function compileRewStuff(content, options) {
 		options.aliases = aliases;
 	}
 	// console.log(aliases);
-	// console.log(result);
+	console.log(result);
+	return "";
 	return result;
 }
 

package/lib/rew/pkgs/styleway.js

@@ -0,0 +1,88 @@
+
+module.exports = () => ((styles) => {
+  let css = "";
+  const variables = {};
+  const mixins = {};
+
+  const parseValue = (v, self, name, vars) => {
+    const vs = {...variables, ...vars, name, ...Object.fromEntries(Object.entries(self).map(i => ['prop_'+i[0], i[1]]))};
+    return v.startsWith('@v') ? vs[v.split('@v')[1].trim()] : v
+  .toString()
+  .replace(/\$([A-Za-z0-9-_]+)/g, (_, name) => (vs)[name])
+  }
+
+  const declectProp = (value, name, selector, start, parent, self, vars = {}) => {
+    let prop = `${name}: `;
+    self.__parent = parent;
+    if (typeof value == 'object') {
+      prop += parseValue(value.default || 'unset', self, name, vars) + ';';
+      prop += '}\n';
+      for (let state in value) {
+        if (state == 'default') continue;
+        else if (state.startsWith('@media')) {
+          prop += `${state} { ${start} ${name}: ${parseValue(value[state], self, name, vars)}; } }\n`
+        } else if (state.startsWith(':')) {
+          prop += `${selector}${state} { ${name}: ${parseValue(value[state], self, name, vars)}; }\n`
+        }
+      }
+      prop += start;
+    } else {
+      let v = parseValue(value, self, name, vars);
+      if(typeof v == 'object') return declectProp(v, name, selector, start, parent, self, vars);
+      prop += v + ';';
+    }
+    return prop;
+  }
+
+  const declectNames = (names, $name, parent, values = {}) => {
+    const start = $name ? $name + ' {' : '';
+    let nameStyles = start;
+    for (let name in names) {
+      let selector = name.replace(/,/g, ', &').replace(/&/g, $name || '');
+      if (name == '@variables') {
+        for (let i in names[name]) {
+          variables[i] = names[name][i];
+        }
+      } else if (name.startsWith('@mixin')) {
+        const mame = name.split('@mixin')[1].trim();
+        const mname = mame.split('(')[0];
+        const args = mame.replace(mname, '').slice(1, -1);
+        mixins[mname] = {
+          args: args.split(','),
+          value: names[name]
+        }
+      } else if (name.startsWith('@keyframes')) {
+        nameStyles += $name ? '' : name + '{';
+
+        for(let keyFrame in names[name]){
+          nameStyles += declectNames(names[name][keyFrame], keyFrame, names[name], values);
+        }
+
+        if(!$name) nameStyles += '}\n';
+      } else if ($name) {
+        if (name.startsWith('&')) {
+          nameStyles += '}\n';
+          nameStyles += declectNames(names[name], selector, names, values);
+          nameStyles += start;
+        } else if(name.startsWith('@include')) {
+          const mame = names[name];
+          const mname = mame.split('(')[0];
+          const args = mame.replace(mname, '').slice(1, -1).split(',');
+          if(mixins[mname]){
+            nameStyles += declectNames(mixins[mname].value, selector, names, {...values, ...Object.fromEntries(mixins[mname].args.map((n, i) => [n, args[i]]))}).trim().replace('@include ', '').slice(1, -1);
+          }
+        } else {
+          nameStyles += declectProp(names[name], name, $name, start, parent || styles, names, values);
+        }
+      } else {
+        nameStyles += declectNames(names[name], selector, names, values);
+      }
+    }
+    if ($name) nameStyles += '}\n';
+    return nameStyles;
+  }
+
+  css += declectNames(styles);
+
+  return css.replace(/(.+) \{\}/g, '');
+})

package/lib/rew/pkgs/web.js

@@ -4,7 +4,7 @@ const { compile } = require("../modules/compiler");
 const { wait } = require("../functions/wait");
 const { generateRandomID } = require("../functions/id");
 const { REW_FILE_TYPE } = require("../const/ext");
-
+const createStyles = require('./styleway')();
 
 const selfClosingElements = new Set([
   'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'source', 'track', 'wbr'
@@ -245,94 +245,6 @@ function renderToString(element, js = false) {
   return js ? js === 'raw' ? eltJSON : JSON.stringify(eltJSON) : element instanceof TextNode ? `${type.text}` : `<${type.element}${propsString}>${selfClosingElements.has(type.element) ? '' : childrenHTML}${selfClosingElements.has(type.element) ? '' : `</${type.element}>`}`;
 }
 
-function createStyles(styles) {
-  let css = "";
-  const variables = {};
-  const mixins = {};
-
-  const parseValue = (v, self, name, vars) => {
-    const vs = {...variables, ...vars, name, ...Object.fromEntries(Object.entries(self).map(i => ['prop_'+i[0], i[1]]))};
-    return v.startsWith('@v') ? vs[v.split('@v')[1].trim()] : v
-  .toString()
-  .replace(/\$([A-Za-z0-9-_]+)/g, (_, name) => (vs)[name])
-  }
-
-  const declectProp = (value, name, selector, start, parent, self, vars = {}) => {
-    let prop = `${name}: `;
-    self.__parent = parent;
-    if (typeof value == 'object') {
-      prop += parseValue(value.default || 'unset', self, name, vars) + ';';
-      prop += '}\n';
-      for (let state in value) {
-        if (state == 'default') continue;
-        else if (state.startsWith('@media')) {
-          prop += `${state} { ${start} ${name}: ${parseValue(value[state], self, name, vars)}; } }\n`
-        } else if (state.startsWith(':')) {
-          prop += `${selector}${state} { ${name}: ${parseValue(value[state], self, name, vars)}; }\n`
-        }
-      }
-      prop += start;
-    } else {
-      let v = parseValue(value, self, name, vars);
-      if(typeof v == 'object') return declectProp(v, name, selector, start, parent, self, vars);
-      prop += v + ';';
-    }
-    return prop;
-  }
-
-  const declectNames = (names, $name, parent, values = {}) => {
-    const start = $name ? $name + ' {' : '';
-    let nameStyles = start;
-    for (let name in names) {
-      let selector = name.replace(/,/g, ', &').replace(/&/g, $name || '');
-      if (name == '@variables') {
-        for (let i in names[name]) {
-          variables[i] = names[name][i];
-        }
-      } else if (name.startsWith('@mixin')) {
-        const mame = name.split('@mixin')[1].trim();
-        const mname = mame.split('(')[0];
-        const args = mame.replace(mname, '').slice(1, -1);
-        mixins[mname] = {
-          args: args.split(','),
-          value: names[name]
-        }
-      } else if (name.startsWith('@keyframes')) {
-        nameStyles += $name ? '' : name + '{';
-
-        for(let keyFrame in names[name]){
-          nameStyles += declectNames(names[name][keyFrame], keyFrame, names[name], values);
-        }
-
-        if(!$name) nameStyles += '}\n';
-      } else if ($name) {
-        if (name.startsWith('&')) {
-          nameStyles += '}\n';
-          nameStyles += declectNames(names[name], selector, names, values);
-          nameStyles += start;
-        } else if(name.startsWith('@include')) {
-          const mame = names[name];
-          const mname = mame.split('(')[0];
-          const args = mame.replace(mname, '').slice(1, -1).split(',');
-          if(mixins[mname]){
-            nameStyles += declectNames(mixins[mname].value, selector, names, {...values, ...Object.fromEntries(mixins[mname].args.map((n, i) => [n, args[i]]))}).trim().replace('@include ', '').slice(1, -1);
-          }
-        } else {
-          nameStyles += declectProp(names[name], name, $name, start, parent || styles, names, values);
-        }
-      } else {
-        nameStyles += declectNames(names[name], selector, names, values);
-      }
-    }
-    if ($name) nameStyles += '}\n';
-    return nameStyles;
-  }
-
-  css += declectNames(styles);
-
-  return css.replace(/(.+) \{\}/g, '');
-}
-
 
 class Page extends Node {
   constructor() {
@@ -556,7 +468,7 @@ module.exports = (context, importOptions) => {
     }
     invokeState(states, callback){
       const statesMapped = states.map(i => i instanceof State ? `getState('${i.id}')` : (typeof i == "function" ? i.toString() : JSON.stringify(i)));
-      return `((${callback})(typof event !== "undefined" ? event : null, ...[${statesMapped}]))`;
+      return `((${callback})((typeof event !== "undefined" ? event : null), ...[${statesMapped}]))`;
     }
     async bundleCode(code, options){
       return Web.prototype.bundle(generateRandomID(), {

package/main.js

@@ -9,5 +9,6 @@ module.exports = {
   compileFile,
   run,
   pkgs,
-  utils
+  utils,
+  LineMap: require('./lib/civet/main').SourceMap
 };

package/package.json

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