Skip to content

Commit

Permalink
feat: add biome instead of prettier and eslint (#178)
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgebodega authored Jun 22, 2024
1 parent 84030bf commit c8f64df
Show file tree
Hide file tree
Showing 71 changed files with 3,123 additions and 4,478 deletions.
34 changes: 0 additions & 34 deletions .eslintrc.json

This file was deleted.

38 changes: 19 additions & 19 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"extends": [
"config:base",
"group:allNonMajor",
"schedule:monthly",
":assignAndReview(jorgebodega)",
":automergeDisabled",
":semanticCommits",
":semanticCommitScopeDisabled",
":separatePatchReleases",
":timezone(UTC+1)"
],
"baseBranches": ["next"],
"packageRules": [
{
"matchPackagePatterns": ["typeorm"],
"groupName": "typeorm",
"automerge": false
}
]
"extends": [
"config:base",
"group:allNonMajor",
"schedule:monthly",
":assignAndReview(jorgebodega)",
":automergeDisabled",
":semanticCommits",
":semanticCommitScopeDisabled",
":separatePatchReleases",
":timezone(UTC+1)"
],
"baseBranches": ["next"],
"packageRules": [
{
"matchPackagePatterns": ["typeorm"],
"groupName": "typeorm",
"automerge": false
}
]
}
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ test.db

### node ###
node_modules

# IDE
.vscode/*
!.vscode/extensions.json
!.vscode/launch.json
!.vscode/settings.json
3 changes: 1 addition & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
.commitlintrc
.eslintrc.js
.github
.node-version
.prettierrc
.releaserc.json
.sgcrc
.vscode
biome.json
examples
jest.config.ts
src
Expand Down
8 changes: 0 additions & 8 deletions .prettierrc

This file was deleted.

70 changes: 35 additions & 35 deletions .releaserc.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"branches": ["main", { "name": "next", "channel": "next", "prerelease": true }],
"plugins": [
[
"@semantic-release/commit-analyzer",
{
"releaseRules": [{ "type": "chore", "release": "patch" }],
"parserOpts": {
"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES"]
}
}
],
[
"@semantic-release/release-notes-generator",
{
"parserOpts": {
"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES"]
}
}
],
[
"@semantic-release/changelog",
{
"changelogFile": "CHANGELOG.md"
}
],
"@semantic-release/npm",
[
"@semantic-release/git",
{
"assets": ["package.json", "pnpm-lock.yaml", "CHANGELOG.md"],
"message": "chore: release ${nextRelease.version}\n\n${nextRelease.notes}"
}
],
["@semantic-release/github", { "successComment": false, "failComment": false, "failTitle": false }]
]
"branches": ["main", { "name": "next", "channel": "next", "prerelease": true }],
"plugins": [
[
"@semantic-release/commit-analyzer",
{
"releaseRules": [{ "type": "chore", "release": "patch" }],
"parserOpts": {
"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES"]
}
}
],
[
"@semantic-release/release-notes-generator",
{
"parserOpts": {
"noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES"]
}
}
],
[
"@semantic-release/changelog",
{
"changelogFile": "CHANGELOG.md"
}
],
"@semantic-release/npm",
[
"@semantic-release/git",
{
"assets": ["package.json", "pnpm-lock.yaml", "CHANGELOG.md"],
"message": "chore: release ${nextRelease.version}\n\n${nextRelease.notes}"
}
],
["@semantic-release/github", { "successComment": false, "failComment": false, "failTitle": false }]
]
}
17 changes: 17 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://biomejs.dev/schemas/1.8.2/schema.json",
"formatter": {
"ignore": ["**/dist/**"],
"lineWidth": 120
},
"linter": {
"enabled": true,
"ignore": ["**/dist/**"],
"rules": {
"recommended": true
}
},
"organizeImports": {
"enabled": true
}
}
10 changes: 5 additions & 5 deletions examples/1-to-1-chained-related/dataSource.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DataSource } from 'typeorm'
import { DataSource } from "typeorm";

export const dataSource = new DataSource({
type: 'sqlite',
database: ':memory:',
entities: [`${__dirname}/**/*.entity.ts`],
})
type: "sqlite",
database: ":memory:",
entities: [`${__dirname}/**/*.entity.ts`],
});
32 changes: 20 additions & 12 deletions examples/1-to-1-chained-related/entities/Pet.entity.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
import { Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from 'typeorm'
import { Refuge } from './Refuge.entity'
import { User } from './User.entity'
import { Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from "typeorm";
import { Refuge } from "./Refuge.entity";
import { User } from "./User.entity";

@Entity()
export class Pet {
@PrimaryGeneratedColumn('increment')
id!: string
@PrimaryGeneratedColumn("increment")
id!: string;

@Column()
name!: string
@Column()
name!: string;

@OneToOne(() => User, (user) => user.pet, { nullable: false })
@JoinColumn({ name: 'owner_id' })
owner!: User
@OneToOne(
() => User,
(user) => user.pet,
{ nullable: false },
)
@JoinColumn({ name: "owner_id" })
owner!: User;

@OneToOne(() => Refuge, (refuge) => refuge.pet, { nullable: false })
refuge!: Refuge
@OneToOne(
() => Refuge,
(refuge) => refuge.pet,
{ nullable: false },
)
refuge!: Refuge;
}
22 changes: 13 additions & 9 deletions examples/1-to-1-chained-related/entities/Refuge.entity.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
import { Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from 'typeorm'
import { Pet } from './Pet.entity'
import { Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from "typeorm";
import { Pet } from "./Pet.entity";

@Entity()
export class Refuge {
@PrimaryGeneratedColumn('increment')
id!: string
@PrimaryGeneratedColumn("increment")
id!: string;

@Column()
name!: string
@Column()
name!: string;

@OneToOne(() => Pet, (pet) => pet.refuge, { nullable: false })
@JoinColumn({ name: 'pet_id' })
pet!: Pet
@OneToOne(
() => Pet,
(pet) => pet.refuge,
{ nullable: false },
)
@JoinColumn({ name: "pet_id" })
pet!: Pet;
}
32 changes: 18 additions & 14 deletions examples/1-to-1-chained-related/entities/User.entity.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, OneToOne } from 'typeorm'
import { Pet } from './Pet.entity'
import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, OneToOne } from "typeorm";
import { Pet } from "./Pet.entity";

@Entity()
export class User {
@PrimaryGeneratedColumn('increment')
id!: number
@PrimaryGeneratedColumn("increment")
id!: number;

@CreateDateColumn({ name: 'created_at' })
createdAt!: Date
@CreateDateColumn({ name: "created_at" })
createdAt!: Date;

@UpdateDateColumn({ name: 'updated_at' })
updatedAt!: Date
@UpdateDateColumn({ name: "updated_at" })
updatedAt!: Date;

@Column()
name!: string
@Column()
name!: string;

@Column({ name: 'last_name' })
lastName!: string
@Column({ name: "last_name" })
lastName!: string;

@OneToOne(() => Pet, (pet) => pet.owner, { nullable: false })
pet!: Pet
@OneToOne(
() => Pet,
(pet) => pet.owner,
{ nullable: false },
)
pet!: Pet;
}
36 changes: 21 additions & 15 deletions examples/1-to-1-chained-related/factories/Pet.factory.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import { faker } from '@faker-js/faker'
import { EagerInstanceAttribute, FactorizedAttrs, Factory, LazyInstanceAttribute, SingleSubfactory } from '../../../src'
import { dataSource } from '../dataSource'
import { Pet } from '../entities/Pet.entity'
import { RefugeFactory } from './Refuge.factory'
import { UserFactory } from './User.factory'
import { faker } from "@faker-js/faker";
import {
EagerInstanceAttribute,
type FactorizedAttrs,
Factory,
LazyInstanceAttribute,
SingleSubfactory,
} from "../../../src";
import { dataSource } from "../dataSource";
import { Pet } from "../entities/Pet.entity";
import { RefugeFactory } from "./Refuge.factory";
import { UserFactory } from "./User.factory";

export class PetFactory extends Factory<Pet> {
protected entity = Pet
protected dataSource = dataSource
protected entity = Pet;
protected dataSource = dataSource;

protected attrs(): FactorizedAttrs<Pet> {
return {
name: faker.animal.insect(),
owner: new EagerInstanceAttribute((instance) => new SingleSubfactory(UserFactory, { pet: instance })),
refuge: new LazyInstanceAttribute((instance) => new SingleSubfactory(RefugeFactory, { pet: instance })),
}
}
protected attrs(): FactorizedAttrs<Pet> {
return {
name: faker.animal.insect(),
owner: new EagerInstanceAttribute((instance) => new SingleSubfactory(UserFactory, { pet: instance })),
refuge: new LazyInstanceAttribute((instance) => new SingleSubfactory(RefugeFactory, { pet: instance })),
};
}
}
26 changes: 13 additions & 13 deletions examples/1-to-1-chained-related/factories/Refuge.factory.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { faker } from '@faker-js/faker'
import { EagerInstanceAttribute, FactorizedAttrs, Factory, SingleSubfactory } from '../../../src'
import { dataSource } from '../dataSource'
import { Refuge } from '../entities/Refuge.entity'
import { PetFactory } from './Pet.factory'
import { faker } from "@faker-js/faker";
import { EagerInstanceAttribute, type FactorizedAttrs, Factory, SingleSubfactory } from "../../../src";
import { dataSource } from "../dataSource";
import { Refuge } from "../entities/Refuge.entity";
import { PetFactory } from "./Pet.factory";

export class RefugeFactory extends Factory<Refuge> {
protected entity = Refuge
protected dataSource = dataSource
protected entity = Refuge;
protected dataSource = dataSource;

protected attrs(): FactorizedAttrs<Refuge> {
return {
name: faker.company.name(),
pet: new EagerInstanceAttribute((instance) => new SingleSubfactory(PetFactory, { refuge: instance })),
}
}
protected attrs(): FactorizedAttrs<Refuge> {
return {
name: faker.company.name(),
pet: new EagerInstanceAttribute((instance) => new SingleSubfactory(PetFactory, { refuge: instance })),
};
}
}
Loading

0 comments on commit c8f64df

Please sign in to comment.