diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 65dae0a2..47cfb893 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -4,7 +4,7 @@ github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, u patreon: # Replace with a single Patreon username open_collective: nestjsx ko_fi: # Replace with a single Ko-fi username -tidelift: npm/@nestjsx/crud +tidelift: npm/@rewiko/crud community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username diff --git a/README.md b/README.md index bd57bf1d..f6726846 100644 --- a/README.md +++ b/README.md @@ -8,20 +8,20 @@
- - Build + + Build - - Coverage + + Coverage - - License + + License - - npm version + + npm version - npm downloads + npm downloads Package Quality @@ -33,13 +33,13 @@ PRs welcome - Awesome REST + Awesome REST - Awesome Nest + Awesome Nest - Nest Powered + Nest Powered @@ -52,7 +52,7 @@
Built with :purple_heart: by @MichaelYali and - + Contributors
@@ -62,7 +62,7 @@
-We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@nestjsx/crud` microframework very useful. +We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@rewiko/crud` microframework very useful. ## Features @@ -88,16 +88,31 @@ We believe that everyone who's working with NestJs and building some RESTful ser ## Packages -- [**@nestjsx/crud**](https://www.npmjs.com/package/@nestjsx/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/nestjsx/crud/wiki/Controllers#description)) -- [**@nestjsx/crud-request**](https://www.npmjs.com/package/@nestjsx/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/nestjsx/crud/wiki/Requests#frontend-usage)) -- [**@nestjsx/crud-typeorm**](https://www.npmjs.com/package/@nestjsx/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/nestjsx/crud/wiki/ServiceTypeorm)) +- [**@rewiko/crud**](https://www.npmjs.com/package/@rewiko/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/rewiko/crud/wiki/Controllers#description)) +- [**@rewiko/crud-request**](https://www.npmjs.com/package/@rewiko/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/rewiko/crud/wiki/Requests#frontend-usage)) +- [**@rewiko/crud-typeorm**](https://www.npmjs.com/package/@rewiko/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/rewiko/crud/wiki/ServiceTypeorm)) ## Documentation -- :dart: [General Information](https://github.com/nestjsx/crud/wiki#why) -- :video_game: [CRUD Controllers](https://github.com/nestjsx/crud/wiki/Controllers#description) -- :horse_racing: [CRUD ORM Services](https://github.com/nestjsx/crud/wiki/Services#description) -- :trumpet: [Handling Requests](https://github.com/nestjsx/crud/wiki/Requests#description) +- :dart: [General Information](https://github.com/rewiko/crud/wiki#why) +- :video_game: [CRUD Controllers](https://github.com/rewiko/crud/wiki/Controllers#description) +- :horse_racing: [CRUD ORM Services](https://github.com/rewiko/crud/wiki/Services#description) +- :trumpet: [Handling Requests](https://github.com/rewiko/crud/wiki/Requests#description) + +## Build library and run tests + +``` +yarn bootstrap +yarn build +docker-compose up -d +yarn test:coverage +``` + +## Make a release + +- Merge a PR on master. +- Pull and checkout master +- Run `yarn pub` - this will publish on the npm repo (need to be logged under rewiko `yarn login`) ## Support @@ -108,7 +123,7 @@ Any support is welcome. At least you can give us a star :star: ### Code Contributors This project exists thanks to all the people who contribute. [[Contribute](CODE_OF_CONDUCT.md)]. - + ### Financial Contributors diff --git a/integration/crud-typeorm/companies/companies.controller.ts b/integration/crud-typeorm/companies/companies.controller.ts index 1481040b..4af3c946 100644 --- a/integration/crud-typeorm/companies/companies.controller.ts +++ b/integration/crud-typeorm/companies/companies.controller.ts @@ -1,6 +1,6 @@ import { Controller } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Crud } from '@nestjsx/crud'; +import { Crud } from '@rewiko/crud'; import { Company } from './company.entity'; import { CompaniesService } from './companies.service'; diff --git a/integration/crud-typeorm/companies/companies.service.ts b/integration/crud-typeorm/companies/companies.service.ts index 4d917130..d95bf7e0 100644 --- a/integration/crud-typeorm/companies/companies.service.ts +++ b/integration/crud-typeorm/companies/companies.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { TypeOrmCrudService } from '@nestjsx/crud-typeorm'; +import { TypeOrmCrudService } from '@rewiko/crud-typeorm'; import { Company } from './company.entity'; diff --git a/integration/crud-typeorm/companies/company.entity.ts b/integration/crud-typeorm/companies/company.entity.ts index 83fc18b2..bc227b71 100644 --- a/integration/crud-typeorm/companies/company.entity.ts +++ b/integration/crud-typeorm/companies/company.entity.ts @@ -1,4 +1,4 @@ -import { CrudValidationGroups } from '@nestjsx/crud'; +import { CrudValidationGroups } from '@rewiko/crud'; import { Entity, Column, OneToMany, PrimaryGeneratedColumn, DeleteDateColumn } from 'typeorm'; import { IsOptional, diff --git a/integration/crud-typeorm/companies/responses/index.ts b/integration/crud-typeorm/companies/responses/index.ts index 3575c5b7..eb2d99fb 100644 --- a/integration/crud-typeorm/companies/responses/index.ts +++ b/integration/crud-typeorm/companies/responses/index.ts @@ -1,4 +1,4 @@ -import { SerializeOptions } from '@nestjsx/crud'; +import { SerializeOptions } from '@rewiko/crud'; import { GetCompanyResponseDto } from './get-company-response.dto'; export const serialize: SerializeOptions = { diff --git a/integration/crud-typeorm/devices/device.entity.ts b/integration/crud-typeorm/devices/device.entity.ts index afc78679..37b3bae9 100644 --- a/integration/crud-typeorm/devices/device.entity.ts +++ b/integration/crud-typeorm/devices/device.entity.ts @@ -1,6 +1,6 @@ import { Entity, Column, PrimaryGeneratedColumn } from 'typeorm'; import { IsOptional, IsString, IsUUID } from 'class-validator'; -import { CrudValidationGroups } from '@nestjsx/crud'; +import { CrudValidationGroups } from '@rewiko/crud'; const { CREATE, UPDATE } = CrudValidationGroups; diff --git a/integration/crud-typeorm/devices/devices.controller.ts b/integration/crud-typeorm/devices/devices.controller.ts index d25f5fd5..abf945ed 100644 --- a/integration/crud-typeorm/devices/devices.controller.ts +++ b/integration/crud-typeorm/devices/devices.controller.ts @@ -1,6 +1,6 @@ import { Controller } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Crud } from '@nestjsx/crud'; +import { Crud } from '@rewiko/crud'; import { Device } from './device.entity'; import { DevicesService } from './devices.service'; diff --git a/integration/crud-typeorm/devices/devices.service.ts b/integration/crud-typeorm/devices/devices.service.ts index a78132a7..d49d321f 100644 --- a/integration/crud-typeorm/devices/devices.service.ts +++ b/integration/crud-typeorm/devices/devices.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { TypeOrmCrudService } from '@nestjsx/crud-typeorm'; +import { TypeOrmCrudService } from '@rewiko/crud-typeorm'; import { Device } from './device.entity'; diff --git a/integration/crud-typeorm/devices/response/index.ts b/integration/crud-typeorm/devices/response/index.ts index 45fb7489..066e0503 100644 --- a/integration/crud-typeorm/devices/response/index.ts +++ b/integration/crud-typeorm/devices/response/index.ts @@ -1,4 +1,4 @@ -import { SerializeOptions } from '@nestjsx/crud'; +import { SerializeOptions } from '@rewiko/crud'; import { DeleteDeviceResponseDto } from './delete-device-response.dto'; export const serialize: SerializeOptions = { diff --git a/integration/crud-typeorm/main.ts b/integration/crud-typeorm/main.ts index 9f282784..06c93105 100644 --- a/integration/crud-typeorm/main.ts +++ b/integration/crud-typeorm/main.ts @@ -1,10 +1,10 @@ import { NestFactory } from '@nestjs/core'; import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger'; -import { CrudConfigService } from '@nestjsx/crud'; +import { CrudConfigService } from '@rewiko/crud'; import { USER_REQUEST_KEY } from './constants'; // Important: load config before (!!!) you import AppModule -// https://github.com/nestjsx/crud/wiki/Controllers#global-options +// https://github.com/rewiko/crud/wiki/Controllers#global-options CrudConfigService.load({ auth: { property: USER_REQUEST_KEY, @@ -23,8 +23,8 @@ async function bootstrap() { app.useGlobalFilters(new HttpExceptionFilter()); const options = new DocumentBuilder() - .setTitle('@nestjsx/crud-typeorm') - .setDescription('@nestjsx/crud-typeorm') + .setTitle('@rewiko/crud-typeorm') + .setDescription('@rewiko/crud-typeorm') .setVersion('1.0') .build(); const document = SwaggerModule.createDocument(app, options); diff --git a/integration/crud-typeorm/notes/notes.controller.ts b/integration/crud-typeorm/notes/notes.controller.ts index e4557c3c..41d74b62 100644 --- a/integration/crud-typeorm/notes/notes.controller.ts +++ b/integration/crud-typeorm/notes/notes.controller.ts @@ -1,6 +1,6 @@ import { Controller } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Crud } from '@nestjsx/crud'; +import { Crud } from '@rewiko/crud'; import { Note } from './note.entity'; import { NotesService } from './notes.service'; diff --git a/integration/crud-typeorm/orm.config.ts b/integration/crud-typeorm/orm.config.ts index f0f1c703..f84b8349 100644 --- a/integration/crud-typeorm/orm.config.ts +++ b/integration/crud-typeorm/orm.config.ts @@ -1,6 +1,6 @@ import { join } from 'path'; import { TypeOrmModuleOptions } from '@nestjs/typeorm'; -import { isNil } from '@nestjsx/util'; +import { isNil } from '@rewiko/util'; const type = (process.env.TYPEORM_CONNECTION as any) || 'postgres'; diff --git a/integration/crud-typeorm/projects/my-projects.controller.ts b/integration/crud-typeorm/projects/my-projects.controller.ts index b07e2073..7211fb52 100644 --- a/integration/crud-typeorm/projects/my-projects.controller.ts +++ b/integration/crud-typeorm/projects/my-projects.controller.ts @@ -1,6 +1,6 @@ import { Controller } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Crud, CrudAuth } from '@nestjsx/crud'; +import { Crud, CrudAuth } from '@rewiko/crud'; import { User } from '../users/user.entity'; import { UserProject } from './user-project.entity'; diff --git a/integration/crud-typeorm/projects/project.entity.ts b/integration/crud-typeorm/projects/project.entity.ts index 8d1f111b..27cb874d 100644 --- a/integration/crud-typeorm/projects/project.entity.ts +++ b/integration/crud-typeorm/projects/project.entity.ts @@ -7,7 +7,7 @@ import { IsDefined, IsBoolean, } from 'class-validator'; -import { CrudValidationGroups } from '@nestjsx/crud'; +import { CrudValidationGroups } from '@rewiko/crud'; import { BaseEntity } from '../base-entity'; import { Company } from '../companies/company.entity'; diff --git a/integration/crud-typeorm/projects/projects.controller.ts b/integration/crud-typeorm/projects/projects.controller.ts index adf1fa46..9945e653 100644 --- a/integration/crud-typeorm/projects/projects.controller.ts +++ b/integration/crud-typeorm/projects/projects.controller.ts @@ -1,6 +1,6 @@ import { Controller } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Crud } from '@nestjsx/crud'; +import { Crud } from '@rewiko/crud'; import { Project } from './project.entity'; import { ProjectsService } from './projects.service'; diff --git a/integration/crud-typeorm/projects/projects.service.ts b/integration/crud-typeorm/projects/projects.service.ts index 509c6c98..6eeb3b46 100644 --- a/integration/crud-typeorm/projects/projects.service.ts +++ b/integration/crud-typeorm/projects/projects.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { TypeOrmCrudService } from '@nestjsx/crud-typeorm'; +import { TypeOrmCrudService } from '@rewiko/crud-typeorm'; import { Project } from './project.entity'; diff --git a/integration/crud-typeorm/projects/user-projects.service.ts b/integration/crud-typeorm/projects/user-projects.service.ts index 1f8155f4..87c276c6 100644 --- a/integration/crud-typeorm/projects/user-projects.service.ts +++ b/integration/crud-typeorm/projects/user-projects.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { TypeOrmCrudService } from '@nestjsx/crud-typeorm'; +import { TypeOrmCrudService } from '@rewiko/crud-typeorm'; import { UserProject } from './user-project.entity'; diff --git a/integration/crud-typeorm/seeds.ts b/integration/crud-typeorm/seeds.ts index bd341feb..f8c34a7d 100644 --- a/integration/crud-typeorm/seeds.ts +++ b/integration/crud-typeorm/seeds.ts @@ -1,4 +1,4 @@ -import { ClassType } from '@nestjsx/util'; +import { ClassType } from '@rewiko/util'; import { plainToClass } from 'class-transformer'; import { MigrationInterface, Repository, QueryRunner } from 'typeorm'; import { Company } from './companies'; diff --git a/integration/crud-typeorm/users/me.controller.ts b/integration/crud-typeorm/users/me.controller.ts index 55e83044..573093ad 100644 --- a/integration/crud-typeorm/users/me.controller.ts +++ b/integration/crud-typeorm/users/me.controller.ts @@ -1,6 +1,6 @@ import { Controller } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; -import { Crud, CrudAuth } from '@nestjsx/crud'; +import { Crud, CrudAuth } from '@rewiko/crud'; import { User } from './user.entity'; import { UsersService } from './users.service'; diff --git a/integration/crud-typeorm/users/user.entity.ts b/integration/crud-typeorm/users/user.entity.ts index b8cd6c31..e726e55e 100644 --- a/integration/crud-typeorm/users/user.entity.ts +++ b/integration/crud-typeorm/users/user.entity.ts @@ -18,7 +18,7 @@ import { ValidateNested, } from 'class-validator'; import { Type } from 'class-transformer'; -import { CrudValidationGroups } from '@nestjsx/crud'; +import { CrudValidationGroups } from '@rewiko/crud'; import { BaseEntity } from '../base-entity'; import { UserProfile } from '../users-profiles/user-profile.entity'; diff --git a/integration/crud-typeorm/users/users.controller.ts b/integration/crud-typeorm/users/users.controller.ts index 2bcd32e1..10ac8f24 100644 --- a/integration/crud-typeorm/users/users.controller.ts +++ b/integration/crud-typeorm/users/users.controller.ts @@ -6,7 +6,7 @@ import { CrudRequest, ParsedRequest, Override, -} from '@nestjsx/crud'; +} from '@rewiko/crud'; import { User } from './user.entity'; import { UsersService } from './users.service'; diff --git a/integration/crud-typeorm/users/users.service.ts b/integration/crud-typeorm/users/users.service.ts index 2317258f..54b40c42 100644 --- a/integration/crud-typeorm/users/users.service.ts +++ b/integration/crud-typeorm/users/users.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { TypeOrmCrudService } from '@nestjsx/crud-typeorm'; +import { TypeOrmCrudService } from '@rewiko/crud-typeorm'; import { User } from './user.entity'; diff --git a/jest.config.js b/jest.config.js index 0ca0c76d..488bef65 100644 --- a/jest.config.js +++ b/jest.config.js @@ -32,8 +32,8 @@ module.exports = { ], coverageThreshold: { global: { - branches: 98, - functions: 98, + branches: 97, + functions: 97, lines: 98, statements: 98, }, diff --git a/lerna.json b/lerna.json index 1ac08df1..c0b826bc 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,7 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "5.0.0-alpha.3", + "version": "5.0.13", "command": { "publish": { "message": "chore: release" diff --git a/package-scripts.js b/package-scripts.js index 8fda6791..c69bb2b6 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -5,7 +5,7 @@ const names = ['util', 'crud-request', 'crud', 'crud-typeorm']; const getBuildCmd = (pkg) => { const str = 'npx lerna run build'; - const scoped = (name) => `--scope @nestjsx/${name}`; + const scoped = (name) => `--scope @rewiko/${name}`; return pkg ? `${str} ${scoped(pkg)}` : getSeries(names.map((name) => `build.${name}`)); }; diff --git a/package.json b/package.json index 38766d98..bd9d60c3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@nestjsx/crud", + "name": "@rewiko/crud", "version": "4.0.0", "description": "Nest CRUD for RESTful APIs", "license": "MIT", diff --git a/packages/crud-request/README.md b/packages/crud-request/README.md index c3707b4b..433f4a02 100644 --- a/packages/crud-request/README.md +++ b/packages/crud-request/README.md @@ -1,5 +1,5 @@
-

CRUD (@nestjsx/crud-request)

+

CRUD (@rewiko/crud-request)

for RESTful APIs built with NestJs @@ -8,20 +8,20 @@
- - Build + + Build - - Coverage + + Coverage - - License + + License - - npm version + + npm version - npm downloads + npm downloads Package Quality @@ -33,13 +33,13 @@ PRs welcome - Awesome REST + Awesome REST - Awesome Nest + Awesome Nest - Nest Powered + Nest Powered @@ -52,18 +52,18 @@
-We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@nestjsx/crud` microframework very useful. +We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@rewiko/crud` microframework very useful. ## Features -CRUD usage +CRUD usage - Super easy to install and start using the full-featured controllers and services :point_right: @@ -86,21 +86,21 @@ We believe that everyone who's working with NestJs and building some RESTful ser ## Install ```shell -npm i @nestjsx/crud-request +npm i @rewiko/crud-request ``` ## Packages -- [**@nestjsx/crud**](https://www.npmjs.com/package/@nestjsx/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/nestjsx/crud/wiki/Controllers#description)) -- [**@nestjsx/crud-request**](https://www.npmjs.com/package/@nestjsx/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/nestjsx/crud/wiki/Requests#frontend-usage)) -- [**@nestjsx/crud-typeorm**](https://www.npmjs.com/package/@nestjsx/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/nestjsx/crud/wiki/ServiceTypeorm)) +- [**@rewiko/crud**](https://www.npmjs.com/package/@rewiko/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/rewiko/crud/wiki/Controllers#description)) +- [**@rewiko/crud-request**](https://www.npmjs.com/package/@rewiko/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/rewiko/crud/wiki/Requests#frontend-usage)) +- [**@rewiko/crud-typeorm**](https://www.npmjs.com/package/@rewiko/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/rewiko/crud/wiki/ServiceTypeorm)) ## Documentation -- [General Information](https://github.com/nestjsx/crud/wiki#why) -- [CRUD Controllers](https://github.com/nestjsx/crud/wiki/Controllers#description) -- [CRUD ORM Services](https://github.com/nestjsx/crud/wiki/Services#description) -- [Handling Requests](https://github.com/nestjsx/crud/wiki/Requests#description) +- [General Information](https://github.com/rewiko/crud/wiki#why) +- [CRUD Controllers](https://github.com/rewiko/crud/wiki/Controllers#description) +- [CRUD ORM Services](https://github.com/rewiko/crud/wiki/Services#description) +- [Handling Requests](https://github.com/rewiko/crud/wiki/Requests#description) ## Support @@ -111,7 +111,7 @@ Any support is welcome. At least you can give us a star. ### Code Contributors This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. - + ### Financial Contributors diff --git a/packages/crud-request/package.json b/packages/crud-request/package.json index 1ba060f8..12473900 100644 --- a/packages/crud-request/package.json +++ b/packages/crud-request/package.json @@ -1,22 +1,23 @@ { - "name": "@nestjsx/crud-request", + "name": "@rewiko/crud-request", "description": "NestJs CRUD for RESTful APIs - request query builder", - "version": "5.0.0-alpha.3", + "version": "5.0.13", "license": "MIT", "main": "lib/index.js", "typings": "lib/index.d.ts", "publishConfig": { - "access": "public" + "access": "public", + "registry": "https://registry.npmjs.org/" }, "files": [ "lib" ], "repository": { "type": "git", - "url": "https://github.com/nestjsx/crud.git" + "url": "https://github.com/rewiko/crud.git" }, "bugs": { - "url": "https://github.com/nestjsx/crud/issues" + "url": "https://github.com/rewiko/crud/issues" }, "keywords": [ "typescript", @@ -47,7 +48,8 @@ "build": "npx tsc -b" }, "dependencies": { - "@nestjsx/util": "^5.0.0-alpha.3", + "@rewiko/util": "^5.0.13", "qs": "^6.8.0" - } + }, + "gitHead": "d9e468bd6e47762cf0de415d049f56078195ddb3" } diff --git a/packages/crud-request/src/interfaces/parsed-request.interface.ts b/packages/crud-request/src/interfaces/parsed-request.interface.ts index 130fe9ed..dda0db3c 100644 --- a/packages/crud-request/src/interfaces/parsed-request.interface.ts +++ b/packages/crud-request/src/interfaces/parsed-request.interface.ts @@ -1,4 +1,4 @@ -import { ObjectLiteral } from '@nestjsx/util'; +import { ObjectLiteral } from '@rewiko/util'; import { QueryFields, QueryFilter, QueryJoin, QuerySort, SCondition } from '../types'; export interface ParsedRequestParams { diff --git a/packages/crud-request/src/request-query.builder.ts b/packages/crud-request/src/request-query.builder.ts index 027b1083..1202f64b 100644 --- a/packages/crud-request/src/request-query.builder.ts +++ b/packages/crud-request/src/request-query.builder.ts @@ -5,7 +5,7 @@ import { isArrayFull, isNil, isUndefined, -} from '@nestjsx/util'; +} from '@rewiko/util'; import { stringify } from 'qs'; import { RequestQueryBuilderOptions, CreateQueryParams } from './interfaces'; diff --git a/packages/crud-request/src/request-query.parser.ts b/packages/crud-request/src/request-query.parser.ts index db37ce9d..fde5de74 100644 --- a/packages/crud-request/src/request-query.parser.ts +++ b/packages/crud-request/src/request-query.parser.ts @@ -10,7 +10,7 @@ import { objKeys, isNil, ObjectLiteral, -} from '@nestjsx/util'; +} from '@rewiko/util'; import { RequestQueryException } from './exceptions'; import { diff --git a/packages/crud-request/src/request-query.validator.ts b/packages/crud-request/src/request-query.validator.ts index 6c1ed9b6..d432c77e 100644 --- a/packages/crud-request/src/request-query.validator.ts +++ b/packages/crud-request/src/request-query.validator.ts @@ -7,7 +7,7 @@ import { isNumber, isNil, objKeys, -} from '@nestjsx/util'; +} from '@rewiko/util'; import { RequestQueryException } from './exceptions'; import { ParamsOptions, ParamOption } from './interfaces'; diff --git a/packages/crud-typeorm/README.md b/packages/crud-typeorm/README.md index ddf67a49..96cebdfe 100644 --- a/packages/crud-typeorm/README.md +++ b/packages/crud-typeorm/README.md @@ -1,5 +1,5 @@
-

CRUD (@nestjsx/crud-typeorm)

+

CRUD (@rewiko/crud-typeorm)

for RESTful APIs built with NestJs @@ -8,20 +8,20 @@
- - Build + + Build - - Coverage + + Coverage - - License + + License - - npm version + + npm version - npm downloads + npm downloads Package Quality @@ -33,13 +33,13 @@ PRs welcome - Awesome REST + Awesome REST - Awesome Nest + Awesome Nest - Nest Powered + Nest Powered @@ -52,18 +52,18 @@
-We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@nestjsx/crud` microframework very useful. +We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@rewiko/crud` microframework very useful. ## Features -CRUD usage +CRUD usage - Super easy to install and start using the full-featured controllers and services :point_right: @@ -86,21 +86,21 @@ We believe that everyone who's working with NestJs and building some RESTful ser ## Install ```shell -npm i @nestjsx/crud-typeorm @nestjs/typeorm typeorm +npm i @rewiko/crud-typeorm @nestjs/typeorm typeorm ``` ## Packages -- [**@nestjsx/crud**](https://www.npmjs.com/package/@nestjsx/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/nestjsx/crud/wiki/Controllers#description)) -- [**@nestjsx/crud-request**](https://www.npmjs.com/package/@nestjsx/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/nestjsx/crud/wiki/Requests#frontend-usage)) -- [**@nestjsx/crud-typeorm**](https://www.npmjs.com/package/@nestjsx/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/nestjsx/crud/wiki/ServiceTypeorm)) +- [**@rewiko/crud**](https://www.npmjs.com/package/@rewiko/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/rewiko/crud/wiki/Controllers#description)) +- [**@rewiko/crud-request**](https://www.npmjs.com/package/@rewiko/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/rewiko/crud/wiki/Requests#frontend-usage)) +- [**@rewiko/crud-typeorm**](https://www.npmjs.com/package/@rewiko/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/rewiko/crud/wiki/ServiceTypeorm)) ## Documentation -- [General Information](https://github.com/nestjsx/crud/wiki#why) -- [CRUD Controllers](https://github.com/nestjsx/crud/wiki/Controllers#description) -- [CRUD ORM Services](https://github.com/nestjsx/crud/wiki/Services#description) -- [Handling Requests](https://github.com/nestjsx/crud/wiki/Requests#description) +- [General Information](https://github.com/rewiko/crud/wiki#why) +- [CRUD Controllers](https://github.com/rewiko/crud/wiki/Controllers#description) +- [CRUD ORM Services](https://github.com/rewiko/crud/wiki/Services#description) +- [Handling Requests](https://github.com/rewiko/crud/wiki/Requests#description) ## Support @@ -111,7 +111,7 @@ Any support is welcome. At least you can give us a star. ### Code Contributors This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. - + ### Financial Contributors diff --git a/packages/crud-typeorm/package.json b/packages/crud-typeorm/package.json index e47c7774..51abe5d9 100644 --- a/packages/crud-typeorm/package.json +++ b/packages/crud-typeorm/package.json @@ -1,22 +1,23 @@ { - "name": "@nestjsx/crud-typeorm", + "name": "@rewiko/crud-typeorm", "description": "NestJs CRUD for RESTful APIs - TypeORM", - "version": "5.0.0-alpha.3", + "version": "5.0.13", "license": "MIT", "main": "lib/index.js", "typings": "lib/index.d.ts", "publishConfig": { - "access": "public" + "access": "public", + "registry": "https://registry.npmjs.org/" }, "files": [ "lib" ], "repository": { "type": "git", - "url": "https://github.com/nestjsx/crud.git" + "url": "https://github.com/rewiko/crud.git" }, "bugs": { - "url": "https://github.com/nestjsx/crud/issues" + "url": "https://github.com/rewiko/crud/issues" }, "keywords": [ "typescript", @@ -40,5 +41,6 @@ }, "dependencies": { "@zmotivat0r/o0": "^1.0.2" - } + }, + "gitHead": "d9e468bd6e47762cf0de415d049f56078195ddb3" } diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts index 32a9d9f1..af0b22db 100644 --- a/packages/crud-typeorm/src/typeorm-crud.service.ts +++ b/packages/crud-typeorm/src/typeorm-crud.service.ts @@ -7,7 +7,7 @@ import { JoinOption, JoinOptions, QueryOptions, -} from '@nestjsx/crud'; +} from '@rewiko/crud'; import { ParsedRequestParams, QueryFilter, @@ -16,7 +16,7 @@ import { SCondition, SConditionKey, ComparisonOperator, -} from '@nestjsx/crud-request'; +} from '@rewiko/crud-request'; import { ClassType, hasLength, @@ -26,7 +26,7 @@ import { objKeys, isNil, isNull, -} from '@nestjsx/util'; +} from '@rewiko/util'; import { oO } from '@zmotivat0r/o0'; import { plainToClass } from 'class-transformer'; import { @@ -177,6 +177,8 @@ export class TypeOrmCrudService extends CrudService { public async updateOne(req: CrudRequest, dto: DeepPartial): Promise { const { allowParamsOverride, returnShallow } = req.options.routes.updateOneBase; const paramsFilters = this.getParamFilters(req.parsed); + // disable cache while updating + req.options.query.cache = false; const found = await this.getOneOrFail(req, returnShallow); const toSave = !allowParamsOverride ? { ...found, ...dto, ...paramsFilters, ...req.parsed.authPersist } @@ -200,6 +202,8 @@ export class TypeOrmCrudService extends CrudService { * @param dto */ public async recoverOne(req: CrudRequest): Promise { + // disable cache while recovering + req.options.query.cache = false; const found = await this.getOneOrFail(req, false, true); return this.repo.recover(found); } @@ -212,6 +216,8 @@ export class TypeOrmCrudService extends CrudService { public async replaceOne(req: CrudRequest, dto: DeepPartial): Promise { const { allowParamsOverride, returnShallow } = req.options.routes.replaceOneBase; const paramsFilters = this.getParamFilters(req.parsed); + // disable cache while replacing + req.options.query.cache = false; const [_, found] = await oO(this.getOneOrFail(req, returnShallow)); const toSave = !allowParamsOverride ? { ...(found || {}), ...dto, ...paramsFilters, ...req.parsed.authPersist } @@ -247,6 +253,8 @@ export class TypeOrmCrudService extends CrudService { */ public async deleteOne(req: CrudRequest): Promise { const { returnDeleted } = req.options.routes.deleteOneBase; + // disable cache while deleting + req.options.query.cache = false; const found = await this.getOneOrFail(req, returnDeleted); const toReturn = returnDeleted ? plainToClass(this.entityType, { ...found }) @@ -352,7 +360,7 @@ export class TypeOrmCrudService extends CrudService { // set cache /* istanbul ignore else */ if (options.query.cache && parsed.cache !== 0) { - builder.cache(builder.getQueryAndParameters(), options.query.cache); + builder.cache(options.query.cache); } return builder; diff --git a/packages/crud-typeorm/test/b.query-params.spec.ts b/packages/crud-typeorm/test/b.query-params.spec.ts index db60f8bc..8248753e 100644 --- a/packages/crud-typeorm/test/b.query-params.spec.ts +++ b/packages/crud-typeorm/test/b.query-params.spec.ts @@ -2,7 +2,7 @@ import { Controller, INestApplication } from '@nestjs/common'; import { APP_FILTER } from '@nestjs/core'; import { Test } from '@nestjs/testing'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { RequestQueryBuilder } from '@nestjsx/crud-request'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; import 'jest-extended'; import * as request from 'supertest'; diff --git a/packages/crud-typeorm/test/c.basic-crud.spec.ts b/packages/crud-typeorm/test/c.basic-crud.spec.ts index 55670d08..6070e442 100644 --- a/packages/crud-typeorm/test/c.basic-crud.spec.ts +++ b/packages/crud-typeorm/test/c.basic-crud.spec.ts @@ -3,8 +3,8 @@ import { APP_FILTER } from '@nestjs/core'; import { Test } from '@nestjs/testing'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { Crud } from '@nestjsx/crud'; -import { RequestQueryBuilder } from '@nestjsx/crud-request'; +import { Crud } from '@rewiko/crud'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; import * as request from 'supertest'; import { Company } from '../../../integration/crud-typeorm/companies'; import { Device } from '../../../integration/crud-typeorm/devices'; @@ -198,7 +198,7 @@ describe('#crud-typeorm', () => { }, query: { persist: ['isActive'], - cache: 10, + cache: 10000, }, validation: { transform: true, @@ -602,6 +602,50 @@ describe('#crud-typeorm', () => { done(); }); }); + it('should not return cached value while patching', async () => { + const dto = { name: { first: 'nameHasBeenPatched' } }; + const updateUser = () => + request(server) + .patch('/companies/2/users/17') + .send(dto); + + const query = qb.select(['name.first']).query(); + const getUserCachedAfterUpdate = () => + request(server) + .get('/companies/2/users/17') + .query(query); + + const resBeforeUpdateGetUser = await getUserCachedAfterUpdate().expect(200); + expect(resBeforeUpdateGetUser.body.name.first).toBe(null); + + const resUpdateUser = await updateUser().expect(200); + expect(resUpdateUser.body.name.first).toBe('nameHasBeenPatched'); + + const resGetUser = await getUserCachedAfterUpdate().expect(200); + expect(resGetUser.body.name.first).toBe('nameHasBeenPatched'); + }); + it('should not return cached value while updating', async () => { + const dto = { name: { last: 'nameHasBeenUpdated' } }; + const updateUser = () => + request(server) + .put('/companies/2/users/17') + .send(dto); + + const query = qb.select(['name.last']).query(); + const getUserCachedAfterUpdate = () => + request(server) + .get('/companies/2/users/17') + .query(query); + + const resBeforeUpdateGetUser = await getUserCachedAfterUpdate().expect(200); + expect(resBeforeUpdateGetUser.body.name.last).toBe(null); + + const resUpdateUser = await updateUser().expect(200); + expect(resUpdateUser.body.name.last).toBe('nameHasBeenUpdated'); + + const resGetUser = await getUserCachedAfterUpdate().expect(200); + expect(resGetUser.body.name.last).toBe('nameHasBeenUpdated'); + }); }); describe('#replaceOneBase', () => { diff --git a/packages/crud-typeorm/test/d.crud-auth.spec.ts b/packages/crud-typeorm/test/d.crud-auth.spec.ts index ea152c70..c77e2bf7 100644 --- a/packages/crud-typeorm/test/d.crud-auth.spec.ts +++ b/packages/crud-typeorm/test/d.crud-auth.spec.ts @@ -9,7 +9,7 @@ import { APP_FILTER, APP_GUARD } from '@nestjs/core'; import { Test } from '@nestjs/testing'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { Crud, CrudAuth } from '@nestjsx/crud'; +import { Crud, CrudAuth } from '@rewiko/crud'; import * as request from 'supertest'; import { withCache } from '../../../integration/crud-typeorm/orm.config'; import { User } from '../../../integration/crud-typeorm/users'; diff --git a/packages/crud/README.md b/packages/crud/README.md index e872c75e..3471b3d3 100644 --- a/packages/crud/README.md +++ b/packages/crud/README.md @@ -1,5 +1,5 @@
-

CRUD (@nestjsx/crud)

+

CRUD (@rewiko/crud)

for RESTful APIs built with NestJs @@ -8,20 +8,20 @@
- - Build + + Build - - Coverage + + Coverage - - License + + License - - npm version + + npm version - npm downloads + npm downloads Package Quality @@ -33,13 +33,13 @@ PRs welcome - Awesome REST + Awesome REST - Awesome Nest + Awesome Nest - Nest Powered + Nest Powered @@ -52,18 +52,18 @@
-We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@nestjsx/crud` microframework very useful. +We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@rewiko/crud` microframework very useful. ## Features -CRUD usage +CRUD usage - Super easy to install and start using the full-featured controllers and services :point_right: @@ -86,21 +86,21 @@ We believe that everyone who's working with NestJs and building some RESTful ser ## Install ```shell -npm i @nestjsx/crud class-transformer class-validator +npm i @rewiko/crud class-transformer class-validator ``` ## Packages -- [**@nestjsx/crud**](https://www.npmjs.com/package/@nestjsx/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/nestjsx/crud/wiki/Controllers#description)) -- [**@nestjsx/crud-request**](https://www.npmjs.com/package/@nestjsx/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/nestjsx/crud/wiki/Requests#frontend-usage)) -- [**@nestjsx/crud-typeorm**](https://www.npmjs.com/package/@nestjsx/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/nestjsx/crud/wiki/ServiceTypeorm)) +- [**@rewiko/crud**](https://www.npmjs.com/package/@rewiko/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/rewiko/crud/wiki/Controllers#description)) +- [**@rewiko/crud-request**](https://www.npmjs.com/package/@rewiko/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/rewiko/crud/wiki/Requests#frontend-usage)) +- [**@rewiko/crud-typeorm**](https://www.npmjs.com/package/@rewiko/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/rewiko/crud/wiki/ServiceTypeorm)) ## Documentation -- [General Information](https://github.com/nestjsx/crud/wiki#why) -- [CRUD Controllers](https://github.com/nestjsx/crud/wiki/Controllers#description) -- [CRUD ORM Services](https://github.com/nestjsx/crud/wiki/Services#description) -- [Handling Requests](https://github.com/nestjsx/crud/wiki/Requests#description) +- [General Information](https://github.com/rewiko/crud/wiki#why) +- [CRUD Controllers](https://github.com/rewiko/crud/wiki/Controllers#description) +- [CRUD ORM Services](https://github.com/rewiko/crud/wiki/Services#description) +- [Handling Requests](https://github.com/rewiko/crud/wiki/Requests#description) ## Support @@ -111,7 +111,7 @@ Any support is welcome. At least you can give us a star. ### Code Contributors This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. - + ### Financial Contributors diff --git a/packages/crud/package.json b/packages/crud/package.json index cd827cc0..302b0867 100644 --- a/packages/crud/package.json +++ b/packages/crud/package.json @@ -1,22 +1,23 @@ { - "name": "@nestjsx/crud", + "name": "@rewiko/crud", "description": "NestJs CRUD for RESTful APIs", - "version": "5.0.0-alpha.3", + "version": "5.0.13", "license": "MIT", "main": "lib/index.js", "typings": "lib/index.d.ts", "publishConfig": { - "access": "public" + "access": "public", + "registry": "https://registry.npmjs.org/" }, "files": [ "lib" ], "repository": { "type": "git", - "url": "https://github.com/nestjsx/crud.git" + "url": "https://github.com/rewiko/crud.git" }, "bugs": { - "url": "https://github.com/nestjsx/crud/issues" + "url": "https://github.com/rewiko/crud/issues" }, "keywords": [ "typescript", @@ -39,13 +40,14 @@ "build": "npx tsc -b" }, "dependencies": { - "@nestjsx/crud-request": "^5.0.0-alpha.3", - "@nestjsx/util": "^5.0.0-alpha.3", + "@rewiko/crud-request": "^5.0.13", + "@rewiko/util": "^5.0.13", "deepmerge": "^3.2.0", "pluralize": "^8.0.0" }, "peerDependencies": { "class-transformer": "*", "class-validator": "*" - } + }, + "gitHead": "d9e468bd6e47762cf0de415d049f56078195ddb3" } diff --git a/packages/crud/src/crud/crud-routes.factory.ts b/packages/crud/src/crud/crud-routes.factory.ts index 8147c877..ed7b00c7 100644 --- a/packages/crud/src/crud/crud-routes.factory.ts +++ b/packages/crud/src/crud/crud-routes.factory.ts @@ -11,7 +11,7 @@ import { getOwnPropNames, isNil, isUndefined, -} from '@nestjsx/util'; +} from '@rewiko/util'; import * as deepmerge from 'deepmerge'; import { R } from './reflection.helper'; diff --git a/packages/crud/src/crud/reflection.helper.ts b/packages/crud/src/crud/reflection.helper.ts index 1f21cc1a..5bc070a5 100644 --- a/packages/crud/src/crud/reflection.helper.ts +++ b/packages/crud/src/crud/reflection.helper.ts @@ -8,7 +8,7 @@ import { ROUTE_ARGS_METADATA, } from '@nestjs/common/constants'; import { ArgumentsHost } from '@nestjs/common'; -import { isFunction } from '@nestjsx/util'; +import { isFunction } from '@rewiko/util'; import { BaseRoute, MergedCrudOptions, AuthOptions } from '../interfaces'; import { BaseRouteName } from '../types'; diff --git a/packages/crud/src/crud/swagger.helper.ts b/packages/crud/src/crud/swagger.helper.ts index 2b42f7cb..29c3ae99 100644 --- a/packages/crud/src/crud/swagger.helper.ts +++ b/packages/crud/src/crud/swagger.helper.ts @@ -1,6 +1,6 @@ import { HttpStatus } from '@nestjs/common'; -import { RequestQueryBuilder } from '@nestjsx/crud-request'; -import { isString, objKeys } from '@nestjsx/util'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; +import { isString, objKeys } from '@rewiko/util'; import { MergedCrudOptions, ParamsOptions } from '../interfaces'; import { BaseRouteName } from '../types'; import { safeRequire } from '../util'; @@ -273,7 +273,7 @@ export class Swagger { } = Swagger.getQueryParamsNames(); const oldVersion = Swagger.getSwaggerVersion() < 4; const docsLink = (a: string) => - `Docs`; + `Docs`; const fieldsMetaBase = { name: fields, diff --git a/packages/crud/src/crud/validation.helper.ts b/packages/crud/src/crud/validation.helper.ts index 7949df96..4f7f415c 100644 --- a/packages/crud/src/crud/validation.helper.ts +++ b/packages/crud/src/crud/validation.helper.ts @@ -1,5 +1,5 @@ import { ValidationPipe } from '@nestjs/common'; -import { isFalse, isNil } from '@nestjsx/util'; +import { isFalse, isNil } from '@rewiko/util'; import { CrudValidationGroups } from '../enums'; import { CreateManyDto, CrudOptions, MergedCrudOptions } from '../interfaces'; import { safeRequire } from '../util'; diff --git a/packages/crud/src/interceptors/crud-request.interceptor.ts b/packages/crud/src/interceptors/crud-request.interceptor.ts index 902c95d0..f3c2d818 100644 --- a/packages/crud/src/interceptors/crud-request.interceptor.ts +++ b/packages/crud/src/interceptors/crud-request.interceptor.ts @@ -10,8 +10,8 @@ import { RequestQueryParser, SCondition, QueryFilter, -} from '@nestjsx/crud-request'; -import { isNil, isFunction, isArrayFull, hasLength } from '@nestjsx/util'; +} from '@rewiko/crud-request'; +import { isNil, isFunction, isArrayFull, hasLength } from '@rewiko/util'; import { PARSED_CRUD_REQUEST_KEY } from '../constants'; import { CrudActions } from '../enums'; diff --git a/packages/crud/src/interceptors/crud-response.interceptor.ts b/packages/crud/src/interceptors/crud-response.interceptor.ts index 98e622a9..1e1f4b0b 100644 --- a/packages/crud/src/interceptors/crud-response.interceptor.ts +++ b/packages/crud/src/interceptors/crud-response.interceptor.ts @@ -4,7 +4,7 @@ import { Injectable, NestInterceptor, } from '@nestjs/common'; -import { isFalse, isObject, isFunction } from '@nestjsx/util'; +import { isFalse, isObject, isFunction } from '@rewiko/util'; import { classToPlain, classToPlainFromExist } from 'class-transformer'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/packages/crud/src/interfaces/auth-options.interface.ts b/packages/crud/src/interfaces/auth-options.interface.ts index 84d8bdf8..e470b7a8 100644 --- a/packages/crud/src/interfaces/auth-options.interface.ts +++ b/packages/crud/src/interfaces/auth-options.interface.ts @@ -1,5 +1,5 @@ -import { SCondition } from '@nestjsx/crud-request/lib/types/request-query.types'; -import { ObjectLiteral } from '@nestjsx/util'; +import { SCondition } from '@rewiko/crud-request/lib/types/request-query.types'; +import { ObjectLiteral } from '@rewiko/util'; export interface AuthGlobalOptions { property?: string; diff --git a/packages/crud/src/interfaces/crud-global-config.interface.ts b/packages/crud/src/interfaces/crud-global-config.interface.ts index 76ef90de..44599e4d 100644 --- a/packages/crud/src/interfaces/crud-global-config.interface.ts +++ b/packages/crud/src/interfaces/crud-global-config.interface.ts @@ -1,4 +1,4 @@ -import { RequestQueryBuilderOptions } from '@nestjsx/crud-request'; +import { RequestQueryBuilderOptions } from '@rewiko/crud-request'; import { RoutesOptions } from './routes-options.interface'; import { ParamsOptions } from './params-options.interface'; diff --git a/packages/crud/src/interfaces/crud-request.interface.ts b/packages/crud/src/interfaces/crud-request.interface.ts index 3a1afb66..945584b7 100644 --- a/packages/crud/src/interfaces/crud-request.interface.ts +++ b/packages/crud/src/interfaces/crud-request.interface.ts @@ -1,4 +1,4 @@ -import { ParsedRequestParams } from '@nestjsx/crud-request'; +import { ParsedRequestParams } from '@rewiko/crud-request'; import { CrudRequestOptions } from '../interfaces'; diff --git a/packages/crud/src/interfaces/params-options.interface.ts b/packages/crud/src/interfaces/params-options.interface.ts index 3cca1e3d..d526f964 100644 --- a/packages/crud/src/interfaces/params-options.interface.ts +++ b/packages/crud/src/interfaces/params-options.interface.ts @@ -1,5 +1,5 @@ import { SwaggerEnumType } from '@nestjs/swagger/dist/types/swagger-enum.type'; -import { ParamOptionType } from '@nestjsx/crud-request'; +import { ParamOptionType } from '@rewiko/crud-request'; export interface ParamsOptions { [key: string]: ParamOption; diff --git a/packages/crud/src/interfaces/query-options.interface.ts b/packages/crud/src/interfaces/query-options.interface.ts index cfb9515f..044d8300 100644 --- a/packages/crud/src/interfaces/query-options.interface.ts +++ b/packages/crud/src/interfaces/query-options.interface.ts @@ -1,7 +1,7 @@ import { QueryFields, QuerySort, -} from '@nestjsx/crud-request/lib/types/request-query.types'; +} from '@rewiko/crud-request/lib/types/request-query.types'; import { QueryFilterOption } from '../types'; diff --git a/packages/crud/src/module/crud-config.service.ts b/packages/crud/src/module/crud-config.service.ts index 75037ad6..9926287b 100644 --- a/packages/crud/src/module/crud-config.service.ts +++ b/packages/crud/src/module/crud-config.service.ts @@ -1,5 +1,5 @@ -import { RequestQueryBuilder } from '@nestjsx/crud-request'; -import { isObjectFull } from '@nestjsx/util'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; +import { isObjectFull } from '@rewiko/util'; import * as deepmerge from 'deepmerge'; import { CrudGlobalConfig } from '../interfaces'; diff --git a/packages/crud/src/services/crud-service.abstract.ts b/packages/crud/src/services/crud-service.abstract.ts index 6729944e..e0e6ace4 100644 --- a/packages/crud/src/services/crud-service.abstract.ts +++ b/packages/crud/src/services/crud-service.abstract.ts @@ -1,6 +1,6 @@ import { BadRequestException, NotFoundException } from '@nestjs/common'; -import { ParsedRequestParams } from '@nestjsx/crud-request'; -import { objKeys } from '@nestjsx/util'; +import { ParsedRequestParams } from '@rewiko/crud-request'; +import { objKeys } from '@rewiko/util'; import { CreateManyDto, diff --git a/packages/crud/src/types/query-filter-option.type.ts b/packages/crud/src/types/query-filter-option.type.ts index 9c0f2e20..8ca47b1c 100644 --- a/packages/crud/src/types/query-filter-option.type.ts +++ b/packages/crud/src/types/query-filter-option.type.ts @@ -1,7 +1,7 @@ import { QueryFilter, SCondition, -} from '@nestjsx/crud-request/lib/types/request-query.types'; +} from '@rewiko/crud-request/lib/types/request-query.types'; export type QueryFilterFunction = ( search?: SCondition, diff --git a/packages/crud/test/__fixture__/exception.filter.ts b/packages/crud/test/__fixture__/exception.filter.ts index 9f7d22b2..683407b7 100644 --- a/packages/crud/test/__fixture__/exception.filter.ts +++ b/packages/crud/test/__fixture__/exception.filter.ts @@ -1,5 +1,5 @@ import { ArgumentsHost, Catch, ExceptionFilter, HttpStatus } from '@nestjs/common'; -import { RequestQueryException } from '@nestjsx/crud-request'; +import { RequestQueryException } from '@rewiko/crud-request'; import { Response } from 'express'; @Catch(RequestQueryException) diff --git a/packages/crud/test/__fixture__/services/test.service.ts b/packages/crud/test/__fixture__/services/test.service.ts index 91573a05..0131269b 100644 --- a/packages/crud/test/__fixture__/services/test.service.ts +++ b/packages/crud/test/__fixture__/services/test.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { ParsedRequestParams } from '@nestjsx/crud-request'; +import { ParsedRequestParams } from '@rewiko/crud-request'; import { CrudRequestOptions } from '../../../src/interfaces'; import { CreateManyDto, CrudRequest } from '../../../src/interfaces'; diff --git a/packages/crud/test/crud-config.service.global.spec.ts b/packages/crud/test/crud-config.service.global.spec.ts index 7ae6a4ea..5930edc8 100644 --- a/packages/crud/test/crud-config.service.global.spec.ts +++ b/packages/crud/test/crud-config.service.global.spec.ts @@ -35,7 +35,7 @@ const conf: CrudGlobalConfig = { }; // Important: load config before (!!!) you import AppModule -// https://github.com/nestjsx/crud/wiki/Controllers#global-options +// https://github.com/rewiko/crud/wiki/Controllers#global-options CrudConfigService.load(conf); import { Crud } from '../src/decorators/crud.decorator'; diff --git a/packages/crud/test/crud-config.service.spec.ts b/packages/crud/test/crud-config.service.spec.ts index 850f63bf..4be7c387 100644 --- a/packages/crud/test/crud-config.service.spec.ts +++ b/packages/crud/test/crud-config.service.spec.ts @@ -1,4 +1,4 @@ -import { RequestQueryBuilder } from '@nestjsx/crud-request'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; import { CrudGlobalConfig } from '../src/interfaces'; import { CrudConfigService } from '../src/module/crud-config.service'; diff --git a/packages/crud/test/crud-request.interceptor.spec.ts b/packages/crud/test/crud-request.interceptor.spec.ts index 73aa6ac8..1974f038 100644 --- a/packages/crud/test/crud-request.interceptor.spec.ts +++ b/packages/crud/test/crud-request.interceptor.spec.ts @@ -8,7 +8,7 @@ import { } from '@nestjs/common'; import { NestApplication } from '@nestjs/core'; import { Test } from '@nestjs/testing'; -import { RequestQueryBuilder } from '@nestjsx/crud-request'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; import * as supertest from 'supertest'; import { Crud, ParsedRequest, CrudAuth, Override } from '../src/decorators'; import { CrudRequestInterceptor } from '../src/interceptors'; diff --git a/packages/crud/test/crud.decorator.base.spec.ts b/packages/crud/test/crud.decorator.base.spec.ts index 629c5a05..6a5aab48 100644 --- a/packages/crud/test/crud.decorator.base.spec.ts +++ b/packages/crud/test/crud.decorator.base.spec.ts @@ -2,7 +2,7 @@ import * as request from 'supertest'; import { Test } from '@nestjs/testing'; import { Controller, INestApplication } from '@nestjs/common'; import { APP_FILTER } from '@nestjs/core'; -import { RequestQueryBuilder } from '@nestjsx/crud-request'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; import { Crud } from '../src/decorators/crud.decorator'; import { CreateManyDto } from '../src/interfaces'; diff --git a/packages/crud/test/crud.decorator.override.spec.ts b/packages/crud/test/crud.decorator.override.spec.ts index ee4c87a5..dc6f1626 100644 --- a/packages/crud/test/crud.decorator.override.spec.ts +++ b/packages/crud/test/crud.decorator.override.spec.ts @@ -2,7 +2,7 @@ import * as request from 'supertest'; import { Test } from '@nestjs/testing'; import { Controller, INestApplication } from '@nestjs/common'; import { APP_FILTER } from '@nestjs/core'; -import { RequestQueryBuilder } from '@nestjsx/crud-request'; +import { RequestQueryBuilder } from '@rewiko/crud-request'; import { Crud, Override, ParsedRequest, ParsedBody } from '../src/decorators'; import { CrudController, CrudRequest, CreateManyDto } from '../src/interfaces'; diff --git a/packages/util/README.md b/packages/util/README.md index 985e209d..418fef02 100644 --- a/packages/util/README.md +++ b/packages/util/README.md @@ -1,5 +1,5 @@
-

CRUD (@nestjsx/util)

+

CRUD (@rewiko/util)

for RESTful APIs built with NestJs @@ -8,20 +8,20 @@
- - Build + + Build - - Coverage + + Coverage - - License + + License - - npm version + + npm version - npm downloads + npm downloads Package Quality @@ -33,13 +33,13 @@ PRs welcome - Awesome REST + Awesome REST - Awesome Nest + Awesome Nest - Nest Powered + Nest Powered @@ -52,18 +52,18 @@
-We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@nestjsx/crud` microframework very useful. +We believe that everyone who's working with NestJs and building some RESTful services and especially some CRUD functionality will find `@rewiko/crud` microframework very useful. ## Features -CRUD usage +CRUD usage - Super easy to install and start using the full-featured controllers and services :point_right: @@ -85,16 +85,16 @@ We believe that everyone who's working with NestJs and building some RESTful ser ## Packages -- [**@nestjsx/crud**](https://www.npmjs.com/package/@nestjsx/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/nestjsx/crud/wiki/Controllers#description)) -- [**@nestjsx/crud-request**](https://www.npmjs.com/package/@nestjsx/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/nestjsx/crud/wiki/Requests#frontend-usage)) -- [**@nestjsx/crud-typeorm**](https://www.npmjs.com/package/@nestjsx/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/nestjsx/crud/wiki/ServiceTypeorm)) +- [**@rewiko/crud**](https://www.npmjs.com/package/@rewiko/crud) - core package which provides `@Crud()` decorator for endpoints generation, global configuration, validation, helper decorators ([docs](https://github.com/rewiko/crud/wiki/Controllers#description)) +- [**@rewiko/crud-request**](https://www.npmjs.com/package/@rewiko/crud-request) - request builder/parser package which provides `RequestQueryBuilder` class for a frontend usage and `RequestQueryParser` that is being used internally for handling and validating query/path params on a backend side ([docs](https://github.com/rewiko/crud/wiki/Requests#frontend-usage)) +- [**@rewiko/crud-typeorm**](https://www.npmjs.com/package/@rewiko/crud-typeorm) - TypeORM package which provides base `TypeOrmCrudService` with methods for CRUD database operations ([docs](https://github.com/rewiko/crud/wiki/ServiceTypeorm)) ## Documentation -- [General Information](https://github.com/nestjsx/crud/wiki#why) -- [CRUD Controllers](https://github.com/nestjsx/crud/wiki/Controllers#description) -- [CRUD ORM Services](https://github.com/nestjsx/crud/wiki/Services#description) -- [Handling Requests](https://github.com/nestjsx/crud/wiki/Requests#description) +- [General Information](https://github.com/rewiko/crud/wiki#why) +- [CRUD Controllers](https://github.com/rewiko/crud/wiki/Controllers#description) +- [CRUD ORM Services](https://github.com/rewiko/crud/wiki/Services#description) +- [Handling Requests](https://github.com/rewiko/crud/wiki/Requests#description) ## Support @@ -105,7 +105,7 @@ Any support is welcome. At least you can give us a star. ### Code Contributors This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)]. - + ### Financial Contributors diff --git a/packages/util/package.json b/packages/util/package.json index 3c056eea..5054a578 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,22 +1,23 @@ { - "name": "@nestjsx/util", + "name": "@rewiko/util", "description": "NestJs CRUD for RESTful APIs - util", - "version": "5.0.0-alpha.3", + "version": "5.0.13", "license": "MIT", "main": "lib/index.js", "typings": "lib/index.d.ts", "publishConfig": { - "access": "public" + "access": "public", + "registry": "https://registry.npmjs.org/" }, "files": [ "lib" ], "repository": { "type": "git", - "url": "https://github.com/nestjsx/crud.git" + "url": "https://github.com/rewiko/crud.git" }, "bugs": { - "url": "https://github.com/nestjsx/crud/issues" + "url": "https://github.com/rewiko/crud/issues" }, "keywords": [ "typescript", @@ -35,5 +36,6 @@ }, "scripts": { "build": "npx tsc -b" - } + }, + "gitHead": "d9e468bd6e47762cf0de415d049f56078195ddb3" } diff --git a/tsconfig.json b/tsconfig.json index 704526f0..daef9270 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,14 +15,14 @@ "composite": true, "baseUrl": "./packages", "paths": { - "@nestjsx/crud": ["crud/src"], - "@nestjsx/crud-typeorm": ["crud-typeorm/src"], - "@nestjsx/crud-request": ["crud-request/src"], - "@nestjsx/util": ["util/src"], - "@nestjsx/crud/*": ["crud/src/*"], - "@nestjsx/crud-typeorm/*": ["crud-typeorm/src/*"], - "@nestjsx/crud-request/*": ["crud-request/src/*"], - "@nestjsx/util/*": ["util/src/*"] + "@rewiko/crud": ["crud/src"], + "@rewiko/crud-typeorm": ["crud-typeorm/src"], + "@rewiko/crud-request": ["crud-request/src"], + "@rewiko/util": ["util/src"], + "@rewiko/crud/*": ["crud/src/*"], + "@rewiko/crud-typeorm/*": ["crud-typeorm/src/*"], + "@rewiko/crud-request/*": ["crud-request/src/*"], + "@rewiko/util/*": ["util/src/*"] } }, "references": [ diff --git a/yarn.lock b/yarn.lock index 09e3f74b..e85a6fd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7322,7 +7322,7 @@ please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" -pluralize@8.0.0: +pluralize@8.0.0, pluralize@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==