@apisr/drizzle-model 0.0.1 → 0.0.2

package/tests/builder-v2.type-test.ts

@@ -1,40 +1,40 @@
-import * as schema from "./schema";
-import { db } from "./db";
-import { relations } from "./relations";
+import { eq, gte, sql } from "drizzle-orm";
 import { modelBuilder } from "src/model";
-import { gte, sql, eq, or } from "drizzle-orm";
 import { esc } from "@/model/query/operations";
+import { db } from "./db";
+import { relations } from "./relations";
+import * as schema from "./schema";
 
 const model = modelBuilder({
-  schema,
-  db,
-  relations,
-  dialect: "PostgreSQL"
+	schema,
+	db,
+	relations,
+	dialect: "PostgreSQL",
 });
 
 const userModel = model("user", {
-  methods: {
-    whereName(name: string) {
-      return userModel.where({
-        name: esc(eq, name)
-      });
-    },
-    findByName(name: string) {
-      return userModel
-        .where({
-          name: esc(name)
-        })
-        .findFirst()
-        .select({
-          id: true,
-          name: true
-        });
-    }
-  },
-  format: ({ secretField, ...rest }) => ({
-    ...rest,
-    customField: "123"
-  })
+	methods: {
+		whereName(name: string) {
+			return userModel.where({
+				name: esc(eq, name),
+			});
+		},
+		findByName(name: string) {
+			return userModel
+				.where({
+					name: esc(name),
+				})
+				.findFirst()
+				.select({
+					id: true,
+					name: true,
+				});
+		},
+	},
+	format: ({ secretField, ...rest }) => ({
+		...rest,
+		customField: "123",
+	}),
 });
 const userIdeasModel = model("userIdeas", {});
 
@@ -44,50 +44,47 @@ const userIdeasModel = model("userIdeas", {});
 // userModel.
 
 const testRaw = await userModel
-  .where({
-    id: {
-      or: [
-        esc(1),
-        esc(2),
-      ]
-    }
-  })
-  .findFirst()
-  .with({
-    posts: {
-      comments: true,
-    },
-  })
-  .select({
-    age: true,
-    posts: {
-      title: true,
-      comments: {
-        content: true,
-      },
-    },
-  });
+	.where({
+		id: {
+			or: [esc(1), esc(2)],
+		},
+	})
+	.findFirst()
+	.with({
+		posts: {
+			comments: true,
+		},
+	})
+	.select({
+		age: true,
+		posts: {
+			title: true,
+			comments: {
+				content: true,
+			},
+		},
+	});
 
 // testRaw.posts[0]?.comments[0]?.content;
 const testRaw1 = await userModel
-  .where({
-    age: esc(12)
-  })
-  .findFirst()
-  .with({
-    posts: {
-      comments: true,
-    },
-  })
-  .exclude({
-    age: true,
-    posts: {
-      id: true,
-      comments: {
-        content: true,
-      },
-    },
-  });
+	.where({
+		age: esc(12),
+	})
+	.findFirst()
+	.with({
+		posts: {
+			comments: true,
+		},
+	})
+	.exclude({
+		age: true,
+		posts: {
+			id: true,
+			comments: {
+				content: true,
+			},
+		},
+	});
 
 // testRaw1.posts[0]?.comments[0].;
 
@@ -95,117 +92,119 @@ const postsModel = model("userPosts", {});
 const commentsModel = model("postComments", {});
 
 const testRaw2 = await userModel
-  .where({
-    age: esc(12)
-  })
-  .findFirst()
-  .with({
-    // Fix is relations in here are from userModel not from posts
-    posts: postsModel.where({
-      id: esc(12)
-    }).include({
-      comments: true,
-    }),
-  });
+	.where({
+		age: esc(12),
+	})
+	.findFirst()
+	.with({
+		// Fix is relations in here are from userModel not from posts
+		posts: postsModel
+			.where({
+				id: esc(12),
+			})
+			.include({
+				comments: true,
+			}),
+	});
 
 // testRaw2.posts[0]?.comments;
 
 const testRaw3 = await userModel
-  .where({
-    id: {
-      or: [
-        {
-          equal: 1,
-        },
-        esc(12),
-      ],
-    }
-  })
-  .findFirst()
-  .with({
-    // Fix is relations in here are from userModel not from posts
-    posts: postsModel
-      .where({
-        id: esc(12)
-      })
-      .include({
-        comments: commentsModel.where({ id: esc(12) }).include({
-          author: true
-        }),
-      }),
-  });
+	.where({
+		id: {
+			or: [
+				{
+					equal: 1,
+				},
+				esc(12),
+			],
+		},
+	})
+	.findFirst()
+	.with({
+		// Fix is relations in here are from userModel not from posts
+		posts: postsModel
+			.where({
+				id: esc(12),
+			})
+			.include({
+				comments: commentsModel.where({ id: esc(12) }).include({
+					author: true,
+				}),
+			}),
+	});
 
 // testRaw3.posts[0]?.comments[0]?.author;
 
 const testRaw4 = await userModel
-  .where({
-    age: {
-      or: [
-        {
-          equal: 1,
-        },
-        esc(2),
-      ],
-    }
-  })
-  .findMany()
-  .with({
-    // Fix is relations in here are from userModel not from posts
-    posts: postsModel
-      .where({
-        id: esc(12)
-      })
-      .include({
-        comments: true,
-      }),
-  })
-  .select({
-    posts: {
-      description: true,
-      comments: true,
-    },
-  });
+	.where({
+		age: {
+			or: [
+				{
+					equal: 1,
+				},
+				esc(2),
+			],
+		},
+	})
+	.findMany()
+	.with({
+		// Fix is relations in here are from userModel not from posts
+		posts: postsModel
+			.where({
+				id: esc(12),
+			})
+			.include({
+				comments: true,
+			}),
+	})
+	.select({
+		posts: {
+			description: true,
+			comments: true,
+		},
+	});
 
 // testRaw4[0]?.posts[0].
 
 const testRaw5 = await userModel
-  .where({
-    age: {
-      or: [
-        {
-          equal: 1,
-        },
-        esc(12),
-      ]
-    },
-  })
-  .findMany()
-  .with({
-    // Fix is relations in here are from userModel not from posts
-    posts: postsModel
-      .where({
-        id: esc(12)
-      })
-      .include({
-        comments: true,
-      }),
-  })
-  .exclude({
-    posts: {
-      description: true,
-      comments: true,
-    },
-  });
+	.where({
+		age: {
+			or: [
+				{
+					equal: 1,
+				},
+				esc(12),
+			],
+		},
+	})
+	.findMany()
+	.with({
+		// Fix is relations in here are from userModel not from posts
+		posts: postsModel
+			.where({
+				id: esc(12),
+			})
+			.include({
+				comments: true,
+			}),
+	})
+	.exclude({
+		posts: {
+			description: true,
+			comments: true,
+		},
+	});
 
 // testRaw5[0]?.posts[0].
 
 const testRaw6 = await userModel
-  .insert({
-    email: "email@email",
-    name: "Nameie",
-    age: 123,
-  })
-  .return();
+	.insert({
+		email: "email@email",
+		name: "Nameie",
+		age: 123,
+	})
+	.return();
 
 // testRaw6.
 
@@ -214,75 +213,67 @@ const testRaw6 = await userModel
 // testRaw6.
 
 const testRaw7 = await userModel
-  .where({ id: esc(12) })
-  .update({
-    age: 12
-  })
-  .return();
+	.where({ id: esc(12) })
+	.update({
+		age: 12,
+	})
+	.return();
 
 // testRaw7?.[0]?.;
 
 const testRaw8 = await userModel
-  .where({ id: esc(12) })
-  .delete()
-  .return();
+	.where({ id: esc(12) })
+	.delete()
+	.return();
 
 // testRaw8[0].
 
 // postsModel.
 
 const testRaw9 = await postsModel
-  .where({
-    user: {
-      id: esc(12)
-    },
-  })
-  .update({
-    description: ""
-  })
-  .return();
+	.where({
+		user: {
+			id: esc(12),
+		},
+	})
+	.update({
+		description: "",
+	})
+	.return();
 
 const testRaw10 = await postsModel
-  .where(
-    userModel.where({ id: esc(12) })
-  )
-  .update({
-    description: ""
-  })
-  .return();
+	.where(userModel.where({ id: esc(12) }))
+	.update({
+		description: "",
+	})
+	.return();
 
 const testRaw11 = await postsModel
-  .where(
-    sql``
-  )
-  .update({
-    description: ""
-  })
-  .return();
+	.where(sql``)
+	.update({
+		description: "",
+	})
+	.return();
 
 // testRaw11[0].
 
 const testRaw12 = await postsModel
-  .where(
-    gte(schema.postComments.id, 123)
-  )
-  .update({
-    description: ""
-  })
-  .return();
-
-db.transaction(async tx => {
-  const result = await postsModel
-    .db(tx)
-    .where(
-      gte(schema.postComments.id, 123)
-    )
-    .update({
-      description: ""
-    })
-    .return({
-      id: true
-    });
+	.where(gte(schema.postComments.id, 123))
+	.update({
+		description: "",
+	})
+	.return();
+
+db.transaction(async (tx) => {
+	const result = await postsModel
+		.db(tx)
+		.where(gte(schema.postComments.id, 123))
+		.update({
+			description: "",
+		})
+		.return({
+			id: true,
+		});
 });
 
 const testRaw13 = await userModel.whereName("Alex").findFirst();
@@ -295,46 +286,48 @@ const testRaw14 = await userModel.findByName("Alex");
 // userModel.w
 
 const testRaw15 = await userModel
-  .where({
-    name: esc("Alex"),
-  })
-  .findFirst()
-  .raw();
+	.where({
+		name: esc("Alex"),
+	})
+	.findFirst()
+	.raw();
 
 const userModel2 = userModel.extend({
-  methods: {
-    whereName(name: string) {
-      return userModel2.where({
-        name: esc(name)
-      });
-    }
-  },
-  format: (output) => {
-    return {
-      ...output,
-      isJoke: true
-    };
-  }
+	methods: {
+		whereName(name: string) {
+			return userModel2.where({
+				name: esc(name),
+			});
+		},
+	},
+	format: (output) => {
+		return {
+			...output,
+			isJoke: true,
+		};
+	},
 });
 
-const testRaw16 = await userModel2.upsert({
-  insert: {
-    email: "123",
-    name: "123",
-    age: 123,
-  },
-  update: (c) => ({
-    name: c.inserted("name")
-  }),
-  updateWhere: (c) => ({
-    name: {
-      not: c.excluded("name")
-    }
-  }),
-  target: ["id"]
-}).return({
-  age: true
-});
+const testRaw16 = await userModel2
+	.upsert({
+		insert: {
+			email: "123",
+			name: "123",
+			age: 123,
+		},
+		update: (c) => ({
+			name: c.inserted("name"),
+		}),
+		updateWhere: (c) => ({
+			name: {
+				not: c.excluded("name"),
+			},
+		}),
+		target: ["id"],
+	})
+	.return({
+		age: true,
+	});
 
 // testRaw16.
 

package/tests/builder.test.ts

@@ -1,7 +1,7 @@
 import { modelBuilder } from "../src";
-import * as schema from "./schema";
 import { db } from "./db";
 import { relations } from "./relations";
+import * as schema from "./schema";
 
 const model = modelBuilder({
 	schema,

package/tests/db.ts

@@ -1,15 +1,15 @@
 import { drizzle } from "drizzle-orm/node-postgres";
+import { relations } from "./relations";
 // import { drizzle as drizzleMysql } from "drizzle-orm/mysql2";
 import * as schema from "./schema";
-import { relations } from "./relations";
 
 // export const mysqlDb = drizzleMysql("nothing");
 
 // mysqlDb.insert().values().$returningId;
 
 export const db = drizzle(process.env.DATABASE_URL!, {
-  schema,
-  relations,
+	schema,
+	relations,
 });
 
 // db.transaction