refactor: Apply suggestions from code review

Alexander Vakrilov · MartoYankov · vakrilov · commit d44d249bf7f2 · 2019-10-15T09:29:25.000+03:00
Co-Authored-By: Martin Yankov &lt;m.i.yankov@gmail.com&gt;
diff --git a/DevelopmentWorkflow.md b/DevelopmentWorkflow.md
@@ -5,10 +5,10 @@ Development Workflow
 
 The repository contains several packages and apps:
  - `nativescript-core` - The core NativeScript TypeScript modules used to develop NativeScript apps. Produces `@nativescript/core` npm package
- - `tns-core-modules-package` - Base for generating the `tns-core-modules` package (compatibility package for projects that still improt code from `tns-core-modules`).
+ - `tns-core-modules-package` - Base for generating the `tns-core-modules` package (compatibility package for projects that still import code from `tns-core-modules`).
  - `tns-core-modules-widgets` - The native widgets (Java and Objective-C) used by the core NativeScript modules. Produces `tns-core-modules-widgets` npm package
  - `tns-platform-declarations` - TypeScript definitions for Android and iOS native APIs. Produces `tns-platform-declarations` npm package
- - `tests` - Unit tests app for the `@nativescript/core`. These test are executed as nativescript application on mobile device or emulator.
+ - `tests` - Unit tests app for the `@nativescript/core` package. These test are executed as nativescript application on mobile device or emulator.
  - `unit-test` - Node unit tests. These test validate parts of the framework that do not require the nativescript runtime and so can be executed in node environment 
  - `e2e` - applications and *e2e* tests
  - `e2e/ui-tests-app` - UI app used for manual testing and automation
diff --git a/nativescript-core/http/http-request/http-request.android.ts b/nativescript-core/http/http-request/http-request.android.ts
@@ -120,7 +120,7 @@ function onRequestComplete(requestId: number, result: org.nativescript.widgets.A
 
                 return new Promise<any>((resolveImage, rejectImage) => {
                     if (result.responseAsImage != null) {
-                        resolveImage(new imageSourceModule.ImageSource(result.responseAsImage));
+                        resolveImage(new imageSource.ImageSource(result.responseAsImage));
                     }
                     else {
                         rejectImage(new Error("Response content may not be converted to an Image"));
diff --git a/nativescript-core/index.d.ts b/nativescript-core/index.d.ts
@@ -61,7 +61,8 @@ export declare const Http: {
     request: typeof request;
 };
 export { ImageAsset, ImageAssetOptions } from "./image-asset";
-export { isAndroid, isIOS, screen } from "./platform";
+export { ImageSource } from "./image-source";
+export { isAndroid, isIOS, screen as Screen, device as Device } from "./platform";
 export { InstrumentationMode, TimerInfo } from "./profiling";
 import { enable as profilingEnable, disable as profilingDisable, time, uptime, start, stop, isRunning, dumpProfiles, resetProfiles, profile, startCPUProfile, stopCPUProfile } from "./profiling";
 export declare const Profiling: {
@@ -97,7 +98,7 @@ export declare const Trace: {
     isEnabled: typeof isEnabled;
 };
 export * from "./ui";
-import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject, mergeSort, getModuleName, openFile, openUrl, layout, ad as androidUtils, ios as iosUtils } from "./utils/utils";
+import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject, getModuleName, openFile, openUrl, layout, ad as androidUtils, ios as iosUtils } from "./utils/utils";
 export declare const Utils: {
     GC: typeof GC;
     isFontIconURI: typeof isFontIconURI;
@@ -108,7 +109,6 @@ export declare const Utils: {
     isMainThread: typeof isMainThread;
     dispatchToMainThread: typeof dispatchToMainThread;
     releaseNativeObject: typeof releaseNativeObject;
-    mergeSort: typeof mergeSort;
     getModuleName: typeof getModuleName;
     openFile: typeof openFile;
     openUrl: typeof openUrl;
diff --git a/nativescript-core/index.ts b/nativescript-core/index.ts
@@ -52,7 +52,7 @@ export const Http = { getFile, getImage, getJSON, getString: httpGetString, requ
 export { ImageAsset, ImageAssetOptions } from "./image-asset";
 
 export { ImageSource } from "./image-source";
-export { isAndroid, isIOS, screen } from "./platform";
+export { isAndroid, isIOS, screen as Screen, device as Device } from "./platform";
 
 // Export interfaces from "profiling" module
 export { InstrumentationMode, TimerInfo } from "./profiling";
@@ -95,7 +95,7 @@ export * from "./ui"; // Barrel export
 import {
     GC, isFontIconURI, isDataURI, isFileOrResourcePath,
     executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject,
-    mergeSort, getModuleName,
+    getModuleName,
     openFile, openUrl,
     layout, ad as androidUtils, ios as iosUtils
 } from "./utils/utils";
@@ -104,10 +104,10 @@ export const Utils = {
     GC, isFontIconURI, isDataURI, isFileOrResourcePath,
     executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject,
 
-    mergeSort, getModuleName,
+    getModuleName,
     openFile, openUrl,
 
     layout, android: androidUtils, ios: iosUtils
 };
 
-export { XmlParser, ParserEventType, ParserEvent } from "./xml";
+export { XmlParser, ParserEventType, ParserEvent } from "./xml";

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ function onRequestComplete(requestId: number, result: org.nativescript.widgets.A`
`120`	`120`
`121`	`121`	`return new Promise<any>((resolveImage, rejectImage) => {`
`122`	`122`	`if (result.responseAsImage != null) {`
`123`		`- resolveImage(new imageSourceModule.ImageSource(result.responseAsImage));`
	`123`	`+ resolveImage(new imageSource.ImageSource(result.responseAsImage));`
`124`	`124`	`}`
`125`	`125`	`else {`
`126`	`126`	`rejectImage(new Error("Response content may not be converted to an Image"));`