@akylas/nativescript-cli 8.8.2 → 8.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/android-tools-info.js +9 -20
- package/lib/base-package-manager.js +47 -64
- package/lib/bun-package-manager.js +65 -88
- package/lib/color.js +2 -2
- package/lib/commands/add-platform.js +14 -30
- package/lib/commands/apple-login.js +18 -29
- package/lib/commands/appstore-list.js +34 -45
- package/lib/commands/appstore-upload.js +55 -68
- package/lib/commands/build.js +57 -86
- package/lib/commands/clean.js +161 -176
- package/lib/commands/command-base.js +14 -27
- package/lib/commands/config.js +51 -70
- package/lib/commands/create-project.js +210 -229
- package/lib/commands/debug.js +66 -88
- package/lib/commands/deploy.js +28 -44
- package/lib/commands/embedding/embed.js +33 -52
- package/lib/commands/extensibility/install-extension.js +5 -16
- package/lib/commands/extensibility/list-extensions.js +13 -24
- package/lib/commands/extensibility/uninstall-extension.js +4 -15
- package/lib/commands/fonts.js +30 -41
- package/lib/commands/generate-assets.js +13 -28
- package/lib/commands/generate-help.js +2 -13
- package/lib/commands/generate.js +17 -26
- package/lib/commands/info.js +2 -13
- package/lib/commands/install.js +34 -49
- package/lib/commands/list-platforms.js +14 -25
- package/lib/commands/migrate.js +15 -26
- package/lib/commands/native-add.js +23 -46
- package/lib/commands/platform-clean.js +19 -32
- package/lib/commands/plugin/add-plugin.js +12 -25
- package/lib/commands/plugin/build-plugin.js +34 -39
- package/lib/commands/plugin/create-plugin.js +110 -133
- package/lib/commands/plugin/list-plugins.js +22 -33
- package/lib/commands/plugin/remove-plugin.js +20 -33
- package/lib/commands/plugin/update-plugin.js +20 -33
- package/lib/commands/post-install.js +20 -33
- package/lib/commands/prepare.js +19 -35
- package/lib/commands/preview.js +49 -62
- package/lib/commands/remove-platform.js +7 -18
- package/lib/commands/resources/resources-update.js +13 -26
- package/lib/commands/run.js +55 -76
- package/lib/commands/start.js +6 -19
- package/lib/commands/test-init.js +123 -134
- package/lib/commands/test.js +66 -89
- package/lib/commands/typings.js +126 -142
- package/lib/commands/update-platform.js +22 -35
- package/lib/commands/update.js +30 -43
- package/lib/common/child-process.js +53 -72
- package/lib/common/codeGeneration/code-entity.js +1 -1
- package/lib/common/codeGeneration/code-printer.js +1 -1
- package/lib/common/command-params.js +7 -18
- package/lib/common/commands/analytics.js +27 -40
- package/lib/common/commands/autocompletion.js +39 -56
- package/lib/common/commands/device/device-log-stream.js +12 -23
- package/lib/common/commands/device/get-file.js +22 -33
- package/lib/common/commands/device/list-applications.js +12 -23
- package/lib/common/commands/device/list-devices.js +72 -87
- package/lib/common/commands/device/list-files.js +23 -34
- package/lib/common/commands/device/put-file.js +22 -33
- package/lib/common/commands/device/run-application.js +12 -25
- package/lib/common/commands/device/stop-application.js +11 -22
- package/lib/common/commands/device/uninstall-application.js +6 -17
- package/lib/common/commands/generate-messages.js +17 -28
- package/lib/common/commands/help.js +20 -33
- package/lib/common/commands/package-manager-get.js +6 -17
- package/lib/common/commands/package-manager-set.js +9 -20
- package/lib/common/commands/post-install.js +2 -13
- package/lib/common/commands/preuninstall.js +23 -38
- package/lib/common/commands/proxy/proxy-base.js +8 -19
- package/lib/common/commands/proxy/proxy-clear.js +4 -15
- package/lib/common/commands/proxy/proxy-get.js +3 -14
- package/lib/common/commands/proxy/proxy-set.js +87 -100
- package/lib/common/constants.js +11 -11
- package/lib/common/decorators.js +10 -22
- package/lib/common/dispatchers.js +79 -96
- package/lib/common/errors.js +89 -104
- package/lib/common/file-system.js +106 -127
- package/lib/common/header.js +1 -2
- package/lib/common/helpers.js +149 -178
- package/lib/common/host-info.js +37 -50
- package/lib/common/http-client.js +93 -108
- package/lib/common/logger/appenders/cli-appender.js +1 -2
- package/lib/common/logger/appenders/emit-appender.js +1 -2
- package/lib/common/logger/layouts/cli-layout.js +1 -2
- package/lib/common/logger/logger.js +1 -1
- package/lib/common/mobile/android/android-application-manager.js +121 -142
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -1
- package/lib/common/mobile/android/android-debug-bridge.js +87 -112
- package/lib/common/mobile/android/android-device-file-system.js +98 -131
- package/lib/common/mobile/android/android-device-hash-service.js +50 -75
- package/lib/common/mobile/android/android-device.js +74 -91
- package/lib/common/mobile/android/android-emulator-services.js +105 -130
- package/lib/common/mobile/android/android-log-filter.js +1 -1
- package/lib/common/mobile/android/android-virtual-device-service.js +76 -97
- package/lib/common/mobile/android/device-android-debug-bridge.js +13 -29
- package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -118
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -81
- package/lib/common/mobile/android/logcat-helper.js +108 -127
- package/lib/common/mobile/application-manager-base.js +84 -107
- package/lib/common/mobile/device-log-provider-base.js +7 -18
- package/lib/common/mobile/ios/device/ios-application-manager.js +79 -108
- package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -105
- package/lib/common/mobile/ios/device/ios-device-operations.js +105 -142
- package/lib/common/mobile/ios/device/ios-device.js +20 -36
- package/lib/common/mobile/ios/ios-device-base.js +58 -81
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +63 -92
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -89
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -43
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -62
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -35
- package/lib/common/mobile/mobile-core/android-device-discovery.js +43 -62
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -32
- package/lib/common/mobile/mobile-core/android-process-service.js +143 -182
- package/lib/common/mobile/mobile-core/device-discovery.js +2 -13
- package/lib/common/mobile/mobile-core/devices-service.js +385 -436
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -35
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -62
- package/lib/common/mobile/mobile-helper.js +15 -26
- package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -52
- package/lib/common/opener.js +2 -2
- package/lib/common/plist-parser.js +2 -2
- package/lib/common/prompter.js +90 -105
- package/lib/common/queue.js +9 -20
- package/lib/common/services/auto-completion-service.js +39 -52
- package/lib/common/services/cancellation.js +17 -28
- package/lib/common/services/commands-service.js +146 -169
- package/lib/common/services/help-service.js +132 -157
- package/lib/common/services/hooks-service.js +93 -108
- package/lib/common/services/ios-notification-service.js +21 -34
- package/lib/common/services/json-file-settings-service.js +52 -71
- package/lib/common/services/lock-service.js +35 -52
- package/lib/common/services/message-contract-generator.js +35 -46
- package/lib/common/services/micro-templating-service.js +4 -15
- package/lib/common/services/net-service.js +90 -107
- package/lib/common/services/project-files-manager.js +10 -23
- package/lib/common/services/proxy-service.js +13 -24
- package/lib/common/services/qr.js +13 -24
- package/lib/common/services/settings-service.js +1 -1
- package/lib/common/services/xcode-select-service.js +20 -35
- package/lib/common/utils.js +2 -2
- package/lib/common/validators/project-name-validator.js +1 -1
- package/lib/common/validators/validation-result.js +1 -1
- package/lib/common/verify-node-version.js +2 -3
- package/lib/common/yok.js +23 -36
- package/lib/config.js +7 -58
- package/lib/constants.js +24 -24
- package/lib/controllers/build-controller.js +82 -99
- package/lib/controllers/debug-controller.js +107 -128
- package/lib/controllers/deploy-controller.js +17 -22
- package/lib/controllers/migrate-controller.js +722 -795
- package/lib/controllers/platform-controller.js +72 -87
- package/lib/controllers/prepare-controller.js +266 -299
- package/lib/controllers/run-controller.js +392 -406
- package/lib/controllers/update-controller-base.js +16 -29
- package/lib/controllers/update-controller.js +94 -119
- package/lib/data/prepare-data.js +4 -1
- package/lib/definitions/ios-debugger-port-service.d.ts +1 -1
- package/lib/definitions/livesync.d.ts +1 -1
- package/lib/detached-processes/cleanup-js-subprocess.js +3 -12
- package/lib/detached-processes/cleanup-process.js +16 -25
- package/lib/device-path-provider.js +23 -34
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -164
- package/lib/device-sockets/ios/notification.js +1 -1
- package/lib/device-sockets/ios/socket-request-executor.js +24 -39
- package/lib/helpers/android-bundle-validator-helper.js +1 -1
- package/lib/helpers/deploy-command-helper.js +45 -49
- package/lib/helpers/key-command-helper.js +4 -13
- package/lib/helpers/livesync-command-helper.js +137 -152
- package/lib/helpers/network-connectivity-validator.js +6 -17
- package/lib/helpers/options-track-helper.js +6 -17
- package/lib/helpers/platform-command-helper.js +99 -120
- package/lib/key-commands/index.js +161 -211
- package/lib/nativescript-cli.js +5 -14
- package/lib/node-package-manager.js +81 -104
- package/lib/options.js +3 -12
- package/lib/package-installation-manager.js +130 -165
- package/lib/package-manager.js +63 -86
- package/lib/platform-command-param.js +4 -15
- package/lib/pnpm-package-manager.js +59 -78
- package/lib/project-data.js +1 -1
- package/lib/providers/project-files-provider.js +1 -1
- package/lib/services/analytics/analytics-broker-process.js +13 -22
- package/lib/services/analytics/analytics-broker.js +17 -30
- package/lib/services/analytics/analytics-service.js +161 -198
- package/lib/services/analytics/google-analytics-provider.js +41 -56
- package/lib/services/analytics-settings-service.js +15 -32
- package/lib/services/android/android-bundle-tool-service.js +43 -60
- package/lib/services/android/gradle-build-args-service.js +9 -20
- package/lib/services/android/gradle-build-service.js +34 -47
- package/lib/services/android/gradle-command-service.js +22 -35
- package/lib/services/android-device-debug-service.js +90 -117
- package/lib/services/android-plugin-build-service.js +230 -256
- package/lib/services/android-project-service.js +163 -199
- package/lib/services/android-resources-migration-service.js +51 -64
- package/lib/services/apple-portal/apple-portal-application-service.js +46 -63
- package/lib/services/apple-portal/apple-portal-session-service.js +171 -188
- package/lib/services/assets-generation/assets-generation-service.js +98 -115
- package/lib/services/build-artifacts-service.js +9 -20
- package/lib/services/build-info-file-service.js +20 -35
- package/lib/services/cleanup-service.js +47 -76
- package/lib/services/cocoapods-service.js +115 -136
- package/lib/services/device/device-install-app-service.js +73 -90
- package/lib/services/doctor-service.js +99 -118
- package/lib/services/extensibility-service.js +81 -100
- package/lib/services/files-hash-service.js +26 -43
- package/lib/services/hmr-status-service.js +1 -1
- package/lib/services/initialize-service.js +37 -50
- package/lib/services/ios/export-options-plist-service.js +38 -51
- package/lib/services/ios/ios-signing-service.js +161 -180
- package/lib/services/ios/spm-service.js +40 -53
- package/lib/services/ios/xcodebuild-args-service.js +77 -94
- package/lib/services/ios/xcodebuild-command-service.js +14 -25
- package/lib/services/ios/xcodebuild-service.js +50 -69
- package/lib/services/ios-debugger-port-service.js +23 -36
- package/lib/services/ios-device-debug-service.js +75 -102
- package/lib/services/ios-entitlements-service.js +31 -42
- package/lib/services/ios-extensions-service.js +18 -29
- package/lib/services/ios-project-service.js +405 -460
- package/lib/services/ios-provision-service.js +108 -129
- package/lib/services/ios-watch-app-service.js +21 -32
- package/lib/services/ip-service.js +38 -53
- package/lib/services/itmstransporter-service.js +129 -152
- package/lib/services/livesync/android-device-livesync-service-base.js +31 -48
- package/lib/services/livesync/android-device-livesync-service.js +120 -149
- package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -152
- package/lib/services/livesync/android-livesync-service.js +14 -35
- package/lib/services/livesync/android-livesync-tool.js +89 -112
- package/lib/services/livesync/device-livesync-service-base.js +15 -28
- package/lib/services/livesync/ios-device-livesync-service.js +114 -143
- package/lib/services/livesync/ios-livesync-service.js +42 -58
- package/lib/services/livesync/platform-livesync-service-base.js +94 -119
- package/lib/services/log-parser-service.js +1 -1
- package/lib/services/log-source-map-service.js +30 -41
- package/lib/services/marking-mode-service.js +15 -28
- package/lib/services/npm-config-service.js +1 -1
- package/lib/services/pacote-service.js +49 -64
- package/lib/services/performance-service.js +1 -1
- package/lib/services/platform/add-platform-service.js +50 -71
- package/lib/services/platform/platform-validation-service.js +22 -33
- package/lib/services/platform/prepare-native-platform-service.js +49 -62
- package/lib/services/platform-environment-requirements.js +26 -37
- package/lib/services/plugins-service.js +122 -147
- package/lib/services/project-backup-service.js +1 -1
- package/lib/services/project-changes-service.js +124 -141
- package/lib/services/project-cleanup-service.js +64 -77
- package/lib/services/project-config-service.js +71 -80
- package/lib/services/project-data-service.js +101 -118
- package/lib/services/project-name-service.js +28 -43
- package/lib/services/project-service.js +84 -103
- package/lib/services/project-templates-service.js +52 -67
- package/lib/services/start-service.js +41 -59
- package/lib/services/temp-service.js +8 -21
- package/lib/services/terminal-spinner-service.js +13 -24
- package/lib/services/test-execution-service.js +59 -72
- package/lib/services/test-initialization-service.js +2 -2
- package/lib/services/timeline-profiler-service.js +1 -1
- package/lib/services/versions-service.js +119 -138
- package/lib/services/webpack/webpack-compiler-service.js +211 -231
- package/lib/services/xcconfig-service.js +8 -19
- package/lib/sys-info.js +45 -62
- package/lib/tools/node-modules/node-modules-builder.js +16 -27
- package/lib/yarn-package-manager.js +59 -78
- package/lib/yarn2-package-manager.js +60 -79
- package/package.json +57 -55
- package/vendor/aab-tool/bundletool.jar +0 -0
- package/lib/common/resources/platform-tools/android/darwin/NOTICE.txt +0 -3407
- package/lib/common/resources/platform-tools/android/darwin/adb +0 -0
- package/lib/common/resources/platform-tools/android/linux/NOTICE.txt +0 -4451
- package/lib/common/resources/platform-tools/android/linux/adb +0 -0
- package/lib/common/resources/platform-tools/android/win32/AdbWinApi.dll +0 -0
- package/lib/common/resources/platform-tools/android/win32/AdbWinUsbApi.dll +0 -0
- package/lib/common/resources/platform-tools/android/win32/NOTICE.txt +0 -4451
- package/lib/common/resources/platform-tools/android/win32/adb.exe +0 -0
- package/lib/common/resources/platform-tools/android/win32/fastboot.exe +0 -0
package/lib/commands/typings.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.TypingsCommand = void 0;
|
|
13
4
|
const glob_1 = require("glob");
|
|
@@ -28,151 +19,144 @@ class TypingsCommand {
|
|
|
28
19
|
this.$prompter = $prompter;
|
|
29
20
|
this.allowedParameters = [];
|
|
30
21
|
}
|
|
31
|
-
execute(args) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
});
|
|
22
|
+
async execute(args) {
|
|
23
|
+
const platform = args[0];
|
|
24
|
+
let result;
|
|
25
|
+
if (this.$mobileHelper.isAndroidPlatform(platform)) {
|
|
26
|
+
result = await this.handleAndroidTypings();
|
|
27
|
+
}
|
|
28
|
+
else if (this.$mobileHelper.isiOSPlatform(platform)) {
|
|
29
|
+
result = await this.handleiOSTypings();
|
|
30
|
+
}
|
|
31
|
+
let typingsFolder = "./typings";
|
|
32
|
+
if (this.$options.copyTo) {
|
|
33
|
+
this.$fs.copyFile(path.resolve(this.$projectData.projectDir, "typings"), this.$options.copyTo);
|
|
34
|
+
typingsFolder = this.$options.copyTo;
|
|
35
|
+
}
|
|
36
|
+
if (result !== false) {
|
|
37
|
+
this.$logger.info("Typings have been generated in the following directory:", typingsFolder);
|
|
38
|
+
}
|
|
50
39
|
}
|
|
51
|
-
canExecute(args) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
return true;
|
|
56
|
-
});
|
|
40
|
+
async canExecute(args) {
|
|
41
|
+
const platform = args[0];
|
|
42
|
+
this.$mobileHelper.validatePlatformName(platform);
|
|
43
|
+
return true;
|
|
57
44
|
}
|
|
58
|
-
resolveGradleDependencies(target) {
|
|
45
|
+
async resolveGradleDependencies(target) {
|
|
59
46
|
var _a;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
sensitivity: "base",
|
|
97
|
-
});
|
|
98
|
-
})
|
|
99
|
-
.map((item) => {
|
|
100
|
-
return {
|
|
101
|
-
title: `${color_1.color.white(item.group)}:${color_1.color.greenBright(item.artifact)}:${color_1.color.yellow(item.version)} - ${color_1.color.cyanBright.bold(item.file)}`,
|
|
102
|
-
value: item.id,
|
|
103
|
-
};
|
|
104
|
-
}), true, {
|
|
105
|
-
optionsPerPage: process.stdout.rows - 6,
|
|
47
|
+
const gradleHome = path.resolve((_a = process.env.GRADLE_USER_HOME) !== null && _a !== void 0 ? _a : path.join((0, os_1.homedir)(), `/.gradle`));
|
|
48
|
+
const gradleFiles = path.resolve(gradleHome, "caches/modules-2/files-2.1/");
|
|
49
|
+
if (!this.$fs.exists(gradleFiles)) {
|
|
50
|
+
this.$logger.warn("No gradle files found");
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const pattern = `${target.replaceAll(":", "/")}/**/*.{jar,aar}`;
|
|
54
|
+
const res = await (0, glob_1.glob)(pattern, {
|
|
55
|
+
cwd: gradleFiles,
|
|
56
|
+
});
|
|
57
|
+
if (!res || res.length === 0) {
|
|
58
|
+
this.$logger.warn("No files found");
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
const items = res.map((item) => {
|
|
62
|
+
const [group, artifact, version, sha1, file] = item.split(path.sep);
|
|
63
|
+
return {
|
|
64
|
+
id: sha1 + version,
|
|
65
|
+
group,
|
|
66
|
+
artifact,
|
|
67
|
+
version,
|
|
68
|
+
sha1,
|
|
69
|
+
file,
|
|
70
|
+
path: path.resolve(gradleFiles, item),
|
|
71
|
+
};
|
|
72
|
+
});
|
|
73
|
+
this.$logger.clearScreen();
|
|
74
|
+
const choices = await this.$prompter.promptForChoice(`Select dependencies to generate typings for (${color_1.color.greenBright(target)})`, items
|
|
75
|
+
.sort((a, b) => {
|
|
76
|
+
if (a.artifact < b.artifact)
|
|
77
|
+
return -1;
|
|
78
|
+
if (a.artifact > b.artifact)
|
|
79
|
+
return 1;
|
|
80
|
+
return a.version.localeCompare(b.version, undefined, {
|
|
81
|
+
numeric: true,
|
|
82
|
+
sensitivity: "base",
|
|
106
83
|
});
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
.
|
|
84
|
+
})
|
|
85
|
+
.map((item) => {
|
|
86
|
+
return {
|
|
87
|
+
title: `${color_1.color.white(item.group)}:${color_1.color.greenBright(item.artifact)}:${color_1.color.yellow(item.version)} - ${color_1.color.cyanBright.bold(item.file)}`,
|
|
88
|
+
value: item.id,
|
|
89
|
+
};
|
|
90
|
+
}), true, {
|
|
91
|
+
optionsPerPage: process.stdout.rows - 6,
|
|
111
92
|
});
|
|
93
|
+
this.$logger.clearScreen();
|
|
94
|
+
return items
|
|
95
|
+
.filter((item) => choices.includes(item.id))
|
|
96
|
+
.map((item) => item.path);
|
|
112
97
|
}
|
|
113
|
-
handleAndroidTypings() {
|
|
98
|
+
async handleAndroidTypings() {
|
|
114
99
|
var _a;
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
this.$logger.trace(`Failed to resolve gradle dependencies for target "${target}"`, err);
|
|
125
|
-
}
|
|
100
|
+
const targets = (_a = this.$options.argv._.slice(2)) !== null && _a !== void 0 ? _a : [];
|
|
101
|
+
const paths = [];
|
|
102
|
+
if (targets.length) {
|
|
103
|
+
for (const target of targets) {
|
|
104
|
+
try {
|
|
105
|
+
paths.push(...(await this.resolveGradleDependencies(target)));
|
|
106
|
+
}
|
|
107
|
+
catch (err) {
|
|
108
|
+
this.$logger.trace(`Failed to resolve gradle dependencies for target "${target}"`, err);
|
|
126
109
|
}
|
|
127
110
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
111
|
+
}
|
|
112
|
+
if (!paths.length && !(this.$options.jar || this.$options.aar)) {
|
|
113
|
+
this.$logger.warn([
|
|
114
|
+
"No .jar or .aar file specified. Please specify at least one of the following:",
|
|
115
|
+
" - path to .jar file with --jar <jar>",
|
|
116
|
+
" - path to .aar file with --aar <aar>",
|
|
117
|
+
].join("\n"));
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
this.$fs.ensureDirectoryExists(path.resolve(this.$projectData.projectDir, "typings", "android"));
|
|
121
|
+
const dtsGeneratorPath = path.resolve(this.$projectData.projectDir, this.$projectData.getBuildRelativeDirectoryPath(), "android", "build-tools", "dts-generator.jar");
|
|
122
|
+
if (!this.$fs.exists(dtsGeneratorPath)) {
|
|
123
|
+
this.$logger.warn("No platforms folder found, preparing project now...");
|
|
124
|
+
await this.$childProcess.spawnFromEvent(this.$hostInfo.isWindows ? "ns.cmd" : "ns", ["prepare", "android"], "exit", { stdio: "inherit", shell: this.$hostInfo.isWindows });
|
|
125
|
+
}
|
|
126
|
+
const asArray = (input) => {
|
|
127
|
+
if (!input) {
|
|
128
|
+
return [];
|
|
135
129
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
if (!this.$fs.exists(dtsGeneratorPath)) {
|
|
139
|
-
this.$logger.warn("No platforms folder found, preparing project now...");
|
|
140
|
-
yield this.$childProcess.spawnFromEvent(this.$hostInfo.isWindows ? "ns.cmd" : "ns", ["prepare", "android"], "exit", { stdio: "inherit", shell: this.$hostInfo.isWindows });
|
|
130
|
+
if (typeof input === "string") {
|
|
131
|
+
return [input];
|
|
141
132
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
"-jar",
|
|
158
|
-
dtsGeneratorPath,
|
|
159
|
-
"-input",
|
|
160
|
-
...inputs,
|
|
161
|
-
"-output",
|
|
162
|
-
path.resolve(this.$projectData.projectDir, "typings", "android"),
|
|
163
|
-
], "exit", { stdio: "inherit" });
|
|
164
|
-
});
|
|
133
|
+
return input;
|
|
134
|
+
};
|
|
135
|
+
const inputs = [
|
|
136
|
+
...asArray(this.$options.jar),
|
|
137
|
+
...asArray(this.$options.aar),
|
|
138
|
+
...paths,
|
|
139
|
+
];
|
|
140
|
+
await this.$childProcess.spawnFromEvent("java", [
|
|
141
|
+
"-jar",
|
|
142
|
+
dtsGeneratorPath,
|
|
143
|
+
"-input",
|
|
144
|
+
...inputs,
|
|
145
|
+
"-output",
|
|
146
|
+
path.resolve(this.$projectData.projectDir, "typings", "android"),
|
|
147
|
+
], "exit", { stdio: "inherit" });
|
|
165
148
|
}
|
|
166
|
-
handleiOSTypings() {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
}
|
|
149
|
+
async handleiOSTypings() {
|
|
150
|
+
if (this.$options.filter !== undefined) {
|
|
151
|
+
this.$logger.warn("--filter flag is not supported yet.");
|
|
152
|
+
}
|
|
153
|
+
this.$fs.ensureDirectoryExists(path.resolve(this.$projectData.projectDir, "typings", "ios"));
|
|
154
|
+
await this.$childProcess.spawnFromEvent("node", [this.$staticConfig.cliBinPath, "build", "ios"], "exit", {
|
|
155
|
+
env: {
|
|
156
|
+
...process.env,
|
|
157
|
+
TNS_TYPESCRIPT_DECLARATIONS_PATH: path.resolve(this.$projectData.projectDir, "typings", "ios"),
|
|
158
|
+
},
|
|
159
|
+
stdio: "inherit",
|
|
176
160
|
});
|
|
177
161
|
}
|
|
178
162
|
}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.UpdatePlatformCommand = void 0;
|
|
13
4
|
const _ = require("lodash");
|
|
@@ -23,34 +14,30 @@ class UpdatePlatformCommand {
|
|
|
23
14
|
this.allowedParameters = [];
|
|
24
15
|
this.$projectData.initializeProjectData();
|
|
25
16
|
}
|
|
26
|
-
execute(args) {
|
|
27
|
-
|
|
28
|
-
yield this.$platformCommandHelper.updatePlatforms(args, this.$projectData);
|
|
29
|
-
});
|
|
17
|
+
async execute(args) {
|
|
18
|
+
await this.$platformCommandHelper.updatePlatforms(args, this.$projectData);
|
|
30
19
|
}
|
|
31
|
-
canExecute(args) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
this.$platformValidationService.validatePlatform(platform, this.$projectData);
|
|
39
|
-
});
|
|
40
|
-
for (const arg of args) {
|
|
41
|
-
const [platform, versionToBeInstalled] = arg.split("@");
|
|
42
|
-
const checkEnvironmentRequirementsInput = {
|
|
43
|
-
platform,
|
|
44
|
-
options: this.$options,
|
|
45
|
-
};
|
|
46
|
-
if (versionToBeInstalled) {
|
|
47
|
-
checkEnvironmentRequirementsInput.projectDir = this.$projectData.projectDir;
|
|
48
|
-
checkEnvironmentRequirementsInput.runtimeVersion = versionToBeInstalled;
|
|
49
|
-
}
|
|
50
|
-
yield this.$platformEnvironmentRequirements.checkEnvironmentRequirements(checkEnvironmentRequirementsInput);
|
|
51
|
-
}
|
|
52
|
-
return true;
|
|
20
|
+
async canExecute(args) {
|
|
21
|
+
if (!args || args.length === 0) {
|
|
22
|
+
this.$errors.failWithHelp("No platform specified. Please specify platforms to update.");
|
|
23
|
+
}
|
|
24
|
+
_.each(args, (arg) => {
|
|
25
|
+
const platform = arg.split("@")[0];
|
|
26
|
+
this.$platformValidationService.validatePlatform(platform, this.$projectData);
|
|
53
27
|
});
|
|
28
|
+
for (const arg of args) {
|
|
29
|
+
const [platform, versionToBeInstalled] = arg.split("@");
|
|
30
|
+
const checkEnvironmentRequirementsInput = {
|
|
31
|
+
platform,
|
|
32
|
+
options: this.$options,
|
|
33
|
+
};
|
|
34
|
+
if (versionToBeInstalled) {
|
|
35
|
+
checkEnvironmentRequirementsInput.projectDir = this.$projectData.projectDir;
|
|
36
|
+
checkEnvironmentRequirementsInput.runtimeVersion = versionToBeInstalled;
|
|
37
|
+
}
|
|
38
|
+
await this.$platformEnvironmentRequirements.checkEnvironmentRequirements(checkEnvironmentRequirementsInput);
|
|
39
|
+
}
|
|
40
|
+
return true;
|
|
54
41
|
}
|
|
55
42
|
}
|
|
56
43
|
exports.UpdatePlatformCommand = UpdatePlatformCommand;
|
package/lib/commands/update.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.UpdateCommand = void 0;
|
|
13
4
|
const yok_1 = require("../common/yok");
|
|
@@ -24,47 +15,43 @@ class UpdateCommand {
|
|
|
24
15
|
this.allowedParameters = [];
|
|
25
16
|
this.$projectData.initializeProjectData();
|
|
26
17
|
}
|
|
27
|
-
execute(args) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
yield this.$markingModeService.handleMarkingModeFullDeprecation({
|
|
31
|
-
projectDir: this.$projectData.projectDir,
|
|
32
|
-
forceSwitch: true,
|
|
33
|
-
});
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
if (!(yield this.$updateController.shouldUpdate({
|
|
18
|
+
async execute(args) {
|
|
19
|
+
if (this.$options.markingMode) {
|
|
20
|
+
await this.$markingModeService.handleMarkingModeFullDeprecation({
|
|
37
21
|
projectDir: this.$projectData.projectDir,
|
|
38
|
-
|
|
39
|
-
}))) {
|
|
40
|
-
this.$logger.printMarkdown(`__${UpdateCommand.PROJECT_UP_TO_DATE_MESSAGE}__`);
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
yield this.$updateController.update({
|
|
44
|
-
projectDir: this.$projectData.projectDir,
|
|
45
|
-
version: args[0],
|
|
46
|
-
frameworkPath: this.$options.frameworkPath,
|
|
22
|
+
forceSwitch: true,
|
|
47
23
|
});
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
if (!(await this.$updateController.shouldUpdate({
|
|
27
|
+
projectDir: this.$projectData.projectDir,
|
|
28
|
+
version: args[0],
|
|
29
|
+
}))) {
|
|
30
|
+
this.$logger.printMarkdown(`__${UpdateCommand.PROJECT_UP_TO_DATE_MESSAGE}__`);
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
await this.$updateController.update({
|
|
34
|
+
projectDir: this.$projectData.projectDir,
|
|
35
|
+
version: args[0],
|
|
36
|
+
frameworkPath: this.$options.frameworkPath,
|
|
48
37
|
});
|
|
49
38
|
}
|
|
50
|
-
canExecute(args) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
loose: true,
|
|
59
|
-
});
|
|
60
|
-
if (shouldMigrate) {
|
|
61
|
-
this.$errors.fail(UpdateCommand.SHOULD_MIGRATE_PROJECT_MESSAGE);
|
|
62
|
-
}
|
|
63
|
-
return args.length < 2 && this.$projectData.projectDir !== "";
|
|
39
|
+
async canExecute(args) {
|
|
40
|
+
const shouldMigrate = await this.$migrateController.shouldMigrate({
|
|
41
|
+
projectDir: this.$projectData.projectDir,
|
|
42
|
+
platforms: [
|
|
43
|
+
this.$devicePlatformsConstants.Android,
|
|
44
|
+
this.$devicePlatformsConstants.iOS,
|
|
45
|
+
],
|
|
46
|
+
loose: true,
|
|
64
47
|
});
|
|
48
|
+
if (shouldMigrate) {
|
|
49
|
+
this.$errors.fail(UpdateCommand.SHOULD_MIGRATE_PROJECT_MESSAGE);
|
|
50
|
+
}
|
|
51
|
+
return args.length < 2 && this.$projectData.projectDir !== "";
|
|
65
52
|
}
|
|
66
53
|
}
|
|
54
|
+
exports.UpdateCommand = UpdateCommand;
|
|
67
55
|
UpdateCommand.SHOULD_MIGRATE_PROJECT_MESSAGE = 'This project is not compatible with the current NativeScript version and cannot be updated. Use "ns migrate" to make your project compatible.';
|
|
68
56
|
UpdateCommand.PROJECT_UP_TO_DATE_MESSAGE = "This project is up to date.";
|
|
69
|
-
exports.UpdateCommand = UpdateCommand;
|
|
70
57
|
yok_1.injector.registerCommand("update", UpdateCommand);
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.ChildProcess = void 0;
|
|
13
4
|
const child_process = require("child_process");
|
|
@@ -20,40 +11,36 @@ class ChildProcess extends events_1.EventEmitter {
|
|
|
20
11
|
this.$logger = $logger;
|
|
21
12
|
this.$errors = $errors;
|
|
22
13
|
}
|
|
23
|
-
exec(command, options, execOptions) {
|
|
24
|
-
return
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
reject(error);
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
const output = execOptions && execOptions.showStderr ? { stdout, stderr } : stdout;
|
|
33
|
-
resolve(output);
|
|
34
|
-
}
|
|
35
|
-
};
|
|
36
|
-
if (options) {
|
|
37
|
-
child_process.exec(command, options, callback);
|
|
14
|
+
async exec(command, options, execOptions) {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
|
+
const callback = (error, stdout, stderr) => {
|
|
17
|
+
this.$logger.trace("Exec %s \n stdout: %s \n stderr: %s", command, stdout.toString(), stderr.toString());
|
|
18
|
+
if (error) {
|
|
19
|
+
reject(error);
|
|
38
20
|
}
|
|
39
21
|
else {
|
|
40
|
-
|
|
22
|
+
const output = execOptions && execOptions.showStderr ? { stdout, stderr } : stdout;
|
|
23
|
+
resolve(output);
|
|
41
24
|
}
|
|
42
|
-
}
|
|
25
|
+
};
|
|
26
|
+
if (options) {
|
|
27
|
+
child_process.exec(command, options, callback);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
child_process.exec(command, callback);
|
|
31
|
+
}
|
|
43
32
|
});
|
|
44
33
|
}
|
|
45
|
-
execFile(command, args) {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
});
|
|
34
|
+
async execFile(command, args) {
|
|
35
|
+
this.$logger.trace("execFile: %s %s", command, this.getArgumentsAsQuotedString(args));
|
|
36
|
+
return new Promise((resolve, reject) => {
|
|
37
|
+
child_process.execFile(command, args, (error, stdout) => {
|
|
38
|
+
if (error) {
|
|
39
|
+
reject(error);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
resolve(stdout);
|
|
43
|
+
}
|
|
57
44
|
});
|
|
58
45
|
});
|
|
59
46
|
}
|
|
@@ -172,42 +159,36 @@ class ChildProcess extends events_1.EventEmitter {
|
|
|
172
159
|
});
|
|
173
160
|
});
|
|
174
161
|
}
|
|
175
|
-
trySpawnFromCloseEvent(command, args, options, spawnFromEventOptions) {
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
}
|
|
189
|
-
});
|
|
162
|
+
async trySpawnFromCloseEvent(command, args, options, spawnFromEventOptions) {
|
|
163
|
+
try {
|
|
164
|
+
const childProcessResult = await this.spawnFromEvent(command, args, "close", options, spawnFromEventOptions);
|
|
165
|
+
return childProcessResult;
|
|
166
|
+
}
|
|
167
|
+
catch (err) {
|
|
168
|
+
this.$logger.trace(`Error from trySpawnFromCloseEvent method. More info: ${err}`);
|
|
169
|
+
return Promise.resolve({
|
|
170
|
+
stderr: err && err.message ? err.message : err,
|
|
171
|
+
stdout: null,
|
|
172
|
+
exitCode: -1,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
190
175
|
}
|
|
191
|
-
tryExecuteApplication(command, args, event, errorMessage, condition) {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
}
|
|
197
|
-
});
|
|
176
|
+
async tryExecuteApplication(command, args, event, errorMessage, condition) {
|
|
177
|
+
const childProcess = await this.tryExecuteApplicationCore(command, args, event, errorMessage);
|
|
178
|
+
if (condition && condition(childProcess)) {
|
|
179
|
+
this.$errors.fail(errorMessage);
|
|
180
|
+
}
|
|
198
181
|
}
|
|
199
|
-
tryExecuteApplicationCore(command, args, event, errorMessage) {
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
}
|
|
210
|
-
});
|
|
182
|
+
async tryExecuteApplicationCore(command, args, event, errorMessage) {
|
|
183
|
+
try {
|
|
184
|
+
return this.spawnFromEvent(command, args, event, undefined, {
|
|
185
|
+
throwError: false,
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
catch (e) {
|
|
189
|
+
const message = e.code === "ENOENT" ? errorMessage : e.message;
|
|
190
|
+
this.$errors.fail(message);
|
|
191
|
+
}
|
|
211
192
|
}
|
|
212
193
|
getArgumentsAsQuotedString(args) {
|
|
213
194
|
return (args && args.length && args.map((argument) => `"${argument}"`).join(" "));
|
|
@@ -7,7 +7,7 @@ var CodeEntityType;
|
|
|
7
7
|
(function (CodeEntityType) {
|
|
8
8
|
CodeEntityType[CodeEntityType["Line"] = 0] = "Line";
|
|
9
9
|
CodeEntityType[CodeEntityType["Block"] = 1] = "Block";
|
|
10
|
-
})(CodeEntityType
|
|
10
|
+
})(CodeEntityType || (exports.CodeEntityType = CodeEntityType = {}));
|
|
11
11
|
class Line {
|
|
12
12
|
constructor(content) {
|
|
13
13
|
this.content = content;
|
|
@@ -40,9 +40,9 @@ class CodePrinter {
|
|
|
40
40
|
return content;
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
+
exports.CodePrinter = CodePrinter;
|
|
43
44
|
CodePrinter.INDENT_CHAR = "\t";
|
|
44
45
|
CodePrinter.NEW_LINE_CHAR = os_1.EOL;
|
|
45
46
|
CodePrinter.START_BLOCK_CHAR = " {";
|
|
46
47
|
CodePrinter.END_BLOCK_CHAR = "}";
|
|
47
|
-
exports.CodePrinter = CodePrinter;
|
|
48
48
|
yok_1.injector.register("swaggerCodePrinter", CodePrinter);
|