@makano/rew 1.2.68 → 1.2.70

package/lib/rew/const/default.js

@@ -13,6 +13,7 @@ const { wait } = require('../functions/wait');
 const { scheduleFrame } = require('../functions/misc');
 const { jsons, yaml, json, yamls } = require('../functions/json');
 const { generateRandomID } = require('../functions/id');
+const { namespace } = require('./usage');
 
 module.exports = {
 	cenum,
@@ -50,6 +51,8 @@ module.exports = {
 	yaml,
 	yamls,
 
+	namespace,
+
 	genID: generateRandomID,
 
 	curl,

package/lib/rew/const/usage.js

@@ -16,14 +16,31 @@ module.exports.USING_DEFAULT = {
 
 module.exports.Usage = class Usage {
   name = "null";
-  trigger = () => {}
+  trigger = () => {};
+  save = true;
 
-  constructor(name, trigger){
+  constructor(name, trigger, save){
     this.name = name;
     this.trigger = trigger;
+    this.save = save;
   }
 
-  create(name, trigger){
-    return new Usage(name, trigger);
+  create(name, trigger, save = true){
+    return new Usage(name, trigger, save);
   }
+}
+
+class Namespace extends module.exports.Usage {
+  namespace = {};
+  constructor(ns, cb){
+    super('namespace');
+    this.save = false;
+    this.trigger = cb;
+    this.namespace = ns;
+  }
+}
+module.exports.Namespace = Namespace;
+
+module.exports.namespace = (namespace, cb) => {
+  return new Namespace(namespace, cb);
 }

package/lib/rew/functions/require.js

@@ -5,9 +5,9 @@ const { wait } = require('./wait');
 
 const cahcedRequires = {};
 
-const doImp = (path) => wait(async () => await import(resolvedPath));
+const doImp = (path) => wait(async () => await import(path));
 
-module.exports.customRequire = function customRequire(modulePath, filePath) {
+module.exports.customRequire = function customRequire(modulePath, filePath, esm) {
 	let pathname = modulePath;
 	if (modulePath.startsWith('./') || modulePath.startsWith('../') || path.isAbsolute(modulePath)) {
 		pathname = path.resolve(modulePath);
@@ -17,7 +17,24 @@ module.exports.customRequire = function customRequire(modulePath, filePath) {
 	}
 	const resolvedPath = resolveModulePath(modulePath, filePath);
 	if(!resolvedPath) throw new Error('Module '+modulePath+' not found');
-	const r = cahcedRequires[resolvedPath] ? cahcedRequires[resolvedPath] : execOptions.useImport ? doImp(resolvedPath) : require(resolvedPath);
+
+	let isEsm = esm || false;
+	const get_file = () => cahcedRequires[resolvedPath] ? cahcedRequires[resolvedPath] : execOptions.useImport || isEsm ? doImp(resolvedPath) : require(resolvedPath);
+
+	let r;
+
+	try{
+		r = get_file();
+	} catch(e){
+		if(e.code === 'ERR_REQUIRE_ESM') {
+			isEsm = true;
+			console.log('Trying with esm');
+			r = get_file();
+		} else {
+			throw e;
+		}
+	}
+	
 	if(!cahcedRequires[resolvedPath]) cahcedRequires[resolvedPath] = r;
 	if(!cahcedRequires[pathname]) cahcedRequires[pathname] = r;
 	return r;
@@ -40,10 +57,13 @@ function resolveModulePath(modulePath, filePath) {
 		
 		if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
 			return searchInPath(fullPath);
+		} else if (fs.existsSync(fullPath) && fs.statSync(fullPath).isFile()) {
+			return fullPath;
 		}
 
 		const rootPath = modulePath.split('/').shift();
 		const halfFullPath = path.join(basePath, rootPath);
+
 		if (fs.existsSync(halfFullPath) && fs.statSync(halfFullPath).isDirectory()) {
 			return searchInPath(halfFullPath, ['.'].concat(fullPath.split('/').slice(1)).join('/'));
 		}
@@ -61,8 +81,8 @@ function searchInPath(fullPath, exportses){
 			}
 		}
 		if(typeof main == "object"){
-			if(Array.isArray(main)) main = main[0].require;
-			else main = main.require;
+			if(Array.isArray(main)) main = execOptions.useImport ? main[0].import || main[0].require : main[0].require || main[0].import;
+			else main = execOptions.useImport ? main.import || main.require : main.require || main.import;
 		}
 		const mainPath = path.join(fullPath, main);
 		if (fs.existsSync(mainPath)) {

package/lib/rew/modules/context.js

@@ -8,7 +8,8 @@ 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");
+const { USING_DEFAULT, Usage, Namespace } = require("../const/usage");
+const runtime = require("./runtime");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -67,7 +68,8 @@ module.exports.prepareContext = function (
   context.global = context;
   context.imports.assert = options.import ?? {};
   context.imp = imp(runPath, context);
-  context.require = (package) => {
+  context.import = context.imp;
+  context.require = (package, esm) => {
     try {
       const search = execOptions.nativeRequire || package.startsWith("node:")
         ? require(
@@ -75,7 +77,7 @@ module.exports.prepareContext = function (
               ? package.split("node:")[1]
               : package,
           )
-        : customRequire(package, filepath);
+        : customRequire(package, filepath, esm);
         if(!search) throw new Error("Module " + package + " not found");
         return search;
     } catch (e) {
@@ -88,8 +90,15 @@ module.exports.prepareContext = function (
         throw new Error("");
       return context.imp(package, asserts);
     } catch (e) {
+      let pname = package.startsWith("pkg:") ? package.split("pkg:")[1] : package;
+      if(pname.endsWith('#esm')){
+        pname = pname.slice(0, -4);
+        if(!asserts) asserts = { esm: true };
+        else asserts.esm = true;
+      }
       return context.require(
-        package.startsWith("pkg:") ? package.split("pkg:")[1] : package,
+        pname,
+        asserts?.esm
       );
     }
   };
@@ -101,8 +110,16 @@ module.exports.prepareContext = function (
       if(USING_DEFAULT[name].param) {
         context.__using__[name] = USING_DEFAULT[name].param(...params);
       }
-    }  else if(name instanceof Usage) {
-      context.__using__[name.name] = name.trigger(...params) || true;
+    } else if(name instanceof Namespace) {
+      const trigger = name.trigger;
+      const childContext = {...context, ...name.namespace, trigger};
+      childContext.currentNamespace = name.namespace;
+      childContext.parentNamespace = context;
+      const code = `(${trigger.toString()})()`;
+      runtime.exec(code, childContext, code, context.module.filepath);
+    } else if(name instanceof Usage) {
+      const v = name.trigger(...params) || true;
+      if(name.save !== false) context.__using__[name.name] = v;
     } else {
       context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
     }

package/lib/rew/modules/runtime.js

@@ -7,9 +7,9 @@ const path = require('path');
 
 const preScript = readFileSync(path.join(__dirname, '../const/pre-exec.js'), { encoding: 'utf-8' });
 
-const exec = (module.exports.exec = function (code, context, original = '') {
+const exec = (module.exports.exec = function (code, context, original = '', filepath) {
 	return vm.runInNewContext(code, context.do ? null : vm.createContext(context), {
-		filename: context.module.filepath,
+		filename: filepath || context.module.filepath,
 		lineOffset: (original.split('\n').length + preScript.split('\n').length) - code.split('\n').length,
 		displayErrors: true,
 	});

package/package.json

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

package/runtime.d.ts

@@ -942,9 +942,12 @@ declare function using(fn: any, ...args: any[]): any;
 declare function wait(fn: CallableFunction, ...args: any[]): any;
 declare function clear(): void;
 
+declare function namespace(object: any, callback: () => any): Usage;
+
 declare class Usage<T = () => void> {
   name: string;
   trigger: T;
-  constructor(name: string, trigger: T);
-  create(name: string, trigger: T): Usage;
+  save: boolean;
+  constructor(name: string, trigger: T, save: boolean);
+  create(name: string, trigger: T, save: boolean): Usage;
 }