homey 4.2.1 → 4.2.2

package/lib/App.js

@@ -865,11 +865,7 @@ $ sudo systemctl restart docker
     Log.success('Pre-processing app...');
 
     // Build app.json from Homey Compose files
-    if (App.hasHomeyCompose({ appPath: this.path })) {
-      const usesModules = App.usesModules({ appPath: this.path });
-
-      await HomeyCompose.build({ appPath: this.path, usesModules });
-    }
+    await HomeyCompose.buildIfUsed(App, this.path);
 
     // Clear the .homeybuild/ folder
     await fse.remove(this._homeyBuildPath).catch(async (err) => {
@@ -1183,9 +1179,7 @@ $ sudo systemctl restart docker
     await writeFileAsync(path.join(manifestFolder, 'app.json'), JSON.stringify(manifest, false, 2));
 
     // Build app.json from Homey Compose files
-    if (App.hasHomeyCompose({ appPath: this.path })) {
-      await HomeyCompose.build({ appPath: this.path });
-    }
+    await HomeyCompose.buildIfUsed(App, this.path);
 
     Log.success(`Updated app.json version to \`${manifest.version}\``);
 
@@ -1197,9 +1191,7 @@ $ sudo systemctl restart docker
       );
 
       // Build app.json from Homey Compose files
-      if (App.hasHomeyCompose({ appPath: this.path })) {
-        await HomeyCompose.build({ appPath: this.path });
-      }
+      await HomeyCompose.buildIfUsed(App, this.path);
     };
 
     return undo;

package/lib/AppPython.js

@@ -46,15 +46,15 @@ class AppPython extends App {
   }
 
   static usesTypeScript({ appPath }) {
-    throw new Error('Method should not be called for Python: "App.usesTypeScript"');
+    return false;
   }
 
   static usesModules({ appPath }) {
-    throw new Error('Method should not be called for Python: "App.usesModules"');
+    return false;
   }
 
   static async transpileToTypescript({ appPath }) {
-    throw new Error('Method should not be called for Python: "App.transpileToTypescript".');
+    return;
   }
 
   async build({ findLinks, dockerSocketPath } = {}) {
@@ -117,7 +117,8 @@ class AppPython extends App {
       HOMEY_APP_RUNNER_DEVMODE: process.env.HOMEY_APP_RUNNER_DEVMODE === '1',
       HOMEY_APP_RUNNER_PATH: process.env.HOMEY_APP_RUNNER_PATH_PYTHON, // e.g. /Users/username/Git/homey-app-runner/src
       HOMEY_APP_RUNNER_CMD: ['bash', 'entrypoint.sh'],
-      HOMEY_APP_RUNNER_ID: process.env.HOMEY_APP_RUNNER_ID_PYTHON || 'ghcr.io/athombv/python-homey-app-runner:latest',
+      HOMEY_APP_RUNNER_ID:
+        process.env.HOMEY_APP_RUNNER_ID_PYTHON || 'ghcr.io/athombv/python-homey-app-runner:latest',
       HOMEY_APP_RUNNER_SDK_PATH: process.env.HOMEY_APP_RUNNER_SDK_PATH_PYTHON, // e.g. /Users/username/Git/python-homey-sdk-v3/dist
     };
   }
@@ -261,9 +262,7 @@ class AppPython extends App {
   } = {}) {
     Log.success('Pre-processing app...');
     // Build app.json from Homey Compose files
-    if (App.hasHomeyCompose({ appPath: this.path })) {
-      await HomeyCompose.build({ appPath: this.path, usesModules: false });
-    }
+    await HomeyCompose.buildIfUsed(AppPython, this.path);
 
     const manifest = App.getManifest({ appPath: this.path });
 

package/lib/HomeyCompose.js

@@ -49,8 +49,12 @@ const FLOW_TYPES = ['triggers', 'conditions', 'actions'];
 
 class HomeyCompose {
   // Temporary simpler api
-  static async build({ appPath, usesModules }) {
-    const compose = new HomeyCompose(appPath, usesModules);
+  static async buildIfUsed(app, appPath) {
+    if (!app.hasHomeyCompose({ appPath })) {
+      return;
+    }
+
+    const compose = new HomeyCompose(appPath, app.usesModules({ appPath }));
     await compose.run();
   }
 
@@ -706,6 +710,14 @@ class HomeyCompose {
             this._appJson.capabilities[capabilityId].title[appLocaleId] = capability.title;
           }
 
+          // Capability.titleShort
+          if (capability.titleShort) {
+            this._appJson.capabilities[capabilityId].titleShort =
+              this._appJson.capabilities[capabilityId].titleShort ?? {};
+            this._appJson.capabilities[capabilityId].titleShort[appLocaleId] =
+              capability.titleShort;
+          }
+
           // Capability.units
           if (capability.units) {
             this._appJson.capabilities[capabilityId].units =
@@ -746,6 +758,16 @@ class HomeyCompose {
                   capabilityOptions.title;
               }
 
+              // Driver.capabilitiesOptions[<capabilityId>].titleShort
+              if (capabilityOptions.titleShort) {
+                appJsonDriver.capabilitiesOptions[capabilityId] =
+                  appJsonDriver.capabilitiesOptions[capabilityId] ?? {};
+                appJsonDriver.capabilitiesOptions[capabilityId].titleShort =
+                  appJsonDriver.capabilitiesOptions[capabilityId].titleShort ?? {};
+                appJsonDriver.capabilitiesOptions[capabilityId].titleShort[appLocaleId] =
+                  capabilityOptions.titleShort;
+              }
+
               // Driver.capabilitiesOptions[<capabilityId>].units
               if (capabilityOptions.units) {
                 appJsonDriver.capabilitiesOptions[capabilityId] =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Command-line interface and type declarations for Homey Apps",
   "main": "bin/homey.js",
   "files": [
@@ -42,7 +42,7 @@
     "fs-extra": "^10.1.0",
     "get-port": "^5.1.1",
     "homey-api": "^3.17.7",
-    "homey-lib": "^2.48.1",
+    "homey-lib": "^2.50.1",
     "ignore-walk": "^3.0.3",
     "inquirer": "8.1.2",
     "object-path": "^0.11.4",