cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bazel): fix strict null checks compile error in packages/bazel/src/schematics/ng-add/index.ts (#29282)

Browse Source 
PR Close #29282
This commit is contained in:
Greg Magolan 2019-03-13 10:05:46 -07:00 committed by Kara Erickson
parent 955e4e704e
commit 9a7f5601fa
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/bazel/src/schematics/ng-add/index.ts
View File

@ -81,7 +81,11 @@ function updateGitignore() {
if (!host.exists(gitignore)) { if (!host.exists(gitignore)) {
return host; return host;
} }
const gitIgnoreContent = host.read(gitignore).toString(); const gitIgnoreContentRaw = host.read(gitignore);
if (!gitIgnoreContentRaw) {
return host;
}
const gitIgnoreContent = gitIgnoreContentRaw.toString();
if (gitIgnoreContent.includes('\n/bazel-out\n')) { if (gitIgnoreContent.includes('\n/bazel-out\n')) {
return host; return host;
} }
@ -102,8 +106,11 @@ function updateAngularJsonToUseBazelBuilder(options: Schema): Rule {
if (!workspacePath) { if (!workspacePath) {
throw new Error('Could not find angular.json'); throw new Error('Could not find angular.json');
} }
const workspaceContent = host.read(workspacePath).toString(); const workspaceContent = host.read(workspacePath);
const workspaceJsonAst = parseJsonAst(workspaceContent) as JsonAstObject; if (!workspaceContent) {
throw new Error('Failed to read angular.json content');
}
const workspaceJsonAst = parseJsonAst(workspaceContent.toString()) as JsonAstObject;
const projects = findPropertyInAstObject(workspaceJsonAst, 'projects'); const projects = findPropertyInAstObject(workspaceJsonAst, 'projects');
if (!projects) { if (!projects) {
throw new SchematicsException('Expect projects in angular.json to be an Object'); throw new SchematicsException('Expect projects in angular.json to be an Object');
@ -220,7 +227,11 @@ function updateTsconfigJson(): Rule {
if (!host.exists(tsconfigPath)) { if (!host.exists(tsconfigPath)) {
return host; return host;
} }
const content = host.read(tsconfigPath).toString(); const contentRaw = host.read(tsconfigPath).toString();
if (!contentRaw) {
return host;
}
const content = contentRaw.toString();
const ast = parseJsonAst(content); const ast = parseJsonAst(content);
if (!isJsonAstObject(ast)) { if (!isJsonAstObject(ast)) {
return host; return host;
@ -255,8 +266,11 @@ function upgradeRxjs() {
if (!host.exists(packageJson)) { if (!host.exists(packageJson)) {
throw new Error(`Could not find ${packageJson}`); throw new Error(`Could not find ${packageJson}`);
} }
const content = host.read(packageJson).toString(); const content = host.read(packageJson);
const jsonAst = parseJsonAst(content); if (!content) {
throw new Error('Failed to read package.json content');
}
const jsonAst = parseJsonAst(content.toString());
if (!isJsonAstObject(jsonAst)) { if (!isJsonAstObject(jsonAst)) {
throw new Error(`Failed to parse JSON for ${packageJson}`); throw new Error(`Failed to parse JSON for ${packageJson}`);
} }
@ -300,8 +314,14 @@ function addPostinstallToGenerateNgSummaries() {
if (!host.exists(packageJson)) { if (!host.exists(packageJson)) {
throw new Error(`Could not find ${packageJson}`); throw new Error(`Could not find ${packageJson}`);
} }
const content = host.read(packageJson).toString(); const content = host.read(packageJson);
const jsonAst = parseJsonAst(content) as JsonAstObject; if (!content) {
throw new Error('Failed to read package.json content');
}
const jsonAst = parseJsonAst(content.toString());
if (!isJsonAstObject(jsonAst)) {
throw new Error(`Failed to parse JSON for ${packageJson}`);
}
const scripts = findPropertyInAstObject(jsonAst, 'scripts') as JsonAstObject; const scripts = findPropertyInAstObject(jsonAst, 'scripts') as JsonAstObject;
const recorder = host.beginUpdate(packageJson); const recorder = host.beginUpdate(packageJson);
if (scripts) { if (scripts) {