@objectql/driver-knex 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @objectql/driver-knex
 
+## 1.2.0
+
+### Minor Changes
+
+- 7df2977: 拆分 objectos
+
+### Patch Changes
+
+- Updated dependencies [7df2977]
+  - @objectql/types@1.2.0
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,10 +1,13 @@
-import { Driver } from '@objectql/core';
+import { Driver } from '@objectql/types';
 import { Knex } from 'knex';
 export declare class KnexDriver implements Driver {
     private knex;
+    private config;
+    private jsonFields;
     constructor(config: any);
     private getBuilder;
     private applyFilters;
+    private mapSortField;
     find(objectName: string, query: any, options?: any): Promise<any[]>;
     findOne(objectName: string, id: string | number, query?: any, options?: any): Promise<any>;
     create(objectName: string, data: any, options?: any): Promise<any>;
@@ -17,4 +20,11 @@ export declare class KnexDriver implements Driver {
     createMany(objectName: string, data: any[], options?: any): Promise<any>;
     updateMany(objectName: string, filters: any, data: any, options?: any): Promise<any>;
     deleteMany(objectName: string, filters: any, options?: any): Promise<any>;
+    init(objects: any[]): Promise<void>;
+    private createColumn;
+    private ensureDatabaseExists;
+    private createDatabase;
+    private isJsonField;
+    private formatInput;
+    private formatOutput;
 }

package/dist/index.js

@@ -7,6 +7,8 @@ exports.KnexDriver = void 0;
 const knex_1 = __importDefault(require("knex"));
 class KnexDriver {
     constructor(config) {
+        this.jsonFields = {};
+        this.config = config;
         this.knex = (0, knex_1.default)(config);
     }
     getBuilder(objectName, options) {
@@ -19,8 +21,6 @@ class KnexDriver {
     applyFilters(builder, filters) {
         if (!filters || filters.length === 0)
             return;
-        // Simple linear parser handling [cond, 'or', cond, 'and', cond]
-        // Default join is AND.
         let nextJoin = 'and';
         for (const item of filters) {
             if (typeof item === 'string') {
@@ -31,49 +31,61 @@ class KnexDriver {
                 continue;
             }
             if (Array.isArray(item)) {
-                const [field, op, value] = item;
-                // Handle specific operators that map to different knex methods
-                const apply = (b) => {
-                    // b is the builder to apply on (could be root or a where clause)
-                    // But here we call directly on builder using 'where' or 'orWhere'
-                    // Method selection
-                    let method = nextJoin === 'or' ? 'orWhere' : 'where';
-                    let methodIn = nextJoin === 'or' ? 'orWhereIn' : 'whereIn';
-                    let methodNotIn = nextJoin === 'or' ? 'orWhereNotIn' : 'whereNotIn';
-                    switch (op) {
-                        case '=':
-                            b[method](field, value);
-                            break;
-                        case '!=':
-                            b[method](field, '<>', value);
-                            break;
-                        case 'in':
-                            b[methodIn](field, value);
-                            break;
-                        case 'nin':
-                            b[methodNotIn](field, value);
-                            break;
-                        case 'contains':
+                // Heuristic to detect if it is a criterion [field, op, value] or a nested group
+                const [fieldRaw, op, value] = item;
+                const isCriterion = typeof fieldRaw === 'string' && typeof op === 'string';
+                if (isCriterion) {
+                    const field = this.mapSortField(fieldRaw);
+                    // Handle specific operators that map to different knex methods
+                    const apply = (b) => {
+                        let method = nextJoin === 'or' ? 'orWhere' : 'where';
+                        let methodIn = nextJoin === 'or' ? 'orWhereIn' : 'whereIn';
+                        let methodNotIn = nextJoin === 'or' ? 'orWhereNotIn' : 'whereNotIn';
+                        // Fix for 'contains' mapping
+                        if (op === 'contains') {
                             b[method](field, 'like', `%${value}%`);
-                            break; // Simple LIKE
-                        default: b[method](field, op, value);
-                    }
-                };
-                apply(builder);
-                // Reset join to 'and' for subsequent terms unless strictly specified?
-                // In SQL `A or B and C` means `A or (B and C)`.
-                // If we chain `.where(A).orWhere(B).where(C)` in Knex:
-                // It produces `... WHERE A OR B AND C`.
-                // So linear application matches SQL precedence usually if implicit validation is ok.
-                // But explicit AND after OR is necessary in our array format.
+                            return;
+                        }
+                        switch (op) {
+                            case '=':
+                                b[method](field, value);
+                                break;
+                            case '!=':
+                                b[method](field, '<>', value);
+                                break;
+                            case 'in':
+                                b[methodIn](field, value);
+                                break;
+                            case 'nin':
+                                b[methodNotIn](field, value);
+                                break;
+                            default: b[method](field, op, value);
+                        }
+                    };
+                    apply(builder);
+                }
+                else {
+                    // Recursive Group
+                    const method = nextJoin === 'or' ? 'orWhere' : 'where';
+                    builder[method]((qb) => {
+                        this.applyFilters(qb, item);
+                    });
+                }
                 nextJoin = 'and';
             }
         }
     }
+    mapSortField(field) {
+        if (field === 'createdAt')
+            return 'created_at';
+        if (field === 'updatedAt')
+            return 'updated_at';
+        return field;
+    }
     async find(objectName, query, options) {
         const builder = this.getBuilder(objectName, options);
         if (query.fields) {
-            builder.select(query.fields);
+            builder.select(query.fields.map((f) => this.mapSortField(f)));
         }
         else {
             builder.select('*');
@@ -83,18 +95,25 @@ class KnexDriver {
         }
         if (query.sort) {
             for (const [field, dir] of query.sort) {
-                builder.orderBy(field, dir);
+                builder.orderBy(this.mapSortField(field), dir);
             }
         }
         if (query.skip)
             builder.offset(query.skip);
         if (query.limit)
             builder.limit(query.limit);
-        return await builder;
+        const results = await builder;
+        if (this.config.client === 'sqlite3') {
+            for (const row of results) {
+                this.formatOutput(objectName, row);
+            }
+        }
+        return results;
     }
     async findOne(objectName, id, query, options) {
         if (id) {
-            return await this.getBuilder(objectName, options).where('id', id).first();
+            const res = await this.getBuilder(objectName, options).where('id', id).first();
+            return this.formatOutput(objectName, res);
         }
         if (query) {
             const results = await this.find(objectName, { ...query, limit: 1 }, options);
@@ -103,18 +122,29 @@ class KnexDriver {
         return null;
     }
     async create(objectName, data, options) {
+        // Handle _id -> id mapping for compatibility
+        const { _id, ...rest } = data;
+        const toInsert = { ...rest };
+        // If _id exists and id doesn't, map _id to id
+        if (_id !== undefined && toInsert.id === undefined) {
+            toInsert.id = _id;
+        }
+        else if (toInsert.id !== undefined) {
+            // normal case
+        }
         // Knex insert returns Result array (e.g. ids)
         // We want the created document. 
-        // Some DBs support .returning('*'), others don't easily.
-        // Assuming Postgres/SQLite/Modern MySQL for now support returning.
         const builder = this.getBuilder(objectName, options);
-        const result = await builder.insert(data).returning('*'); // This might fail on old MySQL
-        return result[0];
+        const formatted = this.formatInput(objectName, toInsert);
+        // We should insert 'toInsert' instead of 'data'
+        const result = await builder.insert(formatted).returning('*');
+        return this.formatOutput(objectName, result[0]);
     }
     async update(objectName, id, data, options) {
         const builder = this.getBuilder(objectName, options);
-        await builder.where('id', id).update(data);
-        return { id, ...data }; // Return patched data? Or fetch fresh?
+        const formatted = this.formatInput(objectName, data);
+        await builder.where('id', id).update(formatted);
+        return { id, ...data };
     }
     async delete(objectName, id, options) {
         const builder = this.getBuilder(objectName, options);
@@ -160,6 +190,217 @@ class KnexDriver {
             this.applyFilters(builder, filters);
         return await builder.delete();
     }
+    async init(objects) {
+        await this.ensureDatabaseExists();
+        for (const obj of objects) {
+            const tableName = obj.name;
+            // Cache JSON fields
+            const jsonCols = [];
+            if (obj.fields) {
+                for (const [name, field] of Object.entries(obj.fields)) {
+                    const type = field.type || 'string';
+                    if (this.isJsonField(type, field)) {
+                        jsonCols.push(name);
+                    }
+                }
+            }
+            this.jsonFields[tableName] = jsonCols;
+            let exists = await this.knex.schema.hasTable(tableName);
+            if (exists) {
+                const columnInfo = await this.knex(tableName).columnInfo();
+                const existingColumns = Object.keys(columnInfo);
+                // Check for _id vs id conflict (Legacy _id from mongo-style init)
+                if (existingColumns.includes('_id') && !existingColumns.includes('id')) {
+                    console.log(`[KnexDriver] Detected legacy '_id' in '${tableName}'. Recreating table for 'id' compatibility...`);
+                    await this.knex.schema.dropTable(tableName);
+                    exists = false;
+                }
+            }
+            if (!exists) {
+                await this.knex.schema.createTable(tableName, (table) => {
+                    // Use standard 'id' for SQL databases
+                    table.string('id').primary();
+                    table.timestamp('created_at').defaultTo(this.knex.fn.now());
+                    table.timestamp('updated_at').defaultTo(this.knex.fn.now());
+                    if (obj.fields) {
+                        for (const [name, field] of Object.entries(obj.fields)) {
+                            this.createColumn(table, name, field);
+                        }
+                    }
+                });
+                console.log(`[KnexDriver] Created table '${tableName}'`);
+            }
+            else {
+                const columnInfo = await this.knex(tableName).columnInfo();
+                const existingColumns = Object.keys(columnInfo);
+                await this.knex.schema.alterTable(tableName, (table) => {
+                    if (obj.fields) {
+                        for (const [name, field] of Object.entries(obj.fields)) {
+                            if (!existingColumns.includes(name)) {
+                                this.createColumn(table, name, field);
+                                console.log(`[KnexDriver] Added column '${name}' to '${tableName}'`);
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    }
+    createColumn(table, name, field) {
+        if (field.multiple) {
+            table.json(name);
+            return;
+        }
+        const type = field.type || 'string';
+        let col;
+        switch (type) {
+            case 'string':
+            case 'email':
+            case 'url':
+            case 'phone':
+            case 'password':
+                col = table.string(name);
+                break;
+            case 'text':
+            case 'textarea':
+            case 'html':
+            case 'markdown':
+                col = table.text(name);
+                break;
+            case 'integer':
+            case 'int':
+                col = table.integer(name);
+                break;
+            case 'float':
+            case 'number':
+            case 'currency':
+            case 'percent':
+                col = table.float(name);
+                break;
+            case 'boolean':
+                col = table.boolean(name);
+                break;
+            case 'date':
+                col = table.date(name);
+                break;
+            case 'datetime':
+                col = table.timestamp(name);
+                break;
+            case 'time':
+                col = table.time(name);
+                break;
+            case 'json':
+            case 'object':
+            case 'array':
+            case 'image':
+            case 'file':
+            case 'avatar':
+            case 'location':
+                col = table.json(name);
+                break;
+            case 'summary':
+                col = table.float(name);
+                break; // Stored calculation result
+            case 'auto_number':
+                col = table.string(name);
+                break; // Generated string
+            case 'formula': return; // Virtual field, do not create column
+            default: col = table.string(name);
+        }
+        if (field.unique) {
+            col.unique();
+        }
+        if (field.required) {
+            col.notNullable();
+        }
+    }
+    async ensureDatabaseExists() {
+        if (this.config.client !== 'pg' && this.config.client !== 'postgresql')
+            return;
+        try {
+            await this.knex.raw('SELECT 1');
+        }
+        catch (e) {
+            if (e.code === '3D000') { // Database does not exist
+                await this.createDatabase();
+            }
+            else {
+                throw e;
+            }
+        }
+    }
+    async createDatabase() {
+        const config = this.config;
+        const connection = config.connection;
+        let dbName = '';
+        let adminConfig = { ...config };
+        if (typeof connection === 'string') {
+            const url = new URL(connection);
+            dbName = url.pathname.slice(1);
+            url.pathname = '/postgres';
+            adminConfig.connection = url.toString();
+        }
+        else {
+            dbName = connection.database;
+            adminConfig.connection = { ...connection, database: 'postgres' };
+        }
+        console.log(`[KnexDriver] Database '${dbName}' does not exist. Creating...`);
+        const adminKnex = (0, knex_1.default)(adminConfig);
+        try {
+            await adminKnex.raw(`CREATE DATABASE "${dbName}"`);
+            console.log(`[KnexDriver] Database '${dbName}' created successfully.`);
+        }
+        catch (e) {
+            console.error(`[KnexDriver] Failed to create database '${dbName}':`, e.message);
+            if (e.code === '42501') {
+                console.error(`[KnexDriver] Hint: The user '${adminConfig.connection.user || 'current user'}' does not have CREATEDB privileges.`);
+                console.error(`[KnexDriver] Please run: createdb ${dbName}`);
+            }
+            throw e;
+        }
+        finally {
+            await adminKnex.destroy();
+        }
+    }
+    isJsonField(type, field) {
+        return ['json', 'object', 'array', 'image', 'file', 'avatar', 'location'].includes(type) || field.multiple;
+    }
+    formatInput(objectName, data) {
+        // Only needed for SQLite usually, PG handles JSON
+        const isSqlite = this.config.client === 'sqlite3';
+        if (!isSqlite)
+            return data;
+        const fields = this.jsonFields[objectName];
+        if (!fields || fields.length === 0)
+            return data;
+        const copy = { ...data };
+        for (const field of fields) {
+            if (copy[field] !== undefined && typeof copy[field] === 'object' && copy[field] !== null) {
+                copy[field] = JSON.stringify(copy[field]);
+            }
+        }
+        return copy;
+    }
+    formatOutput(objectName, data) {
+        const isSqlite = this.config.client === 'sqlite3';
+        if (!isSqlite)
+            return data;
+        const fields = this.jsonFields[objectName];
+        if (!fields || fields.length === 0)
+            return data;
+        // data is a single row object
+        for (const field of fields) {
+            if (data[field] !== undefined && typeof data[field] === 'string') {
+                try {
+                    data[field] = JSON.parse(data[field]);
+                }
+                catch (e) {
+                    // ignore parse error, keep as string
+                }
+            }
+        }
+        return data;
+    }
 }
 exports.KnexDriver = KnexDriver;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@objectql/driver-knex",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "test": "jest"
-  },
   "dependencies": {
-    "@objectql/core": "^1.1.0",
-    "knex": "^3.1.0"
+    "knex": "^3.1.0",
+    "@objectql/types": "1.2.0"
   },
   "devDependencies": {
     "sqlite3": "^5.1.7"
+  },
+  "scripts": {
+    "build": "tsc",
+    "test": "jest"
   }
-}
+}