renamed dbgate packages, because of npmjs policy

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": "yarn workspace dbgate-api start",
-    "start:api:portal": "yarn workspace @dbgate/api start:portal",
+    "start:api:portal": "yarn workspace dbgate-api start:portal",
-    "start:web": "yarn workspace @dbgate/web start",
+    "start:web": "yarn workspace dbgate-web start",
-    "start:sqltree": "yarn workspace @dbgate/sqltree start",
+    "start:sqltree": "yarn workspace dbgate-sqltree start",
-    "start:tools": "yarn workspace @dbgate/tools start",
+    "start:tools": "yarn workspace dbgate-tools start",
-    "start:datalib": "yarn workspace @dbgate/datalib start",
+    "start:datalib": "yarn workspace dbgate-datalib start",
-    "start:filterparser": "yarn workspace @dbgate/filterparser start",
+    "start:filterparser": "yarn workspace dbgate-filterparser start",
-    "build:sqltree": "yarn workspace @dbgate/sqltree build",
+    "build:sqltree": "yarn workspace dbgate-sqltree build",
-    "build:datalib": "yarn workspace @dbgate/datalib build",
+    "build:datalib": "yarn workspace dbgate-datalib build",
-    "build:filterparser": "yarn workspace @dbgate/filterparser build",
+    "build:filterparser": "yarn workspace dbgate-filterparser build",
-    "build:tools": "yarn workspace @dbgate/tools 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:api": "yarn workspace dbgate-api build",
-    "build:web:docker": "yarn workspace @dbgate/web build:docker",
+    "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:api": "yarn workspace dbgate-api ts",
-    "ts:web": "yarn workspace @dbgate/web ts",
+    "ts:web": "yarn workspace dbgate-web ts",
     "ts": "yarn ts:api && yarn ts:web",
     "postinstall": "patch-package"
   },

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-engines": "^1.0.0",
-    "@dbgate/sqltree": "^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",

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) => {

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: {},
 

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) {

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');
 

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');

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');

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');

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}`);

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);

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}`);

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-sqltree": "^1.0.0",
-    "@dbgate/filterparser": "^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"
   }

packages/datalib/src/ChangeSet.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-import { Command, Insert, Update, Delete, UpdateField, Condition, AllowIdentityInsert } from '@dbgate/sqltree';
+import { Command, Insert, Update, Delete, UpdateField, Condition, AllowIdentityInsert } from 'dbgate-sqltree';
-import { NamedObjectInfo, DatabaseInfo } from '@dbgate/types';
+import { NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
 
 export interface ChangeSetItem {
   pureName: string;

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';

packages/datalib/src/FreeTableModel.ts

@@ -1,4 +1,4 @@
-import { TableInfo } from '@dbgate/types';
+import { TableInfo } from 'dbgate-types';
 
 export interface FreeTableModel {
   structure: TableInfo;

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[];

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 { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
-import { parseFilter, getFilterType } from '@dbgate/filterparser';
+import { parseFilter, getFilterType } from 'dbgate-filterparser';
 import { filterName } from './filterName';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
-import { Expression, Select, treeToSql, dumpSqlSelect } from '@dbgate/sqltree';
+import { Expression, Select, treeToSql, dumpSqlSelect } from 'dbgate-sqltree';
-import { isTypeLogical } from '@dbgate/tools';
+import { isTypeLogical } from 'dbgate-tools';
 
 export interface DisplayColumn {
   schemaName: string;

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 {

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 {

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 {

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

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<import('@dbgate/types').DatabaseModification[]>} */
+  /** @returns {Promise<import('dbgate-types').DatabaseModification[]>} */
   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: [],

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) {}

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

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 }

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 },

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':

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);

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,

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 },

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':

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,

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"
   }
 }

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 },

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':

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,

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"

packages/filterparser/src/cli.ts

@@ -1,7 +1,7 @@
 import { parseFilter } from './parseFilter';
 import { FilterType } from './types';
-import engines from '@dbgate/engines';
+import engines from 'dbgate-engines';
-import { dumpSqlCondition, treeToSql } from '@dbgate/sqltree';
+import { dumpSqlCondition, treeToSql } from 'dbgate-sqltree';
 
 const ast = parseFilter(process.argv[2], process.argv[3] as FilterType);
 

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';
 

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 {

packages/filterparser/src/parseFilter.ts

@@ -1,7 +1,7 @@
 import P from 'parsimmon';
 import { FilterType } from './types';
-import { Condition } from '@dbgate/sqltree';
+import { Condition } from 'dbgate-sqltree';
-import { TransformType } from '@dbgate/types';
+import { TransformType } from 'dbgate-types';
 
 const whitespace = P.regexp(/\s*/m);
 

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';

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 { treeToSql, dumpSqlSelect } = require('dbgate-sqltree');
-const engines = require('@dbgate/engines');
+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

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"
   }

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';

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';

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';
 

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';
 

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 {
 // }

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';
 

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",

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(/\[([^\]]+)\]\.\[([^\]]+)\]/);

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 {

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

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0.0",
-  "name": "@dbgate/types",
+  "name": "dbgate-types",
 
   "homepage": "https://dbgate.org/",
   "repository": {

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-datalib": "^1.0.0",
-    "@dbgate/engines": "^1.0.0",
+    "dbgate-engines": "^1.0.0",
-    "@dbgate/sqltree": "^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"

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;

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) {

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 = () => {

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;

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';
 

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;

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 = {

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 {

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';

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';

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').GridDisplay} props.display
- * @param {import('@dbgate/datalib').DisplayColumn} props.column
+ * @param {import('dbgate-datalib').DisplayColumn} props.column
  */
 function ColumnManagerRow(props) {
   const { display, column } = props;

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';

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`

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';

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`

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';
 

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';

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 { TableGridDisplay, createGridConfig, createGridCache } from 'dbgate-datalib';
-import { getFilterValueExpression } from '@dbgate/filterparser';
+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';

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

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 {

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';

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';

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 {

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';
 

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;

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';

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 engines from 'dbgate-engines';
-import { findObjectLike } from '@dbgate/tools';
+import { findObjectLike } from 'dbgate-tools';
 
 export function getTargetName(source, values) {
   const key = `targetName_${source}`;

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 [

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';
 

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';

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,

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';

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';

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';

packages/web/src/utility/metadataLoaders.js

@@ -124,12 +124,12 @@ function useCore(loader, args) {
   return res;
 }
 
-/** @returns {Promise<import('@dbgate/types').DatabaseInfo>} */
+/** @returns {Promise<import('dbgate-types').DatabaseInfo>} */
 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<import('@dbgate/types').TableInfo>} */
+/** @returns {Promise<import('dbgate-types').TableInfo>} */
 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<import('@dbgate/types').ViewInfo>} */
+/** @returns {Promise<import('dbgate-types').ViewInfo>} */
 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<import('@dbgate/types').StoredConnection>} */
+/** @returns {Promise<import('dbgate-types').StoredConnection>} */
 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);
 }

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) => () => {

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({

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({

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({