@makano/rew 1.1.81 → 1.2.1

package/lib/rew/functions/future.js

@@ -1,23 +1,31 @@
-const emitter = require("./emitter");
+const emitter = require('./emitter');
 
-module.exports = function future(callback, timeout = 0, defData = null) {
-  const listener = emitter();
-  const promise = new Promise((resolve, reject) => {
-    listener.on("resolve", (data) => {
-      resolve(data);
-    });
-    listener.on("reject", (data) => {
-      reject(data);
-    });
-    callback(resolve, reject);
-    if (timeout) setTimeout(() => resolve(defData), timeout);
-  });
-  return {
-    pipe: (callback) => promise.then(callback),
-    last: (callback) => promise.finally(callback),
-    catch: (callback) => promise.catch(callback),
-    resolve: (data) => listener.emit("resolve", data),
-    reject: (data) => listener.emit("reject", data),
-    wait: async () => await promise,
-  };
+function future(callback, timeout = 0, defData = null) {
+	const listener = emitter();
+	const promise = new Promise((resolve, reject) => {
+		listener.on('resolve', (data) => {
+			resolve(data);
+		});
+		listener.on('reject', (data) => {
+			reject(data);
+		});
+		callback(resolve, reject);
+		if (timeout) setTimeout(() => resolve(defData), timeout);
+	});
+	return {
+		pipe: (callback) => promise.then(callback),
+		last: (callback) => promise.finally(callback),
+		catch: (callback) => promise.catch(callback),
+		resolve: (data) => listener.emit('resolve', data),
+		reject: (data) => listener.emit('reject', data),
+		wait: async () => await promise,
+	};
 };
+
+future.promise = (promse, timeout = 0, defData = null) => {
+  return future((resolve, reject) => {
+    promse.then(resolve).catch(reject);
+  }, timeout, defData);
+}
+
+module.exports = future;

package/lib/rew/functions/id.js

@@ -1,13 +1,12 @@
 module.exports.generateRandomID = function generateRandomID(length = 12) {
-  const characters =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  const charactersLength = characters.length;
-  let randomID = "";
+	const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+	const charactersLength = characters.length;
+	let randomID = '';
 
-  for (let i = 0; i < length; i++) {
-    const randomIndex = Math.floor(Math.random() * charactersLength);
-    randomID += characters.charAt(randomIndex);
-  }
+	for (let i = 0; i < length; i++) {
+		const randomIndex = Math.floor(Math.random() * charactersLength);
+		randomID += characters.charAt(randomIndex);
+	}
 
-  return randomID;
+	return randomID;
 };

package/lib/rew/functions/import.js

@@ -1,142 +1,126 @@
-const path = require("path");
-const { getFile, file } = require("../modules/fs");
-const { importYaml } = require("../modules/yaml");
-const { findPackage, getPackage } = require("../pkgs/pkgs");
-const { existsSync, readFileSync } = require("fs");
-const conf = require("../pkgs/conf");
-const jsYaml = require("js-yaml");
-const { execOptions } = require("../const/opt");
+const path = require('path');
+const { getFile, file } = require('../modules/fs');
+const { importYaml } = require('../modules/yaml');
+const { findPackage, getPackage } = require('../pkgs/pkgs');
+const { existsSync, readFileSync } = require('fs');
+const conf = require('../pkgs/conf');
+const jsYaml = require('js-yaml');
+const { execOptions } = require('../const/opt');
 
 const cachedFiles = [];
 
 const lookUpInOtherApps = (fullPath) => {
-  const con = conf({});
-  const name = fullPath.indexOf("/") ? fullPath.split("/")[0] : fullPath;
-  let dpath = fullPath.indexOf("/") ? fullPath.split("/")[1] : "";
-  let ppath = path.join(con.CONFIG_PATH, name, "app");
-  if (!existsSync(ppath)) return null;
-  if (!dpath) {
-    dpath = jsYaml.load(
-      readFileSync(path.join(ppath, "app.yaml"), "utf-8"),
-    ).entry;
-  }
-  ppath = path.join(ppath, dpath);
-  if (existsSync(ppath)) return ppath;
-  else return null;
+	const con = conf({});
+	const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
+	let dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
+	let ppath = path.join(con.CONFIG_PATH, name, 'app');
+	const config = jsYaml.load(readFileSync(path.join(ppath, 'app.yaml'), 'utf-8'));
+	if (!existsSync(ppath)) return null;
+	if (!dpath) {
+		dpath = config.entry;
+	}
+	if(config.private == true) return null;
+	const pepath = path.join(ppath, dpath);
+	if(Array.isArray(config.private)){
+		if(config.private.find(f => pepath == path.join(ppath, f))) return null;
+	}
+	if (existsSync(pepath)) return pepath;
+	else return null;
 };
 
 module.exports.imp = function (runPath, context) {
-  return function (filename, options = {}) {
-    if (!options) options = {};
-    let type = options.type || "coffee";
-    let exports,
-      ispkg = findPackage(filename);
+	return function (filename, options = {}) {
+		if (!options) options = {};
+		let type = options.type || 'coffee';
+		let exports,
+			ispkg = findPackage(filename);
 
-    if (filename.startsWith("@") && context.app) {
-      filename = filename.replace("@", context.app.path);
-    }
+		if (filename.startsWith('@') && context.app) {
+			filename = filename.replace('@', context.app.path);
+		}
 
-    let filepath = path.resolve(
-      path.dirname(context.module.filepath),
-      filename,
-    );
+		let filepath = path.resolve(path.dirname(context.module.filepath), filename);
+		if(path.extname(filepath) == '.qrew') options.qrew = true;
 
-    // console.log(typeof runPath);
+		// console.log(typeof runPath);
 
-    const lookUp = () => {
-      const otherPath = lookUpInOtherApps(filename);
-      if (!otherPath) throw new Error('Module "' + filename + '" not found');
-      else filepath = otherPath;
-    };
+		const lookUp = () => {
+			const otherPath = lookUpInOtherApps(filename);
+			if (!otherPath) throw new Error('Module "' + filename + '" not found');
+			else filepath = otherPath;
+		};
 
-    const foundCache = cachedFiles.find((f) => f.filepath == filepath);
+		const foundCache = cachedFiles.find((f) => f.filepath == filepath);
 
-    if (!ispkg && foundCache) {
-      exports = foundCache.exports;
-    }
+		if (!ispkg && foundCache) {
+			exports = foundCache.exports;
+		}
 
-    if (!ispkg && !existsSync(filepath)) {
-      if (
-        Array.isArray(execOptions.resolveExtensions) &&
-        execOptions.resolveExtensions.length
-      ) {
-        const resolve = execOptions.resolveExtensions.find((ext) =>
-          typeof ext == "string"
-            ? existsSync(filepath + ext)
-            : existsSync(filepath + (ext.ext || "")),
-        );
-        if (resolve) {
-          filepath += typeof resolve == "string" ? resolve : resolve.ext;
-          if (typeof resolve == "object" && resolve.options) {
-            if (resolve.options.type) type = resolve.options.type;
-            for (let i in resolve.options) options[i] = resolve.options[i];
-          }
-        } else lookUp();
-      } else lookUp();
-    }
+		if (!ispkg && !existsSync(filepath)) {
+			if (Array.isArray(execOptions.resolveExtensions) && execOptions.resolveExtensions.length) {
+				const resolve = execOptions.resolveExtensions.find((ext) =>
+					typeof ext == 'string' ? existsSync(filepath + ext) : existsSync(filepath + (ext.ext || '')),
+				);
+				if (resolve) {
+					filepath += typeof resolve == 'string' ? resolve : resolve.ext;
+					if (typeof resolve == 'object' && resolve.options) {
+						if (resolve.options.type) type = resolve.options.type;
+						for (let i in resolve.options) options[i] = resolve.options[i];
+					}
+				} else lookUp();
+			} else lookUp();
+		}
 
-    const exec = (coptions = {}) =>
-      runPath(
-        filepath,
-        {
-          import: options,
-          main: false,
-          useContext:
-            execOptions.sharedContext == false
-              ? false
-              : !(options.context && options.context == "new"),
-          ...coptions,
-          as:
-            options.as == "main"
-              ? context.module.main
-                ? "main"
-                : "parent"
-              : options.as == "parent"
-                ? "parent"
-                : "child",
-          fromMain: context.module.main,
-        },
-        execOptions.sharedContext == false
-          ? {}
-          : options.context && options.context == "new"
-            ? {}
-            : context,
-      ).context.module.exports;
+		const exec = (coptions = {}) =>
+			runPath(
+				filepath,
+				{
+					import: options,
+					main: false,
+					useContext: execOptions.sharedContext == false ? false : !(options.context && options.context == 'new'),
+					...coptions,
+					as: options.as == 'main' ? (context.module.main ? 'main' : 'parent') : options.as == 'parent' ? 'parent' : 'child',
+					fromMain: context.module.main,
+					qrew: options.qrew,
+					package: context.app ? context.app.config.package : path.basename(filepath)
+				},
+				execOptions.sharedContext == false ? {} : options.context && options.context == 'new' ? {} : context,
+			).context.module.exports;
 
-    if (ispkg) {
-      const pkg = getPackage(filename)(context);
-      exports = pkg._onImport ? pkg._onImport() : pkg;
-    } else if (foundCache) {
-    } else if (type == "coffee") {
-      exports = exec({});
-    } else if (type == "js") {
-      exports = exec({ compile: false });
-    } else if (type == "yaml" || type == "json" || type == "text") {
-      const f = getFile(filepath);
-      if (type == "yaml") {
-        exports = importYaml(f.path, f);
-      } else if (type == "json") {
-        try {
-          exports = JSON.parse(f.content);
-        } catch (e) {
-          exports = {};
-        }
-      } else {
-        exports = f.content;
-      }
-    }
+		if (ispkg) {
+			const pkg = getPackage(filename)(context);
+			exports = pkg._onImport ? pkg._onImport() : pkg;
+		} else if (foundCache) {
+		} else if (type == 'coffee') {
+			exports = exec({});
+		} else if (type == 'js') {
+			exports = exec({ compile: false });
+		} else if (type == 'yaml' || type == 'json' || type == 'text') {
+			const f = getFile(filepath);
+			if (type == 'yaml') {
+				exports = importYaml(f.path, f);
+			} else if (type == 'json') {
+				try {
+					exports = JSON.parse(f.content);
+				} catch (e) {
+					exports = {};
+				}
+			} else {
+				exports = f.content;
+			}
+		}
 
-    if (options.save && (type == "js" || type == "coffee")) {
-      if (typeof options.save == "string") context[options.save] = exports[i];
-      else
-        for (let i in exports) {
-          context[i] = exports[i];
-        }
-    }
+		if (options.save && (type == 'js' || type == 'coffee')) {
+			if (typeof options.save == 'string') context[options.save] = exports[i];
+			else
+				for (let i in exports) {
+					context[i] = exports[i];
+				}
+		}
 
-    if (!ispkg) context.module.imports.push(filepath);
-    if (!ispkg) cachedFiles.push({ filepath, exports });
+		if (!ispkg) context.module.imports.push(filepath);
+		if (!ispkg) cachedFiles.push({ filepath, exports });
 
-    return exports;
-  };
+		return exports;
+	};
 };

package/lib/rew/functions/map.js

@@ -1,14 +1,14 @@
 module.exports.map = function map(...args) {
-  if (args.length % 2 !== 0) {
-    throw new Error("Arguments must be in key-value pairs");
-  }
+	if (args.length % 2 !== 0) {
+		throw new Error('Arguments must be in key-value pairs');
+	}
 
-  const result = new Map();
-  for (let i = 0; i < args.length; i += 2) {
-    const key = args[i];
-    const value = args[i + 1];
-    result.set(key, value);
-  }
+	const result = new Map();
+	for (let i = 0; i < args.length; i += 2) {
+		const key = args[i];
+		const value = args[i + 1];
+		result.set(key, value);
+	}
 
-  return result;
+	return result;
 };

package/lib/rew/functions/match.js

@@ -1,50 +1,43 @@
-const SerializableData = ["string", "number", "boolean"];
+const SerializableData = ['string', 'number', 'boolean'];
 
-const isRegExp = (obj) =>
-  Object.prototype.toString.call(obj) === "[object RegExp]";
+const isRegExp = (obj) => Object.prototype.toString.call(obj) === '[object RegExp]';
 
 module.exports.match = function match(value, templates, props) {
-  const matchProps = (pattern, value) => {
-    if (!props) return false;
-    if (typeof props === "object") {
-      let t = true;
-      for (let i in props) {
-        t = t && pattern[i] == value[i];
-        if (!t) break;
-      }
-      return t;
-    } else if (typeof props === "function") {
-      return props(pattern, value);
-    } else {
-      return false;
-    }
-  };
+	const matchProps = (pattern, value) => {
+		if (!props) return false;
+		if (typeof props === 'object') {
+			let t = true;
+			for (let i in props) {
+				t = t && pattern[i] == value[i];
+				if (!t) break;
+			}
+			return t;
+		} else if (typeof props === 'function') {
+			return props(pattern, value);
+		} else {
+			return false;
+		}
+	};
 
-  const matchRegex = (pattern, value) => pattern.test(value);
+	const matchRegex = (pattern, value) => pattern.test(value);
 
-  const entries =
-    templates instanceof Map
-      ? templates.entries()
-      : Array.isArray(templates)
-        ? templates
-        : Object.entries(templates);
+	const entries = templates instanceof Map ? templates.entries() : Array.isArray(templates) ? templates : Object.entries(templates);
 
-  for (const [pattern, callback] of entries) {
-    if (
-      isRegExp(pattern)
-        ? matchRegex(pattern, value)
-        : SerializableData.includes(typeof value)
-          ? pattern == value
-          : isRegExp(pattern)
-            ? matchRegex(pattern, value)
-            : typeof pattern === "function"
-              ? value instanceof pattern ||
-                value?.__proto__?.["@instance"] === pattern
-              : matchProps(pattern, value)
-    ) {
-      return callback(...(isRegExp(pattern) ? pattern.exec(value) : [value]));
-    }
-  }
+	for (const [pattern, callback] of entries) {
+		if (
+			isRegExp(pattern)
+				? matchRegex(pattern, value)
+				: SerializableData.includes(typeof value)
+					? pattern == value
+					: isRegExp(pattern)
+						? matchRegex(pattern, value)
+						: typeof pattern === 'function'
+							? value instanceof pattern || value?.__proto__?.['@instance'] === pattern
+							: matchProps(pattern, value)
+		) {
+			return callback(...(isRegExp(pattern) ? pattern.exec(value) : [value]));
+		}
+	}
 
-  return null;
+	return null;
 };

package/lib/rew/functions/path.js

@@ -1,13 +1,13 @@
-const path = require("path");
+const path = require('path');
 
 module.exports = (currentFile) => {
-  const e = {};
-  e.basename = (pathname, suffix) => path.basename(pathname, suffix);
-  e.dirname = (pathname) => path.dirname(pathname);
-  e.extname = (pathname) => path.extname(pathname);
+	const e = {};
+	e.basename = (pathname, suffix) => path.basename(pathname, suffix);
+	e.dirname = (pathname) => path.dirname(pathname);
+	e.extname = (pathname) => path.extname(pathname);
 
-  e.pjoin = (...paths) => path.join(...paths);
-  e.presolve = (...paths) => path.resolve(...paths);
+	e.pjoin = (...paths) => path.join(...paths);
+	e.presolve = (...paths) => path.resolve(...paths);
 
-  return e;
+	return e;
 };

package/lib/rew/functions/require.js

@@ -1,44 +1,40 @@
-const fs = require("fs");
-const path = require("path");
+const fs = require('fs');
+const path = require('path');
 
 module.exports.customRequire = function customRequire(modulePath, filePath) {
-  const resolvedPath = resolveModulePath(modulePath, filePath);
-  return require(resolvedPath);
+	const resolvedPath = resolveModulePath(modulePath, filePath);
+	return require(resolvedPath);
 };
 
 function resolveModulePath(modulePath, filePath) {
-  if (
-    modulePath.startsWith("./") ||
-    modulePath.startsWith("../") ||
-    path.isAbsolute(modulePath)
-  ) {
-    return path.resolve(modulePath);
-  }
+	if (modulePath.startsWith('./') || modulePath.startsWith('../') || path.isAbsolute(modulePath)) {
+		return path.resolve(modulePath);
+	}
 
-  const paths = module.constructor._nodeModulePaths(path.dirname(filePath));
-  for (const basePath of paths) {
-    const fullPath = path.join(basePath, modulePath);
-    if (fs.existsSync(fullPath + ".js")) {
-      return fullPath + ".js";
-    }
-    if (fs.existsSync(fullPath + ".json")) {
-      return fullPath + ".json";
-    }
-    if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
-      const packageJsonPath = path.join(fullPath, "package.json");
-      if (fs.existsSync(packageJsonPath)) {
-        const main = require(packageJsonPath).main || "index.js";
-        const mainPath = path.join(fullPath, main);
-        if (fs.existsSync(mainPath)) {
-          return mainPath;
-        }
-      }
-      const indexPath = path.join(fullPath, "index.js");
-      if (fs.existsSync(indexPath)) {
-        return indexPath;
-      }
-    }
-  }
+	const paths = module.constructor._nodeModulePaths(path.dirname(filePath));
+	for (const basePath of paths) {
+		const fullPath = path.join(basePath, modulePath);
+		if (fs.existsSync(fullPath + '.js')) {
+			return fullPath + '.js';
+		}
+		if (fs.existsSync(fullPath + '.json')) {
+			return fullPath + '.json';
+		}
+		if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
+			const packageJsonPath = path.join(fullPath, 'package.json');
+			if (fs.existsSync(packageJsonPath)) {
+				const main = require(packageJsonPath).main || 'index.js';
+				const mainPath = path.join(fullPath, main);
+				if (fs.existsSync(mainPath)) {
+					return mainPath;
+				}
+			}
+			const indexPath = path.join(fullPath, 'index.js');
+			if (fs.existsSync(indexPath)) {
+				return indexPath;
+			}
+		}
+	}
 
-  throw new Error(`Cannot find module '${modulePath}'`);
+	throw new Error(`Cannot find module '${modulePath}'`);
 }

package/lib/rew/functions/sleep.js

@@ -1,5 +1,5 @@
-const future = require("./future");
+const future = require('./future');
 
 module.exports = async function sleep(time) {
-  return new Promise((r) => setTimeout(r, time));
+	return new Promise((r) => setTimeout(r, time));
 };

package/lib/rew/functions/stdout.js

@@ -1,30 +1,30 @@
-const { execSync, spawnSync } = require("child_process");
-const fs = require("fs");
+const { execSync, spawnSync } = require('child_process');
+const fs = require('fs');
 
 const print = (module.exports.print = function print(...arguments) {
-  return console.log(...arguments);
+	return console.log(...arguments);
 });
 
 print.stdout = process.stdout;
 print.stdin = process.stdin;
 
 module.exports.input = function input(prompt) {
-  process.stdout.write(prompt);
+	process.stdout.write(prompt);
 
-  let cmd;
-  let args;
-  if ("null" == "win32") {
-    cmd = "cmd";
-    args = ["/V:ON", "/C", "set /p response= && echo !response!"];
-  } else {
-    cmd = "bash";
-    args = ["-c", 'read response; echo "$response"'];
-  }
+	let cmd;
+	let args;
+	if ('null' == 'win32') {
+		cmd = 'cmd';
+		args = ['/V:ON', '/C', 'set /p response= && echo !response!'];
+	} else {
+		cmd = 'bash';
+		args = ['-c', 'read response; echo "$response"'];
+	}
 
-  let opts = {
-    stdio: ["inherit", "pipe"],
-    shell: false,
-  };
+	let opts = {
+		stdio: ['inherit', 'pipe'],
+		shell: false,
+	};
 
-  return spawnSync(cmd, args, opts).stdout.toString().trim();
+	return spawnSync(cmd, args, opts).stdout.toString().trim();
 };