@makano/rew 1.3.8 → 1.4.0

package/lib/rew/const/usage.js

@@ -22,9 +22,9 @@ class Usage {
   save = true;
 
   constructor(name, trigger, save){
-    this.name = name;
+    this.name = name || '';
     this.trigger = trigger;
-    this.save = name == '' ? false : save;
+    this.save = name == '' || name == null ? false : save;
   }
 
   create(name, trigger, save = true){
@@ -117,9 +117,9 @@ module.exports.usingFunction = (context, runtime) => {
       if(name.onAfterUse) name.onAfterUse();
       return r;
     } else if(name instanceof Usage) {
-      const v = name.trigger(...params) || true;
-      if(name.save !== false) context.__using__[name.name] = v;
-      return v;
+      const v = name.trigger(...params);
+      if(name.save !== false) context.__using__[name.name] = v ?? true;
+      return v || (typeof name.result === "function" ? name.result(v) : name.result || true);
     } else {
       context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
     }

package/lib/rew/functions/stdout.js

@@ -1,6 +1,6 @@
 const { spawnSync } = require('child_process');
 
-const print = (module.exports.print = function print(...args) {
+(module.exports.print = function print(...args) {
 	return console.log(...args);
 });
 
@@ -8,9 +8,6 @@ module.exports.printf = function printf(buffer, cb) {
 	return process.stdout.write(buffer, cb);
 };
 
-print.stdout = process.stdout;
-print.stdin = process.stdin;
-
 module.exports.input = function input(prompt) {
 	process.stdout.write(prompt);
 

package/lib/rew/modules/compiler.js

@@ -154,11 +154,15 @@ function declareAlias(aliases, token) {
 
 		if(name.startsWith('=')){
 			name = name.slice(1);
-			let isDecOnly = false;
+			let isDecOnly = false, isConstructor = false;
 			if(name.endsWith('*')) {
 				name = name.slice(0, -1);
 				isDecOnly = true;
 			}
+			if(name.endsWith('!')) {
+				name = name.slice(0, -1);
+				isConstructor = true;
+			}
 			aliasValue = (token, tokens, code, hooks, index, setIndex) => {
 				const nextToken = tokens[index+1]
 				let nextToken2 = gnextToken(index, 3, tokens);
@@ -181,7 +185,7 @@ function declareAlias(aliases, token) {
 					let nextToken = gnextToken(index, offset+1, tokens);
 					const args = nextToken.token.value;
 					setIndex(ti + offset);
-					return `${nextToken2.value} = ${token.value} ${args && args !== '(' && args !== '{' && args !== '[' && args !== '-' && args !== '=' ? `${args},` : ''} ${params.trim() ? params.trim() + ', ' : ''}${args == '(' || args == '[' || args == '{' || args == '=' || args == '-' ? args : ''}`.replace(/,(| )$/, '');
+					return `${nextToken2.value} = ${isConstructor?'new ':''}${token.value} ${args && args !== '(' && args !== '{' && args !== '[' && args !== '-' && args !== '=' ? `${args},` : ''} ${params.trim() ? params.trim() + ', ' : ''}${args == '(' || args == '[' || args == '{' || args == '=' || args == '-' ? args : ''}`.replace(/,(| )$/, '');
 				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
 					nextToken.value = '';
 					if(isDecOnly){
@@ -194,7 +198,7 @@ function declareAlias(aliases, token) {
 					if(nextToken2.token.value == ':') nextToken2.token.value = '=';
 					hooks.push({
 						index: nextToken2.ti,
-						value: ' ' + value
+						value: ' ' + (isConstructor?'new ':'') + value
 					})
 					return "";
 				}
@@ -215,8 +219,8 @@ function declareAlias(aliases, token) {
 
 const stdTypes = (isPublic) => {
 	let r = '';
-	const dec = (name, fn) => {
-		r += `#declare${isPublic?'*':''} key "=${name}" = ${fn || name};\n`
+	const dec = (name, fn, cons = 0) => {
+		r += `#declare${isPublic?'*':''} key "=${name}${cons ? '!' : ''}" = ${fn || name};\n`
 	}
 	dec('int');
 	dec('str');
@@ -226,6 +230,7 @@ const stdTypes = (isPublic) => {
 	dec('typedef');
 	dec('typef');
 	dec('struct');
+	dec('Usage', null, 1);
 	return r;
 };
 const includeFile = (includeContent, options) => {
@@ -461,7 +466,7 @@ function compileRewStuff(content, options) {
 
 		if (tokens[i-1]?.value !== '.' && token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
 			straceLog('USING()');
-			const next = nextToken.value;
+			const next = nextToken?.value;
 			if(next in USING_DEFAULT) {
 				const { use } = USING_DEFAULT[next];
 				use?.(options);
@@ -694,7 +699,15 @@ const compileCivetStuff = (file, options) => {
 		filename: file.path,
 		...options
 	};
-	straceLog('OPTION_PREPARE() for CURRENTFILE as', preCompileOptions);
+	straceLog('OPTION_PREPARE() for CURRENTFILE as', JSON.stringify(preCompileOptions));
+	
+	if(options?.type == 'js' || file?.path?.endsWith('.js')){
+		return {
+			compiled: file?.content || "",
+			options: preCompileOptions
+		}
+	}
+	
 	const prepared = compileRewStuff(file.content, preCompileOptions);
 
 	// console.log(prepared);

package/lib/rew/modules/context.js

@@ -65,10 +65,13 @@ module.exports.prepareContext = function (
           }
           this.define = std.prototype.define;
           this.Main = std.prototype.Main;
+          this.attach = std.prototype.attach;
+          this.out = std.prototype.out;
+          this.inp = std.prototype.in;
           this['@cb'] = cb;
         }
       });
-    }, define: (name, object) => {
+    }, out: {...process.stdout, put: (...logs) => context.print(...logs), strace: (...logs) => straceLog('==> STRACE_OUT():', ...logs  ), write: (logs) => context.printf(logs+'\n') }, in: {...process.stdin, read: (...args) => context.input(...args)}, define: (name, object) => {
       if(Array.isArray(name) && name.length == 2 && typeof name[0] == 'string'){
         object = name[1];
         name = name[0];
@@ -127,6 +130,26 @@ module.exports.prepareContext = function (
       }
     };
 
+  context.std.prototype.__ = {
+    get prototype(){
+      const globals = context.app?.config?.assets?.globals ?? '_';
+      const p = context.pjoin(context.app ? context.app.path : context.dirname(context.module.filename), globals);
+      if(!context.exists(p)) return {};
+      const files = context.ls(p);
+      const pr = {};
+      files.forEach(file => {
+        if(!file.endsWith('.coffee')) return;
+        const e = runPath(context.pjoin(p, file));
+        let name = e.context.module.modset || file.split('.').shift();
+        pr[name] = e.context.module.exports || {};
+        if(typeof pr[name] == "object" && pr[name].default && Object.keys(pr[name]).length == 1){
+          pr[name] = pr[name].default;
+        }
+      });
+      return pr;
+    }
+  }
+
   context.global = context;
   context.imports.assert = options.import ?? {};
   context.imp = imp(runPath, context);
@@ -185,6 +208,8 @@ module.exports.prepareContext = function (
   if(!context.app){
     straceLog('==> APP NOT FOUND');
     context.appPackage = (packageName) => context.app = { config: { manifest: { package: packageName } } }
+  } else {
+    context.appPackage = context.mod = (packageName) => context.module.modset = packageName;
   }
 
   Object.defineProperty(context, 'packageName', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "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>;
     }
   }