Merge pull request #590 from eemeli/update-deps

Update dependencies & fix minor TS issue
projectfluent · Apr 29, 2022 · d101b90 · d101b90
2 parents 5406b34 + ebd98dc
commit d101b90
Show file tree

Hide file tree

Showing 6 changed files with 3,282 additions and 3,162 deletions.
diff --git a/fluent-langneg/src/negotiate_languages.ts b/fluent-langneg/src/negotiate_languages.ts
@@ -1,4 +1,4 @@
-import {filterMatches} from "./matches.js";
+import { filterMatches } from "./matches.js";
 
 export interface NegotiateLanguagesOptions {
   strategy?: "filtering" | "matching" | "lookup";
@@ -51,22 +51,19 @@ export interface NegotiateLanguagesOptions {
 export function negotiateLanguages(
   requestedLocales: Readonly<Array<string>>,
   availableLocales: Readonly<Array<string>>,
-  {
-    strategy = "filtering",
-    defaultLocale,
-  }: NegotiateLanguagesOptions = {}
+  { strategy = "filtering", defaultLocale }: NegotiateLanguagesOptions = {}
 ): Array<string> {
-
   const supportedLocales = filterMatches(
-    Array.from(Object(requestedLocales)).map(String),
-    Array.from(Object(availableLocales)).map(String),
+    Array.from(requestedLocales ?? []).map(String),
+    Array.from(availableLocales ?? []).map(String),
     strategy
   );
 
   if (strategy === "lookup") {
     if (defaultLocale === undefined) {
       throw new Error(
-        "defaultLocale cannot be undefined for strategy `lookup`");
+        "defaultLocale cannot be undefined for strategy `lookup`"
+      );
     }
     if (supportedLocales.length === 0) {
       supportedLocales.push(defaultLocale);

diff --git a/fluent-syntax/src/ast.ts b/fluent-syntax/src/ast.ts
@@ -47,7 +47,7 @@ export abstract class BaseNode {
     return true;
   }
 
-  clone(): BaseNode {
+  clone(): this {
     function visit(value: unknown): unknown {
       if (value instanceof BaseNode) {
         return value.clone();
@@ -57,7 +57,8 @@ export abstract class BaseNode {
       }
       return value;
     }
-    const clone = Object.create(this.constructor.prototype) as BaseNode;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    const clone = Object.create(this.constructor.prototype) as this;
     for (const prop of Object.keys(this)) {
       clone[prop] = visit(this[prop]);
     }

diff --git a/fluent-syntax/src/visitor.ts b/fluent-syntax/src/visitor.ts
@@ -106,7 +106,7 @@ export abstract class Transformer extends Visitor {
       } else if (Array.isArray(prop)) {
         let newVals: Array<AST.BaseNode> = [];
         for (let element of prop) {
-          let newVal = this.visit(element);
+          let newVal = this.visit(element as AST.BaseNode);
           if (newVal !== undefined) {
             newVals.push(newVal);
           }
@@ -127,10 +127,12 @@ export abstract class Transformer extends Visitor {
   visitNumberLiteral?(node: AST.NumberLiteral): AST.BaseNode | undefined;
   visitMessageReference?(node: AST.MessageReference): AST.BaseNode | undefined;
   visitTermReference?(node: AST.TermReference): AST.BaseNode | undefined;
-  visitVariableReference?(node: AST.VariableReference):
-  AST.BaseNode | undefined;
-  visitFunctionReference?(node: AST.FunctionReference):
-  AST.BaseNode | undefined;
+  visitVariableReference?(
+    node: AST.VariableReference
+  ): AST.BaseNode | undefined;
+  visitFunctionReference?(
+    node: AST.FunctionReference
+  ): AST.BaseNode | undefined;
   visitSelectExpression?(node: AST.SelectExpression): AST.BaseNode | undefined;
   visitCallArguments?(node: AST.CallArguments): AST.BaseNode | undefined;
   visitAttribute?(node: AST.Attribute): AST.BaseNode | undefined;