Skip to content

Commit e711e7e

Browse files
committed
tsconfig fixes, claude cannot do tsconfig lol
1 parent 1713c93 commit e711e7e

18 files changed

+35
-88
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,6 @@ jobs:
1414
matrix:
1515
node-version: [18.x, 20.x, 22.x]
1616
# See supported Node.js versions at https://nodejs.org/en/about/releases/
17-
18-
services:
19-
# We don't actually need this service since we use testcontainers
20-
# but having it here ensures Docker is available for testcontainers
21-
registry:
22-
image: registry:2
23-
ports:
24-
- 5000:5000
25-
2617
steps:
2718
- uses: actions/checkout@v3
2819

@@ -38,6 +29,8 @@ jobs:
3829
- name: Run lib unit tests
3930
run: yarn test:lib:unit
4031

32+
- name: Gotta build the lib first for downstream stuff
33+
run: yarn build:lib
4134
- name: Run cli unit tests
4235
run: yarn test:cli:unit
4336

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ These tests will:
305305
To run all tests:
306306

307307
```bash
308-
npm run test:all
308+
npm run test
309309
```
310310

311311
### Continuous Integration

package.json

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,25 @@
1212
"clean:server": "rm -rf packages/server/dist",
1313
"clean:pg-server": "rm -rf packages/postgres-server/dist",
1414
"clean": "yarn clean:lib && yarn clean:cli && yarn clean:server && yarn clean:pg-server",
15-
"build:lib": "cd packages/lib && npx tsc",
16-
"build:cli": "cd packages/cli && npx tsc",
17-
"build:server": "cd packages/server && npx tsc",
18-
"build:pg-server": "cd packages/postgres-server && npx tsc",
15+
"build:lib": "yarn workspace @queryleaf/lib build",
16+
"build:cli": "yarn workspace @queryleaf/cli build",
17+
"build:server": "yarn workspace @queryleaf/server build",
18+
"build:pg-server": "yarn workspace @queryleaf/postgres-server build",
1919
"build": "yarn clean && yarn build:lib && yarn build:cli && yarn build:server && yarn build:pg-server",
2020
"build:references": "tsc --build",
21-
"test": "jest",
22-
"test:unit": "yarn test:lib:unit && yarn test:cli:unit && yarn test:server:unit && yarn test:pg-server:unit",
23-
"test:integration": "jest --testMatch='**/*.integration.test.ts'",
24-
"test:lib": "cd packages/lib && yarn test",
25-
"test:lib:unit": "cd packages/lib && yarn test:unit",
26-
"test:lib:integration": "cd packages/lib && yarn test:integration",
27-
"test:cli": "cd packages/cli && yarn test",
28-
"test:cli:unit": "cd packages/cli && jest tests/",
29-
"test:server": "cd packages/server && yarn test",
30-
"test:server:unit": "cd packages/server && jest tests/",
31-
"test:pg-server": "cd packages/postgres-server && yarn test",
32-
"test:pg-server:unit": "cd packages/postgres-server && jest tests/unit/",
33-
"test:all": "yarn test:lib && yarn test:cli && yarn test:server && yarn test:pg-server",
21+
"test": "yarn build:lib test:lib test:cli test:server test:pg-server",
22+
"test:lib": "yarn workspace @queryleaf/lib test",
23+
"test:cli": "yarn workspace @queryleaf/cli test",
24+
"test:server": "yarn workspace @queryleaf/server test",
25+
"test:pg-server": "yarn workspace @queryleaf/postgres-server test",
3426
"typecheck": "cd packages/lib && npx tsc --noEmit && cd ../cli && npx tsc --noEmit && cd ../server && npx tsc --noEmit && cd ../postgres-server && npx tsc --noEmit",
3527
"lint": "eslint --ext .ts packages/*/src",
3628
"lint:fix": "eslint --ext .ts --fix packages/*/src",
3729
"format": "prettier --write \"packages/*/src/**/*.ts\"",
3830
"format:check": "prettier --check \"packages/*/src/**/*.ts\"",
3931
"validate": "yarn typecheck && yarn lint && yarn test && yarn format:check",
4032
"docs:serve": "mkdocs serve",
41-
"docs:build": "pip install -r requirements.txt && mkdocs build",
42-
"docs:deploy": "mkdocs gh-deploy --force"
33+
"docs:build": "pip install -r requirements.txt && mkdocs build"
4334
},
4435
"keywords": [
4536
"sql",

packages/cli/jest.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,4 @@ module.exports = {
99
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
1010
openHandlesTimeout: 30000,
1111
detectOpenHandles: true,
12-
moduleNameMapper: {
13-
'^@queryleaf/lib(.*)$': '<rootDir>/../lib/dist$1',
14-
}
1512
};

packages/cli/tsconfig.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,7 @@
33
"compilerOptions": {
44
"outDir": "./dist",
55
"rootDir": "./src",
6-
"composite": true,
7-
"paths": {
8-
"@queryleaf/lib": ["../lib/dist"],
9-
"@queryleaf/lib/*": ["../lib/dist/*"]
10-
}
116
},
127
"include": ["src/**/*"],
13-
"exclude": ["node_modules", "**/*.test.ts", "dist"],
14-
"references": [
15-
{ "path": "../lib" }
16-
]
8+
"exclude": ["node_modules", "**/*.test.ts", "dist"]
179
}

packages/cli/tsconfig.tsbuildinfo

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/lib/build-log.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Files: 249
2+
Lines: 100788
3+
Identifiers: 102182
4+
Symbols: 63308
5+
Types: 89
6+
Instantiations: 0
7+
Memory used: 109932K
8+
I/O read: 0.01s
9+
I/O write: 0.00s
10+
Parse time: 0.42s
11+
Bind time: 0.18s
12+
Check time: 0.00s
13+
Emit time: 0.00s
14+
Total time: 0.60s

packages/lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"clean": "rm -rf dist",
99
"build": "yarn clean && tsc",
10-
"typecheck": "tsc --noEmit",
10+
"typecheck": "npx tsc --noEmit",
1111
"dev": "ts-node src/index.ts",
1212
"example": "ts-node src/examples/basic-usage.ts",
1313
"test": "jest",

packages/lib/tsconfig.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"compilerOptions": {
44
"outDir": "./dist",
55
"rootDir": "./src",
6-
"composite": true
6+
"declaration": true
77
},
8-
"include": ["src/**/*"],
9-
"exclude": ["node_modules", "**/*.test.ts", "dist"]
8+
"include": ["src/**/*"]
109
}

packages/lib/tsconfig.tsbuildinfo

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)