Skip to content

A local-first personal finance app

[AI] crdt: typecheck test files and clean up lint issues (#7534)

Matiss Janis Aboltins598bf81da18c
diff --git a/.oxlintrc.json b/.oxlintrc.json
index ec15eb393f..eb07b4dca9 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -416,6 +416,16 @@
"rules": {
"eslint/no-empty-function": "off"
}
+ },
+ // crdt enforces the repo's "TODO: enable this" typescript rules as errors
+ {
+ "files": ["packages/crdt/**/*"],
+ "rules": {
+ "typescript/no-misused-spread": "error",
+ "typescript/no-base-to-string": "error",
+ "typescript/no-unsafe-unary-minus": "error",
+ "typescript/no-unsafe-type-assertion": "error"
+ }
}
]
}
diff --git a/packages/crdt/bin/generate-proto b/packages/crdt/bin/generate-proto
index 48a6bbc0be..690075ef81 100755
--- a/packages/crdt/bin/generate-proto
+++ b/packages/crdt/bin/generate-proto
@@ -19,7 +19,7 @@ protoc --plugin="protoc-gen-ts=../../node_modules/.bin/protoc-gen-ts" \
../../node_modules/.bin/oxfmt src/proto/*.d.ts
for file in src/proto/*.d.ts; do
- { echo "/* eslint-disable @typescript-eslint/no-namespace */"; sed 's/export class/export declare class/g' "$file"; } > "${file%.d.ts}.ts"
+ { echo "/* oxlint-disable typescript/no-namespace */"; sed 's/export class/export declare class/g' "$file"; } > "${file%.d.ts}.ts"
rm "$file"
done
diff --git a/packages/crdt/index.ts b/packages/crdt/index.ts
deleted file mode 100644
index 8420b1093f..0000000000
--- a/packages/crdt/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './src';
diff --git a/packages/crdt/package.json b/packages/crdt/package.json
index 115669e514..c06738afe9 100644
--- a/packages/crdt/package.json
+++ b/packages/crdt/package.json
@@ -20,9 +20,9 @@
}
},
"scripts": {
- "build:node": "tsgo",
+ "build:node": "tsgo -p tsconfig.build.json",
"proto:generate": "./bin/generate-proto",
- "build": "rm -rf dist && yarn run build:node",
+ "build": "rm -rf dist && yarn run build:node && cp src/proto/sync_pb.js dist/proto/sync_pb.js",
"test": "vitest --run",
"typecheck": "tsgo -b"
},
diff --git a/packages/crdt/src/crdt/timestamp.test.ts b/packages/crdt/src/crdt/timestamp.test.ts
index fe20ccf83b..9ff6c92c3f 100644
--- a/packages/crdt/src/crdt/timestamp.test.ts
+++ b/packages/crdt/src/crdt/timestamp.test.ts
@@ -44,7 +44,8 @@ describe('Timestamp', function () {
'9999-12-31T23:59:59.999Z-FFFF-10000000000000000',
];
for (const invalidInput of invalidInputs) {
- expect(Timestamp.parse(invalidInput as string)).toBe(null);
+ // @ts-expect-error we intentionally pass invalid inputs
+ expect(Timestamp.parse(invalidInput)).toBe(null);
}
});
diff --git a/packages/crdt/src/crdt/timestamp.ts b/packages/crdt/src/crdt/timestamp.ts
index d3a01fbd4f..69fdf71c7e 100644
--- a/packages/crdt/src/crdt/timestamp.ts
+++ b/packages/crdt/src/crdt/timestamp.ts
@@ -312,9 +312,7 @@ export class Timestamp {
static ClockDriftError = class ClockDriftError extends Error {
constructor(...args: unknown[]) {
- super(
- ['maximum clock drift exceeded'].concat(args as string[]).join(' '),
- );
+ super(['maximum clock drift exceeded', ...args.map(String)].join(' '));
this.name = 'ClockDriftError';
}
};
diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.ts
index 225262f1d7..f029d06d30 100644
--- a/packages/crdt/src/index.ts
+++ b/packages/crdt/src/index.ts
@@ -1,5 +1,5 @@
-/* oxlint-disable typescript/no-explicit-any */
import './proto/sync_pb.js'; // Import for side effects
+import type * as SyncPb from './proto/sync_pb';
export {
merkle,
@@ -13,11 +13,16 @@ export {
Timestamp,
} from './crdt';
-// Access global proto namespace
-export const SyncRequest = (globalThis as any).proto.SyncRequest;
-export const SyncResponse = (globalThis as any).proto.SyncResponse;
-export const Message = (globalThis as any).proto.Message;
-export const MessageEnvelope = (globalThis as any).proto.MessageEnvelope;
-export const EncryptedData = (globalThis as any).proto.EncryptedData;
+declare global {
+ var proto: typeof SyncPb;
+}
-export const SyncProtoBuf = (globalThis as any).proto;
+const { proto } = globalThis;
+
+export const SyncRequest = proto.SyncRequest;
+export const SyncResponse = proto.SyncResponse;
+export const Message = proto.Message;
+export const MessageEnvelope = proto.MessageEnvelope;
+export const EncryptedData = proto.EncryptedData;
+
+export const SyncProtoBuf = proto;
diff --git a/packages/crdt/tsconfig.build.json b/packages/crdt/tsconfig.build.json
new file mode 100644
index 0000000000..42ff5319aa
--- /dev/null
+++ b/packages/crdt/tsconfig.build.json
@@ -0,0 +1,8 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "composite": false,
+ "emitDeclarationOnly": false
+ },
+ "exclude": ["**/*.test.ts", "**/*.spec.ts"]
+}
diff --git a/packages/crdt/tsconfig.json b/packages/crdt/tsconfig.json
index ea37d8ff12..9da5b3d6a4 100644
--- a/packages/crdt/tsconfig.json
+++ b/packages/crdt/tsconfig.json
@@ -1,18 +1,19 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
+ "rootDir": "./src",
"composite": true,
- // Using ES2021 because that's the newest version where
- // the latest Node 16.x release supports all of the features
"target": "ES2021",
- "module": "CommonJS",
+ "module": "NodeNext",
+ "moduleResolution": "NodeNext",
"noEmit": false,
+ "emitDeclarationOnly": true,
"declaration": true,
"declarationMap": true,
"strict": true,
"outDir": "dist",
- "tsBuildInfoFile": "dist/.tsbuildinfo"
+ "tsBuildInfoFile": "dist/.tsbuildinfo",
+ "types": ["vitest/globals"]
},
- "include": ["."],
- "exclude": ["dist", "**/*.test.ts", "**/*.spec.ts"]
+ "include": ["./src/"]
}
diff --git a/upcoming-release-notes/7534.md b/upcoming-release-notes/7534.md
new file mode 100644
index 0000000000..5d92ab1fa0
--- /dev/null
+++ b/upcoming-release-notes/7534.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+crdt: typecheck test files; fix lint issues