nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/common/file-system.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var FileSystem_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSystem = void 0;
@@ -27,78 +18,73 @@ const shelljs = require("shelljs");
 const helpers_1 = require("./helpers");
 const constants_1 = require("../constants");
 const os_1 = require("os");
-const detectNewline = require("detect-newline");
+const detect_newline_1 = require("detect-newline");
 const archiver_1 = require("archiver");
-const stringifyPackage = require("stringify-package");
 // TODO: Add .d.ts for mkdirp module (or use it from @types repo).
 const mkdirp = require("mkdirp");
 let FileSystem = FileSystem_1 = class FileSystem {
     constructor($injector) {
         this.$injector = $injector;
     }
-    zipFiles(zipFile, files, zipPathCallback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            //we are resolving it here instead of in the constructor, because config has dependency on file system and config shouldn't require logger
-            const $logger = this.$injector.resolve("logger");
-            const zip = (0, archiver_1.create)("zip", {
-                zlib: {
-                    level: 9,
-                },
-            });
-            const outFile = fs.createWriteStream(zipFile);
-            zip.pipe(outFile);
-            return new Promise((resolve, reject) => {
-                outFile.on("error", (err) => reject(err));
-                outFile.on("close", () => {
-                    $logger.trace("zip: %d bytes written", zip.pointer());
-                    resolve();
-                });
-                for (const file of files) {
-                    let relativePath = zipPathCallback(file);
-                    relativePath = relativePath.replace(/\\/g, "/");
-                    $logger.trace("zipping as '%s' file '%s'", relativePath, file);
-                    zip.append(fs.createReadStream(file), { name: relativePath });
-                }
-                zip.finalize();
+    async zipFiles(zipFile, files, zipPathCallback) {
+        //we are resolving it here instead of in the constructor, because config has dependency on file system and config shouldn't require logger
+        const $logger = this.$injector.resolve("logger");
+        const zip = (0, archiver_1.create)("zip", {
+            zlib: {
+                level: 9,
+            },
+        });
+        const outFile = fs.createWriteStream(zipFile);
+        zip.pipe(outFile);
+        return new Promise((resolve, reject) => {
+            outFile.on("error", (err) => reject(err));
+            outFile.on("close", () => {
+                $logger.trace("zip: %d bytes written", zip.pointer());
+                resolve();
             });
+            for (const file of files) {
+                let relativePath = zipPathCallback(file);
+                relativePath = relativePath.replace(/\\/g, "/");
+                $logger.trace("zipping as '%s' file '%s'", relativePath, file);
+                zip.append(fs.createReadStream(file), { name: relativePath });
+            }
+            zip.finalize();
         });
     }
     utimes(path, atime, mtime) {
         return fs.utimesSync(path, atime, mtime);
     }
-    unzip(zipFile, destinationDir, options, fileFilters) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const shouldOverwriteFiles = !(options && options.overwriteExisitingFiles === false);
-            const isCaseSensitive = !(options && options.caseSensitive === false);
-            const $hostInfo = this.$injector.resolve("$hostInfo");
-            this.createDirectory(destinationDir);
-            let proc;
-            if ($hostInfo.isWindows) {
-                proc = (0, path_1.join)(__dirname, "resources/platform-tools/unzip/win32/unzip");
-            }
-            else if ($hostInfo.isDarwin) {
-                proc = "unzip"; // darwin unzip is info-zip
-            }
-            else if ($hostInfo.isLinux) {
-                proc = "unzip"; // linux unzip is info-zip
-            }
-            if (!isCaseSensitive) {
-                zipFile = this.findFileCaseInsensitive(zipFile);
-            }
-            const args = _.flatten([
-                "-b",
-                shouldOverwriteFiles ? "-o" : "-n",
-                isCaseSensitive ? [] : "-C",
-                zipFile,
-                fileFilters || [],
-                "-d",
-                destinationDir,
-            ]);
-            const $childProcess = this.$injector.resolve("childProcess");
-            yield $childProcess.spawnFromEvent(proc, args, "close", {
-                stdio: "ignore",
-                detached: true,
-            });
+    async unzip(zipFile, destinationDir, options, fileFilters) {
+        const shouldOverwriteFiles = !(options && options.overwriteExisitingFiles === false);
+        const isCaseSensitive = !(options && options.caseSensitive === false);
+        const $hostInfo = this.$injector.resolve("$hostInfo");
+        this.createDirectory(destinationDir);
+        let proc;
+        if ($hostInfo.isWindows) {
+            proc = (0, path_1.join)(__dirname, "resources/platform-tools/unzip/win32/unzip");
+        }
+        else if ($hostInfo.isDarwin) {
+            proc = "unzip"; // darwin unzip is info-zip
+        }
+        else if ($hostInfo.isLinux) {
+            proc = "unzip"; // linux unzip is info-zip
+        }
+        if (!isCaseSensitive) {
+            zipFile = this.findFileCaseInsensitive(zipFile);
+        }
+        const args = _.flatten([
+            "-b",
+            shouldOverwriteFiles ? "-o" : "-n",
+            isCaseSensitive ? [] : "-C",
+            zipFile,
+            fileFilters || [],
+            "-d",
+            destinationDir,
+        ]);
+        const $childProcess = this.$injector.resolve("childProcess");
+        await $childProcess.spawnFromEvent(proc, args, "close", {
+            stdio: "ignore",
+            detached: true,
         });
     }
     findFileCaseInsensitive(file) {
@@ -172,28 +158,26 @@ let FileSystem = FileSystem_1 = class FileSystem {
             return 0;
         }
     }
-    futureFromEvent(eventEmitter, event) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                eventEmitter.once(event, function () {
-                    const args = _.toArray(arguments);
-                    if (event === "error") {
-                        const err = args[0];
-                        reject(err);
-                        return;
-                    }
-                    switch (args.length) {
-                        case 0:
-                            resolve(undefined);
-                            break;
-                        case 1:
-                            resolve(args[0]);
-                            break;
-                        default:
-                            resolve(args);
-                            break;
-                    }
-                });
+    async futureFromEvent(eventEmitter, event) {
+        return new Promise((resolve, reject) => {
+            eventEmitter.once(event, function () {
+                const args = _.toArray(arguments);
+                if (event === "error") {
+                    const err = args[0];
+                    reject(err);
+                    return;
+                }
+                switch (args.length) {
+                    case 0:
+                        resolve(undefined);
+                        break;
+                    case 1:
+                        resolve(args[0]);
+                        break;
+                    default:
+                        resolve(args);
+                        break;
+                }
             });
         });
     }
@@ -254,9 +238,9 @@ let FileSystem = FileSystem_1 = class FileSystem {
             let newline = os_1.EOL;
             if (fs.existsSync(filename)) {
                 const existingFile = this.readText(filename);
-                newline = detectNewline(existingFile);
+                newline = (0, detect_newline_1.detectNewline)(existingFile);
             }
-            stringifiedData = stringifyPackage(data, space, newline);
+            stringifiedData = JSON.stringify(data, null, space).concat(newline);
         }
         else {
             stringifiedData = JSON.stringify(data, null, space);
@@ -336,18 +320,16 @@ let FileSystem = FileSystem_1 = class FileSystem {
     symlink(sourcePath, destinationPath, type) {
         fs.symlinkSync(sourcePath, destinationPath, type);
     }
-    setCurrentUserAsOwner(path, owner) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const $childProcess = this.$injector.resolve("childProcess");
-            if (!this.$injector.resolve("$hostInfo").isWindows) {
-                const chown = $childProcess.spawn("chown", ["-R", owner, path], {
-                    stdio: "ignore",
-                    detached: true,
-                });
-                yield this.futureFromEvent(chown, "close");
-            }
-            // nothing to do on Windows, as chown does not work on this platform
-        });
+    async setCurrentUserAsOwner(path, owner) {
+        const $childProcess = this.$injector.resolve("childProcess");
+        if (!this.$injector.resolve("$hostInfo").isWindows) {
+            const chown = $childProcess.spawn("chown", ["-R", owner, path], {
+                stdio: "ignore",
+                detached: true,
+            });
+            await this.futureFromEvent(chown, "close");
+        }
+        // nothing to do on Windows, as chown does not work on this platform
     }
     // filterCallback: function(path: String, stat: fs.Stats): Boolean
     enumerateFilesInDirectorySync(directoryPath, filterCallback, opts, foundFiles) {
@@ -384,35 +366,31 @@ let FileSystem = FileSystem_1 = class FileSystem {
         }
         return foundFiles;
     }
-    getFileShasum(fileName, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const algorithm = (options && options.algorithm) || "sha1";
-                const encoding = (options && options.encoding) || "hex";
-                const logger = this.$injector.resolve("$logger");
-                const shasumData = crypto.createHash(algorithm);
-                const fileStream = this.createReadStream(fileName);
-                fileStream.on("data", (data) => {
-                    shasumData.update(data);
-                });
-                fileStream.on("end", () => {
-                    const shasum = shasumData.digest(encoding);
-                    logger.trace(`Shasum of file ${fileName} is ${shasum}`);
-                    resolve(shasum);
-                });
-                fileStream.on("error", (err) => {
-                    reject(err);
-                });
+    async getFileShasum(fileName, options) {
+        return new Promise((resolve, reject) => {
+            const algorithm = (options && options.algorithm) || "sha1";
+            const encoding = (options && options.encoding) || "hex";
+            const logger = this.$injector.resolve("$logger");
+            const shasumData = crypto.createHash(algorithm);
+            const fileStream = this.createReadStream(fileName);
+            fileStream.on("data", (data) => {
+                shasumData.update(data);
+            });
+            fileStream.on("end", () => {
+                const shasum = shasumData.digest(encoding);
+                logger.trace(`Shasum of file ${fileName} is ${shasum}`);
+                resolve(shasum);
+            });
+            fileStream.on("error", (err) => {
+                reject(err);
             });
         });
     }
-    readStdin() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                let buffer = "";
-                process.stdin.on("data", (data) => (buffer += data));
-                process.stdin.on("end", () => resolve(buffer));
-            });
+    async readStdin() {
+        return new Promise((resolve, reject) => {
+            let buffer = "";
+            process.stdin.on("data", (data) => (buffer += data));
+            process.stdin.on("end", () => resolve(buffer));
         });
     }
     rm(options, ...files) {
@@ -443,10 +421,10 @@ let FileSystem = FileSystem_1 = class FileSystem {
             : FileSystem_1.DEFAULT_INDENTATION_CHARACTER;
     }
 };
+exports.FileSystem = FileSystem;
 FileSystem.DEFAULT_INDENTATION_CHARACTER = "\t";
 FileSystem.JSON_OBJECT_REGEXP = new RegExp(`{\\r*\\n*(\\W*)"`, "m");
-FileSystem = FileSystem_1 = __decorate([
+exports.FileSystem = FileSystem = FileSystem_1 = __decorate([
     injector.register("fs")
 ], FileSystem);
-exports.FileSystem = FileSystem;
 //# sourceMappingURL=file-system.js.map

package/lib/common/header.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printHeader = void 0;
+exports.printHeader = printHeader;
 const color_1 = require("../color");
 const yok_1 = require("./yok");
 function printHeader() {
@@ -29,5 +29,4 @@ function printHeader() {
     console.info("  " + tagLine + " ".repeat(width - tagLineLength) + color_1.color.dim("│"));
     console.info("  " + color_1.color.dim("└" + "─".repeat(width - 1) + "┘"));
 }
-exports.printHeader = printHeader;
 //# sourceMappingURL=header.js.map