@meridianjs/framework-utils 0.1.1 → 0.1.2

package/dist/index.d.mts

@@ -156,12 +156,6 @@ type InferModel<M extends ModelDefinition> = M extends ModelDefinition<infer Sch
  */
 declare function MeridianService(models: Record<string, ModelDefinition>): new (container: MeridianContainer) => IModuleService;
 
-/**
- * Converts a DML ModelDefinition to a MikroORM EntitySchema.
- *
- * Automatically adds `created_at`, `updated_at`, and `deleted_at` timestamp
- * columns to every entity.
- */
 declare function dmlToEntitySchema(def: ModelDefinition): EntitySchema;
 /**
  * Wraps a MikroORM EntityManager into the Repository interface expected

package/dist/index.d.ts

@@ -156,12 +156,6 @@ type InferModel<M extends ModelDefinition> = M extends ModelDefinition<infer Sch
  */
 declare function MeridianService(models: Record<string, ModelDefinition>): new (container: MeridianContainer) => IModuleService;
 
-/**
- * Converts a DML ModelDefinition to a MikroORM EntitySchema.
- *
- * Automatically adds `created_at`, `updated_at`, and `deleted_at` timestamp
- * columns to every entity.
- */
 declare function dmlToEntitySchema(def: ModelDefinition): EntitySchema;
 /**
  * Wraps a MikroORM EntityManager into the Repository interface expected

package/dist/index.js

@@ -55,10 +55,10 @@ function Module(key, definition) {
 
 // src/define-link.ts
 function normalizeEndpoint(input) {
-  if ("linkable" in input) {
-    return input;
+  if ("tableName" in input) {
+    return { linkable: input };
   }
-  return { linkable: input };
+  return input;
 }
 function defineLink(left, right, options) {
   const leftEndpoint = normalizeEndpoint(left);
@@ -184,6 +184,15 @@ var model = {
 };
 
 // src/service-factory.ts
+var UPDATE_RESERVED = /* @__PURE__ */ new Set([
+  "id",
+  "created_at",
+  "updated_at",
+  "deleted_at",
+  "__proto__",
+  "constructor",
+  "prototype"
+]);
 function MeridianService(models) {
   class BaseService {
     // Use private class field to avoid conflicting with the index signature
@@ -200,21 +209,21 @@ function MeridianService(models) {
         if (!hasCustomMethod(listMethod)) {
           this[listMethod] = async (filters = {}, options = {}) => {
             const repo = this.#container.resolve(repoToken);
-            return repo.find(filters, options);
+            return repo.find({ deleted_at: null, ...filters }, options);
           };
         }
         const listAndCountMethod = `listAndCount${capitalizedPlural}`;
         if (!hasCustomMethod(listAndCountMethod)) {
           this[listAndCountMethod] = async (filters = {}, options = {}) => {
             const repo = this.#container.resolve(repoToken);
-            return repo.findAndCount(filters, options);
+            return repo.findAndCount({ deleted_at: null, ...filters }, options);
           };
         }
         const retrieveMethod = `retrieve${capitalized}`;
         if (!hasCustomMethod(retrieveMethod)) {
           this[retrieveMethod] = async (id) => {
             const repo = this.#container.resolve(repoToken);
-            return repo.findOneOrFail({ id });
+            return repo.findOneOrFail({ id, deleted_at: null });
           };
         }
         const createMethod = `create${capitalized}`;
@@ -230,8 +239,11 @@ function MeridianService(models) {
         if (!hasCustomMethod(updateMethod)) {
           this[updateMethod] = async (id, data) => {
             const repo = this.#container.resolve(repoToken);
-            const entity = await repo.findOneOrFail({ id });
-            Object.assign(entity, data);
+            const entity = await repo.findOneOrFail({ id, deleted_at: null });
+            const safe = Object.fromEntries(
+              Object.entries(data).filter(([k]) => !UPDATE_RESERVED.has(k))
+            );
+            Object.assign(entity, safe);
             await repo.flush();
             return entity;
           };
@@ -248,7 +260,7 @@ function MeridianService(models) {
         if (!hasCustomMethod(softDeleteMethod)) {
           this[softDeleteMethod] = async (id) => {
             const repo = this.#container.resolve(repoToken);
-            const entity = await repo.findOneOrFail({ id });
+            const entity = await repo.findOneOrFail({ id, deleted_at: null });
             entity.deleted_at = /* @__PURE__ */ new Date();
             await repo.flush();
             return entity;
@@ -262,7 +274,15 @@ function MeridianService(models) {
 
 // src/orm-utils.ts
 var import_core = require("@mikro-orm/core");
+var RESERVED_TIMESTAMP_KEYS = ["created_at", "updated_at", "deleted_at"];
 function dmlToEntitySchema(def) {
+  for (const key of RESERVED_TIMESTAMP_KEYS) {
+    if (key in def.schema) {
+      throw new Error(
+        `Model "${def.tableName}" defines reserved column "${key}". Meridian automatically manages created_at, updated_at, and deleted_at.`
+      );
+    }
+  }
   const properties = {};
   for (const [key, prop] of Object.entries(def.schema)) {
     if (prop instanceof IdProperty) {
@@ -344,9 +364,10 @@ function createRepository(em, entityName) {
       return repo.find(filters, options);
     },
     async findAndCount(filters, options = {}) {
+      const { limit, offset, ...countOptions } = options;
       const [data, count] = await Promise.all([
         repo.find(filters, options),
-        repo.count(filters)
+        repo.count(filters, countOptions)
       ]);
       return [data, count];
     },

package/dist/index.mjs

@@ -5,10 +5,10 @@ function Module(key, definition) {
 
 // src/define-link.ts
 function normalizeEndpoint(input) {
-  if ("linkable" in input) {
-    return input;
+  if ("tableName" in input) {
+    return { linkable: input };
   }
-  return { linkable: input };
+  return input;
 }
 function defineLink(left, right, options) {
   const leftEndpoint = normalizeEndpoint(left);
@@ -134,6 +134,15 @@ var model = {
 };
 
 // src/service-factory.ts
+var UPDATE_RESERVED = /* @__PURE__ */ new Set([
+  "id",
+  "created_at",
+  "updated_at",
+  "deleted_at",
+  "__proto__",
+  "constructor",
+  "prototype"
+]);
 function MeridianService(models) {
   class BaseService {
     // Use private class field to avoid conflicting with the index signature
@@ -150,21 +159,21 @@ function MeridianService(models) {
         if (!hasCustomMethod(listMethod)) {
           this[listMethod] = async (filters = {}, options = {}) => {
             const repo = this.#container.resolve(repoToken);
-            return repo.find(filters, options);
+            return repo.find({ deleted_at: null, ...filters }, options);
           };
         }
         const listAndCountMethod = `listAndCount${capitalizedPlural}`;
         if (!hasCustomMethod(listAndCountMethod)) {
           this[listAndCountMethod] = async (filters = {}, options = {}) => {
             const repo = this.#container.resolve(repoToken);
-            return repo.findAndCount(filters, options);
+            return repo.findAndCount({ deleted_at: null, ...filters }, options);
           };
         }
         const retrieveMethod = `retrieve${capitalized}`;
         if (!hasCustomMethod(retrieveMethod)) {
           this[retrieveMethod] = async (id) => {
             const repo = this.#container.resolve(repoToken);
-            return repo.findOneOrFail({ id });
+            return repo.findOneOrFail({ id, deleted_at: null });
           };
         }
         const createMethod = `create${capitalized}`;
@@ -180,8 +189,11 @@ function MeridianService(models) {
         if (!hasCustomMethod(updateMethod)) {
           this[updateMethod] = async (id, data) => {
             const repo = this.#container.resolve(repoToken);
-            const entity = await repo.findOneOrFail({ id });
-            Object.assign(entity, data);
+            const entity = await repo.findOneOrFail({ id, deleted_at: null });
+            const safe = Object.fromEntries(
+              Object.entries(data).filter(([k]) => !UPDATE_RESERVED.has(k))
+            );
+            Object.assign(entity, safe);
             await repo.flush();
             return entity;
           };
@@ -198,7 +210,7 @@ function MeridianService(models) {
         if (!hasCustomMethod(softDeleteMethod)) {
           this[softDeleteMethod] = async (id) => {
             const repo = this.#container.resolve(repoToken);
-            const entity = await repo.findOneOrFail({ id });
+            const entity = await repo.findOneOrFail({ id, deleted_at: null });
             entity.deleted_at = /* @__PURE__ */ new Date();
             await repo.flush();
             return entity;
@@ -212,7 +224,15 @@ function MeridianService(models) {
 
 // src/orm-utils.ts
 import { EntitySchema } from "@mikro-orm/core";
+var RESERVED_TIMESTAMP_KEYS = ["created_at", "updated_at", "deleted_at"];
 function dmlToEntitySchema(def) {
+  for (const key of RESERVED_TIMESTAMP_KEYS) {
+    if (key in def.schema) {
+      throw new Error(
+        `Model "${def.tableName}" defines reserved column "${key}". Meridian automatically manages created_at, updated_at, and deleted_at.`
+      );
+    }
+  }
   const properties = {};
   for (const [key, prop] of Object.entries(def.schema)) {
     if (prop instanceof IdProperty) {
@@ -294,9 +314,10 @@ function createRepository(em, entityName) {
       return repo.find(filters, options);
     },
     async findAndCount(filters, options = {}) {
+      const { limit, offset, ...countOptions } = options;
       const [data, count] = await Promise.all([
         repo.find(filters, options),
-        repo.count(filters)
+        repo.count(filters, countOptions)
       ]);
       return [data, count];
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meridianjs/framework-utils",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Utilities for building Meridian modules: DML, service factory, defineModule, defineLink",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",