Ertembiyik/update punto (#22624)

* Use Text Input Source Services API to switch layouts

* Update CHANGELOG

* Update extensions/punto/CHANGELOG.md

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Fix indentation

* Remove redundant layoutSwitchModifier preference, lint

* Remove category and source languages unused properties

* Remove redundant Equatable conformance

* Use swift tools version 5.10

* Update CHANGELOG.md

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Co-authored-by: raycastbot <[email protected]>

Author: 3 people

extensions/punto/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Punto Changelog
 
+## [Use TIS API to switch layouts] - 2025-11-05
+
+- Uses Text Input Source Services API to switch layouts instead of keyboard shortcuts approach
+
 ## [Ua layout mapping] - 2025-02-04
 
 - Added Ukrainian layout mapping to dropdown

extensions/punto/package-lock.json

@@ -20,67 +20,45 @@
   ],
   "preferences": [
     {
-      "name": "layoutSwitchModifier",
-      "title": "Layout Switch Shortcut",
-      "description": "The shortcut to switch the layout of the selected text",
-      "type": "dropdown",
-      "required": true,
-      "data": [
-        {
-          "title": "⌘Space",
-          "value": "command"
-        },
-        {
-          "title": "⌃Space",
-          "value": "control"
-        },
-        {
-          "title": "⌥Space",
-          "value": "option"
-        }
-      ],
-      "default": "control"
-    },
-    {
-      "name": "cyrLayoutName",
-      "title": "Cyrillic Layout",
-      "description": "The name of the Cyrillic layout",
+      "name": "cyrLayoutID",
+      "title": "Cyrillic Layout ID",
+      "description": "The id of the Cyrillic layout",
       "type": "dropdown",
       "required": true,
       "data": [
         {
           "title": "Russian",
-          "value": "Russian"
+          "value": "com.apple.keylayout.Russian"
         },
         {
           "title": "Russian - PC",
-          "value": "RussianWin"
+          "value": "com.apple.keylayout.RussianWin"
         },
         {
           "title": "Russian - QWERTY",
-          "value": "Russian - Phonetic"
+          "value": "com.apple.keylayout.Russian-Phonetic"
         },
         {
           "title": "Ukrainian",
-          "value": "Ukrainian - PC"
+          "value": "com.apple.keylayout.Ukrainian-PC"
         },
         {
           "title": "Ukrainian - Legacy",
-          "value": "Ukrainian"
+          "value": "com.apple.keylayout.Ukrainian"
         },
         {
           "title": "Ukrainian - QWERTY",
-          "value": "Ukrainian-QWERTY"
+          "value": "com.apple.keylayout.Ukrainian-QWERTY"
         }
       ]
     },
     {
-      "name": "latLayoutName",
-      "title": "Latin Layout",
-      "description": "The name of the Latin layout",
+      "name": "latLayoutID",
+      "title": "Latin Layout ID",
+      "description": "The id of the Latin layout",
       "type": "textfield",
       "required": true,
-      "default": "ABC"
+      "default": "com.apple.keylayout.ABC"
     },
     {
       "name": "showSuccessHUD",
@@ -93,7 +71,8 @@
     }
   ],
   "dependencies": {
-    "@raycast/api": "^1.89.0"
+    "@raycast/api": "^1.89.0",
+    "@raycast/utils": "^1.10.1"
   },
   "devDependencies": {
     "@types/node": "22.10.7",

extensions/punto/package.json

@@ -5,14 +5,14 @@ import {
   getPreferenceValues,
 } from "@raycast/api";
 import { en_ru, ru_en } from "./Dict";
-import { exec as Exec } from "child_process";
-import { promisify } from "util";
+import {
+  getAvailableInputSourceIds,
+  selectInputSource,
+} from "swift:../swift/Punto";
 
-const exec = promisify(Exec);
 interface Preferences {
-  layoutSwitchModifier: string;
-  latLayoutName: string;
-  cyrLayoutName: string;
+  latLayoutID: string;
+  cyrLayoutID: string;
   showSuccessHUD: boolean;
 }
 
@@ -53,55 +53,29 @@ async function switchKeyboardLayout(
   preferences: Preferences,
   targetLayout: Layout,
 ): Promise<void> {
-  const languages = await getInstalledLayoutNames();
-  // console.log("installed layout names are " + languages.join(", "));
+  const languageIds =
+    (await getAvailableInputSourceIds()) as unknown as string[];
+  // console.log("installed layout names are " + languageIds.join(", "));
   // console.log("target layout is " + targetLayout);
-  const targetLayoutName =
+
+  const targetLayoutID =
     targetLayout === Layout.LAT
-      ? preferences.latLayoutName
-      : preferences.cyrLayoutName;
-  if (!languages.includes(targetLayoutName)) {
+      ? preferences.latLayoutID
+      : preferences.cyrLayoutID;
+
+  if (!languageIds.includes(targetLayoutID)) {
     await showHUD(
       "Layout " +
-        targetLayoutName +
-        " is not installed. Please install it or update the preferences",
+        targetLayoutID +
+        " is not installed. Please install it or update the preferences." +
+        `Available layouts include: ${languageIds.join(", ")}`,
     );
     return;
   }
 
-  const currentLayoutName = await getActiveLayoutName();
-  // console.log("current layout name is " + currentLayoutName);
-
-  if (currentLayoutName === targetLayoutName) {
-    // console.log("already in target layout");
-    return;
-  }
-
-  // console.log("switching to " + targetLayoutName);
-  let attempts = languages.length;
+  // console.log("switching to " + targetLayoutID);
 
-  while (attempts > 0) {
-    const modifierKey = preferences.layoutSwitchModifier;
-    await exec(
-      `osascript -e 'tell application "System Events" to keystroke " " using ` +
-        modifierKey +
-        ` down'`,
-    );
-    const activeLayoutName = await getActiveLayoutName();
-    // console.log("active layout after switch is " + activeLayoutName);
-    if (activeLayoutName === targetLayoutName) {
-      if (preferences.showSuccessHUD) await showHUD("Layout switched!");
-      // console.log("layout switched");
-      return;
-    }
-    if (currentLayoutName === activeLayoutName) {
-      break;
-    }
-    attempts--;
-  }
-
-  await showHUD("Failed to switch layout, please check the preferences");
-  // console.log("failed to switch layout");
+  await selectInputSource(targetLayoutID);
 }
 
 function detectLayout(input: string): Layout {
@@ -120,23 +94,3 @@ function switchCharacterLayout(char: string): string {
     return ru_en.get(char) ?? char;
   }
 }
-
-async function getInstalledLayoutNames(): Promise<string[]> {
-  const result = await exec(
-    `defaults read ~/Library/Preferences/com.apple.HIToolbox.plist AppleEnabledInputSources`,
-  );
-  return result.stdout
-    .split("\n")
-    .filter((line) => line.includes("KeyboardLayout Name"))
-    .map((line) => line.split("=")[1].trim().replace(/;/g, ""));
-}
-
-async function getActiveLayoutName(): Promise<string> {
-  const result = await exec(
-    `defaults read ~/Library/Preferences/com.apple.HIToolbox.plist AppleSelectedInputSources`,
-  );
-  return result.stdout
-    .split("\n")
-    .filter((line) => line.includes("KeyboardLayout Name"))
-    .map((line) => line.split("=")[1].trim().replace(/;/g, ""))[0];
-}

extensions/punto/src/index.ts

@@ -0,0 +1,5 @@
+.DS_Store
+.build/
+.swiftpm/
+.vscode/
+Package.resolved