@obisey/nest 0.1.11 → 0.1.13

package/conexion.d.ts

@@ -1,24 +0,0 @@
-import { Sequelize } from 'sequelize-typescript';
-interface Dominio {
-    nombre: string;
-}
-export interface ConexionProps {
-    nombre: string;
-    id: string | number;
-    database: string;
-    username: string;
-    password: string;
-    host: string;
-    port: number;
-    dominios: Dominio[];
-}
-export declare class Conexion extends Sequelize {
-    constructor({ host, port, username, password, database }: {
-        host: any;
-        port: any;
-        username: any;
-        password: any;
-        database: any;
-    });
-}
-export {};

package/conexion.js

@@ -1,23 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Conexion = void 0;
-const sequelize_typescript_1 = require("sequelize-typescript");
-class Conexion extends sequelize_typescript_1.Sequelize {
-    constructor({ host, port, username, password, database }) {
-        super({
-            dialect: 'mysql',
-            host,
-            port,
-            username,
-            password,
-            database,
-            // logging : true,
-            logging: false,
-            sync: {
-                force: true,
-                alter: true,
-            },
-        });
-    }
-}
-exports.Conexion = Conexion;
+// import { Sequelize } from 'sequelize-typescript';
+// interface Dominio {
+// 	nombre: string;
+// }
+// export interface ConexionProps {
+// 	nombre: string;
+// 	id: string | number;
+// 	database: string;
+// 	username: string;
+// 	password: string;
+// 	host: string;
+// 	port: number;
+// 	dominios: Dominio[];
+// }
+// export class Conexion extends Sequelize {
+// 	constructor({ host, port, username, password, database }) {
+// 		super({
+// 			dialect: 'mysql',
+// 			host,
+// 			port,
+// 			username,
+// 			password,
+// 			database,
+// 			// logging : true,
+// 			logging: false,
+// 			sync: {
+// 				force: true,
+// 				alter: true,
+// 			},
+// 		});
+// 	}
+// }

package/index.d.ts

@@ -9,6 +9,5 @@ export * from './prototipos/utils/activarRedis';
 export * from './prototipos/utils/formarInclude';
 export * from './prototipos/utils/formarorder';
 export * from './prototipos/utils/formarwhere';
-export * from './redisStore';
 export * from './types';
 export * from './fecha';

package/index.js

@@ -26,6 +26,5 @@ __exportStar(require("./prototipos/utils/activarRedis"), exports);
 __exportStar(require("./prototipos/utils/formarInclude"), exports);
 __exportStar(require("./prototipos/utils/formarorder"), exports);
 __exportStar(require("./prototipos/utils/formarwhere"), exports);
-__exportStar(require("./redisStore"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./fecha"), exports);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@obisey/nest",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "NestJS utilities and base classes by Obisey",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "copy:assets": "cp package.json README.md dist/",
@@ -20,14 +20,14 @@
   "author": "Ulises",
   "license": "MIT",
   "peerDependencies": {
+    "@apollo/subgraph": "^2.5.0",
+    "graphql": "^16.11.0",
+    "graphql-scalars": "^1.23.0",
     "lodash": "^4.17.21",
     "sequelize": "^6.32.1",
     "sequelize-typescript": "^2.1.5",
-    "graphql": "^16.0.0",
-    "type-graphql": "^1.2.0",
-    "typegraphql-nestjs": "^0.7.0",
-    "@apollo/subgraph": "^2.5.0",
-    "graphql-scalars": "^1.23.0"
+    "type-graphql": "^1.2.0-beta.1",
+    "typegraphql-nestjs": "^0.7.0"
   },
   "devDependencies": {
     "@nestjs/axios": "^4.0.0",
@@ -35,16 +35,20 @@
     "@nestjs/common": "^10.3.3",
     "@nestjs/core": "^10.3.3",
     "@nestjs/graphql": "^12.2.2",
+    "@types/sequelize": "^4.28.20",
     "cache-manager": "^7.0.0",
     "cache-manager-redis-store": "^3.0.1",
     "graphql": "^16.11.0",
     "ioredis": "^5.6.1",
     "reflect-metadata": "^0.2.2",
+    "sequelize": "^6.32.1",
+    "sequelize-typescript": "^2.1.5",
+    "type-graphql": "^1.2.0-beta.1",
     "typegraphql-nestjs": "^0.7.0",
     "typescript": "^5.4.5"
   },
   "dependencies": {
     "dayjs": "^1.11.13",
-    "graphql-scalars": "^1.24.2"
+    "graphql-scalars": "^1.23.0"
   }
 }

package/prototipos/baseResolver.js

@@ -37,14 +37,8 @@ exports.BaseResolver = BaseResolver;
 const lodash_1 = require("lodash");
 const keyInterface_1 = require("./utils/keyInterface");
 const formarwhere_1 = require("./utils/formarwhere");
-// const chalk = require('chalk');
-// const log = console.log;
-// var imprimir = (texto) => {
-// 	log(chalk.green(texto));
-// };
 var tiempo = 86400000;
 var isDev = false;
-const redisStore_1 = require("../redisStore");
 const cachear_1 = require("./utils/cachear");
 const paginar_1 = require("./utils/paginar");
 const _ = __importStar(require("lodash"));
@@ -582,8 +576,7 @@ function BaseResolver(modelo) {
             });
         }
         async eliminarCache(items, borrarSSR = false) {
-            if (borrarSSR)
-                redisStore_1.clientSsr.flushdb();
+            // if (borrarSSR) clientSsr.flushdb();
             // log(
             // 	chalk.red(
             // 		'SE ELIMINOOOO ALGOOO!!!!!!!!!!!!!!',

package/prototipos/baseService.d.ts

@@ -1,3 +1,5 @@
+import { Cache } from 'cache-manager';
+import { RedisClientType } from 'redis';
 import { Key } from './utils/keyInterface';
 export declare const redis_on = true;
 type Ctor = new (...a: any[]) => any;
@@ -13,7 +15,8 @@ interface Peticion {
 }
 export declare function BaseService(modelo: string): {
     new <T extends {
-        cacheManager: any;
+        readonly redis: RedisClientType;
+        readonly cacheManager: Cache;
         buscarXid<Ctor>({ value: { id, cacheable }, key, Clase, repository, pagina, }: Peticion): Promise<Ctor>;
         buscarTodos<Ctor>({ value, key, Clase, repository, pagina, cacheable, }: Peticion): Promise<Ctor[]>;
         crear<Ctor>({ value, key, Clase, repository, borrarSSR, }: Peticion): Promise<Ctor>;
@@ -48,9 +51,10 @@ export declare function BaseService(modelo: string): {
             value: any;
             repository: any;
         }): Promise<Ctor>;
-        eliminarCache(items: string[], borrarSSR?: boolean): Promise<any[]>;
-    }>(cacheManager: any): {
-        cacheManager: any;
+        eliminarCache(items: string[], borrarSSR?: boolean): Promise<boolean[][]>;
+    }>(redis: RedisClientType, cacheManager: Cache): {
+        readonly redis: RedisClientType;
+        readonly cacheManager: Cache;
         buscarXid<Ctor>({ value: { id, cacheable }, key, Clase, repository, pagina, }: Peticion): Promise<Ctor>;
         buscarTodos<Ctor>({ value, key, Clase, repository, pagina, cacheable, }: Peticion): Promise<Ctor[]>;
         crear<Ctor>({ value, key, Clase, repository, borrarSSR, }: Peticion): Promise<Ctor>;
@@ -85,7 +89,7 @@ export declare function BaseService(modelo: string): {
             value: any;
             repository: any;
         }): Promise<Ctor>;
-        eliminarCache(items: string[], borrarSSR?: boolean): Promise<any[]>;
+        eliminarCache(items: string[], borrarSSR?: boolean): Promise<boolean[][]>;
     };
 };
 export {};

package/prototipos/baseService.js

@@ -7,7 +7,6 @@ exports.BaseService = BaseService;
 const lodash_1 = require("lodash");
 const cachear_1 = require("./utils/cachear");
 const cifrado_1 = require("./utils/cifrado");
-const redisStore_1 = require("../redisStore");
 const keyInterface_1 = require("./utils/keyInterface");
 exports.redis_on = true;
 const paginar_1 = require("./utils/paginar");
@@ -34,7 +33,9 @@ var stringifyInclude = ({ where, as, include }) => ({
 });
 function BaseService(modelo) {
     return class BaseService {
-        constructor(cacheManager) {
+        constructor(redis, // o ReturnType<typeof createClient>
+        cacheManager) {
+            this.redis = redis;
             this.cacheManager = cacheManager;
         }
         buscarXid({ value: { id, cacheable }, key, Clase, repository, pagina, }) {
@@ -62,19 +63,19 @@ function BaseService(modelo) {
                     () => repository.findByPk(id), //Pedir
                     () => new Promise(async (resolve) => {
                         //observar
-                        let e = await this.cacheManager.store.hexists(nkey, 'item');
+                        let e = await this.redis.hExists(nkey, 'item');
                         if (e) {
-                            let item = await this.cacheManager.store.hget(nkey, 'item');
+                            let item = await this.redis.hGet(nkey, 'item');
                             resolve(item);
                         }
                         else {
                             resolve(undefined);
                         }
                     }), (__, resultado) => {
-                        if (resultado)
-                            return this.cacheManager.store.hset(nkey, 'item', resultado);
-                        else
-                            return false;
+                        if (resultado) {
+                            this.redis.hSet(nkey, 'item', resultado);
+                        }
+                        return Promise.resolve(false);
                     });
                     if (resultado)
                         await (0, paginar_1.paginar)(this.cacheManager, key.IdEmpresa, pagina, modelo, resultado.get({ plain: true }));
@@ -132,13 +133,13 @@ function BaseService(modelo) {
                     () => new Promise((resolve) => {
                         resolve(repository.findAll(value)); //Pedir
                     }), () => new Promise(async (resolve) => {
-                        let e = await this.cacheManager.store.hexists(nkey, peticion);
+                        let e = await this.redis.hExists(nkey, peticion);
                         if (e) {
-                            let ids = await this.cacheManager.store.hget(nkey, peticion);
+                            let ids = await this.redis.hGet(nkey, peticion);
                             if (ids) {
-                                Promise.all(JSON.parse(ids).map(async (id) => await this.cacheManager.store.hexists(pkey(id), 'item'))).then((exists) => {
+                                Promise.all(JSON.parse(ids).map(async (id) => await this.redis.hExists(pkey(id), 'item'))).then((exists) => {
                                     if (!exists.includes(0)) {
-                                        Promise.all(JSON.parse(ids).map(async (id) => await this.cacheManager.store.hget(pkey(id), 'item'))).then(resolve);
+                                        Promise.all(JSON.parse(ids).map(async (id) => await this.redis.hGet(pkey(id), 'item'))).then(resolve);
                                     }
                                     else
                                         resolve(undefined);
@@ -151,7 +152,7 @@ function BaseService(modelo) {
                             resolve(undefined);
                     }), //observar
                     (__, resultado) => {
-                        return this.cacheManager.store.hset(nkey, peticion, JSON.stringify(resultado.map((n) => n.id)));
+                        return this.redis.hSet(nkey, peticion, JSON.stringify(resultado.map((n) => n.id)));
                     });
                     await (0, paginar_1.paginar)(this.cacheManager, key.IdEmpresa, pagina, modelo, resultado.map((n) => n.get({ plain: true })));
                     // if (isDev)
@@ -245,9 +246,9 @@ function BaseService(modelo) {
                     (resultado) => Promise.resolve(JSON.stringify(resultado)), //transformar
                     () => repository.count({ ...value, distinct: false }), //Pedir
                     () => new Promise(async (resolve) => {
-                        let e = await this.cacheManager.store.hexists(nkey, peticion);
+                        let e = await this.redis.hExists(nkey, peticion);
                         if (e) {
-                            let item = await this.cacheManager.store.hget(nkey, peticion);
+                            let item = await this.redis.hGet(nkey, peticion);
                             if (item) {
                                 resolve(item);
                             }
@@ -260,7 +261,7 @@ function BaseService(modelo) {
                         }
                     }), //observar
                     (__, resultado) => {
-                        return this.cacheManager.store.hset(nkey, peticion, resultado);
+                        return this.redis.hSet(nkey, peticion, resultado);
                     });
                     // let key$ : string = transformarKey({ nombre : 'contar', ...key, include, where : stringifWhere(where) })
                     // const cache = await this.cacheManager.get(key$)
@@ -327,7 +328,7 @@ function BaseService(modelo) {
                 try {
                     // imprimir(`${modelo} ${value.id} destruir`);
                     let resultado = await repository.destroy(value);
-                    this.cacheManager
+                    this.redis
                         .keys(`*:${modelo}*`) //Obten todos los keys
                         .then((keys) => Promise.all(keys.map((key) => this.cacheManager.del(key))));
                     resolve(resultado);
@@ -380,8 +381,7 @@ function BaseService(modelo) {
             });
         }
         async eliminarCache(items, borrarSSR = false) {
-            if (borrarSSR)
-                redisStore_1.clientSsr.flushdb();
+            // if (borrarSSR) clientSsr.flushdb();
             // log(
             // 	chalk.red(
             // 		'SSR: SE ELIMINOOOO ALGOOO!!!!!!!!!!!!!!',
@@ -389,7 +389,7 @@ function BaseService(modelo) {
             // 		borrarSSR,
             // 	),
             // );
-            return Promise.all(items.map(async (item) => this.cacheManager
+            return Promise.all(items.map(async (item) => this.redis
                 .keys(`*${item}*`)
                 .then((keys) => Promise.all(keys.map((key) => this.cacheManager.del(key))))));
         }

package/prototipos/utils/activarRedis.d.ts

@@ -1 +1 @@
-export declare function onRedis(datos: any, si?: boolean): any;
+export declare function onRedis(datos: any, si?: boolean): boolean;

package/prototipos/utils/formarInclude.d.ts

@@ -1,4 +1,4 @@
-export declare const formarInclude: (include: any, mapa: any, tipo: any, conexion: any, required?: boolean) => Promise<any>;
+export declare const formarInclude: (include: any, mapa: any, tipo: any, conexion: any, required?: boolean) => any;
 declare class FilterBasic {
     is: string;
 }

package/prototipos/utils/formarwhere.d.ts

@@ -1 +1 @@
-export declare const formarWhere: (where: any) => any;
+export declare const formarWhere: (where: any) => {};