revert: merge commit

Author: nandi95

docs/calliope/readme.md

@@ -123,7 +123,7 @@ The `getKeyName` method returns the [primaryKey](#primarykey) of the model.
 
 The `getName` method expected to return the current class' name. For example in a class called `User` it should return `'User'`.
 
-*Note: This is essential to add to every model as this is used throughout the framework.*
+***Note: This is essential to add to every model as this is used throughout the framework.***
 ::: danger
 This value cannot be `this.constructor.name` **if** you're minifying your code or in the minification options you haven't turned off the class rename or equivalent option.
 :::

docs/cookbook.md

@@ -247,7 +247,7 @@ interface PaginatedModels<T extends Model> {
 }
 
 export async function paginateModels<T extends Model>(builder: T, page = 1, limit = 25): Promise<PaginatedModels<T>> {
-    const response = await builder.limit(limit).page(page).call<MyJsonApiResponse>('get');
+    const response = await builder.clone().limit(limit).page(page).call<MyJsonApiResponse>('get');
     const modelCollection = new ModelCollection<T>(response!.data.map(attributes => builder.new(attributes)));
     // or some other custom logic where the response `meta` and `links` or other keys (if any) are taken into account
 

docs/getting-started/readme.md

@@ -13,16 +13,6 @@ const excellentStudentNames = students
     .pluck('name');
 ```
 
-```ts
-import User from '@models/User';
-
-const students = await User.where('is_student', true).with('grades').get();
-
-const excellentStudentNames = students
-    .filter(student => student.grades.average('value') > 4)
-    .pluck('name');
-```
-
 ## What does it solve?
 There are number of solutions out there for fetching data and working with the response. However not all of these might be as scalable as one would hope. With state management, you might have a getter for users, but those users include all users, meaning for a custom collection you would need a new getter method. An on-demand ajax request written specifically to solve a single issue, while it is simple to do, it quickly gets repetitive and hard to maintain. [Upfront](./installation.md) solves the above by creating abstraction over the data in a unified api. Just like the above examples it can be used to fetch data on demand or be complimentary to state management libraries.
 

docs/helpers/event-emitter.md

@@ -16,7 +16,7 @@ The `on` method sets up the listener for an event. It receives two arguments, th
 import { EventEmitter } from '@upfrontjs/framework';
 import type { MyEvents } from '../types';
 
-const emitter = EventEmitter.getInstance<>();
+const emitter = EventEmitter.getInstance<MyEvents>();
 emitter.on('myEvent', num => num);
 emitter.emit('myEvent', 2);
 ```
@@ -29,7 +29,7 @@ The `once` method works the same way as the [on](#on) method except once the cal
 import { EventEmitter } from '@upfrontjs/framework';
 import type { MyEvents } from '../types';
 
-const emitter = EventEmitter.getInstance<>();
+const emitter = EventEmitter.getInstance<MyEvents>();
 emitter.once('myEvent', num => console.log(num));
 emitter.emit('myEvent', 1); // 1 logged out to the console
 emitter.emit('myEvent', 1); // nothing happens
@@ -42,7 +42,7 @@ The `prependListener` method works the same way as the [on](#on) method except t
 import { EventEmitter } from '@upfrontjs/framework';
 import type { MyEvents } from '../types';
 
-const emitter = EventEmitter.getInstance<>();
+const emitter = EventEmitter.getInstance<MyEvents>();
 emitter.on('myEvent', num => console.log(num));
 emitter.prependListener('myEvent', num => console.log('first log: ', num));
 emitter.emit('myEvent', 1); // logged out 'first log: 1', then '1'

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@upfrontjs/framework",
-    "version": "0.6.0",
+    "version": "0.7.0",
     "description": "Data handling framework complementary to backend model systems.",
     "main": "index.min.js",
     "module": "index.es.min.js",

package.json

@@ -65,8 +65,8 @@ export default class Model extends SoftDeletes implements HasFactory {
      *
      * @return {this}
      */
-    public new(attributes?: Attributes | Attributes<this>): this {
-        return new (this.constructor as new (attributes?: Attributes | Attributes<this>) => this)(attributes);
+    public new(attributes?: Attributes<this> | Model): this {
+        return new (this.constructor as new (attributes?: Attributes<this> | Model) => this)(attributes);
     }
 
     /**