mirror of
https://github.com/angular/angular-cli.git
synced 2025-05-19 12:34:32 +08:00
This commit fixes a few issues with json-utils: 1. The implementation is lacking tests 2. The implementation hardcodes indent = 2 in many places and does not respect the `indent` parameter passed by users 3. The implementation is buggy when passed an empty object or array
139 lines
3.5 KiB
TypeScript
139 lines
3.5 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
* found in the LICENSE file at https://angular.io/license
|
|
*/
|
|
import {
|
|
JsonAstArray,
|
|
JsonAstKeyValue,
|
|
JsonAstNode,
|
|
JsonAstObject,
|
|
JsonValue,
|
|
} from '@angular-devkit/core';
|
|
import { UpdateRecorder } from '@angular-devkit/schematics';
|
|
|
|
export function appendPropertyInAstObject(
|
|
recorder: UpdateRecorder,
|
|
node: JsonAstObject,
|
|
propertyName: string,
|
|
value: JsonValue,
|
|
indent: number,
|
|
) {
|
|
const indentStr = _buildIndent(indent);
|
|
let index = node.start.offset + 1;
|
|
if (node.properties.length > 0) {
|
|
// Insert comma.
|
|
const last = node.properties[node.properties.length - 1];
|
|
const {text, end} = last;
|
|
const commaIndex = text.endsWith('\n') ? end.offset - 1 : end.offset;
|
|
recorder.insertRight(commaIndex, ',');
|
|
index = end.offset;
|
|
}
|
|
const content = JSON.stringify(value, null, indent).replace(/\n/g, indentStr);
|
|
recorder.insertRight(
|
|
index,
|
|
(node.properties.length === 0 && indent ? '\n' : '')
|
|
+ ' '.repeat(indent)
|
|
+ `"${propertyName}":${indent ? ' ' : ''}${content}`
|
|
+ indentStr.slice(0, -indent),
|
|
);
|
|
}
|
|
|
|
export function insertPropertyInAstObjectInOrder(
|
|
recorder: UpdateRecorder,
|
|
node: JsonAstObject,
|
|
propertyName: string,
|
|
value: JsonValue,
|
|
indent: number,
|
|
) {
|
|
|
|
if (node.properties.length === 0) {
|
|
appendPropertyInAstObject(recorder, node, propertyName, value, indent);
|
|
|
|
return;
|
|
}
|
|
|
|
// Find insertion info.
|
|
let insertAfterProp: JsonAstKeyValue | null = null;
|
|
let prev: JsonAstKeyValue | null = null;
|
|
let isLastProp = false;
|
|
const last = node.properties[node.properties.length - 1];
|
|
for (const prop of node.properties) {
|
|
if (prop.key.value > propertyName) {
|
|
if (prev) {
|
|
insertAfterProp = prev;
|
|
}
|
|
break;
|
|
}
|
|
if (prop === last) {
|
|
isLastProp = true;
|
|
insertAfterProp = last;
|
|
}
|
|
prev = prop;
|
|
}
|
|
|
|
if (isLastProp) {
|
|
appendPropertyInAstObject(recorder, node, propertyName, value, indent);
|
|
|
|
return;
|
|
}
|
|
|
|
const indentStr = _buildIndent(indent);
|
|
const insertIndex = insertAfterProp === null
|
|
? node.start.offset + 1
|
|
: insertAfterProp.end.offset + 1;
|
|
const content = JSON.stringify(value, null, indent).replace(/\n/g, indentStr);
|
|
recorder.insertRight(
|
|
insertIndex,
|
|
indentStr
|
|
+ `"${propertyName}":${indent ? ' ' : ''}${content}`
|
|
+ ',',
|
|
);
|
|
}
|
|
|
|
|
|
export function appendValueInAstArray(
|
|
recorder: UpdateRecorder,
|
|
node: JsonAstArray,
|
|
value: JsonValue,
|
|
indent = 4,
|
|
) {
|
|
const indentStr = _buildIndent(indent);
|
|
let index = node.start.offset + 1;
|
|
if (node.elements.length > 0) {
|
|
// Insert comma.
|
|
const last = node.elements[node.elements.length - 1];
|
|
recorder.insertRight(last.end.offset, ',');
|
|
index = indent ? last.end.offset + 1 : last.end.offset;
|
|
}
|
|
|
|
recorder.insertRight(
|
|
index,
|
|
(node.elements.length === 0 && indent ? '\n' : '')
|
|
+ ' '.repeat(indent)
|
|
+ JSON.stringify(value, null, indent).replace(/\n/g, indentStr)
|
|
+ indentStr.slice(0, -indent),
|
|
);
|
|
}
|
|
|
|
|
|
export function findPropertyInAstObject(
|
|
node: JsonAstObject,
|
|
propertyName: string,
|
|
): JsonAstNode | null {
|
|
let maybeNode: JsonAstNode | null = null;
|
|
for (const property of node.properties) {
|
|
if (property.key.value == propertyName) {
|
|
maybeNode = property.value;
|
|
}
|
|
}
|
|
|
|
return maybeNode;
|
|
}
|
|
|
|
function _buildIndent(count: number): string {
|
|
return count ? '\n' + ' '.repeat(count) : '';
|
|
}
|