@makano/rew 1.1.73 → 1.1.81

package/lib/rew/functions/import.js

@@ -11,17 +11,19 @@ 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');
+  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;
+    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;
-}
+};
 
 module.exports.imp = function (runPath, context) {
   return function (filename, options = {}) {
@@ -30,7 +32,14 @@ module.exports.imp = function (runPath, context) {
     let exports,
       ispkg = findPackage(filename);
 
-    let filepath = path.resolve(path.dirname(context.module.filepath), filename);
+    if (filename.startsWith("@") && context.app) {
+      filename = filename.replace("@", context.app.path);
+    }
+
+    let filepath = path.resolve(
+      path.dirname(context.module.filepath),
+      filename,
+    );
 
     // console.log(typeof runPath);
 
@@ -38,17 +47,24 @@ module.exports.imp = function (runPath, context) {
       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 && !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 (
+        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) {
@@ -59,24 +75,38 @@ module.exports.imp = function (runPath, context) {
       } 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,
+        },
+        execOptions.sharedContext == false
+          ? {}
+          : options.context && options.context == "new"
+            ? {}
+            : context,
+      ).context.module.exports;
 
     if (ispkg) {
-      exports = getPackage(filename)(context);
+      const pkg = getPackage(filename)(context);
+      exports = pkg._onImport ? pkg._onImport() : pkg;
     } else if (foundCache) {
-
     } else if (type == "coffee") {
       exports = exec({});
     } else if (type == "js") {

package/lib/rew/functions/map.js

@@ -1,9 +1,6 @@
-
-
-
 module.exports.map = function map(...args) {
   if (args.length % 2 !== 0) {
-    throw new Error('Arguments must be in key-value pairs');
+    throw new Error("Arguments must be in key-value pairs");
   }
 
   const result = new Map();
@@ -14,4 +11,4 @@ module.exports.map = function map(...args) {
   }
 
   return result;
-};
+};

package/lib/rew/functions/match.js

@@ -1,7 +1,7 @@
-
 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) => {
@@ -22,13 +22,29 @@ module.exports.match = function match(value, templates, props) {
 
   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)))) {
+    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;
-};
+};

package/lib/rew/functions/path.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require("path");
 
 module.exports = (currentFile) => {
   const e = {};
@@ -10,4 +10,4 @@ module.exports = (currentFile) => {
   e.presolve = (...paths) => path.resolve(...paths);
 
   return e;
-}
+};

package/lib/rew/functions/require.js

@@ -1,36 +1,39 @@
-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);
-}
+};
 
 function resolveModulePath(modulePath, filePath) {
-  if (modulePath.startsWith('./') || modulePath.startsWith('../') || path.isAbsolute(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 + ".js")) {
+      return fullPath + ".js";
     }
-    if (fs.existsSync(fullPath + '.json')) {
-      return fullPath + '.json';
+    if (fs.existsSync(fullPath + ".json")) {
+      return fullPath + ".json";
     }
     if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
-      const packageJsonPath = path.join(fullPath, 'package.json');
+      const packageJsonPath = path.join(fullPath, "package.json");
       if (fs.existsSync(packageJsonPath)) {
-        const main = require(packageJsonPath).main || 'index.js';
+        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');
+      const indexPath = path.join(fullPath, "index.js");
       if (fs.existsSync(indexPath)) {
         return indexPath;
       }
@@ -38,4 +41,4 @@ function resolveModulePath(modulePath, filePath) {
   }
 
   throw new Error(`Cannot find module '${modulePath}'`);
-}
+}

package/lib/rew/functions/stdout.js

@@ -1,9 +1,9 @@
-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) {
+const print = (module.exports.print = function print(...arguments) {
   return console.log(...arguments);
-};
+});
 
 print.stdout = process.stdout;
 print.stdin = process.stdin;
@@ -14,17 +14,17 @@ module.exports.input = function input(prompt) {
   let cmd;
   let args;
   if ("null" == "win32") {
-    cmd = 'cmd';
-    args = ['/V:ON', '/C', 'set /p response= && echo !response!'];
+    cmd = "cmd";
+    args = ["/V:ON", "/C", "set /p response= && echo !response!"];
   } else {
-    cmd = 'bash';
-    args = ['-c', 'read response; echo "$response"'];
+    cmd = "bash";
+    args = ["-c", 'read response; echo "$response"'];
   }
 
   let opts = {
-    stdio: ['inherit', 'pipe'],
+    stdio: ["inherit", "pipe"],
     shell: false,
   };
-  
+
   return spawnSync(cmd, args, opts).stdout.toString().trim();
-}
+};

package/lib/rew/functions/types.js

@@ -1,4 +1,3 @@
-
 const _defaultConstructors = {
   string: String,
   array: Array,
@@ -8,48 +7,68 @@ const _defaultConstructors = {
   symbol: Symbol,
   undefined: Object,
   object: Object,
-  function: Function
-}
-
-function getType(value){
-  return typeof value === 'object' ? Array.isArray(value) ? 'array' : typeof value : typeof value;
+  function: Function,
+};
+
+function getType(value) {
+  return typeof value === "object"
+    ? Array.isArray(value)
+      ? "array"
+      : typeof value
+    : typeof value;
 }
 
 function typedef(value, strict = false) {
   return {
     strict,
     defaultValue: value,
-    class: typeof value == 'function' ? value : typeof value === 'object' && value !== null && !Array.isArray(value) ? value.constructor : _defaultConstructors[getType(value)],
+    class:
+      typeof value == "function"
+        ? value
+        : typeof value === "object" && value !== null && !Array.isArray(value)
+          ? value.constructor
+          : _defaultConstructors[getType(value)],
     type: getType(value),
-    isConstucted: typeof value === 'object' && value !== null && !Array.isArray(value),
-    isEmpty: typeof value == "object" ? !Object.keys(value).length : typeof value == "string" ? value == "" : typeof value !== "function"
+    isConstucted:
+      typeof value === "object" && value !== null && !Array.isArray(value),
+    isEmpty:
+      typeof value == "object"
+        ? !Object.keys(value).length
+        : typeof value == "string"
+          ? value == ""
+          : typeof value !== "function",
   };
 }
 
 function typeis(obj, typeDef) {
   // Resolve Type
-  if(typeof typeDef == "function" && typeDef.type) typeDef = typeDef.type;
+  if (typeof typeDef == "function" && typeDef.type) typeDef = typeDef.type;
 
-  if (typeDef.isConstucted && typeDef.class && !(obj instanceof typeDef.class)) {
+  if (
+    typeDef.isConstucted &&
+    typeDef.class &&
+    !(obj instanceof typeDef.class)
+  ) {
     return false;
   }
 
-  if(getType(obj) == "object" && typeDef.type == 'function') {
-    return (obj instanceof typeDef.class);
+  if (getType(obj) == "object" && typeDef.type == "function") {
+    return obj instanceof typeDef.class;
   }
 
-  if(getType(obj) !== typeDef.type){
+  if (getType(obj) !== typeDef.type) {
     return false;
   }
 
-  if(!typeDef.isEmpty) {
-    if(typeDef.type == 'object'){
+  if (!typeDef.isEmpty) {
+    if (typeDef.type == "object") {
       for (const key in typeDef.defaultValue) {
         let propTypeDef = typeDef.defaultValue[key];
         // Resolve type
-        if(typeof propTypeDef == "function" && propTypeDef.type) propTypeDef = propTypeDef.type;
-    
-        if (typeof propTypeDef === 'object') {
+        if (typeof propTypeDef == "function" && propTypeDef.type)
+          propTypeDef = propTypeDef.type;
+
+        if (typeof propTypeDef === "object") {
           if (!typeis(obj[key], propTypeDef)) {
             return false;
           }
@@ -57,12 +76,17 @@ function typeis(obj, typeDef) {
           return false;
         }
       }
-      if(typeDef.strict) {
-        if(Object.keys(obj).some(key => !Object.keys(typeDef.defaultValue).includes(key))) return false;
+      if (typeDef.strict) {
+        if (
+          Object.keys(obj).some(
+            (key) => !Object.keys(typeDef.defaultValue).includes(key),
+          )
+        )
+          return false;
       }
-    } else if(typeDef.type == 'string'){
+    } else if (typeDef.type == "string") {
       return typeDef.defaultValue == obj;
-    } else if(typeDef.type == 'function'){
+    } else if (typeDef.type == "function") {
       return typeDef.defaultValue == obj;
     }
   }
@@ -78,46 +102,47 @@ function typei(child, parent) {
   return child instanceof parent || child.constructor === parent;
 }
 
-function int(str){
+function int(str) {
   return parseInt(str);
 }
-int.type = typedef(1)
+int.type = typedef(1);
 
-function float(str){
+function float(str) {
   return parseFloat(str);
 }
-float.type = typedef(1.0)
+float.type = typedef(1.0);
 
-function num(str){
+function num(str) {
   return Number(str);
 }
-num.type = typedef(1)
+num.type = typedef(1);
 
-function str(str){
+function str(str) {
   return str ? str.toString() : "";
 }
-str.type = typedef('')
-
-function bool(value){
-  return typeof value == 'string' ? (
-    value == 'true' ? true : false
-  ) : value !== null && value !== undefined;
+str.type = typedef("");
+
+function bool(value) {
+  return typeof value == "string"
+    ? value == "true"
+      ? true
+      : false
+    : value !== null && value !== undefined;
 }
-bool.type = typedef(true)
+bool.type = typedef(true);
 
 module.exports = {
   typex,
   typei,
   typeis,
   typedef,
-  
+
   int,
   float,
   num,
   str,
-  bool
-}
-
+  bool,
+};
 
 // const f = typedef('');
 // const fg = typedef({ g: f });
@@ -137,4 +162,4 @@ module.exports = {
 // let tn = typedef(n)
 
 // // console.log(typeis(g, fg), typeis(1, f), typei('', String));
-// console.log(typeis(l, tn));
+// console.log(typeis(l, tn));

package/lib/rew/html/ui.html

@@ -5,15 +5,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>$OPTIONS(title)</title>
 
-    <style>/* $OPTIONS(style) */</style>
-
+    <style>
+      /* $OPTIONS(style) */
+    </style>
 
     <script>
-      window.onerror = () => alert('ERror');
+      window.onerror = () => alert("ERror");
     </script>
   </head>
 
-  <body>
-
-  </body>
+  <body></body>
 </html>