Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: loop in json parsing #106

Merged
merged 14 commits into from
Jan 3, 2024
Merged

fix: loop in json parsing #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4ae8ecb
fix: loop in json parsing
mbroersen Jan 1, 2024
c0fa2b5
BREAKING CHANGE: drop support for node 12 and 14
mbroersen Jan 2, 2024
f4c0cc6
fix: update linting rules with new eslint version
mbroersen Jan 2, 2024
c72fb32
style: fix order of methods in interface
mbroersen Jan 2, 2024
c8af13f
fix: use toObject call as optional
mbroersen Jan 2, 2024
344c4b2
build: rebuild
mbroersen Jan 2, 2024
856535d
build: rebuild
mbroersen Jan 2, 2024
0b9298d
ci: remove build
mbroersen Jan 2, 2024
29bd028
ci: try new checkout version
mbroersen Jan 2, 2024
99c1ccb
fix: change toJSON
mbroersen Jan 3, 2024
8dd8769
chore: change to es2022
mbroersen Jan 3, 2024
603aa29
chore: downgrade
mbroersen Jan 3, 2024
00d1a76
chore: update eslint
mbroersen Jan 3, 2024
8af86af
chore: update eslint
mbroersen Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 80 additions & 5 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,91 @@ module.exports = {
"curly": ["error", "all"],
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/member-ordering": [
2,
"error",
{
"default": {
"memberTypes": [
// Index signature
"signature",
"call-signature",

// Fields
"public-static-field",
"protected-static-field",
"private-static-field",
"#private-static-field",

"public-decorated-field",
"protected-decorated-field",
"private-decorated-field",

"public-instance-field",
"protected-instance-field",
"private-instance-field",
"#private-instance-field",

"public-abstract-field",
"protected-abstract-field",
"private-abstract-field",

"public-field",
"protected-field",
"private-field",
"#private-field",

"static-field",
"instance-field",
"abstract-field",

"decorated-field",

"field",

// Static initialization
"static-initialization",

// Constructors
"public-constructor",
"protected-constructor",
"private-constructor",

"constructor",

// Accessors
"public-static-accessor",
"protected-static-accessor",
"private-static-accessor",
"#private-static-accessor",

"public-decorated-accessor",
"protected-decorated-accessor",
"private-decorated-accessor",

"public-instance-accessor",
"protected-instance-accessor",
"private-instance-accessor",
"#private-instance-accessor",

"public-abstract-accessor",
"protected-abstract-accessor",

"public-accessor",
"protected-accessor",
"private-accessor",
"#private-accessor",

"static-accessor",
"instance-accessor",
"abstract-accessor",

"decorated-accessor",

"accessor",

// Getters
"public-static-get",
"protected-static-get",
"private-static-get",
"#private-static-get",

"public-decorated-get",
"protected-decorated-get",
Expand All @@ -54,14 +109,15 @@ module.exports = {
"public-instance-get",
"protected-instance-get",
"private-instance-get",
"#private-instance-get",

"public-abstract-get",
"protected-abstract-get",
"private-abstract-get",

"public-get",
"protected-get",
"private-get",
"#private-get",

"static-get",
"instance-get",
Expand All @@ -75,6 +131,7 @@ module.exports = {
"public-static-set",
"protected-static-set",
"private-static-set",
"#private-static-set",

"public-decorated-set",
"protected-decorated-set",
Expand All @@ -83,14 +140,15 @@ module.exports = {
"public-instance-set",
"protected-instance-set",
"private-instance-set",
"#private-instance-set",

"public-abstract-set",
"protected-abstract-set",
"private-abstract-set",

"public-set",
"protected-set",
"private-set",
"#private-set",

"static-set",
"instance-set",
Expand All @@ -104,15 +162,32 @@ module.exports = {
"public-static-method",
"protected-static-method",
"private-static-method",
"#private-static-method",

"public-decorated-method",
"protected-decorated-method",
"private-decorated-method",

"public-instance-method",
"protected-instance-method",
"private-instance-method",
"#private-instance-method",

"public-abstract-method",
"protected-abstract-method",
"private-abstract-method"

"public-method",
"protected-method",
"private-method",
"#private-method",

"static-method",
"instance-method",
"abstract-method",

"decorated-method",

"method"
],
"order": "alphabetically",
}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:

strategy:
matrix:
node-version: [12.x, 14.x, 16.x]
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build --if-present
- run: npm run build
- run: npm run lint
- run: npm test
2 changes: 1 addition & 1 deletion dist/jeloquent.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading