From 40e35aa64ffd6fc805e25c9e382892a73faa73df Mon Sep 17 00:00:00 2001 From: ppetzold Date: Tue, 14 Mar 2023 22:12:49 +0100 Subject: [PATCH] fix: clean up --- src/{paginate => }/filter.ts | 2 +- src/{paginate => }/helper.ts | 0 src/{paginate/index.spec.ts => paginate.spec.ts} | 12 ++++++------ src/{paginate/index.ts => paginate.ts} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/{paginate => }/filter.ts (99%) rename src/{paginate => }/helper.ts (100%) rename src/{paginate/index.spec.ts => paginate.spec.ts} (99%) rename src/{paginate/index.ts => paginate.ts} (99%) diff --git a/src/paginate/filter.ts b/src/filter.ts similarity index 99% rename from src/paginate/filter.ts rename to src/filter.ts index 662234e..bf31a03 100644 --- a/src/paginate/filter.ts +++ b/src/filter.ts @@ -15,7 +15,7 @@ import { SelectQueryBuilder, } from 'typeorm' import { WherePredicateOperator } from 'typeorm/query-builder/WhereClause' -import { PaginateQuery } from '../decorator' +import { PaginateQuery } from './decorator' import { checkIsEmbedded, checkIsRelation, diff --git a/src/paginate/helper.ts b/src/helper.ts similarity index 100% rename from src/paginate/helper.ts rename to src/helper.ts diff --git a/src/paginate/index.spec.ts b/src/paginate.spec.ts similarity index 99% rename from src/paginate/index.spec.ts rename to src/paginate.spec.ts index 4deb8b5..d77296f 100644 --- a/src/paginate/index.spec.ts +++ b/src/paginate.spec.ts @@ -1,11 +1,11 @@ import { Repository, In, DataSource, TypeORMError } from 'typeorm' -import { Paginated, paginate, PaginateConfig, NO_PAGINATION } from '.' -import { PaginateQuery } from '../decorator' +import { Paginated, paginate, PaginateConfig, NO_PAGINATION } from './paginate' +import { PaginateQuery } from './decorator' import { HttpException } from '@nestjs/common' -import { CatEntity } from '../__tests__/cat.entity' -import { CatToyEntity } from '../__tests__/cat-toy.entity' -import { CatHomeEntity } from '../__tests__/cat-home.entity' -import { CatHomePillowEntity } from '../__tests__/cat-home-pillow.entity' +import { CatEntity } from './__tests__/cat.entity' +import { CatToyEntity } from './__tests__/cat-toy.entity' +import { CatHomeEntity } from './__tests__/cat-home.entity' +import { CatHomePillowEntity } from './__tests__/cat-home-pillow.entity' import { clone } from 'lodash' import { getFilterTokens, diff --git a/src/paginate/index.ts b/src/paginate.ts similarity index 99% rename from src/paginate/index.ts rename to src/paginate.ts index 139e7cf..f2e7f67 100644 --- a/src/paginate/index.ts +++ b/src/paginate.ts @@ -7,7 +7,7 @@ import { ObjectLiteral, FindOptionsUtils, } from 'typeorm' -import { PaginateQuery } from '../decorator' +import { PaginateQuery } from './decorator' import { ServiceUnavailableException, Logger } from '@nestjs/common' import { mapKeys } from 'lodash' import { stringify } from 'querystring'