From f566d0a8f7da06c21129d3b00293cde6db1d94bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Duvieusart=20De=CC=81ry?= Date: Wed, 6 Mar 2024 11:22:23 -0500 Subject: [PATCH] fix: undo type undo-type-update An update to the TS definition in https://github.com/jsonata-js/jsonata/pull/633 is causing issues in transformers-jsonata since we are using both 1.x and 2.x versions in there and types do not align anymore. Reverting the change for now. We overwrite the type of the NodeExpr in mappings anyway, and so this should be fine for now. --- jsonata.d.ts | 92 +++++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/jsonata.d.ts b/jsonata.d.ts index 257aac07..8c3b2134 100644 --- a/jsonata.d.ts +++ b/jsonata.d.ts @@ -2,52 +2,62 @@ // Project: https://github.com/jsonata-js/jsonata // Definitions by: Nick and Michael M. Tiller -declare function jsonata(str: string, options?: jsonata.JsonataOptions): jsonata.Expression; +declare function jsonata( + str: string, + options?: jsonata.JsonataOptions +): jsonata.Expression; declare namespace jsonata { + interface JsonataOptions { + recover?: boolean; + RegexEngine?: RegExp; + } - interface JsonataOptions { - recover?: boolean, - RegexEngine?: RegExp - } + interface ExprNode { + type: string; + value?: any; + position?: number; + arguments?: ExprNode[]; + name?: string; + procedure?: ExprNode; + steps?: ExprNode[]; + expressions?: ExprNode[]; + stages?: ExprNode[]; + lhs?: ExprNode; + rhs?: ExprNode; + } - interface ExprNode { - type: string; - value?: any; - position?: number; - arguments?: ExprNode[]; - name?: string; - procedure?: ExprNode; - steps?: ExprNode[]; - expressions?: ExprNode[]; - stages?: ExprNode[]; - lhs?: ExprNode[]; - rhs?: ExprNode; - } + interface JsonataError extends Error { + code: string; + position: number; + token: string; + } - interface JsonataError extends Error { - code: string; - position: number; - token: string; - } + interface Environment { + bind(name: string, value: any): void; + lookup(name: string): any; + readonly timestamp: Date; + readonly async: boolean; + } - interface Environment { - bind(name: string, value: any): void; - lookup(name: string): any; - readonly timestamp: Date; - readonly async: boolean; - } - - interface Focus { - readonly environment: Environment; - readonly input: any; - } - interface Expression { - evaluate(input: any, bindings?: Record): Promise; - evaluate(input: any, bindings: Record | undefined, callback: (err: JsonataError, resp: any) => void): void; - assign(name: string, value: any): void; - registerFunction(name: string, implementation: (this: Focus, ...args: any[]) => any, signature?: string): void; - ast(): ExprNode; - } + interface Focus { + readonly environment: Environment; + readonly input: any; + } + interface Expression { + evaluate(input: any, bindings?: Record): Promise; + evaluate( + input: any, + bindings: Record | undefined, + callback: (err: JsonataError, resp: any) => void + ): void; + assign(name: string, value: any): void; + registerFunction( + name: string, + implementation: (this: Focus, ...args: any[]) => any, + signature?: string + ): void; + ast(): ExprNode; + } } export = jsonata;