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

Fix yarn init printing undefined values #643

Merged
merged 2 commits into from
Dec 18, 2019
Merged

Fix yarn init printing undefined values #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1ead69
Delete fields in the Manifest exportTo function instead of setting to…
Zach10za Dec 18, 2019
7b8fbe6
Adds colors
arcanis Dec 18, 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
4 changes: 4 additions & 0 deletions packages/plugin-init/sources/commands/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@ export default class InitCommand extends BaseCommand {
const inspectable: any = {};
manifest.exportTo(inspectable);

inspect.styles.name = `cyan`;

this.context.stdout.write(`${inspect(inspectable, {
depth: Infinity,
colors: true,
compact: false,
})}\n`);
}
}
76 changes: 50 additions & 26 deletions packages/yarnpkg-core/sources/Manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,14 +533,14 @@ export class Manifest {
else
delete data.languageName;

if (this.bin.size === 0) {
data.bin = undefined;
} else if (this.bin.size === 1 && this.name !== null && this.bin.has(this.name.name)) {
if (this.bin.size === 1 && this.name !== null && this.bin.has(this.name.name)) {
data.bin = this.bin.get(this.name.name)!;
} else {
} else if (this.bin.size > 0) {
data.bin = Object.assign({}, ...Array.from(this.bin.keys()).sort().map(name => {
return {[name]: this.bin.get(name)};
}));
} else {
delete data.bin;
}

const regularDependencies = [];
Expand All @@ -566,21 +566,37 @@ export class Manifest {
}
}

data.dependencies = regularDependencies.length === 0 ? undefined : Object.assign({}, ...structUtils.sortDescriptors(regularDependencies).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
if (regularDependencies.length > 0) {
data.dependencies = Object.assign({}, ...structUtils.sortDescriptors(regularDependencies).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
} else {
delete data.dependencies;
}

data.optionalDependencies = optionalDependencies.length === 0 ? undefined : Object.assign({}, ...structUtils.sortDescriptors(optionalDependencies).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
if (optionalDependencies.length > 0) {
data.optionalDependencies = Object.assign({}, ...structUtils.sortDescriptors(optionalDependencies).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
} else {
delete data.optionalDependencies;
}

data.devDependencies = this.devDependencies.size === 0 ? undefined : Object.assign({}, ...structUtils.sortDescriptors(this.devDependencies.values()).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
if (this.devDependencies.size > 0) {
data.devDependencies = Object.assign({}, ...structUtils.sortDescriptors(this.devDependencies.values()).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
} else {
delete data.devDependencies;
}

data.peerDependencies = this.peerDependencies.size === 0 ? undefined : Object.assign({}, ...structUtils.sortDescriptors(this.peerDependencies.values()).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
if (this.peerDependencies.size > 0) {
data.peerDependencies = Object.assign({}, ...structUtils.sortDescriptors(this.peerDependencies.values()).map(dependency => {
return {[structUtils.stringifyIdent(dependency)]: dependency.range};
}));
} else {
delete data.peerDependencies;
}

data.dependenciesMeta = {};

Expand All @@ -603,20 +619,28 @@ export class Manifest {
}

if (Object.keys(data.dependenciesMeta).length === 0)
data.dependenciesMeta = undefined;
delete data.dependenciesMeta;

data.peerDependenciesMeta = this.peerDependenciesMeta.size === 0 ? undefined : Object.assign({}, ...miscUtils.sortMap(this.peerDependenciesMeta.entries(), ([identString, meta]) => identString).map(([identString, meta]) => {
return {[identString]: meta};
}));
if (this.peerDependenciesMeta.size > 0) {
data.peerDependenciesMeta = Object.assign({}, ...miscUtils.sortMap(this.peerDependenciesMeta.entries(), ([identString, meta]) => identString).map(([identString, meta]) => {
return {[identString]: meta};
}));
} else {
delete data.peerDependenciesMeta;
}

data.resolutions = this.resolutions.length === 0 ? undefined : Object.assign({}, ...this.resolutions.map(({pattern, reference}) => {
return {[stringifyResolution(pattern)]: reference};
}));
if (this.resolutions.length > 0) {
data.resolutions = Object.assign({}, ...this.resolutions.map(({pattern, reference}) => {
return {[stringifyResolution(pattern)]: reference};
}));
} else {
delete data.resolutions;
}

if (this.files === null)
data.files = undefined;
else
if (this.files !== null)
data.files = Array.from(this.files);
else
delete data.files;

return data;
}
Expand Down