@makano/rew 1.2.57 → 1.2.58

package/lib/rew/cli/cli.js

@@ -128,7 +128,7 @@ yargs(hideBin(process.argv))
 				type: 'string',
 			})
 				.option('dev', {
-					describe: `If your entry file is a .qrew, then just use the ${REW_FILE_TYPE.EXTENSION} instead`,
+					describe: `If your entry file is a .qrew, then just use .coffe or ${REW_FILE_TYPE.EXTENSION} instead`,
 					type: 'boolean',
 				})
 				.option('entry', {
@@ -355,7 +355,7 @@ yargs(hideBin(process.argv))
 				})
 				.option('remove', {
 					alias: 'r',
-					describe: 'Remove all '+REW_FILE_TYPE.EXTENSION,
+					describe: 'Remove all .coffee and '+REW_FILE_TYPE.EXTENSION,
 					type: 'boolean',
 				});
 		},

package/lib/rew/cli/utils.js

@@ -50,7 +50,7 @@ module.exports = {
 	runFileWithArgv(filePath, options = {}, cargv) {
 		const argv = cargv || process.argv;
 		argv.shift();
-		if (argv[0].endsWith(REW_FILE_TYPE.EXTENSION)) {
+		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'){
@@ -154,7 +154,7 @@ 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 Civet Types ? (y/N): '.blue.bold), (civet) => {
+						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';
@@ -368,6 +368,9 @@ module.exports = {
 					} 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);
 					} else if (fs.existsSync(importedFilePath + '.js')) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath + '.js', importsArray);
@@ -377,7 +380,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);
 		}
 

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/opt.js

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

package/lib/rew/const/usage.js

@@ -8,5 +8,8 @@ module.exports.USING_DEFAULT = {
   },
   TYPES: {
     use:  (options) => options.typescript = true
+  },
+  DECORATORS: {
+    use:  (options) => options.decorators = true
   }
 }

package/lib/rew/functions/import.js

@@ -73,8 +73,8 @@ module.exports.imp = function (runPath, context) {
 			} else lookUp();
 		}
 
-		const exec = (coptions = {}) =>
-			runPath(
+		const exec = (coptions = {}) => {
+			const r = runPath(
 				filepath,
 				{
 					import: options,
@@ -87,7 +87,12 @@ 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, options);

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/modules/compiler.js

@@ -303,13 +303,22 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 	compiledCode = result.compiled;
 
 	const babelify = (code, options) => babel.transformSync(code, {
-		presets: [[babelReact, { pragma: options.jsxPragma || execOptions.jsxPragma }]],
-		plugins: [],
+		presets: [
+			...(doJSX ? [[babelReact, { pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
+		],
+		plugins: [
+			...(doDecorators ? [[require('@babel/plugin-proposal-decorators'), { version: '2023-05' }], [require('@babel/plugin-proposal-class-properties'), { loose: true }], [require('@babel/plugin-transform-class-static-block'), {}]] : [])
+		],
 	}).code;
 
+	const doJSX = execOptions.jsx || options.jsx;
+	const doTypes = execOptions.typescript || options.typescript;
+	const doDecorators = execOptions.decorators || options.decorators;
+	const doBabel = doJSX || doTypes || doDecorators;
+
 	if(compiledCode instanceof Promise){
 		return compiledCode.then((compiledCode) => {
-			if (execOptions.jsx || options.jsx) {
+			if (doBabel) {
 				compiledCode = babelify(compiledCode, options);
 			}
 			return compiledCode;
@@ -317,7 +326,7 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 	}
 
 	// console.log(c);
-	if (execOptions.jsx || options.jsx) {
+	if (doBabel) {
 		compiledCode = babelify(compiledCode, options);
 	}
 	return compiledCode;
@@ -331,13 +340,21 @@ module.exports.compileFile = function (filepath, options = {}) {
 	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();
+		options.type = f.content.split('\n')[0]?.match(/"initFile (.+)"/)?.[1]?.split('.').pop();
 	} 
 
 	let compiled_code =  cpl(f, { ...options });
 
 	if(options.onlyCompile && !qrew){
-		console.log(compiled_code);
-		process.exit();
+		if(compiled_code instanceof Promise){
+			compiled_code.then((r) => {
+				console.log(r);
+				process.exit();
+			});
+		} else {
+			console.log(compiled_code);
+			process.exit();
+		}
 	}
 
 	return {

package/lib/rew/modules/runtime.js

@@ -18,26 +18,43 @@ const exec = (module.exports.exec = function (code, context, original = '') {
 module.exports.runPath = function runPath(filepath, options = {}, custom_context = {}) {
 	if(filepath.endsWith('.js')) options.type = 'js';
 	if(filepath.endsWith('.coffee')) options.type = 'coffee';
+	if(filepath.endsWith('.qrew')) options.type = 'qrew';
+
+	if(options.import?.async) options.async = true;
 	let { compiled_code, file } = compileFile(options.code ? { content: options.code, path: filepath } : filepath, options);
-	const context = options.import?.takeThisContext ? custom_context : prepareContext(custom_context, options, file.path, runPath);
 	// context.module.compiled = compiled_code;
 	// context.process.exit = (int) => process.exit(int);
 
-	if(context.app){
-		const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
-		if(existsSync(p) && context.app.path !== p){
-			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 } },
-				returns: null
+	const doCode = () => {
+		const context = options.import?.takeThisContext ? custom_context : prepareContext(custom_context, options, file.path, runPath);
+	
+		if(context.app){
+			const p = path.join(CONFIG_PATH, context.app.config.manifest.package, 'app');
+			if(existsSync(p) && context.app.path !== p){
+				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 } },
+					returns: null
+				}
 			}
 		}
+	
+		compiled_code = preScript+'\n'+compiled_code;
+	
+		return {
+			context,
+			returns: exec(compiled_code, context, file.content),
+		};
 	}
 
-	compiled_code = preScript+'\n'+compiled_code;
+	if(options.async){
+		return new Promise(async (r, re) => {
+			compiled_code.then((e) => {
+				compiled_code = e;
+				r(doCode());
+			});
+		});
+	}
 
-	return {
-		context,
-		returns: exec(compiled_code, context, file.content),
-	};
+	return doCode();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.57",
+  "version": "1.2.58",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {
@@ -32,6 +32,9 @@
   "license": "ISC",
   "dependencies": {
     "@babel/core": "^7.24.6",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@babel/plugin-transform-class-static-block": "^7.24.7",
     "@babel/preset-env": "^7.24.7",
     "@babel/preset-react": "^7.24.6",
     "@babel/preset-typescript": "^7.24.7",
@@ -48,6 +51,5 @@
     "vite": "^5.2.13",
     "vm": "^0.1.0",
     "yargs": "^17.7.2"
-  },
-  "devDependencies": {}
+  }
 }

package/runtime.d.ts

@@ -64,6 +64,7 @@ interface ModuleConf extends ModuleConfOptionCenter {
     defaults?: any
   ) => {
     write: (value: any, ifExists?: boolean) => any;
+    // @ts-ignore
     read: (to?: string | object) => string | object | Buffer;
     fileRoot: string;
     exists: boolean;
@@ -128,6 +129,34 @@ interface ModuleThreads {
   };
 }
 
+
+type _Request = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Request;
+type _Response = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Response;
+type _FormData = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").FormData;
+type _Headers = typeof globalThis extends { onmessage: any } ? {} : import("undici-types").Headers;
+type _RequestInit = typeof globalThis extends { onmessage: any } ? {}
+    : import("undici-types").RequestInit;
+type _ResponseInit = typeof globalThis extends { onmessage: any } ? {}
+    : import("undici-types").ResponseInit;
+// @ts-ignore
+type _File = typeof globalThis extends { onmessage: any } ? {} : import("node:buffer").File;
+
+interface Request {}
+declare var Request: typeof globalThis extends {
+    onmessage: any;
+    Request: infer T;
+} ? T
+    : typeof import("undici-types").Request;
+
+interface ResponseInit extends _ResponseInit {}
+
+interface Response extends _Response {}
+declare var Response: typeof globalThis extends {
+    onmessage: any;
+    Response: infer T;
+} ? T
+    : typeof import("undici-types").Response;
+
 type GenericTraps = Record<string, any>;
 
 type IRequestStrict = {
@@ -159,7 +188,7 @@ type StatusErrorObject = {
   [key: string]: any;
 };
 
-export class StatusError extends Error {
+interface StatusError extends Error {
   status: number;
   [key: string]: any;
   constructor(status?: number, body?: StatusErrorObject | string);
@@ -267,7 +296,7 @@ interface ErrorFormatter {
   (statusCode?: number, body?: ErrorBody): Response;
 }
 
-export const IttyRouter: <
+type IttyRouter = <
   RequestType extends IRequest = IRequest,
   Args extends any[] = any[],
   ResponseType = any
@@ -277,7 +306,7 @@ export const IttyRouter: <
   ...other
 }?: IttyRouterOptions) => IttyRouterType<RequestType, Args, ResponseType>;
 
-export const Router: <
+type Router = <
   RequestType = IRequest,
   Args extends any[] = any[],
   ResponseType = any
@@ -291,7 +320,7 @@ export const Router: <
   ResponseType
 >;
 
-const AutoRouter: <
+type AutoRouter = <
   RequestType extends IRequest = IRequest,
   Args extends any[] = any[],
   ResponseType = any
@@ -307,32 +336,18 @@ const AutoRouter: <
   ResponseType
 >;
 
-const createResponse: (
+type createResponse = (
   format?: string,
   transform?: ((body: any) => any) | undefined
 ) => ResponseFormatter;
 
-const error: ErrorFormatter;
-
-const statusR: (status: number, options?: ResponseInit) => Response;
-
-const textR: ResponseFormatter;
+type statusR = (status: number, options?: ResponseInit) => Response;
 
-const jsonR: ResponseFormatter;
+type withContent = (request: IRequest) => Promise<void>;
 
-const htmlR: ResponseFormatter;
+type withCookies = (r: IRequest) => void;
 
-const jpegR: ResponseFormatter;
-
-const pngR: ResponseFormatter;
-
-const webpR: ResponseFormatter;
-
-const withContent: (request: IRequest) => Promise<void>;
-
-const withCookies: (r: IRequest) => void;
-
-const withParams: (request: IRequest) => void;
+type withParams = (request: IRequest) => void;
 
 type CorsOptions = {
   credentials?: true;
@@ -353,7 +368,7 @@ type CorsPair = {
   preflight: Preflight;
   corsify: Corsify;
 };
-const cors: (options?: CorsOptions) => {
+type cors = (options?: CorsOptions) => {
   corsify: (response: Response, request?: Request) => Response;
   preflight: (request: Request) => Response | undefined;
 };
@@ -362,7 +377,9 @@ interface ModuleServeRouter extends RouterType {
   to(server: ModuleServeServer): any;
 }
 
-interface ModuleServeServerOptions {
+interface ResponseType{}
+
+declare class ModuleServeServerOptions {
   handler?: (req: RequestLike, res: ResponseType) => any;
   routers?: ModuleServeRouter[];
   fetch?: (req: RequestLike) => ResponseType | Promise<ResponseType>;
@@ -372,7 +389,7 @@ interface ModuleServeServer {
   _server: any;
   routers: Record<string, ModuleServeRouter>;
 
-  handleRequest: typeof ModuleServeServerOptions.handler;
+  handleRequest: typeof ModuleServeServerOptions.prototype.handler;
   listen: this;
   port: (port: number) => this;
   log: (string: string) => this;
@@ -388,7 +405,7 @@ interface ModuleServeFileRouterOptions {
   onError?: () => any;
 }
 
-class ModuleServe {
+declare class ModuleServe {
   router({
     id,
     type,
@@ -403,26 +420,29 @@ class ModuleServe {
     o: ModuleServeFileRouterOptions
   ): (req: RequestLike) => ResponseType | Promise<ResponseType>;
 
-  cors = cors;
-  json = jsonR;
-  error = error;
-  png = pngR;
-  jpeg = jpegR;
-  webp = webpR;
-  text = textR;
-  html = htmlR;
-  status = statusR;
+  cors: cors;
+  json: ResponseFormatter;
+  error: ResponseFormatter;
+  png: ResponseFormatter;
+  jpeg: ResponseFormatter;
+  webp: ResponseFormatter;
+  text: ResponseFormatter;
+  html: ResponseFormatter;
+  status: statusR;
 
-  createResponse = createResponse;
+  createResponse: createResponse;
 
-  withContent = withContent;
-  withCookies = withCookies;
-  withParams = withParams;
+  withContent: withContent;
+  withCookies: withCookies;
+  withParams: withParams;
 
+  // @ts-ignore
   Request = Request;
+  // @ts-ignore
   Response = Response;
 }
 
+// @ts-ignore
 type nodable = Element | Node | any;
 interface Node {
   type: string;
@@ -461,7 +481,7 @@ interface ModuleWebState {
   subscribe(callback: CallableFunction): this;
 }
 
-class ModuleWeb {
+declare class ModuleWeb {
   create(options: ModuleWebPageOptions): ModuleWebPage;
   isNode(node: any): boolean;
   isTextNode(node: any): boolean;
@@ -471,12 +491,13 @@ class ModuleWeb {
   createElement(...args: any[]): ElementNode;
 
   state(value): ModuleWebState | any;
+  // @ts-ignore
   useState(states: State[], callback: CallableFunction): any;
 
   bundle(filePath: string, options?: Record<string, any>): string;
 }
 
-class Stack<T = any> {
+declare class Stack<T = any> {
   constructor();
   push(item: T): void;
   pop(): T | undefined;
@@ -485,7 +506,7 @@ class Stack<T = any> {
   toArray(): T[];
 }
 
-class Queue<T = any> {
+declare class Queue<T = any> {
   constructor();
   enqueue(item: T): void;
   dequeue(): T | undefined;
@@ -494,7 +515,7 @@ class Queue<T = any> {
   toArray(): T[];
 }
 
-class LinkedList<T = any> {
+declare class LinkedList<T = any> {
   constructor();
   append(value: T): void;
   prepend(value: T): void;
@@ -503,7 +524,7 @@ class LinkedList<T = any> {
   toArray(): T[];
 }
 
-namespace LinkedList {
+declare namespace LinkedList {
   class Node<T = any> {
     constructor(value: T);
     value: T;
@@ -511,14 +532,14 @@ namespace LinkedList {
   }
 }
 
-class BinaryTree<T = any> {
+declare class BinaryTree<T = any> {
   constructor();
   insert(value: T): void;
   find(value: T): BinaryTree.Node<T> | null;
   toArray(): T[];
 }
 
-namespace BinaryTree {
+declare namespace BinaryTree {
   class Node<T = any> {
     constructor(value: T);
     value: T;
@@ -527,7 +548,7 @@ namespace BinaryTree {
   }
 }
 
-class DoublyLinkedList<T = any> {
+declare class DoublyLinkedList<T = any> {
   constructor();
   append(value: T): void;
   prepend(value: T): void;
@@ -536,7 +557,7 @@ class DoublyLinkedList<T = any> {
   toArray(): T[];
 }
 
-namespace DoublyLinkedList {
+declare namespace DoublyLinkedList {
   class Node<T = any> {
     constructor(value: T);
     value: T;
@@ -545,20 +566,26 @@ namespace DoublyLinkedList {
   }
 }
 
-interface ModuleData {
+declare interface ModuleData {
   Stack: typeof Stack;
   Queue: typeof Queue;
-	BinaryTree: typeof BinaryTree;
-	DoublyLinkedList: typeof DoublyLinkedList;
-	LinkedList: typeof LinkedList;
+  BinaryTree: typeof BinaryTree;
+  DoublyLinkedList: typeof DoublyLinkedList;
+  LinkedList: typeof LinkedList;
 }
 
 interface ModuleStream {
+  // @ts-ignore
   Readable: Readable,
+  // @ts-ignore
   Writable: Writable,
+  // @ts-ignore
   Transform: Transform,
+  // @ts-ignore
   Duplex: Duplex,
+  // @ts-ignore
   pipeline: pipeline,
+  // @ts-ignore
   finished: finished
 }
 
@@ -575,8 +602,9 @@ declare function imp(path: "data", options?: ImportOptions): ModuleData;
 declare function imp(path: "stream", options?: ImportOptions): ModuleStream;
 declare function imp(path: string, options?: ImportOptions): any;
 
-declare const inc = imp;
+declare const inc: typeof imp;
 
+// @ts-ignore
 declare function require(moduleName: string): any;
 
 interface Module {
@@ -587,10 +615,12 @@ interface Module {
   compiled: string;
 }
 
+// @ts-ignore
 declare const module: Module;
 
 interface Imports {
   meta: {
+    // @ts-ignore
     url: URL,
     main: boolean
   };
@@ -599,6 +629,7 @@ interface Imports {
 
 declare const imports: Imports;
 
+// @ts-ignore
 declare const process: {
   argv: string[];
   target: ReturnType<typeof emitter>;
@@ -842,6 +873,7 @@ declare function curl(
      */
     o?: string;
   }
+  // @ts-ignore
 ): Promise<Response>;
 
 /**
@@ -874,7 +906,9 @@ declare function curl(
 
 declare function print(...args: any[]): void;
 declare namespace print {
+  // @ts-ignore
   const stdout: WriteStream;
+  // @ts-ignore
   const stdin: ReadStream;
 }
 
@@ -886,6 +920,7 @@ declare const extname: (path: string) => string;
 declare const pjoin: (...paths: string[]) => string;
 declare const presolve: (...paths: string[]) => string;
 
+// @ts-ignore
 declare function exports(value: any): any;
 
 
@@ -901,7 +936,8 @@ declare const opt: {
 
 declare const JSX: any;
 declare const TYPES: any;
+declare const DECORATORS: any;
 declare function using(fn: any, ...args: any[]): any;
 
 declare function wait(fn: CallableFunction, ...args: any[]): any;
-declare function clear(): void;
+declare function clear(): void;