@onivoro/onix 20.5.52 → 20.5.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onivoro/onix",
-  "version": "20.5.52",
+  "version": "20.5.55",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/executors/typeorm-db-client/executor.js

@@ -1,563 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
 const load_env_file_function_1 = require("../../functions/load-env-file.function");
 const executor_factory_function_1 = require("../../functions/executor-factory.function");
-const server_html_1 = require("@onivoro/server-html");
-const typeorm_1 = require("typeorm");
-const express = require("express");
+const child_process_1 = require("child_process");
+const os_1 = require("os");
 exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const { envFile = '/Users/leenorris/github.com/silvertek-us/silvertek/.env.colleran.collerancompanies.com', host = 'PG_HOST', database = 'PG_DB', password = 'PG_PASSWORD', port = 'PG_PORT', username = 'PG_USER', type = 'postgres' } = options || {};
-    // Load environment file if provided
+    const { envFile, host, db, password, port, user, type, httpPort } = options || {};
     if (envFile) {
         (0, load_env_file_function_1.loadEnvFile)(envFile);
     }
-    // Extract database configuration from options or environment variables
-    const dbConfig = {
-        host: process.env[host],
-        port: process.env[port],
-        username: process.env[username],
-        password: process.env[password],
-        database: process.env[database],
-        type: type,
-        ssl: (options === null || options === void 0 ? void 0 : options.ssl) !== undefined ? options.ssl : (process.env.DB_SSL === 'true' || process.env.DB_SSL === '1')
-    };
-    // Create TypeORM DataSource configuration
-    const dataSourceConfig = {
-        type: dbConfig.type,
-        host: dbConfig.host,
-        port: dbConfig.port,
-        username: dbConfig.username,
-        password: dbConfig.password,
-        database: dbConfig.database,
-        synchronize: false, // Never auto-sync in production
-        logging: process.env.DB_LOGGING === 'true',
-        ssl: dbConfig.ssl ? { rejectUnauthorized: false } : false,
-        // Empty entities array since we're doing raw queries for database introspection
-        entities: [],
-        // Set reasonable connection pool settings
-        extra: {
-            max: 10,
-            min: 1,
-            acquireTimeoutMillis: 30000,
-            createTimeoutMillis: 30000,
-            destroyTimeoutMillis: 5000,
-            idleTimeoutMillis: 30000,
-            reapIntervalMillis: 1000,
-            createRetryIntervalMillis: 100
-        }
-    };
-    devkit_1.logger.info(`Creating DataSource with configuration:`);
-    devkit_1.logger.info(`- Type: ${dataSourceConfig.type}`);
-    devkit_1.logger.info(`- Host: ${dataSourceConfig.host}`);
-    devkit_1.logger.info(`- Port: ${dataSourceConfig.port}`);
-    devkit_1.logger.info(`- Database: ${dataSourceConfig.database}`);
-    devkit_1.logger.info(`- Username: ${dataSourceConfig.username}`);
-    devkit_1.logger.info(`- SSL: ${dataSourceConfig.ssl ? 'enabled' : 'disabled'}`);
-    const dataSource = new typeorm_1.DataSource(dataSourceConfig);
-    try {
-        yield dataSource.initialize();
-        devkit_1.logger.info('Database connection established');
-        // Create Express server
-        const app = express();
-        app.use(express.json());
-        app.use(express.urlencoded({ extended: true }));
-        // Routes with error handling
-        app.get('/', (req, res) => {
-            try {
-                res.send(getDatabaseClientUI());
-            }
-            catch (error) {
-                devkit_1.logger.error(`Error serving UI: ${error.message}`);
-                res.status(500).send('Internal Server Error');
-            }
-        });
-        app.get('/api/tables', (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const tablesHtml = yield getTables(dataSource);
-                res.send(tablesHtml);
-            }
-            catch (error) {
-                devkit_1.logger.error(`Error fetching tables: ${error.message}`);
-                res.status(500).send(`<div class="error">Error loading tables: ${error.message}</div>`);
-            }
-        }));
-        app.get('/api/table/:tableName', (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const tableDataHtml = yield getTableData(dataSource, req.params.tableName);
-                res.send(tableDataHtml);
-            }
-            catch (error) {
-                devkit_1.logger.error(`Error fetching table data: ${error.message}`);
-                res.status(500).send(`<div class="error">Error loading table data: ${error.message}</div>`);
-            }
-        }));
-        app.get('/api/table/:tableName/structure', (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const structureHtml = yield getTableStructure(dataSource, req.params.tableName);
-                res.send(structureHtml);
-            }
-            catch (error) {
-                devkit_1.logger.error(`Error fetching table structure: ${error.message}`);
-                res.status(500).send(`<div class="error">Error loading table structure: ${error.message}</div>`);
-            }
-        }));
-        app.post('/api/query', (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const queryResultHtml = yield executeQuery(dataSource, req.body.query);
-                res.send(queryResultHtml);
-            }
-            catch (error) {
-                devkit_1.logger.error(`Error executing query: ${error.message}`);
-                res.status(500).send(`<div class="error">Query error: ${error.message}</div>`);
-            }
-        }));
-        const server = app.listen(3000, () => {
-            devkit_1.logger.info('Database client UI available at http://localhost:3000');
-        });
-        // Keep the process running indefinitely
-        const keepRunning = new Promise((resolve) => {
-            const gracefulShutdown = (signal) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-                devkit_1.logger.info(`Received ${signal}, shutting down database client gracefully...`);
-                try {
-                    // Close the HTTP server first (stop accepting new requests)
-                    yield new Promise((resolve, reject) => {
-                        server.close((err) => {
-                            if (err) {
-                                devkit_1.logger.error(`Error closing HTTP server: ${err.message}`);
-                                reject(err);
-                            }
-                            else {
-                                devkit_1.logger.info('HTTP server closed successfully');
-                                resolve();
-                            }
-                        });
-                    });
-                    // Close database connections
-                    if (dataSource && dataSource.isInitialized) {
-                        yield dataSource.destroy();
-                        devkit_1.logger.info('Database connection closed successfully');
-                    }
-                    devkit_1.logger.info('Graceful shutdown completed');
-                    resolve();
-                }
-                catch (error) {
-                    devkit_1.logger.error(`Error during graceful shutdown: ${error.message}`);
-                    resolve(); // Still resolve to exit the process
-                }
-            });
-            process.on('SIGINT', () => gracefulShutdown('SIGINT'));
-            process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
-            // Handle uncaught exceptions
-            process.on('uncaughtException', (error) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-                devkit_1.logger.error(`Uncaught exception: ${error.message}`);
-                yield gracefulShutdown('uncaughtException');
-                process.exit(1);
-            }));
-            // Handle unhandled promise rejections
-            process.on('unhandledRejection', (reason, promise) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-                devkit_1.logger.error(`Unhandled rejection at: ${promise}, reason: ${reason}`);
-                yield gracefulShutdown('unhandledRejection');
-                process.exit(1);
-            }));
-        });
-        // Wait indefinitely until process is terminated
-        yield keepRunning;
+    const http = env(httpPort);
+    (0, child_process_1.execSync)(`docker` + ' ' + [
+        'run',
+        `-p ${http}:${http}`,
+        `--env="DV_HOST=${env(host)}"`,
+        `--env="DV_DB=${env(db)}"`,
+        `--env="DV_PASSWORD=${env(password)}"`,
+        `--env="DV_PORT=${env(port)}"`,
+        `--env="DV_USER=${env(user)}"`,
+        `--env="DV_TYPE=${env(type)}"`,
+        `--env="PORT=${http}"`,
+        `icedlee337/datavore:${((0, os_1.arch)() === 'arm64') ? 'arm64v8' : 'amd64'}`
+    ].join(' '));
+}));
+function env(value) {
+    if (!value) {
+        return value;
     }
-    catch (error) {
-        devkit_1.logger.error('Failed to connect to database: ' + error.message);
-        throw error;
+    if (value.toString().includes('process.env')) {
+        return eval(value);
     }
-}));
-function getDatabaseClientUI() {
-    return (0, server_html_1.$html)({
-        lang: 'en',
-        children: [
-            (0, server_html_1.$head)({
-                children: [
-                    (0, server_html_1.$meta)({ charset: 'UTF-8' }),
-                    (0, server_html_1.$meta)({ name: 'viewport', content: 'width=device-width, initial-scale=1.0' }),
-                    (0, server_html_1.$title)({ textContent: 'TypeORM Database Client' }),
-                    (0, server_html_1.$script)({ src: 'https://unpkg.com/htmx.org@1.9.10' }),
-                    (0, server_html_1.$script)({ src: 'https://unpkg.com/alpinejs@3.13.5/dist/cdn.min.js', defer: true }),
-                    (0, server_html_1.$style)({
-                        textContent: `
-              * { margin: 0; padding: 0; box-sizing: border-box; }
-              body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: #f5f5f5; }
-              .container { display: flex; height: 100vh; }
-              .sidebar { width: 300px; background: #fff; border-right: 1px solid #e0e0e0; overflow-y: auto; }
-              .main { flex: 1; display: flex; flex-direction: column; }
-              .header { background: #fff; padding: 1rem; border-bottom: 1px solid #e0e0e0; }
-              .content { flex: 1; padding: 1rem; overflow: auto; }
-              .table-list { padding: 1rem; }
-              .table-item { padding: 0.5rem; cursor: pointer; border-radius: 4px; margin-bottom: 0.25rem; }
-              .table-item:hover { background: #f0f0f0; }
-              .table-item.active { background: #007acc; color: white; }
-              .query-editor { margin-bottom: 1rem; }
-              .query-editor textarea { width: 100%; height: 100px; padding: 0.5rem; border: 1px solid #ccc; border-radius: 4px; font-family: monospace; }
-              .btn { padding: 0.5rem 1rem; background: #007acc; color: white; border: none; border-radius: 4px; cursor: pointer; }
-              .btn:hover { background: #005a9e; }
-              .table-container { background: white; border-radius: 4px; overflow: hidden; }
-              table { width: 100%; border-collapse: collapse; }
-              th, td { padding: 0.5rem; text-align: left; border-bottom: 1px solid #e0e0e0; }
-              th { background: #f8f9fa; font-weight: 600; }
-              .loading { text-align: center; padding: 2rem; color: #666; }
-              .error { background: #fee; color: #c33; padding: 1rem; border-radius: 4px; margin-bottom: 1rem; }
-              .tabs { display: flex; border-bottom: 1px solid #e0e0e0; }
-              .tab { padding: 0.75rem 1rem; cursor: pointer; border-bottom: 2px solid transparent; }
-              .tab.active { border-bottom-color: #007acc; color: #007acc; font-weight: 600; }
-              .tab-content { display: none; }
-              .tab-content.active { display: block; }
-            `
-                    })
-                ]
-            }),
-            (0, server_html_1.$body)({
-                'x-data': 'dbClient()',
-                children: [
-                    (0, server_html_1.$div)({
-                        className: 'container',
-                        children: [
-                            // Sidebar
-                            (0, server_html_1.$div)({
-                                className: 'sidebar',
-                                children: [
-                                    (0, server_html_1.$div)({
-                                        className: 'table-list',
-                                        children: [
-                                            (0, server_html_1.$h3)({
-                                                textContent: 'Tables',
-                                                style: { marginBottom: '1rem', color: '#333' }
-                                            }),
-                                            (0, server_html_1.$div)({
-                                                'hx-get': '/api/tables',
-                                                'hx-trigger': 'load',
-                                                'hx-target': '#table-list',
-                                                children: [
-                                                    (0, server_html_1.$div)({
-                                                        id: 'table-list',
-                                                        className: 'loading',
-                                                        textContent: 'Loading tables...'
-                                                    })
-                                                ]
-                                            })
-                                        ]
-                                    })
-                                ]
-                            }),
-                            // Main Content
-                            (0, server_html_1.$div)({
-                                className: 'main',
-                                children: [
-                                    (0, server_html_1.$div)({
-                                        className: 'header',
-                                        children: [
-                                            (0, server_html_1.$h1)({ textContent: 'TypeORM Database Client' })
-                                        ]
-                                    }),
-                                    (0, server_html_1.$div)({
-                                        className: 'content',
-                                        children: [
-                                            // Query Editor
-                                            (0, server_html_1.$div)({
-                                                className: 'query-editor',
-                                                children: [
-                                                    (0, server_html_1.$textarea)({
-                                                        'x-model': 'query',
-                                                        placeholder: 'Enter SQL query...'
-                                                    }),
-                                                    (0, server_html_1.$button)({
-                                                        className: 'btn',
-                                                        '@click': 'executeQuery()',
-                                                        style: { marginTop: '0.5rem' },
-                                                        textContent: 'Execute Query'
-                                                    })
-                                                ]
-                                            }),
-                                            // Results Area
-                                            (0, server_html_1.$div)({
-                                                id: 'results-area',
-                                                children: [
-                                                    (0, server_html_1.$div)({
-                                                        className: 'loading',
-                                                        textContent: 'Select a table or execute a query to see results'
-                                                    })
-                                                ]
-                                            })
-                                        ]
-                                    })
-                                ]
-                            })
-                        ]
-                    }),
-                    (0, server_html_1.$script)({
-                        textContent: `
-              function dbClient() {
-                  return {
-                      query: '',
-                      selectedTable: '',
-
-                      selectTable(tableName) {
-                          this.selectedTable = tableName;
-
-                          // Update table list active state
-                          document.querySelectorAll('.table-item').forEach(item => {
-                              item.classList.remove('active');
-                          });
-                          event.target.classList.add('active');
-
-                          // Load table data with tabs
-                          htmx.ajax('GET', '/api/table/' + tableName, {
-                              target: '#results-area'
-                          });
-                      },
-
-                      executeQuery() {
-                          if (!this.query.trim()) return;
-
-                          htmx.ajax('POST', '/api/query', {
-                              target: '#results-area',
-                              values: { query: this.query }
-                          });
-                      },
-
-                      switchTab(tabName) {
-                          // Handle tab switching
-                          document.querySelectorAll('.tab').forEach(tab => {
-                              tab.classList.remove('active');
-                          });
-                          document.querySelectorAll('.tab-content').forEach(content => {
-                              content.classList.remove('active');
-                          });
-
-                          event.target.classList.add('active');
-                          document.getElementById(tabName + '-content').classList.add('active');
-
-                          // Load structure if structure tab is clicked
-                          if (tabName === 'structure' && this.selectedTable) {
-                              htmx.ajax('GET', '/api/table/' + this.selectedTable + '/structure', {
-                                  target: '#structure-content'
-                              });
-                          }
-                      }
-                  }
-              }
-
-              // Make selectTable and switchTab globally available for HTMX
-              window.selectTable = function(tableName) {
-                  document.querySelector('[x-data]').__x.$data.selectTable(tableName);
-              };
-
-              window.switchTab = function(tabName) {
-                  document.querySelector('[x-data]').__x.$data.switchTab(tabName);
-              };
-            `
-                    })
-                ]
-            })
-        ]
-    });
-}
-function getTables(dataSource) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const tables = yield dataSource.query(`
-      SELECT table_name
-      FROM information_schema.tables
-      WHERE table_schema = 'public'
-      ORDER BY table_name
-    `);
-            const tableElements = tables.map(table => (0, server_html_1.$div)({
-                className: 'table-item',
-                onclick: `selectTable('${table.table_name}')`,
-                textContent: table.table_name
-            }));
-            return tableElements.join('');
-        }
-        catch (error) {
-            return (0, server_html_1.$div)({
-                className: 'error',
-                textContent: `Error loading tables: ${error.message}`
-            });
-        }
-    });
-}
-function getTableData(dataSource, tableName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const data = yield dataSource.query(`SELECT * FROM "${tableName}" LIMIT 100`);
-            if (data.length === 0) {
-                const tabs = (0, server_html_1.$div)({
-                    className: 'tabs',
-                    children: [
-                        (0, server_html_1.$div)({
-                            className: 'tab active',
-                            onclick: "switchTab('data')",
-                            textContent: 'Data'
-                        }),
-                        (0, server_html_1.$div)({
-                            className: 'tab',
-                            onclick: "switchTab('structure')",
-                            textContent: 'Structure'
-                        })
-                    ]
-                });
-                const dataContent = (0, server_html_1.$div)({
-                    id: 'data-content',
-                    className: 'tab-content active',
-                    children: [
-                        (0, server_html_1.$p)({
-                            style: { padding: '2rem', textAlign: 'center', color: '#666' },
-                            textContent: `No data found in table "${tableName}"`
-                        })
-                    ]
-                });
-                const structureContent = (0, server_html_1.$div)({
-                    id: 'structure-content',
-                    className: 'tab-content'
-                });
-                return tabs + dataContent + structureContent;
-            }
-            const columns = Object.keys(data[0]);
-            const headerRow = (0, server_html_1.$tr)({
-                children: columns.map(col => (0, server_html_1.$th)({ textContent: col }))
-            });
-            const rows = data.map(row => (0, server_html_1.$tr)({
-                children: columns.map(col => (0, server_html_1.$td)({
-                    innerHTML: row[col] !== null ? String(row[col]) : '<em>NULL</em>'
-                }))
-            }));
-            const tabs = (0, server_html_1.$div)({
-                className: 'tabs',
-                children: [
-                    (0, server_html_1.$div)({
-                        className: 'tab active',
-                        onclick: "switchTab('data')",
-                        textContent: 'Data'
-                    }),
-                    (0, server_html_1.$div)({
-                        className: 'tab',
-                        onclick: "switchTab('structure')",
-                        textContent: 'Structure'
-                    })
-                ]
-            });
-            const dataContent = (0, server_html_1.$div)({
-                id: 'data-content',
-                className: 'tab-content active',
-                children: [
-                    (0, server_html_1.$div)({
-                        className: 'table-container',
-                        children: [
-                            (0, server_html_1.$table)({
-                                children: [
-                                    (0, server_html_1.$thead)({ children: [headerRow] }),
-                                    (0, server_html_1.$tbody)({ children: rows })
-                                ]
-                            })
-                        ]
-                    })
-                ]
-            });
-            const structureContent = (0, server_html_1.$div)({
-                id: 'structure-content',
-                className: 'tab-content'
-            });
-            return tabs + dataContent + structureContent;
-        }
-        catch (error) {
-            return (0, server_html_1.$div)({
-                className: 'error',
-                textContent: `Error loading table data: ${error.message}`
-            });
-        }
-    });
-}
-function getTableStructure(dataSource, tableName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const columns = yield dataSource.query(`
-      SELECT column_name, data_type, is_nullable, column_default
-      FROM information_schema.columns
-      WHERE table_name = $1
-      ORDER BY ordinal_position
-    `, [tableName]);
-            const headerRow = (0, server_html_1.$tr)({
-                children: [
-                    (0, server_html_1.$th)({ textContent: 'Column' }),
-                    (0, server_html_1.$th)({ textContent: 'Type' }),
-                    (0, server_html_1.$th)({ textContent: 'Nullable' }),
-                    (0, server_html_1.$th)({ textContent: 'Default' })
-                ]
-            });
-            const rows = columns.map(col => (0, server_html_1.$tr)({
-                children: [
-                    (0, server_html_1.$td)({ textContent: col.column_name }),
-                    (0, server_html_1.$td)({ textContent: col.data_type }),
-                    (0, server_html_1.$td)({ textContent: col.is_nullable }),
-                    (0, server_html_1.$td)({
-                        innerHTML: col.column_default || '<em>NULL</em>'
-                    })
-                ]
-            }));
-            return (0, server_html_1.$div)({
-                className: 'table-container',
-                children: [
-                    (0, server_html_1.$table)({
-                        children: [
-                            (0, server_html_1.$thead)({ children: [headerRow] }),
-                            (0, server_html_1.$tbody)({ children: rows })
-                        ]
-                    })
-                ]
-            });
-        }
-        catch (error) {
-            return (0, server_html_1.$div)({
-                className: 'error',
-                textContent: `Error loading table structure: ${error.message}`
-            });
-        }
-    });
-}
-function executeQuery(dataSource, query) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const result = yield dataSource.query(query);
-            if (!Array.isArray(result) || result.length === 0) {
-                return (0, server_html_1.$div)({
-                    style: { padding: '2rem', textAlign: 'center', color: '#666' },
-                    textContent: 'Query executed successfully. No results to display.'
-                });
-            }
-            const columns = Object.keys(result[0]);
-            const headerRow = (0, server_html_1.$tr)({
-                children: columns.map(col => (0, server_html_1.$th)({ textContent: col }))
-            });
-            const rows = result.map(row => (0, server_html_1.$tr)({
-                children: columns.map(col => (0, server_html_1.$td)({
-                    innerHTML: row[col] !== null ? String(row[col]) : '<em>NULL</em>'
-                }))
-            }));
-            return (0, server_html_1.$div)({
-                className: 'table-container',
-                children: [
-                    (0, server_html_1.$table)({
-                        children: [
-                            (0, server_html_1.$thead)({ children: [headerRow] }),
-                            (0, server_html_1.$tbody)({ children: rows })
-                        ]
-                    })
-                ]
-            });
-        }
-        catch (error) {
-            return (0, server_html_1.$div)({
-                className: 'error',
-                textContent: `Query error: ${error.message}`
-            });
-        }
-    });
 }
 //# sourceMappingURL=executor.js.map

package/src/executors/typeorm-db-client/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/typeorm-db-client/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/typeorm-db-client/executor.ts"],"names":[],"mappings":";;;AAEA,mFAAqE;AACrE,yFAA4E;AAC5E,iDAAyC;AACzC,2BAA0B;AAE1B,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,EACT,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,IAAI,OAAO,EAAE,CAAC;QACZ,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE3B,IAAA,wBAAQ,EAAC,QAAQ,GAAG,GAAG,GAAG;QACxB,KAAK;QACL,MAAM,IAAI,IAAI,IAAI,EAAE;QACpB,kBAAkB,GAAG,CAAC,IAAI,CAAC,GAAG;QAC9B,gBAAgB,GAAG,CAAC,EAAE,CAAC,GAAG;QAC1B,sBAAsB,GAAG,CAAC,QAAQ,CAAC,GAAG;QACtC,kBAAkB,GAAG,CAAC,IAAI,CAAC,GAAG;QAC9B,kBAAkB,GAAG,CAAC,IAAI,CAAC,GAAG;QAC9B,kBAAkB,GAAG,CAAC,IAAI,CAAC,GAAG;QAC9B,eAAe,IAAI,GAAG;QACtB,uBAAuB,CAAC,IAAA,SAAI,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE;KACpE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEf,CAAC,CAAA,CAAC,CAAC;AAEH,SAAS,GAAG,CAAC,KAAa;IACxB,IAAG,CAAC,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}

package/src/executors/typeorm-db-client/schema.d.ts

@@ -1,10 +1,10 @@
 export interface ExecutorSchema {
+    db: string;
     envFile?: string;
-    host?: string;
-    port?: number;
-    username?: string;
-    password?: string;
-    database?: string;
-    type?: string;
-    ssl?: boolean;
+    host: string;
+    httpPort: string;
+    password: string;
+    port: string;
+    type: string;
+    user: string;
 }

package/src/executors/typeorm-db-client/schema.json

@@ -11,40 +11,48 @@
     },
     "host": {
       "type": "string",
-      "description": "Database host (defaults to localhost or DB_HOST env var)",
-      "default": "localhost"
+      "description": "Database host"
     },
     "port": {
-      "type": "number",
-      "description": "Database port (defaults to 5432 or DB_PORT env var)",
-      "default": 5432
+      "type": "string",
+      "description": "Database port"
+    },
+    "httpPort": {
+      "type": "string",
+      "description": "Local port to accept HTTP traffic"
     },
-    "username": {
+    "user": {
       "type": "string",
-      "description": "Database username (defaults to postgres or DB_USERNAME/DB_USER env var)",
-      "default": "postgres"
+      "description": "Database username"
     },
     "password": {
       "type": "string",
-      "description": "Database password (defaults to empty or DB_PASSWORD env var)",
-      "default": ""
+      "description": "Database password"
     },
-    "database": {
+    "db": {
       "type": "string",
-      "description": "Database name (defaults to postgres or DB_DATABASE/DB_NAME env var)",
-      "default": "postgres"
+      "description": "Database name"
     },
     "type": {
       "type": "string",
-      "description": "Database type (defaults to postgres or DB_TYPE env var)",
-      "default": "postgres",
-      "enum": ["postgres", "mysql", "mariadb", "sqlite", "mssql", "oracle"]
-    },
-    "ssl": {
-      "type": "boolean",
-      "description": "Enable SSL connection (defaults to false or DB_SSL env var)",
-      "default": false
+      "description": "Database type",
+      "enum": [
+        "postgres",
+        "mysql",
+        "mariadb",
+        "sqlite",
+        "mssql",
+        "oracle"
+      ]
     }
   },
-  "required": []
-}
+  "required": [
+    "db",
+    "host",
+    "httpPort",
+    "password",
+    "port",
+    "type",
+    "user"
+  ]
+}