expresso-macchiato 0.4.9 → 0.4.10-dev.0

package/dist/index.js

@@ -627,8 +627,8 @@ var RouterWrapper = class {
   constructor(data) {
     this.createExpressRouter = () => {
       const newRouter = _express.Router.call(void 0, );
+      const avoidOptionsForDefinedApis = [];
       if (this.data.dbRouting) {
-        const avoidOptionsForDefinedApis = [];
         if (_optionalChain([this, 'access', _17 => _17.data, 'access', _18 => _18.apis, 'optionalAccess', _19 => _19["/"], 'optionalAccess', _20 => _20.GET])) avoidOptionsForDefinedApis.push("LIST");
         if (_optionalChain([this, 'access', _21 => _21.data, 'access', _22 => _22.apis, 'optionalAccess', _23 => _23["/:id"], 'optionalAccess', _24 => _24.GET])) avoidOptionsForDefinedApis.push("GET");
         if (_optionalChain([this, 'access', _25 => _25.data, 'access', _26 => _26.apis, 'optionalAccess', _27 => _27["/"], 'optionalAccess', _28 => _28.POST])) avoidOptionsForDefinedApis.push("POST");
@@ -637,19 +637,6 @@ var RouterWrapper = class {
         for (const avoid of _nullishCoalesce(this.data.dbRouting.avoid, () => ( []))) {
           if (!avoidOptionsForDefinedApis.includes(avoid)) avoidOptionsForDefinedApis.push(avoid);
         }
-        const { entity, bodyParameters, getParameters, primaryKey, secure, returningProps } = this.data.dbRouting;
-        DynamicDbRouter.createDbRouter({
-          entity,
-          bodyParameters,
-          getParameters,
-          primaryKey,
-          router: newRouter,
-          basePath: this.data.basePath,
-          tag: this.data.tag,
-          avoid: avoidOptionsForDefinedApis,
-          secure,
-          returningProps
-        });
       }
       if (this.data.swaggerNewSchemas) {
         for (const schema in this.data.swaggerNewSchemas) Swagger.addSchema(schema, this.data.swaggerNewSchemas[schema].properties);
@@ -690,7 +677,19 @@ var RouterWrapper = class {
         }
       }
       if (this.data.dbRouting) {
-        const { entity, bodyParameters, getParameters, primaryKey } = this.data.dbRouting;
+        const { entity, bodyParameters, getParameters, primaryKey, secure, returningProps } = this.data.dbRouting;
+        DynamicDbRouter.createDbRouter({
+          entity,
+          bodyParameters,
+          getParameters,
+          primaryKey,
+          router: newRouter,
+          basePath: this.data.basePath,
+          tag: this.data.tag,
+          avoid: avoidOptionsForDefinedApis,
+          secure,
+          returningProps
+        });
         DynamicDbRouter.addDbRouterSwagger({
           entity,
           bodyParameters,

package/dist/index.mjs

@@ -627,8 +627,8 @@ var RouterWrapper = class {
   constructor(data) {
     this.createExpressRouter = () => {
       const newRouter = Router();
+      const avoidOptionsForDefinedApis = [];
       if (this.data.dbRouting) {
-        const avoidOptionsForDefinedApis = [];
         if (this.data.apis?.["/"]?.GET) avoidOptionsForDefinedApis.push("LIST");
         if (this.data.apis?.["/:id"]?.GET) avoidOptionsForDefinedApis.push("GET");
         if (this.data.apis?.["/"]?.POST) avoidOptionsForDefinedApis.push("POST");
@@ -637,19 +637,6 @@ var RouterWrapper = class {
         for (const avoid of this.data.dbRouting.avoid ?? []) {
           if (!avoidOptionsForDefinedApis.includes(avoid)) avoidOptionsForDefinedApis.push(avoid);
         }
-        const { entity, bodyParameters, getParameters, primaryKey, secure, returningProps } = this.data.dbRouting;
-        DynamicDbRouter.createDbRouter({
-          entity,
-          bodyParameters,
-          getParameters,
-          primaryKey,
-          router: newRouter,
-          basePath: this.data.basePath,
-          tag: this.data.tag,
-          avoid: avoidOptionsForDefinedApis,
-          secure,
-          returningProps
-        });
       }
       if (this.data.swaggerNewSchemas) {
         for (const schema in this.data.swaggerNewSchemas) Swagger.addSchema(schema, this.data.swaggerNewSchemas[schema].properties);
@@ -690,7 +677,19 @@ var RouterWrapper = class {
         }
       }
       if (this.data.dbRouting) {
-        const { entity, bodyParameters, getParameters, primaryKey } = this.data.dbRouting;
+        const { entity, bodyParameters, getParameters, primaryKey, secure, returningProps } = this.data.dbRouting;
+        DynamicDbRouter.createDbRouter({
+          entity,
+          bodyParameters,
+          getParameters,
+          primaryKey,
+          router: newRouter,
+          basePath: this.data.basePath,
+          tag: this.data.tag,
+          avoid: avoidOptionsForDefinedApis,
+          secure,
+          returningProps
+        });
         DynamicDbRouter.addDbRouterSwagger({
           entity,
           bodyParameters,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expresso-macchiato",
-  "version": "0.4.9",
+  "version": "0.4.10-dev.0",
   "author": "Alessio Velluso",
   "license": "MIT",
   "description": "Description",