@makano/rew 1.2.5 → 1.2.6

package/lib/rew/modules/compiler.js

@@ -1,4 +1,4 @@
-const { compile } = require('../../coffeescript/coffeescript');
+const { compile: compileCivet } = require('../../civet/main');
 const { execOptions } = require('../const/opt');
 const { findAppInfo } = require('../misc/findAppInfo');
 const { from_qrew } = require('../qrew/compile');
@@ -7,6 +7,9 @@ const babel = require('@babel/core');
 const path = require('path');
 const babelReact = require('@babel/preset-react');
 const { readFileSync } = require('fs');
+const { wait } = require('../functions/wait');
+const { REW_FILE_TYPE } = require('../const/ext');
+const { USING_DEFAULT } = require('../const/usage');
 
 function tokenizeCoffeeScript(code) {
 	const tokens = [];
@@ -115,18 +118,25 @@ function compileRewStuff(content, options) {
 		const token = tokens[i];
 		let { token: nextToken, n } = gnextToken(i, 1, tokens) || {};
 
-		if (token.type === 'IDENTIFIER' && token.value === 'opt') {
+		if(token.type == "COMMENT" && i < 2 && token.value.startsWith('#!')){
+			continue;
+		}
+
+		if (token.type === 'IDENTIFIER' && token.value === 'opt.set') {
 			const { token: nextNextToken } = gnextToken(i, 2, tokens) || {};
-			if (nextNextToken && nextNextToken.value == 'jsxPragma') {
+			if (nextNextToken && nextNextToken.value.slice(1).slice(0, -1) == 'jsxPragma') {
 				const { token: nextLastToken } = gnextToken(i, 5, tokens) || {};
 				execOptions.jsxPragma = nextLastToken.value.slice(1).slice(0, -1);
 			}
 		}
 
-		if (token.type === 'COMMENT' && token.value.slice(1).trim() === '@jsx') {
+		if (token.type === 'COMMENT' && token.value.slice(1).trim().startsWith('@jsx')) {
 			options.jsx = true;
+			if(token.value.split('@jsx')[1].trim()){
+				options.jsxPragma = token.value.split('@jsx')[1].trim();
+			}
 		}
-
+		
     if (token.type === 'COMMENT' && token.value.slice(1).trim() === '@cls') {
 			options.cls = true;
 		}
@@ -146,19 +156,20 @@ function compileRewStuff(content, options) {
 		}
 
 
-		if (token.type === 'IDENTIFIER' && token.value === 'let') {
-			result += '`'
-			hooks.push({
-				index: fnextToken(i, tokens, 'OTHER', ';').ti,
-				value: `\``,
-			});
+		if (token.type === 'IDENTIFIER' && token.value === 'export' && !options.keepImports) {
+			token.value = 'pub';
 		}
 
-		if (token.type === 'IDENTIFIER' && token.value === 'export') {
-			token.value = 'pub';
+		if (token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
+			const next = nextToken.value;
+			if(next in USING_DEFAULT) {
+				const { use } = USING_DEFAULT[next];
+				use?.(options);
+				nextToken.value = `"${nextToken.value}"`
+			}
 		}
 
-		if (token.type === 'IDENTIFIER' && token.value === 'import') {
+		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
 			let ind = i + n + 2;
 
@@ -173,9 +184,12 @@ function compileRewStuff(content, options) {
 					const exportsTokens = tokens.slice(ind, closingBraceToken.ti);
 					const exports = exportsTokens
 						.filter((t) => t.type === 'IDENTIFIER')
-						.map((t) => t.value)
+						.map((t, i, arr) => t.value == 'as' ? [arr[i-1].value +': '+arr[i+1].value] : t.value)
+						.flat(1)
+						.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 						.join(', ');
-					result += `{ ${exports} } = inc ${nameToken.value}`;
+
+					result += `{ ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = nameToken.ti;
 				}
 			} else if (nextToken.value === '*') {
@@ -184,7 +198,7 @@ function compileRewStuff(content, options) {
 				if (asToken) {
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
-					result += `${defaultName} = inc ${nameToken.value}`;
+					result += `${defaultName} ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = ind + 6;
 				}
 			} else if (nextToken) {
@@ -197,13 +211,15 @@ function compileRewStuff(content, options) {
 						const exportsTokens = tokens.slice(ind, closingBraceToken.ti);
 						const exports = exportsTokens
 							.filter((t) => t.type === 'IDENTIFIER')
-							.map((t) => t.value)
+							.map((t, i, arr) => t.value == 'as' ? [arr[i-1].value +': '+arr[i+1].value] : t.value)
+							.flat(1)
+							.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 							.join(', ');
-						result += `{ default: ${defaultName}, ${exports} } = inc ${nameToken?.value || ''}`;
+						result += `{ default: ${defaultName}, ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 						i = closingBraceToken.ti + 4;
 					}
 				} else {
-					result += `{ default: ${defaultName} } = inc ${nameToken?.value || ''}`;
+					result += `{ default: ${defaultName} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 					i = ind + 2;
 				}
 			}
@@ -224,7 +240,7 @@ function compileRewStuff(content, options) {
 			nextToken &&
 			nextToken.type === 'IDENTIFIER' &&
 			nextToken.value &&
-			nextToken.value !== 'undefined'
+			nextToken.value !== 'undefined' && !options.keepImports
 		) {
 			let next = {...nextToken};
 			if(next.value == 'default'){
@@ -255,37 +271,90 @@ function compileRewStuff(content, options) {
 	return result;
 }
 
-const cpl = (module.exports.compile = function (file, options = {}) {
-	let c = options.type == 'js' || options.compile == false ? file.content : compile(compileRewStuff(file.content, options), {
+const compileCivetStuff = (file, options) => {
+	const compileOptions = {
 		...options,
-		filename: file.path,
-		bare: false,
+		bare: true,
+		filename: file.content,
 		inlineMap: false,
+		js: true
+	};
+
+	const prepared = compileRewStuff(file.content, options);
+
+	const compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
+
+	return {
+		compiled,
+		options
+	};
+}
+
+const cpl = (module.exports.compile = function (file, options = {}) {
+	let compiledCode;
+	const result = compileCivetStuff(file, {
+		...options,
+		parseOptions: { 
+			coffeeCompat: options.type == "coffee",
+		}
 	});
+	
+	options = result.options;
+	compiledCode = result.compiled;
+
+	const babelify = (code, options) => babel.transformSync(code, {
+		presets: [
+			...(doJSX ? [[babelReact, { 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'), {}]] : [])
+		],
+	}).code;
+
+	const doJSX = execOptions.jsx || options.jsx;
+	const doTypes = execOptions.typescript || options.typescript;
+	const doDecorators = execOptions.decorators || options.decorators;
+	const doBabel = doJSX || doTypes || doDecorators;
+
+	if(compiledCode instanceof Promise){
+		return compiledCode.then((compiledCode) => {
+			if (doBabel) {
+				compiledCode = babelify(compiledCode, options);
+			}
+			return compiledCode;
+		});
+	}
+
 	// console.log(c);
-	if (execOptions.jsx || options.jsx) {
-		c = babel.transformSync(c, {
-			presets: [[babelReact, { pragma: execOptions.jsxPragma }]],
-			plugins: [],
-		}).code;
+	if (doBabel) {
+		compiledCode = babelify(compiledCode, options);
 	}
-	return c;
+	return compiledCode;
 });
 
 module.exports.compileFile = function (filepath, options = {}) {
-	const f = getFile(filepath);
+	const f = typeof filepath == "object" ? filepath : getFile(filepath);
+	if(typeof filepath == "object") filepath = filepath.path;
 	let qrew = false;
 
 	if(options.qrew || path.extname(filepath) == '.qrew') {
 		qrew = true
 		f.content = from_qrew(readFileSync(f.path), options.package || findAppInfo(filepath)?.config.manifest.package || path.basename(filepath).split('.').slice(0, -1).join('.')).toString();
+		options.type = f.content.split('\n')[0]?.match(/"initFile (.+)"/)?.[1]?.split('.').pop();
 	} 
 
 	let compiled_code =  cpl(f, { ...options });
 
 	if(options.onlyCompile && !qrew){
-		console.log(compiled_code);
-		process.exit();
+		if(compiled_code instanceof Promise){
+			compiled_code.then((r) => {
+				console.log(r);
+				process.exit();
+			});
+		} else {
+			console.log(compiled_code);
+			process.exit();
+		}
 	}
 
 	return {

package/lib/rew/modules/context.js

@@ -7,6 +7,7 @@ const fsLib = require("../functions/fs");
 const pathLib = require("../functions/path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
+const { USING_DEFAULT } = require("../const/usage");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -25,11 +26,12 @@ module.exports.prepareContext = function (
       imports: [],
     },
     imports: {
-      meta: {},
+      meta: { url: new URL('file://'+filepath), main: isMainFile(filepath) },
       assert: options.import ?? {},
     },
     app: findAppInfo(filepath),
     ...fsLib(filepath),
+    __using__: {}
   };
   if (options.useContext) {
     context = {
@@ -91,6 +93,16 @@ module.exports.prepareContext = function (
   context.pub = pubFunction(context);
   context.exports = exportsFunction(context);
 
+  context.using = (name, ...params) => {
+    if(USING_DEFAULT[name]){
+      if(USING_DEFAULT[name].param) {
+        context.__using__[name] = USING_DEFAULT[name].param(...params);
+      }
+    } else {
+      context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
+    }
+  };
+
   if (
     context.module.main ||
     (options.fromMain == true && options.as == "main")

package/lib/rew/modules/runtime.js

@@ -1,5 +1,5 @@
 const vm = require('vm');
-const { compileFile } = require('./compiler');
+const { compileFile, compile } = require('./compiler');
 const { prepareContext } = require('./context');
 const { existsSync, readFileSync } = require('fs');
 const { CONFIG_PATH } = require('../const/config_path');
@@ -7,37 +7,54 @@ const path = require('path');
 
 const preScript = readFileSync(path.join(__dirname, '../const/pre-exec.js'), { encoding: 'utf-8' });
 
-const exec = (module.exports.exec = function (code, context) {
-	return vm.runInNewContext(code, vm.createContext(context), {
+const exec = (module.exports.exec = function (code, context, original = '') {
+	return vm.runInNewContext(code, context.do ? null : vm.createContext(context), {
 		filename: context.module.filepath,
-		lineOffset: -1 - preScript.split('\n').length,
+		lineOffset: (original.split('\n').length + preScript.split('\n').length) - code.split('\n').length,
 		displayErrors: true,
 	});
 });
 
 module.exports.runPath = function runPath(filepath, options = {}, custom_context = {}) {
 	if(filepath.endsWith('.js')) options.type = 'js';
-	let { compiled_code, file } = compileFile(filepath, options);
-	const context = prepareContext(custom_context, options, file.path, runPath);
+	if(filepath.endsWith('.coffee')) options.type = 'coffee';
+	if(filepath.endsWith('.qrew')) options.type = 'qrew';
 
-	context.module.compiled = compiled_code;
-	context.process.exit = (int) => process.exit(int);
+	if(options.import?.async) options.async = true;
+	let { compiled_code, file } = compileFile(options.code ? { content: options.code, path: filepath } : filepath, options);
+	// context.module.compiled = compiled_code;
+	// context.process.exit = (int) => process.exit(int);
 
-	if(context.app){
-		const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
-		if(existsSync(p) && context.app.path !== p){
-			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: { exports: null },
-				returns: null
+	const doCode = () => {
+		const context = options.import?.takeThisContext ? custom_context : prepareContext(custom_context, options, file.path, runPath);
+	
+		if(context.app){
+			const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
+			if(existsSync(p) && context.app.path !== p){
+				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 } },
+					returns: null
+				}
 			}
 		}
+	
+		compiled_code = preScript+'\n'+compiled_code;
+	
+		return {
+			context,
+			returns: exec(compiled_code, context, file.content),
+		};
 	}
 
-	compiled_code = preScript+compiled_code;
+	if(options.async){
+		return new Promise(async (r, re) => {
+			compiled_code.then((e) => {
+				compiled_code = e;
+				r(doCode());
+			});
+		});
+	}
 
-	return {
-		context,
-		returns: exec(compiled_code, context),
-	};
+	return doCode();
 };