Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
{
"$schema": "node_modules/@biomejs/biome/configuration_schema.json",
"files": {
"ignore": ["package.json"]
"includes": ["**", "!tests"]
},
"formatter": {
"vcs": {
"enabled": true,
"useEditorconfig": true
"clientKind": "git",
"useIgnoreFile": true
},
"linter": {
"enabled": false,
"enabled": true,
"domains": {
"project": "recommended",
"react": "recommended"
},
"rules": {
"recommended": true
}
},
"organizeImports": {
"enabled": true
"formatter": {
"enabled": true,
"useEditorconfig": true
},
"vcs": {
"clientKind": "git",
"assist": {
"enabled": true,
"useIgnoreFile": true
"actions": {
"recommended": true
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"lodash.debounce": "^4.0.8"
},
"devDependencies": {
"@biomejs/biome": "1.9.4",
"@biomejs/biome": "2.0.0-beta.4",
"@testing-library/react-hooks": "3.7.0",
"@vitest/coverage-v8": "3.1.2",
"bunchee": "6.5.1",
Expand Down
9 changes: 4 additions & 5 deletions src/RecognitionManager.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import debounce from "lodash.debounce";
import { isNative } from "./NativeSpeechRecognition";
import isAndroid from "./isAndroid";
import { isNative } from "./NativeSpeechRecognition";
import { browserSupportsPolyfills, concatTranscripts } from "./utils";

export default class RecognitionManager {
Expand Down Expand Up @@ -113,7 +113,6 @@ export default class RecognitionManager {
this.pauseAfterDisconnect = false;
this.abort();
break;
case "STOP":
default:
this.pauseAfterDisconnect = true;
this.stop();
Expand All @@ -127,13 +126,13 @@ export default class RecognitionManager {
this.recognition.onend = () => {};
this.recognition.onerror = () => {};
if (this.listening) {
this.stopListening();
void this.stopListening();
}
}
}

onError(event) {
if (event && event.error && event.error === "not-allowed") {
if (event?.error && event.error === "not-allowed") {
this.emitMicrophoneAvailabilityChange(false);
this.disableRecognition();
}
Expand All @@ -146,7 +145,7 @@ export default class RecognitionManager {
this.emitListeningChange(false);
} else if (this.recognition) {
if (this.recognition.continuous) {
this.startListening({ continuous: this.recognition.continuous });
void this.startListening({ continuous: this.recognition.continuous });
} else {
this.emitListeningChange(false);
}
Expand Down
20 changes: 7 additions & 13 deletions src/SpeechRecognition.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useReducer, useRef, useState } from "react";
import NativeSpeechRecognition from "./NativeSpeechRecognition";
import RecognitionManager from "./RecognitionManager";
import { appendTranscript, clearTranscript } from "./actions";
import isAndroid from "./isAndroid";
import NativeSpeechRecognition from "./NativeSpeechRecognition";
import RecognitionManager from "./RecognitionManager";
import { transcriptReducer } from "./reducers";
import {
browserSupportsPolyfills,
Expand Down Expand Up @@ -53,14 +53,14 @@ const useSpeechRecognition = ({
const resetTranscript = useCallback(() => {
recognitionManager.resetTranscript();
dispatchClearTranscript();
}, [recognitionManager]);
}, [recognitionManager, dispatchClearTranscript]);

const testFuzzyMatch = (command, input, fuzzyMatchingThreshold) => {
const commandToString =
typeof command === "object" ? command.toString() : command;
const commandWithoutSpecials = commandToString
.replace(/[&/\\#,+()!$~%.'":*?<>{}]/g, "")
.replace(/ +/g, " ")
.replace(/ {2,}/g, " ")
.trim();
const howSimilar = compareTwoStringsUsingDiceCoefficient(
commandWithoutSpecials,
Expand Down Expand Up @@ -141,7 +141,7 @@ const useSpeechRecognition = ({
},
);
},
[resetTranscript],
[resetTranscript, testFuzzyMatch, testMatch],
);

const handleTranscriptChange = useCallback(
Expand All @@ -158,7 +158,7 @@ const useSpeechRecognition = ({
if (clearTranscriptOnListen) {
dispatchClearTranscript();
}
}, [clearTranscriptOnListen]);
}, [clearTranscriptOnListen, dispatchClearTranscript]);

useEffect(() => {
const id = SpeechRecognition.counter;
Expand All @@ -178,13 +178,7 @@ const useSpeechRecognition = ({
return () => {
recognitionManager.unsubscribe(id);
};
}, [
transcribing,
clearTranscriptOnListen,
recognitionManager,
handleTranscriptChange,
handleClearTranscript,
]);
}, [recognitionManager, handleTranscriptChange, handleClearTranscript]);

const transcript = concatTranscripts(finalTranscript, interimTranscript);
return {
Expand Down
10 changes: 5 additions & 5 deletions src/SpeechRecognition.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import { renderHook } from "@testing-library/react-hooks";
import { beforeEach, describe, expect, test, vi } from "vitest";
import { CortiSpeechRecognition } from "../tests/vendor/corti.js";
import isAndroid from "./isAndroid.js";
import RecognitionManager from "./RecognitionManager.js";
import SpeechRecognition, {
useSpeechRecognition,
} from "./SpeechRecognition.js";
import isAndroid from "./isAndroid.js";
import { browserSupportsPolyfills } from "./utils.js";

vi.mock("./isAndroid");
Expand Down Expand Up @@ -225,7 +225,7 @@ describe("SpeechRecognition", () => {
const speech = "This is a test";

await SpeechRecognition.startListening();
SpeechRecognition.abortListening();
await SpeechRecognition.abortListening();
SpeechRecognition.getRecognition().say(speech);

const { transcript, interimTranscript, finalTranscript } = result.current;
Expand Down Expand Up @@ -328,7 +328,7 @@ describe("SpeechRecognition", () => {
const speech = "This is a test";

await SpeechRecognition.startListening();
SpeechRecognition.stopListening();
await SpeechRecognition.stopListening();
SpeechRecognition.getRecognition().say(speech);

const { transcript, interimTranscript, finalTranscript } = result.current;
Expand Down Expand Up @@ -397,7 +397,7 @@ describe("SpeechRecognition", () => {
expect(result.current.interimTranscript).toBe("");
expect(result.current.finalTranscript).toBe(speech);

SpeechRecognition.stopListening();
await SpeechRecognition.stopListening();

expect(result.current.transcript).toBe(speech);
expect(result.current.interimTranscript).toBe("");
Expand All @@ -423,7 +423,7 @@ describe("SpeechRecognition", () => {
expect(result.current.interimTranscript).toBe("");
expect(result.current.finalTranscript).toBe(speech);

SpeechRecognition.stopListening();
await SpeechRecognition.stopListening();

expect(result.current.transcript).toBe(speech);
expect(result.current.interimTranscript).toBe("");
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const commandToRegExp = (command) => {
})
.replace(splatParam, "(.*?)")
.replace(optionalRegex, "\\s*$1?\\s*");
return new RegExp("^" + command + "$", "i");
return new RegExp(`^${command}$`, "i");
};

// this is from https://github.com/aceakash/string-similarity
Expand Down
Loading
Loading