@makano/rew 1.3.6 → 1.3.8

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');
@@ -618,6 +684,7 @@ function compileRewStuff(content, options) {
 	}
 	// console.log(aliases);
 	// console.log(result);
+	// return "";
 	return result;
 }
 

package/lib/rew/modules/context.js

@@ -79,6 +79,13 @@ module.exports.prepareContext = function (
     }, Main: (cb) => {
       if(cb?.main){
         cb.main._class = cb;
+        if(cb.prepare){
+          cb.prepare((object) => {
+            for(let i in object){
+              cb[i] = object[i];
+            }
+          });
+        }
       }
       return (['main', cb?.main ?? cb]);
     }, attach: (object) => {

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.6",
+  "version": "1.3.8",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {