@makano/rew 1.2.61 → 1.2.63

package/lib/rew/modules/compiler.js

@@ -11,72 +11,86 @@ const { wait } = require('../functions/wait');
 const { REW_FILE_TYPE } = require('../const/ext');
 const { USING_DEFAULT } = require('../const/usage');
 
+
+
 function tokenizeCoffeeScript(code) {
-	const tokens = [];
-	let currentToken = '';
-
-	for (let i = 0; i < code.length; i++) {
-		const char = code[i];
-		const nextChar = code[i + 1];
-
-		if (char === '#') {
-			// Comment
-			tokens.push({
-				type: 'COMMENT',
-				value: char + code.substring(i + 1).split('\n')[0] + '\n',
-			});
-			const ind = code.indexOf('\n', i);
-			i = ind < 0 ? code.length-1 : ind;
-		} else if (char === '"' || char === "'") {
-			// String
-			let string = char;
-			let escaped = false;
-			i++;
-			while (i < code.length && (code[i] !== char || escaped)) {
-				string += code[i];
-				if (code[i] === '\\' && !escaped) {
-					escaped = true;
-				} else {
-					escaped = false;
-				}
-				i++;
-			}
-			string += char; // Include closing quote
-			tokens.push({ type: 'STRING', value: string });
-		} else if (char === '/' && (nextChar === '/' || nextChar === '*')) {
-			// Regular expression
-			let regex = char;
-			i++;
-			while (i < code.length && (code[i] !== '/' || regex.endsWith('\\'))) {
-				regex += code[i];
-				i++;
-			}
-			regex += '/';
-			tokens.push({ type: 'REGEX', value: regex });
-		} else if (/\s/.test(char)) {
-			// Whitespace
-			if (tokens[tokens.length - 1]?.type == 'WHITESPACE' && tokens[tokens.length - 1].value[0] == char) {
-				tokens[tokens.length - 1].value += char;
-			} else {
-				tokens.push({ type: 'WHITESPACE', value: char });
-			}
-		} else if (/[a-zA-Z\._$]/.test(char)) {
-			// Identifier
-			let identifier = char;
-			i++;
-			while (i < code.length && /[a-zA-Z0-9\._$]/.test(code[i])) {
-				identifier += code[i];
-				i++;
-			}
-			tokens.push({ type: 'IDENTIFIER', value: identifier });
-			i--; // Move back one character to recheck
-		} else {
-			// Other characters
-			tokens.push({ type: 'OTHER', value: char });
-		}
-	}
+  const tokens = [];
+  let currentToken = '';
+  let i = 0;
+
+  while (i < code.length) {
+    const char = code[i];
+    const nextChar = code[i + 1];
+    const nextNextChar = code[i + 2];
+
+    if (char === '#') {
+      // Comment
+      const commentEnd = code.indexOf('\n', i);
+      const comment = code.substring(i, commentEnd < 0 ? code.length : commentEnd + 1);
+      tokens.push({ type: 'COMMENT', value: comment });
+      i += comment.length - 1;
+    } else if (char === '"' && nextChar === '"' && nextNextChar === '"') {
+      // Triple-quoted string
+      let string = '"""';
+      i += 3;
+      while (i < code.length && !(code[i] === '"' && code[i + 1] === '"' && code[i + 2] === '"')) {
+        string += code[i];
+        i++;
+      }
+      string += '"""'; // Include closing triple quotes
+      tokens.push({ type: 'TRIPLE_STRING', value: string });
+      i += 2; // Skip past the closing triple quotes
+    } else if (char === '"' || char === "'") {
+      // Single or double-quoted string
+      let string = char;
+      let escaped = false;
+      i++;
+      while (i < code.length && (code[i] !== char || escaped)) {
+        string += code[i];
+        if (code[i] === '\\' && !escaped) {
+          escaped = true;
+        } else {
+          escaped = false;
+        }
+        i++;
+      }
+      string += char; // Include closing quote
+      tokens.push({ type: 'STRING', value: string });
+    } else if (char === '/' && nextChar !== ' ' && nextChar !== '/' && nextChar !== '*') {
+      // Regular expression
+      let regex = char;
+      i++;
+      while (i < code.length && (code[i] !== '/' || regex.endsWith('\\'))) {
+        regex += code[i];
+        i++;
+      }
+      regex += '/';
+      tokens.push({ type: 'REGEX', value: regex });
+    } else if (/\s/.test(char)) {
+      // Whitespace
+      if (tokens[tokens.length - 1]?.type === 'WHITESPACE') {
+        tokens[tokens.length - 1].value += char;
+      } else {
+        tokens.push({ type: 'WHITESPACE', value: char });
+      }
+    } else if (/[a-zA-Z_$]/.test(char)) {
+      // Identifier
+      let identifier = char;
+      i++;
+      while (i < code.length && /[a-zA-Z0-9_$]/.test(code[i])) {
+        identifier += code[i];
+        i++;
+      }
+      tokens.push({ type: 'IDENTIFIER', value: identifier });
+      i--; // Move back one character to recheck
+    } else {
+      // Other characters
+      tokens.push({ type: 'OTHER', value: char });
+    }
+    i++;
+  }
 
-	return tokens;
+  return tokens;
 }
 
 const ValueIfy = (val) => {
@@ -255,6 +269,10 @@ function compileRewStuff(content, options) {
 			});
 		}
 
+		// if(token.type === 'TRIPLE_STRING'){
+		// 	token.value = '```'+token.value.slice(3).slice(0, -3).replace(/\#\{/g, '${')+'```';
+		// }
+
 		result += token.value;
 		if (hooks.length) {
 			hooks.forEach((hook, ind) => {

package/lib/rew/pkgs/web.js

@@ -452,7 +452,7 @@ module.exports = (context, importOptions) => {
       return new State(value);
     }
     invokeState(states, callback){
-      const statesMapped = states.map(i => i instanceof State ? `getState('${i.id}')` : JSON.stringify(i));
+      const statesMapped = states.map(i => i instanceof State ? `getState('${i.id}')` : (typeof i == "function" ? i.toString() : JSON.stringify(i)));
       return `((${callback})(event, ...[${statesMapped}]))`;
     }
     async bundle(filepath, options = {}) {
@@ -487,7 +487,7 @@ module.exports = (context, importOptions) => {
               },
               async transform(code, id) {
                 if (id.endsWith(REW_FILE_TYPE.EXTENSION) || id.endsWith('.coffee')) {
-                  const result = compile({ content: code, path: filepath }, { jsx: true, async: true, keepImports: true });
+                  const result = compile({ content: code, path: filepath }, { type: id.endsWith('.coffee') ? "coffee" : undefined, jsx: true, async: true, keepImports: true });
                   return {
                     code: await result,
                     map: null,

package/package.json

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