TS tweaks

Author: EddyVerbruggen

src/firebase.android.ts

@@ -1,6 +1,7 @@
 import { firebase } from "./firebase-common";
 import * as appModule from "tns-core-modules/application";
 import * as utils from "tns-core-modules/utils/utils";
+import lazy from "tns-core-modules/utils/lazy";
 import * as frame from "tns-core-modules/ui/frame";
 import * as fs from "tns-core-modules/file-system";
 import { AndroidActivityResultEventData } from "tns-core-modules/application";
@@ -18,26 +19,9 @@ let fbCallbackManager = null;
 const GOOGLE_SIGNIN_INTENT_ID = 123;
 const REQUEST_INVITE_INTENT_ID = 48;
 
-function lazy(action) {
-  let _value;
-  const that = this;
-
-  return function () {
-    return that._value || (that._value = action());
-  };
-}
-
-const gson = new lazy(function () {
-  return typeof(com.google.gson) === "undefined" ? null : new com.google.gson.Gson();
-});
-
-const messagingEnabled = new lazy(function () {
-  return typeof(com.google.firebase.messaging) !== "undefined";
-});
-
-const dynamicLinksEnabled = new lazy(function () {
-  return typeof(com.google.android.gms.appinvite) !== "undefined";
-});
+const gson = lazy(() => typeof(com.google.gson) === "undefined" ? null : new com.google.gson.Gson());
+const messagingEnabled = lazy(() => typeof(com.google.firebase.messaging) !== "undefined");
+const dynamicLinksEnabled = lazy(() => typeof(com.google.android.gms.appinvite) !== "undefined");
 
 (function () {
   appModule.on("launch", function (args) {

src/firebase.ios.ts

@@ -700,7 +700,7 @@ firebase.analytics.logEvent = function (arg) {
         return;
       }
 
-      const dic: NSMutableDictionary<string, any> = NSMutableDictionary.new();
+      const dic: any = NSMutableDictionary.new();
       if (arg.parameters !== undefined) {
         for (let p in arg.parameters) {
           const param = arg.parameters[p];
@@ -951,7 +951,7 @@ firebase.getRemoteConfig = function (arg) {
       // Enable developer mode to allow for frequent refreshes of the cache
       firebaseRemoteConfig.configSettings = new FIRRemoteConfigSettings({developerModeEnabled: arg.developerMode || false});
 
-      const dic: NSMutableDictionary<string, any> = NSMutableDictionary.new();
+      const dic: any = NSMutableDictionary.new();
       for (let p in arg.properties) {
         const prop = arg.properties[p];
         if (prop.default !== undefined) {

src/package.json

@@ -35,7 +35,7 @@
     "preuninstall": "node preuninstall-hooks.js",
     "setup": "node scripts/postinstall.js setup",
     "config": "node scripts/postinstall.js config",
-    "build": "npm i && tsc",
+    "build": "tsc",
     "demo.ios": "npm run preparedemo && cd ../demo && tns run ios --emulator",
     "demo.ios.device": "npm run preparedemo && cd ../demo && tns platform remove ios && tns run ios",
     "demo.android": "npm run preparedemo && cd ../demo && tns platform remove android && tns run android --justlaunch",

src/tsconfig.json

@@ -7,6 +7,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "skipLibCheck": true,
     "lib": [
       "es6",
       "dom"