@goplusvn/core 0.1.60 → 0.1.61

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goplusvn/core",
   "description": "GoPlusVN Platform Kit - ERP kernel: layout, RBAC, CRUD, multi-tenant, system pages",
-  "version": "0.1.60",
+  "version": "0.1.61",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

package/src/crud/lib/mutation-builder.ts

@@ -0,0 +1,105 @@
+import type { EntityConfig } from "../../types";
+import type { ServerCrudLogger } from "../server-service";
+
+export interface PrepareMutationDataOptions {
+  data: any;
+  config?: EntityConfig;
+  mode: "create" | "update";
+  systemFields: string[];
+  relationFieldSkip?: string[];
+  logger: ServerCrudLogger;
+  touchUpdatedAtOnCreate?: boolean;
+}
+
+export function prepareMutationData(options: PrepareMutationDataOptions) {
+  const { data, config, mode, systemFields, relationFieldSkip, logger, touchUpdatedAtOnCreate } = options;
+
+  let filtered = data;
+  
+  if (config) {
+    // 1. Filter valid fields
+    const valid = new Set(config.fields.filter((f) => !(f as any).isDisplayOnly).map((f) => f.name));
+    for (const f of systemFields) valid.add(f);
+    filtered = {};
+    for (const [k, v] of Object.entries(data)) {
+      if (valid.has(k)) {
+        filtered[k] = v;
+      } else {
+        logger.warn(`Filtering out invalid field "${k}" for entity "${config.name}"`);
+      }
+    }
+
+    // 2. Cast field values (boolean, number)
+    for (const field of config.fields) {
+      const value = filtered[field.name];
+      if (value === undefined || value === null) continue;
+      
+      if (field.type === "boolean" || field.type === "switch") {
+        let isTrue: boolean;
+        if (typeof value === "string") {
+          const lv = value.toLowerCase();
+          isTrue = lv === "true" || lv === "active" || value === "1" || value === "on";
+        } else {
+          isTrue = Boolean(value);
+        }
+        
+        if (field.type === "switch" && field.options && field.options.length >= 2) {
+          filtered[field.name] = isTrue ? (field.options[0] as any).value : (field.options[1] as any).value;
+        } else {
+          filtered[field.name] = isTrue;
+        }
+      } else if (field.type === "number" || (field.type as string) === "integer") {
+        if (typeof value === "string") {
+          if (value.trim() === "") {
+            filtered[field.name] = null;
+          } else {
+            const num = Number(value);
+            if (!isNaN(num)) filtered[field.name] = num;
+          }
+        }
+      }
+    }
+  }
+
+  // 3. System defaults for create
+  if (mode === "create") {
+    if (!filtered.id) {
+      filtered.id = crypto.randomUUID();
+    }
+    if (touchUpdatedAtOnCreate && !filtered.updatedAt) {
+      filtered.updatedAt = new Date();
+    }
+  }
+
+  // 4. Transform relation fields (*Id -> connect/disconnect)
+  const skip = new Set([
+    "id",
+    "createdBy",
+    "updatedBy",
+    "citizenId",
+    "targetId",
+    ...(relationFieldSkip ?? []),
+  ]);
+  
+  const prismaData = { ...filtered };
+  for (const key of Object.keys(prismaData)) {
+    if (skip.has(key)) continue;
+    
+    if (key.endsWith("Id") && key.length > 2) {
+      const rel = key.slice(0, -2);
+      const value = prismaData[key];
+      
+      if (value && typeof value === "string" && value.trim() !== "") {
+        prismaData[rel] = { connect: { id: value } };
+        delete prismaData[key];
+      } else if (value === null || value === undefined || value === "") {
+        if (mode === "update") {
+          prismaData[rel] = { disconnect: true };
+        }
+        delete prismaData[key];
+      }
+    }
+  }
+
+  return prismaData;
+}

package/src/crud/lib/query-builder.ts

@@ -0,0 +1,119 @@
+import { compileFilterTree } from "./filter-tree";
+import type { CrudQueryParams, EntityConfig } from "../../types";
+
+export interface BuildListQueryOptions {
+  entity: string;
+  config: EntityConfig;
+  params: CrudQueryParams;
+  scopeWhere?: Record<string, unknown>;
+  onDisallowedFilter?: (field: string) => void;
+}
+
+export function buildListQuery({
+  entity,
+  config,
+  params,
+  scopeWhere,
+  onDisallowedFilter,
+}: BuildListQueryOptions) {
+  const { page = 1, pageSize = 10, search, sort, filters, filterTree } = params;
+  const MAX_PAGE_SIZE = 200;
+  
+  const safePage = Math.max(1, Number(page) || 1);
+  const safePageSize = Math.min(Math.max(1, Number(pageSize) || 10), MAX_PAGE_SIZE);
+  const skip = (safePage - 1) * safePageSize;
+  const take = safePageSize;
+
+  const allowedFields = new Set<string>([
+    ...config.fields.map((f) => f.name),
+    "id", "createdAt", "updatedAt", "createdBy", "updatedBy", config.idField || "id",
+  ]);
+  const allowedRelations = new Set<string>(config.include || []);
+  const isAllowed = (name: string) => {
+    if (!name) return false;
+    if (name.includes(".")) return allowedRelations.has(name.split(".")[0]);
+    return allowedFields.has(name);
+  };
+
+  const where: any = { ...(scopeWhere ?? {}) };
+  if (search && search.trim()) {
+    const term = search.trim();
+    const searchFields = config.fields.filter((f) => f.filterable && f.type === "text").map((f) => f.name);
+    if (searchFields.length) where.OR = searchFields.map((f) => ({ [f]: { contains: term, mode: "insensitive" } }));
+  }
+
+  if (filters && filters.length) {
+    for (const filter of filters) {
+      const { name, value, operator } = filter as any;
+      if (value === undefined || value === null || (Array.isArray(value) && value.length === 0)) continue;
+      if (!isAllowed(name)) {
+        if (onDisallowedFilter) onDisallowedFilter(name);
+        continue;
+      }
+      let target = where;
+      let key = name;
+      if (name.includes(".")) {
+        const parts = name.split(".");
+        key = parts.pop()!;
+        for (const p of parts) { if (!target[p]) target[p] = {}; target = target[p]; }
+      }
+      const op = operator as string;
+      if (op === "contains") target[key] = { contains: value, mode: "insensitive" };
+      else if (op === "in") target[key] = { in: value };
+      else if (op === "notIn") target[key] = { notIn: value };
+      else if (op === "eq") target[key] = value;
+      else if (op === "ne") target[key] = { not: value };
+      else if (op === "gt") target[key] = { gt: value };
+      else if (op === "gte") target[key] = { gte: value };
+      else if (op === "lt") target[key] = { lt: value };
+      else if (op === "lte") target[key] = { lte: value };
+      else if (op === "startsWith") target[key] = { startsWith: value, mode: "insensitive" };
+      else if (op === "endsWith") target[key] = { endsWith: value, mode: "insensitive" };
+      else if (op === "isNull") target[key] = null;
+      else if (op === "isNotNull") target[key] = { not: null };
+      else target[key] = value;
+    }
+  }
+
+  if (filterTree) {
+    const compiled = compileFilterTree(filterTree, {
+      isAllowed,
+      onDisallowed: (field) => {
+        if (onDisallowedFilter) onDisallowedFilter(field);
+      },
+    });
+    if (compiled) {
+      where.AND = [...(Array.isArray(where.AND) ? where.AND : where.AND ? [where.AND] : []), compiled];
+    }
+  }
+
+  const orderBy: any = {};
+  const applySort = (field: string, direction: any) => {
+    if (field.includes(".")) {
+      const parts = field.split(".");
+      const leaf = parts.pop()!;
+      let t = orderBy;
+      for (const p of parts) { t[p] = t[p] || {}; t = t[p]; }
+      t[leaf] = direction;
+    } else orderBy[field] = direction;
+  };
+
+  if (sort && isAllowed(sort.field)) applySort(sort.field, sort.direction);
+  else if (config.defaultSort) applySort(config.defaultSort.field, config.defaultSort.direction);
+  else if (config.fields.some((f) => f.name === "createdAt")) orderBy.createdAt = "desc";
+  else orderBy[config.idField || "id"] = "desc";
+
+  const include: any = {};
+  if (config.include?.length) config.include.forEach((inc) => (include[inc] = true));
+  const includeOption = Object.keys(include).length ? { include } : {};
+
+  return {
+    where,
+    orderBy,
+    includeOption,
+    skip,
+    take,
+    safePage,
+    safePageSize,
+  };
+}

package/src/crud/server-service.ts

@@ -15,7 +15,8 @@
 //     getModelName: (e) => getModelName(e, MODEL_MAP),
 //   });
 
-import { compileFilterTree } from "./lib/filter-tree";
+import { buildListQuery } from "./lib/query-builder";
+import { prepareMutationData } from "./lib/mutation-builder";
 import type { CrudQueryParams, CrudResponse, EntityConfig } from "../types";
 import { serializeDecimalFields } from "../utils/serialize";
 
@@ -136,163 +137,27 @@ export function createServerCrudService(deps: ServerCrudDeps): ServerCrudService
     return m;
   };
 
-  const filterValidFields = (data: any, config: EntityConfig) => {
-    const valid = new Set(config.fields.filter((f) => !(f as any).isDisplayOnly).map((f) => f.name));
-    for (const f of systemFields) valid.add(f);
-    const out: Record<string, unknown> = {};
-    for (const [k, v] of Object.entries(data)) {
-      if (valid.has(k)) out[k] = v;
-      else log.warn(`Filtering out invalid field "${k}" for entity "${config.name}"`);
-    }
-    return out;
-  };
 
-  const castFieldValues = (data: any, config: EntityConfig) => {
-    const out = { ...data };
-    for (const field of config.fields) {
-      const value = out[field.name];
-      if (value === undefined || value === null) continue;
-      if (field.type === "boolean" || field.type === "switch") {
-        let isTrue: boolean;
-        if (typeof value === "string") {
-          const lv = value.toLowerCase();
-          isTrue = lv === "true" || lv === "active" || value === "1" || value === "on";
-        } else isTrue = Boolean(value);
-        if (field.type === "switch" && field.options && field.options.length >= 2) {
-          out[field.name] = isTrue ? (field.options[0] as any).value : (field.options[1] as any).value;
-        } else out[field.name] = isTrue;
-      } else if (field.type === "number" || (field.type as string) === "integer") {
-        if (typeof value === "string") {
-          if (value.trim() === "") out[field.name] = null;
-          else {
-            const num = Number(value);
-            if (!isNaN(num)) out[field.name] = num;
-          }
-        }
-      }
-    }
-    return out;
-  };
-
-  const transformRelationFields = (data: any, mode: "create" | "update") => {
-    const out = { ...data };
-    // citizenId/targetId là legacy-default từ consumer đầu tiên — app mới khai
-    // cột scalar *Id của mình qua deps.relationFieldSkip thay vì sửa core.
-    const skip = new Set([
-      "id",
-      "createdBy",
-      "updatedBy",
-      "citizenId",
-      "targetId",
-      ...(deps.relationFieldSkip ?? []),
-    ]);
-    for (const key of Object.keys(out)) {
-      if (skip.has(key)) continue;
-      if (key.endsWith("Id") && key.length > 2) {
-        const rel = key.slice(0, -2);
-        const value = out[key];
-        if (value && typeof value === "string" && value.trim() !== "") {
-          out[rel] = { connect: { id: value } };
-          delete out[key];
-        } else if (value === null || value === undefined || value === "") {
-          if (mode === "update") out[rel] = { disconnect: true };
-          delete out[key];
-        }
-      }
-    }
-    return out;
-  };
 
   return {
     async list(entity, config, params) {
       const prismaModel = model(entity);
-      const { page = 1, pageSize = 10, search, sort, filters } = params;
-      const safePage = Math.max(1, Number(page) || 1);
-      const safePageSize = Math.min(Math.max(1, Number(pageSize) || 10), MAX_PAGE_SIZE);
-      const skip = (safePage - 1) * safePageSize;
-      const take = safePageSize;
-
-      const allowedFields = new Set<string>([
-        ...config.fields.map((f) => f.name),
-        "id", "createdAt", "updatedAt", "createdBy", "updatedBy", config.idField || "id",
-      ]);
-      const allowedRelations = new Set<string>(config.include || []);
-      const isAllowed = (name: string) => {
-        if (!name) return false;
-        if (name.includes(".")) return allowedRelations.has(name.split(".")[0]);
-        return allowedFields.has(name);
-      };
-
-      const where: any = { ...(deps.scopeWhere?.(entity, config) ?? {}) };
-      if (search && search.trim()) {
-        const term = search.trim();
-        const searchFields = config.fields.filter((f) => f.filterable && f.type === "text").map((f) => f.name);
-        if (searchFields.length) where.OR = searchFields.map((f) => ({ [f]: { contains: term, mode: "insensitive" } }));
-      }
-      if (filters && filters.length) {
-        for (const filter of filters) {
-          const { name, value, operator } = filter as any;
-          if (value === undefined || value === null || (Array.isArray(value) && value.length === 0)) continue;
-          if (!isAllowed(name)) {
-            log.warn(`Ignoring filter on disallowed field "${name}" for entity "${entity}"`);
-            continue;
-          }
-          let target = where;
-          let key = name;
-          if (name.includes(".")) {
-            const parts = name.split(".");
-            key = parts.pop()!;
-            for (const p of parts) { if (!target[p]) target[p] = {}; target = target[p]; }
-          }
-          const op = operator as string;
-          if (op === "contains") target[key] = { contains: value, mode: "insensitive" };
-          else if (op === "in") target[key] = { in: value };
-          else if (op === "notIn") target[key] = { notIn: value };
-          else if (op === "eq") target[key] = value;
-          else if (op === "ne") target[key] = { not: value };
-          else if (op === "gt") target[key] = { gt: value };
-          else if (op === "gte") target[key] = { gte: value };
-          else if (op === "lt") target[key] = { lt: value };
-          else if (op === "lte") target[key] = { lte: value };
-          else if (op === "startsWith") target[key] = { startsWith: value, mode: "insensitive" };
-          else if (op === "endsWith") target[key] = { endsWith: value, mode: "insensitive" };
-          else if (op === "isNull") target[key] = null;
-          else if (op === "isNotNull") target[key] = { not: null };
-          else target[key] = value;
-        }
-      }
-      // Bộ lọc nâng cao dạng cây ($and/$or, nhiều điều kiện cùng field) —
-      // cùng guard isAllowed với filter phẳng; AND vào where (search dùng OR
-      // nên không đụng nhau). Cây sai cấu trúc → throw (route trả lỗi 4xx).
-      if (params.filterTree) {
-        const compiled = compileFilterTree(params.filterTree, {
-          isAllowed,
-          onDisallowed: (field) =>
-            log.warn(`Ignoring filterTree condition on disallowed field "${field}" for entity "${entity}"`),
-        });
-        if (compiled) {
-          where.AND = [...(Array.isArray(where.AND) ? where.AND : where.AND ? [where.AND] : []), compiled];
-        }
-      }
-
-      const orderBy: any = {};
-      const applySort = (field: string, direction: any) => {
-        if (field.includes(".")) {
-          const parts = field.split(".");
-          const leaf = parts.pop()!;
-          let t = orderBy;
-          for (const p of parts) { t[p] = t[p] || {}; t = t[p]; }
-          t[leaf] = direction;
-        } else orderBy[field] = direction;
-      };
-      if (sort && isAllowed(sort.field)) applySort(sort.field, sort.direction);
-      else if (config.defaultSort) applySort(config.defaultSort.field, config.defaultSort.direction);
-      else if (config.fields.some((f) => f.name === "createdAt")) orderBy.createdAt = "desc";
-      else orderBy[config.idField || "id"] = "desc";
-
-      const include: any = {};
-      if (config.include?.length) config.include.forEach((inc) => (include[inc] = true));
-      const includeOption = Object.keys(include).length ? { include } : {};
+      
+      const {
+        where,
+        orderBy,
+        includeOption,
+        skip,
+        take,
+        safePage,
+        safePageSize,
+      } = buildListQuery({
+        entity,
+        config,
+        params,
+        scopeWhere: deps.scopeWhere?.(entity, config) as Record<string, unknown> | undefined,
+        onDisallowedFilter: (field) => log.warn(`Ignoring filter on disallowed field "${field}" for entity "${entity}"`),
+      });
 
       try {
         const [total, data] = await Promise.all([
@@ -324,13 +189,15 @@ export function createServerCrudService(deps: ServerCrudDeps): ServerCrudService
     async create(entity, data, config, tx) {
       const prismaModel = model(entity, tx ?? prisma);
       try {
-        let filtered = config ? filterValidFields(data, config) : data;
-        if (config) filtered = castFieldValues(filtered, config);
-        if (!filtered.id) filtered.id = crypto.randomUUID();
-        if (deps.touchUpdatedAtOnCreate && !filtered.updatedAt) {
-          filtered.updatedAt = new Date();
-        }
-        const prismaData = transformRelationFields(filtered, "create");
+        const prismaData = prepareMutationData({
+          data,
+          config,
+          mode: "create",
+          systemFields,
+          relationFieldSkip: deps.relationFieldSkip,
+          logger: log,
+          touchUpdatedAtOnCreate: deps.touchUpdatedAtOnCreate,
+        });
         return serializeDecimalFields(await prismaModel.create({ data: prismaData }));
       } catch (error) {
         log.error(`Error creating ${entity}:`, error);
@@ -341,9 +208,14 @@ export function createServerCrudService(deps: ServerCrudDeps): ServerCrudService
     async update(entity, id, data, config, tx) {
       const prismaModel = model(entity, tx ?? prisma);
       try {
-        let filtered = config ? filterValidFields(data, config) : data;
-        if (config) filtered = castFieldValues(filtered, config);
-        const prismaData = transformRelationFields(filtered, "update");
+        const prismaData = prepareMutationData({
+          data,
+          config,
+          mode: "update",
+          systemFields,
+          relationFieldSkip: deps.relationFieldSkip,
+          logger: log,
+        });
         return serializeDecimalFields(await prismaModel.update({ where: { id }, data: prismaData }));
       } catch (error) {
         log.error(`Error updating ${entity}:`, error);