Lint the expressions package

This commit is contained in:
Josh Gross
2023-03-15 15:22:30 -04:00
parent 28a4438faf
commit 9c8c407478
9 changed files with 21 additions and 32 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
import {Array, BooleanData, ExpressionData, Kind} from "../data";
import {BooleanData, ExpressionData, Kind} from "../data";
import {equals} from "../result";
import {FunctionDefinition} from "./info";
@@ -19,7 +19,7 @@ export const contains: FunctionDefinition = {
return new BooleanData(ls.toLowerCase().includes(rs.toLowerCase()));
}
} else if (left.kind === Kind.Array) {
const la = left as Array;
const la = left;
if (la.values().length === 0) {
return new BooleanData(false);
}
+2 -8
View File
@@ -15,7 +15,7 @@ export const format: FunctionDefinition = {
while (index < fs.length) {
const lbrace = fs.indexOf("{", index);
let rbrace = fs.indexOf("}", index);
const rbrace = fs.indexOf("}", index);
// Left brace
if (lbrace >= 0 && (rbrace < 0 || rbrace > lbrace)) {
@@ -81,7 +81,7 @@ function safeCharAt(string: string, index: number): string {
function readArgIndex(string: string, startIndex: number): ArgIndex {
// Count the number of digits
let length = 0;
while (true) {
for (;;) {
const nextChar = safeCharAt(string, startIndex + length);
if (nextChar >= "0" && nextChar <= "9") {
length++;
@@ -112,9 +112,3 @@ interface ArgIndex {
result: number;
endIndex: number;
}
interface FormatSpecifiers {
success: boolean;
result: string;
rbrace: number;
}
+1 -1
View File
@@ -18,7 +18,7 @@ export const fromjson: FunctionDefinition = {
}
try {
return JSON.parse(is, reviver);
return JSON.parse(is, reviver) as ExpressionData;
} catch (e) {
throw new ExpressionEvaluationError("Error parsing JSON when evaluating fromJson", {cause: e});
}
+2 -2
View File
@@ -1,4 +1,4 @@
import {Array, ExpressionData, Kind, StringData} from "../data";
import {ExpressionData, Kind, StringData} from "../data";
import {FunctionDefinition} from "./info";
export const join: FunctionDefinition = {
@@ -23,7 +23,7 @@ export const join: FunctionDefinition = {
// Convert items to strings
return new StringData(
(args[0] as Array)
args[0]
.values()
.map(item => item.coerceString())
.join(separator)