return null when labels.len() <= 2

discordjs-japan · May 25, 2024 · ec1af49 · ec1af49
1 parent d33a735
commit ec1af49
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -64,7 +64,7 @@ class SyrinxStream extends Readable {
    * @param {(error?: Error | null) => void} callback
    */
   async _construct(callback) {
-    /** @type {[import("./native").PreparedSynthesizer, null] | [null, Error]} */
+    /** @type {[import("./native").PreparedSynthesizer | null, null] | [null, Error]} */
     const [synthesizer, error] = await this._syrinx
       .prepare(this._inputText, this._option)
       .then(

diff --git a/lib/native.d.ts b/lib/native.d.ts
@@ -136,7 +136,7 @@ export interface SyrinxConfig {
 export class Syrinx {
   static fromConfig(config: SyrinxConfig): Syrinx
   static fromConfigAsync(config: SyrinxConfig): Promise<Syrinx>
-  prepare(inputText: string, option: SynthesisOption): Promise<PreparedSynthesizer>
+  prepare(inputText: string, option: SynthesisOption): Promise<PreparedSynthesizer | null>
 }
 export class PreparedSynthesizer {
   synthesize(push: (...args: [err: null, frame: Buffer] | [err: Error, frame: null]) => void): Promise<void>

diff --git a/src/lib.rs b/src/lib.rs
@@ -55,7 +55,7 @@ impl Syrinx {
     AsyncTask::new(FromConfigTask { config })
   }
 
-  #[napi(ts_return_type = "Promise<PreparedSynthesizer>")]
+  #[napi(ts_return_type = "Promise<PreparedSynthesizer | null>")]
   pub fn prepare(&self, input_text: String, option: SynthesisOption) -> AsyncTask<PrepareTask> {
     let worker = self.0.clone();
     AsyncTask::new(PrepareTask {
@@ -121,8 +121,8 @@ pub struct PrepareTask {
 }
 
 impl Task for PrepareTask {
-  type Output = PreparedSynthesizer;
-  type JsValue = PreparedSynthesizer;
+  type Output = Option<PreparedSynthesizer>;
+  type JsValue = Option<PreparedSynthesizer>;
 
   fn compute(&mut self) -> napi::Result<Self::Output> {
     self
@@ -136,6 +136,10 @@ impl Task for PrepareTask {
       .extract_fullcontext(&self.input_text)
       .map_err(|err| Error::new(Status::InvalidArg, err))?;
 
+    if labels.len() <= 2 {
+      return Ok(None);
+    }
+
     let generator = self
       .worker
       .jbonsai
@@ -144,10 +148,10 @@ impl Task for PrepareTask {
     let encoder: Box<dyn Encoder> =
       Encoder::new(&self.worker.jbonsai.condition, &self.worker.encoder_config)?;
 
-    Ok(PreparedSynthesizer {
+    Ok(Some(PreparedSynthesizer {
       generator: Some(Box::new(generator)),
       encoder: Some(encoder),
-    })
+    }))
   }
 
   fn resolve(&mut self, _: Env, output: Self::Output) -> napi::Result<Self::JsValue> {