@akylas/nativescript-cli 8.8.7 → 8.10.0

package/lib/definitions/project.d.ts

@@ -101,10 +101,37 @@ interface INsConfigPlaform {
 	id?: string;
 }
 
+interface IOSSPMPackageBase {
+	name: string;
+	libs: string[];
+	/**
+	 * Optional: If you have more targets (like widgets for example)
+	 * you can list their names here to include the Swift Package with them
+	 */
+	targets?: string[];
+}
+
+export interface IOSRemoteSPMPackage extends IOSSPMPackageBase {
+	repositoryURL: string;
+	version: string;
+}
+
+export interface IOSLocalSPMPackage extends IOSSPMPackageBase {
+	path: string;
+}
+
+export type IOSSPMPackage = IOSRemoteSPMPackage | IOSLocalSPMPackage;
+export type BundlerType = "webpack" | "rspack" | "vite";
+
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
 	runtimePackageName?: string
 	cocoapodUseBundleExec?: boolean
+	/**
+	 * Swift Package Manager
+	 * List packages to be included in the iOS build.
+	 */
+	SPMPackages?: Array<IOSSPMPackage>;
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
@@ -168,12 +195,15 @@ interface INsConfig {
 	overridePods?: string;
 	webpackPackageName?: string;
 	webpackConfigPath?: string;
+	bundlerConfigPath?: string;
+	bundler?: BundlerType;
 	ios?: INsConfigIOS;
 	android?: INsConfigAndroid;
 	visionos?: INSConfigVisionOS;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
 	projectName?: string;
+	corePackageName?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -201,13 +231,28 @@ interface IProjectData extends ICreateProjectData {
 	 * Value is true when project has nativescript.config and it has `shared: true` in it.
 	 */
 	isShared: boolean;
-
 	/**
+	 * Specifies the bundler used to build the application.
+	 *
+	 * - `"webpack"`: Uses Webpack for traditional bundling.
+	 * - `"rspack"`: Uses Rspack for fast bundling.
+	 * - `"vite"`: Uses Vite for fast bundling.
+	 *
+	 * @default "webpack"
+	 */
+	bundler: BundlerType;
+	/**
+	 * @deprecated Use bundlerConfigPath
 	 * Defines the path to the configuration file passed to webpack process.
 	 * By default this is the webpack.config.js at the root of the application.
 	 * The value can be changed by setting `webpackConfigPath` in nativescript.config.
 	 */
 	webpackConfigPath: string;
+	/**
+	 * Defines the path to the bundler configuration file passed to the compiler.
+	 * The value can be changed by setting `bundlerConfigPath` in nativescript.config.
+	 */
+	bundlerConfigPath: string;
 	projectName: string;
 
 	/**
@@ -218,7 +263,7 @@ interface IProjectData extends ICreateProjectData {
 	initializeProjectData(projectDir?: string): void;
 	initializeProjectDataFromContent(
 		packageJsonContent: string,
-		projectDir?: string
+		projectDir?: string,
 	): void;
 	getAppDirectoryPath(projectDir?: string): string;
 	getAppDirectoryRelativePath(): string;
@@ -309,7 +354,7 @@ interface IProjectDataService {
 	 */
 	getRuntimePackage(
 		projectDir: string,
-		platform: SupportedPlatform
+		platform: SupportedPlatform,
 	): IBasePluginData;
 
 	/**
@@ -329,7 +374,7 @@ interface IProjectCleanupService {
 	 */
 	clean(
 		pathsToClean: string[],
-		options?: IProjectCleanupOptions
+		options?: IProjectCleanupOptions,
 	): Promise<IProjectCleanupResult>;
 
 	/**
@@ -338,7 +383,7 @@ interface IProjectCleanupService {
 	 */
 	cleanPath(
 		pathToClean: string,
-		options?: IProjectCleanupOptions
+		options?: IProjectCleanupOptions,
 	): Promise<IProjectCleanupResult>;
 }
 
@@ -440,7 +485,7 @@ interface IProjectConfigService {
 
 	writeLegacyNSConfigIfNeeded(
 		projectDir: string,
-		runtimePackage: IBasePluginData
+		runtimePackage: IBasePluginData,
 	): Promise<void>;
 }
 
@@ -543,14 +588,14 @@ interface IProjectTemplatesService {
 	 */
 	prepareTemplate(
 		templateName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<ITemplateData>;
 }
 
 interface IPlatformProjectServiceBase {
 	getPluginPlatformsFolderPath(
 		pluginData: IPluginData,
-		platform: string
+		platform: string,
 	): string;
 	getFrameworkVersion(projectData: IProjectData): string;
 }
@@ -612,7 +657,7 @@ interface ILocalBuildService {
 	 */
 	build(
 		platform: string,
-		platformBuildOptions: IPlatformBuildData
+		platformBuildOptions: IPlatformBuildData,
 	): Promise<string>;
 	/**
 	 * Removes build artifacts specific to the platform
@@ -632,7 +677,7 @@ interface ITestExecutionService {
 	startKarmaServer(
 		platform: string,
 		liveSyncInfo: ILiveSyncInfo,
-		deviceDescriptors: ILiveSyncDeviceDescriptor[]
+		deviceDescriptors: ILiveSyncDeviceDescriptor[],
 	): Promise<void>;
 	canStartKarmaServer(projectData: IProjectData): Promise<boolean>;
 }
@@ -666,17 +711,17 @@ interface ICocoaPodsService {
 	 */
 	applyPodfileFromAppResources(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	applyPodfileArchExclusions(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	applyPodfileFromExtensions(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	/**
@@ -691,7 +736,7 @@ interface ICocoaPodsService {
 		moduleName: string,
 		podfilePath: string,
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	/**
@@ -713,7 +758,7 @@ interface ICocoaPodsService {
 		moduleName: string,
 		podfilePath: string,
 		projectData: IProjectData,
-		nativeProjectPath: string
+		nativeProjectPath: string,
 	): void;
 
 	/**
@@ -731,7 +776,7 @@ interface ICocoaPodsService {
 	 */
 	executePodInstall(
 		projectRoot: string,
-		xcodeProjPath: string
+		xcodeProjPath: string,
 	): Promise<ISpawnResult>;
 
 	/**
@@ -743,7 +788,7 @@ interface ICocoaPodsService {
 	mergePodXcconfigFile(
 		projectData: IProjectData,
 		platformData: IPlatformData,
-		opts: IRelease
+		opts: IRelease,
 	): Promise<void>;
 }
 
@@ -751,16 +796,16 @@ interface ICocoaPodsPlatformManager {
 	addPlatformSection(
 		projectData: IProjectData,
 		podfilePlatformData: IPodfilePlatformData,
-		projectPodfileContent: string
+		projectPodfileContent: string,
 	): string;
 	removePlatformSection(
 		moduleName: string,
 		projectPodFileContent: string,
-		podfilePath: string
+		podfilePath: string,
 	): string;
 	replacePlatformRow(
 		podfileContent: string,
-		podfilePath: string
+		podfilePath: string,
 	): { replacedContent: string; podfilePlatformData: IPodfilePlatformData };
 }
 
@@ -785,24 +830,24 @@ interface IIOSNativeTargetService {
 		targetType: string,
 		project: IXcode.project,
 		platformData: IPlatformData,
-		parentTarget?: string
+		parentTarget?: string,
 	): IXcode.target;
 	prepareSigning(
 		targetUuids: string[],
 		projectData: IProjectData,
-		projectPath: string
+		projectPath: string,
 	): void;
 	getTargetDirectories(folderPath: string): string[];
 	setXcodeTargetBuildConfigurationProperties(
 		properties: IXcodeTargetBuildConfigurationProperty[],
 		targetName: string,
-		project: IXcode.project
+		project: IXcode.project,
 	): void;
 	setConfigurationsFromJsonFile(
 		jsonPath: string,
 		targetUuid: string,
 		targetName: string,
-		project: IXcode.project
+		project: IXcode.project,
 	): void;
 }
 
@@ -811,7 +856,7 @@ interface IIOSNativeTargetService {
  */
 interface IIOSExtensionsService {
 	addExtensionsFromPath(
-		options: IAddExtensionsFromPathOptions
+		options: IAddExtensionsFromPathOptions,
 	): Promise<boolean>;
 	removeExtensions(options: IRemoveExtensionsOptions): void;
 }
@@ -842,6 +887,38 @@ interface IRemoveExtensionsOptions {
 
 interface IRemoveWatchAppOptions extends IRemoveExtensionsOptions {}
 
+interface IWatchAppJSONConfigModule {
+	name?: string;
+	path: string;
+	targetType?: string;
+	embed?: boolean;
+	frameworks?: Array<string | Record<string, string>>;
+	dependencies?: string[];
+	headerSearchPaths?: string[];
+	resources?: string[];
+	src?: string[];
+	linkerFlags?: string[];
+	buildConfigurationProperties?: Record<string, string>;
+	SPMPackages?: Array<IOSSPMPackage | string>;
+}
+interface IWatchAppJSONConfig {
+	targetType?: string;
+	forceAddEmbedWatchContent?: boolean;
+	sharedModulesBuildConfigurationProperties?: Record<string, string>;
+	basedir?: string;
+	infoPlistPath?: string;
+	xcprivacyPath?: string;
+	importSourcesFromMainFolder?: boolean;
+	importResourcesFromMainFolder?: boolean;
+	resources?: string[];
+	src?: string[];
+	resourcesExclude?: string[];
+	srcExclude?: string[];
+	modules: IWatchAppConfigModule[];
+	SPMPackages?: Array<IOSSPMPackage>;
+}
+
+
 interface IRubyFunction {
 	functionName: string;
 	functionParameters?: string;

package/lib/definitions/temp-service.d.ts

@@ -1,9 +1,13 @@
-import { AffixOptions } from "temp";
+export type AffixOptions = {
+	prefix?: string;
+	suffix?: string;
+	dir?: string;
+};
 
 /**
  * Declares wrapped functions of temp module
  */
-interface ITempService {
+export interface ITempService {
 	mkdirSync(affixes: string | AffixOptions): Promise<string>;
 	path(options: string | AffixOptions): Promise<string>;
 }

package/lib/helpers/key-command-helper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const color_1 = require("../color");
+const node_util_1 = require("node:util");
 const yok_1 = require("../common/yok");
 class KeyCommandHelper {
     constructor() {
@@ -33,7 +34,7 @@ class KeyCommandHelper {
                         }
                         if (keyCommand.key !== "\u0003") {
                             const line = ` ${color_1.color.dim("→")} ${color_1.color.bold(keyCommand.key)} — ${keyCommand.description}`;
-                            const lineLength = (0, color_1.stripColors)(line).length - 1;
+                            const lineLength = (0, node_util_1.stripVTControlCharacters)(line).length - 1;
                             console.log(color_1.color.dim(` ┌${"─".repeat(lineLength)}┐`));
                             console.log(line + color_1.color.dim(" │"));
                             console.log(color_1.color.dim(` └${"─".repeat(lineLength)}┘`));

package/lib/nativescript-cli.js

@@ -5,6 +5,34 @@ require("./bootstrap");
 const shelljs = require("shelljs");
 shelljs.config.silent = true;
 shelljs.config.fatal = true;
+if (process.platform === "win32") {
+    const realcp = shelljs.cp;
+    shelljs.cp = (...args) => {
+        if (args.length === 3) {
+            args[1] = replaceDashes(args[1]);
+        }
+        else {
+            args[0] = replaceDashes(args[0]);
+        }
+        if (args.length == 2) {
+            realcp(args[0], args[1]);
+        }
+        else {
+            realcp(args[0], args[1], args[2]);
+        }
+    };
+    function replaceDashes(values) {
+        if (Array.isArray(values)) {
+            for (let i = 0; i < values.length; ++i) {
+                values[i] = replaceDashes(values[i]);
+            }
+            return values;
+        }
+        else {
+            return values.replace(/\\/g, "/");
+        }
+    }
+}
 const errors_1 = require("./common/errors");
 const helpers_1 = require("./common/helpers");
 const yok_1 = require("./common/yok");

package/lib/node-package-manager.js

@@ -30,7 +30,7 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         const packageJsonPath = (0, path_1.join)(pathToSave, "package.json");
         const jsonContentBefore = this.$fs.readJson(packageJsonPath);
         const flags = this.getFlagsString(config, true);
-        let params = ["install", "--legacy-peer-deps"];
+        let params = ["install"];
         const isInstallingAllDependencies = packageName === pathToSave;
         if (!isInstallingAllDependencies) {
             params.push(packageName);

package/lib/options.js

@@ -220,7 +220,11 @@ class Options {
             appleSessionBase64: { type: "string", hasSensitiveValue: true },
             jar: { type: "string", hasSensitiveValue: true },
             aar: { type: "string", hasSensitiveValue: true },
+            dtsGeneratorPath: { type: "string", hasSensitiveValue: true },
             filter: { type: "string", hasSensitiveValue: true },
+            lookupPath: { type: "string", hasSensitiveValue: true },
+            super: { type: "string", hasSensitiveValue: true },
+            skipDeclarations: { type: "boolean", hasSensitiveValue: false },
             git: {
                 type: "boolean",
                 hasSensitiveValue: false,

package/lib/project-data.js

@@ -56,6 +56,7 @@ class ProjectData {
         this.errorInvalidProject(projectDir);
     }
     initializeProjectDataFromContent(packageJsonContent, projectDir) {
+        var _a, _b;
         projectDir = projectDir || this.$projectHelper.projectDir || "";
         this.projectDir = projectDir;
         const projectFilePath = this.getProjectFilePath(projectDir);
@@ -92,10 +93,15 @@ class ProjectData {
             this.buildXcconfigPath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.BUILD_XCCONFIG_FILE_NAME);
             this.podfilePath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.PODFILE_NAME);
             this.isShared = !!(this.nsConfig && this.nsConfig.shared);
-            this.webpackConfigPath =
-                this.nsConfig && this.nsConfig.webpackConfigPath
-                    ? path.resolve(this.projectDir, this.nsConfig.webpackConfigPath)
-                    : path.join(this.projectDir, "webpack.config.js");
+            const webpackConfigPath = this.nsConfig && this.nsConfig.webpackConfigPath
+                ? path.resolve(this.projectDir, this.nsConfig.webpackConfigPath)
+                : path.join(this.projectDir, "webpack.config.js");
+            this.webpackConfigPath = webpackConfigPath;
+            this.bundlerConfigPath =
+                this.nsConfig && this.nsConfig.bundlerConfigPath
+                    ? path.resolve(this.projectDir, this.nsConfig.bundlerConfigPath)
+                    : webpackConfigPath;
+            this.bundler = (_b = (_a = this === null || this === void 0 ? void 0 : this.nsConfig) === null || _a === void 0 ? void 0 : _a.bundler) !== null && _b !== void 0 ? _b : "webpack";
             return;
         }
         this.errorInvalidProject(projectDir);

package/lib/services/analytics/analytics-broker-process.js

@@ -44,7 +44,7 @@ process.on("message", async (data) => {
             analyticsLoggingService.logData({
                 message: `analytics-broker-process will send ${"ProcessFinishedTasks"} message`,
             });
-            process.send("ProcessFinishedTasks", () => {
+            process.send("ProcessFinishedTasks", null, null, () => {
                 analyticsLoggingService.logData({
                     message: `analytics-broker-process sent ${"ProcessFinishedTasks"} message and will exit gracefully now`,
                 });

package/lib/services/analytics/analytics-service.js

@@ -167,7 +167,8 @@ class AnalyticsService {
             const projectData = this.$projectDataService.getProjectData(projectDir);
             customDimensions["cd2"] =
                 projectData.projectType;
-            customDimensions["cd9"] = projectData.isShared.toString();
+            customDimensions["cd9"] =
+                projectData.isShared.toString();
         }
         return customDimensions;
     }

package/lib/services/analytics-settings-service.js

@@ -29,7 +29,8 @@ class AnalyticsSettingsService {
         return this.getSettingValueOrDefault(this.$staticConfig.ANALYTICS_INSTALLATION_ID_SETTING_NAME);
     }
     getClientName() {
-        return "" + color_1.color.cyan.bold(this.$staticConfig.CLIENT_NAME_ALIAS);
+        return ("" +
+            color_1.color.styleText(["cyan", "bold"], this.$staticConfig.CLIENT_NAME_ALIAS));
     }
     async getUserSessionsCount(projectName) {
         const sessionsCountForProject = await this.$userSettingsService.getSettingValue(this.getSessionsProjectKey(projectName));

package/lib/services/android/gradle-build-args-service.js

@@ -4,6 +4,7 @@ exports.GradleBuildArgsService = void 0;
 const path = require("path");
 const constants_1 = require("../../common/constants");
 const yok_1 = require("../../common/yok");
+const constants_2 = require("../../constants");
 class GradleBuildArgsService {
     constructor($androidToolsInfo, $hooksService, $analyticsService, $staticConfig, $projectData, $logger) {
         this.$androidToolsInfo = $androidToolsInfo;
@@ -45,18 +46,21 @@ class GradleBuildArgsService {
             args.push(...additionalArgs);
         }
         if (buildData.release) {
-            args.push("-Prelease", `-PksPath=${path.resolve(buildData.keyStorePath)}`, `-Palias=${buildData.keyStoreAlias}`, `-Ppassword=${buildData.keyStoreAliasPassword}`, `-PksPassword=${buildData.keyStorePassword}`);
+            args.push("-Prelease");
+        }
+        if (buildData.release || buildData.keyStorePath) {
+            args.push(`-PksPath=${path.resolve(buildData.keyStorePath)}`, `-Palias=${buildData.keyStoreAlias}`, `-Ppassword=${buildData.keyStoreAliasPassword}`, `-PksPassword=${buildData.keyStorePassword}`);
         }
         return args;
     }
     getBuildLoggingArgs() {
         const args = [];
         const logLevel = this.$logger.getLevel();
-        if (logLevel === "TRACE") {
+        if (logLevel === constants_2.LoggerLevel.TRACE) {
             args.push("--debug");
         }
-        else if (logLevel === "INFO") {
-            args.push("--quiet");
+        else if (logLevel === constants_2.LoggerLevel.DEBUG) {
+            args.push("--info");
         }
         return args;
     }

package/lib/services/android/gradle-build-service.js

@@ -17,7 +17,10 @@ class GradleBuildService extends events_1.EventEmitter {
         const buildTaskArgs = await this.$gradleBuildArgsService.getBuildTaskArgs(buildData);
         if (buildData.buildFilterDevicesArch) {
             let devices = this.$devicesService.getDevicesForPlatform(buildData.platform);
-            if (buildData.emulator) {
+            if (buildData.device) {
+                devices = devices.filter((d) => d.deviceInfo.identifier === buildData.device);
+            }
+            else if (buildData.emulator) {
                 devices = devices.filter((d) => d.isEmulator);
             }
             const abis = devices

package/lib/services/android-plugin-build-service.js

@@ -454,7 +454,7 @@ class AndroidPluginBuildService {
             localArgs.push(...additionalArgs);
         }
         if (this.$logger.getLevel() === "INFO") {
-            localArgs.push("--quiet");
+            localArgs.push("--info");
         }
         const opts = {
             cwd: pluginBuildSettings.pluginDir,

package/lib/services/android-project-service.js

@@ -448,17 +448,19 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 if (!this.$fs.exists(apkOutputPath)) {
                     return;
                 }
-                const device = this.$devicesService
-                    .getDevicesForPlatform(deviceDescriptor.buildData.platform)
-                    .filter((d) => d.deviceInfo.identifier === deviceDescriptor.identifier)[0];
-                const abis = device.deviceInfo.abis.filter((a) => !!a && a.length)[0];
                 const directoryContent = this.$fs.readDirectory(apkOutputPath);
-                const regexp = new RegExp(`${abis}.*\.apk`);
-                const files = _.filter(directoryContent, (entry) => {
-                    return regexp.test(entry);
-                });
-                if (files.length === 0) {
-                    changesInfo.nativeChanged = true;
+                if (!directoryContent.find(f => f.indexOf("universal") !== -1)) {
+                    const device = this.$devicesService
+                        .getDevicesForPlatform(deviceDescriptor.buildData.platform)
+                        .filter((d) => d.deviceInfo.identifier === deviceDescriptor.identifier)[0];
+                    const abis = device.deviceInfo.abis.filter((a) => !!a && a.length)[0];
+                    const regexp = new RegExp(`${abis}.*\.apk`);
+                    const files = _.filter(directoryContent, (entry) => {
+                        return regexp.test(entry);
+                    });
+                    if (files.length === 0) {
+                        changesInfo.nativeChanged = true;
+                    }
                 }
             }
         });

package/lib/services/assets-generation/assets-generation-service.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsGenerationService = void 0;
-const Jimp = require("jimp");
+const JimpModule = require("jimp");
 const Color = require("color");
 const decorators_1 = require("../../common/decorators");
 const constants_1 = require("../../constants");
@@ -67,7 +67,7 @@ class AssetsGenerationService {
                 }
                 try {
                     const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
-                    const colorHEX = Jimp.cssColorToHex(color);
+                    const colorHEX = JimpModule.cssColorToHex(color);
                     const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
                     this.$fs.writeFile(assetItem.path, [
                         `<?xml version="1.0" encoding="utf-8"?>`,
@@ -112,38 +112,49 @@ class AssetsGenerationService {
                         constants_1.AssetConstants.defaultOverlayImageScale;
                     const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
                     image = await this.resize(generationData.imagePath, imageResize, imageResize);
-                    image = this.generateImage(background, width, height, outputPath, image);
+                    image = this.generateImage(background, width, height, image);
                     break;
                 case "blank":
-                    image = this.generateImage(background, width, height, outputPath);
+                    image = this.generateImage(background, width, height);
                     break;
                 case "resize":
                     image = await this.resize(generationData.imagePath, width, height);
                     break;
                 case "outerScale":
                     image = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
-                    image = this.generateImage("#00000000", width, height, outputPath, image);
+                    image = this.generateImage("#00000000", width, height, image);
                     break;
                 default:
                     throw new Error(`Invalid image generation operation: ${operation}`);
             }
             if (assetItem.rgba === false) {
-                image = image.colorType(2);
+                image = this.generateImage("#FFFFFF", image.width, image.height, image);
+            }
+            if (this.isAssetFilePath(outputPath)) {
+                image.write(outputPath);
+            }
+            else {
+                this.$logger.warn(`Incorrect destination path ${outputPath} for image ${assetItem.filename}`);
             }
-            image.write(outputPath);
         }
     }
     async resize(imagePath, width, height) {
-        const image = await Jimp.read(imagePath);
-        return image.scaleToFit(width, height);
+        const image = await JimpModule.Jimp.read(imagePath);
+        return image.scaleToFit({
+            w: width,
+            h: height,
+        });
     }
-    generateImage(background, width, height, outputPath, overlayImage) {
-        const J = Jimp;
+    generateImage(background, width, height, overlayImage) {
         const backgroundColor = this.getRgbaNumber(background);
-        let image = new J(width, height, backgroundColor);
+        let image = new JimpModule.Jimp({
+            width,
+            height,
+            color: backgroundColor,
+        });
         if (overlayImage) {
-            const centeredWidth = (width - overlayImage.bitmap.width) / 2;
-            const centeredHeight = (height - overlayImage.bitmap.height) / 2;
+            const centeredWidth = (width - overlayImage.width) / 2;
+            const centeredHeight = (height - overlayImage.height) / 2;
             image = image.composite(overlayImage, centeredWidth, centeredHeight);
         }
         return image;
@@ -152,7 +163,14 @@ class AssetsGenerationService {
         const color = new Color(colorString);
         const colorRgb = color.rgb();
         const alpha = Math.round(colorRgb.alpha() * 255);
-        return Jimp.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+        return JimpModule.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+    }
+    isAssetFilePath(path) {
+        if (!path) {
+            return false;
+        }
+        const index = path.lastIndexOf(".");
+        return index > -1 && index < path.length - 1;
     }
 }
 exports.AssetsGenerationService = AssetsGenerationService;