@makano/rew 1.2.94 → 1.2.95

package/lib/rew/modules/compiler.js

@@ -115,6 +115,13 @@ const ValueIfy = (val) => {
   }
 }
 
+function insertTokenAt(array, index, value) {
+	if (index < 0 || index > array.length) {
+			throw new RangeError('Index out of bounds');
+	}
+	array.splice(index, 0, value);
+}
+
 const gnextToken = (i, n, tokens) => {
 	return tokens[i + n] ? (tokens[i + n].type == 'WHITESPACE' ? gnextToken(i, n + 1, tokens) : { token: tokens[i + n], n, ti: i + n }) : null;
 };
@@ -409,6 +416,19 @@ function compileRewStuff(content, options) {
 			} else straceLog('==> UNKNOWN');
 		}
 
+		if (token.type === 'IDENTIFIER' && token.value === 'as' && !options.keepImports) {
+			const isFrom = gnextToken(i, 3, tokens);
+			const isInImport = tokens[i-2];
+			if(isFrom?.token.value == 'from' && isInImport?.value !== '*'){
+				insertTokenAt(tokens, i, { type: 'WHITESPACE', value: ' ' });
+				insertTokenAt(tokens, i, { type: 'OTHER', value: '*' });
+				insertTokenAt(tokens, i, { type: 'WHITESPACE', value: ' ' });
+				insertTokenAt(tokens, i, { type: 'IDENTIFIER', value: 'import' });
+				i -= 1;
+				continue;
+			}
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
 			straceLog('IMPORT()');
@@ -441,8 +461,8 @@ function compileRewStuff(content, options) {
 				}
 			} else if (nextToken.value === '*') {
 				const asToken = fnextToken(ind, tokens, 'IDENTIFIER', 'as');
-				const nameToken = fnextToken(asToken.ri, tokens, 'STRING');
 				if (asToken) {
+					const nameToken = fnextToken(asToken.ti, tokens, 'STRING');
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
 					straceLog('==>', defaultName, 'from', nameToken.value);

package/lib/rew/modules/runtime.js

@@ -36,7 +36,8 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 	
 		if(context.app){
 			const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
-			if(existsSync(p) && context.app.path !== p){
+			const p2 = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app/.allow');
+			if(existsSync(p) && context.app.path !== p && !existsSync(p2)){
 				console.log("App with the same package name has been installed. Conflicts happened. \nTo fix this, change your app's package name or remove the app making the conflict.");
 				return {
 					context: { module: { exports: null } },

package/package.json

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