@sap-ux/fiori-generator-shared 0.12.16 → 0.13.0

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export * from './logging/logWrapper';
 export * from './types';
 export { getPackageScripts } from './npm-package-scripts/getPackageScripts';
 export { getBootstrapResourceUrls } from './ui5/ui5';
-export { getDefaultTargetFolder, isExtensionInstalled } from './vscode-helpers/vscode-helpers';
+export { getDefaultTargetFolder, isExtensionInstalled, isCommandRegistered } from './vscode-helpers/vscode-helpers';
 export { generateAppGenInfo } from './app-gen-info';
 export { getHostEnvironment } from './environment';
 export { getFlpId, getSemanticObject } from './app-helpers/app-helpers';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSemanticObject = exports.getFlpId = exports.getHostEnvironment = exports.generateAppGenInfo = exports.isExtensionInstalled = exports.getDefaultTargetFolder = exports.getBootstrapResourceUrls = exports.getPackageScripts = void 0;
+exports.getSemanticObject = exports.getFlpId = exports.getHostEnvironment = exports.generateAppGenInfo = exports.isCommandRegistered = exports.isExtensionInstalled = exports.getDefaultTargetFolder = exports.getBootstrapResourceUrls = exports.getPackageScripts = void 0;
 __exportStar(require("./cap"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./environment"), exports);
@@ -29,6 +29,7 @@ Object.defineProperty(exports, "getBootstrapResourceUrls", { enumerable: true, g
 var vscode_helpers_1 = require("./vscode-helpers/vscode-helpers");
 Object.defineProperty(exports, "getDefaultTargetFolder", { enumerable: true, get: function () { return vscode_helpers_1.getDefaultTargetFolder; } });
 Object.defineProperty(exports, "isExtensionInstalled", { enumerable: true, get: function () { return vscode_helpers_1.isExtensionInstalled; } });
+Object.defineProperty(exports, "isCommandRegistered", { enumerable: true, get: function () { return vscode_helpers_1.isCommandRegistered; } });
 var app_gen_info_1 = require("./app-gen-info");
 Object.defineProperty(exports, "generateAppGenInfo", { enumerable: true, get: function () { return app_gen_info_1.generateAppGenInfo; } });
 var environment_1 = require("./environment");

package/dist/vscode-helpers/vscode-helpers.d.ts

@@ -7,13 +7,22 @@ export declare const YEOMANUI_TARGET_FOLDER_CONFIG_PROP = "ApplicationWizard.Tar
  */
 export declare function getDefaultTargetFolder(vscode: any): string | undefined;
 /**
- * Check for an installed extension, optionally specifying a minimum version.
- * Note, this does not check for activation state of specified extension.
+ * Check for an installed extension, optionally specifying a minimum version and activation state.
+ * Note, this does not check for activation state unless `isActive` is specified.
  *
  * @param vscode - vscode instance
  * @param extensionId - the id of the extension to find
  * @param minVersion - the minimum version of the specified extension, lower versions will not be returned. Must be a valid SemVer string.
- * @returns true if the extension is installed and the version is >= minVersion (if provided), false otherwise
+ * @param isActive - If `true`, the function will only return `true` if the extension is also active. Defaults to `true`.
+ * @returns true if the extension is installed, the version is >= minVersion, and is active, false otherwise
  */
-export declare function isExtensionInstalled(vscode: any, extensionId: string, minVersion?: string): boolean;
+export declare function isExtensionInstalled(vscode: any, extensionId: string, minVersion?: string, isActive?: boolean): boolean;
+/**
+ * Check if a specific command is registered in VS Code.
+ *
+ * @param vscode - vscode instance
+ * @param commandId - the id of the command to check
+ * @returns true if the command is registered, else false
+ */
+export declare function isCommandRegistered(vscode: any, commandId: string): Promise<boolean>;
 //# sourceMappingURL=vscode-helpers.d.ts.map

package/dist/vscode-helpers/vscode-helpers.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.YEOMANUI_TARGET_FOLDER_CONFIG_PROP = void 0;
 exports.getDefaultTargetFolder = getDefaultTargetFolder;
 exports.isExtensionInstalled = isExtensionInstalled;
+exports.isCommandRegistered = isCommandRegistered;
 const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
 const path_1 = require("path");
@@ -40,23 +41,42 @@ function getDefaultTargetFolder(vscode) {
     return (0, fs_1.existsSync)(DEFAULT_PROJECTS_FOLDER) ? DEFAULT_PROJECTS_FOLDER : undefined;
 }
 /**
- * Check for an installed extension, optionally specifying a minimum version.
- * Note, this does not check for activation state of specified extension.
+ * Check for an installed extension, optionally specifying a minimum version and activation state.
+ * Note, this does not check for activation state unless `isActive` is specified.
  *
  * @param vscode - vscode instance
  * @param extensionId - the id of the extension to find
  * @param minVersion - the minimum version of the specified extension, lower versions will not be returned. Must be a valid SemVer string.
- * @returns true if the extension is installed and the version is >= minVersion (if provided), false otherwise
+ * @param isActive - If `true`, the function will only return `true` if the extension is also active. Defaults to `true`.
+ * @returns true if the extension is installed, the version is >= minVersion, and is active, false otherwise
  */
-function isExtensionInstalled(vscode, extensionId, minVersion) {
+function isExtensionInstalled(vscode, extensionId, minVersion, isActive = true) {
     const foundExt = vscode?.extensions?.getExtension(extensionId);
     if (foundExt) {
         const extVersion = (0, semver_1.coerce)(foundExt.packageJSON.version);
         if (extVersion) {
-            // Check installed ver is >= minVersion or return true if minVersion is not specified
-            return !(minVersion && (0, semver_1.lt)(extVersion, minVersion));
+            // If a minimum version is specified and the extension's version is less than it, return false.
+            if (minVersion && (0, semver_1.lt)(extVersion, minVersion)) {
+                return false;
+            }
+            // If the caller explicitly requires the extension to check if active, and it's not then return false.
+            if (isActive && !foundExt.isActive) {
+                return false;
+            }
+            return true;
         }
     }
     return false;
 }
+/**
+ * Check if a specific command is registered in VS Code.
+ *
+ * @param vscode - vscode instance
+ * @param commandId - the id of the command to check
+ * @returns true if the command is registered, else false
+ */
+async function isCommandRegistered(vscode, commandId) {
+    const commands = await vscode.commands.getCommands();
+    return commands.includes(commandId);
+}
 //# sourceMappingURL=vscode-helpers.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-generator-shared",
   "description": "Commonly used shared functionality and types to support the fiori generator.",
-  "version": "0.12.16",
+  "version": "0.13.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",