@makano/rew 1.2.3 → 1.2.5

package/lib/rew/functions/curl.js

@@ -17,7 +17,7 @@ module.exports.curl = function curl(options, url){
   }).then(async r => {
     if(options.o) fs.writeFileSync(options.o, Buffer.from(await r.clone().arrayBuffer()));
     return r;
-  }).then(r => options.json ? r.clone().json() : r));
+  }).then(r => options.json ? r.clone().json() : options.text ? r.clone().text() : r));
   if(options.a) return f.wait();
   else return f;
 }

package/lib/rew/functions/exec.js

@@ -23,8 +23,8 @@ module.exports = (currentFile) => {
 		);
 	};
 
-	function spawn(command, options) {
-		return shell.spawn(command, options);
+	function spawn(command, ...args) {
+		return shell.spawn(command, ...args);
 	}
 
 	return { exec, spawn };

package/lib/rew/functions/id.js

@@ -1,5 +1,5 @@
-module.exports.generateRandomID = function generateRandomID(length = 12) {
-	const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+module.exports.generateRandomID = function generateRandomID(length = 12, _characters) {
+	const characters = _characters || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 	const charactersLength = characters.length;
 	let randomID = '';
 

package/lib/rew/functions/import.js

@@ -57,7 +57,7 @@ module.exports.imp = function (runPath, context) {
 			exports = foundCache.exports;
 		}
 
-		if (!ispkg && !existsSync(filepath)) {
+		if (!ispkg && !existsSync(filepath) && !foundCache) {
 			if (Array.isArray(execOptions.resolveExtensions) && execOptions.resolveExtensions.length) {
 				const resolve = execOptions.resolveExtensions.find((ext) =>
 					typeof ext == 'string' ? existsSync(filepath + ext) : existsSync(filepath + (ext.ext || '')),
@@ -119,8 +119,24 @@ module.exports.imp = function (runPath, context) {
 				}
 		}
 
-		if (!ispkg) context.module.imports.push(filepath);
-		if (!ispkg) cachedFiles.push({ filepath, exports });
+		// Hehe, i just had an idea for a
+		// descriptive code
+		// you put them in comment blocks
+		// and name it something
+		// then you can simple see 
+		// which part of a code contains a certain
+		// task. cool right?
+	
+		//**  If is not package, post exec section
+		/**/ if (!ispkg) context.module.imports.push(filepath);
+		/**/ if (!ispkg) cachedFiles.push({ filepath, exports });
+		//** 
+
+		//**  Mock imports section	
+		/**/ if(!exports) exports = options.mock;
+		/**/ if(options.mock == null) return null;
+		/**/ if(!exports) throw new Error('Import '+filename+' does not export anything. Use the "mock" option to mock a value.');
+		//** 
 
 		return exports;
 	};

package/lib/rew/functions/json.js

@@ -0,0 +1,27 @@
+const jsYaml = require("js-yaml");
+
+
+
+function json(thing){
+  return JSON.parse(thing);
+}
+
+function jsons(thing){
+  return JSON.stringify(thing);
+}
+
+
+function yaml(thing){
+  return jsYaml.loadAll(thing)[0];
+}
+
+function yamls(thing){
+  return jsYaml.dump(thing);
+}
+
+module.exports = {
+  yaml,
+  yamls,
+  json,
+  jsons
+}

package/lib/rew/functions/require.js

@@ -3,6 +3,7 @@ const path = require('path');
 
 module.exports.customRequire = function customRequire(modulePath, filePath) {
 	const resolvedPath = resolveModulePath(modulePath, filePath);
+	if(!resolvedPath) throw new Error('Module '+modulePath+' not found');
 	return require(resolvedPath);
 };
 
@@ -20,21 +21,40 @@ function resolveModulePath(modulePath, filePath) {
 		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;
-			}
+			return searchInPath(fullPath);
 		}
-	}
 
-	throw new Error(`Cannot find module '${modulePath}'`);
+		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('/'));
+		}
+	}
 }
+
+function searchInPath(fullPath, exportses){
+	const packageJsonPath = path.join(fullPath, 'package.json');
+	if (fs.existsSync(packageJsonPath)) {
+		const packageJson = require(packageJsonPath);
+		let main = packageJson.main || 'index.js';
+		if(exportses){
+			if(packageJson.exports){
+				if(exportses in packageJson.exports) main = packageJson.exports[exportses];
+			}
+		}
+		if(typeof main == "object"){
+			if(Array.isArray(main)) main = main[0].require;
+			else main = main.require;
+		}
+		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;
+	}
+}

package/lib/rew/modules/compiler.js

@@ -145,6 +145,19 @@ function compileRewStuff(content, options) {
       continue;
 		}
 
+
+		if (token.type === 'IDENTIFIER' && token.value === 'let') {
+			result += '`'
+			hooks.push({
+				index: fnextToken(i, tokens, 'OTHER', ';').ti,
+				value: `\``,
+			});
+		}
+
+		if (token.type === 'IDENTIFIER' && token.value === 'export') {
+			token.value = 'pub';
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'import') {
 			// console.log(nextToken.type);
 			let ind = i + n + 2;
@@ -213,9 +226,16 @@ function compileRewStuff(content, options) {
 			nextToken.value &&
 			nextToken.value !== 'undefined'
 		) {
+			let next = {...nextToken};
+			if(next.value == 'default'){
+				i += 2;
+			}
+			if(next.value == 'class'){
+				next.value = gnextToken(i, n + 1, tokens)?.token.value || "default";
+			}
 			hooks.push({
 				index: i + 1,
-				value: `"${nextToken.value}", `,
+				value: `"${next.value}", `,
 			});
 		}
 
@@ -254,13 +274,20 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 
 module.exports.compileFile = function (filepath, options = {}) {
 	const f = getFile(filepath);
+	let qrew = false;
 
 	if(options.qrew || path.extname(filepath) == '.qrew') {
+		qrew = true
 		f.content = from_qrew(readFileSync(f.path), options.package || findAppInfo(filepath)?.config.manifest.package || path.basename(filepath).split('.').slice(0, -1).join('.')).toString();
-	}
+	} 
 
 	let compiled_code =  cpl(f, { ...options });
 
+	if(options.onlyCompile && !qrew){
+		console.log(compiled_code);
+		process.exit();
+	}
+
 	return {
 		compiled_code,
 		file: f,

package/lib/rew/modules/context.js

@@ -42,19 +42,6 @@ module.exports.prepareContext = function (
       ...defaultContext,
       ...pathLib(filepath),
       ...execLib(filepath),
-      require: (package) => {
-        try {
-          return execOptions.nativeRequire || package.startsWith("node:")
-            ? require(
-                package.startsWith("node:")
-                  ? package.split("node:")[1]
-                  : package,
-              )
-            : customRequire(package, filepath);
-        } catch (e) {
-          throw new Error("Module " + package + " not found");
-        }
-      },
       ...custom_context,
     };
   }
@@ -66,6 +53,7 @@ module.exports.prepareContext = function (
         off: (event, listener) => process.off(event, listener),
         emit: (event, code) => process.emit(event, code),
       },
+      __execFile: global.fileName,
       env: process.env,
       cwd: () => process.cwd(),
       arch: process.arch,
@@ -74,6 +62,21 @@ module.exports.prepareContext = function (
   context.global = context;
   context.imports.assert = options.import ?? {};
   context.imp = imp(runPath, context);
+  context.require = (package) => {
+    try {
+      const search = execOptions.nativeRequire || package.startsWith("node:")
+        ? require(
+            package.startsWith("node:")
+              ? package.split("node:")[1]
+              : package,
+          )
+        : customRequire(package, filepath);
+        if(!search) throw new Error("Module " + package + " not found");
+        return search;
+    } catch (e) {
+      throw e;
+    }
+  };
   context.inc = (package, asserts) => {
     try {
       if (package.startsWith("node:") || package.startsWith("pkg:"))

package/lib/rew/modules/yaml.js

@@ -22,7 +22,7 @@ function yamlFile(file) {
 		}),
 	]);
 
-	return yaml.load(file.content, { schema });
+	return file.content.startsWith('---') ? yaml.loadAll(file.content, { schema })[0] : yaml.load(file.content, { schema });
 }
 
 const importYaml = (module.exports.importYaml = function importYaml(filepath, file) {

package/lib/rew/pkgs/conf.js

@@ -14,7 +14,7 @@ module.exports = (context) => ({
 	CONFIG_PATH,
 	_onImport() {
 		if (context.app) {
-			return this.create(context.app.config.package);
+			return this.create(context.app.config.manifest.package);
 		} else {
 			return this.create(seededID(path.basename(context.module.filepath).replace(/[-_/\.]/g, '')));
 		}
@@ -82,7 +82,7 @@ module.exports = (context) => ({
 			};
 
 			return {
-				get: (key, defaultValue) => getData(optionCenter, key) || defaultValue,
+				get: (key, defaultValue) => getData(optionCenter, key) ?? defaultValue,
 				set: (key, value) => setData(optionCenter, key, value),
 				remove: (key) => removeData(optionCenter, key),
 				reset: () => fs.writeFileSync(optionCenter.root, dumpYaml(defaults)) && (conf[name] = defaults),
@@ -101,6 +101,7 @@ module.exports = (context) => ({
 			remove: (key) => defaultCenter.remove(key),
 			root: rootPath,
 			package: packageName,
+			loadYaml: (file) => jsYaml.load(fs.readFileSync(file, { encoding: 'utf-8' }))
 		};
 	},
 });

package/lib/rew/pkgs/rune.js

@@ -169,6 +169,7 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 		};
 
 		const update = (caseRecord, newRecord) => {
+
 			let id;
 			if (typeof caseRecord === 'string') {
 				id = caseRecord;
@@ -224,6 +225,9 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 			if (typeof criteria == 'string') return read(criteria);
 			if (!criteria || typeof criteria !== 'object') return null;
 
+			
+			if (!fs.existsSync(collectionFilePath)) writeDataFile(collectionFilePath, []);
+
 			const data = readDataFile(collectionFilePath);
 			const record =
 				data.find((record) => {
@@ -240,7 +244,6 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 
 		const remove = (id) => {
 			if ('@rune.id' in id) id = id['@rune.id'];
-			if (!fs.existsSync(collectionFilePath)) return false;
 			let data = readDataFile(collectionFilePath);
 			const index = data.findIndex((record) => record['@rune.id'] === id);
 			if (index !== -1) {
@@ -293,6 +296,8 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 			return sortedData;
 		};
 
+		if (!fs.existsSync(collectionFilePath)) writeDataFile(collectionFilePath, []);
+
 		return {
 			insert,
 			read,
@@ -377,6 +382,8 @@ const createDB = (dbName, dirname, dbData = {}, encryptionKey) => {
 			return data;
 		};
 
+		if (!fs.existsSync(mapFilePath)) writeDataFile(mapFilePath, {});
+
 		return { set, get, remove, list, transform };
 	};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {
@@ -11,6 +11,8 @@
   },
   "files": [
     "lib/",
+    "runtime.d.ts",
+    "jsconfig.json",
     "main.js",
     "README.md"
   ],
@@ -38,6 +40,7 @@
     "colors": "^1.4.0",
     "deasync": "^0.1.30",
     "js-yaml": "^4.1.0",
+    "loading-cli": "^1.1.2",
     "tiny-msgpack": "^2.2.0",
     "uuid": "^9.0.1",
     "vm": "^0.1.0",