Define return type of parse() in subclasses of Expression

acalcutt · Jul 18, 2021 · 4e72829 · 4e72829
1 parent 9fe8cf6
commit 4e72829
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/src/style-spec/expression/definitions/at.ts b/src/style-spec/expression/definitions/at.ts
@@ -19,7 +19,7 @@ class At implements Expression {
         this.input = input;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length !== 3)
             return context.error(`Expected 2 arguments, but found ${args.length - 1} instead.`);
 

diff --git a/src/style-spec/expression/definitions/case.ts b/src/style-spec/expression/definitions/case.ts
@@ -21,7 +21,7 @@ class Case implements Expression {
         this.otherwise = otherwise;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length < 4)
             return context.error(`Expected at least 3 arguments, but found only ${args.length - 1}.`);
         if (args.length % 2 !== 0)

diff --git a/src/style-spec/expression/definitions/coalesce.ts b/src/style-spec/expression/definitions/coalesce.ts
@@ -17,7 +17,7 @@ class Coalesce implements Expression {
         this.args = args;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length < 2) {
             return context.error("Expectected at least one argument.");
         }

diff --git a/src/style-spec/expression/definitions/in.ts b/src/style-spec/expression/definitions/in.ts
@@ -27,7 +27,7 @@ class In implements Expression {
         this.haystack = haystack;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length !== 3) {
             return context.error(`Expected 2 arguments, but found ${args.length - 1} instead.`);
         }

diff --git a/src/style-spec/expression/definitions/index_of.ts b/src/style-spec/expression/definitions/index_of.ts
@@ -29,7 +29,7 @@ class IndexOf implements Expression {
         this.fromIndex = fromIndex;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length <= 2 ||  args.length >= 5) {
             return context.error(`Expected 3 or 4 arguments, but found ${args.length - 1} instead.`);
         }

diff --git a/src/style-spec/expression/definitions/interpolate.ts b/src/style-spec/expression/definitions/interpolate.ts
@@ -58,7 +58,7 @@ class Interpolate implements Expression {
         return t;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         let [operator, interpolation, input, ...rest] = args;
 
         if (!Array.isArray(interpolation) || interpolation.length === 0) {

diff --git a/src/style-spec/expression/definitions/length.ts b/src/style-spec/expression/definitions/length.ts
@@ -17,7 +17,7 @@ class Length implements Expression {
         this.input = input;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length !== 2)
             return context.error(`Expected 1 argument, but found ${args.length - 1} instead.`);
 

diff --git a/src/style-spec/expression/definitions/let.ts b/src/style-spec/expression/definitions/let.ts
@@ -25,7 +25,7 @@ class Let implements Expression {
         fn(this.result);
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length < 4)
             return context.error(`Expected at least 3 arguments, but found ${args.length - 1} instead.`);
 

diff --git a/src/style-spec/expression/definitions/literal.ts b/src/style-spec/expression/definitions/literal.ts
@@ -16,7 +16,7 @@ class Literal implements Expression {
         this.value = value;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length !== 2)
             return context.error(`'literal' expression requires exactly one argument, but found ${args.length - 1} instead.`);
 

diff --git a/src/style-spec/expression/definitions/match.ts b/src/style-spec/expression/definitions/match.ts
@@ -32,7 +32,7 @@ class Match implements Expression {
         this.otherwise = otherwise;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length < 5)
             return context.error(`Expected at least 4 arguments, but found only ${args.length - 1}.`);
         if (args.length % 2 !== 1)

diff --git a/src/style-spec/expression/definitions/slice.ts b/src/style-spec/expression/definitions/slice.ts
@@ -29,7 +29,7 @@ class Slice implements Expression {
 
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length <= 2 ||  args.length >= 5) {
             return context.error(`Expected 3 or 4 arguments, but found ${args.length - 1} instead.`);
         }

diff --git a/src/style-spec/expression/definitions/step.ts b/src/style-spec/expression/definitions/step.ts
@@ -27,7 +27,7 @@ class Step implements Expression {
         }
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length - 1 < 4) {
             return context.error(`Expected at least 4 arguments, but found only ${args.length - 1}.`);
         }

diff --git a/src/style-spec/expression/definitions/var.ts b/src/style-spec/expression/definitions/var.ts
@@ -14,7 +14,7 @@ class Var implements Expression {
         this.boundExpression = boundExpression;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length !== 2 || typeof args[1] !== 'string')
             return context.error(`'var' expression requires exactly one string literal argument.`);
 

diff --git a/src/style-spec/expression/definitions/within.ts b/src/style-spec/expression/definitions/within.ts
@@ -291,7 +291,7 @@ class Within implements Expression {
         this.geometries = geometries;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext) {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | undefined | null {
         if (args.length !== 2)
             return context.error(`'within' expression requires exactly one argument, but found ${args.length - 1} instead.`);
         if (isValue(args[1])) {