2.0.0

.vscode/settings.json

@@ -22,5 +22,6 @@
         }
       }
     }
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

package.json

@@ -1,10 +1,11 @@
 {
   "name": "@pushrocks/smartclickhouse",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "private": false,
   "description": "an odm for talking to clickhouse",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
@@ -14,17 +15,17 @@
     "createClickhouse": "docker run --name some-clickhouse-server --ulimit nofile=262144:262144 -p 8123:8123 -p 9000:9000  --volume=$PWD/.nogit/testdatabase:/var/lib/clickhouse yandex/clickhouse-server"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.48",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.91",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.67",
-    "@pushrocks/tapbundle": "^4.0.8",
+    "@pushrocks/tapbundle": "^5.0.2",
     "@types/node": "^17.0.21",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
     "@depyronick/clickhouse-client": "^1.0.12",
-    "@pushrocks/smartobject": "^1.0.8"
+    "@pushrocks/smartobject": "^1.0.10"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.nonci.ts

@@ -1,5 +1,5 @@
 import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
-import * as smartclickhouse from '../ts/index';
+import * as smartclickhouse from '../ts/index.js';
 
 let testClickhouseDb: smartclickhouse.SmartClickHouseDb;
 
@@ -23,7 +23,8 @@ tap.test('should create a timedatatable', async () => {
       message: `hello this is a message ${i}`,
       wow: 'hey',
       deep: {
-        so: 'hello'
+        so: 'hello',
+        myArray: ['array1', 'array2']
       }
     });
     i++;

ts/index.ts

@@ -1,2 +1,2 @@
-export * from './smartclickhouse.classes.smartclickhouse';
+export * from './smartclickhouse.classes.smartclickhouse.js';
-export * from './smartclickhouse.classes.timedatatable';
+export * from './smartclickhouse.classes.timedatatable.js';

ts/smartclickhouse.classes.smartclickhouse.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartclickhouse.plugins';
+import * as plugins from './smartclickhouse.plugins.js';
-import { TimeDataTable } from './smartclickhouse.classes.timedatatable';
+import { TimeDataTable } from './smartclickhouse.classes.timedatatable.js';
 
 export interface IClickhouseConstructorOptions {
   host: string;

ts/smartclickhouse.classes.timedatatable.ts

@@ -1,7 +1,7 @@
-import * as plugins from './smartclickhouse.plugins';
+import * as plugins from './smartclickhouse.plugins.js';
-import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse';
+import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse.js';
 
-export type TClickhouseColumnDataType = 'String' | "DateTime64(3, 'Europe/Berlin')" | 'Float64';
+export type TClickhouseColumnDataType = 'String' | "DateTime64(3, 'Europe/Berlin')" | 'Float64' | 'Array(String)' | 'Array(Float64)';
 export interface IColumnInfo {
   database: string;
   table: string;
@@ -32,10 +32,17 @@ export class TimeDataTable {
 
     // create table in clickhouse
     await smartClickHouseDbRefArg.clickhouseClient
-      .queryPromise(`CREATE TABLE IF NOT EXISTS ${newTable.tableName} (
+      .queryPromise(`
-      timestamp DateTime64(3, 'Europe/Berlin'),
+        CREATE TABLE IF NOT EXISTS ${newTable.tableName} (
-      message String
+          timestamp DateTime64(3, 'Europe/Berlin'),
-    ) ENGINE=MergeTree() ORDER BY timestamp`);
+          message String
+        ) ENGINE=MergeTree() ORDER BY timestamp`);
+    
+    // lets adjust the TTL
+    await smartClickHouseDbRefArg.clickhouseClient
+      .queryPromise(`
+        ALTER TABLE ${newTable.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL 1 MONTH
+      `);
 
     await newTable.updateColumns();
     console.log(`=======================`)
@@ -60,7 +67,6 @@ export class TimeDataTable {
   }
 
   public columns: IColumnInfo[] = [];
-  public seenPaths: { pathName: string; type: TClickhouseColumnDataType }[] = [];
 
   /**
    * updates the columns
@@ -82,14 +88,25 @@ export class TimeDataTable {
     let storageJson: { [key: string]: any } = {};
     
     // helper stuff
-    const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
+    
-      string: 'String',
+    const getClickhouseTypeForValue = (valueArg: any): TClickhouseColumnDataType => {
-      number: 'Float64',
+      const typeConversion: {[key: string]: TClickhouseColumnDataType} = {
-    };
+        string: 'String',
-    const getClickhouseTypeForValue = (valueArg: any) => {
+        number: 'Float64',
+        undefined: null,
+        null: null
+      };
+      if (valueArg instanceof Array) {
+        const arrayType = typeConversion[(typeof valueArg[0]) as string];
+        if (!arrayType) {
+          return null;
+        } else {
+          return `Array(${arrayType})` as TClickhouseColumnDataType;
+        }
+      }
       return typeConversion[(typeof valueArg) as string];
     }
-    const checkPath = async (pathArg: string, typeArg: TClickhouseColumnDataType) => {
+    const checkPath = async (pathArg: string, typeArg: TClickhouseColumnDataType, prechecked = false) => {
       let columnFound = false;
       for (const column of this.columns) {
         if (pathArg === column.name) {
@@ -98,9 +115,22 @@ export class TimeDataTable {
         }
       }
       if (!columnFound) {
-        await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
+        if (!prechecked) {
-          ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST
+          await this.updateColumns();
+          await checkPath(pathArg, typeArg, true);
+          return;
+        }
+        const alterString = `ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST`
+        try {
+          await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
+          ${alterString}
         `);
+        } catch(err) {
+          console.log(alterString);
+          for (const column of this.columns) {
+            console.log(column.name);
+          }
+        }
         await this.updateColumns();
       }
     };
@@ -117,6 +147,9 @@ export class TimeDataTable {
       }
       // lets deal with the rest
       const clickhouseType = getClickhouseTypeForValue(value);
+      if (!clickhouseType) {
+        continue;
+      }
       await checkPath(key, clickhouseType);
       storageJson[key] = value;
     }

tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node12"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}