@makano/rew 1.2.55 → 1.2.57

package/lib/rew/cli/cli.js

@@ -17,6 +17,7 @@ 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');
 
 if (!existsSync(CONFIG_PATH) || !existsSync(CONFIG_PATH + '/repos.yaml')) {
 	mkdirSync(CONFIG_PATH, { recursive: true });
@@ -127,7 +128,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 the ${REW_FILE_TYPE.EXTENSION} instead`,
 					type: 'boolean',
 				})
 				.option('entry', {
@@ -354,7 +355,7 @@ yargs(hideBin(process.argv))
 				})
 				.option('remove', {
 					alias: 'r',
-					describe: 'Remove all coffee',
+					describe: 'Remove all '+REW_FILE_TYPE.EXTENSION,
 					type: 'boolean',
 				});
 		},

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');
@@ -49,7 +50,7 @@ module.exports = {
 	runFileWithArgv(filePath, options = {}, cargv) {
 		const argv = cargv || process.argv;
 		argv.shift();
-		if (argv[0].endsWith('rew')) {
+		if (argv[0].endsWith(REW_FILE_TYPE.EXTENSION)) {
 			if (argv[1] == 'run') {
 				argv.splice(0, 3);
 			} else if(argv[1] == '-w' || argv[1] == '--watch'){
@@ -118,8 +119,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 +128,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 +154,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 Types ? (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 +181,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,
@@ -357,9 +365,9 @@ module.exports = {
 					if (fs.existsSync(importedFilePath)) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath, importsArray);
-					} else if (fs.existsSync(importedFilePath + '.coffee')) {
+					} else if (fs.existsSync(importedFilePath + REW_FILE_TYPE.EXTENSION)) {
 						importsArray.push(importStatement);
-						processFile(importedFilePath + '.coffee', importsArray);
+						processFile(importedFilePath + REW_FILE_TYPE.EXTENSION, importsArray);
 					} else if (fs.existsSync(importedFilePath + '.js')) {
 						importsArray.push(importStatement);
 						processFile(importedFilePath + '.js', importsArray);

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,12 @@
+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
 };
 

package/lib/rew/const/usage.js

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

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,6 +6,7 @@ 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 = () => {
@@ -34,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);
 
@@ -92,7 +93,7 @@ module.exports.imp = function (runPath, 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 +112,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) {
@@ -135,7 +136,6 @@ 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.');
 		//** 
 
 		return exports;

package/lib/rew/functions/require.js

@@ -8,7 +8,7 @@ const cahcedRequires = {};
 const doImp = (path) => wait(async () => await import(resolvedPath));
 
 module.exports.customRequire = function customRequire(modulePath, filePath) {
-	const pathname = modulePath;
+	let pathname = modulePath;
 	if (modulePath.startsWith('./') || modulePath.startsWith('../') || path.isAbsolute(modulePath)) {
 		pathname = path.resolve(modulePath);
 	}

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);
 };

package/lib/rew/modules/compiler.js

@@ -1,4 +1,4 @@
-const { compile } = require('../../coffeescript/coffeescript');
+const { compile: compileCivet } = require('../../civet/main');
 const { execOptions } = require('../const/opt');
 const { findAppInfo } = require('../misc/findAppInfo');
 const { from_qrew } = require('../qrew/compile');
@@ -7,6 +7,9 @@ const babel = require('@babel/core');
 const path = require('path');
 const babelReact = require('@babel/preset-react');
 const { readFileSync } = require('fs');
+const { wait } = require('../functions/wait');
+const { REW_FILE_TYPE } = require('../const/ext');
+const { USING_DEFAULT } = require('../const/usage');
 
 function tokenizeCoffeeScript(code) {
 	const tokens = [];
@@ -115,6 +118,9 @@ function compileRewStuff(content, options) {
 		const token = tokens[i];
 		let { token: nextToken, n } = gnextToken(i, 1, tokens) || {};
 
+		if(token.type == "COMMENT" && i < 2 && token.value.startsWith('#!')){
+			continue;
+		}
 
 		if (token.type === 'IDENTIFIER' && token.value === 'opt.set') {
 			const { token: nextNextToken } = gnextToken(i, 2, tokens) || {};
@@ -150,18 +156,19 @@ function compileRewStuff(content, options) {
 		}
 
 
-		if (token.type === 'IDENTIFIER' && token.value === 'let' && !options.keepImports) {
-			result += '`'
-			hooks.push({
-				index: fnextToken(i, tokens, 'OTHER', ';').ti,
-				value: `\``,
-			});
-		}
-
 		if (token.type === 'IDENTIFIER' && token.value === 'export' && !options.keepImports) {
 			token.value = 'pub';
 		}
 
+		if (token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
+			const next = nextToken.value;
+			if(next in USING_DEFAULT) {
+				const { use } = USING_DEFAULT[next];
+				use?.(options);
+				nextToken.value = `"${nextToken.value}"`
+			}
+		}
+
 		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
 			let ind = i + n + 2;
@@ -177,9 +184,12 @@ function compileRewStuff(content, options) {
 					const exportsTokens = tokens.slice(ind, closingBraceToken.ti);
 					const exports = exportsTokens
 						.filter((t) => t.type === 'IDENTIFIER')
-						.map((t) => t.value)
+						.map((t, i, arr) => t.value == 'as' ? [arr[i-1].value +': '+arr[i+1].value] : t.value)
+						.flat(1)
+						.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 						.join(', ');
-					result += `{ ${exports} } = inc ${nameToken.value}`;
+
+					result += `{ ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = nameToken.ti;
 				}
 			} else if (nextToken.value === '*') {
@@ -188,7 +198,7 @@ function compileRewStuff(content, options) {
 				if (asToken) {
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
-					result += `${defaultName} = inc ${nameToken.value}`;
+					result += `${defaultName} ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = ind + 6;
 				}
 			} else if (nextToken) {
@@ -201,13 +211,15 @@ function compileRewStuff(content, options) {
 						const exportsTokens = tokens.slice(ind, closingBraceToken.ti);
 						const exports = exportsTokens
 							.filter((t) => t.type === 'IDENTIFIER')
-							.map((t) => t.value)
+							.map((t, i, arr) => t.value == 'as' ? [arr[i-1].value +': '+arr[i+1].value] : t.value)
+							.flat(1)
+							.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 							.join(', ');
-						result += `{ default: ${defaultName}, ${exports} } = inc ${nameToken?.value || ''}`;
+						result += `{ default: ${defaultName}, ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 						i = closingBraceToken.ti + 4;
 					}
 				} else {
-					result += `{ default: ${defaultName} } = inc ${nameToken?.value || ''}`;
+					result += `{ default: ${defaultName} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 					i = ind + 2;
 				}
 			}
@@ -259,21 +271,56 @@ function compileRewStuff(content, options) {
 	return result;
 }
 
-const cpl = (module.exports.compile = function (file, options = {}) {
-	let c = options.type == 'js' || options.compile == false ? file.content : compile(compileRewStuff(file.content, options), {
+const compileCivetStuff = (file, options) => {
+	const compileOptions = {
 		...options,
-		filename: file.path,
-		bare: options.bare ?? false,
+		bare: true,
+		filename: file.content,
 		inlineMap: false,
-	});2
+		js: true
+	};
+
+	const prepared = compileRewStuff(file.content, options);
+
+	const compiled = options.async ? compileCivet(prepared, compileOptions) : wait(compileCivet, prepared, compileOptions);
+
+	return {
+		compiled,
+		options
+	};
+}
+
+const cpl = (module.exports.compile = function (file, options = {}) {
+	let compiledCode;
+	const result = compileCivetStuff(file, {
+		...options,
+		parseOptions: { 
+			coffeeCompat: options.type == "coffee",
+		}
+	});
+	
+	options = result.options;
+	compiledCode = result.compiled;
+
+	const babelify = (code, options) => babel.transformSync(code, {
+		presets: [[babelReact, { pragma: options.jsxPragma || execOptions.jsxPragma }]],
+		plugins: [],
+	}).code;
+
+	if(compiledCode instanceof Promise){
+		return compiledCode.then((compiledCode) => {
+			if (execOptions.jsx || options.jsx) {
+				compiledCode = babelify(compiledCode, options);
+			}
+			return compiledCode;
+		});
+	}
+
 	// console.log(c);
 	if (execOptions.jsx || options.jsx) {
-		c = babel.transformSync(c, {
-			presets: [[babelReact, { pragma: options.jsxPragma || execOptions.jsxPragma }]],
-			plugins: [],
-		}).code;
+		compiledCode = babelify(compiledCode, options);
 	}
-	return c;
+	return compiledCode;
 });
 
 module.exports.compileFile = function (filepath, options = {}) {

package/lib/rew/modules/context.js

@@ -7,6 +7,7 @@ const fsLib = require("../functions/fs");
 const pathLib = require("../functions/path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
+const { USING_DEFAULT } = require("../const/usage");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -30,6 +31,7 @@ module.exports.prepareContext = function (
     },
     app: findAppInfo(filepath),
     ...fsLib(filepath),
+    __using__: {}
   };
   if (options.useContext) {
     context = {
@@ -91,6 +93,16 @@ module.exports.prepareContext = function (
   context.pub = pubFunction(context);
   context.exports = exportsFunction(context);
 
+  context.using = (name, ...params) => {
+    if(USING_DEFAULT[name]){
+      if(USING_DEFAULT[name].param) {
+        context.__using__[name] = USING_DEFAULT[name].param(...params);
+      }
+    } else {
+      context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
+    }
+  };
+
   if (
     context.module.main ||
     (options.fromMain == true && options.as == "main")

package/lib/rew/modules/runtime.js

@@ -17,6 +17,7 @@ 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';
 	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;

package/lib/rew/pkgs/serve.js

@@ -5,6 +5,10 @@ const path = require('path');
 const { run } = require('../main');
 const { runPath } = require('../modules/runtime');
 const { cleanCache } = require('../functions/import');
+const { REW_FILE_TYPE } = require('../const/ext');
+
+const lookUpFiles = ['route', 'page', 'page.s'];
+
 module.exports = (context) => {
 
   // http.createServer((req, res) => {
@@ -105,7 +109,7 @@ module.exports = (context) => {
     }
   }
 
-  function findLayoutFiles(filePath, root, isClientSide = true, resolveExtensions = ['.coffee', '.js', '.jsx']) {
+  function findLayoutFiles(filePath, root, isClientSide = true, resolveExtensions = [REW_FILE_TYPE.EXTENSION,  '.coffee', '.js', '.jsx']) {
     const layouts = [];
     const rootDir = root;
     let currentDir = path.dirname(filePath);
@@ -138,7 +142,7 @@ module.exports = (context) => {
   `;
   
   const defaultSsrBundlerEntry = (file, layouts, data) => `
-  files = "${layouts.join(',')},${file}".split(',')
+  files = "${layouts.length ? layouts.join(',')+',' : ''}${file}".split(',')
 
   renderers = []
   staticRendering = false
@@ -162,13 +166,11 @@ module.exports = (context) => {
     onError = () => error(404, 'Path not found'),
     root = '',
     basePath = '',
-    resolveExtensions = ['.coffee', '.js', '.jsx'],
+    resolveExtensions = [REW_FILE_TYPE.EXTENSION, '.coffee', '.js', '.jsx'],
     bundlerOptions = {},
     bundlerEntry = defaultBundlerEntry,
     ssrBundlerEntry = defaultSsrBundlerEntry,
   }) {
-  
-    const lookUpFiles = ['route', 'page', 'page.s'];
 
     const params = {};
   
@@ -176,6 +178,7 @@ module.exports = (context) => {
       const routeParts = pathname.split('/').filter(Boolean);
       let routePath = root;
 
+
       Object.keys(params).forEach(key => delete params[key]);
     
       for (const part of routeParts) {

package/lib/rew/pkgs/web.js

@@ -3,6 +3,7 @@ const emitter = require("../functions/emitter");
 const { compile } = require("../modules/compiler");
 const { wait } = require("../functions/wait");
 const { generateRandomID } = require("../functions/id");
+const { REW_FILE_TYPE } = require("../const/ext");
 
 
 const selfClosingElements = new Set([
@@ -476,11 +477,11 @@ module.exports = (context, importOptions) => {
                 }
                 return null;
               },
-              transform(code, id) {
-                if (id.endsWith('.coffee')) {
-                  const result = compile({ content: code, path: filepath }, { jsx: true, keepImports: true });
+              async transform(code, id) {
+                if (id.endsWith(REW_FILE_TYPE.EXTENSION) || id.endsWith('.coffee')) {
+                  const result = compile({ content: code, path: filepath }, { jsx: true, async: true, keepImports: true });
                   return {
-                    code: result,
+                    code: await result,
                     map: null,
                   };
                 }

package/package.json

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

package/runtime.d.ts

@@ -1,3 +1,5 @@
+
+
 interface ImportOptions {
   /**
    * Determines how to import the given module
@@ -61,7 +63,7 @@ interface ModuleConf extends ModuleConfOptionCenter {
     name: string,
     defaults?: any
   ) => {
-    write: (value: any, ifExists?: boolean) => this;
+    write: (value: any, ifExists?: boolean) => any;
     read: (to?: string | object) => string | object | Buffer;
     fileRoot: string;
     exists: boolean;
@@ -109,8 +111,8 @@ interface ModuleRuneDB {
 interface ModuleRune {
   db(dbname: string, data?: object, encryptionKey?: string): ModuleRuneDB;
   genKey(secret: string): string;
-  push(...values: any[]): PushChange;
-  pop(...values: any[]): PopChange;
+  push(...values: any[]): any;
+  pop(...values: any[]): any;
 }
 
 interface ModuleThreads {
@@ -120,7 +122,7 @@ interface ModuleThreads {
       on: (event: string, callback: (data) => void) => void;
       off: (event: string, callback: (data) => void) => void;
       emit: (event: string, data: any) => void;
-      get: () => Promise;
+      get: () => Promise<any>;
       stop: () => void;
     };
   };
@@ -156,7 +158,8 @@ type StatusErrorObject = {
   error?: string;
   [key: string]: any;
 };
-class StatusError extends Error {
+
+export class StatusError extends Error {
   status: number;
   [key: string]: any;
   constructor(status?: number, body?: StatusErrorObject | string);
@@ -262,12 +265,9 @@ interface ErrorLike extends Error {
 type ErrorBody = string | object;
 interface ErrorFormatter {
   (statusCode?: number, body?: ErrorBody): Response;
-  (error: ErrorLike): Response;
-}
-{
 }
 
-const IttyRouter: <
+export const IttyRouter: <
   RequestType extends IRequest = IRequest,
   Args extends any[] = any[],
   ResponseType = any
@@ -277,7 +277,7 @@ const IttyRouter: <
   ...other
 }?: IttyRouterOptions) => IttyRouterType<RequestType, Args, ResponseType>;
 
-const Router: <
+export const Router: <
   RequestType = IRequest,
   Args extends any[] = any[],
   ResponseType = any
@@ -888,6 +888,7 @@ declare const presolve: (...paths: string[]) => string;
 
 declare function exports(value: any): any;
 
+
 declare function pub(value: any): any;
 declare function pub(name: string, value: any): any;
 
@@ -898,5 +899,9 @@ declare const opt: {
   pop: (key: string) => any;
 };
 
+declare const JSX: any;
+declare const TYPES: any;
+declare function using(fn: any, ...args: any[]): any;
+
 declare function wait(fn: CallableFunction, ...args: any[]): any;
 declare function clear(): void;

package/jsconfig.json

@@ -1,13 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true,
-    "lib": ["ESNext"],
-    "module": "Node16"
-  },
-  "include": [
-    "./runtime.d.ts"
-  ],
-  "typeAcquisition": {
-    "include": ["./runtime.d.ts"]
-  }
-}