@makano/rew 1.2.971 → 1.3.1

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

@@ -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

@@ -402,11 +402,25 @@ function compileRewStuff(content, options) {
 			straceLog('EXPORT() => TRANSLATING TO pub');
 		}
 		
-		if (token.type === 'IDENTIFIER' && token.value === 'package' && nextToken.type == 'STRING') {
+		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && token.value === 'package' && nextToken.type == 'STRING') {
 			token.value = 'appPackage';
 			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/lib/rew/modules/context.js

@@ -81,6 +81,9 @@ module.exports.prepareContext = function (
         if(!context[i]) context[i] = object[i];
       }
     } }
+    Object.defineProperty(std.prototype, 'void', {
+      get: () => void 0
+    })
     context.std = std;
   }
   if (!context.process)

package/package.json

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

package/runtime.d.ts

@@ -1006,4 +1006,24 @@ declare namespace Rew {
     group(...group: any[]): { g: T, with: (props: any) => { g: T, [key: string]: any }, [key: string]: any }
   }
 
+  declare const std = {
+    curl: curl,
+    int: int,
+    str: str,
+    bool: bool,
+    float: float,
+    num: num,
+    typeis: typeis,
+    typex: typex,
+    typei: typei,
+
+    prototype: {
+      void: () => void 0,
+      Main: () => [string, () => any],
+      define: (name: string, object: any) => any,
+      attach: (object: any) => any,
+      ns: () => any
+    }
+  }
+
 // }