fix: improve type generation

trust0-project · Jan 1, 2025 · b5dcc14 · b5dcc14
1 parent 09d4d7f
commit b5dcc14
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/packages/ridb-level/package.json b/packages/ridb-level/package.json
@@ -29,7 +29,7 @@
     "test:node": "sh test.sh -e node",
     "test:browser": "sh test.sh -e browser",
     "types": "npm run types:default",
-    "types:default": "npx dts-bundle-generator src/index.ts  --no-check -o ./build/index.d.ts",
+    "types:default": "npx tsc",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {

diff --git a/packages/ridb-level/src/index.ts b/packages/ridb-level/src/index.ts
@@ -25,8 +25,8 @@ import type {
     Doc, 
     Operation,
     QueryType,
+    BaseStorage as BaseStorageWasm
  } from "@trust0/ridb-wasm";
-import type { BaseStorage as BaseStorageWasm} from "@trust0/ridb-wasm";
 import type { ClassicLevel } from "classic-level";
 type Level = ClassicLevel<string, string>
 

diff --git a/packages/ridb-level/tsconfig.json b/packages/ridb-level/tsconfig.json
@@ -15,8 +15,7 @@
     "lib": ["ES2022", "DOM"]
   },
   "include": [
-    "src/**/*",
-    "../testing/src/**/*"
+    "src/**/*"
   ],
   "exclude": ["node_modules", "build"]
 }
diff --git a/packages/ridb-react/package.json b/packages/ridb-react/package.json
@@ -11,9 +11,11 @@
     },
     "scripts": {
         "clean": "rm -rf build node_modules",
-        "ts-types": " tsc ",
-        "build": "rm -rf build && node ./esbuild.js && npm run ts-types",
-        "test": "vitest --run"
+        "build": "rm -rf build && npm run types && node ./esbuild.js",
+        "test": "vitest --run",
+        "types": "npm run types:default",
+        "types:default": "npx tsc",
+        "prepublishOnly": "npm run build"
     },
     "files": [
         "build/*",

diff --git a/packages/ridb/src/index.ts b/packages/ridb/src/index.ts
@@ -230,10 +230,10 @@ export class RIDB<T extends SchemaTypeRecord = SchemaTypeRecord> {
 
     /**
      * Loads the RIDB Rust module.
-     * @returns {Promise<typeof import("@trust0/ridb-wasm")>} A promise that resolves to the RIDB Rust module.
+     * @returns {Promise<typeof import("@trust0/ridb")>} A promise that resolves to the RIDB Rust module.
      * @private
      */
-    static async load(): Promise<typeof import("@trust0/ridb-wasm")> {
+    static async load() {
         internal ??= await import("@trust0/ridb-wasm").then(async (module) => {
             const wasmInstance = module.initSync(wasmBuffer);
             await module.default(wasmInstance);