@promakeai/dbreact 1.0.3 → 1.0.4

package/README.md

@@ -4,12 +4,12 @@ React hooks and providers for schema-driven, multi-language databases. Type-safe
 
 ## Features
 
-- **Type-Safe Hooks** - Generated TypeScript types and React hooks
+- **Type-Safe Hooks** - Generic React hooks with generated TypeScript types
 - **Multi-Language Support** - Automatic translation queries with fallback
 - **Browser SQLite** - sql.js WASM adapter for offline-first apps
-- **React Query Integration** - Built-in caching, loading states, optimistic updates
-- **Zero-Config Language Switching** - Change language, queries refetch automatically
-- **MongoDB-Style Queries** - Intuitive filter syntax (`$gt`, `$in`, `$like`, etc.)
+- **React Query Integration** - Built-in caching, loading states, optimistic updates
+- **Zero-Config Language Switching** - Change language, queries refetch automatically
+- **MongoDB-Style Queries** - Intuitive filter syntax (`$gt`, `$in`, `$like`, `$contains`, etc.)
 
 ## Installation
 
@@ -26,11 +26,16 @@ npm install @promakeai/dbreact @tanstack/react-query
 ### 1. Setup Adapter
 
 ```tsx
-import { SqliteAdapter } from '@promakeai/dbreact';
-
-const adapter = new SqliteAdapter({
-  storageKey: 'myapp-db',  // localStorage key for persistence
-});
+import { SqliteAdapter } from '@promakeai/dbreact';
+import { parseJSONSchema } from '@promakeai/dbreact';
+import schemaJson from './schema.json';
+
+const schema = parseJSONSchema(schemaJson as any);
+
+const adapter = new SqliteAdapter({
+  storageKey: 'myapp-db',  // localStorage key for persistence
+  schema,
+});
 ```
 
 ### 2. Wrap App with Provider
@@ -98,24 +103,27 @@ Main provider component that wraps your application.
 
 ```tsx
 <DbProvider
-  adapter={adapter}
-  lang="tr"
-  fallbackLang="en"
-  autoConnect={true}
->
+  adapter={adapter}
+  schema={schema}
+  lang="tr"
+  fallbackLang="en"
+  autoConnect={true}
+>
   <App />
 </DbProvider>
 ```
 
 **Props:**
 
-| Prop | Type | Required | Default | Description |
-|------|------|----------|---------|-------------|
-| `adapter` | `IDataAdapter` | Yes | - | Database adapter instance |
-| `lang` | `string` | No | `'en'` | Current language code |
-| `fallbackLang` | `string` | No | `'en'` | Fallback language |
-| `autoConnect` | `boolean` | No | `true` | Auto-connect on mount |
-| `children` | `ReactNode` | Yes | - | Child components |
+| Prop | Type | Required | Default | Description |
+|------|------|----------|---------|-------------|
+| `adapter` | `IDataAdapter` | Yes | - | Database adapter instance |
+| `schema` | `SchemaDefinition` | No | - | Enables populate + typed serialization |
+| `lang` | `string` | No | `'en'` | Current language code |
+| `fallbackLang` | `string` | No | `'en'` | Fallback language |
+| `autoConnect` | `boolean` | No | `true` | Auto-connect on mount |
+| `queryClient` | `QueryClient` | No | Internal | Provide a custom React Query client |
+| `children` | `ReactNode` | Yes | - | Child components |
 
 ---
 
@@ -143,19 +151,29 @@ const { data, isLoading, error, refetch } = useDbList<Product>('products', {
 | `orderBy` | `array` | Sort order `[{ field, direction }]` |
 | `limit` | `number` | Max records to return |
 | `offset` | `number` | Skip records |
-| `populate` | `string[]` | Resolve foreign key references |
+| `populate` | `PopulateOption` | Resolve foreign key references (string, array, or object) |
 | `enabled` | `boolean` | Enable/disable query |
 
-#### useDbGet
-
-Fetch single record by ID.
-
-```tsx
-const { data: product, isLoading } = useDbGet<Product>('products', productId, {
-  populate: ['categoryId'],
-  enabled: !!productId,
-});
-```
+#### useDbGet
+
+Fetch single record by ID.
+
+```tsx
+const { data: product, isLoading } = useDbGet<Product>('products', productId, {
+  populate: ['categoryId'],
+  enabled: !!productId,
+});
+```
+
+Find-one style (by where clause):
+
+```tsx
+const { data: product } = useDbGet<Product>('products', {
+  where: { slug: 'my-product' },
+  enabled: !!slug,
+  populate: { categoryId: true },
+});
+```
 
 ---
 
@@ -182,13 +200,13 @@ createProduct.mutate(
 Update an existing record.
 
 ```tsx
-const updateProduct = useDbUpdate<Product>('products', productId);
-
-updateProduct.mutate(
-  { price: 89.99 },
-  {
-    onSuccess: () => console.log('Updated'),
-  }
+const updateProduct = useDbUpdate<Product>('products');
+
+updateProduct.mutate(
+  { id: productId, data: { price: 89.99 } },
+  {
+    onSuccess: () => console.log('Updated'),
+  }
 );
 ```
 
@@ -197,11 +215,11 @@ updateProduct.mutate(
 Delete a record.
 
 ```tsx
-const deleteProduct = useDbDelete('products', productId);
-
-deleteProduct.mutate(undefined, {
-  onSuccess: () => console.log('Deleted'),
-});
+const deleteProduct = useDbDelete('products');
+
+deleteProduct.mutate(productId, {
+  onSuccess: () => console.log('Deleted'),
+});
 ```
 
 ---
@@ -294,12 +312,16 @@ const adapter = new SqliteAdapter({
 { name: { $like: '%shirt%' } }       // LIKE '%shirt%'
 { name: { $notLike: '%test%' } }     // NOT LIKE '%test%'
 
-// Range
-{ price: { $between: [10, 100] } }   // BETWEEN 10 AND 100
-
-// Null
-{ description: { $isNull: true } }   // IS NULL
-{ description: { $isNull: false } }  // IS NOT NULL
+// Range
+{ price: { $between: [10, 100] } }   // BETWEEN 10 AND 100
+
+// Null
+{ description: { $isNull: true } }   // IS NULL
+{ description: { $isNull: false } }  // IS NOT NULL
+
+// JSON array contains
+{ tags: { $contains: "sale" } }
+{ tags: { $containsAny: ["sale", "new"] } }
 
 // Logical
 { $and: [
@@ -318,18 +340,18 @@ const adapter = new SqliteAdapter({
 ### Query Interface
 
 ```typescript
-interface QueryOptions {
-  where?: Record<string, unknown>;
-  orderBy?: Array<{
-    field: string;
-    direction: 'ASC' | 'DESC';
-  }>;
-  limit?: number;
-  offset?: number;
-  populate?: string[];
-  lang?: string;
-  fallbackLang?: string;
-}
+interface QueryOptions {
+  where?: Record<string, unknown>;
+  orderBy?: Array<{
+    field: string;
+    direction: 'ASC' | 'DESC';
+  }>;
+  limit?: number;
+  offset?: number;
+  populate?: PopulateOption;
+  lang?: string;
+  fallbackLang?: string;
+}
 ```
 
 ---
@@ -387,36 +409,32 @@ function LanguageSwitcher() {
 
 ---
 
-## Generated Hooks
-
-Generate type-safe hooks from your schema:
-
-```bash
-dbcli generate --schema ./schema.ts --output ./src/db/generated
-```
-
-**Generated files:**
-- `types.ts` - TypeScript interfaces for each table
-- `hooks.ts` - Type-safe hooks for each table
-
-```tsx
-// Generated hooks usage
-import { useProducts, useProduct, useCreateProduct } from './db/generated/hooks';
-
-function ProductManager() {
-  const { data: products } = useProducts({
-    where: { stock: { $gt: 0 } },
-  });
-
-  const { data: product } = useProduct(1);
-
-  const createProduct = useCreateProduct();
-
-  return (
-    // ...
-  );
-}
-```
+## Generated Types + Generic Hooks
+
+Generate runtime schema and TypeScript interfaces:
+
+```bash
+dbcli generate --schema ./schema.json --output ./src/db
+```
+
+`dbcli generate` writes `schema.json` and `types.ts`. React hooks are imported from `@promakeai/dbreact`:
+
+```tsx
+import { useDbList, useDbGet, useDbCreate } from '@promakeai/dbreact';
+import type { DbProduct, DbProductInput } from './db/types';
+
+function ProductManager() {
+  const { data: products } = useDbList<DbProduct>('products', {
+    where: { stock: { $gt: 0 } },
+  });
+
+  const { data: product } = useDbGet<DbProduct>('products', 1);
+
+  const createProduct = useDbCreate<DbProduct, DbProductInput>('products');
+
+  return null;
+}
+```
 
 ---
 
@@ -425,15 +443,10 @@ function ProductManager() {
 ### Custom React Query Options
 
 ```tsx
-const { data } = useDbList('products', {
-  where: { active: true },
-}, {
-  // React Query options
-  staleTime: 1000 * 60 * 5,  // 5 minutes
-  gcTime: 1000 * 60 * 30,    // 30 minutes
-  refetchOnWindowFocus: false,
-  retry: 3,
-});
+const { data } = useDbList('products', {
+  where: { active: true },
+  limit: 50,
+});
 ```
 
 ### Direct Adapter Access
@@ -467,7 +480,7 @@ function AdvancedSearch() {
 ```tsx
 function ProductPrice({ product }) {
   const queryClient = useQueryClient();
-  const updateProduct = useDbUpdate('products', product.id);
+  const updateProduct = useDbUpdate('products');
 
   const handlePriceChange = async (newPrice: number) => {
     // Optimistic update
@@ -476,7 +489,10 @@ function ProductPrice({ product }) {
       { ...product, price: newPrice }
     );
 
-    await updateProduct.mutateAsync({ price: newPrice });
+    await updateProduct.mutateAsync({
+      id: product.id,
+      data: { price: newPrice },
+    });
   };
 
   return <PriceInput value={product.price} onChange={handlePriceChange} />;
@@ -568,13 +584,13 @@ function ProductSearch() {
 Full TypeScript support with generated types:
 
 ```typescript
-import type { Product, ProductInput } from './db/generated/types';
+import type { DbProduct, DbProductInput } from './db/types';
 
 // Type-safe queries
-const products: Product[] = await adapter.list('products');
+const products: DbProduct[] = await adapter.list('products');
 
 // Type-safe creates
-const newProduct: ProductInput = {
+const newProduct: DbProductInput = {
   sku: 'SHIRT-001',
   price: 99.99,
 };

package/dist/adapters/SqliteAdapter.d.ts

@@ -32,6 +32,7 @@ export interface SqliteAdapterConfig {
 export declare class SqliteAdapter implements IDataAdapter {
     private db;
     private SQL;
+    private tableColumnsCache;
     private config;
     schema?: SchemaDefinition;
     defaultLang?: string;
@@ -141,6 +142,8 @@ export declare class SqliteAdapter implements IDataAdapter {
         created: number;
         ids: (number | bigint)[];
     }>;
+    private getAvailableMainFallbackFields;
+    private getTableColumns;
     updateMany(table: string, updates: {
         id: number | string;
         data: Record<string, unknown>;

package/dist/adapters/SqliteAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteAdapter.d.ts","sourceRoot":"","sources":["../../adapters/SqliteAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqliteAdapter.d.ts","sourceRoot":"","sources":["../../adapters/SqliteAdapter.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -224,6 +224,7 @@ import {
 class SqliteAdapter {
   db = null;
   SQL = null;
+  tableColumnsCache = new Map;
   config;
   schema;
   defaultLang;
@@ -241,6 +242,7 @@ class SqliteAdapter {
   setSchema(schema) {
     this.schema = schema;
     this.config.schema = schema;
+    this.tableColumnsCache.clear();
   }
   async connect() {
     this.SQL = await initSqlJs({
@@ -348,6 +350,7 @@ class SqliteAdapter {
       schema: this.schema,
       lang: options.lang,
       fallbackLang: options.fallbackLang ?? this.defaultLang,
+      mainFallbackFields: await this.getAvailableMainFallbackFields(table),
       where: options.where,
       orderBy: options.orderBy,
       limit: options.limit,
@@ -377,7 +380,7 @@ class SqliteAdapter {
       const results = await this.list(table, { where: { id }, limit: 1 });
       return results[0] ?? null;
     }
-    const { sql, params } = buildTranslationQueryById(table, this.schema, id, options.lang, options.fallbackLang ?? this.defaultLang);
+    const { sql, params } = buildTranslationQueryById(table, this.schema, id, options.lang, options.fallbackLang ?? this.defaultLang, await this.getAvailableMainFallbackFields(table));
     const rows = this.runQuery(sql, params);
     const deserialized = this.deserializeResults(table, rows);
     return deserialized[0] ?? null;
@@ -573,6 +576,7 @@ class SqliteAdapter {
       this.persist();
       this.db.close();
       this.db = null;
+      this.tableColumnsCache.clear();
     }
   }
   async beginTransaction() {
@@ -615,6 +619,25 @@ class SqliteAdapter {
     this.persist();
     return { created: ids.length, ids };
   }
+  async getAvailableMainFallbackFields(table) {
+    const tableSchema = this.schema?.tables[table];
+    if (!tableSchema)
+      return [];
+    const translatableFields = getTranslatableFields(tableSchema);
+    if (translatableFields.length === 0)
+      return [];
+    const tableColumns = await this.getTableColumns(table);
+    return translatableFields.filter((field) => tableColumns.has(field));
+  }
+  async getTableColumns(table) {
+    const cached = this.tableColumnsCache.get(table);
+    if (cached)
+      return cached;
+    const schema = await this.getTableSchema(table);
+    const columnSet = new Set(schema.map((col) => col.name));
+    this.tableColumnsCache.set(table, columnSet);
+    return columnSet;
+  }
   async updateMany(table, updates) {
     let updated = 0;
     for (const { id, data } of updates) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promakeai/dbreact",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "React client for schema-driven multi-language database",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -40,7 +40,7 @@
     "sql.js": ">=1.11.0"
   },
   "dependencies": {
-    "@promakeai/orm": "1.0.3"
+    "@promakeai/orm": "1.0.4"
   },
   "devDependencies": {
     "@tanstack/query-core": "5.90.20",