@makano/rew 1.2.75 → 1.2.77

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/functions/import.js

@@ -97,6 +97,7 @@ module.exports.imp = function (runPath, context) {
 		if (ispkg) {
 			const pkg = getPackage(filename)(context, options);
 			exports = pkg._onImport ? pkg._onImport() : pkg;
+			if(options.useDefaultForPackages) exports = { default: exports };
 		} else if (foundCache) {
 		} else if (type == REW_FILE_TYPE.TYPE || type == "coffee") {
 			exports = exec({});

package/lib/rew/modules/compiler.js

@@ -297,7 +297,18 @@ function compileRewStuff(content, options) {
 
 			if (nextLastToken?.value == 'assert') {
 				result += ', ';
+				const assertionToken = gnextToken(nextLastToken.ti, 2, tokens);
+				if(assertionToken.token.type == 'OTHER' && assertionToken.token.value == '{'){
+					hooks.push({
+						index: assertionToken.token.ti,
+						value: ' useDefaultForPackages: true, '
+					})
+				} else {
+					result += 'useDefaultForPackages: true, '
+				}
 				i += 3;
+			} else {
+				result += ", { useDefaultForPackages: true }"
 			}
 
 			continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.75",
+  "version": "1.2.77",
   "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"
   ],