@obisey/nest 0.1.40 → 0.1.43

package/index.d.ts

@@ -10,6 +10,7 @@ export * from './prototipos/utils/formarInclude';
 export * from './prototipos/utils/formarorder';
 export * from './prototipos/utils/formarwhere';
 export * from './prototipos/utils/getModelId';
+export * from './prototipos/utils/json.scalar';
 export * from './assets/http-exception.filter';
 export * from './assets/tokens';
 export * from './types';

package/index.js

@@ -27,6 +27,7 @@ __exportStar(require("./prototipos/utils/formarInclude"), exports);
 __exportStar(require("./prototipos/utils/formarorder"), exports);
 __exportStar(require("./prototipos/utils/formarwhere"), exports);
 __exportStar(require("./prototipos/utils/getModelId"), exports);
+__exportStar(require("./prototipos/utils/json.scalar"), exports);
 __exportStar(require("./assets/http-exception.filter"), exports);
 __exportStar(require("./assets/tokens"), exports);
 __exportStar(require("./types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obisey/nest",
-  "version": "0.1.40",
+  "version": "0.1.43",
   "description": "NestJS utilities and base classes by Obisey",
   "main": "index.js",
   "types": "index.d.ts",

package/prototipos/baseController.d.ts

@@ -1,6 +1,6 @@
 import { Cache } from 'cache-manager';
 import { Fragmentos } from './utils/keyInterface';
-interface Peticion {
+export interface BaseControllerPeticion {
     ataque: Fragmentos[];
     defensa: Fragmentos[];
     promesa: (req: any, res: any, next: any, cache: any, conexion: any, http: any) => Promise<any>;
@@ -18,10 +18,9 @@ interface Peticion {
 export declare function BaseController(modelo: string): {
     new <T extends {
         cacheManager: any;
-        satelite(nombre: string, { ataque, defensa, promesa, entities, tipo, peticion: { req, res, next, cache, conexion }, http, }: Peticion): Promise<unknown>;
+        satelite(nombre: string, { ataque, defensa, promesa, entities, tipo, peticion: { req, res, next, cache, conexion }, http, }: BaseControllerPeticion): Promise<unknown>;
     }>(cacheManager: any): {
         cacheManager: any;
-        satelite(nombre: string, { ataque, defensa, promesa, entities, tipo, peticion: { req, res, next, cache, conexion }, http, }: Peticion): Promise<unknown>;
+        satelite(nombre: string, { ataque, defensa, promesa, entities, tipo, peticion: { req, res, next, cache, conexion }, http, }: BaseControllerPeticion): Promise<unknown>;
     };
 };
-export {};

package/prototipos/baseResolver.js

@@ -493,7 +493,7 @@ function BaseResolver(modelo) {
                             let ids = await this.redis.hGet(nkey, planeta);
                             if (ids) {
                                 Promise.all(JSON.parse(ids).map((id) => this.redis.hExists(pkey(id), 'item'))).then((exists) => {
-                                    if (!exists.includes(0)) {
+                                    if (!exists.includes(false)) {
                                         Promise.all(JSON.parse(ids).map(async (id) => await this.redis.hGet(pkey(id), 'item'))).then(resolve);
                                     }
                                     else

package/prototipos/baseService.d.ts

@@ -3,7 +3,7 @@ import { Key } from './utils/keyInterface';
 export declare const redis_on = true;
 import type { Cache } from 'cache-manager';
 type Ctor = new (...a: any[]) => any;
-interface Peticion {
+export interface BaseServicePeticion {
     value: any;
     key: Key;
     Clase: Ctor;
@@ -17,9 +17,9 @@ export declare function BaseService(modelo: string): {
     new <T extends {
         readonly redis: ReturnType<typeof createClient>;
         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>;
+        buscarXid<Ctor>({ value: { id, cacheable }, key, Clase, repository, pagina, }: BaseServicePeticion): Promise<Ctor>;
+        buscarTodos<Ctor>({ value, key, Clase, repository, pagina, cacheable, }: BaseServicePeticion): Promise<Ctor[]>;
+        crear<Ctor>({ value, key, Clase, repository, borrarSSR, }: BaseServicePeticion): Promise<Ctor>;
         contar({ value, repository, key }: {
             value: any;
             repository: any;
@@ -43,7 +43,7 @@ export declare function BaseService(modelo: string): {
             repository: any;
             borrarSSR?: any;
         }): Promise<unknown>;
-        buscaryContar<Ctor>({ value, key, Clase, repository, pagina, }: Peticion): Promise<{
+        buscaryContar<Ctor>({ value, key, Clase, repository, pagina, }: BaseServicePeticion): Promise<{
             count: number;
             rows: Ctor[];
         }>;
@@ -55,9 +55,9 @@ export declare function BaseService(modelo: string): {
     }>(redis: ReturnType<typeof createClient>, cacheManager: Cache): {
         readonly redis: ReturnType<typeof createClient>;
         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>;
+        buscarXid<Ctor>({ value: { id, cacheable }, key, Clase, repository, pagina, }: BaseServicePeticion): Promise<Ctor>;
+        buscarTodos<Ctor>({ value, key, Clase, repository, pagina, cacheable, }: BaseServicePeticion): Promise<Ctor[]>;
+        crear<Ctor>({ value, key, Clase, repository, borrarSSR, }: BaseServicePeticion): Promise<Ctor>;
         contar({ value, repository, key }: {
             value: any;
             repository: any;
@@ -81,7 +81,7 @@ export declare function BaseService(modelo: string): {
             repository: any;
             borrarSSR?: any;
         }): Promise<unknown>;
-        buscaryContar<Ctor>({ value, key, Clase, repository, pagina, }: Peticion): Promise<{
+        buscaryContar<Ctor>({ value, key, Clase, repository, pagina, }: BaseServicePeticion): Promise<{
             count: number;
             rows: Ctor[];
         }>;

package/prototipos/baseService.js

@@ -52,8 +52,7 @@ function BaseService(modelo) {
                     // }
                     let nkey = `${key.universo ? key.universo : 'pro'}:${key.IdEmpresa}:${key.fragmentos[0].nombre}:${id}`;
                     const { resultado, cache } = await (0, cachear_1.cachear)(cacheable, this.cacheManager, (0, keyInterface_1.transformarKey)({ ...key }), (cache) => {
-                        const ModelClass = repository.sequelize.models[(0, lodash_1.capitalize)(modelo)];
-                        return Promise.resolve(ModelClass.build(JSON.parse(cache), { raw: false, isNewRecord: false }));
+                        return Promise.resolve(repository.build(JSON.parse(cache), { raw: false, isNewRecord: false }));
                     }, (resultado) => {
                         return Promise.resolve(resultado
                             ? JSON.stringify(resultado.get({ plain: true }))
@@ -126,8 +125,7 @@ function BaseService(modelo) {
                         where,
                     }), (cache) => Promise.resolve(cache.map((n) => {
                         const parsed = JSON.parse(n);
-                        const ModelClass = repository.sequelize.models[(0, lodash_1.capitalize)(modelo)];
-                        return ModelClass.build(parsed, { raw: false, isNewRecord: false });
+                        return repository.build(parsed, { raw: false, isNewRecord: false });
                     })), (resultado) => {
                         return Promise.resolve(resultado.map((n) => JSON.stringify(n.get({ plain: true }))));
                     }, () => repository.findAll(value), () => new Promise(async (resolve) => {

package/prototipos/utils/json.scalar.d.ts

@@ -0,0 +1,21 @@
+import { CustomScalar } from '@nestjs/graphql';
+import { ValueNode } from 'graphql';
+/**
+ * Generic JSON scalar for NestJS GraphQL.
+ * Use for opaque JSON columns (DataType.JSON) where the shape is not fixed
+ * or is too complex to express as a @ObjectType (e.g. recursive AST trees).
+ *
+ * Usage in modelo.ts / type.ts:
+ *   import { JsonScalar } from '@obisey/nest';
+ *   @Field(() => JsonScalar, { nullable: true })
+ *   ast?: unknown;
+ *
+ * Register once in the NestJS module that owns the entity:
+ *   @Module({ providers: [JsonScalar], exports: [JsonScalar] })
+ */
+export declare class JsonScalar implements CustomScalar<unknown, unknown> {
+    description: string;
+    parseValue(value: unknown): unknown;
+    serialize(value: unknown): unknown;
+    parseLiteral(ast: ValueNode): unknown;
+}

package/prototipos/utils/json.scalar.js

@@ -0,0 +1,65 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonScalar = void 0;
+const graphql_1 = require("@nestjs/graphql");
+const graphql_2 = require("graphql");
+function parseLiteralValue(ast) {
+    switch (ast.kind) {
+        case graphql_2.Kind.STRING:
+        case graphql_2.Kind.BOOLEAN:
+            return ast.value;
+        case graphql_2.Kind.INT:
+        case graphql_2.Kind.FLOAT:
+            return parseFloat(ast.value);
+        case graphql_2.Kind.OBJECT: {
+            const obj = {};
+            ast.fields.forEach((field) => {
+                obj[field.name.value] = parseLiteralValue(field.value);
+            });
+            return obj;
+        }
+        case graphql_2.Kind.LIST:
+            return ast.values.map(parseLiteralValue);
+        case graphql_2.Kind.NULL:
+            return null;
+        default:
+            return undefined;
+    }
+}
+/**
+ * Generic JSON scalar for NestJS GraphQL.
+ * Use for opaque JSON columns (DataType.JSON) where the shape is not fixed
+ * or is too complex to express as a @ObjectType (e.g. recursive AST trees).
+ *
+ * Usage in modelo.ts / type.ts:
+ *   import { JsonScalar } from '@obisey/nest';
+ *   @Field(() => JsonScalar, { nullable: true })
+ *   ast?: unknown;
+ *
+ * Register once in the NestJS module that owns the entity:
+ *   @Module({ providers: [JsonScalar], exports: [JsonScalar] })
+ */
+let JsonScalar = class JsonScalar {
+    constructor() {
+        this.description = 'JSON scalar — any JSON-serializable value';
+    }
+    parseValue(value) {
+        return value;
+    }
+    serialize(value) {
+        return value;
+    }
+    parseLiteral(ast) {
+        return parseLiteralValue(ast);
+    }
+};
+exports.JsonScalar = JsonScalar;
+exports.JsonScalar = JsonScalar = __decorate([
+    (0, graphql_1.Scalar)('JSON', () => Object)
+], JsonScalar);

package/types.d.ts

@@ -1,4 +1,4 @@
-interface Peticion {
+export interface Peticion {
     where: any;
     include: any;
     cacheable?: any;
@@ -35,4 +35,3 @@ export declare class OrderInput {
     key: String;
 }
 export declare const UtilsTypes: (typeof Conteo | typeof Status | typeof ArgsFechas | typeof OrderInput)[];
-export {};