better ts lint

.gitignore

@@ -1,4 +1,5 @@
 # Files
+**/.esm-cache/**
 .vscode
 .idea
 .DS_Store

.prettierignore

@@ -1,2 +1,3 @@
 **/pnpm-lock.yaml
 scripts/
+**/.esm-cache/*

eslint.config.mjs

@@ -4,22 +4,46 @@ import tseslint from "typescript-eslint";
 const opts = tseslint.config(
   eslint.configs.recommended,
   //   ...tseslint.configs.recommended,
-  ...tseslint.configs.strict,
-  ...tseslint.configs.stylistic,
+  // ...tseslint.configs.strict,
+  // ...tseslint.configs.stylistic,
+  ...tseslint.configs.strictTypeChecked,
+  ...tseslint.configs.stylisticTypeChecked,
+  ...tseslint.configs.recommendedTypeChecked,
+  {
+    languageOptions: {
+      parserOptions: {
+        sourceType: "module",
+        project: "./tsconfig.json",
+        //        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
   {
     ignores: [
       "babel.config.cjs",
+      "prettier.config.js",
       "jest.config.js",
+      "setup.*.js",
+      "to-esm.js",
+      "vitest.*.ts",
+      "**/.esm-cache/**",
       "**/dist/",
+      "dist/**",
       "**/pubdir/",
       "**/node_modules/",
       "**/scripts/",
       "**/examples/",
       "scripts/",
+      "coverage/",
       "smoke/react/",
       "src/missingTypes/lib.deno.d.ts",
     ],
   },
+  {
+    files: ["**/*.js", "*.mjs"],
+    extends: [tseslint.configs.disableTypeChecked],
+  },
   {
     rules: {
       "no-console": ["warn"],
@@ -30,6 +54,12 @@ const opts = tseslint.config(
       "no-restricted-globals": ["error", "URL", "TextDecoder", "TextEncoder"],
     },
   },
+  {
+    ignores: ["**/*.mjs"],
+    rules: {
+      "@typescript-eslint/prefer-readonly": "error",
+    },
+  },
 );
 
 export default opts;

package.json

@@ -51,6 +51,7 @@
     "@types/node": "^22.10.5",
     "@types/randombytes": "^2.0.3",
     "@types/react": "^18.3.12",
+    "@types/semver": "^7.5.8",
     "@typescript-eslint/typescript-estree": "^8.19.0",
     "@vitest/browser": "^2.1.8",
     "@vitest/coverage-v8": "^2.1.8",

publish-package.ts

@@ -3,6 +3,7 @@ import { $ } from "zx";
 import { SemVer } from "semver";
 import fs from "fs";
 import path from "path";
+import * as process from "process";
 
 async function main() {
   $.verbose = true;
@@ -13,17 +14,17 @@ async function main() {
   }
   const tags: string[] = [];
   let refVersion;
-  if (process.env.GITHUB_REF && process.env.GITHUB_REF.startsWith("refs/tags/v")) {
+  if (process.env.GITHUB_REF?.startsWith("refs/tags/v")) {
     refVersion = process.env.GITHUB_REF;
   }
   if (!refVersion) {
-    console.error(`No version found in GITHUB_REF(${process.env.GITHUB_REF}) we will not publish`);
+    console.error(`No version found in GITHUB_REF(${process.env.GITHUB_REF ?? ""}) we will not publish`);
     process.exit(1);
   }
   const version = refVersion.replace(/^.*\/v/, "");
   console.log(`Version: ${version} ${refVersion}`);
   const semVer = new SemVer(version);
-  if (semVer.prerelease.find((i) => i.includes("dev"))) {
+  if (semVer.prerelease.find((i) => i.toString().includes("dev"))) {
     tags.push("dev");
   }
   console.log(`Publishing package: ${packageJsonFile} version ${version} with tags ${tags.join(", ")}`);

setup.indexdb.ts

@@ -1,4 +1,4 @@
-function gthis() {
+function gthis(): Record<string | symbol, unknown> {
   return globalThis;
 }
 

src/blockstore/commit-queue.ts

@@ -3,7 +3,7 @@
 type QueueFunction<T = void> = () => Promise<T>;
 
 export class CommitQueue<T = void> {
-  readonly queue: QueueFunction<void>[] = [];
+  readonly queue: QueueFunction[] = [];
   processing = false;
 
   readonly _waitIdleItems: Set<Future<void>> = new Set<Future<void>>();
@@ -22,7 +22,7 @@
         try {
           resolve(await fn());
         } catch (e) {
           reject(e);
         } finally {
           this.processing = false;
           this.processNext();
@@ -40,7 +40,7 @@
       this.processing = true;
       const queueFn = this.queue.shift();
       if (queueFn) {
         queueFn().finally(() => {
           /**/
         });
       }
@@ -48,7 +48,9 @@
     if (this.queue.length === 0 && !this.processing) {
       const toResolve = Array.from(this._waitIdleItems);
       this._waitIdleItems.clear();
-      toResolve.map((fn) => fn.resolve());
+      toResolve.map((fn) => {
+        fn.resolve();
+      });
     }
   }
 }

src/blockstore/loader.ts

@@ -72,9 +72,9 @@ export class Loader implements Loadable {
   remoteCarStore?: DataStore;
   remoteFileStore?: DataStore;
 
-  private getBlockCache = new Map<string, AnyBlock>();
-  private seenMeta = new Set<string>();
-  private writeLimit = pLimit(1);
+  private readonly getBlockCache = new Map<string, AnyBlock>();
+  private readonly seenMeta = new Set<string>();
+  private readonly writeLimit = pLimit(1);
 
   private readonly _carStore = new ResolveOnce<DataStore>();
   async carStore(): Promise<DataStore> {
@@ -214,7 +214,7 @@ export class Loader implements Loadable {
     carHeader.compact.map((c) => c.toString()).forEach(this.seenCompacted.add, this.seenCompacted);
     await this.getMoreReaders(carHeader.cars.flat());
     this.carLog = [...uniqueCids([meta.cars, ...this.carLog, ...carHeader.cars], this.seenCompacted)];
-    await this.ebOpts.applyMeta?.(carHeader.meta);
+    await this.ebOpts.applyMeta(carHeader.meta);
   }
 
   // protected async ingestKeyFromMeta(meta: DbMeta): Promise<void> {

src/blockstore/store.ts

@@ -111,7 +111,7 @@ export abstract class BaseStoreImpl {
     const res = await this.gateway.start(this._url, this.loader);
     if (res.isErr()) {
       this.logger.Error().Result("gw-start", res).Msg("started-gateway");
-      return res as Result<URI>;
+      return res;
     }
     this._url = res.Ok();
     // add storekey to url
@@ -126,7 +126,7 @@ export abstract class BaseStoreImpl {
       return storeKeyName.join(":");
     });
     if (skRes.isErr()) {
-      return skRes as Result<URI>;
+      return skRes;
     }
     this._url = skRes.Ok();
     const version = guardVersion(this._url);
@@ -143,7 +143,9 @@ export abstract class BaseStoreImpl {
         return ready as Result<URI>;
       }
     }
-    this._onStarted.forEach((fn) => fn());
+    this._onStarted.forEach((fn) => {
+      fn();
+    });
     this.logger.Debug().Msg("started");
     return version;
   }
@@ -154,7 +156,7 @@ export async function createDbMetaEvent(sthis: SuperThis, dbMeta: DbMeta, parent
     {
       dbMeta: sthis.txt.encode(format(dbMeta)),
     },
-    parents as unknown as Link<EventView<DbMetaBinary>, number, number, 1>[],
+    parents as unknown as Link<EventView<DbMetaBinary>>[],
   );
   return {
     eventCid: event.cid as CarClockLink,
@@ -182,7 +184,7 @@ export class MetaStoreImpl extends BaseStoreImpl implements MetaStore {
           async ({ payload: dbMetas }: FPEnvelopeMeta) => {
             this.logger.Debug().Msg("Received message from gateway");
             await Promise.all(
-              dbMetas.map((dbMeta) => this.loader.taskManager?.handleEvent(dbMeta.eventCid, dbMeta.parents, dbMeta.dbMeta)),
+              dbMetas.map((dbMeta) => this.loader.taskManager.handleEvent(dbMeta.eventCid, dbMeta.parents, dbMeta.dbMeta)),
             );
             this.updateParentsFromDbMetas(dbMetas);
           },
@@ -257,7 +259,9 @@ export class MetaStoreImpl extends BaseStoreImpl implements MetaStore {
 
   async close(): Promise<Result<void>> {
     await this.gateway.close(this.url(), this.loader);
-    this._onClosed.forEach((fn) => fn());
+    this._onClosed.forEach((fn) => {
+      fn();
+    });
     return Result.Ok(undefined);
   }
   async destroy(): Promise<Result<void>> {
@@ -322,7 +326,7 @@ export class DataStoreImpl extends BaseStoreImpl implements DataStore {
     if (res.isErr()) {
       throw this.logger.Error().Err(res.Err()).Msg("got error from gateway.put").AsError();
     }
-    return res.Ok();
+    res.Ok();
   }
   async remove(cid: AnyLink): Promise<Result<void>> {
     const url = await this.gateway.buildUrl(this.url(), cid.toString(), this.loader);
@@ -333,7 +337,9 @@ export class DataStoreImpl extends BaseStoreImpl implements DataStore {
   }
   async close(): Promise<Result<void>> {
     await this.gateway.close(this.url(), this.loader);
-    this._onClosed.forEach((fn) => fn());
+    this._onClosed.forEach((fn) => {
+      fn();
+    });
     return Result.Ok(undefined);
   }
   destroy(): Promise<Result<void>> {
@@ -352,7 +358,7 @@ export class WALStoreImpl extends BaseStoreImpl implements WALStore {
 
   readonly walState: WALState = { operations: [], noLoaderOps: [], fileOperations: [] };
   readonly processing: Promise<void> | undefined = undefined;
-  readonly processQueue: CommitQueue<void> = new CommitQueue<void>();
+  readonly processQueue: CommitQueue = new CommitQueue();
 
   constructor(sthis: SuperThis, url: URI, opts: StoreOpts) {
     // const my = new URL(url.toString());
@@ -574,7 +580,9 @@ export class WALStoreImpl extends BaseStoreImpl implements WALStore {
 
   async close() {
     await this.gateway.close(this.url(), this.loader);
-    this._onClosed.forEach((fn) => fn());
+    this._onClosed.forEach((fn) => {
+      fn();
+    });
     return Result.Ok(undefined);
   }
 

src/blockstore/transaction.ts

@@ -66,7 +66,7 @@ export function defaultedBlockstoreRuntime(
     },
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     compact: async (blocks: BlockFetcher) => {
-      return {} as unknown as TransactionMeta;
+      return {} as unknown;
     },
     autoCompact: 100,
     public: false,

src/blockstore/types.ts

@@ -24,7 +24,7 @@ export interface AnyBlock {
 }
 
 export interface CIDBlock {
-  readonly cid: CID<unknown, number, number, Version>;
+  readonly cid: CID;
   readonly bytes: Uint8Array;
 }
 
@@ -357,7 +357,7 @@ export interface WALStore extends BaseStore {
   readonly storeType: "wal";
   ready(): Promise<void>;
   readonly processing?: Promise<void> | undefined;
-  readonly processQueue: CommitQueue<void>;
+  readonly processQueue: CommitQueue;
 
   process(): Promise<void>;
   enqueue(dbMeta: DbMeta, opts: CommitOpts): Promise<void>;

src/crdt-clock.ts

@@ -61,13 +61,19 @@ export class CRDTClock<T extends DocTypes> {
       const changes = await clockChangesSince<T>(throwFalsy(this.blockstore), this.head, prevHead, {}, this.logger);
       internalUpdates = changes.result;
     }
-    this.zoomers.forEach((fn) => fn());
+    this.zoomers.forEach((fn) => {
+      fn();
+    });
     this.notifyWatchers(internalUpdates || []);
   }
 
   notifyWatchers(updates: DocUpdate<T>[]) {
-    this.emptyWatchers.forEach((fn) => fn());
-    this.watchers.forEach((fn) => fn(updates || []));
+    this.emptyWatchers.forEach((fn) => {
+      fn();
+    });
+    this.watchers.forEach((fn) => {
+      fn(updates || []);
+    });
   }
 
   onTick(fn: (updates: DocUpdate<T>[]) => void) {

src/crdt-helpers.ts

@@ -128,7 +128,7 @@ async function processFileset(
   // let totalSize = 0
   for (const filename in files) {
     if (File === files[filename].constructor) {
-      const file = files[filename] as File;
+      const file = files[filename];
 
       // totalSize += file.size
       const { cid, blocks: fileBlocks } = await store.encodeFile(file);
@@ -148,7 +148,7 @@ async function processFileset(
   if (didPut.length) {
     const car = await dbBlockstore.loader.commitFiles(
       t,
-      { files } as unknown as TransactionMeta /* {
+      { files } as unknown /* {
       public: publicFiles,
     } */,
     );
@@ -241,9 +241,7 @@ export async function clockChangesSince<T extends DocTypes>(
   opts: ChangesOptions,
   logger: Logger,
 ): Promise<{ result: DocUpdate<T>[]; head: ClockHead }> {
-  const eventsFetcher = (
-    opts.dirty ? new DirtyEventFetcher<Operation>(logger, blocks) : new EventFetcher<Operation>(blocks)
-  ) as EventFetcher<Operation>;
+  const eventsFetcher = opts.dirty ? new DirtyEventFetcher<Operation>(logger, blocks) : new EventFetcher<Operation>(blocks);
   const keys = new Set<string>();
   const updates = await gatherUpdates<T>(
     blocks,

src/crdt.ts

@@ -194,6 +194,6 @@ export class CRDT<T extends DocTypes> {
 
   async compact(): Promise<void> {
     const blocks = this.blockstore as EncryptedBlockstore;
-    return await blocks.compact();
+    await blocks.compact();
   }
 }