Skip to content

Add flag for internal resolving. #295

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

Merged
merged 6 commits into from
Jun 16, 2019
Merged

Add flag for internal resolving. #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb7c086
Add flag for internal resolving
bcrowe Feb 21, 2019
d196e3b
Merge branch 'master' of github.com:wework/speccy into internal-flag
bcrowe Apr 2, 2019
19a3a5c
Merge branch 'master' into internal-flag
bcrowe May 20, 2019
f2004c5
Add missing spaces after args
bcrowe May 20, 2019
86ea9d6
Undo
djtarazona Jun 16, 2019
cbfb4fa
Merge branch 'internal-flag' of https://github.com/bcrowe/speccy into…
djtarazona Jun 16, 2019
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
1 change: 1 addition & 0 deletions lib/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Config {
},
resolve: {
output: args.output,
internalRefs: args.internalRefs
},
serve: {
port: args.port,
Expand Down
4 changes: 3 additions & 1 deletion resolve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const command = async (file, cmd) => {
const jsonSchema = config.get('jsonSchema');
const output = config.get('resolve:output');
const verbose = config.get('quiet') ? 0 : config.get('verbose', 1);
const internalRefs = config.get('resolve:internalRefs');

const spec = await loader.readOrError(
file,
Expand Down Expand Up @@ -40,7 +41,7 @@ const command = async (file, cmd) => {
});
};

const buildLoaderOptions = (jsonSchema, verbose) => {
const buildLoaderOptions = (jsonSchema, verbose, internalRefs) => {
const options = {
resolve: true,
cache: [],
Expand All @@ -52,6 +53,7 @@ const buildLoaderOptions = (jsonSchema, verbose) => {
verbose,
};
if (jsonSchema) options.filters.push(fromJsonSchema);
if (internalRefs) options.resolveInternal = true;
return options;
}

Expand Down
6 changes: 3 additions & 3 deletions speccy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ function increaseVerbosity(v, total) {
return total + 1;
}


program
.version(version)
.usage('<command>')
Expand Down Expand Up @@ -50,7 +49,8 @@ program
.option('-o, --output <file>', 'file to output to')
.option('-q, --quiet', 'reduce verbosity')
.option('-j, --json-schema', 'treat $ref like JSON Schema and convert to OpenAPI Schema Objects (default: false)')
.option('-v, --verbose', 'increase verbosity', increaseVerbosity,1)
.option('-i, --internal-refs', 'resolve internal references (default: false)')
.option('-v, --verbose', 'increase verbosity', increaseVerbosity, 1)
.action((specFile, cmd) => {
resolve.command(specFile, cmd)
.then(() => { process.exit(0) })
Expand All @@ -68,7 +68,7 @@ program
.option('-p, --port [value]', 'port on which the server will listen (default: 5000)')
.option('-q, --quiet', 'reduce verbosity')
.option('-j, --json-schema', 'treat $ref like JSON Schema and convert to OpenAPI Schema Objects (default: false)')
.option('-v, --verbose', 'increase verbosity', increaseVerbosity,1)
.option('-v, --verbose', 'increase verbosity', increaseVerbosity, 1)
// TODO .option('-w, --watch', 'reloading browser on spec file changes')
.action((specFile, cmd) => {
serve.command(specFile, cmd)
Expand Down