nativescript 9.1.0-alpha.15 → 9.1.0-alpha.17

package/lib/tools/node-modules/node-modules-dependencies-builder.js

@@ -56,18 +56,14 @@ class NodeModulesDependenciesBuilder {
             let modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
                 paths: [parentModulesPath],
             });
-            // perhaps traverse up the tree here?
             if (!modulePath) {
-                // fallback to searching in the root path
                 modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
                     paths: [rootPath],
                 });
             }
-            // if we failed to find the module...
             if (!modulePath) {
                 return null;
             }
-            // if we already resolved this dependency, we return null to avoid a duplicate resolution
             if (resolvedDependencies.some((r) => {
                 return r.name === depDescription.name && r.directory === modulePath;
             })) {
@@ -92,7 +88,6 @@ class NodeModulesDependenciesBuilder {
             const packageJsonContents = this.$fs.readJson(packageJsonPath);
             dependency.version = packageJsonContents.version;
             if (!!packageJsonContents.nativescript) {
-                // add `nativescript` property, necessary for resolving plugins
                 dependency.nativescript = packageJsonContents.nativescript;
             }
             dependency.dependencies = _.keys(packageJsonContents.dependencies);
@@ -103,4 +98,3 @@ class NodeModulesDependenciesBuilder {
 }
 exports.NodeModulesDependenciesBuilder = NodeModulesDependenciesBuilder;
 yok_1.injector.register("nodeModulesDependenciesBuilder", NodeModulesDependenciesBuilder);
-//# sourceMappingURL=node-modules-dependencies-builder.js.map

package/lib/tools/plist-merge/plist-session.d.ts

@@ -0,0 +1,30 @@
+export interface Reporter {
+    log?(msg: string): void;
+    warn?(msg: string): void;
+}
+export interface Patch {
+    name: string;
+    read(): string;
+}
+export interface ICFBundleURLType {
+    CFBundleTypeRole: string;
+    CFBundleURLSchemes: string[];
+}
+export declare class PlistMerger {
+    private reporter?;
+    constructor(reporter?: Reporter);
+    merge(base: any, patch: any): any;
+    private mergeCFBundleURLTypes;
+    private mergeLSApplicationQueriesSchemes;
+    private customizer;
+    private warn;
+}
+export declare class PlistSession {
+    private reporter?;
+    private patches;
+    constructor(reporter?: Reporter);
+    get hasPatches(): boolean;
+    patch(patch: Patch): void;
+    build(): string;
+    private log;
+}

package/lib/tools/plist-merge/plist-session.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlistSession = exports.PlistMerger = void 0;
+const plist = require("plist");
+const _ = require("lodash");
+const CF_BUNDLE_URL_TYPES = "CFBundleURLTypes";
+const LS_APPLICATION_QUERIES_SCHEMES = "LSApplicationQueriesSchemes";
+class PlistMerger {
+    constructor(reporter) {
+        this.reporter = reporter;
+    }
+    merge(base, patch) {
+        const baseClone = _.cloneDeep(base);
+        _.mergeWith(baseClone, patch, this.customizer.bind(this));
+        return baseClone;
+    }
+    mergeCFBundleURLTypes(baseValue, patchValue) {
+        for (const patchElement of patchValue) {
+            let shouldAddToBase = true;
+            for (const baseElement of baseValue) {
+                if (!patchElement.CFBundleTypeRole || !baseElement.CFBundleTypeRole) {
+                    this.warn(`Merging ${CF_BUNDLE_URL_TYPES}: Property CFBundleTypeRole is required!`);
+                }
+                if (patchElement.CFBundleTypeRole === baseElement.CFBundleTypeRole) {
+                    baseElement.CFBundleURLSchemes =
+                        baseElement.CFBundleURLSchemes.concat(patchElement.CFBundleURLSchemes);
+                    shouldAddToBase = false;
+                }
+            }
+            if (shouldAddToBase) {
+                baseValue.push(patchElement);
+            }
+        }
+        return baseValue;
+    }
+    mergeLSApplicationQueriesSchemes(baseValue, patchValue) {
+        for (const patchElement of patchValue) {
+            if (!baseValue.some((x) => x === patchElement)) {
+                baseValue.push(patchElement);
+            }
+        }
+        return baseValue;
+    }
+    customizer(baseValue, patchValue, key) {
+        if (key === CF_BUNDLE_URL_TYPES && !!baseValue) {
+            return this.mergeCFBundleURLTypes(baseValue, patchValue);
+        }
+        else if (key === LS_APPLICATION_QUERIES_SCHEMES && !!baseValue) {
+            return this.mergeLSApplicationQueriesSchemes(baseValue, patchValue);
+        }
+        if (_.isArray(baseValue)) {
+            return patchValue;
+        }
+    }
+    warn(msg) {
+        if (this.reporter && this.reporter.warn) {
+            this.reporter.warn(msg);
+        }
+    }
+}
+exports.PlistMerger = PlistMerger;
+class PlistSession {
+    constructor(reporter) {
+        this.reporter = reporter;
+        this.patches = [];
+    }
+    get hasPatches() {
+        return this.patches.length > 0;
+    }
+    patch(patch) {
+        this.patches.push(patch);
+    }
+    build() {
+        this.log(`Start`);
+        const plistMerger = new PlistMerger(this.reporter);
+        let jsonPlist = {};
+        for (const patch of this.patches) {
+            this.log(`Patch '${patch.name}'`);
+            const patchJson = plist.parse(patch.read());
+            jsonPlist = plistMerger.merge(jsonPlist, patchJson);
+        }
+        const resultString = plist.build(jsonPlist);
+        this.log(`Complete`);
+        return resultString;
+    }
+    log(msg) {
+        if (this.reporter && this.reporter.log) {
+            this.reporter.log(msg);
+        }
+    }
+}
+exports.PlistSession = PlistSession;

package/lib/yarn-package-manager.d.ts

@@ -0,0 +1,16 @@
+import { BasePackageManager } from "./base-package-manager";
+import { INodePackageManagerInstallOptions, INpmInstallResultInfo, INpmsResult } from "./declarations";
+import { IChildProcess, IErrors, IFileSystem, IHostInfo, Server, IDictionary } from "./common/declarations";
+export declare class YarnPackageManager extends BasePackageManager {
+    private $errors;
+    private $httpClient;
+    private $logger;
+    constructor($childProcess: IChildProcess, $errors: IErrors, $fs: IFileSystem, $hostInfo: IHostInfo, $httpClient: Server.IHttpClient, $logger: ILogger, $pacoteService: IPacoteService);
+    install(packageName: string, pathToSave: string, config: INodePackageManagerInstallOptions): Promise<INpmInstallResultInfo>;
+    uninstall(packageName: string, config?: IDictionary<string | boolean>, cwd?: string): Promise<string>;
+    view(packageName: string, config: Object): Promise<any>;
+    search(filter: string[], config: IDictionary<string | boolean>): Promise<string>;
+    searchNpms(keyword: string): Promise<INpmsResult>;
+    getRegistryPackageData(packageName: string): Promise<any>;
+    getCachePath(): Promise<string>;
+}

package/lib/yarn-package-manager.js

@@ -113,4 +113,3 @@ __decorate([
     (0, decorators_1.exported)("yarn")
 ], YarnPackageManager.prototype, "getCachePath", null);
 yok_1.injector.register("yarn", YarnPackageManager);
-//# sourceMappingURL=yarn-package-manager.js.map

package/lib/yarn2-package-manager.d.ts

@@ -0,0 +1,18 @@
+import { BasePackageManager } from "./base-package-manager";
+import { INodePackageManagerInstallOptions, INpmInstallResultInfo, INpmsResult } from "./declarations";
+import { IChildProcess, IErrors, IFileSystem, IHostInfo, Server, IDictionary } from "./common/declarations";
+export declare class Yarn2PackageManager extends BasePackageManager {
+    private $errors;
+    private $httpClient;
+    private $logger;
+    private $hostInfo_;
+    constructor($childProcess: IChildProcess, $errors: IErrors, $fs: IFileSystem, $hostInfo: IHostInfo, $httpClient: Server.IHttpClient, $logger: ILogger, $pacoteService: IPacoteService);
+    protected getPackageManagerExecutableName(): string;
+    install(packageName: string, pathToSave: string, config: INodePackageManagerInstallOptions): Promise<INpmInstallResultInfo>;
+    uninstall(packageName: string, config?: IDictionary<string | boolean>, cwd?: string): Promise<string>;
+    view(packageName: string, config: Object): Promise<any>;
+    search(filter: string[], config: IDictionary<string | boolean>): Promise<string>;
+    searchNpms(keyword: string): Promise<INpmsResult>;
+    getRegistryPackageData(packageName: string): Promise<any>;
+    getCachePath(): Promise<string>;
+}

package/lib/yarn2-package-manager.js

@@ -36,8 +36,6 @@ class Yarn2PackageManager extends base_package_manager_1.BasePackageManager {
         }
         const packageJsonPath = path.join(pathToSave, "package.json");
         const jsonContentBefore = this.$fs.readJson(packageJsonPath);
-        // remove unsupported flags
-        // todo: refactor all package managers to map typed flags to the actual flags
         const cleanedConfig = _.omit(config, ["save-dev", "save-exact"]);
         const flags = this.getFlagsString(cleanedConfig, true);
         let params = [];
@@ -124,4 +122,3 @@ __decorate([
     (0, decorators_1.exported)("yarn2")
 ], Yarn2PackageManager.prototype, "getCachePath", null);
 yok_1.injector.register("yarn2", Yarn2PackageManager);
-//# sourceMappingURL=yarn2-package-manager.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.1.0-alpha.15",
+  "version": "9.1.0-alpha.17",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -10,39 +10,9 @@
     "nsc": "./bin/tns",
     "ns": "./bin/tns"
   },
-  "files": [
-    "bin/*",
-    "config",
-    "docs",
-    "!docs/html",
-    "lib",
-    "!lib/**/*.ts",
-    "lib/**/*.d.ts",
-    "!lib/**/*.js.map",
-    "!lib/common/test",
-    "!lib/common/docs/fonts",
-    "resources",
-    "setup",
-    "vendor",
-    "postinstall.js",
-    "preuninstall.js"
-  ],
   "scripts": {
-    "clean": "npx rimraf node_modules package-lock.json && npm run setup",
-    "build": "grunt",
-    "build.all": "grunt test",
-    "dev": "tsc --watch",
-    "setup": "npm i --ignore-scripts && npx husky",
-    "test": "npm run tsc && mocha --config=test/.mocharc.yml",
     "postinstall": "node postinstall.js",
-    "preuninstall": "node preuninstall.js",
-    "prepack": "grunt prepare",
-    "postpack": "grunt set_dev_ga_id",
-    "mocha": "mocha",
-    "tsc": "tsc",
-    "test-watch": "node ./dev/tsc-to-mocha-watch.js",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "prettier": "prettier --write ./lib/**/*{.ts,.d.ts} ./test/**/*{.ts,.d.ts}"
+    "preuninstall": "node preuninstall.js"
   },
   "repository": {
     "type": "git",
@@ -58,7 +28,6 @@
     "@nativescript/doctor": "2.0.17",
     "@nativescript/hook": "3.0.5",
     "@npmcli/arborist": "9.1.8",
-    "@nstudio/trapezedev-project": "7.2.4",
     "@rigor789/resolve-package-path": "1.0.7",
     "axios": "1.18.1",
     "byline": "5.0.0",
@@ -68,17 +37,16 @@
     "convert-source-map": "2.0.0",
     "detect-newline": "3.1.0",
     "email-validator": "2.0.4",
-    "esprima": "4.0.1",
     "font-finder": "1.1.0",
     "ios-device-lib": "0.9.5",
     "ios-mobileprovision-finder": "1.2.1",
     "ios-sim-portable": "4.5.1",
-    "jimp": "1.6.0",
-    "lodash": "4.17.23",
+    "jimp": "1.6.1",
+    "lodash": "4.18.1",
     "log4js": "6.9.1",
     "marked": "15.0.12",
     "marked-terminal": "7.3.0",
-    "minimatch": "10.2.4",
+    "minimatch": "10.2.6",
     "mkdirp": "3.0.1",
     "mute-stream": "2.0.0",
     "nativescript-dev-xcode": "0.8.2",
@@ -87,8 +55,7 @@
     "pacote": "21.0.4",
     "pbxproj-dom": "1.2.0",
     "plist": "3.1.0",
-    "plist-merge-patch": "0.2.0",
-    "prettier": "3.7.3",
+    "prettier": "3.9.6",
     "prompts": "2.4.2",
     "proper-lockfile": "4.1.2",
     "proxy-lib": "0.4.1",
@@ -98,98 +65,24 @@
     "shelljs": "0.10.0",
     "simple-git": "3.36.0",
     "simple-plist": "1.4.0",
-    "source-map": "0.7.6",
-    "tar": "7.5.9",
-    "ts-morph": "25.0.1",
+    "source-map": "0.8.0",
+    "tar": "7.5.22",
+    "ts-morph": "28.0.0",
     "tunnel": "0.0.6",
     "typescript": "5.7.3",
-    "universal-analytics": "0.5.3",
-    "uuid": "11.1.0",
+    "uuid": "11.1.1",
     "winreg": "1.2.5",
-    "ws": "8.18.3",
+    "ws": "8.21.1",
     "xml2js": "0.6.2",
     "yargs": "17.7.2",
     "yazl": "^3.3.1"
   },
-  "devDependencies": {
-    "@types/byline": "^4.2.36",
-    "@types/chai": "5.2.2",
-    "@types/chai-as-promised": "8.0.2",
-    "@types/color": "4.2.0",
-    "@types/convert-source-map": "2.0.3",
-    "@types/lodash": "4.17.23",
-    "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.0.0",
-    "@types/npmcli__arborist": "^6.3.0",
-    "@types/pacote": "^11.1.8",
-    "@types/plist": "^3.0.5",
-    "@types/prompts": "2.4.9",
-    "@types/proper-lockfile": "4.1.4",
-    "@types/qr-image": "3.2.9",
-    "@types/retry": "0.12.5",
-    "@types/semver": "7.7.1",
-    "@types/shelljs": "^0.8.11",
-    "@types/sinon": "^17.0.3",
-    "@types/tabtab": "^3.0.2",
-    "@types/tar": "6.1.13",
-    "@types/tunnel": "0.0.7",
-    "@types/universal-analytics": "0.4.8",
-    "@types/uuid": "^10.0.0",
-    "@types/ws": "8.18.1",
-    "@types/xml2js": "0.4.14",
-    "@types/yargs": "17.0.33",
-    "@types/yazl": "^3.3.0",
-    "braces": ">=3.0.3",
-    "chai": "5.3.3",
-    "chai-as-promised": "8.0.2",
-    "conventional-changelog-cli": "^5.0.0",
-    "fast-check": "3.23.2",
-    "grunt": "1.6.1",
-    "grunt-contrib-clean": "2.0.1",
-    "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-watch": "1.1.0",
-    "grunt-shell": "4.0.0",
-    "grunt-template": "1.0.0",
-    "grunt-ts": "6.0.0-beta.22",
-    "husky": "9.1.7",
-    "istanbul": "0.4.5",
-    "lint-staged": "~15.5.2",
-    "mocha": "11.7.5",
-    "sinon": "19.0.5",
-    "source-map-support": "0.5.21",
-    "xml2js": ">=0.5.0"
-  },
   "optionalDependencies": {
     "fsevents": "*"
   },
-  "bundleDependencies": [
-    "universal-analytics"
-  ],
-  "overrides": {
-    "@conventional-changelog/git-client": "2.5.1",
-    "uuid": "11.1.0",
-    "jimp": {
-      "xml2js": "0.6.2"
-    },
-    "npm-watch": {
-      "nodemon": "3.0.3"
-    },
-    "grunt": {
-      "minimatch": "3.1.5"
-    },
-    "globule": {
-      "minimatch": "3.1.5"
-    },
-    "replace": {
-      "minimatch": "3.1.5"
-    }
-  },
   "analyze": true,
   "license": "Apache-2.0",
   "engines": {
     "node": ">=20.0.0"
-  },
-  "lint-staged": {
-    "*.ts": "prettier --write"
   }
 }

package/postinstall.js

@@ -2,9 +2,14 @@
 
 var child_process = require("child_process");
 var path = require("path");
-var constants = require(path.join(__dirname, "lib", "constants"));
+var fs = require("fs");
+// In the published package dist/ is the root; in a source checkout the compiled
+// output lives under dist/ while lib/ holds only TypeScript.
+var distLib = path.join(__dirname, "dist", "lib");
+var pathToLib = fs.existsSync(distLib) ? distLib : path.join(__dirname, "lib");
+var constants = require(path.join(pathToLib, "constants"));
 var commandArgs = [path.join(__dirname, "bin", "tns"), constants.POST_INSTALL_COMMAND_NAME];
-var helpers = require(path.join(__dirname, "lib", "common", "helpers"));
+var helpers = require(path.join(pathToLib, "common", "helpers"));
 if (helpers.isInstallingNativeScriptGlobally()) {
 	child_process.spawn(process.argv[0], commandArgs, { stdio: "inherit" });
 }