@makano/rew 1.3.9 → 1.4.1

package/lib/rew/functions/future.js

@@ -1,4 +1,5 @@
 const emitter = require('./emitter');
+const { wait } = require('./wait');
 
 function future(callback, timeout = 0, defData = null) {
 	const listener = emitter();
@@ -19,6 +20,8 @@ function future(callback, timeout = 0, defData = null) {
 		resolve: (data) => listener.emit('resolve', data),
 		reject: (data) => listener.emit('reject', data),
 		wait: async () => await promise,
+		sync: (fn) => wait(async () => fn ? (await fn(promise)) : await promise),
+		_isfuture: true
 	};
 };
 

package/lib/rew/functions/wait.js

@@ -3,11 +3,21 @@ const deasync = require("deasync");
 
 module.exports.wait = (...args) => {
   const fn = args.shift();
-  if(typeof fn !== "function") throw new TypeError("The first argument must be a function to use wait.");
+  if(typeof fn !== "function" && typeof fn?.then != "function" && !fn?._isfuture) throw new TypeError("The first argument must be a function, future or a Promise to use wait.");
   const df = deasync(async (cb) => {
-    fn(...args)
-      .then(d => cb(null, d))
-      .catch(d => cb(d));
+    let result = typeof fn == "function" ? fn(...args) : fn;
+
+    if(result._isfuture){
+      result = result.wait();
+    }
+
+    if(typeof result.then == "function"){
+      result
+        .then(d => cb(null, d))
+        .catch(d => cb(d));
+    } else {
+      cb(null, result);
+    }
   });
   return df();
 }

package/package.json

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

package/runtime.d.ts

@@ -958,13 +958,7 @@ declare namespace Rew {
   ): ReturnType<typeof future>;
 
   declare function print(...args: any[]): void;
-  declare namespace print {
-    // @ts-ignore
-    const stdout: WriteStream;
-    // @ts-ignore
-    const stdin: ReadStream;
-  }
-
+  declare function printf(...args: any[]): void;
   declare function input(prompt: string): string;
 
   declare const basename: (path: string) => string;
@@ -1009,6 +1003,18 @@ declare namespace Rew {
     group(...group: any[]): { g: T, with: (props: any) => { g: T, [key: string]: any }, [key: string]: any }
   }
 
+  // @ts-ignore
+  interface stdout extends WriteStream {
+    put: typeof print;
+    write: (str: string) => void;
+    strace: (...str: string[]) => void;
+  }
+
+  // @ts-ignore
+  interface stdin extends ReadStream {
+    read: typeof input
+  }
+
   declare const std: {
     curl: typeof curl,
     int: typeof int,
@@ -1021,11 +1027,17 @@ declare namespace Rew {
     typei: typeof typei,
 
     prototype: {
-      void: () => void 0,
+      void: void,
       Main: () => [string, () => any],
       define: (name: string, object: any) => any,
       attach: (object: any) => any,
-      ns: () => any
+
+      out: stdout;
+      in: stdin;
+
+      ns: () => any;
+
+      __: Record<string, any>;
     }
   }