@codenameryuu/adonis-lucid-filter 2.0.0 → 2.1.0

package/LICENSE.md

@@ -1,9 +1,9 @@
-# The MIT License
-
-Copyright (c) 2024 Lookin Anton
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# The MIT License
+
+Copyright (c) 2024 Lookin Anton
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,312 +1,315 @@
-# Adonis Lucid Filter
-> Works with AdonisJS v6
-
-[![npm-image]][npm-url] [![license-image]][license-url] [![typescript-image]][typescript-url]
-
-This addon adds the functionality to filter Lucid Models
-> Inspired by [EloquentFilter](https://github.com/Tucker-Eric/EloquentFilter)
-
-## Versions
-
-> **Note**: Check before install :point_down:
-
-| adonis-lucid-filter                 | @adonisjs/lucid     |
-|-------------------------------------|---------------------|
-| ^5.\*.*                             | ^20.\*.*            |
-| ^4.\*.*                             | <=18.\*.*           |
-| ^3.\*.* (`@filterable()` decorator) | ^15.\*.*            |
-| ^2.\*.*                             | 14.\*.*             |
-
-- Docs [for **Adonis v5**](https://github.com/lookinlab/adonis-lucid-filter/tree/v4)
-- Docs [for **Adonis v4**](https://github.com/lookinlab/adonis-lucid-filter/tree/v1)
-- Docs [for `@filterable()` decorator](https://github.com/lookinlab/adonis-lucid-filter/tree/v3)
-
-## Introduction
-Example, we want to return a list of users filtered by multiple parameters. When we navigate to:
-
-`/users?name=Tony&lastName=&companyId=2&industry=5`
-
-`request.all()` or `request.qs()` will return:
-
-```json
-{
-  "name": "Tony",
-  "lastName": "",
-  "companyId": 2,
-  "industry": 5
-}
-```
-
-To filter by all those parameters we would need to do something like:
-
-```ts
-import type { HttpContext } from '@adonisjs/core/http'
-import User from '#models/user'
-
-export default class UsersController {
-  async index({ request }: HttpContext): Promise<User[]> {
-    const { companyId, lastName, name, industry } = request.qs()
-  
-    const query = User.query().where('company_id', +companyId)
-
-    if (lastName) {
-      query.where('last_name', 'LIKE', `%${lastName}%`)
-    }
-    if (name) {
-      query.where(function () {
-        this.where('first_name', 'LIKE', `%${name}%`)
-          .orWhere('last_name', 'LIKE', `%${name}%`)
-      })
-    }
-    return query.exec()
-  }
-
-}
-```
-
-To filter that same input with Lucid Filters:
-
-```ts
-import type { HttpContext } from '@adonisjs/core/http'
-import User from '#models/user'
-
-export default class UsersController {
-  async index({ request }: HttpContext): Promise<User[]> {
-    return User.filter(request.qs()).exec()
-  }
-}
-```
-
-## Installation
-
-Make sure to install it using `npm`, `yarn` or `pnpm`.
-
-```bash
-# npm
-npm i adonis-lucid-filter
-
-# yarn
-yarn add adonis-lucid-filter
-
-# pnpm
-pnpm add adonis-lucid-filter
-```
-
-After install call `configure`:
-
-```bash
-node ace configure adonis-lucid-filter
-```
-
-## Usage
-
-Make sure to register the provider and commands inside `adonisrc.ts` file.
-
-```ts
-providers: [
-  // ...
-  () => import('adonis-lucid-filter/provider'),
-],
-commands: [
-  // ...
-  () => import('adonis-lucid-filter/commands')
-]
-```
-
-### Generating The Filter
-> Only available if you have added `adonis-lucid-filter/commands` in `commands` array in your `adonisrc.ts'
-
-You can create a model filter with the following ace command:
-
-```bash
-node ace make:filter user
-```
-
-Where `user` is the Lucid Model you are creating the filter for. This will create `app/models/filters/user_filter.js`
-
-### Defining The Filter Logic
-Define the filter logic based on the camel cased input key passed to the `filter()` method.
-
-- Empty strings are ignored
-- `setup()` will be called regardless of input
-- `_id` is dropped from the end of the input to define the method so filtering `user_id` would use the `user()` method
-- Input without a corresponding filter method are ignored
-- The value of the key is injected into the method
-- All values are accessible through the `this.$input` a property
-- All QueryBuilder methods are accessible in `this.$query` object in the model filter class.
-
-To define methods for the following input:
-
-```json
-{
-  "companyId": 5,
-  "name": "Tony",
-  "mobilePhone": "888555"
-}
-```
-
-You would use the following methods:
-
-```ts
-import { BaseModelFilter } from 'adonis-lucid-filter'
-import type { ModelQueryBuilderContract } from '@adonisjs/lucid/types/model'
-import User from '#models/user'
-
-export default class UserFilter extends BaseModelFilter {
-  declare $query: ModelQueryBuilderContract<typeof User>
-  
-  static blacklist: string[] = ['secretMethod']
-
-  // This will filter 'companyId', 'company_id' OR 'company'
-  company(id: number) {
-    this.$query.where('company_id', id)
-  }
-
-  name(name: string) {
-    this.$query.where((builder) => {
-      builder
-        .where('first_name', 'LIKE', `%${name}%`)
-        .orWhere('last_name', 'LIKE', `%${name}%`)
-    })
-  }
-
-  mobilePhone(phone: string) {
-    this.$query.where('mobile_phone', 'LIKE', `${phone}%`)
-  }
-
-  secretMethod(secretParameter: any) {
-    this.$query.where('some_column', true)
-  }
-}
-```
-
-#### Blacklist
-
-Any methods defined in the `blacklist` array will not be called by the filter.
-Those methods are normally used for internal filter logic.
-
-The `whitelistMethod()` methods can be used to dynamically blacklist methods.
-
-Example:
-```ts
-setup($query) {
-  this.whitelistMethod('secretMethod')
-  this.$query.where('is_admin', true)
-}
-```
-> `setup()` not may be async
-
-> **Note:** All methods inside `setup()` will be called every time `filter()` is called on the model
-
-In the example above `secretMethod()` will not be called, even if there is a `secret_method` key in the input object.
-In order to call this method it would need to be whitelisted dynamically:
-
-#### Static properties
-
-```ts
-export default class UserFilter extends BaseModelFilter {
-  // Blacklisted methods
-  static blacklist: string[] = []
-  
-  // Dropped `_id` from the end of the input
-  // Doing this would allow you to have a `company()` filter method as well as a `companyId()` filter method.
-  static dropId: boolean = true
-  
-  // Doing this would allow you to have a mobile_phone() filter method instead of mobilePhone().
-  // By default, mobilePhone() filter method can be called thanks to one of the following input key:
-  // mobile_phone, mobilePhone, mobile_phone_id, mobilePhoneId
-  static camelCase: boolean = true
-}
-```
-
-### Applying The Filter To A Model
-
-```ts
-import UserFilter from '#models/filters/user_filter'
-import { compose } from '@adonisjs/core/helpers'
-import { Filterable } from 'adonis-lucid-filter'
-
-export default class User extends compose(BaseModel, Filterable) {
-  static $filter = () => UserFilter
-
-  // ...columns and props
-}
-```
-
-This gives you access to the `filter()` method that accepts an object of input:
-
-```ts
-import type { HttpContext } from '@adonisjs/core/http'
-import User from '#models/user'
-
-export default class UsersController {
-  async index({ request }: HttpContext): Promise<User[]> {
-    return User.filter(request.qs()).exec()
-  }
-
-  // or with paginate method
-
-  async index({ request }: HttpContext): Promise<ModelPaginatorContract<User>> {
-    const { page = 1, ...input } = request.qs()
-    return User.filter(input).paginate(page, 15)
-  }
-}
-```
-
-### Dynamic Filters
-
-You can define the filter dynamically by passing the filter to use as the second parameter of the filter() method.
-Defining a filter dynamically will take precedent over any other filters defined for the model.
-
-```ts
-import type { HttpContext } from '@adonisjs/core/http'
-import AdminFilter from '#models/filters/admin_filter'
-import UserFilter from '#models/filters/user_filter'
-
-export default class UsersController {
-  async index({ request, auth }: HttpContext): Promise<User[]> {
-    const filter = auth.user.isAdmin() ? AdminFilter : UserFilter
-    return User.filter(request.qs(), filter).exec()
-  } 
-}
-```
-
-### Filtering relations
-
-For filtering relations of model may be use `.query().filter()` or scope `filtration`, example:
-
-```ts
-import type { HttpContext } from '@adonisjs/core/http'
-import User from '#models/user'
-
-export default class UserPostsController {
-  /**
-   * Get a list posts of user
-   * GET /users/:user_id/posts
-   */
-  async index({ params, request }: HttpContext): Promise<Post[]> {
-    const user: User = await User.findOrFail(params.user_id)
-    
-    return user.related('posts').query()
-      .apply(scopes => scopes.filtration(request.qs()))
-      .exec()
-
-    // or
-
-    return user.related('posts').query().filter(request.qs()).exec()
-  }
-}
-```
-
-Documentation by [Query Scopes](https://lucid.adonisjs.com/docs/model-query-scopes)
-
-**Note:** The relation model must be `Filterable` and `$filter` must be defined in it
-
-[npm-image]: https://img.shields.io/npm/v/adonis-lucid-filter?logo=npm&style=for-the-badge
-[npm-url]: https://www.npmjs.com/package/adonis-lucid-filter
-
-[license-image]: https://img.shields.io/npm/l/adonis-lucid-filter?style=for-the-badge&color=blueviolet
-[license-url]: https://github.com/lookinlab/adonis-lucid-filter/blob/develop/LICENSE.md
-
-[typescript-image]: https://img.shields.io/npm/types/adonis-lucid-filter?color=294E80&label=%20&logo=typescript&style=for-the-badge
-[typescript-url]: https://github.com/lookinlab
+# Adonis Lucid Filter
+
+> Works with AdonisJS v6
+
+[![npm-image]][npm-url] [![license-image]][license-url] [![typescript-image]][typescript-url]
+
+This addon adds the functionality to filter Lucid Models
+
+> Inspired by [EloquentFilter](https://github.com/Tucker-Eric/EloquentFilter)
+
+## Versions
+
+> **Note**: Check before install :point_down:
+
+| adonis-lucid-filter                  | @adonisjs/lucid |
+| ------------------------------------ | --------------- |
+| ^5.\*.\*                             | ^20.\*.\*       |
+| ^4.\*.\*                             | <=18.\*.\*      |
+| ^3.\*.\* (`@filterable()` decorator) | ^15.\*.\*       |
+| ^2.\*.\*                             | 14.\*.\*        |
+
+- Docs [for **Adonis v5**](https://github.com/lookinlab/adonis-lucid-filter/tree/v4)
+- Docs [for **Adonis v4**](https://github.com/lookinlab/adonis-lucid-filter/tree/v1)
+- Docs [for `@filterable()` decorator](https://github.com/lookinlab/adonis-lucid-filter/tree/v3)
+
+## Introduction
+
+Example, we want to return a list of users filtered by multiple parameters. When we navigate to:
+
+`/users?name=Tony&lastName=&companyId=2&industry=5`
+
+`request.all()` or `request.qs()` will return:
+
+```json
+{
+  "name": "Tony",
+  "lastName": "",
+  "companyId": 2,
+  "industry": 5
+}
+```
+
+To filter by all those parameters we would need to do something like:
+
+```ts
+import type { HttpContext } from '@adonisjs/core/http'
+import User from '#models/user'
+
+export default class UsersController {
+  async index({ request }: HttpContext): Promise<User[]> {
+    const { companyId, lastName, name, industry } = request.qs()
+
+    const query = User.query().where('company_id', +companyId)
+
+    if (lastName) {
+      query.where('last_name', 'LIKE', `%${lastName}%`)
+    }
+    if (name) {
+      query.where(function () {
+        this.where('first_name', 'LIKE', `%${name}%`).orWhere('last_name', 'LIKE', `%${name}%`)
+      })
+    }
+    return query.exec()
+  }
+}
+```
+
+To filter that same input with Lucid Filters:
+
+```ts
+import type { HttpContext } from '@adonisjs/core/http'
+import User from '#models/user'
+
+export default class UsersController {
+  async index({ request }: HttpContext): Promise<User[]> {
+    return User.filter(request.qs()).exec()
+  }
+}
+```
+
+## Installation
+
+Make sure to install it using `npm`, `yarn` or `pnpm`.
+
+```bash
+# npm
+npm i adonis-lucid-filter
+
+# yarn
+yarn add adonis-lucid-filter
+
+# pnpm
+pnpm add adonis-lucid-filter
+```
+
+After install call `configure`:
+
+```bash
+node ace configure adonis-lucid-filter
+```
+
+## Usage
+
+Make sure to register the provider and commands inside `adonisrc.ts` file.
+
+```ts
+providers: [
+  // ...
+  () => import('adonis-lucid-filter/provider'),
+],
+commands: [
+  // ...
+  () => import('adonis-lucid-filter/commands')
+]
+```
+
+### Generating The Filter
+
+> Only available if you have added `adonis-lucid-filter/commands` in `commands` array in your `adonisrc.ts'
+
+You can create a model filter with the following ace command:
+
+```bash
+node ace make:filter user
+```
+
+Where `user` is the Lucid Model you are creating the filter for. This will create `app/models/filters/user_filter.js`
+
+### Defining The Filter Logic
+
+Define the filter logic based on the camel cased input key passed to the `filter()` method.
+
+- Empty strings are ignored
+- `setup()` will be called regardless of input
+- `_id` is dropped from the end of the input to define the method so filtering `user_id` would use the `user()` method
+- Input without a corresponding filter method are ignored
+- The value of the key is injected into the method
+- All values are accessible through the `this.$input` a property
+- All QueryBuilder methods are accessible in `this.$query` object in the model filter class.
+
+To define methods for the following input:
+
+```json
+{
+  "companyId": 5,
+  "name": "Tony",
+  "mobilePhone": "888555"
+}
+```
+
+You would use the following methods:
+
+```ts
+import { BaseModelFilter } from 'adonis-lucid-filter'
+import type { ModelQueryBuilderContract } from '@adonisjs/lucid/types/model'
+import User from '#models/user'
+
+export default class UserFilter extends BaseModelFilter {
+  declare $query: ModelQueryBuilderContract<typeof User>
+
+  static blacklist: string[] = ['secretMethod']
+
+  // This will filter 'companyId', 'company_id' OR 'company'
+  company(id: number) {
+    this.$query.where('company_id', id)
+  }
+
+  name(name: string) {
+    this.$query.where((builder) => {
+      builder.where('first_name', 'LIKE', `%${name}%`).orWhere('last_name', 'LIKE', `%${name}%`)
+    })
+  }
+
+  mobilePhone(phone: string) {
+    this.$query.where('mobile_phone', 'LIKE', `${phone}%`)
+  }
+
+  secretMethod(secretParameter: any) {
+    this.$query.where('some_column', true)
+  }
+}
+```
+
+#### Blacklist
+
+Any methods defined in the `blacklist` array will not be called by the filter.
+Those methods are normally used for internal filter logic.
+
+The `whitelistMethod()` methods can be used to dynamically blacklist methods.
+
+Example:
+
+```ts
+setup($query) {
+  this.whitelistMethod('secretMethod')
+  this.$query.where('is_admin', true)
+}
+```
+
+> `setup()` not may be async
+
+> **Note:** All methods inside `setup()` will be called every time `filter()` is called on the model
+
+In the example above `secretMethod()` will not be called, even if there is a `secret_method` key in the input object.
+In order to call this method it would need to be whitelisted dynamically:
+
+#### Static properties
+
+```ts
+export default class UserFilter extends BaseModelFilter {
+  // Blacklisted methods
+  static blacklist: string[] = []
+
+  // Dropped `_id` from the end of the input
+  // Doing this would allow you to have a `company()` filter method as well as a `companyId()` filter method.
+  static dropId: boolean = true
+
+  // Doing this would allow you to have a mobile_phone() filter method instead of mobilePhone().
+  // By default, mobilePhone() filter method can be called thanks to one of the following input key:
+  // mobile_phone, mobilePhone, mobile_phone_id, mobilePhoneId
+  static camelCase: boolean = true
+}
+```
+
+### Applying The Filter To A Model
+
+```ts
+import UserFilter from '#models/filters/user_filter'
+import { compose } from '@adonisjs/core/helpers'
+import { Filterable } from 'adonis-lucid-filter'
+
+export default class User extends compose(BaseModel, Filterable) {
+  static $filter = () => UserFilter
+
+  // ...columns and props
+}
+```
+
+This gives you access to the `filter()` method that accepts an object of input:
+
+```ts
+import type { HttpContext } from '@adonisjs/core/http'
+import User from '#models/user'
+
+export default class UsersController {
+  async index({ request }: HttpContext): Promise<User[]> {
+    return User.filter(request.qs()).exec()
+  }
+
+  // or with paginate method
+
+  async index({ request }: HttpContext): Promise<ModelPaginatorContract<User>> {
+    const { page = 1, ...input } = request.qs()
+    return User.filter(input).paginate(page, 15)
+  }
+}
+```
+
+### Dynamic Filters
+
+You can define the filter dynamically by passing the filter to use as the second parameter of the filter() method.
+Defining a filter dynamically will take precedent over any other filters defined for the model.
+
+```ts
+import type { HttpContext } from '@adonisjs/core/http'
+import AdminFilter from '#models/filters/admin_filter'
+import UserFilter from '#models/filters/user_filter'
+
+export default class UsersController {
+  async index({ request, auth }: HttpContext): Promise<User[]> {
+    const filter = auth.user.isAdmin() ? AdminFilter : UserFilter
+    return User.filter(request.qs(), filter).exec()
+  }
+}
+```
+
+### Filtering relations
+
+For filtering relations of model may be use `.query().filter()` or scope `filtration`, example:
+
+```ts
+import type { HttpContext } from '@adonisjs/core/http'
+import User from '#models/user'
+
+export default class UserPostsController {
+  /**
+   * Get a list posts of user
+   * GET /users/:user_id/posts
+   */
+  async index({ params, request }: HttpContext): Promise<Post[]> {
+    const user: User = await User.findOrFail(params.user_id)
+
+    return user
+      .related('posts')
+      .query()
+      .apply((scopes) => scopes.filtration(request.qs()))
+      .exec()
+
+    // or
+
+    return user.related('posts').query().filter(request.qs()).exec()
+  }
+}
+```
+
+Documentation by [Query Scopes](https://lucid.adonisjs.com/docs/model-query-scopes)
+
+**Note:** The relation model must be `Filterable` and `$filter` must be defined in it
+
+[npm-image]: https://img.shields.io/npm/v/adonis-lucid-filter?logo=npm&style=for-the-badge
+[npm-url]: https://www.npmjs.com/package/adonis-lucid-filter
+[license-image]: https://img.shields.io/npm/l/adonis-lucid-filter?style=for-the-badge&color=blueviolet
+[license-url]: https://github.com/lookinlab/adonis-lucid-filter/blob/develop/LICENSE.md
+[typescript-image]: https://img.shields.io/npm/types/adonis-lucid-filter?color=294E80&label=%20&logo=typescript&style=for-the-badge
+[typescript-url]: https://github.com/lookinlab

package/build/{chunk-FZT5JNRL.js → chunk-V7FYZD4D.js}

@@ -12,4 +12,4 @@ function extendModelQueryBuilder(builder) {
 export {
   extendModelQueryBuilder
 };
-//# sourceMappingURL=chunk-FZT5JNRL.js.map
+//# sourceMappingURL=chunk-V7FYZD4D.js.map

package/build/chunk-V7FYZD4D.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/bindings/model_query_builder.ts"],"sourcesContent":["/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\nimport type { ModelQueryBuilder } from '@adonisjs/lucid/orm'\nimport type { LucidFilterContract } from '@codenameryuu/adonis-lucid-filter/types/filter'\n\n/**\n * Define filter method to ModelQueryBuilder\n */\nexport function extendModelQueryBuilder(builder: any) {\n  builder.macro(\n    'filter',\n    function (this: ModelQueryBuilder, input: any, filter?: LucidFilterContract) {\n      const Filter = filter || (this.model as any).$filter()\n      return new Filter(this, input).handle()\n    }\n  )\n}\n"],"mappings":";AAeO,SAAS,wBAAwB,SAAc;AACpD,UAAQ;AAAA,IACN;AAAA,IACA,SAAmC,OAAY,QAA8B;AAC3E,YAAM,SAAS,UAAW,KAAK,MAAc,QAAQ;AACrD,aAAO,IAAI,OAAO,MAAM,KAAK,EAAE,OAAO;AAAA,IACxC;AAAA,EACF;AACF;","names":[]}

package/build/{chunk-NBGNVIUM.js → chunk-WD7GE7Y7.js}

@@ -6,4 +6,4 @@ var stubsRoot = dirname(fileURLToPath(import.meta.url));
 export {
   stubsRoot
 };
-//# sourceMappingURL=chunk-NBGNVIUM.js.map
+//# sourceMappingURL=chunk-WD7GE7Y7.js.map

package/build/chunk-WD7GE7Y7.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../stubs/main.ts"],"sourcesContent":["/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\nimport { fileURLToPath } from 'node:url'\nimport { dirname } from 'node:path'\n\nexport const stubsRoot = dirname(fileURLToPath(import.meta.url))\n"],"mappings":";AASA,SAAS,qBAAqB;AAC9B,SAAS,eAAe;AAEjB,IAAM,YAAY,QAAQ,cAAc,YAAY,GAAG,CAAC;","names":[]}

package/build/commands/make_filter.js

@@ -1,6 +1,6 @@
 import {
   stubsRoot
-} from "../chunk-NBGNVIUM.js";
+} from "../chunk-WD7GE7Y7.js";
 import {
   __decorateClass
 } from "../chunk-XUS63JTZ.js";

package/build/commands/make_filter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../commands/make_filter.ts"],"sourcesContent":["/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\nimport { BaseCommand, args } from '@adonisjs/core/ace'\r\nimport { stubsRoot } from '../stubs/main.js'\r\n\r\nexport default class MakeFilter extends BaseCommand {\r\n  static commandName = 'make:filter'\r\n  static description = 'Make a new Lucid filter'\r\n\r\n  /**\r\n   * The name of the model file.\r\n   */\r\n  @args.string({ description: 'Name of the model file' })\r\n  declare name: string\r\n\r\n  /**\r\n   * Run command\r\n   */\r\n  async run(): Promise<void> {\r\n    const codemods = await this.createCodemods()\r\n\r\n    await codemods.makeUsingStub(stubsRoot, 'make/filter/main.stub', {\r\n      name: this.name,\r\n    })\r\n  }\r\n}\r\n"],"mappings":";;;;;;;;AASA,SAAS,aAAa,YAAY;AAGlC,IAAqB,aAArB,cAAwC,YAAY;AAAA,EAClD,OAAO,cAAc;AAAA,EACrB,OAAO,cAAc;AAAA;AAAA;AAAA;AAAA,EAWrB,MAAM,MAAqB;AACzB,UAAM,WAAW,MAAM,KAAK,eAAe;AAE3C,UAAM,SAAS,cAAc,WAAW,yBAAyB;AAAA,MAC/D,MAAM,KAAK;AAAA,IACb,CAAC;AAAA,EACH;AACF;AAZU;AAAA,EADP,KAAK,OAAO,EAAE,aAAa,yBAAyB,CAAC;AAAA,GAPnC,WAQX;","names":[]}
+{"version":3,"sources":["../../commands/make_filter.ts"],"sourcesContent":["/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\nimport { BaseCommand, args } from '@adonisjs/core/ace'\nimport { stubsRoot } from '../stubs/main.js'\n\nexport default class MakeFilter extends BaseCommand {\n  static commandName = 'make:filter'\n  static description = 'Make a new Lucid filter'\n\n  /**\n   * The name of the model file.\n   */\n  @args.string({ description: 'Name of the model file' })\n  declare name: string\n\n  /**\n   * Run command\n   */\n  async run(): Promise<void> {\n    const codemods = await this.createCodemods()\n\n    await codemods.makeUsingStub(stubsRoot, 'make/filter/main.stub', {\n      name: this.name,\n    })\n  }\n}\n"],"mappings":";;;;;;;;AASA,SAAS,aAAa,YAAY;AAGlC,IAAqB,aAArB,cAAwC,YAAY;AAAA,EAClD,OAAO,cAAc;AAAA,EACrB,OAAO,cAAc;AAAA;AAAA;AAAA;AAAA,EAWrB,MAAM,MAAqB;AACzB,UAAM,WAAW,MAAM,KAAK,eAAe;AAE3C,UAAM,SAAS,cAAc,WAAW,yBAAyB;AAAA,MAC/D,MAAM,KAAK;AAAA,IACb,CAAC;AAAA,EACH;AACF;AAZU;AAAA,EADP,KAAK,OAAO,EAAE,aAAa,yBAAyB,CAAC;AAAA,GAPnC,WAQX;","names":[]}

package/build/index.js

@@ -1,6 +1,6 @@
 import {
   stubsRoot
-} from "./chunk-NBGNVIUM.js";
+} from "./chunk-WD7GE7Y7.js";
 import {
   __decorateClass,
   __publicField
@@ -10,8 +10,8 @@ import {
 async function configure(command) {
   const codemods = await command.createCodemods();
   await codemods.updateRcFile((rcFile) => {
-    rcFile.addProvider("adonis-lucid-filter/provider");
-    rcFile.addCommand("adonis-lucid-filter/commands");
+    rcFile.addProvider("@codenameryuu/adonis-lucid-filter/provider");
+    rcFile.addCommand("@codenameryuu/adonis-lucid-filter/commands");
   });
 }
 

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../configure.ts","../src/base_model.ts","../src/mixin.ts"],"sourcesContent":["/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\nimport type Configure from '@adonisjs/core/commands/configure'\r\n\r\nexport async function configure(command: Configure) {\r\n  const codemods = await command.createCodemods()\r\n\r\n  await codemods.updateRcFile((rcFile) => {\r\n    rcFile.addProvider('adonis-lucid-filter/provider')\r\n    rcFile.addCommand('adonis-lucid-filter/commands')\r\n  })\r\n}\r\n","/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\nimport camelCase from 'lodash/camelCase.js'\r\nimport type { LucidFilter, LucidFilterContract } from './types/filter.js'\r\n\r\nfunction StaticImplements<T>() {\r\n  return (_t: T) => {}\r\n}\r\n\r\n/**\r\n * Class to filtering AdonisJS Lucid ORM\r\n *\r\n * @class BaseModelFilter\r\n * @constructor\r\n */\r\n@StaticImplements<LucidFilterContract>()\r\nexport class BaseModelFilter implements LucidFilter {\r\n  declare ['constructor']: typeof BaseModelFilter\r\n  declare $blacklist: string[]\r\n\r\n  static blacklist: string[] = []\r\n  static dropId: boolean = true\r\n  static camelCase: boolean = true\r\n\r\n  setup?($query: any): void\r\n\r\n  constructor(\r\n    public $query: any,\r\n    public $input: object\r\n  ) {\r\n    this.$input = BaseModelFilter.removeEmptyInput(this.$input)\r\n    this.$blacklist = this.constructor.blacklist\r\n  }\r\n\r\n  handle(): any {\r\n    if (this.setup && typeof this.setup === 'function') {\r\n      this.setup(this.$query)\r\n    }\r\n    this.$filterByInput()\r\n\r\n    return this.$query\r\n  }\r\n\r\n  whitelistMethod(method: string): boolean {\r\n    const index = this.$blacklist.indexOf(method)\r\n\r\n    const isBlacklisted = index !== -1\r\n    if (isBlacklisted) this.$blacklist.splice(index, 1)\r\n\r\n    return isBlacklisted\r\n  }\r\n\r\n  $filterByInput(): void {\r\n    for (const key in this.$input) {\r\n      const method = this.$getFilterMethod(key)\r\n\r\n      const keyName = key as keyof typeof this.$input\r\n      const value: unknown = this.$input[keyName]\r\n\r\n      if (this.$methodIsCallable(method)) {\r\n        ;(this[method as keyof this] as Function)(value)\r\n      }\r\n    }\r\n  }\r\n\r\n  $getFilterMethod(key: string): string {\r\n    const methodName = this.constructor.dropId ? key.replace(/^(.*)(_id|Id)$/, '$1') : key\r\n    return this.constructor.camelCase ? camelCase(methodName) : methodName\r\n  }\r\n\r\n  static removeEmptyInput(input: object): object {\r\n    const filteredInput = {}\r\n\r\n    for (const key in input) {\r\n      const keyName = key as keyof typeof input\r\n      const value = input[keyName]\r\n\r\n      if (value !== '' && value !== null && value !== undefined) {\r\n        filteredInput[keyName] = value\r\n      }\r\n    }\r\n    return filteredInput\r\n  }\r\n\r\n  $methodIsCallable(method: string): boolean {\r\n    const methodKey = method as keyof this\r\n\r\n    return (\r\n      !!this[methodKey] &&\r\n      typeof this[methodKey] === 'function' &&\r\n      !this.$methodIsBlacklisted(method)\r\n    )\r\n  }\r\n\r\n  $methodIsBlacklisted(method: string): boolean {\r\n    return this.$blacklist.includes(method)\r\n  }\r\n}\r\nexport default BaseModelFilter\r\n","/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\nimport type { NormalizeConstructor } from '@adonisjs/core/types/helpers'\r\nimport type { BaseModel } from '@adonisjs/lucid/orm'\r\nimport type {\r\n  InputObject,\r\n  LucidFilterContract,\r\n} from '@codenameryuu/adonis-lucid-filter/types/filter'\r\nimport type {\r\n  ModelQueryBuilderContract,\r\n  QueryScope,\r\n  QueryScopeCallback,\r\n} from '@adonisjs/lucid/types/model'\r\n\r\nexport const Filterable = <Model extends NormalizeConstructor<typeof BaseModel>>(\r\n  superclass: Model\r\n) => {\r\n  class FilterableModel extends superclass {\r\n    declare static $filter: () => LucidFilterContract\r\n\r\n    /**\r\n     * Filter method of filterable model\r\n     */\r\n    static filter<\r\n      T extends typeof FilterableModel,\r\n      Filter extends LucidFilterContract = ReturnType<T['$filter']>,\r\n    >(\r\n      this: T,\r\n      input: InputObject<InstanceType<Filter>>,\r\n      filter?: Filter\r\n    ): ModelQueryBuilderContract<T> {\r\n      const Filter = filter || this.$filter()\r\n      return new Filter(this.query(), input).handle()\r\n    }\r\n\r\n    /**\r\n     * Filtration scope of filterable model\r\n     */\r\n    static filtration = function (\r\n      this: typeof FilterableModel,\r\n      query,\r\n      input,\r\n      filter?: LucidFilterContract\r\n    ) {\r\n      const Filter = filter || this.$filter()\r\n      return new Filter(query, input).handle()\r\n    } as QueryScope<Model, QueryScopeCallback>\r\n  }\r\n  return FilterableModel\r\n}\r\n"],"mappings":";;;;;;;;;AAWA,eAAsB,UAAU,SAAoB;AAClD,QAAM,WAAW,MAAM,QAAQ,eAAe;AAE9C,QAAM,SAAS,aAAa,CAAC,WAAW;AACtC,WAAO,YAAY,8BAA8B;AACjD,WAAO,WAAW,8BAA8B;AAAA,EAClD,CAAC;AACH;;;ACTA,OAAO,eAAe;AAGtB,SAAS,mBAAsB;AAC7B,SAAO,CAAC,OAAU;AAAA,EAAC;AACrB;AASO,IAAM,kBAAN,MAA6C;AAAA,EAUlD,YACS,QACA,QACP;AAFO;AACA;AAEP,SAAK,SAAS,gBAAgB,iBAAiB,KAAK,MAAM;AAC1D,SAAK,aAAa,KAAK,YAAY;AAAA,EACrC;AAAA,EAEA,SAAc;AACZ,QAAI,KAAK,SAAS,OAAO,KAAK,UAAU,YAAY;AAClD,WAAK,MAAM,KAAK,MAAM;AAAA,IACxB;AACA,SAAK,eAAe;AAEpB,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,gBAAgB,QAAyB;AACvC,UAAM,QAAQ,KAAK,WAAW,QAAQ,MAAM;AAE5C,UAAM,gBAAgB,UAAU;AAChC,QAAI,cAAe,MAAK,WAAW,OAAO,OAAO,CAAC;AAElD,WAAO;AAAA,EACT;AAAA,EAEA,iBAAuB;AACrB,eAAW,OAAO,KAAK,QAAQ;AAC7B,YAAM,SAAS,KAAK,iBAAiB,GAAG;AAExC,YAAM,UAAU;AAChB,YAAM,QAAiB,KAAK,OAAO,OAAO;AAE1C,UAAI,KAAK,kBAAkB,MAAM,GAAG;AAClC;AAAC,QAAC,KAAK,MAAoB,EAAe,KAAK;AAAA,MACjD;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB,KAAqB;AACpC,UAAM,aAAa,KAAK,YAAY,SAAS,IAAI,QAAQ,kBAAkB,IAAI,IAAI;AACnF,WAAO,KAAK,YAAY,YAAY,UAAU,UAAU,IAAI;AAAA,EAC9D;AAAA,EAEA,OAAO,iBAAiB,OAAuB;AAC7C,UAAM,gBAAgB,CAAC;AAEvB,eAAW,OAAO,OAAO;AACvB,YAAM,UAAU;AAChB,YAAM,QAAQ,MAAM,OAAO;AAE3B,UAAI,UAAU,MAAM,UAAU,QAAQ,UAAU,QAAW;AACzD,sBAAc,OAAO,IAAI;AAAA,MAC3B;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,kBAAkB,QAAyB;AACzC,UAAM,YAAY;AAElB,WACE,CAAC,CAAC,KAAK,SAAS,KAChB,OAAO,KAAK,SAAS,MAAM,cAC3B,CAAC,KAAK,qBAAqB,MAAM;AAAA,EAErC;AAAA,EAEA,qBAAqB,QAAyB;AAC5C,WAAO,KAAK,WAAW,SAAS,MAAM;AAAA,EACxC;AACF;AA7EE,cAJW,iBAIJ,aAAsB,CAAC;AAC9B,cALW,iBAKJ,UAAkB;AACzB,cANW,iBAMJ,aAAqB;AANjB,kBAAN;AAAA,EADN,iBAAsC;AAAA,GAC1B;;;ACFN,IAAM,aAAa,CACxB,eACG;AAAA,EACH,MAAM,wBAAwB,WAAW;AAAA;AAAA;AAAA;AAAA,IAMvC,OAAO,OAKL,OACA,QAC8B;AAC9B,YAAM,SAAS,UAAU,KAAK,QAAQ;AACtC,aAAO,IAAI,OAAO,KAAK,MAAM,GAAG,KAAK,EAAE,OAAO;AAAA,IAChD;AAAA;AAAA;AAAA;AAAA,IAKA,OAAO,aAAa,SAElB,OACA,OACA,QACA;AACA,YAAM,SAAS,UAAU,KAAK,QAAQ;AACtC,aAAO,IAAI,OAAO,OAAO,KAAK,EAAE,OAAO;AAAA,IACzC;AAAA,EACF;AACA,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../configure.ts","../src/base_model.ts","../src/mixin.ts"],"sourcesContent":["/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\nimport type Configure from '@adonisjs/core/commands/configure'\n\nexport async function configure(command: Configure) {\n  const codemods = await command.createCodemods()\n\n  await codemods.updateRcFile((rcFile) => {\n    rcFile.addProvider('@codenameryuu/adonis-lucid-filter/provider')\n    rcFile.addCommand('@codenameryuu/adonis-lucid-filter/commands')\n  })\n}\n","/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\nimport camelCase from 'lodash/camelCase.js'\nimport type { LucidFilter, LucidFilterContract } from './types/filter.js'\n\nfunction StaticImplements<T>() {\n  return (_t: T) => {}\n}\n\n/**\n * Class to filtering AdonisJS Lucid ORM\n *\n * @class BaseModelFilter\n * @constructor\n */\n@StaticImplements<LucidFilterContract>()\nexport class BaseModelFilter implements LucidFilter {\n  declare ['constructor']: typeof BaseModelFilter\n  declare $blacklist: string[]\n\n  static blacklist: string[] = []\n  static dropId: boolean = true\n  static camelCase: boolean = true\n\n  setup?($query: any): void\n\n  constructor(\n    public $query: any,\n    public $input: object\n  ) {\n    this.$input = BaseModelFilter.removeEmptyInput(this.$input)\n    this.$blacklist = this.constructor.blacklist\n  }\n\n  handle(): any {\n    if (this.setup && typeof this.setup === 'function') {\n      this.setup(this.$query)\n    }\n    this.$filterByInput()\n\n    return this.$query\n  }\n\n  whitelistMethod(method: string): boolean {\n    const index = this.$blacklist.indexOf(method)\n\n    const isBlacklisted = index !== -1\n    if (isBlacklisted) this.$blacklist.splice(index, 1)\n\n    return isBlacklisted\n  }\n\n  $filterByInput(): void {\n    for (const key in this.$input) {\n      const method = this.$getFilterMethod(key)\n\n      const keyName = key as keyof typeof this.$input\n      const value: unknown = this.$input[keyName]\n\n      if (this.$methodIsCallable(method)) {\n        ;(this[method as keyof this] as Function)(value)\n      }\n    }\n  }\n\n  $getFilterMethod(key: string): string {\n    const methodName = this.constructor.dropId ? key.replace(/^(.*)(_id|Id)$/, '$1') : key\n    return this.constructor.camelCase ? camelCase(methodName) : methodName\n  }\n\n  static removeEmptyInput(input: object): object {\n    const filteredInput = {}\n\n    for (const key in input) {\n      const keyName = key as keyof typeof input\n      const value = input[keyName]\n\n      if (value !== '' && value !== null && value !== undefined) {\n        filteredInput[keyName] = value\n      }\n    }\n    return filteredInput\n  }\n\n  $methodIsCallable(method: string): boolean {\n    const methodKey = method as keyof this\n\n    return (\n      !!this[methodKey] &&\n      typeof this[methodKey] === 'function' &&\n      !this.$methodIsBlacklisted(method)\n    )\n  }\n\n  $methodIsBlacklisted(method: string): boolean {\n    return this.$blacklist.includes(method)\n  }\n}\nexport default BaseModelFilter\n","/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\nimport type { NormalizeConstructor } from '@adonisjs/core/types/helpers'\nimport type { BaseModel } from '@adonisjs/lucid/orm'\nimport type {\n  InputObject,\n  LucidFilterContract,\n} from '@codenameryuu/adonis-lucid-filter/types/filter'\nimport type {\n  ModelQueryBuilderContract,\n  QueryScope,\n  QueryScopeCallback,\n} from '@adonisjs/lucid/types/model'\n\nexport const Filterable = <Model extends NormalizeConstructor<typeof BaseModel>>(\n  superclass: Model\n) => {\n  class FilterableModel extends superclass {\n    declare static $filter: () => LucidFilterContract\n\n    /**\n     * Filter method of filterable model\n     */\n    static filter<\n      T extends typeof FilterableModel,\n      Filter extends LucidFilterContract = ReturnType<T['$filter']>,\n    >(\n      this: T,\n      input: InputObject<InstanceType<Filter>>,\n      filter?: Filter\n    ): ModelQueryBuilderContract<T> {\n      const Filter = filter || this.$filter()\n      return new Filter(this.query(), input).handle()\n    }\n\n    /**\n     * Filtration scope of filterable model\n     */\n    static filtration = function (\n      this: typeof FilterableModel,\n      query,\n      input,\n      filter?: LucidFilterContract\n    ) {\n      const Filter = filter || this.$filter()\n      return new Filter(query, input).handle()\n    } as QueryScope<Model, QueryScopeCallback>\n  }\n  return FilterableModel\n}\n"],"mappings":";;;;;;;;;AAWA,eAAsB,UAAU,SAAoB;AAClD,QAAM,WAAW,MAAM,QAAQ,eAAe;AAE9C,QAAM,SAAS,aAAa,CAAC,WAAW;AACtC,WAAO,YAAY,4CAA4C;AAC/D,WAAO,WAAW,4CAA4C;AAAA,EAChE,CAAC;AACH;;;ACTA,OAAO,eAAe;AAGtB,SAAS,mBAAsB;AAC7B,SAAO,CAAC,OAAU;AAAA,EAAC;AACrB;AASO,IAAM,kBAAN,MAA6C;AAAA,EAUlD,YACS,QACA,QACP;AAFO;AACA;AAEP,SAAK,SAAS,gBAAgB,iBAAiB,KAAK,MAAM;AAC1D,SAAK,aAAa,KAAK,YAAY;AAAA,EACrC;AAAA,EAEA,SAAc;AACZ,QAAI,KAAK,SAAS,OAAO,KAAK,UAAU,YAAY;AAClD,WAAK,MAAM,KAAK,MAAM;AAAA,IACxB;AACA,SAAK,eAAe;AAEpB,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,gBAAgB,QAAyB;AACvC,UAAM,QAAQ,KAAK,WAAW,QAAQ,MAAM;AAE5C,UAAM,gBAAgB,UAAU;AAChC,QAAI,cAAe,MAAK,WAAW,OAAO,OAAO,CAAC;AAElD,WAAO;AAAA,EACT;AAAA,EAEA,iBAAuB;AACrB,eAAW,OAAO,KAAK,QAAQ;AAC7B,YAAM,SAAS,KAAK,iBAAiB,GAAG;AAExC,YAAM,UAAU;AAChB,YAAM,QAAiB,KAAK,OAAO,OAAO;AAE1C,UAAI,KAAK,kBAAkB,MAAM,GAAG;AAClC;AAAC,QAAC,KAAK,MAAoB,EAAe,KAAK;AAAA,MACjD;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB,KAAqB;AACpC,UAAM,aAAa,KAAK,YAAY,SAAS,IAAI,QAAQ,kBAAkB,IAAI,IAAI;AACnF,WAAO,KAAK,YAAY,YAAY,UAAU,UAAU,IAAI;AAAA,EAC9D;AAAA,EAEA,OAAO,iBAAiB,OAAuB;AAC7C,UAAM,gBAAgB,CAAC;AAEvB,eAAW,OAAO,OAAO;AACvB,YAAM,UAAU;AAChB,YAAM,QAAQ,MAAM,OAAO;AAE3B,UAAI,UAAU,MAAM,UAAU,QAAQ,UAAU,QAAW;AACzD,sBAAc,OAAO,IAAI;AAAA,MAC3B;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,kBAAkB,QAAyB;AACzC,UAAM,YAAY;AAElB,WACE,CAAC,CAAC,KAAK,SAAS,KAChB,OAAO,KAAK,SAAS,MAAM,cAC3B,CAAC,KAAK,qBAAqB,MAAM;AAAA,EAErC;AAAA,EAEA,qBAAqB,QAAyB;AAC5C,WAAO,KAAK,WAAW,SAAS,MAAM;AAAA,EACxC;AACF;AA7EE,cAJW,iBAIJ,aAAsB,CAAC;AAC9B,cALW,iBAKJ,UAAkB;AACzB,cANW,iBAMJ,aAAqB;AANjB,kBAAN;AAAA,EADN,iBAAsC;AAAA,GAC1B;;;ACFN,IAAM,aAAa,CACxB,eACG;AAAA,EACH,MAAM,wBAAwB,WAAW;AAAA;AAAA;AAAA;AAAA,IAMvC,OAAO,OAKL,OACA,QAC8B;AAC9B,YAAM,SAAS,UAAU,KAAK,QAAQ;AACtC,aAAO,IAAI,OAAO,KAAK,MAAM,GAAG,KAAK,EAAE,OAAO;AAAA,IAChD;AAAA;AAAA;AAAA;AAAA,IAKA,OAAO,aAAa,SAElB,OACA,OACA,QACA;AACA,YAAM,SAAS,UAAU,KAAK,QAAQ;AACtC,aAAO,IAAI,OAAO,OAAO,KAAK,EAAE,OAAO;AAAA,IACzC;AAAA,EACF;AACA,SAAO;AACT;","names":[]}

package/build/providers/lucid_filter_provider.js

@@ -1,6 +1,6 @@
 import {
   extendModelQueryBuilder
-} from "../chunk-FZT5JNRL.js";
+} from "../chunk-V7FYZD4D.js";
 import "../chunk-XUS63JTZ.js";
 
 // providers/lucid_filter_provider.ts

package/build/providers/lucid_filter_provider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../providers/lucid_filter_provider.ts"],"sourcesContent":["/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\n/// <reference path=\"../src/types/querybuilder.ts\" />\r\n\r\nimport type { ApplicationService } from '@adonisjs/core/types'\r\nimport { extendModelQueryBuilder } from '../src/bindings/model_query_builder.js'\r\n\r\nexport default class LucidFilterProvider {\r\n  constructor(protected app: ApplicationService) {}\r\n\r\n  async boot() {\r\n    const { ModelQueryBuilder } = await this.app.import('@adonisjs/lucid/orm')\r\n    extendModelQueryBuilder(ModelQueryBuilder)\r\n  }\r\n}\r\n"],"mappings":";;;;;;AAcA,IAAqB,sBAArB,MAAyC;AAAA,EACvC,YAAsB,KAAyB;AAAzB;AAAA,EAA0B;AAAA,EAEhD,MAAM,OAAO;AACX,UAAM,EAAE,kBAAkB,IAAI,MAAM,KAAK,IAAI,OAAO,qBAAqB;AACzE,4BAAwB,iBAAiB;AAAA,EAC3C;AACF;","names":[]}
+{"version":3,"sources":["../../providers/lucid_filter_provider.ts"],"sourcesContent":["/*\n * adonis-lucid-filter\n *\n * (c) Lookin Anton <alf@lookinlab.ru>\n *\n * For the full copyright and license information, please view the LICENSE\n * file that was distributed with this source code.\n */\n\n/// <reference path=\"../src/types/querybuilder.ts\" />\n\nimport type { ApplicationService } from '@adonisjs/core/types'\nimport { extendModelQueryBuilder } from '../src/bindings/model_query_builder.js'\n\nexport default class LucidFilterProvider {\n  constructor(protected app: ApplicationService) {}\n\n  async boot() {\n    const { ModelQueryBuilder } = await this.app.import('@adonisjs/lucid/orm')\n    extendModelQueryBuilder(ModelQueryBuilder)\n  }\n}\n"],"mappings":";;;;;;AAcA,IAAqB,sBAArB,MAAyC;AAAA,EACvC,YAAsB,KAAyB;AAAzB;AAAA,EAA0B;AAAA,EAEhD,MAAM,OAAO;AACX,UAAM,EAAE,kBAAkB,IAAI,MAAM,KAAK,IAAI,OAAO,qBAAqB;AACzE,4BAAwB,iBAAiB;AAAA,EAC3C;AACF;","names":[]}

package/build/src/bindings/model_query_builder.js

@@ -1,6 +1,6 @@
 import {
   extendModelQueryBuilder
-} from "../../chunk-FZT5JNRL.js";
+} from "../../chunk-V7FYZD4D.js";
 import "../../chunk-XUS63JTZ.js";
 export {
   extendModelQueryBuilder

package/package.json

@@ -1,134 +1,134 @@
-{
-  "name": "@codenameryuu/adonis-lucid-filter",
-  "description": "Addon for filtering AdonisJS Lucid ORM",
-  "version": "2.0.0",
-  "engines": {
-    "node": ">=20.6.0"
-  },
-  "main": "./build/index.js",
-  "type": "module",
-  "files": [
-    "build",
-    "!build/bin",
-    "!build/tests"
-  ],
-  "exports": {
-    ".": "./build/index.js",
-    "./commands": "./build/commands/main.js",
-    "./types/*": "./build/src/types/*.js",
-    "./bindings": "./build/src/bindings/model_query_builder.js",
-    "./provider": "./build/providers/lucid_filter_provider.js"
-  },
-  "scripts": {
-    "lint": "eslint .",
-    "clean": "del-cli build",
-    "precompile": "npm run lint && npm run clean",
-    "postcompile": "npm run copy:stubs && npm run index:commands",
-    "compile": "tsup-node && tsc --emitDeclarationOnly --declaration",
-    "build": "npm run compile",
-    "copy:stubs": "copyfiles \"stubs/**/**/*.stub\" --up=\"1\" build",
-    "index:commands": "adonis-kit index build/commands",
-    "quick:test": "NODE_DEBUG=\"adonis-lucid-filter\" node --enable-source-maps --loader=ts-node/esm bin/test.ts",
-    "pretest": "npm run lint",
-    "test": "c8 npm run quick:test",
-    "typecheck": "tsc --noEmit",
-    "version": "npm run build",
-    "prepublishOnly": "npm run build",
-    "release": "np"
-  },
-  "devDependencies": {
-    "@adonisjs/assembler": "^7.7.0",
-    "@adonisjs/core": "^7.0.0",
-    "@adonisjs/eslint-config": "^1.3.0",
-    "@adonisjs/lucid": "^22.0.0",
-    "@adonisjs/prettier-config": "^1.3.0",
-    "@adonisjs/tsconfig": "^1.3.0",
-    "@japa/assert": "^2.1.0",
-    "@japa/expect-type": "^2.0.2",
-    "@japa/file-system": "^2.3.0",
-    "@japa/runner": "^3.1.4",
-    "@japa/snapshot": "^2.0.5",
-    "@swc/core": "^1.6.7",
-    "@types/lodash": "^4.17.6",
-    "c8": "^9.1.0",
-    "copyfiles": "^2.4.1",
-    "del-cli": "^5.1.0",
-    "eslint": "^8.57.0",
-    "knex": "^3.1.0",
-    "lodash": "^4.17.21",
-    "luxon": "^3.4.4",
-    "np": "^9.2.0",
-    "reflect-metadata": "^0.2.2",
-    "sqlite3": "^5.1.7",
-    "ts-node": "^10.9.2",
-    "tsup": "^8.1.0",
-    "typescript": "^5.5.3"
-  },
-  "dependencies": {
-    "type-fest": "^4.21.0"
-  },
-  "peerDependencies": {
-    "@adonisjs/core": "^6.2.3",
-    "@adonisjs/lucid": "^21.1.0",
-    "lodash": "^4.17.21"
-  },
-  "author": "LookinGit",
-  "license": "MIT",
-  "homepage": "https://github.com/lookinlab/adonis-lucid-filter#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/lookinlab/adonis-lucid-filter.git"
-  },
-  "bugs": {
-    "url": "https://github.com/lookinlab/adonis-lucid-filter/issues"
-  },
-  "keywords": [
-    "adonisjs",
-    "adonisjs-filter",
-    "adonisjs-lucid",
-    "adonisjs-lucid-filter",
-    "adonis",
-    "adonis-lucid",
-    "adonis-filter",
-    "adonis-lucid-filter"
-  ],
-  "eslintConfig": {
-    "extends": "@adonisjs/eslint-config/package"
-  },
-  "prettier": "@adonisjs/prettier-config",
-  "publishConfig": {
-    "access": "public",
-    "tag": "latest"
-  },
-  "np": {
-    "message": "chore(release): %s",
-    "tag": "latest",
-    "branch": "master",
-    "anyBranch": false
-  },
-  "c8": {
-    "reporter": [
-      "text",
-      "html"
-    ],
-    "exclude": [
-      "tests/**",
-      "bin/**"
-    ]
-  },
-  "tsup": {
-    "entry": [
-      "./index.ts",
-      "./src/types/*.ts",
-      "./src/bindings/model_query_builder.ts",
-      "./commands/make_filter.ts",
-      "./providers/lucid_filter_provider.ts"
-    ],
-    "outDir": "./build",
-    "clean": true,
-    "format": "esm",
-    "dts": false,
-    "sourcemap": true,
-    "target": "esnext"
-  }
-}
+{
+  "name": "@codenameryuu/adonis-lucid-filter",
+  "description": "Addon for filtering Adonis JS 7 Lucid ORM",
+  "version": "2.1.0",
+  "engines": {
+    "node": ">=24.x.x"
+  },
+  "main": "./build/index.js",
+  "type": "module",
+  "files": [
+    "build",
+    "!build/bin",
+    "!build/tests"
+  ],
+  "exports": {
+    ".": "./build/index.js",
+    "./commands": "./build/commands/main.js",
+    "./types/*": "./build/src/types/*.js",
+    "./bindings": "./build/src/bindings/model_query_builder.js",
+    "./provider": "./build/providers/lucid_filter_provider.js"
+  },
+  "scripts": {
+    "lint": "eslint .",
+    "format": "prettier --write .",
+    "clean": "del-cli build",
+    "precompile": "npm run lint && npm run clean",
+    "postcompile": "npm run copy:stubs && npm run index:commands",
+    "compile": "tsup-node && tsc --emitDeclarationOnly --declaration",
+    "build": "npm run compile",
+    "copy:stubs": "copyfiles \"stubs/**/**/*.stub\" --up=\"1\" build",
+    "index:commands": "adonis-kit index build/commands",
+    "quick:test": "NODE_DEBUG=\"adonis-lucid-filter\" node --enable-source-maps --loader=ts-node/esm bin/test.ts",
+    "pretest": "npm run lint",
+    "test": "c8 npm run quick:test",
+    "typecheck": "tsc --noEmit",
+    "version": "npm run build",
+    "prepublishOnly": "npm run build",
+    "release": "np"
+  },
+  "devDependencies": {
+    "@adonisjs/assembler": "^7.7.0",
+    "@adonisjs/core": "^7.0.0",
+    "@adonisjs/eslint-config": "^1.3.0",
+    "@adonisjs/lucid": "^22.0.0",
+    "@adonisjs/prettier-config": "^1.3.0",
+    "@adonisjs/tsconfig": "^1.3.0",
+    "@japa/assert": "^2.1.0",
+    "@japa/expect-type": "^2.0.2",
+    "@japa/file-system": "^2.3.0",
+    "@japa/runner": "^3.1.4",
+    "@japa/snapshot": "^2.0.5",
+    "@swc/core": "^1.6.7",
+    "@types/lodash": "^4.17.6",
+    "c8": "^9.1.0",
+    "copyfiles": "^2.4.1",
+    "del-cli": "^5.1.0",
+    "eslint": "^8.57.0",
+    "knex": "^3.1.0",
+    "lodash": "^4.17.21",
+    "luxon": "^3.4.4",
+    "reflect-metadata": "^0.2.2",
+    "sqlite3": "^5.1.7",
+    "ts-node": "^10.9.2",
+    "tsup": "^8.1.0",
+    "typescript": "^5.5.3"
+  },
+  "dependencies": {
+    "type-fest": "^4.21.0"
+  },
+  "peerDependencies": {
+    "@adonisjs/core": "^6.2.3",
+    "@adonisjs/lucid": "^21.1.0",
+    "lodash": "^4.17.21"
+  },
+  "author": "LookinGit",
+  "license": "MIT",
+  "homepage": "https://github.com/lookinlab/adonis-lucid-filter#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/lookinlab/adonis-lucid-filter.git"
+  },
+  "bugs": {
+    "url": "https://github.com/lookinlab/adonis-lucid-filter/issues"
+  },
+  "keywords": [
+    "adonisjs",
+    "adonisjs-filter",
+    "adonisjs-lucid",
+    "adonisjs-lucid-filter",
+    "adonis",
+    "adonis-lucid",
+    "adonis-filter",
+    "adonis-lucid-filter"
+  ],
+  "eslintConfig": {
+    "extends": "@adonisjs/eslint-config/package"
+  },
+  "prettier": "@adonisjs/prettier-config",
+  "publishConfig": {
+    "access": "public",
+    "tag": "latest"
+  },
+  "np": {
+    "message": "chore(release): %s",
+    "tag": "latest",
+    "branch": "master",
+    "anyBranch": false
+  },
+  "c8": {
+    "reporter": [
+      "text",
+      "html"
+    ],
+    "exclude": [
+      "tests/**",
+      "bin/**"
+    ]
+  },
+  "tsup": {
+    "entry": [
+      "./index.ts",
+      "./src/types/*.ts",
+      "./src/bindings/model_query_builder.ts",
+      "./commands/make_filter.ts",
+      "./providers/lucid_filter_provider.ts"
+    ],
+    "outDir": "./build",
+    "clean": true,
+    "format": "esm",
+    "dts": false,
+    "sourcemap": true,
+    "target": "esnext"
+  }
+}

package/build/chunk-FZT5JNRL.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/bindings/model_query_builder.ts"],"sourcesContent":["/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\nimport type { ModelQueryBuilder } from '@adonisjs/lucid/orm'\r\nimport type { LucidFilterContract } from '@codenameryuu/adonis-lucid-filter/types/filter'\r\n\r\n/**\r\n * Define filter method to ModelQueryBuilder\r\n */\r\nexport function extendModelQueryBuilder(builder: any) {\r\n  builder.macro(\r\n    'filter',\r\n    function (this: ModelQueryBuilder, input: any, filter?: LucidFilterContract) {\r\n      const Filter = filter || (this.model as any).$filter()\r\n      return new Filter(this, input).handle()\r\n    }\r\n  )\r\n}\r\n"],"mappings":";AAeO,SAAS,wBAAwB,SAAc;AACpD,UAAQ;AAAA,IACN;AAAA,IACA,SAAmC,OAAY,QAA8B;AAC3E,YAAM,SAAS,UAAW,KAAK,MAAc,QAAQ;AACrD,aAAO,IAAI,OAAO,MAAM,KAAK,EAAE,OAAO;AAAA,IACxC;AAAA,EACF;AACF;","names":[]}

package/build/chunk-NBGNVIUM.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../stubs/main.ts"],"sourcesContent":["/*\r\n * adonis-lucid-filter\r\n *\r\n * (c) Lookin Anton <alf@lookinlab.ru>\r\n *\r\n * For the full copyright and license information, please view the LICENSE\r\n * file that was distributed with this source code.\r\n */\r\n\r\nimport { fileURLToPath } from 'node:url'\r\nimport { dirname } from 'node:path'\r\n\r\nexport const stubsRoot = dirname(fileURLToPath(import.meta.url))\r\n"],"mappings":";AASA,SAAS,qBAAqB;AAC9B,SAAS,eAAe;AAEjB,IAAM,YAAY,QAAQ,cAAc,YAAY,GAAG,CAAC;","names":[]}