Skip to content

Commit 5ea3b82

Browse files
committed
refactor: code base
1 parent 50ff7e4 commit 5ea3b82

File tree

9 files changed

+4674
-3324
lines changed

9 files changed

+4674
-3324
lines changed

.github/workflows/bring-it.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ jobs:
1414
- windows-latest
1515
- ubuntu-latest
1616
node:
17-
- 18.12.0
18-
- 16.15.0
17+
- current
18+
- lts/*
19+
- lts/-1
1920
exclude:
2021
- os: ubuntu-latest
21-
node: 16.15.0
22+
node: lts/*
2223

2324
runs-on: ${{ matrix.os }}
2425
steps:

lib/index.cjs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,13 @@ const schema = {
1212
after: {
1313
instanceof: 'Function',
1414
},
15-
dereference: {
16-
default: false,
17-
oneOf: [
18-
{
19-
type: 'boolean',
20-
},
21-
{
22-
instanceof: 'Function',
23-
},
24-
],
25-
},
2615
},
2716
};
2817

2918
module.exports = function loader(source) {
3019
this.cacheable();
3120

32-
const { before, after, dereference } = this.getOptions(schema) || {};
21+
const { before, after } = this.getOptions(schema) || {};
3322

3423
const callback = this.async();
3524

@@ -44,16 +33,12 @@ module.exports = function loader(source) {
4433
try {
4534
data = JSON.parse(source);
4635

47-
const should = Boolean(
48-
typeof dereference === 'function' ? dereference(data) : dereference,
49-
);
50-
5136
if (before) {
5237
data = before(data);
5338
}
5439

5540
if (data) {
56-
parse({ data, resourcePath, dereference: should })
41+
parse({ data, resourcePath })
5742
.then((io) => {
5843
callData(io);
5944
})

lib/parse.cjs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,14 @@
33
const { readFile } = require('node:fs/promises');
44
const $refParser = require('@apidevtools/json-schema-ref-parser');
55

6-
module.exports = function parse({ data, resourcePath, dereference }) {
7-
const func = dereference ? 'dereference' : 'bundle';
8-
9-
return $refParser[func](resourcePath, data, {
6+
module.exports = function parse({ data, resourcePath }) {
7+
return $refParser.dereference(resourcePath, data, {
108
resolve: {
119
npm: {
1210
canRead: /^npm:/i,
1311
read(file, callback) {
1412
const path = file.url.replace(/^npm:/, '');
1513

16-
return readFile(require.resolve(path), 'utf8')
17-
.then((raw) => {
18-
callback(null, raw);
19-
})
20-
.catch((error) => {
21-
callback(error);
22-
});
23-
},
24-
},
25-
scope: {
26-
canRead: /^scope:/i,
27-
read(file, callback) {
28-
const path = file.url.replace(/^scope:/, '@');
29-
3014
return readFile(require.resolve(path), 'utf8')
3115
.then((raw) => {
3216
callback(null, raw);

0 commit comments

Comments
 (0)