@makano/rew 1.2.74 → 1.2.76

package/lib/rew/cli/cli.js

@@ -123,10 +123,31 @@ yargs(hideBin(process.argv))
 			yargs.positional('path', {
 				describe: 'Path of the project to create',
 				type: 'string',
+			}).option('git', {
+				alias: 'g',
+				describe: `Enable Git Option`,
+				type: 'boolean',
+			}).option('civet', {
+				alias: 'c',
+				describe: `Use civet for main`,
+				type: 'boolean',
+			}).option('types', {
+				alias: 't',
+				describe: `Create @types/rew in node modules`,
+				type: 'boolean',
+			}).option('name', {
+				alias: 'n',
+				describe: `The package name`,
+				type: 'string'
+			}).option('ignore', {
+				alias: 'i',
+				describe: `Use default options`,
+				type: 'boolean',
+				default: false
 			});
 		},
 		(argv) => {
-			require('./utils').createProject(argv.path);
+			require('./utils').createProject(argv.path, argv);
 		},
 	)
 	.command(

package/lib/rew/cli/log.js

@@ -8,7 +8,7 @@ let last = '';
 
 const log = (module.exports.log = function (...toPrint) {
 	let prefix = start ? startPrefix : middlePrefix;
-	let returns = false;
+	let returns = false, nosep = false;
 	if (toPrint[toPrint.length - 1] == ':end') {
 		prefix = endPrefix;
 		toPrint.pop();
@@ -17,13 +17,17 @@ const log = (module.exports.log = function (...toPrint) {
 		returns = true;
 		toPrint.pop();
 	}
+	if (toPrint[toPrint.length - 1] == ':nosep') {
+		nosep = true;
+		toPrint.pop();
+	}
 	if (prefix == endPrefix && start) prefix = separator;
 	// if(last == endPrefix && prefix == separator) prefix = startPrefix;
-	if (!start) console.log(last == endPrefix ? startPrefix : separator);
+	if (!start && !returns && !nosep) console.log(last == endPrefix ? startPrefix : separator);
 	if (start) start = false;
 	last = prefix;
 	if (returns) return [prefix, ...toPrint].join(' ');
-	else console.log(prefix, ...toPrint);
+	else if (toPrint.length) console.log(prefix, ...toPrint);
 });
 
 module.exports.logget = function (...toPrint) {

package/lib/rew/cli/utils.js

@@ -26,6 +26,7 @@ const {
   cachepath,
   localBinPath
 } = require('./helpers');
+const { input } = require('../functions/stdout');
 
 module.exports = {
 	conf(command, fullPath, key, value) {
@@ -77,13 +78,19 @@ module.exports = {
 			}
 		}
 	},
-	createProject: (ppath) => {
+	createProject: (ppath, argv) => {
 		const projectPath = path.join(process.cwd(), ppath);
 		log(''.cyan, 'Creating at'.blue, ppath.yellow);
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: process.stdout,
-		});
+
+		const b = (value, type) => type == "boolean" ? (value.toString() == 'y' || value.toString() == "yes" ? true : false) : value;
+
+		const registerInput = (name, promptText, type, argvName, defaultValue) => {
+			if(type == 'boolean') defaultValue = false;
+			let prompted = false;
+			project[name] = argv[argvName] ?? (argv.ignore ? defaultValue ?? b(input(promptText, prompted = log() || true), type) : b(input(promptText, prompted = log() || true), type));
+			log(name.grey+'?'.grey, type == 'string' ? project[name].green : (project[name] == true ? 'yes'.cyan : 'no'.yellow), prompted ? ':nosep' : '');
+		}
+
 		const project = {};
 		const create = () => {
 			fs.mkdirSync(projectPath, { recursive: true });
@@ -97,8 +104,8 @@ module.exports = {
 				execSync('cd ' + projectPath + ' && git init . && git branch -m main', { stdio: 'ignore' });
 			}
 			if(project.intellisense){
-				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'));
+				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'));
 			}
 			execSync('cd ' + projectPath + ' && npm init -y', { stdio: 'ignore' });
 			if(project.civet){
@@ -115,29 +122,41 @@ module.exports = {
 			//   }
 			// });
 			log('Done.'.blue.bold, ':end');
-			rl.close();
 		};
 		if (!fs.existsSync(projectPath)) {
-			rl.question(logget(' Package Name: '.blue), (pkg) => {
-				if (pkg.trim()) {
-					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 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 {
-					rl.close();
-				}
-			});
+
+			registerInput(
+				'package',
+				logget(' Package Name: '.blue),
+				'string',
+				'name',
+				path.basename(projectPath)
+			)
+
+			registerInput(
+				'intellisense',
+				logget(' Use intellisense declarations ? (y/N): '.magenta),
+				'boolean',
+				'types'
+			)
+
+			registerInput(
+				'civet',
+				logget(' Use Civet For main ? (y/N): '.blue),
+				'boolean',
+				'civet'
+			)
+
+			registerInput(
+				'git',
+				logget('󰊢 Use git ? (y/N): '.yellow),
+				'boolean',
+				'git'
+			)
+
+			create();
 		} else {
 			log(` Project ${ppath} already exists at ${projectPath}`.red.bold, ':end');
-			rl.close();
 		}
 	},
 	runApp(pathOrPackage, options) {

package/lib/rew/const/opt.js

@@ -9,7 +9,9 @@ const execOptions = {
 	jsxPragma: '__using__.JSX.createElement',
 	jsx: false,
 	typescript: false,
-	decorators: false
+	decorators: false,
+
+	_syntaxAliases: {}
 };
 
 module.exports.execOptions = execOptions;

package/lib/rew/modules/compiler.js

@@ -6,7 +6,7 @@ const { getFile, file } = require('./fs');
 const babel = require('@babel/core');
 const path = require('path');
 const babelReact = require('@babel/preset-react');
-const { readFileSync } = require('fs');
+const { readFileSync, existsSync } = require('fs');
 const { wait } = require('../functions/wait');
 const { REW_FILE_TYPE } = require('../const/ext');
 const { USING_DEFAULT } = require('../const/usage');
@@ -122,12 +122,43 @@ const fnextToken = (i, tokens, type, value) => {
 		.find((t) => t.type == type && (value ? t.value == value : true));
 };
 
+function declareAlias(aliases, token) {
+  const regex = /^#declare(\*)?\s+(\w+)\s+"([^"]+)"\s*=\s*([\s\S]*);$/;
+  const match = token.value.trim().match(regex);
+
+  if (match) {
+    const isPublic = !!match[1];
+    const type = match[2] == "key" ? 'IDENTIFIER' : match[2];
+    const name = match[3];
+    const value = match[4].trim();
+
+    const aliasValue = value.startsWith('${')
+      ? new Function('token', 'tokens', 'code', value.slice(2, -1))
+      : value;
+
+    aliases[type] = aliases[type] || {};
+    aliases[type][name] = aliasValue;
+
+		if(isPublic){
+			execOptions._syntaxAliases[type] = execOptions._syntaxAliases[type] || {};
+			execOptions._syntaxAliases[type][name] = aliasValue;
+		}
+  }
+}
+
 function compileRewStuff(content, options) {
 	const tokens = tokenizeCoffeeScript(content);
 	let result = '';
+  let multilineDeclareBuffer = [];
+  let multilineDeclare = false;
 
 	let hooks = [];
 
+
+	const aliases = {
+		...execOptions._syntaxAliases
+	}
+
 	for (let i = 0; i < tokens.length; i++) {
 		const token = tokens[i];
 		let { token: nextToken, n } = gnextToken(i, 1, tokens) || {};
@@ -136,6 +167,30 @@ function compileRewStuff(content, options) {
 			continue;
 		}
 
+    if ((token.type === "COMMENT" && multilineDeclare) || (token.type !== "COMMENT" && multilineDeclare)) {
+      if(token.type === "COMMENT"){
+				multilineDeclareBuffer.push(token.value.startsWith('###') ? token.value.slice(3) : token.value.slice(1));
+				if (token.value.includes(';')) {
+					multilineDeclare = false;
+					const combinedDeclaration = multilineDeclareBuffer.join('\n');
+					declareAlias(aliases, { ...token, value: combinedDeclaration });
+					multilineDeclareBuffer = [];
+				}
+			} else {
+				multilineDeclare = false;
+				multilineDeclareBuffer = [];
+			}
+    }
+
+		if (token.type === "COMMENT" && token.value.startsWith('#declare')) {
+      if (token.value.includes(';')) {
+        declareAlias(aliases, token);
+      } else {
+        multilineDeclare = true;
+        multilineDeclareBuffer.push(token.value);
+      }
+    }
+
 		if (token.type === 'IDENTIFIER' && token.value === 'opt.set') {
 			const { token: nextNextToken } = gnextToken(i, 2, tokens) || {};
 			if (nextNextToken && nextNextToken.value.slice(1).slice(0, -1) == 'jsxPragma') {
@@ -269,6 +324,17 @@ function compileRewStuff(content, options) {
 			});
 		}
 
+		const aliasType = aliases[token.type];
+    if (aliasType && aliasType[token.value]) {
+      const aliasValue = aliasType[token.value];
+      if (typeof aliasValue === 'function') {
+        result += aliasValue(token, tokens, result) || "";
+      } else {
+        result += aliasValue;
+      }
+      continue;
+    }
+
 		// if(token.type === 'TRIPLE_STRING'){
 		// 	token.value = '```'+token.value.slice(3).slice(0, -3).replace(/\#\{/g, '${')+'```';
 		// }
@@ -282,10 +348,19 @@ function compileRewStuff(content, options) {
 				}
 			});
 		}
+		
+		if (token.type === "COMMENT" && token.value.startsWith('#include')) {
+			const includeContent = token.value.split(' ')[1] || '';
+			const filename = options.filename ? path.resolve(path.dirname(options.filename), includeContent) : includeContent;
+			if (existsSync(filename)) {
+        result += '\n'+ compileRewStuff(readFileSync(filename).toString(), {
+					...options,
+					filename
+				});
+      }
+    }
 	}
 
-	// console.log(result)
-
 	return result;
 }
 
@@ -298,7 +373,10 @@ const compileCivetStuff = (file, options) => {
 		js: true
 	};
 
-	const prepared = compileRewStuff(file.content, options);
+	const prepared = compileRewStuff(file.content, {
+		filename: file.path,
+		...options
+	});
 	let compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
 
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.74",
+  "version": "1.2.76",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {
@@ -12,7 +12,6 @@
   "files": [
     "lib/",
     "runtime.d.ts",
-    "jsconfig.json",
     "main.js",
     "README.md"
   ],