fix types, fix exports, add json library module, fix env expand, vers…

…ion bump

index.d.ts

@@ -2,3 +2,31 @@ declare module '@exajs/core' {
     const exa: any;
     export default exa;
 }
+
+declare module '@exajs/core/database' {
+    const connection: any;
+    const models: any;
+    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 json from '#exa/util/json.js';
+
+    export { json };
+}

lib/core/config.js

@@ -3,7 +3,7 @@ let config = {
     /**
      * internal config
      */
-    version: '0.0.12',
+    version: '0.0.13',
 
     paths: {
         root: '',

lib/database/index.js

@@ -0,0 +1,4 @@
+import connection from '#exa/database/connection.js';
+import models from '#exa/database/models.js';
+
+export { connection, models };

lib/http/express.js

@@ -29,6 +29,7 @@ export const init = async () => {
     app.use(cors());
     app.use(multer({ storage: multer.memoryStorage() }).any());
     app.use(Express.json({ limit: '16mb' }));
+    app.use(Express.urlencoded({ extended: true }));
     app.use('/public', Express.static(`${config.paths.root}/public`));
 
     // mounted http controller routes

lib/index.js

@@ -1,5 +1,6 @@
 import * as dotenv from 'dotenv';
-dotenv.config();
+import dotenv_expand from 'dotenv-expand';
+dotenv_expand.expand(dotenv.config());
 
 import config, { init as init_config } from '#exa/core/config.js';
 import connection, { init as init_db } from '#exa/database/connection.js';

lib/util/index.js

@@ -0,0 +1,3 @@
+import json from '#exa/util/json.js';
+
+export { json };

lib/util/json.js

@@ -0,0 +1,11 @@
+export default new class {
+
+    safe_parse(json, def) {
+        try {
+            return JSON.parse(json);
+        } catch {
+            return def ?? json;
+        }
+    }
+
+};

package.json

@@ -2,7 +2,7 @@
     "name": "@exajs/core",
     "type": "module",
     "author": "Brian Seymour <@realtux>",
-    "version": "0.0.12",
+    "version": "0.0.13",
     "description": "modern opinionated node.js framework",
     "license": "MIT",
     "homepage": "https://github.com/realtux/exa",
@@ -20,15 +20,17 @@
     },
     "exports": {
         ".": "./lib/index.js",
+        "./database": "./lib/database/index.js",
         "./database/models": "./lib/database/models.js",
         "./database/connection": "./lib/database/connection.js",
-        "./system": "./lib/system/index.js",
-        "./system/sequelize": "./lib/system/sequelize.js"
+        "./system/sequelize": "./lib/system/sequelize.js",
+        "./util": "./lib/util/index.js"
     },
     "dependencies": {
         "chalk": "5.3.0",
         "cors": "2.8.5",
         "dotenv": "16.4.5",
+        "dotenv-expand": "11.0.6",
         "express": "4.19.2",
         "glob": "10.4.1",
         "luxon": "3.4.4",