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: Fix loading options twice in bootstrap to keep 'extends'. #1273

Merged
merged 8 commits into from Apr 25, 2020
Merged

fix: Fix loading options twice in bootstrap to keep 'extends'. #1273

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a043fe
fix: Fix loading options twice in bootstrap.
WilliamJns Apr 19, 2020
c1dd855
fix: Fix whitespace (tslint)
WilliamJns Apr 19, 2020
8d4cea6
revert application bootstrap.
WilliamJns Apr 20, 2020
93c43c3
fix: clone typedoc options object after loading file content.
WilliamJns Apr 20, 2020
2e25e8d
doc: add a comment for clone object line.
WilliamJns Apr 20, 2020
37aabd2
doc: add extends declaration
WilliamJns Apr 20, 2020
be71607
fix: remove extends declaration
WilliamJns Apr 21, 2020
d4392dc
fix: trailing whitespace
WilliamJns Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/lib/utils/options/readers/typedoc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as Path from 'path';
import * as FS from 'fs';
import * as _ from 'lodash';
import { cloneDeep } from 'lodash';

import { OptionsReader } from '..';
import { Logger } from '../../loggers';
Expand Down Expand Up @@ -51,13 +51,16 @@ export class TypeDocReader implements OptionsReader {
}
seen.add(file);

const data: unknown = require(file);
const fileContent: unknown = require(file);

if (typeof data !== 'object' || !data) {
if (typeof fileContent !== 'object' || !fileContent) {
logger.error(`The file ${file} is not an object.`);
return;
}

// clone option object to avoid of property changes in re-calling this file
const data: object = cloneDeep(fileContent);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


if ('extends' in data) {
const extended: string[] = getStringArray(data['extends']);
for (const extendedFile of extended) {
Expand Down