Skip to content

Commit 2425fb6

Browse files
klerickklerick
committed
refactor(json-api-nestjs-sdk): Use new structur
Use type from shared library BREAKING CHANGE: New package name
1 parent 4359ac7 commit 2425fb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+685
-904
lines changed

‎libs/json-api/json-api-nestjs-sdk/.eslintrc.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"extends": ["../../../.eslintrc.json"],
3-
"ignorePatterns": ["!**/*", "**/*.spec.ts"],
2+
"extends": ["../../../.eslintrc.base.json"],
3+
"ignorePatterns": ["!**/*"],
44
"overrides": [
55
{
66
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -18,13 +18,12 @@
1818
"files": ["*.json"],
1919
"parser": "jsonc-eslint-parser",
2020
"rules": {
21-
"@nx/dependency-checks": "error"
22-
}
23-
},
24-
{
25-
"files": ["*.ts"],
26-
"rules": {
27-
"@angular-eslint/prefer-standalone": "off"
21+
"@nx/dependency-checks": [
22+
"error",
23+
{
24+
"ignoredFiles": ["{projectRoot}/eslint.config.{js,cjs,mjs}"]
25+
}
26+
]
2827
}
2928
}
3029
]

‎libs/json-api/json-api-nestjs-sdk/jest.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
export default {
32
displayName: 'json-api-nestjs-sdk',
43
preset: '../../../jest.preset.js',

‎libs/json-api/json-api-nestjs-sdk/ng-package.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎libs/json-api/json-api-nestjs-sdk/package.json

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "json-api-nestjs-sdk",
2+
"name": "@klerick/json-api-nestjs-sdk",
33
"version": "9.0.0",
44
"engines": {
55
"node": ">= 16.0.0"
@@ -17,7 +17,6 @@
1717
},
1818
"private": false,
1919
"license": "MIT",
20-
"main": "./src/index.js",
2120
"files": [
2221
"**/*"
2322
],
@@ -29,11 +28,34 @@
2928
"typeorm",
3029
"CRUD"
3130
],
32-
"peerDependencies": {
33-
"@angular/common": ">=19.0.0 <20.0.0",
34-
"@angular/core": ">=19.0.0 <20.0.0",
35-
"axios": "^1.6.0",
36-
"reflect-metadata": "^0.1.13",
37-
"tslib": "^2.3.0"
31+
"dependencies": {
32+
"tslib": ">2.3.0"
33+
},
34+
"exports": {
35+
"./package.json": "./package.json",
36+
".": {
37+
"types": "./mjs/src/index.d.ts",
38+
"node": "./cjs/src/index.js",
39+
"require": "./cjs/src/index.js",
40+
"module": "./mjs/src/index.js",
41+
"default": "./mjs/src/index.js"
42+
},
43+
"./ngModule": {
44+
"types": "./mjs/src/ngModule.d.ts",
45+
"node": "./cjs/src/ngModule.js",
46+
"require": "./cjs/src/ngModule.js",
47+
"module": "./mjs/src/ngModule.js",
48+
"default": "./mjs/src/ngModule.js"
49+
}
50+
},
51+
"main": "./cjs/src/index.js",
52+
"module": "./mjs/src/index.js",
53+
"types": "./mjs/src/index.d.ts",
54+
"typesVersions": {
55+
"*": {
56+
"ngModule": [
57+
"./mjs/src/ngModule.d.ts"
58+
]
59+
}
3860
}
3961
}

‎libs/json-api/json-api-nestjs-sdk/project.json

Lines changed: 43 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,29 @@
33
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
44
"sourceRoot": "libs/json-api/json-api-nestjs-sdk/src",
55
"projectType": "library",
6-
"targets": {
7-
"compile-for-angular": {
8-
"executor": "@nx/angular:package",
9-
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
10-
"options": {
11-
"project": "libs/json-api/json-api-nestjs-sdk/ng-package.json"
12-
},
13-
"configurations": {
14-
"production": {
15-
"tsConfig": "libs/json-api/json-api-nestjs-sdk/tsconfig-mjs.lib.json"
16-
},
17-
"development": {
18-
"tsConfig": "libs/json-api/json-api-nestjs-sdk/tsconfig-mjs.lib.json"
19-
}
20-
},
21-
"defaultConfiguration": "production"
22-
},
23-
"build": {
24-
"executor": "nx:run-commands",
25-
"dependsOn": [
26-
"build-cjs"
27-
],
28-
"options": {
29-
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk",
30-
"commands": [
31-
"node tools/scripts/preparation-hybrid-npm-package.mjs json-api-nestjs-sdk",
32-
"node tools/scripts/preparation-npm-package.mjs json-api-nestjs-sdk"
33-
],
34-
"cwd": "./",
35-
"parallel": false
6+
"release": {
7+
"version": {
8+
"generatorOptions": {
9+
"packageRoot": "dist/{projectRoot}",
10+
"currentVersionResolver": "git-tag",
11+
"fallbackCurrentVersionResolver": "disk"
3612
}
37-
},
13+
}
14+
},
15+
"tags": ["type:lib", "lib:json-api-nestjs", "lib:json-api-nestjs-sdk", "type:publish"],
16+
"targets": {
3817
"build-cjs": {
3918
"executor": "@nx/js:tsc",
4019
"outputs": ["{options.outputPath}"],
41-
"dependsOn": [
42-
"build-mjs"
43-
],
4420
"options": {
4521
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk/cjs",
4622
"main": "libs/json-api/json-api-nestjs-sdk/src/index.ts",
4723
"tsConfig": "libs/json-api/json-api-nestjs-sdk/tsconfig.lib.json",
48-
"assets": ["libs/json-api/json-api-nestjs-sdk/*.md"],
49-
"external": "none",
24+
"assets": [{
25+
"glob": "*.md",
26+
"input": "libs/json-api/json-api-nestjs-sdk",
27+
"output": "../"
28+
}],
5029
"updateBuildableProjectDepsInPackageJson": true,
5130
"buildableProjectDepsInPackageJsonType": "peerDependencies",
5231
"additionalEntryPoints": [
@@ -62,8 +41,11 @@
6241
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk/mjs",
6342
"main": "libs/json-api/json-api-nestjs-sdk/src/index.ts",
6443
"tsConfig": "libs/json-api/json-api-nestjs-sdk/tsconfig-mjs.lib.json",
65-
"assets": ["libs/json-api/json-api-nestjs-sdk/*.md"],
66-
"external": "none",
44+
"assets": [{
45+
"glob": "*.md",
46+
"input": "libs/json-api/json-api-nestjs-sdk",
47+
"output": "../"
48+
}],
6749
"updateBuildableProjectDepsInPackageJson": true,
6850
"buildableProjectDepsInPackageJsonType": "peerDependencies",
6951
"additionalEntryPoints": [
@@ -72,42 +54,40 @@
7254
"generateExportsField": true
7355
}
7456
},
75-
"publish": {
76-
"command": "node tools/scripts/publish.mjs json-api-nestjs-sdk {args.ver} {args.tag}",
77-
"dependsOn": ["build"]
78-
},
79-
"lint": {
80-
"executor": "@nx/eslint:lint",
81-
"outputs": ["{options.outputFile}"]
82-
},
83-
"test": {
84-
"executor": "@nx/jest:jest",
85-
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
86-
"options": {
87-
"jestConfig": "libs/json-api/json-api-nestjs-sdk/jest.config.ts",
88-
"codeCoverage": true,
89-
"coverageReporters": ["json-summary"]
90-
}
91-
},
92-
"upload-badge": {
57+
"build": {
9358
"executor": "nx:run-commands",
9459
"dependsOn": [
95-
{
96-
"target": "test"
97-
}
60+
"build-cjs", "build-mjs"
9861
],
9962
"options": {
100-
"outputPath": "{workspaceRoot}/libs/json-api/json-api-nestjs-sdk",
101-
"commands": ["node tools/scripts/upload-badge.mjs json-api-nestjs-sdk"],
63+
"outputPath": "dist/libs/json-api/json-api-nestjs-sdk",
64+
"commands": [
65+
{
66+
"command": "mv dist/{projectRoot}/cjs/package.json dist/{projectRoot}/package.json",
67+
"forwardAllArgs": false
68+
},
69+
{
70+
"command": "rm -rf dist/{projectRoot}/mjs/package.json",
71+
"forwardAllArgs": false
72+
},
73+
{
74+
"command": "mkdir -p node_modules/@klerick && rm -rf node_modules/@klerick/json-api-nestjs-sdk",
75+
"forwardAllArgs": false
76+
},
77+
{
78+
"command": "ln -s $(pwd)/dist/{projectRoot} node_modules/@klerick/json-api-nestjs-sdk",
79+
"forwardAllArgs": false
80+
}
81+
],
10282
"cwd": "./",
10383
"parallel": false
10484
}
10585
},
10686
"nx-release-publish": {
10787
"options": {
108-
"packageRoot": "dist/libs/json-api/json-api-nestjs-sdk"
88+
"packageRoot": "dist/{projectRoot}"
10989
}
11090
}
11191
},
112-
"tags": []
92+
"implicitDependencies": ["json-api-nestjs-shared"]
11393
}

‎libs/json-api/json-api-nestjs-sdk/src/index.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
export { JsonApiUtilsService, JsonApiSdkService } from './lib/service';
2-
export * from './lib/json-api-js';
3-
export { adapterForAxios } from './lib/utils';
41
export {
52
FilterOperand,
63
ResourceObject,
7-
AtomicOperations,
8-
Operands,
94
QueryField,
10-
QueryParams,
11-
} from './lib/types';
5+
} from '@klerick/json-api-nestjs-shared';
6+
7+
export { JsonApiUtilsService, JsonApiSdkService } from './lib/service';
8+
export * from './lib/json-api-js';
9+
export { adapterForAxios } from './lib/utils';
10+
export { AtomicOperations, Operands, QueryParams } from './lib/types';

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
export const ID_KEY = 'id';
2-
export const KEY_MAIN_INPUT_SCHEMA = 'atomic:operations';
3-
export const KEY_MAIN_OUTPUT_SCHEMA = 'atomic:results';

‎libs/json-api/json-api-nestjs-sdk/src/lib/service/atomic-operations.service.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { lastValueFrom, of } from 'rxjs';
2+
import { KEY_MAIN_OUTPUT_SCHEMA } from '@klerick/json-api-nestjs-shared';
23
import { AtomicOperationsService } from './atomic-operations.service';
3-
import { JsonApiUtilsService } from './';
4+
import { JsonApiUtilsService } from './index';
45
import { HttpInnerClient, JsonApiSdkConfig } from '../types';
5-
import { KEY_MAIN_OUTPUT_SCHEMA } from '../constants';
6-
7-
// jest.mock('../utils');
86

97
class Users {
108
public id!: number;

0 commit comments

Comments
 (0)