@makano/rew 1.2.66 → 1.2.67

package/lib/rew/functions/match.js

@@ -2,6 +2,8 @@ const SerializableData = ['string', 'number', 'boolean'];
 
 const isRegExp = (obj) => Object.prototype.toString.call(obj) === '[object RegExp]';
 
+const AnySymbol = Symbol('any');
+
 module.exports.match = function match(value, templates, props) {
 	const matchProps = (pattern, value) => {
 		if (!props) return false;
@@ -23,6 +25,8 @@ module.exports.match = function match(value, templates, props) {
 
 	const entries = templates instanceof Map ? templates.entries() : Array.isArray(templates) ? templates : Object.entries(templates);
 
+	let any;
+
 	for (const [pattern, callback] of entries) {
 		if (
 			isRegExp(pattern)
@@ -36,8 +40,17 @@ module.exports.match = function match(value, templates, props) {
 							: matchProps(pattern, value)
 		) {
 			return callback(...(isRegExp(pattern) ? pattern.exec(value) : [value]));
+		} else if(pattern == AnySymbol){
+			any = callback;
 		}
 	}
 
+	if(any){
+		return any(value);
+	}
+
 	return null;
 };
+
+
+module.exports.match.any = AnySymbol;

package/lib/rew/models/struct.js

@@ -9,14 +9,17 @@ module.exports.struct = function struct(template) {
 		types[key] = typeof value;
 	}
 
-	const fun = function (properties = {}) {
+	const fun = function (properties = {}, extra) {
 		var defaultValue, instance;
 		instance = {};
 		for (key in template) {
 			defaultValue = template[key];
-			if (key in properties) {
+			if(key.startsWith('@') && typeof template[key] == "function"){
+				const realname = key.slice(1);
+				instance[realname] = defaultValue(properties[realname]);
+			} else if (key in properties) {
 				value = properties[key];
-				if (defaultValue != '!any' && typeof value !== types[key]) {
+				if (defaultValue != '!any' && typeof value !== types[key] && types[key] !== '!any') {
 					throw new Error(`Type error: Expected ${types[key]} for ${key}, got ${typeof value}`);
 				}
 				instance[key] = value;
@@ -24,10 +27,17 @@ module.exports.struct = function struct(template) {
 				instance[key] = defaultValue == '!any' ? null : defaultValue;
 			}
 		}
+		if(typeof extra == "object"){
+			for(let i in extra){
+				instance[i] = extra[i];
+			}
+		}
 		instance.__proto__ = { '@instance': fun };
 		return instance;
 	};
 
+	fun.extends = (stuff) => struct({ ...template, ...stuff });
+
 	return fun;
 };
 

package/lib/rew/modules/context.js

@@ -5,6 +5,7 @@ const { imp } = require("../functions/import");
 const { customRequire } = require("../functions/require");
 const fsLib = require("../functions/fs");
 const pathLib = require("../functions/path");
+const path = require("path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
 const { USING_DEFAULT, Usage } = require("../const/usage");
@@ -60,6 +61,7 @@ module.exports.prepareContext = function (
       env: process.env,
       cwd: () => process.cwd(),
       arch: process.arch,
+      pid: process.pid
     };
 
   context.global = context;
@@ -106,6 +108,14 @@ module.exports.prepareContext = function (
     }
   };
 
+  if(context.app?.config?.exec?.['auto import']){
+    const autoipath = path.join(context.app.path, context.app.config?.exec?.['auto import']);
+    if(autoipath !== filepath){
+      const all = context.imp(path.relative(path.dirname(filepath), autoipath));
+      for(let i in all) context[i] = all[i];
+    }
+  }
+
   if (
     context.module.main ||
     (options.fromMain == true && options.as == "main")

package/package.json

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