@makano/rew 1.2.94 → 1.2.96

package/lib/rew/cli/cli.js

@@ -338,18 +338,45 @@ yargs(hideBin(process.argv))
 			}
 		},
 	)
-
 	.command(
 		'cache <command>',
 		'Manage cache',
+		(yargs) => {
+			yargs
+			.positional('command', {
+				describe: 'Command to clear/list/show',
+				type: 'string',
+			})
+			.example('rew cache list', 'Lists all caches')
+			.example('rew cache clear', 'Clears all caches')
+			.example('rew cache clear all', 'Clears all caches')
+			.example('rew cache clear [id]', 'Clears all caches for id [id]')
+			.example('rew cache show [id]', 'Shows commits downloaded for [id]')
+			.example('rew cache show [id]', 'Shows commits downloaded for [id]')
+			.example('rew cache show [id]/clone', 'Shows the contents for [id]')
+			.example('rew cache show [id]#tag', 'Shows the tag for [id]')
+			.example('rew cache show [id]#commit', 'Shows the current commit for [id]')
+			.example('rew cache show [id]#name', 'Shows the name for [id]')
+			.example('rew cache show [id]/clone/app.yaml', 'Shows the app config for [id]')
+			.example('rew cache show [id]/clone/path/to/file', 'Gives you the path to the file inside [id]')
+			.example('rew cache show [id]/clone/path/to/file', 'Gives you the path to the file inside [id]')
+			.example('rew cache install [id]', 'Installs cache')
+		},
+		async (argv) => {
+			require('./utils').cache(argv.command, ...argv._.slice(1));
+		},
+	)
+	.command(
+		'misc <command>',
+		'Misc functions',
 		(yargs) => {
 			yargs.positional('command', {
-				describe: 'Command to clear/list',
+				describe: 'Misc command name',
 				type: 'string',
 			});
 		},
-		async (argv) => {
-			require('./utils').cache(argv.command)
+		(argv) => {
+			require('./miscUtils')[argv.command](...argv._.slice(1));
 		},
 	)
 	.command(

package/lib/rew/cli/helpers.js

@@ -35,11 +35,36 @@ function getAllPipeInput(){
   });
 }
 
+/**
+ * 
+ * @param {string} string 
+ * @param {Record<string,(replacedString: string, originalString: string) => any>} order 
+ * @returns { { string: string, [key: string]: any } }
+ */
+function hashTags(string, order){
+  const hashes = Object.keys(order);
+  const h = {};
+  let s = string;
+  for(let i of hashes){
+    if(string.includes(`#${i}`)){
+      const str = s.replace(`#${i}`, '');
+      h[i] = order[i](str, string);
+      if(h[i]?.$set) {s = h[i].$set; string = s }
+      else s = str;
+    }
+  }
+  return {
+    string: s,
+    ...h
+  };
+}
+
 module.exports = {
   binpath,
   logspath,
   cachepath,
   localBinPath,
   npm_package_name,
-  getAllPipeInput
+  getAllPipeInput,
+  hashTags
 }

package/lib/rew/cli/miscUtils.js

@@ -0,0 +1,41 @@
+const { findAppInfo } = require("../misc/findAppInfo");
+const { log } = require("./log");
+const colors = require('colors');
+const path = require('path');
+const fs = require('fs');
+const { CONFIG_PATH } = require("../const/config_path");
+
+module.exports = {
+	types(projectPath){
+    if(!projectPath) projectPath = process.cwd();
+    else projectPath = path.resolve(process.cwd(), projectPath);
+    const projectinfo = findAppInfo(projectPath+'/app.yaml');
+    if(!projectinfo){
+      log('Path not a rew app'.red.bold, ':end')
+      return;
+    }
+    let typesToLoad = ['rew'];
+    if(projectinfo.config?.types){
+      typesToLoad = projectinfo.config?.types;
+    }
+    fs.mkdirSync(path.join(projectPath, 'node_modules/@types/rew'), { recursive: true });
+
+
+    typesToLoad.forEach(name => {
+      let filename = name+'.d.ts';
+      if(name == 'rew'){
+				fs.copyFileSync(path.join(__dirname, '../../../runtime.d.ts'), path.join(projectPath, 'node_modules/@types/rew/index.d.ts'));
+        return;
+      }
+      let p = path.resolve(CONFIG_PATH, name, 'app', 'types.d.ts');
+      
+      if(name.indexOf('/') > -1) {
+        const fn = name.split('/').slice(1).join('/')+'.d.ts';
+        p = path.resolve(CONFIG_PATH, name.split('/')[0], 'app', fn);
+        filename = name.split('/')[0]+'-'+path.basename(fn);
+      }
+      if(fs.existsSync(p)) fs.copyFileSync(p, path.join(projectPath, 'node_modules/@types/rew/'+filename));
+    });
+	},
+
+}

package/lib/rew/cli/utils.js

@@ -12,9 +12,7 @@ const { to_qrew } = require('../qrew/compile');
 const { findAppInfo } = require('../misc/findAppInfo');
 const { req } = require('../misc/req');
 const { CONFIG_PATH } = require('../const/config_path');
-const { watch } = require('chokidar');
-const { execRewFile, runFileWithArgv } = require('./run');
-const { seededID } = require('../misc/seededid');
+const { runFileWithArgv } = require('./run');
 const loading = require('loading-cli');
 const sleep = require('../functions/sleep');
 const { gen_key } = require('../misc/bin');
@@ -24,7 +22,8 @@ const {
   binpath,
   logspath,
   cachepath,
-  localBinPath
+  localBinPath,
+	hashTags
 } = require('./helpers');
 const { input } = require('../functions/stdout');
 
@@ -94,9 +93,13 @@ module.exports = {
 		const project = {};
 		const create = () => {
 			fs.mkdirSync(projectPath, { recursive: true });
+			const confObj = { 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: [] } };
 			const confPath = path.join(projectPath, 'app.yaml');
 			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: [] } }));
+			if(project.intellisense) {
+				confObj.types = ['rew'];
+			}
+			fs.writeFileSync(confPath, jsYaml.dump(confObj));
 			fs.writeFileSync(entryFile, `print("Hello World!")`);
 			fs.mkdirSync(path.join(projectPath, 'assets'), { recursive: true });
 			if (project.git) {
@@ -104,8 +107,8 @@ module.exports = {
 				execSync('cd ' + projectPath + ' && git init . && git branch -m main', { stdio: 'ignore' });
 			}
 			if(project.intellisense){
-				fs.mkdirSync(path.join(projectPath, 'node_modules/@types/rew'), { recursive: true });
-				fs.copyFileSync(path.join(__dirname, '../../../runtime.d.ts'), path.join(projectPath, 'node_modules/@types/rew/index.d.ts'));
+				require('./miscUtils')
+				.types(projectPath);
 			}
 			execSync('cd ' + projectPath + ' && npm init -y', { stdio: 'ignore' });
 			if(project.civet){
@@ -382,11 +385,50 @@ module.exports = {
 		processFile(filePath, importsArray);
 		log('󰈔 Compiled'.yellow, (importsArray.length + 1 + '').blue, `file${importsArray.length ? 's' : ''}.`.yellow, ':end');
 	},
-	cache(command){
+	cache(command, file){
+
+		const findGitCommitPath = (p) => {
+			const heads = path.join(p, '.git/refs/heads');
+			if(!fs.existsSync(heads)) return '';
+			const refs = fs.readdirSync(heads);
+			if(!refs.length) return '';
+			return fs.readFileSync(path.join(heads, refs[0]), { encoding: 'utf-8' }).trim();
+		}
+
 		if(command == 'list'){
 			console.log(fs.readdirSync(cachepath).join('\n').trim());
-		} else {
-			fs.readdirSync(cachepath).forEach(file => fs.rmSync(path.join(cachepath, file), { recursive: true }));
+		} else if(command == 'clear'){
+			if(file) fs.rmSync(path.join(cachepath, file), { recursive: true });
+			else if(file == 'all') fs.readdirSync(cachepath).forEach(file => fs.rmSync(path.join(cachepath, file), { recursive: true }));
+		} else if(command == 'install'){
+			if(!file) return process.exit(1);
+			this.installApp(path.join(cachepath, file, 'clone'), {
+				update: true
+			});
+		} else if(command == 'show'){
+			if(!file) return console.log(fs.readdirSync(cachepath).join('\n').trim());
+
+			const hashed = hashTags(file, {
+				tag: (str) => ({ $set: str + '#name#commit' }),
+				commit: (file) => findGitCommitPath(path.join(cachepath, file.replace(/#name/, ''), 'clone')),
+				name: (file) => jsYaml.load(fs.readFileSync(path.join(cachepath, file, 'clone/app.yaml'), { encoding: 'utf-8' }).trim()).manifest.package
+			});
+			file = hashed.string;
+
+			if(hashed.tag){
+				return console.log(hashed.name +':'+ hashed.commit);
+			}
+			if(hashed.commit) return console.log(hashed.commit);
+			if(hashed.name) return console.log(hashed.name);
+
+			const f = path.join(cachepath, file);
+			if(!fs.existsSync(f)) return;
+			if(fs.statSync(f).isDirectory()) console.log(
+				fs.readdirSync(f).join('\n')
+			);
+			else if(file.endsWith('app.yaml')){
+				console.log(fs.readFileSync(f, { encoding: 'utf-8' }).trim());
+			} else console.log(f);
 		}
 	},
 	async cloneGit(gitpath, opts) {

package/lib/rew/functions/import.js

@@ -9,6 +9,12 @@ const { execOptions } = require('../const/opt');
 const { REW_FILE_TYPE } = require('../const/ext');
 const { straceLog } = require('../misc/strace');
 
+const _returns = (options, content) => {
+	if(options.useDefaultForPackages){
+		return content?.default ? content : { default: content };
+	} else return content;
+}
+
 const cachedFiles = [];
 module.exports.cleanCache = () => {
 	while(cachedFiles.length) cachedFiles.pop();
@@ -37,7 +43,10 @@ const lookUpInOtherApps = (fullPath) => {
 module.exports.imp = function (runPath, context) {
 	return function (filename, options = {}) {
 		if (!options) options = {};
-		let type = options.type || filename.endsWith('.coffee') ? 'coffee' : REW_FILE_TYPE.TYPE;
+		let type = options.type ? options.type : filename.endsWith('.coffee') ? 'coffee' : (
+			filename.endsWith(REW_FILE_TYPE.EXTENSION) ? REW_FILE_TYPE.TYPE :
+			path.extname(filename).slice(1)
+		);
 		let exports,
 			ispkg = findPackage(filename);
 
@@ -58,10 +67,10 @@ module.exports.imp = function (runPath, context) {
 			else filepath = otherPath;
 		};
 
-		const foundCache = cachedFiles.find((f) => f.filepath == filepath);
+		const foundCache = cachedFiles.find((f) => f.filepath == type+':'+filepath);
 
 		if (!ispkg && foundCache) {
-			exports = foundCache.exports;
+			exports = options.useDefaultForPackages === false ? foundCache.exports.default || foundCache.exports : _returns(options, foundCache.exports);
 		}
 
 		if (!ispkg && !existsSync(filepath) && !foundCache) {
@@ -117,17 +126,17 @@ module.exports.imp = function (runPath, context) {
 			const f = getFile(filepath);
 			if (type == 'yaml') {
 				straceLog('===> FROM_YAML()');
-				exports = importYaml(f.path, f);
+				exports = _returns(options, importYaml(f.path, f));
 			} else if (type == 'json') {
 				straceLog('===>');
 				try {
-					exports = JSON.parse(f.content);
+					exports = _returns(options, JSON.parse(f.content));
 				} catch (e) {
-					exports = {};
+					exports = _returns(options, {});
 				}
 			} else {
 				straceLog('===> FROM_TEXT');
-				exports = f.content;
+				exports = _returns(options, f.content);
 			}
 		}
 
@@ -143,13 +152,13 @@ module.exports.imp = function (runPath, context) {
 		// descriptive code
 		// you put them in comment blocks
 		// and name it something
-		// then you can simple see 
+		// then you can simply 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 });
+		/**/ if (!ispkg) cachedFiles.push({ filepath: type+':'+filepath, exports });
 		//** 
 
 		//**  Mock imports section	

package/lib/rew/modules/compiler.js

@@ -115,6 +115,13 @@ const ValueIfy = (val) => {
   }
 }
 
+function insertTokenAt(array, index, value) {
+	if (index < 0 || index > array.length) {
+			throw new RangeError('Index out of bounds');
+	}
+	array.splice(index, 0, value);
+}
+
 const gnextToken = (i, n, tokens) => {
 	return tokens[i + n] ? (tokens[i + n].type == 'WHITESPACE' ? gnextToken(i, n + 1, tokens) : { token: tokens[i + n], n, ti: i + n }) : null;
 };
@@ -409,11 +416,25 @@ function compileRewStuff(content, options) {
 			} else straceLog('==> UNKNOWN');
 		}
 
+		if (token.type === 'IDENTIFIER' && token.value === 'as' && !options.keepImports) {
+			const isFrom = gnextToken(i, 3, tokens);
+			const isInImport = tokens[i-2];
+			if(isFrom?.token.value == 'from' && isInImport?.value !== '*'){
+				insertTokenAt(tokens, i, { type: 'WHITESPACE', value: ' ' });
+				insertTokenAt(tokens, i, { type: 'OTHER', value: '*' });
+				insertTokenAt(tokens, i, { type: 'WHITESPACE', value: ' ' });
+				insertTokenAt(tokens, i, { type: 'IDENTIFIER', value: 'import' });
+				i -= 1;
+				continue;
+			}
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
 			straceLog('IMPORT()');
 			straceLog('==> WARN: SLOWS DOWN TOKENIZATION');
 			let ind = i + n + 2;
+			let isAs = false;
 
 			let defaultName;
 			if (nextToken.type === 'STRING') {
@@ -441,14 +462,15 @@ function compileRewStuff(content, options) {
 				}
 			} else if (nextToken.value === '*') {
 				const asToken = fnextToken(ind, tokens, 'IDENTIFIER', 'as');
-				const nameToken = fnextToken(asToken.ri, tokens, 'STRING');
 				if (asToken) {
+					const nameToken = fnextToken(asToken.ti, tokens, 'STRING');
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
 					straceLog('==>', defaultName, 'from', nameToken.value);
 					if(useImp(nameToken, options)) updateAliases(aliases);
 					result += `${defaultName} ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = ind + 6;
+					isAs = true;
 				}
 			} else if (nextToken) {
 				const nameToken = fnextToken(ind, tokens, 'STRING');
@@ -485,14 +507,14 @@ function compileRewStuff(content, options) {
 				if(assertionToken.token.type == 'OTHER' && assertionToken.token.value == '{'){
 					hooks.push({
 						index: assertionToken.token.ti,
-						value: ' useDefaultForPackages: true, '
+						value: ' useDefaultForPackages: '+(isAs?'false':'true')+', '
 					})
 				} else {
-					result += 'useDefaultForPackages: true, '
+					result += 'useDefaultForPackages: '+(isAs?'false':'true')+', '
 				}
 				i += 3;
 			} else {
-				result += ", { useDefaultForPackages: true }"
+				result += ", { useDefaultForPackages: "+(isAs?'false':'true')+" }"
 			}
 
 			continue;

package/lib/rew/modules/runtime.js

@@ -36,7 +36,8 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 	
 		if(context.app){
 			const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
-			if(existsSync(p) && context.app.path !== p){
+			const p2 = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app/.allow');
+			if(existsSync(p) && context.app.path !== p && !existsSync(p2)){
 				console.log("App with the same package name has been installed. Conflicts happened. \nTo fix this, change your app's package name or remove the app making the conflict.");
 				return {
 					context: { module: { exports: null } },

package/package.json

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