@axium/server 0.34.1 → 0.34.3

package/README.md

@@ -1 +1,9 @@
 # Axium Server
+
+Axium Server is the main server application and framework for Axium.
+
+It includes:
+
+- The `axium` (server) CLI
+- The web UI/server and HTTP API
+- Lots of database stuff

package/dist/linking.js

@@ -12,14 +12,14 @@ function info(id) {
     return [text, link];
 }
 export function* listRouteLinks(options = {}) {
-    if (!options.only) {
+    if (!options.only || !options.only.length) {
         const [text, link] = info('#builtin');
         yield { text, id: '#builtin', from: link, to: resolve(import.meta.dirname, '../routes') };
     }
     for (const plugin of plugins.values()) {
         if (!plugin.server?.routes)
             continue;
-        if (options.only && !options.only.includes(plugin.name))
+        if (options.only && options.only.length && !options.only.includes(plugin.name))
             continue;
         const [text, link] = info(plugin.name);
         const to = resolve(join(plugin.dirname, plugin.server.routes));

package/dist/main.js

@@ -82,17 +82,30 @@ async function rlConfirm(question = 'Is this ok') {
         io.exit('Aborted.');
 }
 async function dbInitTables() {
-    const info = db.getUpgradeInfo();
-    const schema = db.getFullSchema({ exclude: Object.keys(info.current) });
-    const delta = db.computeDelta({ tables: {}, indexes: [] }, schema);
-    if (db.deltaIsEmpty(delta))
-        return;
-    for (const text of db.displayDelta(delta))
-        console.log(text);
-    await rlConfirm();
-    await db.applyDelta(delta);
-    Object.assign(info.current, schema.versions);
-    db.setUpgradeInfo(info);
+    const env_2 = { stack: [], error: void 0, hasError: false };
+    try {
+        const info = db.getUpgradeInfo();
+        const schema = db.getFullSchema({ exclude: Object.keys(info.current) });
+        const delta = db.computeDelta({ tables: {}, indexes: [] }, schema);
+        if (db.deltaIsEmpty(delta))
+            return;
+        for (const text of db.displayDelta(delta))
+            console.log(text);
+        await rlConfirm();
+        const _ = __addDisposableResource(env_2, db.connect(), true);
+        await db.applyDelta(delta);
+        Object.assign(info.current, schema.versions);
+        db.setUpgradeInfo(info);
+    }
+    catch (e_2) {
+        env_2.error = e_2;
+        env_2.hasError = true;
+    }
+    finally {
+        const result_1 = __disposeResources(env_2);
+        if (result_1)
+            await result_1;
+    }
 }
 function configReplacer(opt) {
     return (key, value) => {
@@ -173,7 +186,6 @@ try {
                 io.warn('Invalid timeout value, using default.');
             io.setCommandTimeout(timeout);
         }),
-        packagesDir: new Option('-p, --packages-dir <dir>', 'the directory to look for packages in'),
     };
     axiumDB = program.command('db').alias('database').description('Manage the database').addOption(opts.timeout);
     axiumDB
@@ -265,7 +277,7 @@ try {
         .description('Check the structure of the database')
         .option('-s, --strict', 'Throw errors instead of emitting warnings for most column problems')
         .action(async (opt) => {
-        const env_2 = { stack: [], error: void 0, hasError: false };
+        const env_3 = { stack: [], error: void 0, hasError: false };
         try {
             await io.run('Checking for sudo', 'which sudo').catch(io.exit);
             await io.run('Checking for psql', 'which psql').catch(io.exit);
@@ -277,7 +289,7 @@ try {
             await db._sql(`SELECT 1 FROM pg_database WHERE datname = 'axium'`, 'Checking for database').then(throwUnlessRows).catch(io.exit);
             await db._sql(`SELECT 1 FROM pg_roles WHERE rolname = 'axium'`, 'Checking for user').then(throwUnlessRows).catch(io.exit);
             io.start('Connecting to database');
-            const _ = __addDisposableResource(env_2, db.connect(), true);
+            const _ = __addDisposableResource(env_3, db.connect(), true);
             io.done();
             io.start('Getting schema metadata');
             const schemas = await db.database.introspection.getSchemas().catch(io.exit);
@@ -316,14 +328,14 @@ try {
             else
                 io.warn(unchecked);
         }
-        catch (e_2) {
-            env_2.error = e_2;
-            env_2.hasError = true;
+        catch (e_3) {
+            env_3.error = e_3;
+            env_3.hasError = true;
         }
         finally {
-            const result_1 = __disposeResources(env_2);
-            if (result_1)
-                await result_1;
+            const result_2 = __disposeResources(env_3);
+            if (result_2)
+                await result_2;
         }
     });
     axiumDB
@@ -572,21 +584,21 @@ try {
         .addOption(opts.check)
         .argument('<plugin>', 'the plugin to initialize')
         .action(async (search) => {
-        const env_3 = { stack: [], error: void 0, hasError: false };
+        const env_4 = { stack: [], error: void 0, hasError: false };
         try {
             const plugin = _findPlugin(search);
             if (!plugin)
                 io.exit(`Can't find a plugin matching "${search}"`);
-            const _ = __addDisposableResource(env_3, db.connect(), true);
+            const _ = __addDisposableResource(env_4, db.connect(), true);
         }
-        catch (e_3) {
-            env_3.error = e_3;
-            env_3.hasError = true;
+        catch (e_4) {
+            env_4.error = e_4;
+            env_4.hasError = true;
         }
         finally {
-            const result_2 = __disposeResources(env_3);
-            if (result_2)
-                await result_2;
+            const result_3 = __disposeResources(env_4);
+            if (result_3)
+                await result_3;
         }
     });
     axiumApps = program.command('apps').description('Manage Axium apps').addOption(opts.global);
@@ -742,7 +754,6 @@ try {
         .description('Install Axium server')
         .addOption(opts.force)
         .addOption(opts.check)
-        .addOption(opts.packagesDir)
         .option('-s, --skip', 'Skip already initialized steps', false)
         .action(async (opt) => {
         await db.init(opt).catch(io.exit);
@@ -776,7 +787,6 @@ try {
     program
         .command('link')
         .description('Link routes provided by plugins and the server')
-        .addOption(opts.packagesDir)
         .addOption(new Option('-l, --list', 'list route links').conflicts('delete'))
         .option('-d, --delete', 'delete route links')
         .argument('[name...]', 'List of plugin names to operate on. If not specified, operates on all plugins and built-in routes.')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.34.1",
+	"version": "0.34.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",