@makano/rew 1.2.97 → 1.2.99

package/lib/rew/cli/run.js

@@ -44,6 +44,11 @@ function runFileWithArgv(filePath, options = {}, cargv) {
 	}
 	if (argv.includes('--')) {
 		argv = argv.slice(argv.indexOf('--') + 1, argv.length);
+	} else {
+		const index = argv.find(p => filePath.endsWith(p.replace(/(\.|\.\.)\//, '/')));
+		if(index){
+			argv = argv.slice(argv.indexOf(index) + 1, argv.length);
+		}
 	}
 	runFile(filePath, options, argv);
 }

package/lib/rew/functions/import.js

@@ -46,7 +46,7 @@ module.exports.imp = function (runPath, context) {
 		if(filename == 'std' || filename == '#std') return {};
 		let type = options.type ? options.type : filename.endsWith('.coffee') ? 'coffee' : (
 			filename.endsWith(REW_FILE_TYPE.EXTENSION) ? REW_FILE_TYPE.TYPE :
-			path.extname(filename).slice(1)
+			'coffee'
 		);
 		let exports,
 			ispkg = findPackage(filename);
@@ -71,7 +71,7 @@ module.exports.imp = function (runPath, context) {
 		const foundCache = cachedFiles.find((f) => f.filepath == type+':'+filepath);
 
 		if (!ispkg && foundCache) {
-			exports = options.useDefaultForPackages === false ? foundCache.exports.default || foundCache.exports : _returns(options, foundCache.exports);
+			exports = type === 'coffee' || type === REW_FILE_TYPE.EXTENSION ? foundCache.exports : options.useDefaultForPackages === false ? foundCache.exports.default || foundCache.exports : _returns(options, foundCache.exports);
 		}
 
 		if (!ispkg && !existsSync(filepath) && !foundCache) {

package/lib/rew/modules/compiler.js

@@ -407,6 +407,20 @@ function compileRewStuff(content, options) {
 			straceLog('APP_PACKAGE_CHANGE()');
 		}
 
+		if (
+			token.type === 'OTHER' && token.value === '-' &&
+			nextToken.type == 'IDENTIFIER' && nextToken.value === 'wait'
+		) {
+			const { token: nextNextToken } = gnextToken(i, 2, tokens) || {};
+			if(nextNextToken?.type == 'IDENTIFIER'){
+				token.value = '';
+				hooks.push({
+					index: i + 3,
+					value: ','
+				});
+			}
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
 			straceLog('USING()');
 			const next = nextToken.value;

package/package.json

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