fix(core): add helper method in util.ts to shorter zone.wrap/scehduleMacroTask

Author: JiaLiPassion

Diff for: lib/browser/browser.ts

@@ -12,7 +12,7 @@
 
 import {findEventTasks} from '../common/events';
 import {patchTimer} from '../common/timers';
-import {bindArguments, patchClass, patchMacroTask, patchMethod, patchOnProperties, patchPrototype, ZONE_SYMBOL_ADD_EVENT_LISTENER, ZONE_SYMBOL_REMOVE_EVENT_LISTENER, zoneSymbol} from '../common/utils';
+import {bindArguments, patchClass, patchMacroTask, patchMethod, patchOnProperties, patchPrototype, scheduleMacroTaskWithCurrentZone, ZONE_SYMBOL_ADD_EVENT_LISTENER, ZONE_SYMBOL_REMOVE_EVENT_LISTENER, zoneSymbol} from '../common/utils';
 
 import {propertyPatch} from './define-property';
 import {eventTargetPatch, patchEvent} from './event-target';
@@ -179,7 +179,6 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
     const XMLHTTPREQUEST_SOURCE = 'XMLHttpRequest.send';
     const sendNative: Function =
         patchMethod(XMLHttpRequestPrototype, 'send', () => function(self: any, args: any[]) {
-          const zone = Zone.current;
           if (self[XHR_SYNC]) {
             // if the XHR is sync there is no task to schedule, just execute the code.
             return sendNative.apply(self, args);
@@ -192,7 +191,7 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
               args: args,
               aborted: false
             };
-            return zone.scheduleMacroTask(
+            return scheduleMacroTaskWithCurrentZone(
                 XMLHTTPREQUEST_SOURCE, placeholderCallback, options, scheduleTask, clearTask);
           }
         });

Diff for: lib/browser/property-descriptor.ts

@@ -10,7 +10,7 @@
  * @suppress {globalThis}
  */
 
-import {isBrowser, isMix, isNode, ObjectDefineProperty, ObjectGetOwnPropertyDescriptor, ObjectGetPrototypeOf, patchClass, patchOnProperties, zoneSymbol} from '../common/utils';
+import {isBrowser, isMix, isNode, ObjectDefineProperty, ObjectGetOwnPropertyDescriptor, ObjectGetPrototypeOf, patchClass, patchOnProperties, wrapWithCurrentZone, zoneSymbol} from '../common/utils';
 
 import * as webSocketPatch from './websocket';
 
@@ -402,7 +402,7 @@ function patchViaCapturingAllTheEvents() {
       }
       while (elt) {
         if (elt[onproperty] && !elt[onproperty][unboundKey]) {
-          bound = Zone.current.wrap(elt[onproperty], source);
+          bound = wrapWithCurrentZone(elt[onproperty], source);
           bound[unboundKey] = elt[onproperty];
           elt[onproperty] = bound;
         }

Diff for: lib/browser/register-element.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {attachOriginToPatched, isBrowser, isMix, ObjectGetOwnPropertyDescriptor} from '../common/utils';
+import {attachOriginToPatched, isBrowser, isMix, ObjectGetOwnPropertyDescriptor, wrapWithCurrentZone} from '../common/utils';
 
 import {_redefineProperty} from './define-property';
 
@@ -27,13 +27,13 @@ export function registerElementPatch(_global: any) {
         if (prototype.hasOwnProperty(callback)) {
           const descriptor = ObjectGetOwnPropertyDescriptor(prototype, callback);
           if (descriptor && descriptor.value) {
-            descriptor.value = Zone.current.wrap(descriptor.value, source);
+            descriptor.value = wrapWithCurrentZone(descriptor.value, source);
             _redefineProperty(opts.prototype, callback, descriptor);
           } else {
-            prototype[callback] = Zone.current.wrap(prototype[callback], source);
+            prototype[callback] = wrapWithCurrentZone(prototype[callback], source);
           }
         } else if (prototype[callback]) {
-          prototype[callback] = Zone.current.wrap(prototype[callback], source);
+          prototype[callback] = wrapWithCurrentZone(prototype[callback], source);
         }
       });
     }

Diff for: lib/common/timers.ts

@@ -10,7 +10,7 @@
  * @suppress {missingRequire}
  */
 
-import {patchMethod, zoneSymbol} from './utils';
+import {patchMethod, scheduleMacroTaskWithCurrentZone, zoneSymbol} from './utils';
 
 const taskSymbol = zoneSymbol('zoneTask');
 
@@ -61,15 +61,14 @@ export function patchTimer(window: any, setName: string, cancelName: string, nam
   setNative =
       patchMethod(window, setName, (delegate: Function) => function(self: any, args: any[]) {
         if (typeof args[0] === 'function') {
-          // Zone.current
-          const zone = Zone.current;
           const options: TimerOptions = {
             handleId: null,
             isPeriodic: nameSuffix === 'Interval',
             delay: (nameSuffix === 'Timeout' || nameSuffix === 'Interval') ? args[1] || 0 : null,
             args: args
           };
-          const task = zone.scheduleMacroTask(setName, args[0], options, scheduleTask, clearTask);
+          const task =
+              scheduleMacroTaskWithCurrentZone(setName, args[0], options, scheduleTask, clearTask);
           if (!task) {
             return task;
           }

Diff for: lib/common/utils.ts

@@ -38,6 +38,16 @@ export const FALSE_STR = 'false';
 /** __zone_symbol__ string const */
 export const ZONE_SYMBOL_PREFIX = '__zone_symbol__';
 
+export function wrapWithCurrentZone<T extends Function>(callback: T, source: string): T {
+  return Zone.current.wrap(callback, source);
+}
+
+export function scheduleMacroTaskWithCurrentZone(
+    source: string, callback: Function, data: TaskData, customSchedule: (task: Task) => void,
+    customCancel: (task: Task) => void): MacroTask {
+  return Zone.current.scheduleMacroTask(source, callback, data, customSchedule, customCancel);
+}
+
 // Hack since TypeScript isn't compiling this for a worker.
 declare const WorkerGlobalScope: any;
 
@@ -52,7 +62,7 @@ const NULL_ON_PROP_VALUE: any[] = [null];
 export function bindArguments(args: any[], source: string): any[] {
   for (let i = args.length - 1; i >= 0; i--) {
     if (typeof args[i] === 'function') {
-      args[i] = Zone.current.wrap(args[i], source + '_' + i);
+      args[i] = wrapWithCurrentZone(args[i], source + '_' + i);
     }
   }
   return args;
@@ -300,7 +310,7 @@ export function patchClass(className: string) {
         ObjectDefineProperty(_global[className].prototype, prop, {
           set: function(fn) {
             if (typeof fn === 'function') {
-              this[originalInstanceKey][prop] = Zone.current.wrap(fn, className + '.' + prop);
+              this[originalInstanceKey][prop] = wrapWithCurrentZone(fn, className + '.' + prop);
               // keep callback in wrapped function so we can
               // use it in Function.prototype.toString to return
               // the native one.
@@ -379,7 +389,8 @@ export function patchMacroTask(
   setNative = patchMethod(obj, funcName, (delegate: Function) => function(self: any, args: any[]) {
     const meta = metaCreator(self, args);
     if (meta.cbIdx >= 0 && typeof args[meta.cbIdx] === 'function') {
-      return Zone.current.scheduleMacroTask(meta.name, args[meta.cbIdx], meta, scheduleTask, null);
+      return scheduleMacroTaskWithCurrentZone(
+          meta.name, args[meta.cbIdx], meta, scheduleTask, null);
     } else {
       // cause an error by calling it directly.
       return delegate.apply(self, args);