feat(json-api-nestjs-shared): Use new structure

set two type package in npm package.json

Author: klerick

.nxignore

@@ -0,0 +1,2 @@
+**/*.test-d.ts
+**/__test__/**/*

libs/json-api/json-api-nestjs-shared/package.json

@@ -5,5 +5,7 @@
  "tslib": "^2.3.0"
  },
  "type": "commonjs",
- "main": "./src/index.js"
+ "main": "./cjs/src/index.js",
+ "types": "./cjs/src/index.d.ts",
+ "module": "./mjs/src/index.js"
 }

libs/json-api/json-api-nestjs-shared/project.json

@@ -13,15 +13,71 @@
  },
  "tags": [],
  "targets": {
- "build": {
+ "build-cjs": {
  "executor": "@nx/js:tsc",
- "outputs": ["{options.outputPath}"],
+ "outputs": [
+ "{options.outputPath}"
+ ],
+ "options": {
+ "outputPath": "dist/{projectRoot}/cjs",
+ "tsConfig": "{projectRoot}/tsconfig.lib.json",
+ "packageJson": "{projectRoot}/package.json",
+ "main": "{projectRoot}/src/index.ts",
+ "assets": [
+ {
+ "glob": "*.md",
+ "input": "{projectRoot}",
+ "output": "../"
+ }
+ ],
+ "updateBuildableProjectDepsInPackageJson": true
+ }
+ },
+ "build-mjs": {
+ "executor": "@nx/js:tsc",
+ "outputs": [
+ "{options.outputPath}"
+ ],
+ "options": {
+ "outputPath": "dist/{projectRoot}/mjs",
+ "tsConfig": "{projectRoot}/tsconfig-mjs.lib.json",
+ "packageJson": "{projectRoot}/package.json",
+ "main": "{projectRoot}/src/index.ts",
+ "assets": [
+ {
+ "glob": "*.md",
+ "input": "{projectRoot}",
+ "output": "../"
+ }
+ ]
+ }
+ },
+ "build": {
+ "executor": "nx:run-commands",
+ "dependsOn": [
+ "build-cjs",
+ "build-mjs"
+ ],
  "options": {
- "outputPath": "dist/libs/json-api/json-api-nestjs-shared",
- "tsConfig": "libs/json-api/json-api-nestjs-shared/tsconfig.lib.json",
- "packageJson": "libs/json-api/json-api-nestjs-shared/package.json",
- "main": "libs/json-api/json-api-nestjs-shared/src/index.ts",
- "assets": ["libs/json-api/json-api-nestjs-shared/*.md"]
+ "commands": [
+ {
+ "command": "[ ! -f dist/{projectRoot}/cjs/package.json ] || mv dist/{projectRoot}/cjs/package.json dist/{projectRoot}/package.json",
+ "forwardAllArgs": false
+ },
+ {
+ "command": "rm -rf dist/{projectRoot}/mjs/package.json",
+ "forwardAllArgs": false
+ },
+ {
+ "command": "mkdir -p node_modules/@klerick && rm -rf node_modules/@klerick/json-api-nestjs-shared",
+ "forwardAllArgs": false
+ },
+ {
+ "command": "ln -s $(pwd)/dist/{projectRoot} node_modules/@klerick/json-api-nestjs-shared"
+ }
+ ],
+ "cwd": "./",
+ "parallel": false
  }
  },
  "ts-test": {

libs/json-api/json-api-nestjs-shared/src/index.ts

@@ -1,2 +1,3 @@
 export * from './lib/utils';
 export * from './lib/types';
+export * from './lib/constants';

libs/json-api/json-api-nestjs-shared/src/lib/constants/index.ts

@@ -0,0 +1,2 @@
+export const KEY_MAIN_INPUT_SCHEMA = 'atomic:operations';
+export const KEY_MAIN_OUTPUT_SCHEMA = 'atomic:results';

libs/json-api/json-api-nestjs-shared/src/lib/types/entity-type.test-d.ts

@@ -4,7 +4,7 @@ import { Any } from 'ts-toolbelt';
 import { Users } from '../utils/___test___/test-classes.helper';
 
 import { RelationKeys, PropertyKeys, IsIterator } from './entity-type';
-import { Collection } from '@mikro-orm/core';
+import type { Collection } from '@mikro-orm/core';
 
 type RelationId = 'addresses' | 'manager' | 'roles' | 'comments' | 'userGroup';
 type RelationName = 'roles';

libs/json-api/json-api-nestjs-shared/src/lib/types/entity-type.ts

@@ -38,3 +38,6 @@ export type IsIterator<T> = T extends {
 export type TypeOfArray<T> = T extends (infer U)[] ? U : T;
 
 export type ValueOf<T> = T[keyof T];
+export type Constructor<T> = new (...args: any[]) => T;
+export type AnyEntity<T = object> = T;
+export type EntityClass<T extends AnyEntity> = Constructor<T>;

libs/json-api/json-api-nestjs-shared/src/lib/types/query-type.ts

@@ -34,3 +34,9 @@ export enum FilterOperandOnlySimple {
  ne = 'ne',
  regexp = 'regexp',
 }
+
+export enum Operation {
+ add = 'add',
+ update = 'update',
+ remove = 'remove',
+}

libs/json-api/json-api-nestjs-shared/src/lib/utils/___test___/test-classes.helper.ts

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

libs/json-api/json-api-nestjs-shared/src/lib/utils/object-utils.ts

@@ -1,4 +1,4 @@
-import { kebabCase } from 'change-case-commonjs';
+import { pascalCase } from 'change-case-commonjs';
 
 export const ObjectTyped = {
  keys: Object.keys as <T extends {}>(yourObject: T) => Array<keyof T>,
@@ -20,7 +20,7 @@ export function isString<T, P extends T>(value: T): value is P {
 }
 
 export function createEntityInstance<E>(name: string): E {
- const entityName = kebabCase(name);
+ const entityName = pascalCase(name);
  return Function('return new class ' + entityName + '{}')();
 }