Merge branch 'feature/weapi-storage-and-privacy-apis' into develop

See #893

Makefile

@@ -500,11 +500,14 @@ pycodestyle: python-packages
 	@$(PY_PYCODESTYLE) tests/marionette/
 ts: node-packages
 	@echo $@
-	@$(TSC)
+	@$(TSC) --noEmit
+	@#$(TSC) --noEmit -p tests/mocha     # failing
+	@#$(TSC) --noEmit -p tests/xpcshell  # failing
 tslint: node-packages
 	@echo $@
 	@$(TSLINT) --project tsconfig.json \
 		--exclude '**/third-party/**/*' \
+		--exclude '**/*.d.ts' \
 		'src/**/*.ts' \
 		| $(_remove_leading_empty_lines)
 

package.json

@@ -37,10 +37,10 @@
     "ts-node": "^4.1.0",
     "tslint": "^5.5.0",
     "typescript": "^2.4.2",
-    "web-ext-types": "github:myrdd/web-ext-types#d5a9541ab27d13c41e877ce70dcc1248c54a0b2c"
+    "web-ext-types": "github:myrdd/web-ext-types#8d773c8"
   },
   "dependencies": {
     "jquery": "^3.3.1",
-    "mozilla-version-comparator": "github:myrdd/mozilla-version-comparator"
+    "mozilla-version-comparator": "github:myrdd/mozilla-version-comparator#3b77635"
   }
 }

src/conditional/legacy/content/bootstrap/api/api.module.ts

@@ -20,21 +20,25 @@
  * ***** END LICENSE BLOCK *****
  */
 
+import { Common } from "common/interfaces";
 import { Module } from "lib/classes/module";
-import { API } from "./interfaces";
+import { API, JSMs } from "./interfaces";
 
 export class Api extends Module {
   constructor(
-      log: API.ILog,
+      log: Common.ILog,
       public readonly extension: API.extension.IExtension,
       public readonly i18n: API.i18n.II18n,
       public readonly management: API.management.IManagement,
       public readonly manifest: API.IManifest,
+      public readonly privacy: API.privacy.IPrivacy,
       public readonly runtime: API.runtime.IRuntime,
       public readonly storage: API.storage.IStorage,
+      private readonly prefsService: JSMs.Services["prefs"],
       private readonly miscInfos: API.IMiscInfos,
-      private readonly prefs: API.storage.IPrefs,
+      private readonly rpPrefBranch: API.storage.IPrefBranch,
       private readonly prefObserverFactory: API.storage.PrefObserverFactory,
+      private readonly tryCatchUtils: API.ITryCatchUtils,
   ) {
     super("API", log);
   }
@@ -45,6 +49,7 @@ export class Api extends Module {
       i18n: this.i18n,
       management: this.management,
       manifest: this.manifest,
+      privacy: this.privacy,
       runtime: this.runtime,
       storage: this.storage,
     };
@@ -55,6 +60,7 @@ export class Api extends Module {
       extension: this.extension.backgroundApi,
       i18n: this.i18n.backgroundApi,
       management: this.management.backgroundApi,
+      privacy: this.privacy.backgroundApi,
       runtime: this.runtime.backgroundApi,
       storage: this.storage.backgroundApi,
     };
@@ -74,8 +80,10 @@ export class Api extends Module {
       createPrefObserver: this.prefObserverFactory,
       i18n: this.i18n.legacyApi,
       miscInfos: this.miscInfos,
-      prefs: this.prefs,
+      prefsService: this.prefsService,
+      rpPrefBranch: this.rpPrefBranch,
       storage: {},
+      tryCatchUtils: this.tryCatchUtils,
     };
   }
 

src/conditional/legacy/content/bootstrap/api/extension.ts

@@ -20,13 +20,13 @@
  * ***** END LICENSE BLOCK *****
  */
 
-import { API } from "bootstrap/api/interfaces";
+import { Common } from "common/interfaces";
 import {Module} from "lib/classes/module";
 
 export class Extension extends Module {
   private backgroundPage: any;
 
-  constructor(log: API.ILog) {
+  constructor(log: Common.ILog) {
     super("browser.extension", log);
   }
 

src/conditional/legacy/content/bootstrap/api/i18n/async-locale-data.ts

@@ -20,20 +20,22 @@
  * ***** END LICENSE BLOCK *****
  */
 
-import { API } from "bootstrap/api/interfaces";
+import { API, JSMs } from "bootstrap/api/interfaces";
+import { IModule } from "lib/classes/module";
 import {defer} from "lib/utils/js-utils";
 import * as I18nUtils from "./i18n-utils";
 import {LocaleData} from "./locale-data";
 
 /**
  * This object manages loading locales for i18n support.
  */
-export class AsyncLocaleData extends LocaleData {
+export class AsyncLocaleData extends LocaleData implements IModule {
   private dReady = defer();
 
   constructor(
       private tryCatchUtils: API.ITryCatchUtils,
       private chromeFileService: API.services.IChromeFileService,
+      private mozServices: JSMs.Services,
   ) {
     super();
   }
@@ -48,7 +50,10 @@ export class AsyncLocaleData extends LocaleData {
    * @return {String}
    */
   public getAppLocale() {
-    const appLocale = this.tryCatchUtils.getAppLocale();
+    const appLocale = this.tryCatchUtils.getAppLocale(
+        this.mozServices.prefs,
+        this.mozServices.locale,
+    );
     return I18nUtils.normalizeToBCP47(appLocale);
   }
 

src/conditional/legacy/content/bootstrap/api/i18n/i18n-utils.js

@@ -45,7 +45,7 @@ export function normalizeToBCP47(tag) {
  *
  * @param {Array} availableLocales list of BCP 47 tags of available locales
  * @param {String} locale canonicalized BCP 47 tag of requested locale
- * @return {String} Best match BCP 47 tag
+ * @return {String|undefined} Best match BCP 47 tag
  */
 export function getBestAvailableLocale(availableLocales, locale) {
   let lcAvailable = availableLocales.map((l) => l.toLowerCase());

src/conditional/legacy/content/bootstrap/api/i18n/i18n.module.ts

@@ -21,12 +21,13 @@
  */
 
 import { API } from "bootstrap/api/interfaces";
+import { Common } from "common/interfaces";
 import {Module} from "lib/classes/module";
 import * as L10nUtils from "./l10n-utils";
 
 export class I18n extends Module {
   constructor(
-      log: API.ILog,
+      log: Common.ILog,
       protected localeData: API.i18n.IAsyncLocaleData,
   ) {
     super("browser.i18n", log);