@atls/nestjs-dataloader 0.0.9 → 0.0.11

package/CHANGELOG.md

@@ -0,0 +1,18 @@
+
+
+## 0.0.11 (2025-12-31)
+
+
+### Bug Fixes
+
+
+* **packages:** linter errors ([204ce22](https://github.com/atls/nestjs/commit/204ce229e375b09ffd69d93e47c08bd1d1fbea1b))
+* **packages:** linter errors ([d41854b](https://github.com/atls/nestjs/commit/d41854b94d5502ebf2b9e18d22cac33f98c8fc41))
+* **packages:** tests ([ae0f308](https://github.com/atls/nestjs/commit/ae0f308e695cfe39b4e2d38b6a33be4f7e5a8821))
+
+### Features
+
+
+* **common:** bump yarn, trigger release ([#338](https://github.com/atls/nestjs/issues/338)) ([9837d48](https://github.com/atls/nestjs/commit/9837d482f75928a3ac132d0306ab6de04d8a04b9))
+
+

package/dist/constants.d.ts

@@ -1 +1 @@
-export declare const GET_LOADER_CONTEXT_KEY: string;
+export declare const GET_LOADER_CONTEXT_KEY = "GET_LOADER_CONTEXT_KEY";

package/dist/constants.js

@@ -1,4 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GET_LOADER_CONTEXT_KEY = void 0;
-exports.GET_LOADER_CONTEXT_KEY = 'GET_LOADER_CONTEXT_KEY';
+export const GET_LOADER_CONTEXT_KEY = 'GET_LOADER_CONTEXT_KEY';

package/dist/decorators/index.d.ts

@@ -1,2 +1,2 @@
-export * from './order-result-by-key.decorator';
-export * from './loader.decorator';
+export * from './order-result-by-key.decorator.js';
+export * from './loader.decorator.js';

package/dist/decorators/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./order-result-by-key.decorator"), exports);
-__exportStar(require("./loader.decorator"), exports);
+export * from "./order-result-by-key.decorator.js";
+export * from "./loader.decorator.js";

package/dist/decorators/loader.decorator.js

@@ -1,19 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Loader = void 0;
-const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
-const graphql_1 = require("@nestjs/graphql");
-const common_2 = require("@nestjs/common");
-const constants_1 = require("../constants");
-const data_loader_interceptor_1 = require("../interceptors/data-loader.interceptor");
-exports.Loader = (0, common_2.createParamDecorator)((type, context) => {
-    const graphqlExecutionContext = graphql_1.GqlExecutionContext.create(context);
+import { InternalServerErrorException } from '@nestjs/common';
+import { APP_INTERCEPTOR } from '@nestjs/core';
+import { GqlExecutionContext } from '@nestjs/graphql';
+import { createParamDecorator } from '@nestjs/common';
+import { GET_LOADER_CONTEXT_KEY } from '../constants.js';
+import { DataLoaderInterceptor } from '../interceptors/index.js';
+export const Loader = createParamDecorator((type, context) => {
+    const graphqlExecutionContext = GqlExecutionContext.create(context);
     const ctx = graphqlExecutionContext.getContext();
-    if (ctx[constants_1.GET_LOADER_CONTEXT_KEY] === undefined) {
-        throw new common_1.InternalServerErrorException(`
-        You should provide interceptor ${data_loader_interceptor_1.DataLoaderInterceptor.name} globaly with ${core_1.APP_INTERCEPTOR}
+    if (ctx[GET_LOADER_CONTEXT_KEY] === undefined) {
+        throw new InternalServerErrorException(`
+        You should provide interceptor ${DataLoaderInterceptor.name} globaly with ${APP_INTERCEPTOR}
       `);
     }
-    return ctx[constants_1.GET_LOADER_CONTEXT_KEY](type);
+    const getLoader = ctx[GET_LOADER_CONTEXT_KEY];
+    return getLoader(type);
 });

package/dist/decorators/order-result-by-key.decorator.d.ts

@@ -1 +1 @@
-export declare const OrderResultByKey: (key?: string, defaultValue?: undefined) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+export declare const OrderResultByKey: (key?: string, defaultValue?: unknown) => (target: object, propertyKey: string, descriptor: PropertyDescriptor) => PropertyDescriptor;

package/dist/decorators/order-result-by-key.decorator.js

@@ -1,17 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrderResultByKey = void 0;
-const OrderResultByKey = (key = 'id', defaultValue = undefined) => (target, propertyKey, descriptor) => {
+const normalizeKey = (value) => {
+    if (typeof value === 'string' || typeof value === 'number') {
+        return String(value);
+    }
+    if (typeof value === 'symbol') {
+        return value.toString();
+    }
+    return undefined;
+};
+export const OrderResultByKey = (key = 'id', defaultValue = undefined) => (target, propertyKey, descriptor) => {
     const original = descriptor.value;
     descriptor.value = async function (keys, ...args) {
         const method = original.bind(this);
         const result = await method(keys, ...args);
-        const resultByKey = result.reduce((res, item) => ({
-            ...res,
-            [item[key]]: item,
-        }), {});
-        return keys.map((itemKey) => resultByKey[itemKey] || defaultValue);
+        const resultByKey = result.reduce((res, item) => {
+            const itemKey = item[key];
+            const normalizedKey = normalizeKey(itemKey);
+            if (normalizedKey !== undefined) {
+                res[normalizedKey] = item;
+            }
+            return res;
+        }, {});
+        return keys.map((itemKey) => {
+            const normalizedKey = normalizeKey(itemKey);
+            if (normalizedKey === undefined) {
+                return defaultValue;
+            }
+            return resultByKey[normalizedKey] ?? defaultValue;
+        });
     };
     return descriptor;
 };
-exports.OrderResultByKey = OrderResultByKey;

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './decorators';
-export * from './interceptors';
-export * from './interfaces';
+export * from './decorators/index.js';
+export * from './interceptors/index.js';
+export type * from './interfaces/index.js';

package/dist/index.js

@@ -1,19 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./decorators"), exports);
-__exportStar(require("./interceptors"), exports);
-__exportStar(require("./interfaces"), exports);
+export * from "./decorators/index.js";
+export * from "./interceptors/index.js";

package/dist/interceptors/data-loader.interceptor.d.ts

@@ -1,10 +1,10 @@
-import { CallHandler } from '@nestjs/common';
-import { ExecutionContext } from '@nestjs/common';
-import { NestInterceptor } from '@nestjs/common';
+import type { CallHandler } from '@nestjs/common';
+import type { ExecutionContext } from '@nestjs/common';
+import type { NestInterceptor } from '@nestjs/common';
+import type { Observable } from 'rxjs';
 import { ModuleRef } from '@nestjs/core';
-import { Observable } from 'rxjs';
 export declare class DataLoaderInterceptor implements NestInterceptor {
     private readonly moduleRef;
     constructor(moduleRef: ModuleRef);
-    intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
+    intercept(context: ExecutionContext, next: CallHandler): Observable<unknown>;
 }

package/dist/interceptors/data-loader.interceptor.js

@@ -1,4 +1,3 @@
-"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);
@@ -8,40 +7,43 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataLoaderInterceptor = void 0;
-const common_1 = require("@nestjs/common");
-const common_2 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
-const graphql_1 = require("@nestjs/graphql");
-const constants_1 = require("../constants");
+import { Injectable } from '@nestjs/common';
+import { InternalServerErrorException } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
+import { GqlExecutionContext } from '@nestjs/graphql';
+import { GET_LOADER_CONTEXT_KEY } from '../constants.js';
 let DataLoaderInterceptor = class DataLoaderInterceptor {
+    moduleRef;
     constructor(moduleRef) {
         this.moduleRef = moduleRef;
     }
     intercept(context, next) {
-        const graphqlExecutionContext = graphql_1.GqlExecutionContext.create(context);
+        const graphqlExecutionContext = GqlExecutionContext.create(context);
         const ctx = graphqlExecutionContext.getContext();
-        if (ctx[constants_1.GET_LOADER_CONTEXT_KEY] === undefined) {
-            ctx[constants_1.GET_LOADER_CONTEXT_KEY] = (type) => {
-                if (ctx[type] === undefined) {
-                    try {
-                        ctx[type] = this.moduleRef
-                            .get(type, { strict: false })
-                            .generateDataLoader();
-                    }
-                    catch (e) {
-                        throw new common_2.InternalServerErrorException(`The loader ${type} is not provided`);
-                    }
+        const loaders = ctx;
+        if (ctx[GET_LOADER_CONTEXT_KEY] === undefined) {
+            ctx[GET_LOADER_CONTEXT_KEY] = (type) => {
+                const existing = loaders[type];
+                if (existing) {
+                    return existing;
+                }
+                try {
+                    const loader = this.moduleRef
+                        .get(type, { strict: false })
+                        .generateDataLoader();
+                    loaders[type] = loader;
+                    return loader;
+                }
+                catch {
+                    throw new InternalServerErrorException(`The loader ${type} is not provided`);
                 }
-                return ctx[type];
             };
         }
         return next.handle();
     }
 };
 DataLoaderInterceptor = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [core_1.ModuleRef])
+    Injectable(),
+    __metadata("design:paramtypes", [ModuleRef])
 ], DataLoaderInterceptor);
-exports.DataLoaderInterceptor = DataLoaderInterceptor;
+export { DataLoaderInterceptor };

package/dist/interceptors/index.d.ts

@@ -1 +1 @@
-export * from './data-loader.interceptor';
+export * from './data-loader.interceptor.js';

package/dist/interceptors/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./data-loader.interceptor"), exports);
+export * from "./data-loader.interceptor.js";

package/dist/interfaces/index.d.ts

@@ -1 +1 @@
-export * from './nest-dataloader.interfaces';
+export type * from './nest-dataloader.interfaces.js';

package/dist/interfaces/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./nest-dataloader.interfaces"), exports);
+export {};

package/dist/interfaces/nest-dataloader.interfaces.d.ts

@@ -1,4 +1,4 @@
-import DataLoader from 'dataloader';
+import type DataLoader from 'dataloader';
 export interface NestDataLoader {
-    generateDataLoader(): DataLoader<any, any>;
+    generateDataLoader: () => DataLoader<unknown, unknown>;
 }

package/dist/interfaces/nest-dataloader.interfaces.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/package.json

@@ -1,7 +1,16 @@
 {
   "name": "@atls/nestjs-dataloader",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "license": "BSD-3-Clause",
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -15,32 +24,38 @@
     "dataloader": "2.2.2"
   },
   "devDependencies": {
-    "@nestjs/common": "patch:@nestjs/common@npm%3A10.2.5#~/.yarn/patches/@nestjs-common-npm-10.2.5-816dceeade.patch",
-    "@nestjs/core": "10.2.5",
-    "@nestjs/graphql": "12.0.9",
-    "@nestjs/microservices": "10.2.5",
-    "@nestjs/testing": "10.2.5",
-    "@types/lodash": "4.14.198",
-    "@types/node": "20.6.0",
-    "get-port": "7.0.0",
-    "graphql": "16.8.0",
-    "reflect-metadata": "0.1.13",
-    "rxjs": "7.5.4",
-    "supertest": "6.3.3",
+    "@nestjs/common": "10.4.1",
+    "@nestjs/core": "10.4.1",
+    "@nestjs/graphql": "12.2.0",
+    "@nestjs/microservices": "10.4.1",
+    "@types/lodash": "4.17.7",
+    "@types/node": "22.5.5",
+    "graphql": "16.9.0",
+    "reflect-metadata": "0.2.2",
+    "rxjs": "7.8.1",
     "ts-morph": "19.0.0",
     "ws": "8.14.1"
   },
   "peerDependencies": {
-    "@nestjs/common": "10.2.5",
-    "@nestjs/core": "10.2.5",
-    "@nestjs/graphql": "12.0.9",
-    "graphql": "16.8.0",
-    "reflect-metadata": "0.1.13",
-    "rxjs": "7.8.1"
+    "@nestjs/common": "10",
+    "@nestjs/core": "10",
+    "@nestjs/graphql": "12",
+    "graphql": "16",
+    "reflect-metadata": "0.2",
+    "rxjs": "7"
   },
   "publishConfig": {
+    "exports": {
+      "./package.json": "./package.json",
+      ".": {
+        "import": "./dist/index.js",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
     "main": "dist/index.js",
     "typings": "dist/index.d.ts"
   },
+  "typecheckSkipLibCheck": true,
   "typings": "dist/index.d.ts"
 }