appwrite-cli 9.0.2 → 9.1.0

package/lib/commands/push.js

@@ -51,7 +51,9 @@ const {
 } = require("./databases");
 const {
     tablesDBGet,
-    tablesDBGetTable
+    tablesDBGetTable,
+    tablesDBUpdateTable,
+    tablesDBCreateTable
 } = require("./tables-db");
 const {
     storageGetBucket, storageUpdateBucket, storageCreateBucket
@@ -892,7 +894,7 @@ const createIndexes = async (indexes, collection) => {
     );
 
     if (!result) {
-        throw new Error("Index creation timed out.");
+        throw new Error('Index creation timed out.');
     }
 
     success(`Created ${indexes.length} indexes`);
@@ -916,6 +918,25 @@ const createAttributes = async (attributes, collection) => {
 
     success(`Created ${attributes.length} attributes`);
 }
+const createColumns = async (columns, table) => {
+    for (let column of columns) {
+        if (column.side !== 'child') {
+            await createAttribute(table['databaseId'], table['$id'], column);
+        }
+    }
+
+    const result = await awaitPools.expectAttributes(
+        table['databaseId'],
+        table['$id'],
+        table.columns.filter(column => column.side !== 'child').map(column => column.key)
+    );
+
+    if (!result) {
+        throw new Error(`Column creation timed out.`);
+    }
+
+    success(`Created ${columns.length} columns`);
+}
 
 const pushResources = async () => {
     const actions = {
@@ -1711,7 +1732,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
 
     // Parallel db actions
     await Promise.all(databases.map(async (databaseId) => {
-        const localDatabase = localConfig.getDatabase(databaseId);
+        const localDatabase = localConfig.getTablesDB(databaseId);
 
         try {
             const database = await tablesDBGet({
@@ -1753,11 +1774,10 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             });
 
             if (remoteTable.name !== table.name) {
-                await databasesUpdateTable({
+                await tablesDBUpdateTable({
                     databaseId: table['databaseId'],
                     tableId: table['$id'],
                     name: table.name,
-                    name: table.name,
                     parseOutput: false
                 })
 
@@ -1770,7 +1790,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             (e) {
             if (Number(e.code) === 404) {
                 log(`Table ${table.name} does not exist in the project. Creating ... `);
-                await databasesCreateTable({
+                await tablesDBCreateTable({
                     databaseId: table['databaseId'],
                     tableId: table['$id'],
                     name: table.name,
@@ -1796,13 +1816,12 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             if ((Array.isArray(columns) && columns.length <= 0) && (Array.isArray(indexes) && indexes.length <= 0)) {
                 continue;
             }
-
         }
 
         log(`Pushing table ${table.name} ( ${table['databaseId']} - ${table['$id']} ) attributes`)
 
         try {
-            await createAttributes(columns, table)
+            await createColumns(columns, table)
         } catch (e) {
             throw e;
         }
@@ -1900,7 +1919,6 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
                     databaseId: collection['databaseId'],
                     collectionId: collection['$id'],
                     name: collection.name,
-                    name: collection.name,
                     parseOutput: false
                 })
 

package/lib/commands/tables-db.js

@@ -1178,6 +1178,267 @@ const tablesDBUpdateIpColumn = async ({databaseId,tableId,key,required,xdefault,
 
     return response;
 
+}
+/**
+ * @typedef {Object} TablesDBCreateLineColumnRequestParams
+ * @property {string} databaseId Database ID.
+ * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
+ * @property {string} key Column Key.
+ * @property {boolean} required Is column required?
+ * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {boolean} overrideForCli
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {TablesDBCreateLineColumnRequestParams} params
+ */
+const tablesDBCreateLineColumn = async ({databaseId,tableId,key,required,xdefault,parseOutput = true, overrideForCli = false, sdk = undefined}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/tablesdb/{databaseId}/tables/{tableId}/columns/line'.replace('{databaseId}', databaseId).replace('{tableId}', tableId);
+    let payload = {};
+    if (typeof key !== 'undefined') {
+        payload['key'] = key;
+    }
+    if (typeof required !== 'undefined') {
+        payload['required'] = required;
+    }
+    if (typeof xdefault !== 'undefined') {
+        payload['default'] = xdefault;
+    }
+
+    let response = undefined;
+
+    response = await client.call('post', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+/**
+ * @typedef {Object} TablesDBUpdateLineColumnRequestParams
+ * @property {string} databaseId Database ID.
+ * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
+ * @property {string} key Column Key.
+ * @property {boolean} required Is column required?
+ * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {string} newKey New Column Key.
+ * @property {boolean} overrideForCli
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {TablesDBUpdateLineColumnRequestParams} params
+ */
+const tablesDBUpdateLineColumn = async ({databaseId,tableId,key,required,xdefault,newKey,parseOutput = true, overrideForCli = false, sdk = undefined}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/tablesdb/{databaseId}/tables/{tableId}/columns/line/{key}'.replace('{databaseId}', databaseId).replace('{tableId}', tableId).replace('{key}', key);
+    let payload = {};
+    if (typeof required !== 'undefined') {
+        payload['required'] = required;
+    }
+    if (typeof xdefault !== 'undefined') {
+        payload['default'] = xdefault;
+    }
+    if (typeof newKey !== 'undefined') {
+        payload['newKey'] = newKey;
+    }
+
+    let response = undefined;
+
+    response = await client.call('patch', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+/**
+ * @typedef {Object} TablesDBCreatePointColumnRequestParams
+ * @property {string} databaseId Database ID.
+ * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
+ * @property {string} key Column Key.
+ * @property {boolean} required Is column required?
+ * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {boolean} overrideForCli
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {TablesDBCreatePointColumnRequestParams} params
+ */
+const tablesDBCreatePointColumn = async ({databaseId,tableId,key,required,xdefault,parseOutput = true, overrideForCli = false, sdk = undefined}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/tablesdb/{databaseId}/tables/{tableId}/columns/point'.replace('{databaseId}', databaseId).replace('{tableId}', tableId);
+    let payload = {};
+    if (typeof key !== 'undefined') {
+        payload['key'] = key;
+    }
+    if (typeof required !== 'undefined') {
+        payload['required'] = required;
+    }
+    if (typeof xdefault !== 'undefined') {
+        payload['default'] = xdefault;
+    }
+
+    let response = undefined;
+
+    response = await client.call('post', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+/**
+ * @typedef {Object} TablesDBUpdatePointColumnRequestParams
+ * @property {string} databaseId Database ID.
+ * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
+ * @property {string} key Column Key.
+ * @property {boolean} required Is column required?
+ * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {string} newKey New Column Key.
+ * @property {boolean} overrideForCli
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {TablesDBUpdatePointColumnRequestParams} params
+ */
+const tablesDBUpdatePointColumn = async ({databaseId,tableId,key,required,xdefault,newKey,parseOutput = true, overrideForCli = false, sdk = undefined}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/tablesdb/{databaseId}/tables/{tableId}/columns/point/{key}'.replace('{databaseId}', databaseId).replace('{tableId}', tableId).replace('{key}', key);
+    let payload = {};
+    if (typeof required !== 'undefined') {
+        payload['required'] = required;
+    }
+    if (typeof xdefault !== 'undefined') {
+        payload['default'] = xdefault;
+    }
+    if (typeof newKey !== 'undefined') {
+        payload['newKey'] = newKey;
+    }
+
+    let response = undefined;
+
+    response = await client.call('patch', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+/**
+ * @typedef {Object} TablesDBCreatePolygonColumnRequestParams
+ * @property {string} databaseId Database ID.
+ * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
+ * @property {string} key Column Key.
+ * @property {boolean} required Is column required?
+ * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {boolean} overrideForCli
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {TablesDBCreatePolygonColumnRequestParams} params
+ */
+const tablesDBCreatePolygonColumn = async ({databaseId,tableId,key,required,xdefault,parseOutput = true, overrideForCli = false, sdk = undefined}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/tablesdb/{databaseId}/tables/{tableId}/columns/polygon'.replace('{databaseId}', databaseId).replace('{tableId}', tableId);
+    let payload = {};
+    if (typeof key !== 'undefined') {
+        payload['key'] = key;
+    }
+    if (typeof required !== 'undefined') {
+        payload['required'] = required;
+    }
+    if (typeof xdefault !== 'undefined') {
+        payload['default'] = xdefault;
+    }
+
+    let response = undefined;
+
+    response = await client.call('post', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
+}
+/**
+ * @typedef {Object} TablesDBUpdatePolygonColumnRequestParams
+ * @property {string} databaseId Database ID.
+ * @property {string} tableId Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).
+ * @property {string} key Column Key.
+ * @property {boolean} required Is column required?
+ * @property {string} xdefault Default value for column when not provided, as JSON string. Cannot be set when column is required.
+ * @property {string} newKey New Column Key.
+ * @property {boolean} overrideForCli
+ * @property {boolean} parseOutput
+ * @property {libClient | undefined} sdk
+ */
+
+/**
+ * @param {TablesDBUpdatePolygonColumnRequestParams} params
+ */
+const tablesDBUpdatePolygonColumn = async ({databaseId,tableId,key,required,xdefault,newKey,parseOutput = true, overrideForCli = false, sdk = undefined}) => {
+    let client = !sdk ? await sdkForProject() :
+    sdk;
+    let apiPath = '/tablesdb/{databaseId}/tables/{tableId}/columns/polygon/{key}'.replace('{databaseId}', databaseId).replace('{tableId}', tableId).replace('{key}', key);
+    let payload = {};
+    if (typeof required !== 'undefined') {
+        payload['required'] = required;
+    }
+    if (typeof xdefault !== 'undefined') {
+        payload['default'] = xdefault;
+    }
+    if (typeof newKey !== 'undefined') {
+        payload['newKey'] = newKey;
+    }
+
+    let response = undefined;
+
+    response = await client.call('patch', apiPath, {
+        'content-type': 'application/json',
+    }, payload);
+
+    if (parseOutput) {
+        parse(response)
+    }
+
+    return response;
+
 }
 /**
  * @typedef {Object} TablesDBCreateRelationshipColumnRequestParams
@@ -2566,6 +2827,69 @@ tablesDB
     .option(`--new-key <new-key>`, `New Column Key.`)
     .action(actionRunner(tablesDBUpdateIpColumn))
 
+tablesDB
+    .command(`create-line-column`)
+    .description(`Create a geometric line attribute.`)
+    .requiredOption(`--database-id <database-id>`, `Database ID.`)
+    .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
+    .requiredOption(`--key <key>`, `Column Key.`)
+    .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .action(actionRunner(tablesDBCreateLineColumn))
+
+tablesDB
+    .command(`update-line-column`)
+    .description(`Update a line column. Changing the 'default' value will not update already existing documents.`)
+    .requiredOption(`--database-id <database-id>`, `Database ID.`)
+    .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
+    .requiredOption(`--key <key>`, `Column Key.`)
+    .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--new-key <new-key>`, `New Column Key.`)
+    .action(actionRunner(tablesDBUpdateLineColumn))
+
+tablesDB
+    .command(`create-point-column`)
+    .description(`Create a geometric point attribute.`)
+    .requiredOption(`--database-id <database-id>`, `Database ID.`)
+    .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
+    .requiredOption(`--key <key>`, `Column Key.`)
+    .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .action(actionRunner(tablesDBCreatePointColumn))
+
+tablesDB
+    .command(`update-point-column`)
+    .description(`Update a point column. Changing the 'default' value will not update already existing documents.`)
+    .requiredOption(`--database-id <database-id>`, `Database ID.`)
+    .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
+    .requiredOption(`--key <key>`, `Column Key.`)
+    .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--new-key <new-key>`, `New Column Key.`)
+    .action(actionRunner(tablesDBUpdatePointColumn))
+
+tablesDB
+    .command(`create-polygon-column`)
+    .description(`Create a geometric polygon attribute.`)
+    .requiredOption(`--database-id <database-id>`, `Database ID.`)
+    .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
+    .requiredOption(`--key <key>`, `Column Key.`)
+    .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .action(actionRunner(tablesDBCreatePolygonColumn))
+
+tablesDB
+    .command(`update-polygon-column`)
+    .description(`Update a polygon column. Changing the 'default' value will not update already existing documents.`)
+    .requiredOption(`--database-id <database-id>`, `Database ID.`)
+    .requiredOption(`--table-id <table-id>`, `Table ID. You can create a new table using the TablesDB service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).`)
+    .requiredOption(`--key <key>`, `Column Key.`)
+    .requiredOption(`--required [value]`, `Is column required?`, (value) => value === undefined ? true : parseBool(value))
+    .option(`--xdefault <xdefault>`, `Default value for column when not provided, as JSON string. Cannot be set when column is required.`)
+    .option(`--new-key <new-key>`, `New Column Key.`)
+    .action(actionRunner(tablesDBUpdatePolygonColumn))
+
 tablesDB
     .command(`create-relationship-column`)
     .description(`Create relationship column. [Learn more about relationship columns](https://appwrite.io/docs/databases-relationships#relationship-columns). `)
@@ -2865,6 +3189,12 @@ module.exports = {
     tablesDBUpdateIntegerColumn,
     tablesDBCreateIpColumn,
     tablesDBUpdateIpColumn,
+    tablesDBCreateLineColumn,
+    tablesDBUpdateLineColumn,
+    tablesDBCreatePointColumn,
+    tablesDBUpdatePointColumn,
+    tablesDBCreatePolygonColumn,
+    tablesDBUpdatePolygonColumn,
     tablesDBCreateRelationshipColumn,
     tablesDBCreateStringColumn,
     tablesDBUpdateStringColumn,

package/lib/commands/types.js

@@ -12,6 +12,7 @@ const { Swift } = require("../type-generation/languages/swift");
 const { Java } = require("../type-generation/languages/java");
 const { Dart } = require("../type-generation/languages/dart");
 const { JavaScript } = require("../type-generation/languages/javascript");
+const { CSharp } = require("../type-generation/languages/csharp");
 
 /**
  * @param {string} language
@@ -33,6 +34,8 @@ function createLanguageMeta(language) {
       return new Java();
     case "dart":
       return new Dart();
+    case "cs":
+      return new CSharp();
     default:
       throw new Error(`Language '${language}' is not supported`);
   }
@@ -55,7 +58,7 @@ const typesLanguageOption = new Option(
   "-l, --language <language>",
   "The language of the types"
 )
-  .choices(["auto", "ts", "js", "php", "kotlin", "swift", "java", "dart"])
+  .choices(["auto", "ts", "js", "php", "kotlin", "swift", "java", "dart", "cs"])
   .default("auto");
 
 const typesStrictOption = new Option(
@@ -97,22 +100,58 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
     fs.mkdirSync(outputDirectory, { recursive: true });
   }
 
-  const collections = localConfig.getCollections();
-  if (collections.length === 0) {
-    const configFileName = path.basename(localConfig.path);
-    throw new Error(`No collections found in configuration. Make sure ${configFileName} exists and contains collections.`);
+  // Try tables first, fallback to collections
+  let tables = localConfig.getTables();
+  let collections = [];
+  let dataSource = 'tables';
+  
+  if (tables.length === 0) {
+    collections = localConfig.getCollections();
+    dataSource = 'collections';
+    
+    if (collections.length === 0) {
+      const configFileName = path.basename(localConfig.path);
+      throw new Error(`No tables or collections found in configuration. Make sure ${configFileName} exists and contains tables or collections.`);
+    }
+  }
+
+  // Use tables if available, otherwise use collections
+  let dataItems = tables.length > 0 ? tables : collections;
+  const itemType = tables.length > 0 ? 'tables' : 'collections';
+
+  // Normalize tables data: rename 'columns' to 'attributes' for template compatibility
+  if (tables.length > 0) {
+    dataItems = dataItems.map(table => {
+      const { columns, ...rest } = table;
+      return {
+        ...rest,
+        attributes: (columns || []).map(column => {
+          if (column.relatedTable) {
+            const { relatedTable, ...columnRest } = column;
+            return {
+              ...columnRest,
+              relatedCollection: relatedTable
+            };
+          }
+          return column;
+        })
+      };
+    });
   }
 
-  log(`Found ${collections.length} collections: ${collections.map(c => c.name).join(", ")}`);
+  log(`Found ${dataItems.length} ${itemType}: ${dataItems.map(c => c.name).join(", ")}`);
+
+  // Use columns if available, otherwise use attributes
+  const resourceType = tables.length > 0 ? 'columns' : 'attributes';
 
-  const totalAttributes = collections.reduce((count, collection) => count + collection.attributes.length, 0);
-  log(`Found ${totalAttributes} attributes across all collections`);
+  const totalAttributes = dataItems.reduce((count, item) => count + (item.attributes || []).length, 0);
+  log(`Found ${totalAttributes} ${resourceType} across all ${itemType}`);
 
   const templater = ejs.compile(meta.getTemplate());
 
   if (meta.isSingleFile()) {
     const content = templater({
-      collections,
+      collections: dataItems,
       strict,
       ...templateHelpers,
       getType: meta.getType,
@@ -123,23 +162,23 @@ const typesCommand = actionRunner(async (rawOutputDirectory, {language, strict})
     fs.writeFileSync(destination, content);
     log(`Added types to ${destination}`);
   } else {
-    for (const collection of collections) {
+    for (const item of dataItems) {
       const content = templater({
-        collections,
-        collection,
+        collections: dataItems,
+        collection: item,
         strict,
         ...templateHelpers,
         getType: meta.getType,
       });
   
-      const destination = path.join(outputDirectory, meta.getFileName(collection));
+      const destination = path.join(outputDirectory, meta.getFileName(item));
   
       fs.writeFileSync(destination, content);
-      log(`Added types for ${collection.name} to ${destination}`);
+      log(`Added types for ${item.name} to ${destination}`);
     }
   }
   
-  success(`Generated types for all the listed collections`);
+  success(`Generated types for all the listed ${itemType}`);
 });
 
 const types = new Command("types")

package/lib/config.js

@@ -55,7 +55,7 @@ const KeysColumns = new Set([
     // enum
     "elements",
     // relationship
-    "relatedCollection",
+    "relatedTable",
     "relationType",
     "twoWay",
     "twoWayKey",
@@ -150,6 +150,47 @@ class Config {
     toString() {
         return JSONbig.stringify(this.data, null, 4);
     }
+
+    _getDBEntities(entityType) {
+        if (!this.has(entityType)) {
+            return [];
+        }
+        return this.get(entityType);
+    }
+
+    _getDBEntity(entityType, $id) {
+        if (!this.has(entityType)) {
+            return {};
+        }
+
+        let entities = this.get(entityType);
+        for (let i = 0; i < entities.length; i++) {
+            if (entities[i]['$id'] == $id) {
+                return entities[i];
+            }
+        }
+
+        return {};
+    }
+
+    _addDBEntity(entityType, props, keysSet, nestedKeys = {}) {
+        props = whitelistKeys(props, keysSet, nestedKeys);
+
+        if (!this.has(entityType)) {
+            this.set(entityType, []);
+        }
+
+        let entities = this.get(entityType);
+        for (let i = 0; i < entities.length; i++) {
+            if (entities[i]['$id'] == props['$id']) {
+                entities[i] = props;
+                this.set(entityType, entities);
+                return;
+            }
+        }
+        entities.push(props);
+        this.set(entityType, entities);
+    }
 }
 
 class Local extends Config {
@@ -464,45 +505,28 @@ class Local extends Config {
         this.set("topics", topics);
     }
 
-    getDatabases() {
-        if (!this.has("databases")) {
-            return [];
-        }
-        return this.get("databases");
+    getTablesDBs() {
+        return this._getDBEntities("tablesDB");
     }
 
-    getDatabase($id) {
-        if (!this.has("databases")) {
-            return {};
-        }
+    getTablesDB($id) {
+        return this._getDBEntity("tablesDB", $id);
+    }
+    
+    addTablesDB(props) {
+        this._addDBEntity("tablesDB", props, KeysDatabase);
+    }
 
-        let databases = this.get("databases");
-        for (let i = 0; i < databases.length; i++) {
-            if (databases[i]['$id'] == $id) {
-                return databases[i];
-            }
-        }
+    getDatabases() {
+        return this._getDBEntities("databases");
+    }
 
-        return {};
+    getDatabase($id) {
+        return this._getDBEntity("databases", $id);
     }
 
     addDatabase(props) {
-        props = whitelistKeys(props, KeysDatabase);
-
-        if (!this.has("databases")) {
-            this.set("databases", []);
-        }
-
-        let databases = this.get("databases");
-        for (let i = 0; i < databases.length; i++) {
-            if (databases[i]['$id'] == props['$id']) {
-                databases[i] = props;
-                this.set("databases", databases);
-                return;
-            }
-        }
-        databases.push(props);
-        this.set("databases", databases);
+        this._addDBEntity("databases", props, KeysDatabase);
     }
 
     getTeams() {