create-m5kdev 0.13.0 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-m5kdev",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",

package/templates/minimal-app/apps/server/src/modules/posts/posts.repository.ts.tpl

@@ -6,7 +6,7 @@ import type {
 import { BaseTableRepository } from "@m5kdev/backend/modules/base/base.repository";
 import type { ServerResultAsync } from "@m5kdev/backend/utils/types";
 import { and, asc, count, desc, eq, isNull, like, ne, or } from "drizzle-orm";
-import { ok } from "neverthrow";
+import { err, ok } from "neverthrow";
 import type { Orm, Schema } from "../../db";
 
 export class PostsRepository extends BaseTableRepository<
@@ -16,73 +16,82 @@ export class PostsRepository extends BaseTableRepository<
   Schema["posts"]
 > {
   async list(input: PostsListInputSchema = {}): ServerResultAsync<PostsListOutputSchema> {
-    return this.throwableAsync(async () => {
-      const page = input.page ?? 1;
-      const limit = input.limit ?? 6;
-      const search = input.search?.trim();
-      const conditions = [isNull(this.table.deletedAt)];
+    const page = input.page ?? 1;
+    const limit = input.limit ?? 6;
+    const search = input.search?.trim();
+    const conditions = [isNull(this.table.deletedAt)];
 
-      if (input.status) {
-        conditions.push(eq(this.table.status, input.status));
-      }
-
-      if (search) {
-        const pattern = `%${search}%`;
-        const searchCondition = or(
-          like(this.table.title, pattern),
-          like(this.table.slug, pattern),
-          like(this.table.excerpt, pattern),
-          like(this.table.content, pattern)
-        );
+    if (input.status) {
+      conditions.push(eq(this.table.status, input.status));
+    }
 
-        if (searchCondition) {
-          conditions.push(searchCondition);
-        }
+    if (search) {
+      const escapedSearch = search.replace(/[%_]/g, '\\    if (search) {
+      const pattern = `%${search}%`;
+      const searchCondition = or(
+        like(this.table.title, pattern),
+        like(this.table.slug, pattern),
+        like(this.table.excerpt, pattern),
+        like(this.table.content, pattern)
+      );
+');
+      const pattern = `%${escapedSearch}%`;
+      const searchCondition = or(
+        like(this.table.title, pattern),
+        like(this.table.slug, pattern),
+        like(this.table.excerpt, pattern),
+        like(this.table.content, pattern)
+      );
+      if (searchCondition) {
+        conditions.push(searchCondition);
       }
+    }
 
-      const whereClause = and(...conditions);
-      const ordering =
-        input.sort === "title"
+    const whereClause = and(...conditions);
+    const ordering =
+      input.sort === "title"
+        ? input.order === "asc"
+          ? asc(this.table.title)
+          : desc(this.table.title)
+        : input.sort === "publishedAt"
           ? input.order === "asc"
-            ? asc(this.table.title)
-            : desc(this.table.title)
-          : input.sort === "publishedAt"
-            ? input.order === "asc"
-              ? asc(this.table.publishedAt)
-              : desc(this.table.publishedAt)
-            : input.order === "asc"
-              ? asc(this.table.updatedAt)
-              : desc(this.table.updatedAt);
+            ? asc(this.table.publishedAt)
+            : desc(this.table.publishedAt)
+          : input.order === "asc"
+            ? asc(this.table.updatedAt)
+            : desc(this.table.updatedAt);
+
+    const rowsQuery = this.orm
+      .select()
+      .from(this.table)
+      .where(whereClause)
+      .orderBy(ordering, desc(this.table.createdAt))
+      .limit(limit)
+      .offset((page - 1) * limit);
 
-      const rows = await this.orm
-        .select()
-        .from(this.table)
-        .where(whereClause)
-        .orderBy(ordering, desc(this.table.createdAt))
-        .limit(limit)
-        .offset((page - 1) * limit);
+    const countQuery = this.orm.select({ count: count() }).from(this.table).where(whereClause);
 
-      const [totalRow] = await this.orm
-        .select({ count: count() })
-        .from(this.table)
-        .where(whereClause);
+    const result = await this.throwableQuery(() => Promise.all([rowsQuery, countQuery]));
+    if (result.isErr()) return err(result.error);
+    const [rows, [totalRow]] = result.value;
 
-      return ok({
-        rows: rows as PostSchema[],
-        total: totalRow?.count ?? 0,
-      });
+    return ok({
+      rows: rows as PostSchema[],
+      total: totalRow?.count ?? 0,
     });
   }
 
   async findBySlug(slug: string, excludeId?: string) {
-    return this.throwableAsync(async () => {
-      const whereClause = excludeId
-        ? and(eq(this.table.slug, slug), ne(this.table.id, excludeId), isNull(this.table.deletedAt))
-        : and(eq(this.table.slug, slug), isNull(this.table.deletedAt));
+    const whereClause = excludeId
+      ? and(eq(this.table.slug, slug), ne(this.table.id, excludeId), isNull(this.table.deletedAt))
+      : and(eq(this.table.slug, slug), isNull(this.table.deletedAt));
 
-      const [row] = await this.orm.select().from(this.table).where(whereClause).limit(1);
-      return ok(row);
-    });
+    const result = await this.throwableQuery(() =>
+      this.orm.select().from(this.table).where(whereClause).limit(1)
+    );
+    if (result.isErr()) return err(result.error);
+    const [row] = result.value;
+    return ok(row);
   }
 
   async resolveUniqueSlug(candidate: string, excludeId?: string) {