refactor: call tracer only after isEnabled check (#1500)

original PR: #958

Author: sis0k0

nativescript-angular/animations/animation-player.ts

@@ -4,7 +4,7 @@ import { KeyframeAnimation }
 
 import { Keyframe, createKeyframeAnimation } from "./utils";
 import { NgView } from "../element-registry";
-import { animationsLog as traceLog } from "../trace";
+import { animationsLog as traceLog, isLogEnabled } from "../trace";
 
 export class NativeScriptAnimationPlayer implements AnimationPlayer {
  public parentPlayer: AnimationPlayer = null;
@@ -41,7 +41,9 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
  onDestroy(fn: Function): void { this._doneSubscriptions.push(fn); }
 
  play(): void {
- traceLog(`NativeScriptAnimationPlayer.play`);
+ if (isLogEnabled()) {
+ traceLog(`NativeScriptAnimationPlayer.play`);
+ }
 
  if (!this.animation) {
  return;
@@ -66,22 +68,28 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
  }
 
  reset(): void {
- traceLog(`NativeScriptAnimationPlayer.reset`);
+ if (isLogEnabled()) {
+ traceLog(`NativeScriptAnimationPlayer.reset`);
+ }
 
  if (this.animation && this.animation.isPlaying) {
  this.animation.cancel();
  }
  }
 
  restart(): void {
- traceLog(`NativeScriptAnimationPlayer.restart`);
+ if (isLogEnabled()) {
+ traceLog(`NativeScriptAnimationPlayer.restart`);
+ }
 
  this.reset();
  this.play();
  }
 
  destroy(): void {
- traceLog(`NativeScriptAnimationPlayer.destroy`);
+ if (isLogEnabled()) {
+ traceLog(`NativeScriptAnimationPlayer.destroy`);
+ }
  this.onFinish();
  }
 
@@ -94,13 +102,17 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
  }
 
  private initKeyframeAnimation(keyframes: Keyframe[], duration: number, delay: number, easing: string) {
- traceLog(`NativeScriptAnimationPlayer.initKeyframeAnimation`);
+ if (isLogEnabled()) {
+ traceLog(`NativeScriptAnimationPlayer.initKeyframeAnimation`);
+ }
 
  this.animation = createKeyframeAnimation(keyframes, duration, delay, easing);
  }
 
  private onFinish() {
- traceLog(`NativeScriptAnimationPlayer.onFinish`);
+ if (isLogEnabled()) {
+ traceLog(`NativeScriptAnimationPlayer.onFinish`);
+ }
 
  if (this._finished) {
  return;

nativescript-angular/directives/list-view-comp.ts

@@ -26,7 +26,7 @@ import { ObservableArray } from "tns-core-modules/data/observable-array";
 import { profile } from "tns-core-modules/profiling";
 
 import { getSingleViewRecursive } from "../element-registry";
-import { listViewLog, listViewError } from "../trace";
+import { listViewLog, listViewError, isLogEnabled } from "../trace";
 
 const NG_VIEW = "_ngViewRef";
 
@@ -101,7 +101,9 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
  }
 
  ngAfterContentInit() {
- listViewLog("ListView.ngAfterContentInit()");
+ if (isLogEnabled()) {
+ listViewLog("ListView.ngAfterContentInit()");
+ }
  this.setItemTemplates();
  }
 
@@ -115,7 +117,9 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
  this.itemTemplate = this.itemTemplateQuery;
 
  if (this._templateMap) {
- listViewLog("Setting templates");
+ if (isLogEnabled()) {
+ listViewLog("Setting templates");
+ }
 
  const templates: KeyedTemplate[] = [];
  this._templateMap.forEach(value => {
@@ -126,15 +130,19 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
  }
 
  public registerTemplate(key: string, template: TemplateRef<ListItemContext>) {
- listViewLog("registerTemplate for key: " + key);
+ if (isLogEnabled()) {
+ listViewLog(`registerTemplate for key: ${key}`);
+ }
  if (!this._templateMap) {
  this._templateMap = new Map<string, KeyedTemplate>();
  }
 
  const keyedTemplate = {
  key,
  createView: () => {
- listViewLog("registerTemplate for key: " + key);
+ if (isLogEnabled()) {
+ listViewLog(`registerTemplate for key: ${key}`);
+ }
 
  const viewRef = this.loader.createEmbeddedView(template, new ListItemContext(), 0);
  const resultView = getItemViewRoot(viewRef);
@@ -159,7 +167,9 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
  let viewRef: EmbeddedViewRef<ListItemContext>;
 
  if (args.view) {
- listViewLog("onItemLoading: " + index + " - Reusing existing view");
+ if (isLogEnabled()) {
+ listViewLog(`onItemLoading: ${index} - Reusing existing view`);
+ }
  viewRef = args.view[NG_VIEW];
  // Getting angular view from original element (in cases when ProxyViewContainer
  // is used NativeScript internally wraps it in a StackLayout)
@@ -168,12 +178,16 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
  }
 
  if (!viewRef) {
- listViewError("ViewReference not found for item " + index + ". View recycling is not working");
+ if (isLogEnabled()) {
+ listViewError(`ViewReference not found for item ${index}. View recycling is not working`);
+ }
  }
  }
 
  if (!viewRef) {
- listViewLog("onItemLoading: " + index + " - Creating view from template");
+ if (isLogEnabled()) {
+ listViewLog(`onItemLoading: ${index} - Creating view from template`);
+ }
  viewRef = this.loader.createEmbeddedView(this.itemTemplate, new ListItemContext(), 0);
  args.view = getItemViewRoot(viewRef);
  args.view[NG_VIEW] = viewRef;
@@ -197,17 +211,23 @@ export class ListViewComponent implements DoCheck, OnDestroy, AfterContentInit {
 
  @profile
  private detectChangesOnChild(viewRef: EmbeddedViewRef<ListItemContext>, index: number) {
- listViewLog("Manually detect changes in child: " + index);
+ if (isLogEnabled()) {
+ listViewLog(`Manually detect changes in child: ${index}`);
+ }
  viewRef.markForCheck();
  viewRef.detectChanges();
  }
 
  ngDoCheck() {
  if (this._differ) {
- listViewLog("ngDoCheck() - execute differ");
+ if (isLogEnabled()) {
+ listViewLog("ngDoCheck() - execute differ");
+ }
  const changes = this._differ.diff(this._items);
  if (changes) {
- listViewLog("ngDoCheck() - refresh");
+ if (isLogEnabled()) {
+ listViewLog("ngDoCheck() - refresh");
+ }
  this.listView.refresh();
  }
  }

nativescript-angular/directives/tab-view.ts

@@ -11,7 +11,7 @@ import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
 import { TextTransform } from "tns-core-modules/ui/text-base";
 
 import { InvisibleNode } from "../element-registry";
-import { rendererLog } from "../trace";
+import { rendererLog, isLogEnabled } from "../trace";
 import { isBlank } from "../lang-facade";
 
 export interface TabViewItemDef {
@@ -46,7 +46,9 @@ export class TabViewDirective implements AfterViewInit {
 
  ngAfterViewInit() {
  this.viewInitialized = true;
- rendererLog("this._selectedIndex: " + this._selectedIndex);
+ if (isLogEnabled()) {
+ rendererLog("this._selectedIndex: " + this._selectedIndex);
+ }
  if (!isBlank(this._selectedIndex)) {
  this.tabView.selectedIndex = this._selectedIndex;
  }

nativescript-angular/dom-adapter.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 import { Type } from "@angular/core";
 import { ɵDomAdapter } from "@angular/platform-browser";
-import { rendererLog } from "./trace";
+import { rendererLog, isLogEnabled } from "./trace";
 
 export class NativeScriptDomAdapter implements ɵDomAdapter {
  static makeCurrent() {
@@ -12,12 +12,16 @@ export class NativeScriptDomAdapter implements ɵDomAdapter {
  const privateAPI = global.require("@angular/platform-browser");
  const setRootDomAdapter = privateAPI.ɵsetRootDomAdapter;
 
- rendererLog("Setting root DOM adapter...");
+ if (isLogEnabled()) {
+ rendererLog("Setting root DOM adapter...");
+ }
  setRootDomAdapter(new NativeScriptDomAdapter());
  } catch (e) {
- rendererLog("@angular/platform-browser package not present. NOT setting root DOM adapter...");
+ if (isLogEnabled()) {
+ rendererLog("@angular/platform-browser package not present. NOT setting root DOM adapter...");
+ }
  }
- }
+  }
  }
 
  hasProperty(_element: any, _name: string) {

nativescript-angular/platform-common.ts

@@ -21,7 +21,7 @@ import {
 } from "@angular/core";
 import { DOCUMENT } from "@angular/common";
 
-import { bootstrapLog, bootstrapLogError } from "./trace";
+import { bootstrapLog, bootstrapLogError, isLogEnabled } from "./trace";
 import { defaultPageFactoryProvider, setRootPage, PageFactory, PAGE_FACTORY } from "./platform-providers";
 import { AppHostView } from "./app-host-view";
 
@@ -155,18 +155,24 @@ export class NativeScriptPlatformRef extends PlatformRef {
  setRootPage(<any>tempAppHostView);
  }
 
- bootstrapLog("NativeScriptPlatform bootstrap started.");
+ if (isLogEnabled()) {
+ bootstrapLog("NativeScriptPlatform bootstrap started.");
+ }
  const launchCallback = profile(
  "nativescript-angular/platform-common.launchCallback",
  (args: LaunchEventData) => {
- bootstrapLog("Application launch event fired");
+ if (isLogEnabled()) {
+ bootstrapLog("Application launch event fired");
+ }
 
  let bootstrapPromiseCompleted = false;
  this._bootstrapper().then(
  moduleRef => {
  bootstrapPromiseCompleted = true;
 
- bootstrapLog(`Angular bootstrap bootstrap done. uptime: ${uptime()}`);
+ if (isLogEnabled()) {
+ bootstrapLog(`Angular bootstrap bootstrap done. uptime: ${uptime()}`);
+ }
 
  if (!autoCreateFrame) {
  rootContent = tempAppHostView.content;
@@ -178,20 +184,30 @@ export class NativeScriptPlatformRef extends PlatformRef {
  bootstrapPromiseCompleted = true;
 
  const errorMessage = err.message + "\n\n" + err.stack;
- bootstrapLogError("ERROR BOOTSTRAPPING ANGULAR");
- bootstrapLogError(errorMessage);
+ if (isLogEnabled()) {
+ bootstrapLogError("ERROR BOOTSTRAPPING ANGULAR");
+ }
+ if (isLogEnabled()) {
+ bootstrapLogError(errorMessage);
+ }
 
  rootContent = this.createErrorUI(errorMessage);
  }
  );
 
- bootstrapLog("bootstrapAction called, draining micro tasks queue. Root: " + rootContent);
+ if (isLogEnabled()) {
+ bootstrapLog("bootstrapAction called, draining micro tasks queue. Root: " + rootContent);
+ }
  (<any>global).Zone.drainMicroTaskQueue();
- bootstrapLog("bootstrapAction called, draining micro tasks queue finished! Root: " + rootContent);
+ if (isLogEnabled()) {
+ bootstrapLog("bootstrapAction called, draining micro tasks queue finished! Root: " + rootContent);
+ }
 
  if (!bootstrapPromiseCompleted) {
  const errorMessage = "Bootstrap promise didn't resolve";
- bootstrapLogError(errorMessage);
+ if (isLogEnabled()) {
+ bootstrapLogError(errorMessage);
+ }
  rootContent = this.createErrorUI(errorMessage);
  }
 
@@ -205,7 +221,9 @@ export class NativeScriptPlatformRef extends PlatformRef {
 
  @profile
  public _livesync() {
- bootstrapLog("Angular livesync started.");
+ if (isLogEnabled()) {
+ bootstrapLog("Angular livesync started.");
+ }
  onBeforeLivesync.next(lastBootstrappedModule ? lastBootstrappedModule.get() : null);
 
  const autoCreateFrame = !!this.appOptions.createFrameOnBootstrap;
@@ -226,7 +244,9 @@ export class NativeScriptPlatformRef extends PlatformRef {
  this._bootstrapper().then(
  moduleRef => {
  bootstrapPromiseCompleted = true;
- bootstrapLog("Angular livesync done.");
+ if (isLogEnabled()) {
+ bootstrapLog("Angular livesync done.");
+ }
  onAfterLivesync.next({ moduleRef });
 
  if (!autoCreateFrame) {
@@ -237,23 +257,33 @@ export class NativeScriptPlatformRef extends PlatformRef {
  },
  error => {
  bootstrapPromiseCompleted = true;
- bootstrapLogError("ERROR LIVESYNC BOOTSTRAPPING ANGULAR");
+ if (isLogEnabled()) {
+ bootstrapLogError("ERROR LIVESYNC BOOTSTRAPPING ANGULAR");
+ }
  const errorMessage = error.message + "\n\n" + error.stack;
- bootstrapLogError(errorMessage);
+ if (isLogEnabled()) {
+ bootstrapLogError(errorMessage);
+ }
 
  rootContent = this.createErrorUI(errorMessage);
 
  onAfterLivesync.next({ error });
  }
  );
 
- bootstrapLog("livesync bootstrapAction called, draining micro tasks queue. Root: " + rootContent);
+ if (isLogEnabled()) {
+ bootstrapLog("livesync bootstrapAction called, draining micro tasks queue. Root: " + rootContent);
+ }
  (<any>global).Zone.drainMicroTaskQueue();
- bootstrapLog("livesync bootstrapAction called, draining micro tasks queue finished! Root: " + rootContent);
+ if (isLogEnabled()) {
+ bootstrapLog("livesync bootstrapAction called, draining micro tasks queue finished! Root: " + rootContent);
+ }
 
  if (!bootstrapPromiseCompleted) {
  const result = "Livesync bootstrap promise didn't resolve";
- bootstrapLogError(result);
+ if (isLogEnabled()) {
+ bootstrapLogError(result);
+ }
  rootContent = this.createErrorUI(result);
 
  onAfterLivesync.next({ error: new Error(result) });