diff --git a/packages/cursorless-engine/package.json b/packages/cursorless-engine/package.json index 0159f82145..5117cd8790 100644 --- a/packages/cursorless-engine/package.json +++ b/packages/cursorless-engine/package.json @@ -30,13 +30,13 @@ "@cursorless/common": "workspace:*", "@cursorless/node-common": "workspace:*", "@cursorless/sentence-parser": "workspace:*", + "@cursorless/talon-tools": "^0.7.0", "immer": "^11.1.4", "immutability-helper": "^3.1.1", "itertools": "^2.6.0", "lodash-es": "^4.17.23", "moo": "^0.5.3", "nearley": "^2.20.1", - "talon-snippets": "^1.3.0", "uuid": "^13.0.0", "zod": "^4.3.6" }, diff --git a/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts b/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts index f3eca4e4d8..539544cc25 100644 --- a/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts +++ b/packages/cursorless-engine/src/actions/GenerateSnippet/GenerateSnippet.ts @@ -13,7 +13,7 @@ import { type SnippetFile, type SnippetHeader, type SnippetVariable, -} from "talon-snippets"; +} from "@cursorless/talon-tools"; import type { Snippets } from "../../core/Snippets"; import { ide } from "../../singletons/ide.singleton"; import type { Target } from "../../typings/target.types"; diff --git a/packages/cursorless-vscode/package.json b/packages/cursorless-vscode/package.json index 34d14befbd..1a0b71b47a 100644 --- a/packages/cursorless-vscode/package.json +++ b/packages/cursorless-vscode/package.json @@ -1287,7 +1287,6 @@ "lodash-es": "^4.17.23", "nearley": "^2.20.1", "semver": "^7.7.4", - "talon-snippets": "^1.3.0", "trie-search": "^2.2.1", "uuid": "^13.0.0", "vscode-uri": "^3.1.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 14b0c020ad..b8885d3c1a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -285,6 +285,9 @@ importers: '@cursorless/sentence-parser': specifier: workspace:* version: link:../sentence-parser + '@cursorless/talon-tools': + specifier: ^0.7.0 + version: 0.7.0 immer: specifier: ^11.1.4 version: 11.1.4 @@ -303,9 +306,6 @@ importers: nearley: specifier: ^2.20.1 version: 2.20.1(patch_hash=0db19a2c501b16f37fbd86a94190d4a790184cea1061bf2e07f24eb076d4f2cf) - talon-snippets: - specifier: ^1.3.0 - version: 1.3.0 uuid: specifier: ^13.0.0 version: 13.0.0 @@ -689,9 +689,6 @@ importers: semver: specifier: ^7.7.4 version: 7.7.4 - talon-snippets: - specifier: ^1.3.0 - version: 1.3.0 trie-search: specifier: ^2.2.1 version: 2.2.1 @@ -2060,6 +2057,10 @@ packages: peerDependencies: postcss: ^8.4 + '@cursorless/talon-tools@0.7.0': + resolution: {integrity: sha512-P7sJyKC61UfhX2P+5KIV9pME7qx6M7L4tgDGOO7RNSrfoTXsP+SSjFDh/0zxyXinO9J3J6acCf/z+acIEIbVWA==} + hasBin: true + '@cursorless/tree-sitter-wasms@0.7.0': resolution: {integrity: sha512-yGmyFb75nmicYyXqKm0TMEydA8QF76kr/+dvBcu9eSN093CKijLYYgsg3xGU44K3lUI2Vjfec5OJ4tyaYssahA==} @@ -3104,6 +3105,9 @@ packages: resolution: {integrity: sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==} engines: {node: ^18.17.0 || >=20.5.0} + '@one-ini/wasm@0.2.1': + resolution: {integrity: sha512-TUqERXGNTifZ9y2g3wPxQrw3HpHv/02DsW3D90T9x0hhonrL1ZqpSmNrU2XkoIq0fP1N6gZfVQzy2Fw1ZvGBNg==} + '@opentelemetry/api@1.9.0': resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==} engines: {node: '>=8.0.0'} @@ -5388,6 +5392,10 @@ packages: resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} engines: {node: '>=18'} + commander@14.0.3: + resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==} + engines: {node: '>=20'} + commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -5927,6 +5935,11 @@ packages: eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + editorconfig@3.0.2: + resolution: {integrity: sha512-T0ix8GhtxyKVfUFEcvdNDt3YGqlwkFHbD4/5bgFUDgFmxhI/cSRAeJ87/Sz//Cq8Eam6JX/e23RkoFO71P7aAA==} + engines: {node: '>=20'} + hasBin: true + ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -6575,6 +6588,10 @@ packages: get-source@2.0.12: resolution: {integrity: sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==} + get-stdin@10.0.0: + resolution: {integrity: sha512-eWSePJ4zXFdqz+/Lyfopob4rIcoF/U2XfE8nJc7iZV6lnebWc9k7DoQQpX+2a9jc0AOvBsXvbe5YkjXl/MHbpg==} + engines: {node: '>=20'} + get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} @@ -10261,10 +10278,6 @@ packages: tailwindcss@4.2.1: resolution: {integrity: sha512-/tBrSQ36vCleJkAOsy9kbNTgaxvGbyOamC30PRePTQe/o1MFwEKHQk4Cn7BNGaPtjp+PuUrByJehM1hgxfq4sw==} - talon-snippets@1.3.0: - resolution: {integrity: sha512-iFc1ePBQyaqZ73TL0lVgY+G8/DBfFTSiBRVdT2wT1CdPDips6usxSkBmXKGTDgHYJKstQx/NpXhIc0vXiAL4Kw==} - deprecated: 'Deprecated: use @cursorless/talon-tools instead.' - tapable@2.3.0: resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==} engines: {node: '>=6'} @@ -12345,6 +12358,14 @@ snapshots: dependencies: postcss: 8.5.8 + '@cursorless/talon-tools@0.7.0': + dependencies: + '@cursorless/tree-sitter-wasms': 0.7.0 + editorconfig: 3.0.2 + fast-glob: 3.3.3 + get-stdin: 10.0.0 + web-tree-sitter: 0.26.6 + '@cursorless/tree-sitter-wasms@0.7.0': {} '@dabh/diagnostics@2.0.8': @@ -13957,6 +13978,8 @@ snapshots: dependencies: semver: 7.7.4 + '@one-ini/wasm@0.2.1': {} + '@opentelemetry/api@1.9.0': optional: true @@ -16920,6 +16943,8 @@ snapshots: commander@12.1.0: {} + commander@14.0.3: {} + commander@2.20.3: {} commander@5.1.0: {} @@ -17470,6 +17495,13 @@ snapshots: eastasianwidth@0.2.0: {} + editorconfig@3.0.2: + dependencies: + '@one-ini/wasm': 0.2.1 + commander: 14.0.3 + minimatch: 10.2.4 + semver: 7.7.4 + ee-first@1.1.1: {} electron-to-chromium@1.5.307: {} @@ -18350,6 +18382,8 @@ snapshots: data-uri-to-buffer: 2.0.2 source-map: 0.6.1 + get-stdin@10.0.0: {} + get-stream@6.0.1: {} get-symbol-description@1.1.0: @@ -22850,8 +22884,6 @@ snapshots: tailwindcss@4.2.1: {} - talon-snippets@1.3.0: {} - tapable@2.3.0: {} tar@7.5.10: