@makano/rew 1.2.5 → 1.2.6

package/lib/rew/cli/cli.js

@@ -5,7 +5,7 @@ const path = require('path');
 const { hideBin } = require('yargs/helpers');
 const { execSync } = require('child_process');
 const utils = require('./utils');
-const { existsSync, readFileSync, writeFileSync, mkdirSync, statSync } = require('fs');
+const { existsSync, readFileSync, writeFileSync, mkdirSync, statSync, unlinkSync } = require('fs');
 const { log } = require('./log');
 const os = require('os');
 const crypto = require('crypto');
@@ -17,6 +17,8 @@ const { print, input } = require('../functions/stdout');
 const colors = require('colors');
 const { req } = require('../misc/req');
 const { gen_key } = require('../misc/bin');
+const { REW_FILE_TYPE } = require('../const/ext');
+const { generateRandomID } = require('../functions/id');
 
 if (!existsSync(CONFIG_PATH) || !existsSync(CONFIG_PATH + '/repos.yaml')) {
 	mkdirSync(CONFIG_PATH, { recursive: true });
@@ -61,9 +63,36 @@ yargs(hideBin(process.argv))
 				log('File not found:'.red.bold, argv.file, ':end');
 				return;
 			}
-			utils.runFileWithArgv(filePath, { onlyCompile: argv.compile, watch: argv.watch });
+			utils.runFileWithArgv(filePath, { async: !process.stdin.isTTY, onlyCompile: argv.compile, watch: argv.watch });
 		},
 	)
+	.command(
+		'exec [code]',
+		'Executes in REPL',
+		(yargs) => {
+			yargs
+			.option('compile', {
+				alias: 'c',
+				describe: 'Compile and output the javascript',
+				type: 'boolean',
+			});
+		},
+		async (argv) => {
+			const replFile = '/tmp/rew-'+generateRandomID()+'-'+Date.now()+'.coffee';
+			let code = argv.code;
+			if(!process.stdin.isTTY) {
+				code = await utils.getAllPipeInput();
+			}
+			writeFileSync(replFile, code);
+			try{
+				utils.runFileWithArgv(replFile, { async: !process.stdin.isTTY, onlyCompile: argv.compile });
+			} catch(e){
+				console.error(e);
+			} finally {
+				unlinkSync(replFile);
+			}
+		}
+	)
 	.command(
 		'conf <command> [path] [key] [value]',
 		'Configuration management',
@@ -127,7 +156,7 @@ yargs(hideBin(process.argv))
 				type: 'string',
 			})
 				.option('dev', {
-					describe: 'If your entry file is a .qrew, then just use the .coffee instead',
+					describe: `If your entry file is a .qrew, then just use .coffe or ${REW_FILE_TYPE.EXTENSION} instead`,
 					type: 'boolean',
 				})
 				.option('entry', {
@@ -354,7 +383,7 @@ yargs(hideBin(process.argv))
 				})
 				.option('remove', {
 					alias: 'r',
-					describe: 'Remove all coffee',
+					describe: 'Remove all .coffee and '+REW_FILE_TYPE.EXTENSION,
 					type: 'boolean',
 				});
 		},
@@ -362,4 +391,4 @@ yargs(hideBin(process.argv))
 			utils.build(argv);
 		},
 	)
-	.help(!isFileGiven).argv;
+	.help(!isFileGiven).argv;

package/lib/rew/cli/utils.js

@@ -18,6 +18,7 @@ const { seededID } = require('../misc/seededid');
 const loading = require('loading-cli');
 const sleep = require('../functions/sleep');
 const { gen_key } = require('../misc/bin');
+const { REW_FILE_TYPE } = require('../const/ext');
 
 const binpath = path.join(conf({}).create('').root, '.bin');
 const logspath = path.join(conf({}).create('').root, '.logs');
@@ -35,7 +36,7 @@ module.exports = {
 
 		const runIt = () => {
 			if (options.watch) console.clear();
-			const imports = execRewFile(filePath, [filePath, ...(argv || [])], { onlyCompile: options?.onlyCompile });
+			const imports = execRewFile(filePath, [filePath, ...(argv || [])], { onlyCompile: options?.onlyCompile, async: options?.async });
 			if (options.watch) {
 				imports.forEach((file) => {
 					watchIt(file);
@@ -47,15 +48,21 @@ module.exports = {
 		runIt();
 	},
 	runFileWithArgv(filePath, options = {}, cargv) {
-		const argv = cargv || process.argv;
+		let argv = cargv || process.argv;
 		argv.shift();
-		if (argv[0].endsWith('rew')) {
+		if (argv[0].endsWith(REW_FILE_TYPE.EXTENSION) || argv[0].endsWith('.coffee')) {
 			if (argv[1] == 'run') {
 				argv.splice(0, 3);
 			} else if(argv[1] == '-w' || argv[1] == '--watch'){
 				argv.splice(0, 3);
 			} else argv.splice(0, 2);
 		}
+		if (argv[1] == 'exec') {
+			argv.splice(0, 2);
+		}
+		if (argv.includes('--')) {
+			argv = argv.slice(argv.indexOf('--') + 1, argv.length);
+		}
 		this.runFile(filePath, options, argv)
 	},
 	conf(command, fullPath, key, value) {
@@ -118,8 +125,8 @@ module.exports = {
 		const create = () => {
 			fs.mkdirSync(projectPath, { recursive: true });
 			const confPath = path.join(projectPath, 'app.yaml');
-			const entryFile = path.join(projectPath, 'main.coffee');
-			fs.writeFileSync(confPath, jsYaml.dump({ manifest: { package: project.package, private: false }, exec: { entry: 'main.coffee' }, assets: { icon: 'assets/icon.png', folder: './assets' }, install: { requirements: [] } }));
+			const entryFile = path.join(projectPath, 'main'+(project.civet ? REW_FILE_TYPE.EXTENSION : '.coffee'));
+			fs.writeFileSync(confPath, jsYaml.dump({ manifest: { package: project.package, private: false }, exec: { entry: 'main'+(project.civet ? REW_FILE_TYPE.EXTENSION : '.coffee') }, assets: { icon: 'assets/icon.png', folder: './assets' }, install: { requirements: [] } }));
 			fs.writeFileSync(entryFile, `print("Hello World!")`);
 			fs.mkdirSync(path.join(projectPath, 'assets'), { recursive: true });
 			if (project.git) {
@@ -127,10 +134,14 @@ module.exports = {
 				execSync('cd ' + projectPath + ' && git init . && git branch -m main', { stdio: 'ignore' });
 			}
 			if(project.intellisense){
-				fs.copyFileSync(path.join(__dirname, '../../../jsconfig.json'), path.join(projectPath, 'jsconfig.json'));
+				fs.copyFileSync(path.join(__dirname, '../../../tsconfig.json'), path.join(projectPath, 'tsconfig.json'));
 				fs.copyFileSync(path.join(__dirname, '../../../runtime.d.ts'), path.join(projectPath, 'runtime.d.ts'));
 			}
 			execSync('cd ' + projectPath + ' && npm init -y', { stdio: 'ignore' });
+			if(project.civet){
+				log('Installing NPM Packages');
+				execSync('cd '+projectPath+' && npm i @types/node --no-save', { stdio: 'ignore' });
+			}
 			// log('Installing '+npm_package_name);
 			// exec('cd '+projectPath+' && npm i '+npm_package_name, (err) => {
 			//   if(err){
@@ -149,9 +160,12 @@ module.exports = {
 					project.package = pkg.trim();
 					rl.question(logget(' Use intellisense declarations ? (y/N): '.magenta.bold), (inteli) => {
 						project.intellisense = inteli.toLowerCase() == 'y' || inteli.toLowerCase() == 'yes';
-						rl.question(logget('󰊢 Use git ? (y/N): '.yellow.bold), (use_git) => {
-							project.git = use_git.toLowerCase() == 'y' || use_git.toLowerCase() == 'yes';
-							create();
+						rl.question(logget(' Use Civet For main ? (y/N): '.blue.bold), (civet) => {
+							project.civet = civet.toLowerCase() == 'y' || civet.toLowerCase() == 'yes';
+							rl.question(logget('󰊢 Use git ? (y/N): '.yellow.bold), (use_git) => {
+								project.git = use_git.toLowerCase() == 'y' || use_git.toLowerCase() == 'yes';
+								create();
+							});
 						});
 					});
 				} else {
@@ -173,8 +187,8 @@ module.exports = {
 				c.exec.entry = c.exec[options.entry] || c.exec.entry;
 			}
 			if (c.exec.entry) {
-				if (byPath && options.dev) c.exec.entry = c.entry.endsWith('.qrew') ? c.exec.entry.replace(/\.qrew$/, '.coffee') : c.exec.entry;
 				let r = path.resolve(root, c.exec.entry);
+				if (byPath && options.dev) r = r.endsWith('.qrew') ? r.replace(/\.qrew$/, (a, b) => fs.existsSync(r.replace(a, '.coffee')) ? '.coffee' : REW_FILE_TYPE.EXTENSION) : r;
 				if (options.build) {
 					this.build({
 						file: r,
@@ -182,7 +196,7 @@ module.exports = {
 					});
 					r = path.resolve(root, c.exec.entry.replace(new RegExp(path.extname(c.exec.entry).replace('.', '\\.') + '$'), options.translate ? '.js' : '.qrew'));
 				}
-				this.runFileWithArgv(r);
+				this.runFileWithArgv(r, { async: !process.stdin.isTTY });
 			}
 		};
 
@@ -357,6 +371,9 @@ module.exports = {
 					if (fs.existsSync(importedFilePath)) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath, importsArray);
+					} else if (fs.existsSync(importedFilePath + REW_FILE_TYPE.EXTENSION)) {
+						importsArray.push(importStatement);
+						processFile(importedFilePath + REW_FILE_TYPE.EXTENSION, importsArray);
 					} else if (fs.existsSync(importedFilePath + '.coffee')) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath + '.coffee', importsArray);
@@ -369,7 +386,7 @@ module.exports = {
 
 			const appPath = findAppInfo(filePath);
 
-			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(content, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
+			const compiled = argv.translate ? compile({ content }, {}) : to_qrew(`"initFile ${filePath}"\n${path.basename(content)}`, appPath?.config?.manifest?.package || path.basename(filePath).split('.').slice(0, -1).join('.'));
 			writeCompiledFile(filePath, compiled);
 		}
 
@@ -531,5 +548,19 @@ module.exports = {
 		fs.mkdirSync(binpath, { recursive: true });
 		fs.mkdirSync(cachepath, { recursive: true });
 		fs.mkdirSync(logspath, { recursive: true });
+	},
+	getAllPipeInput(){
+		return new Promise((resolve) => {
+			let data = '';
+			process.stdin.setEncoding('utf8');
+			
+			process.stdin.on('data', (chunk) => {
+				data += chunk;
+			});
+			
+			process.stdin.on('end', () => {
+				resolve(data);
+			});
+		});
 	}
 };

package/lib/rew/const/default.js

@@ -7,7 +7,7 @@ const { match } = require('../functions/match');
 const { map } = require('../functions/map');
 const { typex, typeis, typedef, typei, int, float, num, str, bool } = require('../functions/types');
 const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry } = require('../functions/core');
-const { print, input, clear } = require('../functions/stdout');
+const { print, input, clear, printf } = require('../functions/stdout');
 const { curl } = require('../functions/curl');
 const { wait } = require('../functions/wait');
 const { scheduleFrame } = require('../functions/misc');
@@ -55,5 +55,6 @@ module.exports = {
 	curl,
 
 	print,
+	printf,
 	input,
 };

package/lib/rew/const/ext.js

@@ -0,0 +1,5 @@
+
+module.exports.REW_FILE_TYPE = {
+  EXTENSION: '.civet',
+  TYPE: 'civet'
+}

package/lib/rew/const/opt.js

@@ -1,10 +1,15 @@
+const { REW_FILE_TYPE } = require("./ext");
+
 const execOptions = {
 	sharedContext: true,
-	resolveExtensions: ['.coffee', { ext: '.js', options: { type: 'js' } }, { ext: '.qrew', options: { qrew: true } }],
+	resolveExtensions: [REW_FILE_TYPE.EXTENSION, ".coffee", { ext: '.js', options: { type: 'js' } }, { ext: '.qrew', options: { qrew: true } }],
 	nativeRequire: false,
+	useImport: false,
 	cwdAlias: '$',
-	jsxPragma: 'createElement',
+	jsxPragma: '__using__.JSX.createElement',
 	jsx: false,
+	typescript: false,
+	decorators: false
 };
 
 module.exports.execOptions = execOptions;

package/lib/rew/const/usage.js

@@ -0,0 +1,15 @@
+
+
+
+module.exports.USING_DEFAULT = {
+  JSX: {
+    param: (param) => ({ createElement: param }),
+    use:  (options) => options.jsx = true
+  },
+  TYPES: {
+    use:  (options) => options.typescript = true
+  },
+  DECORATORS: {
+    use:  (options) => options.decorators = true
+  }
+}

package/lib/rew/functions/export.js

@@ -10,7 +10,7 @@ function exportsThe(item, name, context) {
 
 module.exports.pubFunction = function (context) {
 	return function (name, item) {
-		if (name && !item) {
+		if (name && item == null) {
 			item = name;
 			name = null;
 		}

package/lib/rew/functions/fs.js

@@ -31,7 +31,11 @@ module.exports = (currentFile) => {
 	}
 
 	function rm(filepath, options) {
-		return fs.unlinkSync(filepath);
+		return fs.rmSync(gp(filepath), { recursive: true,...options });
+	}
+
+	function unlink(filepath, options) {
+		return fs.unlinkSync(gp(filepath));
 	}
 
 	function chmod(filepath, mode, options) {
@@ -51,6 +55,7 @@ module.exports = (currentFile) => {
 		mkdir,
 		chmod,
 		rm,
+		unlink,
 		fstat,
 		exists,
 		write,

package/lib/rew/functions/import.js

@@ -6,9 +6,12 @@ const { existsSync, readFileSync } = require('fs');
 const conf = require('../pkgs/conf');
 const jsYaml = require('js-yaml');
 const { execOptions } = require('../const/opt');
+const { REW_FILE_TYPE } = require('../const/ext');
 
 const cachedFiles = [];
-
+module.exports.cleanCache = () => {
+	while(cachedFiles.length) cachedFiles.pop();
+};
 const lookUpInOtherApps = (fullPath) => {
 	const con = conf({});
 	const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
@@ -32,7 +35,7 @@ const lookUpInOtherApps = (fullPath) => {
 module.exports.imp = function (runPath, context) {
 	return function (filename, options = {}) {
 		if (!options) options = {};
-		let type = options.type || 'coffee';
+		let type = options.type || filename.endsWith('.coffee') ? 'coffee' : REW_FILE_TYPE.TYPE;
 		let exports,
 			ispkg = findPackage(filename);
 
@@ -43,8 +46,6 @@ module.exports.imp = function (runPath, context) {
 		let filepath = path.resolve(path.dirname(context.module.filepath), filename);
 		if(path.extname(filepath) == '.qrew') options.qrew = true;
 
-		// console.log(typeof runPath);
-
 		const lookUp = () => {
 			const otherPath = lookUpInOtherApps(filename);
 			if (!otherPath) throw new Error('Module "' + filename + '" not found');
@@ -72,8 +73,8 @@ module.exports.imp = function (runPath, context) {
 			} else lookUp();
 		}
 
-		const exec = (coptions = {}) =>
-			runPath(
+		const exec = (coptions = {}) => {
+			const r = runPath(
 				filepath,
 				{
 					import: options,
@@ -86,13 +87,18 @@ module.exports.imp = function (runPath, context) {
 					package: context.app ? context.app.config.package : path.basename(filepath)
 				},
 				execOptions.sharedContext == false ? {} : options.context && options.context == 'new' ? {} : context,
-			).context.module.exports;
+			);
+			if(r instanceof Promise){
+				return new Promise((resolve) => r.then(c => resolve(c.context.module.exports)));
+			}
+			return r.context.module.exports;
+		}
 
 		if (ispkg) {
-			const pkg = getPackage(filename)(context);
+			const pkg = getPackage(filename)(context, options);
 			exports = pkg._onImport ? pkg._onImport() : pkg;
 		} else if (foundCache) {
-		} else if (type == 'coffee') {
+		} else if (type == REW_FILE_TYPE.TYPE || type == "coffee") {
 			exports = exec({});
 		} else if (type == 'js') {
 			exports = exec({ compile: false });
@@ -111,7 +117,7 @@ module.exports.imp = function (runPath, context) {
 			}
 		}
 
-		if (options.save && (type == 'js' || type == 'coffee')) {
+		if (options.save && (type == 'js' || type == REW_FILE_TYPE.TYPE || type == "coffee")) {
 			if (typeof options.save == 'string') context[options.save] = exports[i];
 			else
 				for (let i in exports) {
@@ -134,8 +140,7 @@ module.exports.imp = function (runPath, context) {
 
 		//**  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.');
+		/**/ if(options.mock === null) return null;
 		//** 
 
 		return exports;

package/lib/rew/functions/require.js

@@ -1,10 +1,26 @@
 const fs = require('fs');
 const path = require('path');
+const { execOptions } = require('../const/opt');
+const { wait } = require('./wait');
+
+const cahcedRequires = {};
+
+const doImp = (path) => wait(async () => await import(resolvedPath));
 
 module.exports.customRequire = function customRequire(modulePath, filePath) {
+	let pathname = modulePath;
+	if (modulePath.startsWith('./') || modulePath.startsWith('../') || path.isAbsolute(modulePath)) {
+		pathname = path.resolve(modulePath);
+	}
+	if(cahcedRequires[pathname]) {
+		return cahcedRequires[pathname];
+	}
 	const resolvedPath = resolveModulePath(modulePath, filePath);
 	if(!resolvedPath) throw new Error('Module '+modulePath+' not found');
-	return require(resolvedPath);
+	const r = cahcedRequires[resolvedPath] ? cahcedRequires[resolvedPath] : execOptions.useImport ? doImp(resolvedPath) : require(resolvedPath);
+	if(!cahcedRequires[resolvedPath]) cahcedRequires[resolvedPath] = r;
+	if(!cahcedRequires[pathname]) cahcedRequires[pathname] = r;
+	return r;
 };
 
 function resolveModulePath(modulePath, filePath) {

package/lib/rew/functions/stdout.js

@@ -4,6 +4,10 @@ const print = (module.exports.print = function print(...args) {
 	return console.log(...args);
 });
 
+module.exports.printf = function printf(buffer, cb) {
+	return process.stdout.write(buffer, cb);
+};
+
 print.stdout = process.stdout;
 print.stdin = process.stdin;
 

package/lib/rew/main.js

@@ -1,17 +1,5 @@
-const { compileFile } = require('./modules/compiler');
-const { exec, runPath } = require('./modules/runtime');
-const fs = require('fs');
-const { imp } = require('./functions/import');
-const { FILES } = require('./const/files');
+const { runPath } = require('./modules/runtime');
 
 module.exports.run = function (filepath, options = {}, custom_context = {}) {
-	FILES.forEach((file) => {
-		if (fs.existsSync(file.path)) return;
-		if (file.content) {
-			fs.writeFileSync(file.path, file.content);
-		} else {
-			fs.mkdirSync(file.path, { recursive: true });
-		}
-	});
 	return runPath(filepath, options, custom_context);
 };