Add search type

Author: owjs3901

Cargo.lock

@@ -1,11 +1,7 @@
 import 'reflect-metadata'
 
-import { Column, Func, Model } from '@devup-api/model'
-import {
-  createRevision,
-  createSqliteConnection,
-  migrate,
-} from '@devup-sql/sqlite'
+import { Column, DevupModel, Func, Model } from '@devup-api/model'
+import { createSqliteConnection } from '@devup-sql/sqlite'
 describe('sqlite', async () => {
   const pool = await createSqliteConnection({
     url: 'sqlite::memory:',
@@ -41,7 +37,7 @@ describe('sqlite', async () => {
   })
   describe('model', () => {
     @Model()
-    class User {
+    class User extends DevupModel {
       @Column({
         name: 'id',
         primaryKey: true,
@@ -67,20 +63,34 @@ describe('sqlite', async () => {
       createdAt: Date
     }
     it('test', async () => {
-      const revisions = await loadRevisions()
-      // create next revision from revision
-      const nextRevisions = await createRevision(revisions)
-      const currentRevision = await currentRevision(pool)
-      // apply sql script
-      const sql = getSqlFromRevision(revisions[0])
-      await migrate(pool, nextRevisions)
+      // get current revision
+      const currentRevision = await pool.getCurrentRevision()
+      // create revision
+      const nextRevision = await pool.createRevision()
+      // migrate to next revision
+      await pool.migrate(nextRevision)
 
-      const user = new User()
-      user.username = 'devup'
-      await user.save()
+      // const user = new User()
+      // user.username = 'devup'
+      // await user.save()
 
-      const user = await User.findById(1)
-      expect(user?.username).toEqual('devup')
+      // const user = await User.findById(1)
+      // expect(user?.username).toEqual('devup')
+
+      const user = await User.findOne({
+        filter: {},
+      })
+
+      const users = await User.findAll({
+        filter: {
+          username: 'devup',
+        },
+        limit: 10,
+        offset: 0,
+        order: {
+          id: 'ASC',
+        },
+      })
 
       expect(0).toEqual(0)
     })

__tests__/sql/index.test.ts

@@ -68,9 +68,12 @@ pub struct DevupModelColumn {
     pub default: Option<DevupModelColumnDefault>,
     pub nullable: bool,
     pub primary_key: bool,
-    pub foreign_key: Option<String>,
-    pub unique: Option<DevupModelColumnUnique>,
-    pub index: Option<DevupModelColumnIndex>,
+    // multiple foreign key
+    pub foreign_key: Option<Vec<String>>,
+    // multiple unique
+    pub unique: Option<Vec<DevupModelColumnUnique>>,
+    // multiple index
+    pub index: Option<Vec<DevupModelColumnIndex>>,
     pub auto_increment: bool,
     pub comment: Option<String>,
     pub dto: Option<DevupModelColumnDtoOption>,

core/model/src/column.rs

@@ -18,23 +18,25 @@ pub fn find_foreign_key_target(
     for field in &model.fields {
         if let DevupModelFieldType::Column(column) = field {
             if let Some(foreign_key) = &column.foreign_key {
-                if let Some(relation) = &rel.field {
-                    if column.name != relation.clone() {
-                        continue;
+                for foreign_key in foreign_key {
+                    if let Some(relation) = &rel.field {
+                        if column.name != relation.clone() {
+                            continue;
+                        }
+                        return Ok(FindForeignKeyTargetResult {
+                            field: column.name.clone(),
+                            foreign_key: foreign_key.clone(),
+                        });
                     }
-                    return Ok(FindForeignKeyTargetResult {
-                        field: column.name.clone(),
-                        foreign_key: foreign_key.clone(),
-                    });
-                }
-                if column.name.starts_with(rel.name.as_str()) {
-                    if ret.is_some() {
-                        return Err("Multiple foreign keys found".into());
+                    if column.name.starts_with(rel.name.as_str()) {
+                        if ret.is_some() {
+                            return Err("Multiple foreign keys found".into());
+                        }
+                        ret = Some(FindForeignKeyTargetResult {
+                            field: column.name.clone(),
+                            foreign_key: foreign_key.clone(),
+                        });
                     }
-                    ret = Some(FindForeignKeyTargetResult {
-                        field: column.name.clone(),
-                        foreign_key: foreign_key.clone(),
-                    });
                 }
             }
         }

core/model/src/utils.rs

@@ -1,17 +1,22 @@
 [package]
 edition = "2024"
-name = "devup-api-node-model"
+name = "devup_api_node_model"
 version = "0.0.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.12.2", default-features = false, features = ["napi5", "serde-json"] }
+napi = { version = "2.12.2", default-features = false, features = [
+    "napi5",
+    "serde-json",
+] }
 napi-derive = "2.12.2"
 serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
 model = { path = "../../../core/model" }
 schema = { path = "../../../core/schema" }
+devup_node_struct = { path = "../struct" }
 [build-dependencies]
 napi-build = "2.0.1"

libs/node/model/Cargo.toml

@@ -34,6 +34,31 @@ export interface JsDevupModelColumn {
 export declare function Column(options?: JsDevupModelColumn | undefined | null): (...args: any[]) => any
 /** Model decorator */
 export declare function Model(name?: string | undefined | null): (...args: any[]) => any
+export interface JsDevupModelColumn {
+  name: string
+  type: JsDevupModelColumnType
+  default: Func | string | boolean | number | null | (() => string | number | boolean | null)
+  nullable: boolean
+  primaryKey: boolean
+  autoIncrement: boolean
+  foreignKey?: unknown
+  unique?: string | boolean | string[]
+  index?: string | boolean | string[]
+  comment?: string
+}
+export interface JsDevupModelColumnOptions {
+  name?: string
+  type?: JsDevupModelColumnType
+  default?: Func | string | boolean | number | null | (() => string | number | boolean | null)
+  nullable?: boolean
+  primaryKey?: boolean
+  autoIncrement?: boolean
+  foreignKey?: string | string[]
+  unique?: string | boolean | string[]
+  index?: string | boolean | string[]
+  comment?: string
+}
+export declare function Column(options?: JsDevupModelColumnOptions | undefined | null): (...args: any[]) => any
 export type JsFunc = Func
 export declare class Func {
   value: string

libs/node/model/index.d.ts

@@ -310,9 +310,10 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { JsDevupModelColumnType, Column, Func, Model } = nativeBinding
+const { JsDevupModelColumnType, Column, Func, Model, Column } = nativeBinding
 
 module.exports.JsDevupModelColumnType = JsDevupModelColumnType
 module.exports.Column = Column
 module.exports.Func = Func
 module.exports.Model = Model
+module.exports.Column = Column

libs/node/model/index.js

@@ -0,0 +1,50 @@
+export * from './index'
+export class DevupModel {
+  save(): Promise<void> {
+    throw new Error('Method not implemented.')
+  }
+
+  static findById<T, I extends InstanceType<T>>(
+    this: T,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    id: number,
+  ): Promise<I> {
+    throw new Error('Method not implemented.')
+  }
+
+  static findAll<T, I extends InstanceType<T>>(
+    this: T,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    options: DeepPartial<FindOptions<I>>,
+  ): Promise<I[]> {
+    throw new Error('Method not implemented.')
+  }
+
+  static findOne<T, I extends InstanceType<T>>(
+    this: T,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    options: DeepPartial<FilterOptions<I>>,
+  ): Promise<I> {
+    throw new Error('Method not implemented.')
+  }
+}
+
+type FilterOptions<T> = {
+  filter: { [key in ExtractFieldKeys<T>]: T[key] }
+}
+
+type FindOptions<T> = FilterOptions<T> & {
+  limit: number
+  offset: number
+  order: { [key in ExtractFieldKeys<T>]: 'ASC' | 'DESC' }
+}
+
+type InstanceType<T> = T extends new (...args: any[]) => infer R ? R : never
+type DeepPartial<T> = {
+  [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P]
+}
+
+// if T[P] is function, exclude it
+type ExtractFieldKeys<T> = keyof {
+  [P in keyof T as T[P] extends (...args: any[]) => any ? never : P]: never
+}

libs/node/model/main.d.ts

@@ -2,7 +2,7 @@
   "name": "@devup-api/model",
   "version": "0.0.0",
   "main": "index.js",
-  "types": "index.d.ts",
+  "types": "main.d.ts",
   "napi": {
     "name": "model",
     "triples": {}