@devbro/pashmak 0.1.17 → 0.1.18

package/dist/bin/router.cjs

@@ -591,9 +591,11 @@ async function runNext(middlewares, req, res, final) {
 __name(runNext, "runNext");
 
 // src/router.mts
-function Model(model, paramName) {
+function Model(model, param_name = "id", model_field = "id") {
   return createParamDecorator(async () => {
-    let rc = await model.find((0, import_neko_context.ctx)().get("request").params[paramName]);
+    let rc = await model.findOne({
+      [model_field]: (0, import_neko_context.ctx)().get("request").params[param_name]
+    });
     if (!rc) {
       throw new import_errors.HttpNotFoundError("Object not found", "OBJECT_NOT_FOUND");
     }
@@ -601,9 +603,9 @@ function Model(model, paramName) {
   });
 }
 __name(Model, "Model");
-function Param(paramName) {
+function Param(param_name) {
   return createParamDecorator(() => {
-    return (0, import_neko_context.ctx)().get("request").params[paramName];
+    return (0, import_neko_context.ctx)().get("request").params[param_name] || void 0;
   });
 }
 __name(Param, "Param");

package/dist/router.d.mts

@@ -2,8 +2,8 @@ import { BaseModel } from '@devbro/neko-orm';
 import * as yup from 'yup';
 export * from '@devbro/neko-router';
 
-declare function Model(model: typeof BaseModel, paramName: string): ParameterDecorator;
-declare function Param(paramName: string): ParameterDecorator;
+declare function Model(model: typeof BaseModel, param_name?: string, model_field?: string): ParameterDecorator;
+declare function Param(param_name: string): ParameterDecorator;
 declare function ValidatedRequest(validationRules: yup.ObjectSchema<any> | (() => yup.ObjectSchema<any>)): ParameterDecorator;
 
 export { Model, Param, ValidatedRequest };

package/dist/router.mjs

@@ -4,9 +4,11 @@ import { ctx } from "@devbro/neko-context";
 import { HttpNotFoundError } from "@devbro/neko-http/errors";
 import { createParamDecorator } from "@devbro/neko-router";
 export * from "@devbro/neko-router";
-function Model(model, paramName) {
+function Model(model, param_name = "id", model_field = "id") {
   return createParamDecorator(async () => {
-    let rc = await model.find(ctx().get("request").params[paramName]);
+    let rc = await model.findOne({
+      [model_field]: ctx().get("request").params[param_name]
+    });
     if (!rc) {
       throw new HttpNotFoundError("Object not found", "OBJECT_NOT_FOUND");
     }
@@ -14,9 +16,9 @@ function Model(model, paramName) {
   });
 }
 __name(Model, "Model");
-function Param(paramName) {
+function Param(param_name) {
   return createParamDecorator(() => {
-    return ctx().get("request").params[paramName];
+    return ctx().get("request").params[param_name] || void 0;
   });
 }
 __name(Param, "Param");

package/dist/router.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/router.mts"],"sourcesContent":["import { ctx } from \"@devbro/neko-context\";\nimport { BaseModel } from \"@devbro/neko-orm\";\nimport { Request } from \"@devbro/neko-router\";\nimport { HttpNotFoundError } from \"@devbro/neko-http/errors\";\nimport { createParamDecorator } from \"@devbro/neko-router\";\nimport * as yup from \"yup\";\nexport * from \"@devbro/neko-router\";\n\nexport function Model(\n  model: typeof BaseModel,\n  paramName: string,\n): ParameterDecorator {\n  return createParamDecorator(async () => {\n    let rc = await model.find(ctx().get<Request>(\"request\").params[paramName]);\n    if (!rc) {\n      throw new HttpNotFoundError(\"Object not found\", \"OBJECT_NOT_FOUND\");\n    }\n\n    return rc;\n  });\n}\n\nexport function Param(paramName: string): ParameterDecorator {\n  return createParamDecorator(() => {\n    return ctx().get<Request>(\"request\").params[paramName];\n  });\n}\n\nexport function ValidatedRequest(\n  validationRules: yup.ObjectSchema<any> | (() => yup.ObjectSchema<any>),\n): ParameterDecorator {\n  return createParamDecorator(async () => {\n    const rc = await (\n      typeof validationRules === \"function\"\n        ? validationRules()\n        : validationRules\n    )\n      .noUnknown()\n      .validate(ctx().get<Request>(\"request\").body, { abortEarly: false });\n\n    return rc;\n  });\n}\n"],"mappings":";;AAAA,SAAS,WAAW;AAGpB,SAAS,yBAAyB;AAClC,SAAS,4BAA4B;AAErC,cAAc;AAEP,SAAS,MACd,OACA,WACoB;AACpB,SAAO,qBAAqB,YAAY;AACtC,QAAI,KAAK,MAAM,MAAM,KAAK,IAAI,EAAE,IAAa,SAAS,EAAE,OAAO,SAAS,CAAC;AACzE,QAAI,CAAC,IAAI;AACP,YAAM,IAAI,kBAAkB,oBAAoB,kBAAkB;AAAA,IACpE;AAEA,WAAO;AAAA,EACT,CAAC;AACH;AAZgB;AAcT,SAAS,MAAM,WAAuC;AAC3D,SAAO,qBAAqB,MAAM;AAChC,WAAO,IAAI,EAAE,IAAa,SAAS,EAAE,OAAO,SAAS;AAAA,EACvD,CAAC;AACH;AAJgB;AAMT,SAAS,iBACd,iBACoB;AACpB,SAAO,qBAAqB,YAAY;AACtC,UAAM,KAAK,OACT,OAAO,oBAAoB,aACvB,gBAAgB,IAChB,iBAEH,UAAU,EACV,SAAS,IAAI,EAAE,IAAa,SAAS,EAAE,MAAM,EAAE,YAAY,MAAM,CAAC;AAErE,WAAO;AAAA,EACT,CAAC;AACH;AAdgB;","names":[]}
+{"version":3,"sources":["../src/router.mts"],"sourcesContent":["import { ctx } from \"@devbro/neko-context\";\nimport { BaseModel } from \"@devbro/neko-orm\";\nimport { Request } from \"@devbro/neko-router\";\nimport { HttpNotFoundError } from \"@devbro/neko-http/errors\";\nimport { createParamDecorator } from \"@devbro/neko-router\";\nimport * as yup from \"yup\";\nexport * from \"@devbro/neko-router\";\n\nexport function Model(\n  model: typeof BaseModel,\n  param_name: string = \"id\",\n  model_field: string = \"id\",\n): ParameterDecorator {\n  return createParamDecorator(async () => {\n    let rc = await model.findOne({\n      [model_field]: ctx().get<Request>(\"request\").params[param_name],\n    });\n    if (!rc) {\n      throw new HttpNotFoundError(\"Object not found\", \"OBJECT_NOT_FOUND\");\n    }\n\n    return rc;\n  });\n}\n\nexport function Param(param_name: string): ParameterDecorator {\n  return createParamDecorator(() => {\n    return ctx().get<Request>(\"request\").params[param_name] || undefined;\n  });\n}\n\nexport function ValidatedRequest(\n  validationRules: yup.ObjectSchema<any> | (() => yup.ObjectSchema<any>),\n): ParameterDecorator {\n  return createParamDecorator(async () => {\n    const rc = await (\n      typeof validationRules === \"function\"\n        ? validationRules()\n        : validationRules\n    )\n      .noUnknown()\n      .validate(ctx().get<Request>(\"request\").body, { abortEarly: false });\n\n    return rc;\n  });\n}\n"],"mappings":";;AAAA,SAAS,WAAW;AAGpB,SAAS,yBAAyB;AAClC,SAAS,4BAA4B;AAErC,cAAc;AAEP,SAAS,MACd,OACA,aAAqB,MACrB,cAAsB,MACF;AACpB,SAAO,qBAAqB,YAAY;AACtC,QAAI,KAAK,MAAM,MAAM,QAAQ;AAAA,MAC3B,CAAC,WAAW,GAAG,IAAI,EAAE,IAAa,SAAS,EAAE,OAAO,UAAU;AAAA,IAChE,CAAC;AACD,QAAI,CAAC,IAAI;AACP,YAAM,IAAI,kBAAkB,oBAAoB,kBAAkB;AAAA,IACpE;AAEA,WAAO;AAAA,EACT,CAAC;AACH;AAfgB;AAiBT,SAAS,MAAM,YAAwC;AAC5D,SAAO,qBAAqB,MAAM;AAChC,WAAO,IAAI,EAAE,IAAa,SAAS,EAAE,OAAO,UAAU,KAAK;AAAA,EAC7D,CAAC;AACH;AAJgB;AAMT,SAAS,iBACd,iBACoB;AACpB,SAAO,qBAAqB,YAAY;AACtC,UAAM,KAAK,OACT,OAAO,oBAAoB,aACvB,gBAAgB,IAChB,iBAEH,UAAU,EACV,SAAS,IAAI,EAAE,IAAa,SAAS,EAAE,MAAM,EAAE,YAAY,MAAM,CAAC;AAErE,WAAO;AAAA,EACT,CAAC;AACH;AAdgB;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devbro/pashmak",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "testing application for the entire repo",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",