improved error logging, improved type def, version bump

Author: realtux

bin/scripts/init.js

@@ -89,6 +89,9 @@ export default async () => {
      */
     let package_json = JSON.parse(await fs.readFile(`${project_path}/package.json`));
 
+    // delete internal
+    delete package_json.scripts.__internal_test;
+
     // ensure user gets latest version
     package_json.dependencies['@exajs/core'] = 'latest';
 

index.d.ts

@@ -9,25 +9,31 @@ declare module '@exajs/core/database' {
     export { connection, models };
 }
 
-declare module '@exajs/core/database/models' {
-    const models: any;
-    export default models;
-}
-
-declare module '@exajs/core/database/connection' {
-    const connection: any;
-    export default connection;
-}
-
 declare module '@exajs/core/system/sequelize' {
     const sequelize: any;
     export default sequelize;
     export * from 'sequelize';
 }
 
 declare module '@exajs/core/util' {
-    import hash from '#exa/util/hash.js';
-    import json from '#exa/util/json.js';
-    import string from '#exa/util/string.js';
-    export { hash, json, string };
+    class Hash {
+        sha1(string?: any): string;
+        sha2(string?: any): string;
+    }
+    class Json {
+        safe_parse(json: string, def?: any): any;
+        merge(...objects: any[]): object;
+        minify(jsonString: string): string;
+        compare(obj1: any, obj2: any): boolean;
+    }
+    class String {
+        ucwords(string: any): string;
+        to_slug(string: any): string;
+        to_currency(amount: any): string;
+        strip_html(str: any): any;
+    }
+
+    export const hash: Hash;
+    export const json: Json;
+    export const string: String;
 }

lib/core/logger.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 export default new class {
 
     error(...msg) {
-        console.log(`${chalk.red('!')}`, ...msg);
+        console.log(`${chalk.red('!')}`, ...this.dim(...msg));
     }
 
     warning(...msg) {
@@ -14,4 +14,22 @@ export default new class {
         console.log(`${chalk.cyan('*')}`, ...msg);
     }
 
+    dim(...msg) {
+        return msg.map(line => {
+            if (typeof line !== 'string') {
+                return line;
+            }
+
+            return line
+                .split('\n')
+                .map(line => {
+                    if (line.match(/at.+(node_modules|node:internal)/gi)) {
+                        return chalk.gray(line);
+                    }
+                    return line;
+                })
+                .join('\n');
+        });
+    }
+
 }

lib/database/models.js

@@ -1,10 +1,12 @@
 import config from '#exa/core/config.js';
+import logger from '#exa/core/logger.js';
 import connection from '#exa/database/connection.js';
+import chalk from 'chalk';
 import { glob } from 'glob';
 
 let models = {};
 
-export const init = async () => {
+export const init = async quiet => {
     let files = await glob(`${config.paths.root}${config.paths.models}/*.js`);
 
     for (const file of files) {
@@ -45,6 +47,10 @@ export const init = async () => {
 
         model.associate && model.associate(models);
     }
+
+    if (!quiet) {
+        logger.info(`initialized ${chalk.green(Object.entries(models).length)} models`);
+    }
 };
 
 export default models;

lib/http/express.js

@@ -81,7 +81,7 @@ export const init = async () => {
 
     // start server
     const server = app.listen(config.http.port, () => {
-        logger.info(`server running on ${config.http.host}:${config.http.port}`);
+        logger.info(`http server running on ${config.http.host}:${config.http.port}`);
     });
 
     if (config.websocket.use) {

lib/index.js

@@ -20,6 +20,10 @@ const handle_fatal_logging = err => {
     if (err instanceof Error) {
         logger.error(chalk.red('error:'), err.message);
         logger.error(chalk.red('stack:'), err.stack.toString());
+        if (err.sql) {
+            logger.error(chalk.red('query:'), err.sql);
+            logger.error(chalk.red('parameters:'), err.parameters);
+        }
     } else if (typeof err === 'string') {
         logger.error(err);
     } else if (typeof err === 'object') {
@@ -33,7 +37,7 @@ process.on('uncaughtException', err => {
     handle_fatal_logging(err);
 });
 
-process.on('unhandledRejection', err => {
+process.on('unhandledRejection', (err, promise) => {
     logger.error(`exa unhandled rejection:`);
     handle_fatal_logging(err);
 });
@@ -101,11 +105,7 @@ export default new class {
              */
             if (config.database.use) {
                 await init_db();
-                await init_models();
-
-                if (!quiet) {
-                    logger.info('database initialized');
-                }
+                await init_models(quiet);
             }
 
             if (is_console) {

package.json

@@ -2,7 +2,7 @@
     "name": "@exajs/core",
     "type": "module",
     "author": "Brian Seymour <@realtux>",
-    "version": "0.0.21",
+    "version": "0.0.22",
     "description": "modern opinionated node.js framework",
     "license": "MIT",
     "homepage": "https://github.com/realtux/exa",
@@ -21,10 +21,8 @@
     "exports": {
         ".": "./lib/index.js",
         "./database": "./lib/database/index.js",
-        "./database/models": "./lib/database/models.js",
-        "./database/connection": "./lib/database/connection.js",
-        "./system/sequelize": "./lib/system/sequelize.js",
-        "./util": "./lib/util/index.js"
+        "./util": "./lib/util/index.js",
+        "./system/sequelize": "./lib/system/sequelize.js"
     },
     "dependencies": {
         "chalk": "5.3.0",

readme.md

@@ -1,4 +1,4 @@
-## IMPORTANT!!! THIS PROJECT IS AN EARLY ACCESS PREVIEW THAT IS BEING ACTIVELY DEVELOPED. IT MAY OR MAY NOT BE SUITABLE FOR PRODUCTION. EXPECTED 1.0 DATE IS FEBRUARY OR MARCH 2025. THE PROJECT STATE IS: USEFUL BUT INCOMPLETE
+## IMPORTANT!!! THIS PROJECT IS AN EARLY ACCESS PREVIEW THAT IS BEING ACTIVELY DEVELOPED. IT MAY OR MAY NOT BE SUITABLE FOR PRODUCTION. EXPECTED 1.0 DATE IS APRIL 2025. THE PROJECT STATE IS: VERY USEFUL AND BEING REFINED
 
 ## exa.js by [tux](https://github.com/realtux)
 exa.js is a minimal node.js backend framework that has a strong focus on simplicity, modularity, and convention over configuration. it makes available the most important stuff needed for a node.js web framework, and nothing more.

var/template/.gitignore

@@ -1,2 +1,3 @@
 node_modules
 .env
+.exa

var/template/package.json

@@ -10,6 +10,7 @@
     "scripts": {
         "watch": "nodemon -q --watch ../.. --ignore node_modules/ -e '*' -x '%%RUNTIME%% app.js || touch app.js'",
         "start": "%%RUNTIME%% app.js",
-        "console": "%%RUNTIME%% app.js console $*"
+        "console": "%%RUNTIME%% app.js console $*",
+        "__internal_test": "nodemon -q --watch ../.. --ignore node_modules/ -e '*' -x 'node app.js || touch app.js'"
     }
 }