@klerick/json-api-nestjs-shared 1.0.0-beta.3 → 1.0.0-beta.5

package/CHANGELOG.md

@@ -0,0 +1,46 @@
+## 1.0.0-beta.5 (2026-01-23)
+
+### 🚀 Features
+
+- **json-api-nestjs-shared:** enhance type utilities with `UnwrapReference`, `FunctionKeys`, and refine `PropertyKeys` logic ([d864270](https://github.com/klerick/nestjs-json-api/commit/d864270))
+
+### ❤️ Thank You
+
+- Alex H
+
+## 1.0.0-beta.4 (2025-11-13)
+
+### 🚀 Features
+
+- **json-api-nestjs-shared:** fix after update nx ([e4ef59f](https://github.com/klerick/nestjs-json-api/commit/e4ef59f))
+- **json-api-nestjs-shared:** fix after update nx ([4c7a42d](https://github.com/klerick/nestjs-json-api/commit/4c7a42d))
+
+### 🩹 Fixes
+
+- **json-api-nestjs-shared:** refine `RelationCheck` type logic to handle nested promises and exclude undefined types ([d5c1ea7](https://github.com/klerick/nestjs-json-api/commit/d5c1ea7))
+
+### ❤️ Thank You
+
+- Alex H
+
+## 1.0.0-beta.3 (2025-05-23)
+
+### 🚀 Features
+
+- **json-api-nestjs,json-api-nestjs-microorm,json-api-nestjs-sdk,json-api-nestjs-shared,json-api-nestjs-typeorm:** up nestjs ([42b6b82](https://github.com/klerick/nestjs-json-api/commit/42b6b82))
+
+### ❤️ Thank You
+
+- Alex H
+
+## 1.0.0-beta.0 (2025-05-21)
+
+### 🚀 Features
+
+- **json-api-nestjs-shared:** Use new structure ([4359ac7](https://github.com/klerick/nestjs-json-api/commit/4359ac7))
+- **json-api-nestjs-shared:** Use shared type from separate package ([1a1c859](https://github.com/klerick/nestjs-json-api/commit/1a1c859))
+- **json-api-nestjs:** Microro orm ([4696f51](https://github.com/klerick/nestjs-json-api/commit/4696f51))
+
+### ❤️ Thank You
+
+- Alex H

package/README.md

@@ -0,0 +1,17 @@
+<p align='center'>
+  <a href="https://www.npmjs.com/package/@klerick/json-api-nestjs-shared" target="_blank"><img src="https://img.shields.io/npm/v/@klerick/json-api-nestjs-shared.svg" alt="NPM Version" /></a>
+  <a href="https://www.npmjs.com/package/@klerick/json-api-nestjs-shared" target="_blank"><img src="https://img.shields.io/npm/l/@klerick/json-api-nestjs-shared.svg" alt="Package License" /></a>
+  <a href="https://www.npmjs.com/package/@klerick/json-api-nestjs-shared" target="_blank"><img src="https://img.shields.io/npm/dm/@klerick/json-api-nestjs-shared.svg" alt="NPM Downloads" /></a>
+  <a href="http://commitizen.github.io/cz-cli/" target="_blank"><img src="https://img.shields.io/badge/commitizen-friendly-brightgreen.svg" alt="Commitizen friendly" /></a>
+  <img src="https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/klerick/02a4c98cf7008fea2af70dc2d50f4cb7/raw/json-api-nestjs-microorm.json" alt="Coverage Badge" />
+</p>
+
+# json-api-nestjs-shared
+
+Helper module for **[json-api-nestjs](https://github.com/klerick/nestjs-json-api/tree/master/libs/json-api/json-api-nestjs)**
+
+## Installation
+
+```bash  
+$ npm install @klerick/json-api-nestjs-shared
+```  

package/cjs/src/lib/types/entity-type.d.ts

@@ -1,13 +1,21 @@
-import { Any } from 'ts-toolbelt';
-export type HasId<T, IdKey extends string> = Any.At<T, IdKey> extends undefined ? 0 : 1;
+export type HasId<T, IdKey extends string> = IdKey extends keyof T ? 1 : 0;
+type UnwrapReference<T> = T extends {
+    unwrap: Function;
+} ? T extends {
+    unwrap(): infer U;
+} ? U & {} : T : T;
 export type CastIteratorType<T> = T extends {
     [Symbol.iterator](): Iterator<infer U>;
-} ? U : T;
-type RelationCheck<T, IdKey extends string> = T extends never ? 0 : T extends Promise<infer U> ? HasId<U, IdKey> : HasId<CastIteratorType<T>, IdKey>;
+} ? U : UnwrapReference<T>;
+type RelationCheck<T, IdKey extends string> = T extends never ? 0 : T extends Promise<infer U> ? RelationCheck<U, IdKey> : HasId<Exclude<CastIteratorType<T>, undefined>, IdKey>;
+type StringKeys<E> = Extract<keyof E, string>;
+type FunctionKeys<E> = {
+    [K in StringKeys<E>]: E[K] extends Function ? K : never;
+}[StringKeys<E>];
 export type RelationKeys<E, IdKey extends string = 'id'> = {
-    [K in keyof E]: Exclude<E[K], null> extends never ? never : RelationCheck<Exclude<E[K], null>, IdKey> extends 1 ? K : never;
-}[keyof E];
-export type PropertyKeys<E, IdKey extends string = 'id'> = keyof Omit<E, RelationKeys<E, IdKey>>;
+    [K in StringKeys<E>]: Exclude<E[K], null> extends never ? never : RelationCheck<Exclude<E[K], null>, IdKey> extends 1 ? K : never;
+}[StringKeys<E>];
+export type PropertyKeys<E, IdKey extends string = 'id'> = Exclude<StringKeys<E>, RelationKeys<E, IdKey> | FunctionKeys<E> | IdKey>;
 export type IsIterator<T> = T extends {
     [Symbol.iterator](): Iterator<any>;
 } ? 1 : 0;

package/cjs/src/lib/types/entity-type.test-d.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/src/lib/types/entity-type.test-d.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tsd_1 = require("tsd");
+(0, tsd_1.expectType)(1);
+(0, tsd_1.expectType)(1);
+(0, tsd_1.expectType)(0);
+(0, tsd_1.expectType)(1);
+(0, tsd_1.expectType)(1);
+(0, tsd_1.expectType)(0);
+(0, tsd_1.expectType)(1);
+(0, tsd_1.expectType)(1);
+(0, tsd_1.expectType)(0);
+//# sourceMappingURL=entity-type.test-d.js.map

package/cjs/src/lib/types/entity-type.test-d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-type.test-d.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-shared/src/lib/types/entity-type.test-d.ts"],"names":[],"mappings":";;AAAA,6BAAiC;AAqDjC,IAAA,gBAAU,EAAqB,CAAC,CAAC,CAAC;AAClC,IAAA,gBAAU,EAAuB,CAAC,CAAC,CAAC;AACpC,IAAA,gBAAU,EAAyB,CAAC,CAAC,CAAC;AAEtC,IAAA,gBAAU,EAAqB,CAAC,CAAC,CAAC;AAClC,IAAA,gBAAU,EAAuB,CAAC,CAAC,CAAC;AACpC,IAAA,gBAAU,EAAyB,CAAC,CAAC,CAAC;AAKtC,IAAA,gBAAU,EAAyB,CAAC,CAAC,CAAC;AACtC,IAAA,gBAAU,EAA8B,CAAC,CAAC,CAAC;AAC3C,IAAA,gBAAU,EAAoB,CAAC,CAAC,CAAC"}

package/cjs/src/lib/types/response-body.test-d.d.ts

@@ -0,0 +1 @@
+export {};

package/cjs/src/lib/types/response-body.test-d.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tsd_1 = require("tsd");
+const CheckBaseMeta = {
+    meta: { time: 1 },
+};
+const CheckBaseMetaExtend = {
+    meta: { time: 1, someData: '' },
+};
+const CheckBaseMetaForArray = {
+    meta: { time: 1, pageSize: 0, pageNumber: 0, totalItems: 0 },
+};
+(0, tsd_1.expectAssignable)(CheckBaseMeta);
+(0, tsd_1.expectAssignable)(CheckBaseMetaExtend);
+(0, tsd_1.expectAssignable)(CheckBaseMetaForArray);
+const CheckAttributes = {
+    firstName: '',
+    lastName: '',
+    login: '',
+    isActive: null,
+    testDate: new Date(),
+    testArrayNull: null,
+    testReal: [1],
+    createdAt: new Date(),
+    updatedAt: new Date(),
+};
+(0, tsd_1.expectAssignable)(CheckAttributes);
+const CheckInclude = {
+    id: '1',
+    type: 'users',
+    attributes: CheckAttributes,
+    relationships: {
+        addresses: {
+            links: {
+                self: 'selflinks',
+            },
+        },
+        manager: {
+            links: {
+                self: 'selflinks',
+            },
+            data: {
+                type: 'users',
+                id: 'dssd',
+            },
+        },
+        comments: {
+            links: {
+                self: 'selfLinks',
+            },
+            data: [{ id: '1', type: 'comments' }],
+        },
+        roles: {
+            links: {
+                self: 'selfLinks',
+            },
+            data: [{ id: '1', type: 'roles' }],
+        },
+        userGroup: {
+            links: { self: 'selfLinks' },
+            data: null,
+        },
+    },
+    links: { self: 'selfLinks' },
+};
+(0, tsd_1.expectAssignable)(CheckInclude);
+const CheckResourceObject = {
+    meta: CheckBaseMeta.meta,
+    data: {
+        id: '1',
+        type: 'users',
+        attributes: CheckAttributes,
+        links: { self: 'selfLinks' },
+    },
+};
+const CheckResourceObjectArray = {
+    meta: CheckBaseMetaForArray.meta,
+    data: [
+        {
+            id: '1',
+            type: 'users',
+            attributes: CheckAttributes,
+            relationships: {
+                addresses: {
+                    links: {
+                        self: 'selflinks',
+                    },
+                },
+                manager: {
+                    links: {
+                        self: 'selflinks',
+                    },
+                    data: {
+                        type: 'users',
+                        id: 'dssd',
+                    },
+                },
+                comments: {
+                    links: {
+                        self: 'selfLinks',
+                    },
+                    data: [{ id: '1', type: 'comments' }],
+                },
+                roles: {
+                    links: {
+                        self: 'selfLinks',
+                    },
+                    data: [{ id: '1', type: 'roles' }],
+                },
+                userGroup: {
+                    links: { self: 'selfLinks' },
+                    data: null,
+                },
+            },
+            links: { self: 'selfLinks' },
+        },
+    ],
+};
+(0, tsd_1.expectAssignable)(CheckResourceObject);
+(0, tsd_1.expectAssignable)(CheckResourceObjectArray);
+const CheckResourceObjectRelationships = {
+    meta: {
+        time: 1,
+    },
+    data: {
+        id: '1',
+        type: 'users-groups',
+    },
+};
+const CheckResourceObjectRelationshipsArray = {
+    meta: {
+        time: 1,
+    },
+    data: [
+        {
+            id: '1',
+            type: 'users-groups',
+        },
+    ],
+};
+(0, tsd_1.expectAssignable)(CheckResourceObjectRelationships);
+(0, tsd_1.expectAssignable)(CheckResourceObjectRelationshipsArray);
+//# sourceMappingURL=response-body.test-d.js.map

package/cjs/src/lib/types/response-body.test-d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-body.test-d.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-shared/src/lib/types/response-body.test-d.ts"],"names":[],"mappings":"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"}

package/cjs/src/lib/utils/___test___/test-classes.helper.d.ts

@@ -0,0 +1,53 @@
+import { Collection } from '@mikro-orm/core';
+type IUsers = Users;
+export declare class Users {
+    id: number;
+    login: string;
+    firstName: string;
+    testReal: number[];
+    testArrayNull: number[] | null;
+    lastName: string | null;
+    isActive: null;
+    testDate: Date;
+    createdAt: Date;
+    updatedAt: Date;
+    addresses: IAddresses;
+    manager: IUsers;
+    roles: Collection<Roles, object>;
+    comments: Comments[];
+    userGroup: UserGroups | null;
+}
+export declare class Roles {
+    id: number;
+    name: string;
+    key: string;
+    isDefault: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare class UserGroups {
+    id: number;
+    label: string;
+}
+type IAddresses = Addresses;
+export declare class Addresses {
+    id: number;
+    city: string;
+    state: string;
+    country: string;
+    arrayField: string[];
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare class Comments {
+    id: number;
+    kind: CommentKind;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare enum CommentKind {
+    Comment = "COMMENT",
+    Message = "MESSAGE",
+    Note = "NOTE"
+}
+export {};

package/cjs/src/lib/utils/___test___/test-classes.helper.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentKind = exports.Comments = exports.Addresses = exports.UserGroups = exports.Roles = exports.Users = void 0;
+const core_1 = require("@mikro-orm/core");
+class Users {
+    constructor() {
+        this.testReal = [];
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
+        this.roles = new core_1.Collection(this);
+    }
+}
+exports.Users = Users;
+class Roles {
+    constructor() {
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
+    }
+}
+exports.Roles = Roles;
+class UserGroups {
+}
+exports.UserGroups = UserGroups;
+class Addresses {
+    constructor() {
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
+    }
+}
+exports.Addresses = Addresses;
+class Comments {
+    constructor() {
+        this.createdAt = new Date();
+        this.updatedAt = new Date();
+    }
+}
+exports.Comments = Comments;
+var CommentKind;
+(function (CommentKind) {
+    CommentKind["Comment"] = "COMMENT";
+    CommentKind["Message"] = "MESSAGE";
+    CommentKind["Note"] = "NOTE";
+})(CommentKind || (exports.CommentKind = CommentKind = {}));
+//# sourceMappingURL=test-classes.helper.js.map

package/cjs/src/lib/utils/___test___/test-classes.helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-classes.helper.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs-shared/src/lib/utils/___test___/test-classes.helper.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAE7C,MAAa,KAAK;IAAlB;QAIS,aAAQ,GAAa,EAAE,CAAC;QAKxB,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAI7B,UAAK,GAAG,IAAI,iBAAU,CAAQ,IAAI,CAAC,CAAC;IAG7C,CAAC;CAAA;AAjBD,sBAiBC;AAED,MAAa,KAAK;IAAlB;QAKE,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC/B,CAAC;CAAA;AAPD,sBAOC;AAED,MAAa,UAAU;CAGtB;AAHD,gCAGC;AAED,MAAa,SAAS;IAAtB;QAME,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC/B,CAAC;CAAA;AARD,8BAQC;AAED,MAAa,QAAQ;IAArB;QAGE,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,cAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC/B,CAAC;CAAA;AALD,4BAKC;AACD,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,4BAAa,CAAA;AACf,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB"}

package/mjs/src/lib/types/entity-type.d.ts

@@ -1,13 +1,21 @@
-import { Any } from 'ts-toolbelt';
-export type HasId<T, IdKey extends string> = Any.At<T, IdKey> extends undefined ? 0 : 1;
+export type HasId<T, IdKey extends string> = IdKey extends keyof T ? 1 : 0;
+type UnwrapReference<T> = T extends {
+    unwrap: Function;
+} ? T extends {
+    unwrap(): infer U;
+} ? U & {} : T : T;
 export type CastIteratorType<T> = T extends {
     [Symbol.iterator](): Iterator<infer U>;
-} ? U : T;
-type RelationCheck<T, IdKey extends string> = T extends never ? 0 : T extends Promise<infer U> ? HasId<U, IdKey> : HasId<CastIteratorType<T>, IdKey>;
+} ? U : UnwrapReference<T>;
+type RelationCheck<T, IdKey extends string> = T extends never ? 0 : T extends Promise<infer U> ? RelationCheck<U, IdKey> : HasId<Exclude<CastIteratorType<T>, undefined>, IdKey>;
+type StringKeys<E> = Extract<keyof E, string>;
+type FunctionKeys<E> = {
+    [K in StringKeys<E>]: E[K] extends Function ? K : never;
+}[StringKeys<E>];
 export type RelationKeys<E, IdKey extends string = 'id'> = {
-    [K in keyof E]: Exclude<E[K], null> extends never ? never : RelationCheck<Exclude<E[K], null>, IdKey> extends 1 ? K : never;
-}[keyof E];
-export type PropertyKeys<E, IdKey extends string = 'id'> = keyof Omit<E, RelationKeys<E, IdKey>>;
+    [K in StringKeys<E>]: Exclude<E[K], null> extends never ? never : RelationCheck<Exclude<E[K], null>, IdKey> extends 1 ? K : never;
+}[StringKeys<E>];
+export type PropertyKeys<E, IdKey extends string = 'id'> = Exclude<StringKeys<E>, RelationKeys<E, IdKey> | FunctionKeys<E> | IdKey>;
 export type IsIterator<T> = T extends {
     [Symbol.iterator](): Iterator<any>;
 } ? 1 : 0;

package/mjs/src/lib/types/entity-type.test-d.d.ts

@@ -0,0 +1 @@
+export {};

package/mjs/src/lib/types/entity-type.test-d.js

@@ -0,0 +1,11 @@
+import { expectType } from 'tsd';
+expectType(1);
+expectType(1);
+expectType(0);
+expectType(1);
+expectType(1);
+expectType(0);
+expectType(1);
+expectType(1);
+expectType(0);
+//# sourceMappingURL=entity-type.test-d.js.map

package/mjs/src/lib/types/entity-type.test-d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-type.test-d.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-shared/src/lib/types/entity-type.test-d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAqDjC,UAAU,CAAqB,CAAC,CAAC,CAAC;AAClC,UAAU,CAAuB,CAAC,CAAC,CAAC;AACpC,UAAU,CAAyB,CAAC,CAAC,CAAC;AAEtC,UAAU,CAAqB,CAAC,CAAC,CAAC;AAClC,UAAU,CAAuB,CAAC,CAAC,CAAC;AACpC,UAAU,CAAyB,CAAC,CAAC,CAAC;AAKtC,UAAU,CAAyB,CAAC,CAAC,CAAC;AACtC,UAAU,CAA8B,CAAC,CAAC,CAAC;AAC3C,UAAU,CAAoB,CAAC,CAAC,CAAC"}

package/mjs/src/lib/types/response-body.test-d.d.ts

@@ -0,0 +1 @@
+export {};

package/mjs/src/lib/types/response-body.test-d.js

@@ -0,0 +1,141 @@
+import { expectAssignable } from 'tsd';
+const CheckBaseMeta = {
+    meta: { time: 1 },
+};
+const CheckBaseMetaExtend = {
+    meta: { time: 1, someData: '' },
+};
+const CheckBaseMetaForArray = {
+    meta: { time: 1, pageSize: 0, pageNumber: 0, totalItems: 0 },
+};
+expectAssignable(CheckBaseMeta);
+expectAssignable(CheckBaseMetaExtend);
+expectAssignable(CheckBaseMetaForArray);
+const CheckAttributes = {
+    firstName: '',
+    lastName: '',
+    login: '',
+    isActive: null,
+    testDate: new Date(),
+    testArrayNull: null,
+    testReal: [1],
+    createdAt: new Date(),
+    updatedAt: new Date(),
+};
+expectAssignable(CheckAttributes);
+const CheckInclude = {
+    id: '1',
+    type: 'users',
+    attributes: CheckAttributes,
+    relationships: {
+        addresses: {
+            links: {
+                self: 'selflinks',
+            },
+        },
+        manager: {
+            links: {
+                self: 'selflinks',
+            },
+            data: {
+                type: 'users',
+                id: 'dssd',
+            },
+        },
+        comments: {
+            links: {
+                self: 'selfLinks',
+            },
+            data: [{ id: '1', type: 'comments' }],
+        },
+        roles: {
+            links: {
+                self: 'selfLinks',
+            },
+            data: [{ id: '1', type: 'roles' }],
+        },
+        userGroup: {
+            links: { self: 'selfLinks' },
+            data: null,
+        },
+    },
+    links: { self: 'selfLinks' },
+};
+expectAssignable(CheckInclude);
+const CheckResourceObject = {
+    meta: CheckBaseMeta.meta,
+    data: {
+        id: '1',
+        type: 'users',
+        attributes: CheckAttributes,
+        links: { self: 'selfLinks' },
+    },
+};
+const CheckResourceObjectArray = {
+    meta: CheckBaseMetaForArray.meta,
+    data: [
+        {
+            id: '1',
+            type: 'users',
+            attributes: CheckAttributes,
+            relationships: {
+                addresses: {
+                    links: {
+                        self: 'selflinks',
+                    },
+                },
+                manager: {
+                    links: {
+                        self: 'selflinks',
+                    },
+                    data: {
+                        type: 'users',
+                        id: 'dssd',
+                    },
+                },
+                comments: {
+                    links: {
+                        self: 'selfLinks',
+                    },
+                    data: [{ id: '1', type: 'comments' }],
+                },
+                roles: {
+                    links: {
+                        self: 'selfLinks',
+                    },
+                    data: [{ id: '1', type: 'roles' }],
+                },
+                userGroup: {
+                    links: { self: 'selfLinks' },
+                    data: null,
+                },
+            },
+            links: { self: 'selfLinks' },
+        },
+    ],
+};
+expectAssignable(CheckResourceObject);
+expectAssignable(CheckResourceObjectArray);
+const CheckResourceObjectRelationships = {
+    meta: {
+        time: 1,
+    },
+    data: {
+        id: '1',
+        type: 'users-groups',
+    },
+};
+const CheckResourceObjectRelationshipsArray = {
+    meta: {
+        time: 1,
+    },
+    data: [
+        {
+            id: '1',
+            type: 'users-groups',
+        },
+    ],
+};
+expectAssignable(CheckResourceObjectRelationships);
+expectAssignable(CheckResourceObjectRelationshipsArray);
+//# sourceMappingURL=response-body.test-d.js.map

package/mjs/src/lib/types/response-body.test-d.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-body.test-d.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-shared/src/lib/types/response-body.test-d.ts"],"names":[],"mappings":"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"}

package/mjs/src/lib/utils/___test___/test-classes.helper.d.ts

@@ -0,0 +1,53 @@
+import { Collection } from '@mikro-orm/core';
+type IUsers = Users;
+export declare class Users {
+    id: number;
+    login: string;
+    firstName: string;
+    testReal: number[];
+    testArrayNull: number[] | null;
+    lastName: string | null;
+    isActive: null;
+    testDate: Date;
+    createdAt: Date;
+    updatedAt: Date;
+    addresses: IAddresses;
+    manager: IUsers;
+    roles: Collection<Roles, object>;
+    comments: Comments[];
+    userGroup: UserGroups | null;
+}
+export declare class Roles {
+    id: number;
+    name: string;
+    key: string;
+    isDefault: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare class UserGroups {
+    id: number;
+    label: string;
+}
+type IAddresses = Addresses;
+export declare class Addresses {
+    id: number;
+    city: string;
+    state: string;
+    country: string;
+    arrayField: string[];
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare class Comments {
+    id: number;
+    kind: CommentKind;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare enum CommentKind {
+    Comment = "COMMENT",
+    Message = "MESSAGE",
+    Note = "NOTE"
+}
+export {};

package/mjs/src/lib/utils/___test___/test-classes.helper.js

@@ -0,0 +1,52 @@
+import { Collection } from '@mikro-orm/core';
+export class Users {
+    id;
+    login;
+    firstName;
+    testReal = [];
+    testArrayNull;
+    lastName;
+    isActive;
+    testDate;
+    createdAt = new Date();
+    updatedAt = new Date();
+    addresses;
+    manager;
+    roles = new Collection(this);
+    comments;
+    userGroup;
+}
+export class Roles {
+    id;
+    name;
+    key;
+    isDefault;
+    createdAt = new Date();
+    updatedAt = new Date();
+}
+export class UserGroups {
+    id;
+    label;
+}
+export class Addresses {
+    id;
+    city;
+    state;
+    country;
+    arrayField;
+    createdAt = new Date();
+    updatedAt = new Date();
+}
+export class Comments {
+    id;
+    kind;
+    createdAt = new Date();
+    updatedAt = new Date();
+}
+export var CommentKind;
+(function (CommentKind) {
+    CommentKind["Comment"] = "COMMENT";
+    CommentKind["Message"] = "MESSAGE";
+    CommentKind["Note"] = "NOTE";
+})(CommentKind || (CommentKind = {}));
+//# sourceMappingURL=test-classes.helper.js.map

package/mjs/src/lib/utils/___test___/test-classes.helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-classes.helper.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs-shared/src/lib/utils/___test___/test-classes.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,OAAO,KAAK;IACT,EAAE,CAAU;IACZ,KAAK,CAAU;IACf,SAAS,CAAU;IACnB,QAAQ,GAAa,EAAE,CAAC;IACxB,aAAa,CAAmB;IAChC,QAAQ,CAAiB;IACzB,QAAQ,CAAQ;IAChB,QAAQ,CAAQ;IAChB,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAE7B,SAAS,CAAc;IACvB,OAAO,CAAU;IACjB,KAAK,GAAG,IAAI,UAAU,CAAQ,IAAI,CAAC,CAAC;IACpC,QAAQ,CAAc;IACtB,SAAS,CAAqB;CACtC;AAED,MAAM,OAAO,KAAK;IACT,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,GAAG,CAAU;IACb,SAAS,CAAW;IAC3B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;CAC9B;AAED,MAAM,OAAO,UAAU;IACd,EAAE,CAAU;IACZ,KAAK,CAAU;CACvB;AAED,MAAM,OAAO,SAAS;IACb,EAAE,CAAU;IACZ,IAAI,CAAU;IACd,KAAK,CAAU;IACf,OAAO,CAAU;IACjB,UAAU,CAAY;IAC7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;CAC9B;AAED,MAAM,OAAO,QAAQ;IACZ,EAAE,CAAU;IACZ,IAAI,CAAe;IAC1B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;IAC7B,SAAS,GAAS,IAAI,IAAI,EAAE,CAAC;CAC9B;AACD,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,kCAAmB,CAAA;IACnB,4BAAa,CAAA;AACf,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-shared",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Shared Helper for JsonApi Plugin for NestJs",
   "keywords": [
     "nestjs",
@@ -12,16 +12,20 @@
     "CRUD"
   ],
   "dependencies": {
-    "change-case-commonjs": "^5.4.4",
-    "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0",
-    "ts-toolbelt": "^9.6.0",
+    "change-case-commonjs": "^5.4.4"
+  },
+  "peerDependencies": {
     "tslib": ">2.3.0"
   },
   "type": "commonjs",
   "main": "./cjs/src/index.js",
   "types": "./cjs/src/index.d.ts",
   "module": "./mjs/src/index.js",
+  "overrides": {
+    "mikro-orm-pglite": {
+      "@mikro-orm/postgresql": "^6.4.0"
+    }
+  },
   "license": "MIT",
   "contributors": [
     {

package/cjs/package.json

@@ -1,25 +0,0 @@
-{
-  "name": "@klerick/json-api-nestjs-shared",
-  "version": "1.0.0-beta.3",
-  "description": "Shared Helper for JsonApi Plugin for NestJs",
-  "keywords": [
-    "nestjs",
-    "nest",
-    "jsonapi",
-    "json-api",
-    "typeorm",
-    "microorm",
-    "CRUD"
-  ],
-  "dependencies": {
-    "change-case-commonjs": "^5.4.4",
-    "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0",
-    "ts-toolbelt": "^9.6.0",
-    "tslib": ">2.3.0"
-  },
-  "type": "commonjs",
-  "main": "./cjs/src/index.js",
-  "types": "./cjs/src/index.d.ts",
-  "module": "./mjs/src/index.js"
-}

package/mjs/package.json

@@ -1,23 +0,0 @@
-{
-  "name": "@klerick/json-api-nestjs-shared",
-  "version": "1.0.0-beta.3",
-  "description": "Shared Helper for JsonApi Plugin for NestJs",
-  "keywords": [
-    "nestjs",
-    "nest",
-    "jsonapi",
-    "json-api",
-    "typeorm",
-    "microorm",
-    "CRUD"
-  ],
-  "dependencies": {
-    "tslib": ">2.3.0",
-    "reflect-metadata": "^0.1.12 || ^0.2.0",
-    "rxjs": "^7.1.0"
-  },
-  "type": "commonjs",
-  "main": "./cjs/src/index.js",
-  "types": "./cjs/src/index.d.ts",
-  "module": "./mjs/src/index.js"
-}