Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
5e04d2c
rename to ts
KSDaemon May 13, 2025
0c2d534
Move to TS whole codebase
KSDaemon May 14, 2025
7dbce72
Move to TS tests
KSDaemon May 13, 2025
fb7b441
side fix :)
KSDaemon May 13, 2025
c3f3311
fix tools settings
KSDaemon May 13, 2025
5e85dce
temp comment out rollup for client-core
KSDaemon May 13, 2025
492da15
update ts config and remove babel
KSDaemon May 13, 2025
7f232e4
a few more type fixes
KSDaemon May 13, 2025
a9736c1
versions sync
KSDaemon May 13, 2025
f4c23ab
return back rollup
KSDaemon May 13, 2025
b6c6689
another try to fix rollup
KSDaemon May 13, 2025
1db3737
build fixes
vasilev-alex May 14, 2025
4e36c08
fix quotes
KSDaemon May 14, 2025
92ec374
fix ts config
KSDaemon May 14, 2025
cc9c3f4
return back lint plugin
KSDaemon May 14, 2025
79e6883
delete removed rule
KSDaemon May 14, 2025
3ce5045
fix lint errors
KSDaemon May 14, 2025
19c5c27
fix lint error in BaseDriver
KSDaemon May 14, 2025
dda3ca1
fix linting in api-gateway
KSDaemon May 14, 2025
6acf830
fix linting in BaseQueueDriver
KSDaemon May 14, 2025
b2fcd6f
fix linting in QueryTestAbstract
KSDaemon May 14, 2025
31cdf1a
more fixes
KSDaemon May 14, 2025
5c5280c
more type fixes
KSDaemon May 14, 2025
3e8c556
Fix more types
KSDaemon May 14, 2025
243a92e
fix load()
KSDaemon May 15, 2025
223e7d1
fix vue clients
KSDaemon May 15, 2025
8b2f675
fix getNormalizedPivotConfig()
KSDaemon May 15, 2025
6681425
trying to fix dev docker img
KSDaemon May 15, 2025
af47ed6
exclude index.umd.js from coverage
KSDaemon May 15, 2025
e79d390
trying to fix dev docker img
KSDaemon May 15, 2025
8fbb37a
revert all docker changes in docker file
KSDaemon May 15, 2025
23eb2d5
fix client builds
KSDaemon May 15, 2025
4ba6468
entry point fixes
vasilev-alex May 15, 2025
ccc77c8
fix quotes
vasilev-alex May 15, 2025
40d119b
module fix
vasilev-alex May 15, 2025
564a31f
updated uuid
vasilev-alex May 15, 2025
f7341ba
trying to fix jest tests + client core build
KSDaemon May 15, 2025
520c642
remove module
KSDaemon May 15, 2025
d024ad7
unit tests
vasilev-alex May 16, 2025
3134708
fix coverage
vasilev-alex May 16, 2025
63d7f84
fix entry point
vasilev-alex May 16, 2025
ee77138
ws fix
vasilev-alex May 16, 2025
200a2b9
resolve fix
vasilev-alex May 16, 2025
289ea94
cleanup
vasilev-alex May 16, 2025
457a5b5
fix yarn.lock
KSDaemon May 16, 2025
36d5c2c
some configs polishment
KSDaemon May 16, 2025
fac9b3b
fix after rebasing
KSDaemon May 16, 2025
2d18f9c
improve ts config for jest
KSDaemon May 16, 2025
7ef44fd
more tests for resultset
KSDaemon May 16, 2025
5fa98a2
fix test for cubeApi
KSDaemon May 16, 2025
2824207
few more tests
KSDaemon May 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
**
!package.json
!tsconfig.base.json
!tsconfig.json
!rollup.config.js
!yarn.lock
!lerna.json
Expand Down
16 changes: 16 additions & 0 deletions jest.base-ts.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const base = require('./jest.base.config');

/** @type {import('jest').Config} */
module.exports = {
...base,
preset: 'ts-jest',
testMatch: ['<rootDir>/test/**/*.test.ts'],
moduleFileExtensions: ['ts', 'js', 'json'],
transform: {
'^.+\\.ts$': ['ts-jest', { tsconfig: '../../tsconfig.jest.json' }],
},
collectCoverageFrom: [
'<rootDir>/src/**/*.{ts,tsx}',
'!<rootDir>/src/**/*.d.ts',
]
};
1 change: 1 addition & 0 deletions jest.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
'^uuid$': require.resolve('uuid'),
'^yaml$': require.resolve('yaml'),
},
setupFiles: ['../../jest.setup.js'],
snapshotFormat: {
escapeString: true, // To keep existing variant of snapshots
printBasicPrototype: true
Expand Down
5 changes: 5 additions & 0 deletions jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const { webcrypto } = require('node:crypto');

if (!globalThis.crypto) {
globalThis.crypto = webcrypto;
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
]
},
"scripts": {
"build": "rollup -c",
"build": "yarn lerna run build:client-core && rollup -c",
"watch": "rollup -c -w",
"watch-local": "CUBEJS_API_URL=http://localhost:6020/cubejs-api/v1 rollup -c -w",
"lint:npm": "yarn npmPkgJsonLint packages/*/package.json rust/package.json",
Expand All @@ -26,7 +26,6 @@
},
"author": "Cube Dev, Inc.",
"dependencies": {
"@typescript-eslint/eslint-plugin": "^4.17.0",
"core-js": "^3.34.0",
"lerna": "^8.2.1"
},
Expand All @@ -44,7 +43,9 @@
"@rollup/plugin-alias": "^3.1.2",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^11.2.0",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@types/fs-extra": "^9.0.1",
"@types/jest": "^27",
"flush-promises": "^1.0.2",
Expand All @@ -57,6 +58,7 @@
"rimraf": "^3.0.2",
"rollup": "2.53.1",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-tsconfig-paths": "^1.5.2",
"typescript": "~5.2.2"
},
"repository": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

/* globals describe,test,expect */
/* eslint-disable import/no-duplicates */
/* eslint-disable @typescript-eslint/no-duplicate-imports */

import { MemberType } from '../../src/types/enums';
import prepareAnnotationDef
Expand Down
4 changes: 2 additions & 2 deletions packages/cubejs-base-driver/src/BaseDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,9 @@ export abstract class BaseDriver implements DriverInterface {
return undefined;
}

abstract testConnection(): Promise<void>;
public abstract testConnection(): Promise<void>;

abstract query<R = unknown>(_query: string, _values?: unknown[], _options?: QueryOptions): Promise<R[]>;
public abstract query<R = unknown>(_query: string, _values?: unknown[], _options?: QueryOptions): Promise<R[]>;

// eslint-disable-next-line @typescript-eslint/no-unused-vars
public async streamQuery(sql: string, values: string[]): Promise<stream.Readable> {
Expand Down
39 changes: 0 additions & 39 deletions packages/cubejs-client-core/.eslintrc.js

This file was deleted.

4 changes: 0 additions & 4 deletions packages/cubejs-client-core/babel.config.js

This file was deleted.

Loading
Loading