fix(tsc): tsconfig.json strict:true

Author: JiaLiPassion

lib/browser/browser.ts

@@ -154,7 +154,7 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 if(!storedTask){
 target[XHR_TASK]=task;
 }
-sendNative.apply(target,data.args);
+sendNative!.apply(target,data.args);
 (XMLHttpRequestasany)[XHR_SCHEDULED]=true;
 returntask;
 }
@@ -166,31 +166,25 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 // Note - ideally, we would call data.target.removeEventListener here, but it's too late
 // to prevent it from firing. So instead, we store info for the event listener.
 data.aborted=true;
-returnabortNative.apply(data.target,data.args);
+returnabortNative!.apply(data.target,data.args);
 }
 
-constopenNative: Function=
+constopenNative=
 patchMethod(XMLHttpRequestPrototype,'open',()=>function(self: any,args: any[]){
 self[XHR_SYNC]=args[2]==false;
 self[XHR_URL]=args[1];
-returnopenNative.apply(self,args);
+returnopenNative!.apply(self,args);
 });
 
 constXMLHTTPREQUEST_SOURCE='XMLHttpRequest.send';
-constsendNative: Function=
+constsendNative=
 patchMethod(XMLHttpRequestPrototype,'send',()=>function(self: any,args: any[]){
 if(self[XHR_SYNC]){
 // if the XHR is sync there is no task to schedule, just execute the code.
-returnsendNative.apply(self,args);
+returnsendNative!.apply(self,args);
 }else{
-constoptions: XHROptions={
-target: self,
-url: self[XHR_URL],
-isPeriodic: false,
-delay: null,
-args: args,
-aborted: false
-};
+constoptions: XHROptions=
+{target: self,url: self[XHR_URL],isPeriodic: false,args: args,aborted: false};
 returnscheduleMacroTaskWithCurrentZone(
 XMLHTTPREQUEST_SOURCE,placeholderCallback,options,scheduleTask,clearTask);
 }

lib/browser/define-property.ts

@@ -48,7 +48,7 @@ export function propertyPatch() {
 
 Object.getOwnPropertyDescriptor=function(obj,prop){
 constdesc=_getOwnPropertyDescriptor(obj,prop);
-if(isUnconfigurable(obj,prop)){
+if(desc&&isUnconfigurable(obj,prop)){
 desc.configurable=false;
 }
 returndesc;
@@ -97,7 +97,7 @@ function _tryDefineProperty(obj: any, prop: string, desc: any, originalConfigura
 try{
 return_defineProperty(obj,prop,desc);
 }catch(error){
-letdescJson: string=null;
+letdescJson: string|null=null;
 try{
 descJson=JSON.stringify(desc);
 }catch(error){

lib/browser/property-descriptor.ts

@@ -384,7 +384,7 @@ function canPatchViaPropertyDescriptor() {
 constdetectFunc=()=>{};
 req.onreadystatechange=detectFunc;
 constresult=(reqasany)[SYMBOL_FAKE_ONREADYSTATECHANGE]===detectFunc;
-req.onreadystatechange=null;
+req.onreadystatechange=nullasany;
 returnresult;
 }
 }

lib/common/error-rewrite.ts

@@ -63,7 +63,7 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
 // Process the stack trace and rewrite the frames.
 if((ZoneAwareErrorasany)[stackRewrite]&&originalStack){
 letframes: string[]=originalStack.split('\n');
-letzoneFrame=api.currentZoneFrame();
+letzoneFrame: _ZoneFrame|null=api.currentZoneFrame();
 leti=0;
 // Find the first frame
 while(!(frames[i]===zoneAwareFrame1||frames[i]===zoneAwareFrame2)&&
@@ -295,20 +295,20 @@ Zone.__load_patch('Error', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
 ()=>{
 thrownew(ZoneAwareErrorasany)(ZoneAwareError,NativeError);
 },
-null,
+undefined,
 (t: Task)=>{
 (tasany)._transitionTo=fakeTransitionTo;
 t.invoke();
 });
 },
-null,
+undefined,
 (t)=>{
 (tasany)._transitionTo=fakeTransitionTo;
 t.invoke();
 },
 ()=>{});
 },
-null,
+undefined,
 (t)=>{
 (tasany)._transitionTo=fakeTransitionTo;
 t.invoke();

lib/common/events.ts

@@ -398,7 +398,7 @@ export function patchEventTarget(
 taskData.eventName=eventName;
 taskData.isExisting=isExisting;
 
-constdata=useGlobalCallback ? OPTIMIZED_ZONE_EVENT_TASK_DATA : null;
+constdata=useGlobalCallback ? OPTIMIZED_ZONE_EVENT_TASK_DATA : undefined;
 
 // keep taskData into data to allow onScheduleEventTask to access the task information
 if(data){

lib/common/promise.ts

@@ -46,7 +46,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 api.microtaskDrainDone=()=>{
 while(_uncaughtPromiseErrors.length){
 while(_uncaughtPromiseErrors.length){
-constuncaughtPromiseError: UncaughtPromiseError=_uncaughtPromiseErrors.shift();
+constuncaughtPromiseError: UncaughtPromiseError=_uncaughtPromiseErrors.shift()!;
 try{
 uncaughtPromiseError.zone.runGuarded(()=>{
 throwuncaughtPromiseError;
@@ -164,7 +164,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 (promiseasany)[symbolValue]=value;
 
 if((promiseasany)[symbolFinally]===symbolFinally){
-// the promise is generated by Promise.prototype.finally
+// the promise is generated by Promise.prototype.finally
 if(state===RESOLVED){
 // the state is resolved, should ignore the value
 // and use parent promise value
@@ -202,7 +202,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 error.rejection=value;
 error.promise=promise;
 error.zone=Zone.current;
-error.task=Zone.currentTask;
+error.task=Zone.currentTask!;
 _uncaughtPromiseErrors.push(error);
 api.scheduleMicroTask();// to make sure that it is running
 }
@@ -239,7 +239,8 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 
 functionscheduleResolveOrReject<R,U1,U2>(
 promise: ZoneAwarePromise<any>,zone: AmbientZone,chainPromise: ZoneAwarePromise<any>,
-onFulfilled?: (value: R)=>U1,onRejected?: (error: any)=>U2): void{
+onFulfilled?: ((value: R)=>U1)|null|undefined,
+onRejected?: ((error: any)=>U2)|null|undefined): void{
 clearRejectedNoCatch(promise);
 constpromiseState=(promiseasany)[symbolState];
 constdelegate=promiseState ?
@@ -248,14 +249,19 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 zone.scheduleMicroTask(source,()=>{
 try{
 constparentPromiseValue=(promiseasany)[symbolValue];
-constisFinallyPromise=chainPromise&&symbolFinally===(chainPromiseasany)[symbolFinally];
+constisFinallyPromise=
+chainPromise&&symbolFinally===(chainPromiseasany)[symbolFinally];
 if(isFinallyPromise){
 // if the promise is generated from finally call, keep parent promise's state and value
 (chainPromiseasany)[symbolParentPromiseValue]=parentPromiseValue;
 (chainPromiseasany)[symbolParentPromiseState]=promiseState;
 }
 // should not pass value to finally callback
-constvalue=zone.run(delegate,undefined,isFinallyPromise&&delegate!==forwardRejection&&delegate!==forwardResolution ? [] : [parentPromiseValue]);
+constvalue=zone.run(
+delegate,undefined,
+isFinallyPromise&&delegate!==forwardRejection&&delegate!==forwardResolution ?
+[] :
+[parentPromiseValue]);
 resolvePromise(chainPromise,true,value);
 }catch(error){
 // if error occurs, should always return this error
@@ -272,11 +278,11 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 }
 
 staticresolve<R>(value: R): Promise<R>{
-returnresolvePromise(<ZoneAwarePromise<R>>newthis(null),RESOLVED,value);
+returnresolvePromise(<ZoneAwarePromise<R>>newthis(nullasany),RESOLVED,value);
 }
 
 staticreject<U>(error: U): Promise<U>{
-returnresolvePromise(<ZoneAwarePromise<U>>newthis(null),REJECTED,error);
+returnresolvePromise(<ZoneAwarePromise<U>>newthis(nullasany),REJECTED,error);
 }
 
 staticrace<R>(values: PromiseLike<any>[]): Promise<R>{
@@ -323,10 +329,10 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 resolve(resolvedValues);
 }
 })(count),
-reject);
+reject!);
 count++;
 }
-if(!count)resolve(resolvedValues);
+if(!count)resolve!(resolvedValues);
 returnpromise;
 }
 
@@ -351,7 +357,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 onRejected?: ((reason: any)=>TResult2|PromiseLike<TResult2>)|undefined|
 null): Promise<TResult1|TResult2>{
 constchainPromise: Promise<TResult1|TResult2>=
-new(this.constructorastypeofZoneAwarePromise)(null);
+new(this.constructorastypeofZoneAwarePromise)(nullasany);
 constzone=Zone.current;
 if((thisasany)[symbolState]==UNRESOLVED){
 (<any[]>(thisasany)[symbolValue]).push(zone,chainPromise,onFulfilled,onRejected);
@@ -368,7 +374,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 
 finally<U>(onFinally?: ()=>U|PromiseLike<U>): Promise<R>{
 constchainPromise: Promise<R|never>=
-new(this.constructorastypeofZoneAwarePromise)(null);
+new(this.constructorastypeofZoneAwarePromise)(nullasany);
 (chainPromiseasany)[symbolFinally]=symbolFinally;
 constzone=Zone.current;
 if((thisasany)[symbolState]==UNRESOLVED){

lib/common/timers.ts

@@ -15,13 +15,13 @@ import {patchMethod, scheduleMacroTaskWithCurrentZone, zoneSymbol} from './utils
 consttaskSymbol=zoneSymbol('zoneTask');
 
 interfaceTimerOptionsextendsTaskData{
-handleId: number;
+handleId?: number;
 args: any[];
 }
 
 exportfunctionpatchTimer(window: any,setName: string,cancelName: string,nameSuffix: string){
-letsetNative: Function=null;
-letclearNative: Function=null;
+letsetNative: Function|null=null;
+letclearNative: Function|null=null;
 setName+=nameSuffix;
 cancelName+=nameSuffix;
 
@@ -50,21 +50,21 @@ export function patchTimer(window: any, setName: string, cancelName: string, nam
 }
 }
 data.args[0]=timer;
-data.handleId=setNative.apply(window,data.args);
+data.handleId=setNative!.apply(window,data.args);
 returntask;
 }
 
 functionclearTask(task: Task){
-returnclearNative((<TimerOptions>task.data).handleId);
+returnclearNative!((<TimerOptions>task.data).handleId);
 }
 
 setNative=
 patchMethod(window,setName,(delegate: Function)=>function(self: any,args: any[]){
 if(typeofargs[0]==='function'){
 constoptions: TimerOptions={
-handleId: null,
 isPeriodic: nameSuffix==='Interval',
-delay: (nameSuffix==='Timeout'||nameSuffix==='Interval') ? args[1]||0 : null,
+delay: (nameSuffix==='Timeout'||nameSuffix==='Interval') ? args[1]||0 :
+undefined,
 args: args
 };
 consttask=
@@ -118,7 +118,7 @@ export function patchTimer(window: any, setName: string, cancelName: string, nam
 }
 if(task&&typeoftask.type==='string'){
 if(task.state!=='notScheduled'&&
-(task.cancelFn&&task.data.isPeriodic||task.runCount===0)){
+(task.cancelFn&&task.data!.isPeriodic||task.runCount===0)){
 if(typeofid==='number'){
 deletetasksByHandleId[id];
 }elseif(id){

lib/common/utils.ts

@@ -43,8 +43,8 @@ export function wrapWithCurrentZone<T extends Function>(callback: T, source: str
 }
 
 exportfunctionscheduleMacroTaskWithCurrentZone(
-source: string,callback: Function,data: TaskData,customSchedule: (task: Task)=>void,
-customCancel: (task: Task)=>void): MacroTask{
+source: string,callback: Function,data?: TaskData,customSchedule?: (task: Task)=>void,
+customCancel?: (task: Task)=>void): MacroTask{
 returnZone.current.scheduleMacroTask(source,callback,data,customSchedule,customCancel);
 }
 
@@ -229,7 +229,7 @@ export function patchProperty(obj: any, prop: string, prototype?: any) {
 // so we should use original native get to retrieve the handler
 letvalue=originalDescGet&&originalDescGet.call(this);
 if(value){
-desc.set.call(this,value);
+desc!.set!.call(this,value);
 if(typeoftarget[REMOVE_ATTRIBUTE]==='function'){
 target.removeAttribute(prop);
 }
@@ -242,7 +242,7 @@ export function patchProperty(obj: any, prop: string, prototype?: any) {
 ObjectDefineProperty(obj,prop,desc);
 }
 
-exportfunctionpatchOnProperties(obj: any,properties: string[],prototype?: any){
+exportfunctionpatchOnProperties(obj: any,properties: string[]|null,prototype?: any){
 if(properties){
 for(leti=0;i<properties.length;i++){
 patchProperty(obj,'on'+properties[i],prototype);
@@ -337,7 +337,7 @@ export function patchClass(className: string) {
 exportfunctionpatchMethod(
 target: any,name: string,
 patchFn: (delegate: Function,delegateName: string,name: string)=>(self: any,args: any[])=>
-any): Function{
+any): Function|null{
 letproto=target;
 while(proto&&!proto.hasOwnProperty(name)){
 proto=ObjectGetPrototypeOf(proto);
@@ -348,14 +348,14 @@ export function patchMethod(
 }
 
 constdelegateName=zoneSymbol(name);
-letdelegate: Function;
+letdelegate: Function|null=null;
 if(proto&&!(delegate=proto[delegateName])){
 delegate=proto[delegateName]=proto[name];
 // check whether proto[name] is writable
 // some property is readonly in safari, such as HtmlCanvasElement.prototype.toBlob
 constdesc=proto&&ObjectGetOwnPropertyDescriptor(proto,name);
 if(isPropertyWritable(desc)){
-constpatchDelegate=patchFn(delegate,delegateName,name);
+constpatchDelegate=patchFn(delegate!,delegateName,name);
 proto[name]=function(){
 returnpatchDelegate(this,argumentsasany);
 };
@@ -375,22 +375,21 @@ export interface MacroTaskMeta extends TaskData {
 // TODO: @JiaLiPassion, support cancel task later if necessary
 exportfunctionpatchMacroTask(
 obj: any,funcName: string,metaCreator: (self: any,args: any[])=>MacroTaskMeta){
-letsetNative: Function=null;
+letsetNative: Function|null=null;
 
 functionscheduleTask(task: Task){
 constdata=<MacroTaskMeta>task.data;
 data.args[data.cbIdx]=function(){
 task.invoke.apply(this,arguments);
 };
-setNative.apply(data.target,data.args);
+setNative!.apply(data.target,data.args);
 returntask;
 }
 
 setNative=patchMethod(obj,funcName,(delegate: Function)=>function(self: any,args: any[]){
 constmeta=metaCreator(self,args);
 if(meta.cbIdx>=0&&typeofargs[meta.cbIdx]==='function'){
-returnscheduleMacroTaskWithCurrentZone(
-meta.name,args[meta.cbIdx],meta,scheduleTask,null);
+returnscheduleMacroTaskWithCurrentZone(meta.name,args[meta.cbIdx],meta,scheduleTask);
 }else{
 // cause an error by calling it directly.
 returndelegate.apply(self,args);
@@ -407,14 +406,14 @@ export interface MicroTaskMeta extends TaskData {
 
 exportfunctionpatchMicroTask(
 obj: any,funcName: string,metaCreator: (self: any,args: any[])=>MicroTaskMeta){
-letsetNative: Function=null;
+letsetNative: Function|null=null;
 
 functionscheduleTask(task: Task){
 constdata=<MacroTaskMeta>task.data;
 data.args[data.cbIdx]=function(){
 task.invoke.apply(this,arguments);
 };
-setNative.apply(data.target,data.args);
+setNative!.apply(data.target,data.args);
 returntask;
 }
 

lib/extra/cordova.ts

@@ -10,15 +10,15 @@ Zone.__load_patch('cordova', (global: any, Zone: ZoneType, api: _ZonePrivate) =>
 constSUCCESS_SOURCE='cordova.exec.success';
 constERROR_SOURCE='cordova.exec.error';
 constFUNCTION='function';
-constnativeExec: Function=
+constnativeExec: Function|null=
 api.patchMethod(global.cordova,'exec',()=>function(self: any,args: any[]){
 if(args.length>0&&typeofargs[0]===FUNCTION){
 args[0]=Zone.current.wrap(args[0],SUCCESS_SOURCE);
 }
 if(args.length>1&&typeofargs[1]===FUNCTION){
 args[1]=Zone.current.wrap(args[1],ERROR_SOURCE);
 }
-returnnativeExec.apply(self,args);
+returnnativeExec!.apply(self,args);
 });
 }
 });

lib/extra/electron.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Zone.__load_patch('electron',(global: any,Zone: ZoneType,api: _ZonePrivate)=>{
-functionpatchArguments(target: any,name: string,source: string): Function{
+functionpatchArguments(target: any,name: string,source: string): Function|null{
 returnapi.patchMethod(target,name,(delegate: Function)=>(self: any,args: any[])=>{
 returndelegate&&delegate.apply(self,api.bindArguments(args,source));
 });