express-file-cluster 0.3.4 → 0.3.6

package/dist/index.d.cts

@@ -1,13 +1,33 @@
 import http from 'node:http';
-import { M as ModelSchema, b as ModelCRUD, R as RouteEntry, E as EFCConfig } from './types-CFU2IhRW.cjs';
-export { A as AuthStrategy, C as CorsConfig, D as DatabaseEngine, c as RouteMeta, d as RouteMethodMeta, T as TaskDefinition, a as TaskOptions } from './types-CFU2IhRW.cjs';
+import { M as ModelSchema, b as ModelCRUD, R as RouteEntry, E as EFCConfig } from './types-Df0jLGwr.cjs';
+export { A as AuthStrategy, C as CorsConfig, D as DatabaseEngine, F as FieldDefinition, c as ModelQueryOptions, d as RouteMeta, e as RouteMethodMeta, T as TaskDefinition, a as TaskOptions } from './types-Df0jLGwr.cjs';
 import { RequestHandler } from 'express';
 
+/**
+ * Represents an HTTP error with a status code and message.
+ * Throw this inside any route handler to send a structured error response.
+ *
+ * @example
+ * throw new HttpError(404, 'User not found');
+ */
 declare class HttpError extends Error {
     readonly statusCode: number;
     constructor(statusCode: number, message: string);
+    /** Returns a plain object representation suitable for JSON serialization. */
+    toJSON(): {
+        statusCode: number;
+        error: string;
+        message: string;
+    };
 }
 
+/**
+ * Chains multiple Express request handlers into a single handler.
+ * Each handler calls the next one via its `next` callback.
+ *
+ * @example
+ * export const GET = compose(requireAuth, rateLimiter, myHandler);
+ */
 declare function compose(...handlers: RequestHandler[]): RequestHandler;
 
 declare function defineModel<T extends Record<string, any>>(name: string, schema: ModelSchema): ModelCRUD<T>;

package/dist/index.d.ts

@@ -1,13 +1,33 @@
 import http from 'node:http';
-import { M as ModelSchema, b as ModelCRUD, R as RouteEntry, E as EFCConfig } from './types-CFU2IhRW.js';
-export { A as AuthStrategy, C as CorsConfig, D as DatabaseEngine, c as RouteMeta, d as RouteMethodMeta, T as TaskDefinition, a as TaskOptions } from './types-CFU2IhRW.js';
+import { M as ModelSchema, b as ModelCRUD, R as RouteEntry, E as EFCConfig } from './types-Df0jLGwr.js';
+export { A as AuthStrategy, C as CorsConfig, D as DatabaseEngine, F as FieldDefinition, c as ModelQueryOptions, d as RouteMeta, e as RouteMethodMeta, T as TaskDefinition, a as TaskOptions } from './types-Df0jLGwr.js';
 import { RequestHandler } from 'express';
 
+/**
+ * Represents an HTTP error with a status code and message.
+ * Throw this inside any route handler to send a structured error response.
+ *
+ * @example
+ * throw new HttpError(404, 'User not found');
+ */
 declare class HttpError extends Error {
     readonly statusCode: number;
     constructor(statusCode: number, message: string);
+    /** Returns a plain object representation suitable for JSON serialization. */
+    toJSON(): {
+        statusCode: number;
+        error: string;
+        message: string;
+    };
 }
 
+/**
+ * Chains multiple Express request handlers into a single handler.
+ * Each handler calls the next one via its `next` callback.
+ *
+ * @example
+ * export const GET = compose(requireAuth, rateLimiter, myHandler);
+ */
 declare function compose(...handlers: RequestHandler[]): RequestHandler;
 
 declare function defineModel<T extends Record<string, any>>(name: string, schema: ModelSchema): ModelCRUD<T>;

package/dist/index.js

@@ -118,7 +118,61 @@ function normalise(doc) {
   const id = doc["_id"] ? String(doc["_id"]) : "";
   return { ...doc, id };
 }
-async function getModel(name, schemaObj) {
+function isNestedArraySchema(def) {
+  return Array.isArray(def);
+}
+function primitiveCtor(type, mg) {
+  switch (type) {
+    case "string":
+      return String;
+    case "number":
+      return Number;
+    case "boolean":
+      return Boolean;
+    case "date":
+      return Date;
+    case "object":
+      return Object;
+    case "objectId":
+      return mg.Schema.Types.ObjectId;
+    case "array":
+      return Array;
+  }
+}
+function buildFieldEntry(def, mg) {
+  const entry = {};
+  if (def.type === "array") {
+    if (def.of === "objectId") {
+      const item = { type: mg.Schema.Types.ObjectId };
+      if (def.ref !== void 0) item["ref"] = def.ref;
+      entry["type"] = [item];
+    } else if (def.of) {
+      entry["type"] = [primitiveCtor(def.of, mg)];
+    } else {
+      entry["type"] = Array;
+    }
+  } else {
+    entry["type"] = primitiveCtor(def.type, mg);
+    if (def.type === "objectId" && def.ref !== void 0) entry["ref"] = def.ref;
+  }
+  if (def.required !== void 0) entry["required"] = def.required;
+  if (def.unique !== void 0) entry["unique"] = def.unique;
+  if (def.default !== void 0) entry["default"] = def.default;
+  if (def.enum !== void 0) entry["enum"] = def.enum;
+  return entry;
+}
+function buildMongooseSchema(schema, mg) {
+  const out = {};
+  for (const [key, def] of Object.entries(schema)) {
+    if (isNestedArraySchema(def)) {
+      out[key] = def[0] ? [buildMongooseSchema(def[0], mg)] : [];
+    } else {
+      out[key] = buildFieldEntry(def, mg);
+    }
+  }
+  return out;
+}
+async function getModel(name, schema) {
   let mg;
   try {
     const mod = await import("mongoose");
@@ -127,77 +181,52 @@ async function getModel(name, schemaObj) {
     throw new Error("[EFC] mongoose is not installed. Run: npm install mongoose");
   }
   if (mg.models[name]) return mg.models[name];
-  const schema = new mg.Schema(schemaObj, { timestamps: true });
-  return mg.model(name, schema);
-}
-function buildMongooseSchema(schema) {
-  const out = {};
-  for (const [key, def] of Object.entries(schema)) {
-    const entry = {};
-    switch (def.type) {
-      case "string":
-        entry["type"] = String;
-        break;
-      case "number":
-        entry["type"] = Number;
-        break;
-      case "boolean":
-        entry["type"] = Boolean;
-        break;
-      case "date":
-        entry["type"] = Date;
-        break;
-      case "object":
-        entry["type"] = Object;
-        break;
-      case "array":
-        entry["type"] = Array;
-        break;
-    }
-    if (def.required !== void 0) entry["required"] = def.required;
-    if (def.unique !== void 0) entry["unique"] = def.unique;
-    if (def.default !== void 0) entry["default"] = def.default;
-    out[key] = entry;
-  }
-  return out;
+  const schemaObj = buildMongooseSchema(schema, mg);
+  const mongooseSchema = new mg.Schema(schemaObj, { timestamps: true });
+  return mg.model(name, mongooseSchema);
 }
 function defineModel(name, schema) {
-  const mongooseSchema = buildMongooseSchema(schema);
   return {
-    async find(filter = {}) {
-      const M = await getModel(name, mongooseSchema);
-      const docs = await M.find(filter).lean();
+    async find(filter = {}, options) {
+      const M = await getModel(name, schema);
+      const query = M.find(filter);
+      if (options?.populate) query.populate(options.populate);
+      const docs = await query.lean();
       return docs.map(normalise);
     },
-    async findById(id) {
-      const M = await getModel(name, mongooseSchema);
-      const doc = await M.findById(id).lean();
+    async findById(id, options) {
+      const M = await getModel(name, schema);
+      const query = M.findById(id);
+      if (options?.populate) query.populate(options.populate);
+      const doc = await query.lean();
       if (!doc) return null;
       return normalise(doc);
     },
-    async findOne(filter) {
-      const M = await getModel(name, mongooseSchema);
-      const doc = await M.findOne(filter).lean();
+    async findOne(filter, options) {
+      const M = await getModel(name, schema);
+      const query = M.findOne(filter);
+      if (options?.populate) query.populate(options.populate);
+      const doc = await query.lean();
       if (!doc) return null;
       return normalise(doc);
     },
     async create(data) {
-      const M = await getModel(name, mongooseSchema);
+      const M = await getModel(name, schema);
       const doc = await M.create(data);
       return normalise(doc.toObject());
     },
     async update(id, data) {
-      const M = await getModel(name, mongooseSchema);
+      const M = await getModel(name, schema);
       const doc = await M.findByIdAndUpdate(id, data, { new: true }).lean();
       if (!doc) return null;
       return normalise(doc);
     },
     async delete(id) {
-      const M = await getModel(name, mongooseSchema);
+      const M = await getModel(name, schema);
       await M.findByIdAndDelete(id);
     },
     async count(filter = {}) {
-      const M = await getModel(name, mongooseSchema);
+      const M = await getModel(name, schema);
       return M.countDocuments(filter);
     }
   };
@@ -951,12 +980,19 @@ var HttpError = class _HttpError extends Error {
     this.statusCode = statusCode;
     Error.captureStackTrace(this, _HttpError);
   }
+  /** Returns a plain object representation suitable for JSON serialization. */
+  toJSON() {
+    return {
+      statusCode: this.statusCode,
+      error: this.name,
+      message: this.message
+    };
+  }
 };
 
 // src/compose.ts
 function compose(...handlers) {
   return (req, res, next) => {
-    const index = 0;
     function dispatch(i) {
       if (i >= handlers.length) {
         next();
@@ -973,7 +1009,7 @@ function compose(...handlers) {
         next(err);
       }
     }
-    dispatch(index);
+    dispatch(0);
   };
 }
 
@@ -1014,11 +1050,10 @@ async function ignite(config) {
       return { name: "API", version: "" };
     }
   }
-  const envPort = process.env["PORT"] != null ? Number(process.env["PORT"]) : NaN;
-  const port = _port != null && !Number.isNaN(_port) ? _port : !Number.isNaN(envPort) ? envPort : 3e3;
-  const databaseUrl = config.databaseUrl ?? process.env["DATABASE_URL"];
+  const port = _port != null && !Number.isNaN(_port) ? _port : 3e3;
+  const databaseUrl = config.databaseUrl;
   const database = config.database ?? detectDatabase(databaseUrl);
-  const jwtSecret = config.jwtSecret ?? process.env["JWT_SECRET"];
+  const jwtSecret = config.jwtSecret;
   const authStrategy = config.authStrategy ?? "http-only";
   const clusterEnabled = config.cluster ?? process.env["NODE_ENV"] === "production";
   if (clusterEnabled && cluster2.isPrimary) {
@@ -1032,16 +1067,7 @@ async function ignite(config) {
   const app = express();
   const corsOption = config.cors ?? true;
   if (corsOption !== false) {
-    const envOrigins = process.env["CORS_ORIGINS"];
-    let origin;
-    if (envOrigins) {
-      const list = envOrigins.split(",").map((o) => o.trim()).filter(Boolean);
-      origin = list;
-    } else if (typeof corsOption === "object" && corsOption.origin !== void 0) {
-      origin = corsOption.origin;
-    } else {
-      origin = true;
-    }
+    const origin = typeof corsOption === "object" && corsOption.origin !== void 0 ? corsOption.origin : true;
     const corsOpts = typeof corsOption === "object" ? { ...corsOption, origin } : { origin };
     app.use(cors(corsOpts));
   }
@@ -1056,12 +1082,11 @@ async function ignite(config) {
     setDbClient(conn);
   }
   if (jwtSecret) {
-    const cookieDomain = process.env["COOKIE_DOMAIN"];
     configureAuth({
       secret: jwtSecret,
       strategy: authStrategy,
-      expiresIn: process.env["JWT_EXPIRES_IN"] ?? "7d",
-      ...cookieDomain !== void 0 && { cookieDomain }
+      expiresIn: config.jwtExpiresIn ?? "7d",
+      ...config.cookieDomain !== void 0 && { cookieDomain: config.cookieDomain }
     });
   }
   if (tasksDir) {