expresso-macchiato 0.4.8 → 0.4.10-dev.0

package/dist/index.d.mts

@@ -1,5 +1,5 @@
+import { DataSource, MixedList, EntitySchema, BaseEntity } from 'typeorm';
 import { Request, Response as Response$1, RequestHandler, Router, Express } from 'express';
-import { BaseEntity, MixedList, EntitySchema } from 'typeorm';
 import { Socket, Namespace, Server as Server$1, ServerOptions } from 'socket.io';
 import http from 'http';
 import * as utils_logger_av from 'utils-logger-av';
@@ -50,6 +50,14 @@ type ListOptions = {
     order?: 'ASC' | 'DESC';
 } & SearchQuery;
 
+declare class DbConnector {
+    private static DataSource;
+    static getDataSource: () => DataSource;
+    private readonly projectConfig;
+    constructor(projectConfig: ProjectConfigs);
+    connect: (entities: MixedList<Function | string | EntitySchema>, migrations?: string[], sync?: boolean, logging?: boolean) => Promise<void>;
+}
+
 interface Info {
     title: string;
     version: string;
@@ -658,4 +666,4 @@ declare const socketNok: (message: string) => SocketConnectionNok;
 declare const sleep: (ms: number) => Promise<unknown>;
 declare const getCompiledPath: (__filename: string, __dirname: string, pathsWithoutExtension: string[]) => string[];
 
-export { type ApiKeySecurity, BackgroundService, type BaseFormatContrainedParameter, type BaseOAuthSecurity, type BaseParameter, type BaseSchema, type BaseSecurity, type BasicAuthenticationSecurity, type BodyParameter, type Components, type ConnectedSocketClient, type Contact, type DefaultTokenPayload, type DynamicDbRouterOptions, type DynamicSwaggerOperation, type DynamicSwaggerOperationBody, type DynamicSwaggerPath, type DynamicSwaggerRequestBodyOperation, type ErrorsMapping, type ExpressReturn, type ExternalDocs, type FormDataParameter, type GenericFormat, type Header, type HeaderParameter, type Info, type IntegerFormat, type License, type ListOptions, type MethodPathHandling, type Methods, type NumberFormat, type OAuth2AccessCodeSecurity, type OAuth2ApplicationSecurity, type OAuth2ImplicitSecurity, type OAuth2PasswordSecurity, type OAuthScope, type Operation, type Parameter, type ParameterCollectionFormat, type ParameterType, type Path, type PathParameter, type ProjectConfigs, type QueryParameter, type Reference, type RequestBodyOperation, type Response, RouterWrapper, type RouterWrapperInterface, type Schema, type SchemaFormatConstraints, type SchemaV3, type SearchQuery, type SecureTokenConfig, type Security, type Server, type SocketConnectionMiddleware, type SocketConnectionNok, type SocketConnectionOk, SocketWrapper, type SocketWrapperConstructor, type Spec, Starter, type StarterOptions, type StringFormat, Swagger, type SwaggerMetadataInterface, type Tag, Token, type TokenApiOptions, type TokenConstructor, type XML, apiNok, apiOk, c, errorCatcher, fullLogNok, fullLogOk, getCompiledPath, i, log, sleep, socketNok, socketOk };
+export { type ApiKeySecurity, BackgroundService, type BaseFormatContrainedParameter, type BaseOAuthSecurity, type BaseParameter, type BaseSchema, type BaseSecurity, type BasicAuthenticationSecurity, type BodyParameter, type Components, type ConnectedSocketClient, type Contact, DbConnector, type DefaultTokenPayload, type DynamicDbRouterOptions, type DynamicSwaggerOperation, type DynamicSwaggerOperationBody, type DynamicSwaggerPath, type DynamicSwaggerRequestBodyOperation, type ErrorsMapping, type ExpressReturn, type ExternalDocs, type FormDataParameter, type GenericFormat, type Header, type HeaderParameter, type Info, type IntegerFormat, type License, type ListOptions, type MethodPathHandling, type Methods, type NumberFormat, type OAuth2AccessCodeSecurity, type OAuth2ApplicationSecurity, type OAuth2ImplicitSecurity, type OAuth2PasswordSecurity, type OAuthScope, type Operation, type Parameter, type ParameterCollectionFormat, type ParameterType, type Path, type PathParameter, type ProjectConfigs, type QueryParameter, type Reference, type RequestBodyOperation, type Response, RouterWrapper, type RouterWrapperInterface, type Schema, type SchemaFormatConstraints, type SchemaV3, type SearchQuery, type SecureTokenConfig, type Security, type Server, type SocketConnectionMiddleware, type SocketConnectionNok, type SocketConnectionOk, SocketWrapper, type SocketWrapperConstructor, type Spec, Starter, type StarterOptions, type StringFormat, Swagger, type SwaggerMetadataInterface, type Tag, Token, type TokenApiOptions, type TokenConstructor, type XML, apiNok, apiOk, c, errorCatcher, fullLogNok, fullLogOk, getCompiledPath, i, log, sleep, socketNok, socketOk };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
+import { DataSource, MixedList, EntitySchema, BaseEntity } from 'typeorm';
 import { Request, Response as Response$1, RequestHandler, Router, Express } from 'express';
-import { BaseEntity, MixedList, EntitySchema } from 'typeorm';
 import { Socket, Namespace, Server as Server$1, ServerOptions } from 'socket.io';
 import http from 'http';
 import * as utils_logger_av from 'utils-logger-av';
@@ -50,6 +50,14 @@ type ListOptions = {
     order?: 'ASC' | 'DESC';
 } & SearchQuery;
 
+declare class DbConnector {
+    private static DataSource;
+    static getDataSource: () => DataSource;
+    private readonly projectConfig;
+    constructor(projectConfig: ProjectConfigs);
+    connect: (entities: MixedList<Function | string | EntitySchema>, migrations?: string[], sync?: boolean, logging?: boolean) => Promise<void>;
+}
+
 interface Info {
     title: string;
     version: string;
@@ -658,4 +666,4 @@ declare const socketNok: (message: string) => SocketConnectionNok;
 declare const sleep: (ms: number) => Promise<unknown>;
 declare const getCompiledPath: (__filename: string, __dirname: string, pathsWithoutExtension: string[]) => string[];
 
-export { type ApiKeySecurity, BackgroundService, type BaseFormatContrainedParameter, type BaseOAuthSecurity, type BaseParameter, type BaseSchema, type BaseSecurity, type BasicAuthenticationSecurity, type BodyParameter, type Components, type ConnectedSocketClient, type Contact, type DefaultTokenPayload, type DynamicDbRouterOptions, type DynamicSwaggerOperation, type DynamicSwaggerOperationBody, type DynamicSwaggerPath, type DynamicSwaggerRequestBodyOperation, type ErrorsMapping, type ExpressReturn, type ExternalDocs, type FormDataParameter, type GenericFormat, type Header, type HeaderParameter, type Info, type IntegerFormat, type License, type ListOptions, type MethodPathHandling, type Methods, type NumberFormat, type OAuth2AccessCodeSecurity, type OAuth2ApplicationSecurity, type OAuth2ImplicitSecurity, type OAuth2PasswordSecurity, type OAuthScope, type Operation, type Parameter, type ParameterCollectionFormat, type ParameterType, type Path, type PathParameter, type ProjectConfigs, type QueryParameter, type Reference, type RequestBodyOperation, type Response, RouterWrapper, type RouterWrapperInterface, type Schema, type SchemaFormatConstraints, type SchemaV3, type SearchQuery, type SecureTokenConfig, type Security, type Server, type SocketConnectionMiddleware, type SocketConnectionNok, type SocketConnectionOk, SocketWrapper, type SocketWrapperConstructor, type Spec, Starter, type StarterOptions, type StringFormat, Swagger, type SwaggerMetadataInterface, type Tag, Token, type TokenApiOptions, type TokenConstructor, type XML, apiNok, apiOk, c, errorCatcher, fullLogNok, fullLogOk, getCompiledPath, i, log, sleep, socketNok, socketOk };
+export { type ApiKeySecurity, BackgroundService, type BaseFormatContrainedParameter, type BaseOAuthSecurity, type BaseParameter, type BaseSchema, type BaseSecurity, type BasicAuthenticationSecurity, type BodyParameter, type Components, type ConnectedSocketClient, type Contact, DbConnector, type DefaultTokenPayload, type DynamicDbRouterOptions, type DynamicSwaggerOperation, type DynamicSwaggerOperationBody, type DynamicSwaggerPath, type DynamicSwaggerRequestBodyOperation, type ErrorsMapping, type ExpressReturn, type ExternalDocs, type FormDataParameter, type GenericFormat, type Header, type HeaderParameter, type Info, type IntegerFormat, type License, type ListOptions, type MethodPathHandling, type Methods, type NumberFormat, type OAuth2AccessCodeSecurity, type OAuth2ApplicationSecurity, type OAuth2ImplicitSecurity, type OAuth2PasswordSecurity, type OAuthScope, type Operation, type Parameter, type ParameterCollectionFormat, type ParameterType, type Path, type PathParameter, type ProjectConfigs, type QueryParameter, type Reference, type RequestBodyOperation, type Response, RouterWrapper, type RouterWrapperInterface, type Schema, type SchemaFormatConstraints, type SchemaV3, type SearchQuery, type SecureTokenConfig, type Security, type Server, type SocketConnectionMiddleware, type SocketConnectionNok, type SocketConnectionOk, SocketWrapper, type SocketWrapperConstructor, type Spec, Starter, type StarterOptions, type StringFormat, Swagger, type SwaggerMetadataInterface, type Tag, Token, type TokenApiOptions, type TokenConstructor, type XML, apiNok, apiOk, c, errorCatcher, fullLogNok, fullLogOk, getCompiledPath, i, log, sleep, socketNok, socketOk };

package/dist/index.js

@@ -58,15 +58,9 @@ var BackgroundService = class {
   }
 };
 
-// src/RouterWrapper.ts
-var _express = require('express'); var _express2 = _interopRequireDefault(_express);
-
-// src/DynamicDbRouter.ts
-var _typeorm = require('typeorm');
-
 // src/DbConnector.ts
 require('reflect-metadata');
-
+var _typeorm = require('typeorm');
 var _DbConnector = class _DbConnector {
   constructor(projectConfig) {
     this.connect = async (entities, migrations, sync, logging = false) => {
@@ -113,6 +107,12 @@ var _DbConnector = class _DbConnector {
 _DbConnector.getDataSource = () => _DbConnector.DataSource;
 var DbConnector = _DbConnector;
 
+// src/RouterWrapper.ts
+var _express = require('express'); var _express2 = _interopRequireDefault(_express);
+
+// src/DynamicDbRouter.ts
+
+
 // src/Swagger.ts
 var _Swagger = class _Swagger {
 };
@@ -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,
@@ -962,4 +961,5 @@ var Token = class {
 
 
 
-exports.BackgroundService = BackgroundService; exports.RouterWrapper = RouterWrapper; exports.SocketWrapper = SocketWrapper; exports.Starter = Starter; exports.Swagger = Swagger; exports.Token = Token; exports.apiNok = apiNok; exports.apiOk = apiOk; exports.c = c; exports.errorCatcher = errorCatcher; exports.fullLogNok = fullLogNok; exports.fullLogOk = fullLogOk; exports.getCompiledPath = getCompiledPath; exports.i = i; exports.log = log; exports.sleep = sleep; exports.socketNok = socketNok; exports.socketOk = socketOk;
+
+exports.BackgroundService = BackgroundService; exports.DbConnector = DbConnector; exports.RouterWrapper = RouterWrapper; exports.SocketWrapper = SocketWrapper; exports.Starter = Starter; exports.Swagger = Swagger; exports.Token = Token; exports.apiNok = apiNok; exports.apiOk = apiOk; exports.c = c; exports.errorCatcher = errorCatcher; exports.fullLogNok = fullLogNok; exports.fullLogOk = fullLogOk; exports.getCompiledPath = getCompiledPath; exports.i = i; exports.log = log; exports.sleep = sleep; exports.socketNok = socketNok; exports.socketOk = socketOk;

package/dist/index.mjs

@@ -58,12 +58,6 @@ var BackgroundService = class {
   }
 };
 
-// src/RouterWrapper.ts
-import { Router } from "express";
-
-// src/DynamicDbRouter.ts
-import { EntityMetadataNotFoundError, Equal, Like } from "typeorm";
-
 // src/DbConnector.ts
 import "reflect-metadata";
 import { DataSource } from "typeorm";
@@ -113,6 +107,12 @@ var _DbConnector = class _DbConnector {
 _DbConnector.getDataSource = () => _DbConnector.DataSource;
 var DbConnector = _DbConnector;
 
+// src/RouterWrapper.ts
+import { Router } from "express";
+
+// src/DynamicDbRouter.ts
+import { EntityMetadataNotFoundError, Equal, Like } from "typeorm";
+
 // src/Swagger.ts
 var _Swagger = class _Swagger {
 };
@@ -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,
@@ -945,6 +944,7 @@ var Token = class {
 };
 export {
   BackgroundService,
+  DbConnector,
   RouterWrapper,
   SocketWrapper,
   Starter,

package/package.json

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