From f7ebcd953742d94b81bcdbd63fb339a76460be26 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Mon, 16 Nov 2020 21:59:08 +0100 Subject: [PATCH] renamed dbgate packages, because of npmjs policy --- package.json | 32 +++++++++---------- packages/api/package.json | 8 ++--- .../src/controllers/databaseConnections.js | 6 ++-- packages/api/src/controllers/runners.js | 6 ++-- packages/api/src/controllers/sessions.js | 2 +- packages/api/src/proc/connectProcess.js | 2 +- .../api/src/proc/databaseConnectionProcess.js | 2 +- .../api/src/proc/serverConnectionProcess.js | 2 +- packages/api/src/proc/sessionProcess.js | 2 +- packages/api/src/shell/queryReader.js | 2 +- packages/api/src/shell/tableReader.js | 4 +-- packages/api/src/shell/tableWriter.js | 2 +- packages/datalib/package.json | 8 ++--- packages/datalib/src/ChangeSet.ts | 4 +-- packages/datalib/src/FreeTableGridDisplay.ts | 2 +- packages/datalib/src/FreeTableModel.ts | 2 +- packages/datalib/src/GridConfig.ts | 2 +- packages/datalib/src/GridDisplay.ts | 8 ++--- packages/datalib/src/JslGridDisplay.ts | 2 +- packages/datalib/src/TableGridDisplay.ts | 4 +-- packages/datalib/src/ViewGridDisplay.ts | 2 +- packages/engines/README.md | 4 +-- packages/engines/default/DatabaseAnalyser.js | 10 +++--- packages/engines/default/SqlDumper.js | 14 ++++---- .../default/createBulkInsertStreamBase.js | 4 +-- packages/engines/index.d.ts | 2 +- packages/engines/mssql/MsSqlAnalyser.js | 4 +-- packages/engines/mssql/MsSqlDumper.js | 2 +- .../engines/mssql/createBulkInsertStream.js | 2 +- packages/engines/mssql/index.js | 4 +-- packages/engines/mysql/MySqlAnalyser.js | 4 +-- packages/engines/mysql/MySqlDumper.js | 2 +- packages/engines/mysql/index.js | 4 +-- packages/engines/package.json | 6 ++-- packages/engines/postgres/PostgreAnalyser.js | 4 +-- packages/engines/postgres/PostgreDumper.js | 2 +- packages/engines/postgres/index.js | 4 +-- packages/filterparser/package.json | 6 ++-- packages/filterparser/src/cli.ts | 4 +-- packages/filterparser/src/filterTool.ts | 2 +- packages/filterparser/src/getFilterType.ts | 2 +- packages/filterparser/src/parseFilter.ts | 4 +-- packages/filterparser/src/types.ts | 2 +- packages/sqltree/README.md | 10 +++--- packages/sqltree/package.json | 4 +-- packages/sqltree/src/dumpSqlCommand.ts | 2 +- packages/sqltree/src/dumpSqlCondition.ts | 2 +- packages/sqltree/src/dumpSqlExpression.ts | 2 +- packages/sqltree/src/dumpSqlSource.ts | 2 +- packages/sqltree/src/types.ts | 2 +- packages/sqltree/src/utility.ts | 2 +- packages/tools/package.json | 4 +-- packages/tools/src/nameTools.ts | 2 +- packages/tools/src/tableTransforms.ts | 2 +- packages/types/README.md | 4 +-- packages/types/package.json | 2 +- packages/web/package.json | 10 +++--- packages/web/src/appobj/MacroAppObject.js | 2 +- .../web/src/appobj/archiveFileAppObject.js | 2 +- .../web/src/appobj/archiveFolderAppObject.js | 2 +- packages/web/src/appobj/columnAppObject.js | 4 +-- .../web/src/appobj/connectionAppObject.js | 2 +- .../web/src/appobj/constraintAppObject.js | 4 +-- .../web/src/appobj/databaseObjectAppObject.js | 2 +- packages/web/src/datagrid/ChangeSetGrider.ts | 2 +- .../web/src/datagrid/ColumnHeaderControl.js | 2 +- packages/web/src/datagrid/ColumnLabel.js | 2 +- packages/web/src/datagrid/ColumnManager.js | 6 ++-- .../web/src/datagrid/DataFilterControl.js | 2 +- packages/web/src/datagrid/DataGrid.js | 2 +- packages/web/src/datagrid/DataGridCore.js | 2 +- packages/web/src/datagrid/DataGridRow.js | 2 +- packages/web/src/datagrid/ReferenceManager.js | 2 +- packages/web/src/datagrid/SqlDataGridCore.js | 4 +-- packages/web/src/datagrid/TableDataGrid.js | 6 ++-- packages/web/src/datagrid/gridutil.ts | 4 +-- packages/web/src/datagrid/types.ts | 2 +- packages/web/src/freetable/FreeTableGrid.js | 2 +- .../web/src/freetable/FreeTableGridCore.js | 2 +- packages/web/src/freetable/FreeTableGrider.ts | 2 +- .../web/src/freetable/MacroPreviewGrider.ts | 2 +- .../src/impexp/ImportExportConfigurator.js | 2 +- packages/web/src/impexp/PreviewDataGrid.js | 2 +- packages/web/src/impexp/createImpExpScript.js | 4 +-- packages/web/src/modals/InsertJoinModal.js | 2 +- packages/web/src/sqleditor/JslDataGrid.js | 2 +- packages/web/src/tabs/FreeTableTab.js | 2 +- packages/web/src/tabs/QueryTab.js | 2 +- packages/web/src/tabs/ShellTab.js | 2 +- packages/web/src/tabs/TableDataTab.js | 2 +- packages/web/src/tabs/ViewDataTab.js | 4 +-- packages/web/src/utility/metadataLoaders.js | 16 +++++----- packages/web/src/utility/useGridConfig.js | 2 +- test/exportTable.js | 2 +- test/importTable.js | 2 +- test/importUcet.js | 2 +- 96 files changed, 179 insertions(+), 179 deletions(-) diff --git a/package.json b/package.json index 22574308f..fbd60a661 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,25 @@ { "private": true, - "name": "@dbgate/all", + "name": "dbgate-all", "workspaces": [ "packages/*" ], "scripts": { - "start:api": "yarn workspace @dbgate/api start", - "start:api:portal": "yarn workspace @dbgate/api start:portal", - "start:web": "yarn workspace @dbgate/web start", - "start:sqltree": "yarn workspace @dbgate/sqltree start", - "start:tools": "yarn workspace @dbgate/tools start", - "start:datalib": "yarn workspace @dbgate/datalib start", - "start:filterparser": "yarn workspace @dbgate/filterparser start", - "build:sqltree": "yarn workspace @dbgate/sqltree build", - "build:datalib": "yarn workspace @dbgate/datalib build", - "build:filterparser": "yarn workspace @dbgate/filterparser build", - "build:tools": "yarn workspace @dbgate/tools build", + "start:api": "yarn workspace dbgate-api start", + "start:api:portal": "yarn workspace dbgate-api start:portal", + "start:web": "yarn workspace dbgate-web start", + "start:sqltree": "yarn workspace dbgate-sqltree start", + "start:tools": "yarn workspace dbgate-tools start", + "start:datalib": "yarn workspace dbgate-datalib start", + "start:filterparser": "yarn workspace dbgate-filterparser start", + "build:sqltree": "yarn workspace dbgate-sqltree build", + "build:datalib": "yarn workspace dbgate-datalib build", + "build:filterparser": "yarn workspace dbgate-filterparser build", + "build:tools": "yarn workspace dbgate-tools build", "build:lib": "yarn build:tools && yarn build:sqltree && yarn build:filterparser && yarn build:datalib", "build:app": "cd app && yarn install && yarn build", - "build:api": "yarn workspace @dbgate/api build", - "build:web:docker": "yarn workspace @dbgate/web build:docker", + "build:api": "yarn workspace dbgate-api build", + "build:web:docker": "yarn workspace dbgate-web build:docker", "build:app:local": "cd app && yarn build:local", "start:app:local": "cd app && yarn start:local", @@ -29,8 +29,8 @@ "prepare": "yarn build:lib", "start": "concurrently --kill-others-on-fail \"yarn start:api\" \"yarn start:web\"", "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\"", - "ts:api": "yarn workspace @dbgate/api ts", - "ts:web": "yarn workspace @dbgate/web ts", + "ts:api": "yarn workspace dbgate-api ts", + "ts:web": "yarn workspace dbgate-web ts", "ts": "yarn ts:api && yarn ts:web", "postinstall": "patch-package" }, diff --git a/packages/api/package.json b/packages/api/package.json index 00dffaa12..212ae0777 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,11 +1,11 @@ { - "name": "@dbgate/api", + "name": "dbgate-api", "main": "src/index.js", "version": "1.0.0", "private": true, "dependencies": { - "@dbgate/engines": "^1.0.0", - "@dbgate/sqltree": "^1.0.0", + "dbgate-engines": "^1.0.0", + "dbgate-sqltree": "^1.0.0", "async-lock": "^1.2.4", "axios": "^0.19.0", "body-parser": "^1.19.0", @@ -36,7 +36,7 @@ "build": "webpack" }, "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/lodash": "^4.14.149", "env-cmd": "^10.1.0", "nodemon": "^2.0.2", diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js index c939ad51a..be16f7e95 100644 --- a/packages/api/src/controllers/databaseConnections.js +++ b/packages/api/src/controllers/databaseConnections.js @@ -2,10 +2,10 @@ const uuidv1 = require('uuid/v1'); const connections = require('./connections'); const socket = require('../utility/socket'); const { fork } = require('child_process'); -const DatabaseAnalyser = require('@dbgate/engines/default/DatabaseAnalyser'); +const DatabaseAnalyser = require('dbgate-engines/default/DatabaseAnalyser'); module.exports = { - /** @type {import('@dbgate/types').OpenedDatabaseConnection[]} */ + /** @type {import('dbgate-types').OpenedDatabaseConnection[]} */ opened: [], closed: [], requests: {}, @@ -67,7 +67,7 @@ module.exports = { return newOpened; }, - /** @param {import('@dbgate/types').OpenedDatabaseConnection} conn */ + /** @param {import('dbgate-types').OpenedDatabaseConnection} conn */ sendRequest(conn, message) { const msgid = uuidv1(); const promise = new Promise((resolve, reject) => { diff --git a/packages/api/src/controllers/runners.js b/packages/api/src/controllers/runners.js index 90e4bfd96..f523fbaf2 100644 --- a/packages/api/src/controllers/runners.js +++ b/packages/api/src/controllers/runners.js @@ -8,7 +8,7 @@ const { fork } = require('child_process'); const { rundir, uploadsdir } = require('../utility/directories'); const scriptTemplate = (script) => ` -const dbgateApi = require(process.env.DBGATE_API || "@dbgate/api"); +const dbgateApi = require(process.env.DBGATE_API || "dbgate-api"); require=null; async function run() { ${script} @@ -18,7 +18,7 @@ dbgateApi.runScript(run); `; const loaderScriptTemplate = (functionName, props, runid) => ` -const dbgateApi = require(process.env.DBGATE_API || "@dbgate/api"); +const dbgateApi = require(process.env.DBGATE_API || "dbgate-api"); require=null; async function run() { const reader=await dbgateApi.${functionName}(${JSON.stringify(props)}); @@ -29,7 +29,7 @@ dbgateApi.runScript(run); `; module.exports = { - /** @type {import('@dbgate/types').OpenedRunner[]} */ + /** @type {import('dbgate-types').OpenedRunner[]} */ opened: [], requests: {}, diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js index 6c09d324a..e429979f1 100644 --- a/packages/api/src/controllers/sessions.js +++ b/packages/api/src/controllers/sessions.js @@ -6,7 +6,7 @@ const { fork } = require('child_process'); const jsldata = require('./jsldata'); module.exports = { - /** @type {import('@dbgate/types').OpenedSession[]} */ + /** @type {import('dbgate-types').OpenedSession[]} */ opened: [], // handle_error(sesid, props) { diff --git a/packages/api/src/proc/connectProcess.js b/packages/api/src/proc/connectProcess.js index 2a252d483..9ba051492 100644 --- a/packages/api/src/proc/connectProcess.js +++ b/packages/api/src/proc/connectProcess.js @@ -1,4 +1,4 @@ -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); const driverConnect = require('../utility/driverConnect'); const childProcessChecker = require('../utility/childProcessChecker'); diff --git a/packages/api/src/proc/databaseConnectionProcess.js b/packages/api/src/proc/databaseConnectionProcess.js index 95fb14742..08665fcf9 100644 --- a/packages/api/src/proc/databaseConnectionProcess.js +++ b/packages/api/src/proc/databaseConnectionProcess.js @@ -1,4 +1,4 @@ -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); const stableStringify = require('json-stable-stringify'); const driverConnect = require('../utility/driverConnect'); const childProcessChecker = require('../utility/childProcessChecker'); diff --git a/packages/api/src/proc/serverConnectionProcess.js b/packages/api/src/proc/serverConnectionProcess.js index 3f8341d8d..0d08b95ca 100644 --- a/packages/api/src/proc/serverConnectionProcess.js +++ b/packages/api/src/proc/serverConnectionProcess.js @@ -1,4 +1,4 @@ -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); const stableStringify = require('json-stable-stringify'); const driverConnect = require('../utility/driverConnect'); const childProcessChecker = require('../utility/childProcessChecker'); diff --git a/packages/api/src/proc/sessionProcess.js b/packages/api/src/proc/sessionProcess.js index ef15c74af..a24bf42c7 100644 --- a/packages/api/src/proc/sessionProcess.js +++ b/packages/api/src/proc/sessionProcess.js @@ -1,4 +1,4 @@ -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); const uuidv1 = require('uuid/v1'); const path = require('path'); const fs = require('fs'); diff --git a/packages/api/src/shell/queryReader.js b/packages/api/src/shell/queryReader.js index 087b5439f..12ae13bec 100644 --- a/packages/api/src/shell/queryReader.js +++ b/packages/api/src/shell/queryReader.js @@ -1,6 +1,6 @@ const driverConnect = require('../utility/driverConnect'); -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); async function queryReader({ connection, sql }) { console.log(`Reading query ${sql}`); diff --git a/packages/api/src/shell/tableReader.js b/packages/api/src/shell/tableReader.js index 023819d7c..172fabb0f 100644 --- a/packages/api/src/shell/tableReader.js +++ b/packages/api/src/shell/tableReader.js @@ -1,7 +1,7 @@ -const { quoteFullName } = require('@dbgate/tools'); +const { quoteFullName } = require('dbgate-tools'); const driverConnect = require('../utility/driverConnect'); -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); async function tableReader({ connection, pureName, schemaName }) { const driver = engines(connection); diff --git a/packages/api/src/shell/tableWriter.js b/packages/api/src/shell/tableWriter.js index 4ca34b478..0d7b16533 100644 --- a/packages/api/src/shell/tableWriter.js +++ b/packages/api/src/shell/tableWriter.js @@ -1,6 +1,6 @@ const driverConnect = require('../utility/driverConnect'); -const engines = require('@dbgate/engines'); +const engines = require('dbgate-engines'); async function tableWriter({ connection, schemaName, pureName, ...options }) { console.log(`Write table ${schemaName}.${pureName}`); diff --git a/packages/datalib/package.json b/packages/datalib/package.json index efebbd53d..42cd3a9f1 100644 --- a/packages/datalib/package.json +++ b/packages/datalib/package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "@dbgate/datalib", + "name": "dbgate-datalib", "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { @@ -12,11 +12,11 @@ "lib" ], "dependencies": { - "@dbgate/sqltree": "^1.0.0", - "@dbgate/filterparser": "^1.0.0" + "dbgate-sqltree": "^1.0.0", + "dbgate-filterparser": "^1.0.0" }, "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/node": "^13.7.0", "typescript": "^3.7.5" } diff --git a/packages/datalib/src/ChangeSet.ts b/packages/datalib/src/ChangeSet.ts index f8bc629e3..fdb4244d8 100644 --- a/packages/datalib/src/ChangeSet.ts +++ b/packages/datalib/src/ChangeSet.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { Command, Insert, Update, Delete, UpdateField, Condition, AllowIdentityInsert } from '@dbgate/sqltree'; -import { NamedObjectInfo, DatabaseInfo } from '@dbgate/types'; +import { Command, Insert, Update, Delete, UpdateField, Condition, AllowIdentityInsert } from 'dbgate-sqltree'; +import { NamedObjectInfo, DatabaseInfo } from 'dbgate-types'; export interface ChangeSetItem { pureName: string; diff --git a/packages/datalib/src/FreeTableGridDisplay.ts b/packages/datalib/src/FreeTableGridDisplay.ts index 278c86678..f113a9cf6 100644 --- a/packages/datalib/src/FreeTableGridDisplay.ts +++ b/packages/datalib/src/FreeTableGridDisplay.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { EngineDriver, ViewInfo, ColumnInfo } from '@dbgate/types'; +import { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types'; import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay'; import { GridConfig, GridCache } from './GridConfig'; import { FreeTableModel } from './FreeTableModel'; diff --git a/packages/datalib/src/FreeTableModel.ts b/packages/datalib/src/FreeTableModel.ts index 515df3c67..e5cce2f76 100644 --- a/packages/datalib/src/FreeTableModel.ts +++ b/packages/datalib/src/FreeTableModel.ts @@ -1,4 +1,4 @@ -import { TableInfo } from '@dbgate/types'; +import { TableInfo } from 'dbgate-types'; export interface FreeTableModel { structure: TableInfo; diff --git a/packages/datalib/src/GridConfig.ts b/packages/datalib/src/GridConfig.ts index 8d5730e48..13d7a11b0 100644 --- a/packages/datalib/src/GridConfig.ts +++ b/packages/datalib/src/GridConfig.ts @@ -1,5 +1,5 @@ import { DisplayColumn } from './GridDisplay'; -import { TableInfo } from '@dbgate/types'; +import { TableInfo } from 'dbgate-types'; export interface GridConfigColumns { hiddenColumns: string[]; diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts index 00b215a31..db92e426c 100644 --- a/packages/datalib/src/GridDisplay.ts +++ b/packages/datalib/src/GridDisplay.ts @@ -1,11 +1,11 @@ import _ from 'lodash'; import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig'; -import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from '@dbgate/types'; -import { parseFilter, getFilterType } from '@dbgate/filterparser'; +import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types'; +import { parseFilter, getFilterType } from 'dbgate-filterparser'; import { filterName } from './filterName'; import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet'; -import { Expression, Select, treeToSql, dumpSqlSelect } from '@dbgate/sqltree'; -import { isTypeLogical } from '@dbgate/tools'; +import { Expression, Select, treeToSql, dumpSqlSelect } from 'dbgate-sqltree'; +import { isTypeLogical } from 'dbgate-tools'; export interface DisplayColumn { schemaName: string; diff --git a/packages/datalib/src/JslGridDisplay.ts b/packages/datalib/src/JslGridDisplay.ts index 7d900a632..c7cae1600 100644 --- a/packages/datalib/src/JslGridDisplay.ts +++ b/packages/datalib/src/JslGridDisplay.ts @@ -1,5 +1,5 @@ import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay'; -import { QueryResultColumn } from '@dbgate/types'; +import { QueryResultColumn } from 'dbgate-types'; import { GridConfig, GridCache } from './GridConfig'; export class JslGridDisplay extends GridDisplay { diff --git a/packages/datalib/src/TableGridDisplay.ts b/packages/datalib/src/TableGridDisplay.ts index 77eedfbfa..f002ee50a 100644 --- a/packages/datalib/src/TableGridDisplay.ts +++ b/packages/datalib/src/TableGridDisplay.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay'; -import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from '@dbgate/types'; +import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types'; import { GridConfig, GridCache, createGridCache } from './GridConfig'; -import { Expression, Select, treeToSql, dumpSqlSelect } from '@dbgate/sqltree'; +import { Expression, Select, treeToSql, dumpSqlSelect } from 'dbgate-sqltree'; import { filterName } from './filterName'; export class TableGridDisplay extends GridDisplay { diff --git a/packages/datalib/src/ViewGridDisplay.ts b/packages/datalib/src/ViewGridDisplay.ts index aa873f495..c9a5758c6 100644 --- a/packages/datalib/src/ViewGridDisplay.ts +++ b/packages/datalib/src/ViewGridDisplay.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay'; -import { EngineDriver, ViewInfo, ColumnInfo } from '@dbgate/types'; +import { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types'; import { GridConfig, GridCache } from './GridConfig'; export class ViewGridDisplay extends GridDisplay { diff --git a/packages/engines/README.md b/packages/engines/README.md index b512afeef..1a7e9b227 100644 --- a/packages/engines/README.md +++ b/packages/engines/README.md @@ -1,7 +1,7 @@ -# @dbgate/engines +# dbgate-engines JavaScript library implementing MySQL, MS SQL and PostgreSQL operations ## Installation - yarn add @dbgate/engines + yarn add dbgate-engines diff --git a/packages/engines/default/DatabaseAnalyser.js b/packages/engines/default/DatabaseAnalyser.js index dea9bb424..8874a725e 100644 --- a/packages/engines/default/DatabaseAnalyser.js +++ b/packages/engines/default/DatabaseAnalyser.js @@ -4,15 +4,15 @@ const fp = require('lodash/fp'); class DatabaseAnalyser { /** * - * @param {import('@dbgate/types').EngineDriver} driver + * @param {import('dbgate-types').EngineDriver} driver */ constructor(pool, driver) { this.pool = pool; this.driver = driver; // this.result = DatabaseAnalyser.createEmptyStructure(); - /** @type {import('@dbgate/types').DatabaseInfo} */ + /** @type {import('dbgate-types').DatabaseInfo} */ this.structure = null; - /** import('@dbgate/types').DatabaseModification[]) */ + /** import('dbgate-types').DatabaseModification[]) */ this.modifications = null; this.singleObjectFilter = null; } @@ -21,7 +21,7 @@ class DatabaseAnalyser { return DatabaseAnalyser.createEmptyStructure(); } - /** @returns {Promise} */ + /** @returns {Promise} */ async getModifications() { if (this.structure == null) throw new Error('DatabaseAnalyse.getModifications - structure must be filled'); @@ -82,7 +82,7 @@ class DatabaseAnalyser { // } } -/** @returns {import('@dbgate/types').DatabaseInfo} */ +/** @returns {import('dbgate-types').DatabaseInfo} */ DatabaseAnalyser.createEmptyStructure = () => ({ tables: [], views: [], diff --git a/packages/engines/default/SqlDumper.js b/packages/engines/default/SqlDumper.js index 0452e07f6..e00b96ca1 100644 --- a/packages/engines/default/SqlDumper.js +++ b/packages/engines/default/SqlDumper.js @@ -2,7 +2,7 @@ const _ = require('lodash'); const moment = require('moment'); class SqlDumper { - /** @param driver {import('@dbgate/types').EngineDriver} */ + /** @param driver {import('dbgate-types').EngineDriver} */ constructor(driver) { this.s = ''; this.driver = driver; @@ -150,7 +150,7 @@ class SqlDumper { } /** - * @param column {import('@dbgate/types').ColumnInfo} + * @param column {import('dbgate-types').ColumnInfo} */ columnDefinition(column, { includeDefault = true, includeNullable = true, includeCollate = true } = {}) { if (column.computedExpression) { @@ -176,7 +176,7 @@ class SqlDumper { } /** - * @param column {import('@dbgate/types').ColumnInfo} + * @param column {import('dbgate-types').ColumnInfo} */ columnDefault(column) { if (column.defaultConstraint != null) { @@ -202,7 +202,7 @@ class SqlDumper { } } - /** @param table {import('@dbgate/types').TableInfo} */ + /** @param table {import('dbgate-types').TableInfo} */ createTable(table) { this.put('^create ^table %f ( &>&n', table); this.putCollection(',&n', table.columns, (col) => { @@ -245,7 +245,7 @@ class SqlDumper { // } } - /** @param fk {import('@dbgate/types').ForeignKeyInfo} */ + /** @param fk {import('dbgate-types').ForeignKeyInfo} */ createForeignKeyFore(fk) { if (fk.constraintName != null) this.put('^constraint %i ', fk.constraintName); this.put( @@ -258,13 +258,13 @@ class SqlDumper { if (fk.updateAction) this.put(' ^on ^update %k', fk.updateAction); } - /** @param type {import('@dbgate/types').TransformType} */ + /** @param type {import('dbgate-types').TransformType} */ transform(type, dumpExpr) { dumpExpr(); } /** - * @param table {import('@dbgate/types').NamedObjectInfo} + * @param table {import('dbgate-types').NamedObjectInfo} * @param allow {boolean} */ allowIdentityInsert(table, allow) {} diff --git a/packages/engines/default/createBulkInsertStreamBase.js b/packages/engines/default/createBulkInsertStreamBase.js index 68aa47e60..12550104b 100644 --- a/packages/engines/default/createBulkInsertStreamBase.js +++ b/packages/engines/default/createBulkInsertStreamBase.js @@ -1,9 +1,9 @@ -const { prepareTableForImport } = require('@dbgate/tools'); +const { prepareTableForImport } = require('dbgate-tools'); const _ = require('lodash'); /** * - * @param {import('@dbgate/types').EngineDriver} driver + * @param {import('dbgate-types').EngineDriver} driver */ function createBulkInsertStreamBase(driver, stream, pool, name, options) { const fullNameQuoted = name.schemaName diff --git a/packages/engines/index.d.ts b/packages/engines/index.d.ts index 0d17b77d7..1ce5b0395 100644 --- a/packages/engines/index.d.ts +++ b/packages/engines/index.d.ts @@ -1,4 +1,4 @@ -import types from "@dbgate/types"; +import types from "dbgate-types"; declare function getDriver( connection: string | { engine: string } diff --git a/packages/engines/mssql/MsSqlAnalyser.js b/packages/engines/mssql/MsSqlAnalyser.js index 9363dc081..8a272a3c8 100644 --- a/packages/engines/mssql/MsSqlAnalyser.js +++ b/packages/engines/mssql/MsSqlAnalyser.js @@ -4,7 +4,7 @@ const sql = require('./sql'); const DatabaseAnalyser = require('../default/DatabaseAnalyser'); const { filter } = require('lodash'); -const { isTypeString, isTypeNumeric } = require('@dbgate/tools'); +const { isTypeString, isTypeNumeric } = require('dbgate-tools'); function objectTypeToField(type) { switch (type.trim()) { @@ -187,7 +187,7 @@ class MsSqlAnalyser extends DatabaseAnalyser { // object not modified if (obj && Math.abs(new Date(modifyDate).getTime() - new Date(obj.modifyDate).getTime()) < 1000) return null; - /** @type {import('@dbgate/types').DatabaseModification} */ + /** @type {import('dbgate-types').DatabaseModification} */ const action = obj ? { newName: { schemaName, pureName }, diff --git a/packages/engines/mssql/MsSqlDumper.js b/packages/engines/mssql/MsSqlDumper.js index 673189012..ba5bf0b8a 100644 --- a/packages/engines/mssql/MsSqlDumper.js +++ b/packages/engines/mssql/MsSqlDumper.js @@ -16,7 +16,7 @@ class MsSqlDumper extends SqlDumper { this.putCmd('^set ^identity_insert %f %k;&n', table, allow ? 'on' : 'off'); } - /** @param type {import('@dbgate/types').TransformType} */ + /** @param type {import('dbgate-types').TransformType} */ transform(type, dumpExpr) { switch (type) { case 'GROUP:YEAR': diff --git a/packages/engines/mssql/createBulkInsertStream.js b/packages/engines/mssql/createBulkInsertStream.js index c6d250820..b3f345102 100644 --- a/packages/engines/mssql/createBulkInsertStream.js +++ b/packages/engines/mssql/createBulkInsertStream.js @@ -2,7 +2,7 @@ const createBulkInsertStreamBase = require('../default/createBulkInsertStreamBas /** * - * @param {import('@dbgate/types').EngineDriver} driver + * @param {import('dbgate-types').EngineDriver} driver */ function createBulkInsertStream(driver, mssql, stream, pool, name, options) { const writable = createBulkInsertStreamBase(driver, stream, pool, name, options); diff --git a/packages/engines/mssql/index.js b/packages/engines/mssql/index.js index 269473728..2eda2cde9 100644 --- a/packages/engines/mssql/index.js +++ b/packages/engines/mssql/index.js @@ -4,7 +4,7 @@ const MsSqlDumper = require('./MsSqlDumper'); const createBulkInsertStream = require('./createBulkInsertStream'); const driverBase = require('../default/driverBase'); -/** @type {import('@dbgate/types').SqlDialect} */ +/** @type {import('dbgate-types').SqlDialect} */ const dialect = { limitSelect: true, rangeSelect: true, @@ -51,7 +51,7 @@ function extractColumns(columns) { return [res, mapper]; } -/** @type {import('@dbgate/types').EngineDriver} */ +/** @type {import('dbgate-types').EngineDriver} */ const driver = { ...driverBase, analyserClass: MsSqlAnalyser, diff --git a/packages/engines/mysql/MySqlAnalyser.js b/packages/engines/mysql/MySqlAnalyser.js index fd5f145f5..64de86467 100644 --- a/packages/engines/mysql/MySqlAnalyser.js +++ b/packages/engines/mysql/MySqlAnalyser.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const sql = require('./sql'); const DatabaseAnalayser = require('../default/DatabaseAnalyser'); -const { isTypeString, isTypeNumeric } = require('@dbgate/tools'); +const { isTypeString, isTypeNumeric } = require('dbgate-tools'); const { rangeStep } = require('lodash/fp'); function getColumnInfo({ @@ -191,7 +191,7 @@ class MySqlAnalyser extends DatabaseAnalayser { // console.log('MODIFICATION OF ', field, pureName, modifyDate, obj.modifyDate); - /** @type {import('@dbgate/types').DatabaseModification} */ + /** @type {import('dbgate-types').DatabaseModification} */ const action = obj ? { newName: { pureName }, diff --git a/packages/engines/mysql/MySqlDumper.js b/packages/engines/mysql/MySqlDumper.js index 9464a2acc..3b778de0c 100644 --- a/packages/engines/mysql/MySqlDumper.js +++ b/packages/engines/mysql/MySqlDumper.js @@ -1,7 +1,7 @@ const SqlDumper = require('../default/SqlDumper'); class MySqlDumper extends SqlDumper { - /** @param type {import('@dbgate/types').TransformType} */ + /** @param type {import('dbgate-types').TransformType} */ transform(type, dumpExpr) { switch (type) { case 'GROUP:YEAR': diff --git a/packages/engines/mysql/index.js b/packages/engines/mysql/index.js index f90456bf1..5aee7c46d 100644 --- a/packages/engines/mysql/index.js +++ b/packages/engines/mysql/index.js @@ -2,7 +2,7 @@ const driverBase = require('../default/driverBase'); const MySqlAnalyser = require('./MySqlAnalyser'); const MySqlDumper = require('./MySqlDumper'); -/** @type {import('@dbgate/types').SqlDialect} */ +/** @type {import('dbgate-types').SqlDialect} */ const dialect = { rangeSelect: true, stringEscapeChar: '\\', @@ -20,7 +20,7 @@ function extractColumns(fields) { return null; } -/** @type {import('@dbgate/types').EngineDriver} */ +/** @type {import('dbgate-types').EngineDriver} */ const driver = { ...driverBase, analyserClass: MySqlAnalyser, diff --git a/packages/engines/package.json b/packages/engines/package.json index 41841ebd6..caa59fbf2 100644 --- a/packages/engines/package.json +++ b/packages/engines/package.json @@ -1,5 +1,5 @@ { - "name": "@dbgate/engines", + "name": "dbgate-engines", "version": "1.0.0", "main": "index.js", "typings": "./index.d.ts", @@ -14,13 +14,13 @@ "license": "GPL", "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/lodash": "^4.14.149", "nodemon": "^2.0.2", "typescript": "^3.7.5" }, "dependencies": { "lodash": "^4.17.15", - "@dbgate/tools": "^1.0.0" + "dbgate-tools": "^1.0.0" } } diff --git a/packages/engines/postgres/PostgreAnalyser.js b/packages/engines/postgres/PostgreAnalyser.js index 2448aff24..16ed42b5d 100644 --- a/packages/engines/postgres/PostgreAnalyser.js +++ b/packages/engines/postgres/PostgreAnalyser.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const sql = require('./sql'); const DatabaseAnalayser = require('../default/DatabaseAnalyser'); -const { isTypeString, isTypeNumeric } = require('@dbgate/tools'); +const { isTypeString, isTypeNumeric } = require('dbgate-tools'); function normalizeTypeName(dataType) { if (dataType == 'character varying') return 'varchar'; @@ -127,7 +127,7 @@ class PostgreAnalyser extends DatabaseAnalayser { // console.log('MODIFICATION OF ', objectTypeField, schemaName, pureName); - /** @type {import('@dbgate/types').DatabaseModification} */ + /** @type {import('dbgate-types').DatabaseModification} */ const action = obj ? { newName: { schemaName, pureName }, diff --git a/packages/engines/postgres/PostgreDumper.js b/packages/engines/postgres/PostgreDumper.js index 9809b621a..12582b547 100644 --- a/packages/engines/postgres/PostgreDumper.js +++ b/packages/engines/postgres/PostgreDumper.js @@ -1,7 +1,7 @@ const SqlDumper = require('../default/SqlDumper'); class PostgreDumper extends SqlDumper { - /** @param type {import('@dbgate/types').TransformType} */ + /** @param type {import('dbgate-types').TransformType} */ transform(type, dumpExpr) { switch (type) { case 'GROUP:YEAR': diff --git a/packages/engines/postgres/index.js b/packages/engines/postgres/index.js index 95c4dd971..bc09995b4 100644 --- a/packages/engines/postgres/index.js +++ b/packages/engines/postgres/index.js @@ -3,7 +3,7 @@ const driverBase = require('../default/driverBase'); const PostgreAnalyser = require('./PostgreAnalyser'); const PostgreDumper = require('./PostgreDumper'); -/** @type {import('@dbgate/types').SqlDialect} */ +/** @type {import('dbgate-types').SqlDialect} */ const dialect = { rangeSelect: true, // stringEscapeChar: '\\', @@ -14,7 +14,7 @@ const dialect = { }, }; -/** @type {import('@dbgate/types').EngineDriver} */ +/** @type {import('dbgate-types').EngineDriver} */ const driver = { ...driverBase, analyserClass: PostgreAnalyser, diff --git a/packages/filterparser/package.json b/packages/filterparser/package.json index dafc30ffd..82559fa47 100644 --- a/packages/filterparser/package.json +++ b/packages/filterparser/package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "@dbgate/filterparser", + "name": "dbgate-filterparser", "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { @@ -13,7 +13,7 @@ "lib" ], "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/jest": "^25.1.4", "@types/node": "^13.7.0", "jest": "^24.9.0", @@ -22,7 +22,7 @@ }, "dependencies": { "@types/parsimmon": "^1.10.1", - "@dbgate/tools": "^1.0.0", + "dbgate-tools": "^1.0.0", "lodash": "^4.17.15", "moment": "^2.24.0", "parsimmon": "^1.13.0" diff --git a/packages/filterparser/src/cli.ts b/packages/filterparser/src/cli.ts index 5142fe9fd..5cee1d064 100644 --- a/packages/filterparser/src/cli.ts +++ b/packages/filterparser/src/cli.ts @@ -1,7 +1,7 @@ import { parseFilter } from './parseFilter'; import { FilterType } from './types'; -import engines from '@dbgate/engines'; -import { dumpSqlCondition, treeToSql } from '@dbgate/sqltree'; +import engines from 'dbgate-engines'; +import { dumpSqlCondition, treeToSql } from 'dbgate-sqltree'; const ast = parseFilter(process.argv[2], process.argv[3] as FilterType); diff --git a/packages/filterparser/src/filterTool.ts b/packages/filterparser/src/filterTool.ts index d3ac937d7..fad9cec19 100644 --- a/packages/filterparser/src/filterTool.ts +++ b/packages/filterparser/src/filterTool.ts @@ -1,4 +1,4 @@ -import { isTypeDateTime } from '@dbgate/tools'; +import { isTypeDateTime } from 'dbgate-tools'; export type FilterMultipleValuesMode = 'is' | 'is_not' | 'contains' | 'begins' | 'ends'; diff --git a/packages/filterparser/src/getFilterType.ts b/packages/filterparser/src/getFilterType.ts index 1020ae274..7a1ce75fb 100644 --- a/packages/filterparser/src/getFilterType.ts +++ b/packages/filterparser/src/getFilterType.ts @@ -1,4 +1,4 @@ -import { isTypeNumber, isTypeString, isTypeLogical, isTypeDateTime } from '@dbgate/tools'; +import { isTypeNumber, isTypeString, isTypeLogical, isTypeDateTime } from 'dbgate-tools'; import { FilterType } from './types'; export function getFilterType(dataType: string): FilterType { diff --git a/packages/filterparser/src/parseFilter.ts b/packages/filterparser/src/parseFilter.ts index e44ab0c2b..1154311a5 100644 --- a/packages/filterparser/src/parseFilter.ts +++ b/packages/filterparser/src/parseFilter.ts @@ -1,7 +1,7 @@ import P from 'parsimmon'; import { FilterType } from './types'; -import { Condition } from '@dbgate/sqltree'; -import { TransformType } from '@dbgate/types'; +import { Condition } from 'dbgate-sqltree'; +import { TransformType } from 'dbgate-types'; const whitespace = P.regexp(/\s*/m); diff --git a/packages/filterparser/src/types.ts b/packages/filterparser/src/types.ts index 1bc1e73db..8292fd139 100644 --- a/packages/filterparser/src/types.ts +++ b/packages/filterparser/src/types.ts @@ -1,3 +1,3 @@ -// import types from '@dbgate/types'; +// import types from 'dbgate-types'; export type FilterType = 'number' | 'string' | 'datetime' | 'logical'; diff --git a/packages/sqltree/README.md b/packages/sqltree/README.md index e010fdf2b..7911f7c86 100644 --- a/packages/sqltree/README.md +++ b/packages/sqltree/README.md @@ -1,14 +1,14 @@ -# @dbgate/sqltree +# dbgate-sqltree JavaScript/TypeScript SQL query-builder library -@dbgate/sqltree hold query definition in RAW JSON objects. +dbgate-sqltree hold query definition in RAW JSON objects. ## Sample usage ```javascript -const { treeToSql, dumpSqlSelect } = require('@dbgate/sqltree'); -const engines = require('@dbgate/engines'); +const { treeToSql, dumpSqlSelect } = require('dbgate-sqltree'); +const engines = require('dbgate-engines'); const select = { commandType: 'select', @@ -36,4 +36,4 @@ console.log('Generated SQL', sqll); ## Installation - yarn add @dbgate/sqltree + yarn add dbgate-sqltree diff --git a/packages/sqltree/package.json b/packages/sqltree/package.json index 8bd1e894f..bb7f60451 100644 --- a/packages/sqltree/package.json +++ b/packages/sqltree/package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "@dbgate/sqltree", + "name": "dbgate-sqltree", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -22,7 +22,7 @@ "lib" ], "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/node": "^13.7.0", "typescript": "^3.7.5" } diff --git a/packages/sqltree/src/dumpSqlCommand.ts b/packages/sqltree/src/dumpSqlCommand.ts index d2e397880..849d12258 100644 --- a/packages/sqltree/src/dumpSqlCommand.ts +++ b/packages/sqltree/src/dumpSqlCommand.ts @@ -1,4 +1,4 @@ -import { SqlDumper } from '@dbgate/types'; +import { SqlDumper } from 'dbgate-types'; import { Command, Select, Update, Delete, Insert } from './types'; import { dumpSqlExpression } from './dumpSqlExpression'; import { dumpSqlFromDefinition, dumpSqlSourceRef } from './dumpSqlSource'; diff --git a/packages/sqltree/src/dumpSqlCondition.ts b/packages/sqltree/src/dumpSqlCondition.ts index f20b1ab3e..c9da29fef 100644 --- a/packages/sqltree/src/dumpSqlCondition.ts +++ b/packages/sqltree/src/dumpSqlCondition.ts @@ -1,4 +1,4 @@ -import { SqlDumper } from '@dbgate/types'; +import { SqlDumper } from 'dbgate-types'; import { Condition, BinaryCondition } from './types'; import { dumpSqlExpression } from './dumpSqlExpression'; import { link } from 'fs'; diff --git a/packages/sqltree/src/dumpSqlExpression.ts b/packages/sqltree/src/dumpSqlExpression.ts index 0a90d5577..cd70f8179 100644 --- a/packages/sqltree/src/dumpSqlExpression.ts +++ b/packages/sqltree/src/dumpSqlExpression.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { SqlDumper } from '@dbgate/types'; +import { SqlDumper } from 'dbgate-types'; import { Expression, ColumnRefExpression } from './types'; import { dumpSqlSourceRef } from './dumpSqlSource'; diff --git a/packages/sqltree/src/dumpSqlSource.ts b/packages/sqltree/src/dumpSqlSource.ts index 649cb0682..46590dc3f 100644 --- a/packages/sqltree/src/dumpSqlSource.ts +++ b/packages/sqltree/src/dumpSqlSource.ts @@ -1,5 +1,5 @@ import { Source, FromDefinition, Relation } from './types'; -import { SqlDumper } from '@dbgate/types'; +import { SqlDumper } from 'dbgate-types'; import { dumpSqlSelect } from './dumpSqlCommand'; import { dumpSqlCondition } from './dumpSqlCondition'; diff --git a/packages/sqltree/src/types.ts b/packages/sqltree/src/types.ts index a1c211b7d..b6d3da364 100644 --- a/packages/sqltree/src/types.ts +++ b/packages/sqltree/src/types.ts @@ -1,4 +1,4 @@ -import { NamedObjectInfo, RangeDefinition, TransformType } from '@dbgate/types'; +import { NamedObjectInfo, RangeDefinition, TransformType } from 'dbgate-types'; // export interface Command { // } diff --git a/packages/sqltree/src/utility.ts b/packages/sqltree/src/utility.ts index 26cacf51f..ba0bc89ad 100644 --- a/packages/sqltree/src/utility.ts +++ b/packages/sqltree/src/utility.ts @@ -1,4 +1,4 @@ -import { EngineDriver, SqlDumper } from '@dbgate/types'; +import { EngineDriver, SqlDumper } from 'dbgate-types'; import { Command } from './types'; import { dumpSqlCommand } from './dumpSqlCommand'; diff --git a/packages/tools/package.json b/packages/tools/package.json index 54f9caed9..606d8c546 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "@dbgate/tools", + "name": "dbgate-tools", "main": "lib/index.js", "typings": "lib/index.d.ts", "scripts": { @@ -13,7 +13,7 @@ "lib" ], "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/node": "^13.7.0", "jest": "^24.9.0", "ts-jest": "^25.2.1", diff --git a/packages/tools/src/nameTools.ts b/packages/tools/src/nameTools.ts index ed962cb3e..9d22301bd 100644 --- a/packages/tools/src/nameTools.ts +++ b/packages/tools/src/nameTools.ts @@ -1,4 +1,4 @@ -import { DatabaseInfo, DatabaseInfoObjects } from '@dbgate/types'; +import { DatabaseInfo, DatabaseInfoObjects } from 'dbgate-types'; export function fullNameFromString(name) { const m = name.match(/\[([^\]]+)\]\.\[([^\]]+)\]/); diff --git a/packages/tools/src/tableTransforms.ts b/packages/tools/src/tableTransforms.ts index b5d31c147..5e3ea9ef2 100644 --- a/packages/tools/src/tableTransforms.ts +++ b/packages/tools/src/tableTransforms.ts @@ -1,4 +1,4 @@ -import { TableInfo } from '@dbgate/types'; +import { TableInfo } from 'dbgate-types'; import _ from 'lodash'; export function prepareTableForImport(table: TableInfo): TableInfo { diff --git a/packages/types/README.md b/packages/types/README.md index df3817c8e..a8dd80ff3 100644 --- a/packages/types/README.md +++ b/packages/types/README.md @@ -1,4 +1,4 @@ -# @dbgate/types +# dbgate-types Typescript definitions for DbGate app @@ -11,4 +11,4 @@ Typescript definitions for DbGate app ## Installation - yarn add --dev @dbgate/types + yarn add --dev dbgate-types diff --git a/packages/types/package.json b/packages/types/package.json index 9f46c7e69..6bd0f8cc8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "@dbgate/types", + "name": "dbgate-types", "homepage": "https://dbgate.org/", "repository": { diff --git a/packages/web/package.json b/packages/web/package.json index c851ffc80..dc196cbb3 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,12 +1,12 @@ { - "name": "@dbgate/web", + "name": "dbgate-web", "version": "1.0.0", "private": true, "dependencies": { "@ant-design/colors": "^5.0.0", - "@dbgate/datalib": "^1.0.0", - "@dbgate/engines": "^1.0.0", - "@dbgate/sqltree": "^1.0.0", + "dbgate-datalib": "^1.0.0", + "dbgate-engines": "^1.0.0", + "dbgate-sqltree": "^1.0.0", "@mdi/font": "^5.8.55", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", @@ -54,7 +54,7 @@ ] }, "devDependencies": { - "@dbgate/types": "^1.0.0", + "dbgate-types": "^1.0.0", "@types/react": "^16.9.17", "@types/styled-components": "^4.4.2", "typescript": "^3.7.4" diff --git a/packages/web/src/appobj/MacroAppObject.js b/packages/web/src/appobj/MacroAppObject.js index 217f309af..314ff1589 100644 --- a/packages/web/src/appobj/MacroAppObject.js +++ b/packages/web/src/appobj/MacroAppObject.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; const macroAppObject = () => ({ name, type, title, group }, { setOpenedTabs }) => { const key = name; diff --git a/packages/web/src/appobj/archiveFileAppObject.js b/packages/web/src/appobj/archiveFileAppObject.js index 4c70903b2..def217f97 100644 --- a/packages/web/src/appobj/archiveFileAppObject.js +++ b/packages/web/src/appobj/archiveFileAppObject.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import moment from 'moment'; import { DropDownMenuItem } from '../modals/DropDownMenu'; import { openNewTab } from '../utility/common'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; import axios from '../utility/axios'; function openArchive(setOpenedTabs, fileName, folderName) { diff --git a/packages/web/src/appobj/archiveFolderAppObject.js b/packages/web/src/appobj/archiveFolderAppObject.js index 492e0460d..79524ea72 100644 --- a/packages/web/src/appobj/archiveFolderAppObject.js +++ b/packages/web/src/appobj/archiveFolderAppObject.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import moment from 'moment'; import { DropDownMenuItem } from '../modals/DropDownMenu'; import axios from '../utility/axios'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; function Menu({ data, setOpenedTabs }) { const handleDelete = () => { diff --git a/packages/web/src/appobj/columnAppObject.js b/packages/web/src/appobj/columnAppObject.js index 2016b3603..e40c08224 100644 --- a/packages/web/src/appobj/columnAppObject.js +++ b/packages/web/src/appobj/columnAppObject.js @@ -1,10 +1,10 @@ -/** @param columnProps {import('@dbgate/types').ColumnInfo} */ +/** @param columnProps {import('dbgate-types').ColumnInfo} */ function getColumnIcon(columnProps) { if (columnProps.autoIncrement) return 'img autoincrement'; return 'img column'; } -/** @param columnProps {import('@dbgate/types').ColumnInfo} */ +/** @param columnProps {import('dbgate-types').ColumnInfo} */ export default function columnAppObject(columnProps, { setOpenedTabs }) { const title = columnProps.columnName; const key = title; diff --git a/packages/web/src/appobj/connectionAppObject.js b/packages/web/src/appobj/connectionAppObject.js index 9a0c24637..da2d93fda 100644 --- a/packages/web/src/appobj/connectionAppObject.js +++ b/packages/web/src/appobj/connectionAppObject.js @@ -3,7 +3,7 @@ import React from 'react'; import { DropDownMenuItem } from '../modals/DropDownMenu'; import ConnectionModal from '../modals/ConnectionModal'; import axios from '../utility/axios'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; import ConfirmModal from '../modals/ConfirmModal'; import CreateDatabaseModal from '../modals/CreateDatabaseModal'; diff --git a/packages/web/src/appobj/constraintAppObject.js b/packages/web/src/appobj/constraintAppObject.js index 7b6c3b801..d75f0245b 100644 --- a/packages/web/src/appobj/constraintAppObject.js +++ b/packages/web/src/appobj/constraintAppObject.js @@ -1,11 +1,11 @@ -/** @param props {import('@dbgate/types').ConstraintInfo} */ +/** @param props {import('dbgate-types').ConstraintInfo} */ function getConstraintIcon(props) { if (props.constraintType == 'primaryKey') return 'img primary-key'; if (props.constraintType == 'foreignKey') return 'img foreign-key'; return null; } -/** @param props {import('@dbgate/types').ConstraintInfo} */ +/** @param props {import('dbgate-types').ConstraintInfo} */ export default function constraintAppObject(props, { setOpenedTabs }) { const title = props.constraintName; const key = title; diff --git a/packages/web/src/appobj/databaseObjectAppObject.js b/packages/web/src/appobj/databaseObjectAppObject.js index db895dd03..8d55b8b7f 100644 --- a/packages/web/src/appobj/databaseObjectAppObject.js +++ b/packages/web/src/appobj/databaseObjectAppObject.js @@ -4,7 +4,7 @@ import { DropDownMenuItem } from '../modals/DropDownMenu'; import { openNewTab } from '../utility/common'; import { getConnectionInfo } from '../utility/metadataLoaders'; import fullDisplayName from '../utility/fullDisplayName'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; import ImportExportModal from '../modals/ImportExportModal'; const icons = { diff --git a/packages/web/src/datagrid/ChangeSetGrider.ts b/packages/web/src/datagrid/ChangeSetGrider.ts index 0bcfdf26f..6db15b0cc 100644 --- a/packages/web/src/datagrid/ChangeSetGrider.ts +++ b/packages/web/src/datagrid/ChangeSetGrider.ts @@ -9,7 +9,7 @@ import { GridDisplay, revertChangeSetRowChanges, setChangeSetValue, -} from '@dbgate/datalib'; +} from 'dbgate-datalib'; import Grider, { GriderRowStatus } from './Grider'; export default class ChangeSetGrider extends Grider { diff --git a/packages/web/src/datagrid/ColumnHeaderControl.js b/packages/web/src/datagrid/ColumnHeaderControl.js index a7440069f..af2aa1162 100644 --- a/packages/web/src/datagrid/ColumnHeaderControl.js +++ b/packages/web/src/datagrid/ColumnHeaderControl.js @@ -4,7 +4,7 @@ import ColumnLabel from './ColumnLabel'; import DropDownButton from '../widgets/DropDownButton'; import { DropDownMenuItem, DropDownMenuDivider } from '../modals/DropDownMenu'; import { useSplitterDrag } from '../widgets/Splitter'; -import { isTypeDateTime } from '@dbgate/tools'; +import { isTypeDateTime } from 'dbgate-tools'; import { openDatabaseObjectDetail } from '../appobj/databaseObjectAppObject'; import { useSetOpenedTabs } from '../utility/globalState'; import { FontIcon } from '../icons'; diff --git a/packages/web/src/datagrid/ColumnLabel.js b/packages/web/src/datagrid/ColumnLabel.js index 7951fe37d..a94a60dfd 100644 --- a/packages/web/src/datagrid/ColumnLabel.js +++ b/packages/web/src/datagrid/ColumnLabel.js @@ -9,7 +9,7 @@ const Label = styled.span` white-space: nowrap; `; -/** @param column {import('@dbgate/datalib').DisplayColumn|import('@dbgate/types').ColumnInfo} */ +/** @param column {import('dbgate-datalib').DisplayColumn|import('dbgate-types').ColumnInfo} */ export default function ColumnLabel(column) { let icon = null; if (column.autoIncrement) icon = 'img autoincrement'; diff --git a/packages/web/src/datagrid/ColumnManager.js b/packages/web/src/datagrid/ColumnManager.js index 0c8d3a1ae..6ab6cc809 100644 --- a/packages/web/src/datagrid/ColumnManager.js +++ b/packages/web/src/datagrid/ColumnManager.js @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; import ColumnLabel from './ColumnLabel'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; import { ExpandIcon } from '../icons'; import InlineButton from '../widgets/InlineButton'; import { ManagerInnerContainer } from './ManagerStyles'; @@ -34,8 +34,8 @@ const Button = styled.button` /** * @param {object} props - * @param {import('@dbgate/datalib').GridDisplay} props.display - * @param {import('@dbgate/datalib').DisplayColumn} props.column + * @param {import('dbgate-datalib').GridDisplay} props.display + * @param {import('dbgate-datalib').DisplayColumn} props.column */ function ColumnManagerRow(props) { const { display, column } = props; diff --git a/packages/web/src/datagrid/DataFilterControl.js b/packages/web/src/datagrid/DataFilterControl.js index a96e5e2f3..4d272277d 100644 --- a/packages/web/src/datagrid/DataFilterControl.js +++ b/packages/web/src/datagrid/DataFilterControl.js @@ -3,7 +3,7 @@ import React from 'react'; import { DropDownMenuItem, DropDownMenuDivider, showMenu } from '../modals/DropDownMenu'; import styled from 'styled-components'; import keycodes from '../utility/keycodes'; -import { parseFilter, createMultiLineFilter } from '@dbgate/filterparser'; +import { parseFilter, createMultiLineFilter } from 'dbgate-filterparser'; import InlineButton from '../widgets/InlineButton'; import useShowModal from '../modals/showModal'; import FilterMultipleValuesModal from '../modals/FilterMultipleValuesModal'; diff --git a/packages/web/src/datagrid/DataGrid.js b/packages/web/src/datagrid/DataGrid.js index 9a4433bfd..383a88a33 100644 --- a/packages/web/src/datagrid/DataGrid.js +++ b/packages/web/src/datagrid/DataGrid.js @@ -6,7 +6,7 @@ import ReferenceManager from './ReferenceManager'; import { HorizontalSplitter } from '../widgets/Splitter'; import WidgetColumnBar, { WidgetColumnBarItem } from '../widgets/WidgetColumnBar'; import CellDataView from '../celldata/CellDataView'; -import { FreeTableGridDisplay } from '@dbgate/datalib'; +import { FreeTableGridDisplay } from 'dbgate-datalib'; import useTheme from '../theme/useTheme'; const LeftContainer = styled.div` diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js index b80701ebf..dd661325a 100644 --- a/packages/web/src/datagrid/DataGridCore.js +++ b/packages/web/src/datagrid/DataGridCore.js @@ -6,7 +6,7 @@ import { HorizontalScrollBar, VerticalScrollBar } from './ScrollBars'; import useDimensions from '../utility/useDimensions'; import DataFilterControl from './DataFilterControl'; import stableStringify from 'json-stable-stringify'; -import { getFilterType, getFilterValueExpression } from '@dbgate/filterparser'; +import { getFilterType, getFilterValueExpression } from 'dbgate-filterparser'; import { cellFromEvent, getCellRange, topLeftCell, isRegularCell, nullCell, emptyCellArray } from './selection'; import keycodes from '../utility/keycodes'; import DataGridRow from './DataGridRow'; diff --git a/packages/web/src/datagrid/DataGridRow.js b/packages/web/src/datagrid/DataGridRow.js index a7695e71e..cecb5001d 100644 --- a/packages/web/src/datagrid/DataGridRow.js +++ b/packages/web/src/datagrid/DataGridRow.js @@ -5,7 +5,7 @@ import React from 'react'; import styled from 'styled-components'; import InplaceEditor from './InplaceEditor'; import { cellIsSelected } from './gridutil'; -import { isTypeLogical } from '@dbgate/tools'; +import { isTypeLogical } from 'dbgate-tools'; import useTheme from '../theme/useTheme'; const TableBodyCell = styled.td` diff --git a/packages/web/src/datagrid/ReferenceManager.js b/packages/web/src/datagrid/ReferenceManager.js index f556111de..1adb2ac76 100644 --- a/packages/web/src/datagrid/ReferenceManager.js +++ b/packages/web/src/datagrid/ReferenceManager.js @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import { ManagerInnerContainer } from './ManagerStyles'; import SearchInput from '../widgets/SearchInput'; -import { filterName } from '@dbgate/datalib'; +import { filterName } from 'dbgate-datalib'; import { FontIcon } from '../icons'; import useTheme from '../theme/useTheme'; diff --git a/packages/web/src/datagrid/SqlDataGridCore.js b/packages/web/src/datagrid/SqlDataGridCore.js index d23429e54..c7f196580 100644 --- a/packages/web/src/datagrid/SqlDataGridCore.js +++ b/packages/web/src/datagrid/SqlDataGridCore.js @@ -5,11 +5,11 @@ import DataGridCore from './DataGridCore'; import useSocket from '../utility/SocketProvider'; import useShowModal from '../modals/showModal'; import ImportExportModal from '../modals/ImportExportModal'; -import { changeSetToSql, createChangeSet, getChangeSetInsertedRows } from '@dbgate/datalib'; +import { changeSetToSql, createChangeSet, getChangeSetInsertedRows } from 'dbgate-datalib'; import { openNewTab } from '../utility/common'; import LoadingDataGridCore from './LoadingDataGridCore'; import ChangeSetGrider from './ChangeSetGrider'; -import { scriptToSql } from '@dbgate/sqltree'; +import { scriptToSql } from 'dbgate-sqltree'; import useModalState from '../modals/useModalState'; import ConfirmSqlModal from '../modals/ConfirmSqlModal'; import ErrorMessageModal from '../modals/ErrorMessageModal'; diff --git a/packages/web/src/datagrid/TableDataGrid.js b/packages/web/src/datagrid/TableDataGrid.js index d28c9c06e..c7a7dd42c 100644 --- a/packages/web/src/datagrid/TableDataGrid.js +++ b/packages/web/src/datagrid/TableDataGrid.js @@ -2,10 +2,10 @@ import React from 'react'; import _ from 'lodash'; import DataGrid from './DataGrid'; import styled from 'styled-components'; -import { TableGridDisplay, createGridConfig, createGridCache } from '@dbgate/datalib'; -import { getFilterValueExpression } from '@dbgate/filterparser'; +import { TableGridDisplay, createGridConfig, createGridCache } from 'dbgate-datalib'; +import { getFilterValueExpression } from 'dbgate-filterparser'; import { useConnectionInfo, getTableInfo, useDatabaseInfo } from '../utility/metadataLoaders'; -import engines from '@dbgate/engines'; +import engines from 'dbgate-engines'; import useSocket from '../utility/SocketProvider'; import { VerticalSplitter } from '../widgets/Splitter'; import stableStringify from 'json-stable-stringify'; diff --git a/packages/web/src/datagrid/gridutil.ts b/packages/web/src/datagrid/gridutil.ts index 7dc3f2aa2..7d763c51f 100644 --- a/packages/web/src/datagrid/gridutil.ts +++ b/packages/web/src/datagrid/gridutil.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { SeriesSizes } from './SeriesSizes'; import { CellAddress } from './selection'; -import { GridDisplay } from '@dbgate/datalib'; +import { GridDisplay } from 'dbgate-datalib'; import Grider from './Grider'; export function countColumnSizes(grider: Grider, columns, containerWidth, display: GridDisplay) { @@ -89,7 +89,7 @@ export function countVisibleRealColumns(columnSizes, firstVisibleColumnScrollInd const visibleRealColumnIndexes = []; const modelIndexes = {}; - /** @type {(import('@dbgate/datalib').DisplayColumn & {widthPx: string; colIndex: number})[]} */ + /** @type {(import('dbgate-datalib').DisplayColumn & {widthPx: string; colIndex: number})[]} */ const realColumns = []; // frozen columns diff --git a/packages/web/src/datagrid/types.ts b/packages/web/src/datagrid/types.ts index 8727292e8..c6f0791b9 100644 --- a/packages/web/src/datagrid/types.ts +++ b/packages/web/src/datagrid/types.ts @@ -1,4 +1,4 @@ -import { GridDisplay, ChangeSet, GridReferenceDefinition } from '@dbgate/datalib'; +import { GridDisplay, ChangeSet, GridReferenceDefinition } from 'dbgate-datalib'; import Grider from './Grider'; export interface DataGridProps { diff --git a/packages/web/src/freetable/FreeTableGrid.js b/packages/web/src/freetable/FreeTableGrid.js index 4bc64b041..10960e457 100644 --- a/packages/web/src/freetable/FreeTableGrid.js +++ b/packages/web/src/freetable/FreeTableGrid.js @@ -1,4 +1,4 @@ -import { runMacro } from '@dbgate/datalib'; +import { runMacro } from 'dbgate-datalib'; import React from 'react'; import _ from 'lodash'; import styled from 'styled-components'; diff --git a/packages/web/src/freetable/FreeTableGridCore.js b/packages/web/src/freetable/FreeTableGridCore.js index a81c15bed..0a9bd6c93 100644 --- a/packages/web/src/freetable/FreeTableGridCore.js +++ b/packages/web/src/freetable/FreeTableGridCore.js @@ -1,4 +1,4 @@ -import { createGridCache, FreeTableGridDisplay } from '@dbgate/datalib'; +import { createGridCache, FreeTableGridDisplay } from 'dbgate-datalib'; import React from 'react'; import DataGridCore from '../datagrid/DataGridCore'; import keycodes from '../utility/keycodes'; diff --git a/packages/web/src/freetable/FreeTableGrider.ts b/packages/web/src/freetable/FreeTableGrider.ts index d424e18ea..b5b5059bf 100644 --- a/packages/web/src/freetable/FreeTableGrider.ts +++ b/packages/web/src/freetable/FreeTableGrider.ts @@ -1,4 +1,4 @@ -import { FreeTableModel } from '@dbgate/datalib'; +import { FreeTableModel } from 'dbgate-datalib'; import Grider, { GriderRowStatus } from '../datagrid/Grider'; export default class FreeTableGrider extends Grider { diff --git a/packages/web/src/freetable/MacroPreviewGrider.ts b/packages/web/src/freetable/MacroPreviewGrider.ts index e33ea59a7..6503dc09f 100644 --- a/packages/web/src/freetable/MacroPreviewGrider.ts +++ b/packages/web/src/freetable/MacroPreviewGrider.ts @@ -1,4 +1,4 @@ -import { FreeTableModel, MacroDefinition, MacroSelectedCell, runMacro } from '@dbgate/datalib'; +import { FreeTableModel, MacroDefinition, MacroSelectedCell, runMacro } from 'dbgate-datalib'; import Grider, { GriderRowStatus } from '../datagrid/Grider'; import _ from 'lodash'; diff --git a/packages/web/src/impexp/ImportExportConfigurator.js b/packages/web/src/impexp/ImportExportConfigurator.js index f79b4077c..812edd907 100644 --- a/packages/web/src/impexp/ImportExportConfigurator.js +++ b/packages/web/src/impexp/ImportExportConfigurator.js @@ -103,7 +103,7 @@ async function addFilesToSourceList(files, values, setFieldValue, preferedStorag if (isFileStorage(storage)) { if (storage == 'excel') { const resp = await axios.get(`files/analyse-excel?filePath=${encodeURIComponent(file.full)}`); - /** @type {import('@dbgate/types').DatabaseInfo} */ + /** @type {import('dbgate-types').DatabaseInfo} */ const structure = resp.data; for (const table of structure.tables) { const sourceName = table.pureName; diff --git a/packages/web/src/impexp/PreviewDataGrid.js b/packages/web/src/impexp/PreviewDataGrid.js index 34df29f11..ca1849765 100644 --- a/packages/web/src/impexp/PreviewDataGrid.js +++ b/packages/web/src/impexp/PreviewDataGrid.js @@ -1,4 +1,4 @@ -import { createGridCache, createGridConfig, FreeTableGridDisplay } from '@dbgate/datalib'; +import { createGridCache, createGridConfig, FreeTableGridDisplay } from 'dbgate-datalib'; import React from 'react'; import DataGridCore from '../datagrid/DataGridCore'; import RowsArrayGrider from '../datagrid/RowsArrayGrider'; diff --git a/packages/web/src/impexp/createImpExpScript.js b/packages/web/src/impexp/createImpExpScript.js index ce03dbf4b..28c2f0aa8 100644 --- a/packages/web/src/impexp/createImpExpScript.js +++ b/packages/web/src/impexp/createImpExpScript.js @@ -2,8 +2,8 @@ import _ from 'lodash'; import ScriptWriter from './ScriptWriter'; import getAsArray from '../utility/getAsArray'; import { getConnectionInfo } from '../utility/metadataLoaders'; -import engines from '@dbgate/engines'; -import { findObjectLike } from '@dbgate/tools'; +import engines from 'dbgate-engines'; +import { findObjectLike } from 'dbgate-tools'; export function getTargetName(source, values) { const key = `targetName_${source}`; diff --git a/packages/web/src/modals/InsertJoinModal.js b/packages/web/src/modals/InsertJoinModal.js index 845eb8683..962aff3b6 100644 --- a/packages/web/src/modals/InsertJoinModal.js +++ b/packages/web/src/modals/InsertJoinModal.js @@ -51,7 +51,7 @@ export default function InsertJoinModal({ sql, modalState, engine, dbinfo, onIns const targets = React.useMemo(() => { const source = sources[sourceIndex]; if (!source) return []; - /** @type {import('@dbgate/types').TableInfo} */ + /** @type {import('dbgate-types').TableInfo} */ const table = dbinfo.tables.find((x) => x.pureName == sources[sourceIndex].name); if (!table) return []; return [ diff --git a/packages/web/src/sqleditor/JslDataGrid.js b/packages/web/src/sqleditor/JslDataGrid.js index 192c0ce03..7b49cd64b 100644 --- a/packages/web/src/sqleditor/JslDataGrid.js +++ b/packages/web/src/sqleditor/JslDataGrid.js @@ -1,6 +1,6 @@ import React from 'react'; import DataGrid from '../datagrid/DataGrid'; -import { JslGridDisplay, createGridConfig, createGridCache } from '@dbgate/datalib'; +import { JslGridDisplay, createGridConfig, createGridCache } from 'dbgate-datalib'; import useFetch from '../utility/useFetch'; import JslDataGridCore from '../datagrid/JslDataGridCore'; diff --git a/packages/web/src/tabs/FreeTableTab.js b/packages/web/src/tabs/FreeTableTab.js index 46d67f85a..deadf88f1 100644 --- a/packages/web/src/tabs/FreeTableTab.js +++ b/packages/web/src/tabs/FreeTableTab.js @@ -1,5 +1,5 @@ import React from 'react'; -import { createGridCache, createChangeSet, createGridConfig, createFreeTableModel } from '@dbgate/datalib'; +import { createGridCache, createChangeSet, createGridConfig, createFreeTableModel } from 'dbgate-datalib'; import useUndoReducer from '../utility/useUndoReducer'; import usePropsCompare from '../utility/usePropsCompare'; import { useSetOpenedTabs, useUpdateDatabaseForTab } from '../utility/globalState'; diff --git a/packages/web/src/tabs/QueryTab.js b/packages/web/src/tabs/QueryTab.js index c2314d2e2..cd8ddb212 100644 --- a/packages/web/src/tabs/QueryTab.js +++ b/packages/web/src/tabs/QueryTab.js @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import _ from 'lodash'; import axios from '../utility/axios'; -import engines from '@dbgate/engines'; +import engines from 'dbgate-engines'; import { useConnectionInfo, diff --git a/packages/web/src/tabs/ShellTab.js b/packages/web/src/tabs/ShellTab.js index d670b27c4..2197a8ef5 100644 --- a/packages/web/src/tabs/ShellTab.js +++ b/packages/web/src/tabs/ShellTab.js @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import _ from 'lodash'; import axios from '../utility/axios'; -import engines from '@dbgate/engines'; +import engines from 'dbgate-engines'; import { useConnectionInfo, getTableInfo, getConnectionInfo, getSqlObjectInfo } from '../utility/metadataLoaders'; import SqlEditor from '../sqleditor/SqlEditor'; diff --git a/packages/web/src/tabs/TableDataTab.js b/packages/web/src/tabs/TableDataTab.js index 09664f7bc..b295f95db 100644 --- a/packages/web/src/tabs/TableDataTab.js +++ b/packages/web/src/tabs/TableDataTab.js @@ -1,5 +1,5 @@ import React from 'react'; -import { createGridCache, createChangeSet, createGridConfig } from '@dbgate/datalib'; +import { createGridCache, createChangeSet, createGridConfig } from 'dbgate-datalib'; import useUndoReducer from '../utility/useUndoReducer'; import usePropsCompare from '../utility/usePropsCompare'; import { useUpdateDatabaseForTab } from '../utility/globalState'; diff --git a/packages/web/src/tabs/ViewDataTab.js b/packages/web/src/tabs/ViewDataTab.js index 21045532a..65f751c4e 100644 --- a/packages/web/src/tabs/ViewDataTab.js +++ b/packages/web/src/tabs/ViewDataTab.js @@ -1,8 +1,8 @@ import React from 'react'; import DataGrid from '../datagrid/DataGrid'; -import { ViewGridDisplay, createGridCache, createChangeSet } from '@dbgate/datalib'; +import { ViewGridDisplay, createGridCache, createChangeSet } from 'dbgate-datalib'; import { useConnectionInfo, useViewInfo } from '../utility/metadataLoaders'; -import engines from '@dbgate/engines'; +import engines from 'dbgate-engines'; import useUndoReducer from '../utility/useUndoReducer'; import usePropsCompare from '../utility/usePropsCompare'; import { useUpdateDatabaseForTab } from '../utility/globalState'; diff --git a/packages/web/src/utility/metadataLoaders.js b/packages/web/src/utility/metadataLoaders.js index 3c1b404f3..583075919 100644 --- a/packages/web/src/utility/metadataLoaders.js +++ b/packages/web/src/utility/metadataLoaders.js @@ -124,12 +124,12 @@ function useCore(loader, args) { return res; } -/** @returns {Promise} */ +/** @returns {Promise} */ export function getDatabaseInfo(args) { return getCore(databaseInfoLoader, args); } -/** @returns {import('@dbgate/types').DatabaseInfo} */ +/** @returns {import('dbgate-types').DatabaseInfo} */ export function useDatabaseInfo(args) { return useCore(databaseInfoLoader, args); } @@ -150,22 +150,22 @@ export function useDbCore(args, objectTypeField = undefined) { ); } -/** @returns {Promise} */ +/** @returns {Promise} */ export function getTableInfo(args) { return getDbCore(args, 'tables'); } -/** @returns {import('@dbgate/types').TableInfo} */ +/** @returns {import('dbgate-types').TableInfo} */ export function useTableInfo(args) { return useDbCore(args, 'tables'); } -/** @returns {Promise} */ +/** @returns {Promise} */ export function getViewInfo(args) { return getDbCore(args, 'views'); } -/** @returns {import('@dbgate/types').ViewInfo} */ +/** @returns {import('dbgate-types').ViewInfo} */ export function useViewInfo(args) { return useDbCore(args, 'views'); } @@ -178,12 +178,12 @@ export function useSqlObjectInfo(args) { return useDbCore(args); } -/** @returns {Promise} */ +/** @returns {Promise} */ export function getConnectionInfo(args) { return getCore(connectionInfoLoader, args); } -/** @returns {import('@dbgate/types').StoredConnection} */ +/** @returns {import('dbgate-types').StoredConnection} */ export function useConnectionInfo(args) { return useCore(connectionInfoLoader, args); } diff --git a/packages/web/src/utility/useGridConfig.js b/packages/web/src/utility/useGridConfig.js index 5763fa14a..969d30cef 100644 --- a/packages/web/src/utility/useGridConfig.js +++ b/packages/web/src/utility/useGridConfig.js @@ -1,4 +1,4 @@ -import { createGridConfig } from '@dbgate/datalib'; +import { createGridConfig } from 'dbgate-datalib'; import React from 'react'; const loadGridConfigFunc = (tabid) => () => { diff --git a/test/exportTable.js b/test/exportTable.js index a687949f3..7f9fe2c4b 100644 --- a/test/exportTable.js +++ b/test/exportTable.js @@ -1,4 +1,4 @@ -const dbgateApi = require('@dbgate/api'); +const dbgateApi = require('dbgate-api'); async function run() { // const queryReader = await dbgateApi.queryReader({ diff --git a/test/importTable.js b/test/importTable.js index 52772b374..1ae95025f 100644 --- a/test/importTable.js +++ b/test/importTable.js @@ -1,4 +1,4 @@ -const dbgateApi = require('@dbgate/api'); +const dbgateApi = require('dbgate-api'); async function run() { const csvReader = await dbgateApi.csvReader({ diff --git a/test/importUcet.js b/test/importUcet.js index 97ec40acf..24d3f5906 100644 --- a/test/importUcet.js +++ b/test/importUcet.js @@ -1,4 +1,4 @@ -const dbgateApi = require('@dbgate/api'); +const dbgateApi = require('dbgate-api'); async function run() { const var3 = await dbgateApi.excelSheetReader({