From 7c3fccd69615578d427431a4969c9b9b98f02b36 Mon Sep 17 00:00:00 2001 From: Marcono1234 Date: Sun, 7 Nov 2021 18:24:49 +0100 Subject: [PATCH] Add JSON path supplier parameter to visitor functions --- README.md | 30 ++++-- src/impl/parser.ts | 30 +++++- src/main.ts | 29 ++++-- src/test/edit.test.ts | 2 +- src/test/format.test.ts | 2 +- src/test/json.test.ts | 199 ++++++++++++++++++++++++---------------- 6 files changed, 197 insertions(+), 95 deletions(-) diff --git a/README.md b/README.md index 6b7d47c..a05c117 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ export interface JSONScanner { */ scan(): SyntaxKind; /** - * Returns the current scan position, which is after the last read token. + * Returns the zero-based current scan position, which is after the last read token. */ getPosition(): number; /** @@ -62,7 +62,7 @@ export interface JSONScanner { */ getTokenValue(): string; /** - * The start offset of the last read token. + * The zero-based start offset of the last read token. */ getTokenOffset(): number; /** @@ -103,15 +103,29 @@ export declare function parse(text: string, errors?: {error: ParseErrorCode;}[], */ export declare function visit(text: string, visitor: JSONVisitor, options?: ParseOptions): any; +/** + * Visitor called by {@linkcode visit} when parsing JSON. + * + * The visitor functions have the following common parameters: + * - `offset`: Global offset within the JSON document, starting at 0 + * - `startLine`: Line number, starting at 0 + * - `startCharacter`: Start character (column) within the current line, starting at 0 + * + * Additionally some functions have a `pathSupplier` parameter which can be used to obtain the + * current `JSONPath` within the document. + */ export interface JSONVisitor { /** * Invoked when an open brace is encountered and an object is started. The offset and length represent the location of the open brace. */ - onObjectBegin?: (offset: number, length: number, startLine: number, startCharacter: number) => void; + onObjectBegin?: (offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; + /** * Invoked when a property is encountered. The offset and length represent the location of the property name. + * The `JSONPath` created by the `pathSupplier` refers to the enclosing JSON object, it does not include the + * property name yet. */ - onObjectProperty?: (property: string, offset: number, length: number, startLine: number, startCharacter: number) => void; + onObjectProperty?: (property: string, offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a closing brace is encountered and an object is completed. The offset and length represent the location of the closing brace. */ @@ -119,7 +133,7 @@ export interface JSONVisitor { /** * Invoked when an open bracket is encountered. The offset and length represent the location of the open bracket. */ - onArrayBegin?: (offset: number, length: number, startLine: number, startCharacter: number) => void; + onArrayBegin?: (offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a closing bracket is encountered. The offset and length represent the location of the closing bracket. */ @@ -127,7 +141,7 @@ export interface JSONVisitor { /** * Invoked when a literal value is encountered. The offset and length represent the location of the literal value. */ - onLiteralValue?: (value: any, offset: number, length: number, startLine: number, startCharacter: number) => void; + onLiteralValue?: (value: any, offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a comma or colon separator is encountered. The offset and length represent the location of the separator. */ @@ -174,6 +188,10 @@ export declare function stripComments(text: string, replaceCh?: string): string; */ export declare function getLocation(text: string, position: number): Location; +/** + * A {@linkcode JSONPath} segment. Either a string representing an object property name + * or a number (starting at 0) for array indices. + */ export declare type Segment = string | number; export declare type JSONPath = Segment[]; export interface Location { diff --git a/src/impl/parser.ts b/src/impl/parser.ts index 12124a6..518f04d 100644 --- a/src/impl/parser.ts +++ b/src/impl/parser.ts @@ -386,20 +386,29 @@ export function findNodeAtOffset(node: Node, offset: number, includeRightBound = export function visit(text: string, visitor: JSONVisitor, options: ParseOptions = ParseOptions.DEFAULT): any { const _scanner = createScanner(text, false); + // Important: Only pass copies of this to visitor functions to prevent accidental modification, and + // to not affect visitor functions which stored a reference to a previous JSONPath + const _jsonPath: JSONPath = []; function toNoArgVisit(visitFunction?: (offset: number, length: number, startLine: number, startCharacter: number) => void): () => void { return visitFunction ? () => visitFunction(_scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter()) : () => true; } + function toNoArgVisitWithPath(visitFunction?: (offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void): () => void { + return visitFunction ? () => visitFunction(_scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter(), () => _jsonPath.slice()) : () => true; + } function toOneArgVisit(visitFunction?: (arg: T, offset: number, length: number, startLine: number, startCharacter: number) => void): (arg: T) => void { return visitFunction ? (arg: T) => visitFunction(arg, _scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter()) : () => true; } + function toOneArgVisitWithPath(visitFunction?: (arg: T, offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void): (arg: T) => void { + return visitFunction ? (arg: T) => visitFunction(arg, _scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter(), () => _jsonPath.slice()) : () => true; + } - const onObjectBegin = toNoArgVisit(visitor.onObjectBegin), - onObjectProperty = toOneArgVisit(visitor.onObjectProperty), + const onObjectBegin = toNoArgVisitWithPath(visitor.onObjectBegin), + onObjectProperty = toOneArgVisitWithPath(visitor.onObjectProperty), onObjectEnd = toNoArgVisit(visitor.onObjectEnd), - onArrayBegin = toNoArgVisit(visitor.onArrayBegin), + onArrayBegin = toNoArgVisitWithPath(visitor.onArrayBegin), onArrayEnd = toNoArgVisit(visitor.onArrayEnd), - onLiteralValue = toOneArgVisit(visitor.onLiteralValue), + onLiteralValue = toOneArgVisitWithPath(visitor.onLiteralValue), onSeparator = toOneArgVisit(visitor.onSeparator), onComment = toNoArgVisit(visitor.onComment), onError = toOneArgVisit(visitor.onError); @@ -474,6 +483,8 @@ export function visit(text: string, visitor: JSONVisitor, options: ParseOptions onLiteralValue(value); } else { onObjectProperty(value); + // add property name afterwards + _jsonPath.push(value); } scanNext(); return true; @@ -521,6 +532,7 @@ export function visit(text: string, visitor: JSONVisitor, options: ParseOptions if (!parseValue()) { handleError(ParseErrorCode.ValueExpected, [], [SyntaxKind.CloseBraceToken, SyntaxKind.CommaToken]); } + _jsonPath.pop(); // remove processed property name } else { handleError(ParseErrorCode.ColonExpected, [], [SyntaxKind.CloseBraceToken, SyntaxKind.CommaToken]); } @@ -562,6 +574,7 @@ export function visit(text: string, visitor: JSONVisitor, options: ParseOptions function parseArray(): boolean { onArrayBegin(); scanNext(); // consume open bracket + let isFirstElement = true; let needsComma = false; while (_scanner.getToken() !== SyntaxKind.CloseBracketToken && _scanner.getToken() !== SyntaxKind.EOF) { @@ -577,12 +590,21 @@ export function visit(text: string, visitor: JSONVisitor, options: ParseOptions } else if (needsComma) { handleError(ParseErrorCode.CommaExpected, [], []); } + if (isFirstElement) { + _jsonPath.push(0); + isFirstElement = false; + } else { + (_jsonPath[_jsonPath.length - 1] as number)++; + } if (!parseValue()) { handleError(ParseErrorCode.ValueExpected, [], [SyntaxKind.CloseBracketToken, SyntaxKind.CommaToken]); } needsComma = true; } onArrayEnd(); + if (!isFirstElement) { + _jsonPath.pop(); // remove array index + } if (_scanner.getToken() !== SyntaxKind.CloseBracketToken) { handleError(ParseErrorCode.CloseBracketExpected, [SyntaxKind.CloseBracketToken], []); } else { diff --git a/src/main.ts b/src/main.ts index 2ff806c..868cbeb 100644 --- a/src/main.ts +++ b/src/main.ts @@ -58,7 +58,7 @@ export interface JSONScanner { */ scan(): SyntaxKind; /** - * Returns the current scan position, which is after the last read token. + * Returns the zero-based current scan position, which is after the last read token. */ getPosition(): number; /** @@ -70,7 +70,7 @@ export interface JSONScanner { */ getTokenValue(): string; /** - * The start offset of the last read token. + * The zero-based start offset of the last read token. */ getTokenOffset(): number; /** @@ -198,6 +198,10 @@ export interface Node { readonly children?: Node[]; } +/** + * A {@linkcode JSONPath} segment. Either a string representing an object property name + * or a number (starting at 0) for array indices. + */ export type Segment = string | number; export type JSONPath = Segment[]; @@ -229,16 +233,29 @@ export interface ParseOptions { allowEmptyContent?: boolean; } +/** + * Visitor called by {@linkcode visit} when parsing JSON. + * + * The visitor functions have the following common parameters: + * - `offset`: Global offset within the JSON document, starting at 0 + * - `startLine`: Line number, starting at 0 + * - `startCharacter`: Start character (column) within the current line, starting at 0 + * + * Additionally some functions have a `pathSupplier` parameter which can be used to obtain the + * current `JSONPath` within the document. + */ export interface JSONVisitor { /** * Invoked when an open brace is encountered and an object is started. The offset and length represent the location of the open brace. */ - onObjectBegin?: (offset: number, length: number, startLine: number, startCharacter: number) => void; + onObjectBegin?: (offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a property is encountered. The offset and length represent the location of the property name. + * The `JSONPath` created by the `pathSupplier` refers to the enclosing JSON object, it does not include the + * property name yet. */ - onObjectProperty?: (property: string, offset: number, length: number, startLine: number, startCharacter: number) => void; + onObjectProperty?: (property: string, offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a closing brace is encountered and an object is completed. The offset and length represent the location of the closing brace. @@ -248,7 +265,7 @@ export interface JSONVisitor { /** * Invoked when an open bracket is encountered. The offset and length represent the location of the open bracket. */ - onArrayBegin?: (offset: number, length: number, startLine: number, startCharacter: number) => void; + onArrayBegin?: (offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a closing bracket is encountered. The offset and length represent the location of the closing bracket. @@ -258,7 +275,7 @@ export interface JSONVisitor { /** * Invoked when a literal value is encountered. The offset and length represent the location of the literal value. */ - onLiteralValue?: (value: any, offset: number, length: number, startLine: number, startCharacter: number) => void; + onLiteralValue?: (value: any, offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => void; /** * Invoked when a comma or colon separator is encountered. The offset and length represent the location of the separator. diff --git a/src/test/edit.test.ts b/src/test/edit.test.ts index 808c906..d54563a 100644 --- a/src/test/edit.test.ts +++ b/src/test/edit.test.ts @@ -20,7 +20,7 @@ suite('JSON - edits', () => { lastEditOffset = edit.offset; content = content.substring(0, edit.offset) + edit.content + content.substring(edit.offset + edit.length); } - assert.equal(content, expected); + assert.strictEqual(content, expected); } let formattingOptions: FormattingOptions = { diff --git a/src/test/format.test.ts b/src/test/format.test.ts index d1d1426..4289be8 100644 --- a/src/test/format.test.ts +++ b/src/test/format.test.ts @@ -31,7 +31,7 @@ suite('JSON - formatter', () => { content = content.substring(0, edit.offset) + edit.content + content.substring(edit.offset + edit.length); } - assert.equal(content, expected); + assert.strictEqual(content, expected); } test('object - single property', () => { diff --git a/src/test/json.test.ts b/src/test/json.test.ts index 7a31887..e03e426 100644 --- a/src/test/json.test.ts +++ b/src/test/json.test.ts @@ -7,37 +7,36 @@ import * as assert from 'assert'; import { SyntaxKind, createScanner, parse, getLocation, Node, ParseError, parseTree, ParseErrorCode, - ParseOptions, Segment, findNodeAtLocation, getNodeValue, getNodePath, ScanError, Location, visit, JSONVisitor + ParseOptions, Segment, findNodeAtLocation, getNodeValue, getNodePath, ScanError, visit, JSONVisitor, JSONPath } from '../main'; -import { truncateSync } from 'fs'; function assertKinds(text: string, ...kinds: SyntaxKind[]): void { var scanner = createScanner(text); var kind: SyntaxKind; while ((kind = scanner.scan()) !== SyntaxKind.EOF) { - assert.equal(kind, kinds.shift()); - assert.equal(scanner.getTokenError(), ScanError.None, text); + assert.strictEqual(kind, kinds.shift()); + assert.strictEqual(scanner.getTokenError(), ScanError.None, text); } - assert.equal(kinds.length, 0); + assert.strictEqual(kinds.length, 0); } function assertScanError(text: string, scanError: ScanError, ...kinds: SyntaxKind[]): void { var scanner = createScanner(text); scanner.scan(); - assert.equal(scanner.getToken(), kinds.shift()); - assert.equal(scanner.getTokenError(), scanError); + assert.strictEqual(scanner.getToken(), kinds.shift()); + assert.strictEqual(scanner.getTokenError(), scanError); var kind: SyntaxKind; while ((kind = scanner.scan()) !== SyntaxKind.EOF) { - assert.equal(kind, kinds.shift()); + assert.strictEqual(kind, kinds.shift()); } - assert.equal(kinds.length, 0); + assert.strictEqual(kinds.length, 0); } function assertValidParse(input: string, expected: any, options?: ParseOptions): void { var errors: ParseError[] = []; var actual = parse(input, errors, options); - assert.deepEqual([], errors); - assert.deepEqual(actual, expected); + assert.deepStrictEqual([], errors); + assert.deepStrictEqual(actual, expected); } function assertInvalidParse(input: string, expected: any, options?: ParseOptions): void { @@ -45,18 +44,18 @@ function assertInvalidParse(input: string, expected: any, options?: ParseOptions var actual = parse(input, errors, options); assert(errors.length > 0); - assert.deepEqual(actual, expected); + assert.deepStrictEqual(actual, expected); } function assertTree(input: string, expected: any, expectedErrors: ParseError[] = []): void { var errors: ParseError[] = []; var actual = parseTree(input, errors); - assert.deepEqual(errors, expectedErrors); + assert.deepStrictEqual(errors, expectedErrors); let checkParent = (node: Node | undefined) => { if (node?.children) { for (let child of node.children) { - assert.equal(node, child.parent); + assert.strictEqual(node, child.parent); delete (child).parent; // delete to avoid recursion in deep equal checkParent(child); } @@ -64,7 +63,7 @@ function assertTree(input: string, expected: any, expectedErrors: ParseError[] = }; checkParent(actual); - assert.deepEqual(actual, expected, JSON.stringify(actual)); + assert.deepStrictEqual(actual, expected, JSON.stringify(actual)); } interface VisitorCallback { @@ -73,7 +72,8 @@ interface VisitorCallback { startLine: number; startCharacter: number; arg?: any; -}; + path?: JSONPath; +} interface VisitorError extends ParseError { startLine: number; startCharacter: number; @@ -83,14 +83,16 @@ function assertVisit(input: string, expected: VisitorCallback[], expectedErrors: let errors: VisitorError[] = []; let actuals: VisitorCallback[] = []; let noArgHalder = (id: keyof JSONVisitor) => (offset: number, length: number, startLine: number, startCharacter: number) => actuals.push({ id, text: input.substr(offset, length), startLine, startCharacter }); + let noArgHalderWithPath = (id: keyof JSONVisitor) => (offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => actuals.push({ id, text: input.substr(offset, length), startLine, startCharacter, path: pathSupplier() }); let oneArgHalder = (id: keyof JSONVisitor) => (arg: any, offset: number, length: number, startLine: number, startCharacter: number) => actuals.push({ id, text: input.substr(offset, length), startLine, startCharacter, arg }); + let oneArgHalderWithPath = (id: keyof JSONVisitor) => (arg: any, offset: number, length: number, startLine: number, startCharacter: number, pathSupplier: () => JSONPath) => actuals.push({ id, text: input.substr(offset, length), startLine, startCharacter, arg, path: pathSupplier() }); visit(input, { - onObjectBegin: noArgHalder('onObjectBegin'), - onObjectProperty: oneArgHalder('onObjectProperty'), + onObjectBegin: noArgHalderWithPath('onObjectBegin'), + onObjectProperty: oneArgHalderWithPath('onObjectProperty'), onObjectEnd: noArgHalder('onObjectEnd'), - onArrayBegin: noArgHalder('onArrayBegin'), + onArrayBegin: noArgHalderWithPath('onArrayBegin'), onArrayEnd: noArgHalder('onArrayEnd'), - onLiteralValue: oneArgHalder('onLiteralValue'), + onLiteralValue: oneArgHalderWithPath('onLiteralValue'), onSeparator: oneArgHalder('onSeparator'), onComment: noArgHalder('onComment'), onError: (error: ParseErrorCode, offset: number, length: number, startLine: number, startCharacter: number) => { @@ -99,15 +101,15 @@ function assertVisit(input: string, expected: VisitorCallback[], expectedErrors: }, { disallowComments }); - assert.deepEqual(errors, expectedErrors); - assert.deepEqual(actuals, expected, JSON.stringify(actuals)); + assert.deepStrictEqual(errors, expectedErrors); + assert.deepStrictEqual(actuals, expected, JSON.stringify(actuals)); } function assertNodeAtLocation(input: Node | undefined, segments: Segment[], expected: any) { let actual = input && findNodeAtLocation(input, segments); assert.deepEqual(actual ? getNodeValue(actual) : void 0, expected); if (actual) { - assert.deepEqual(getNodePath(actual), segments); + assert.deepStrictEqual(getNodePath(actual), segments); } } @@ -116,9 +118,9 @@ function assertLocation(input: string, expectedSegments: Segment[], expectedNode input = input.substring(0, offset) + input.substring(offset + 1, input.length); var actual = getLocation(input, offset); assert(actual); - assert.deepEqual(actual.path, expectedSegments, input); - assert.equal(actual.previousNode && actual.previousNode.type, expectedNodeType, input); - assert.equal(actual.isAtPropertyKey, expectedCompleteProperty, input); + assert.deepStrictEqual(actual.path, expectedSegments, input); + assert.strictEqual(actual.previousNode && actual.previousNode.type, expectedNodeType, input); + assert.strictEqual(actual.isAtPropertyKey, expectedCompleteProperty, input); } function assertMatchesLocation(input: string, matchingSegments: Segment[], expectedResult = true): void { @@ -126,7 +128,7 @@ function assertMatchesLocation(input: string, matchingSegments: Segment[], expec input = input.substring(0, offset) + input.substring(offset + 1, input.length); var actual = getLocation(input, offset); assert(actual); - assert.equal(actual.matches(matchingSegments), expectedResult); + assert.strictEqual(actual.matches(matchingSegments), expectedResult); } suite('JSON', () => { @@ -434,105 +436,148 @@ suite('JSON', () => { }); test('visit: object', () => { - assertVisit('{ }', [{ id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 0 }, { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 2 }]); + assertVisit('{ }', [ + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 2 }, + ]); assertVisit('{ "foo": "bar" }', [ - { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 0 }, - { id: 'onObjectProperty', text: '"foo"', startLine: 0, startCharacter: 2, arg: 'foo' }, + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onObjectProperty', text: '"foo"', startLine: 0, startCharacter: 2, arg: 'foo', path: [] }, { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 7, arg: ':' }, - { id: 'onLiteralValue', text: '"bar"', startLine: 0, startCharacter: 9, arg: 'bar' }, + { id: 'onLiteralValue', text: '"bar"', startLine: 0, startCharacter: 9, arg: 'bar', path: ['foo'] }, { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 15 }, ]); assertVisit('{ "foo": { "goo": 3 } }', [ - { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 0 }, - { id: 'onObjectProperty', text: '"foo"', startLine: 0, startCharacter: 2, arg: 'foo' }, + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onObjectProperty', text: '"foo"', startLine: 0, startCharacter: 2, arg: 'foo', path: [] }, { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 7, arg: ':' }, - { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 9 }, - { id: 'onObjectProperty', text: '"goo"', startLine: 0, startCharacter: 11, arg: 'goo' }, + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 9, path: ['foo'] }, + { id: 'onObjectProperty', text: '"goo"', startLine: 0, startCharacter: 11, arg: 'goo', path: ['foo'] }, { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 16, arg: ':' }, - { id: 'onLiteralValue', text: '3', startLine: 0, startCharacter: 18, arg: 3 }, + { id: 'onLiteralValue', text: '3', startLine: 0, startCharacter: 18, arg: 3, path: ['foo', 'goo'] }, { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 20 }, { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 22 }, ]); }); test('visit: array', () => { - assertVisit('[]', [{ id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0 }, { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 1 }]); + assertVisit('[]', [ + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 1 }, + ]); assertVisit('[ true, null, [] ]', [ - { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0 }, - { id: 'onLiteralValue', text: 'true', startLine: 0, startCharacter: 2, arg: true }, + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onLiteralValue', text: 'true', startLine: 0, startCharacter: 2, arg: true, path: [0] }, { id: 'onSeparator', text: ',', startLine: 0, startCharacter: 6, arg: ',' }, - { id: 'onLiteralValue', text: 'null', startLine: 0, startCharacter: 8, arg: null }, + { id: 'onLiteralValue', text: 'null', startLine: 0, startCharacter: 8, arg: null, path: [1] }, { id: 'onSeparator', text: ',', startLine: 0, startCharacter: 12, arg: ',' }, - { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 14 }, + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 14, path: [2] }, { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 15 }, { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 17 }, ]); assertVisit('[\r\n0,\r\n1,\r\n2\r\n]', [ - { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0 }, - { id: 'onLiteralValue', text: '0', startLine: 1, startCharacter: 0, arg: 0 }, + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onLiteralValue', text: '0', startLine: 1, startCharacter: 0, arg: 0, path: [0] }, { id: 'onSeparator', text: ',', startLine: 1, startCharacter: 1, arg: ',' }, - { id: 'onLiteralValue', text: '1', startLine: 2, startCharacter: 0, arg: 1 }, + { id: 'onLiteralValue', text: '1', startLine: 2, startCharacter: 0, arg: 1, path: [1] }, { id: 'onSeparator', text: ',', startLine: 2, startCharacter: 1, arg: ',' }, - { id: 'onLiteralValue', text: '2', startLine: 3, startCharacter: 0, arg: 2 }, - { id: 'onArrayEnd', text: ']', startLine: 4, startCharacter: 0 }]); + { id: 'onLiteralValue', text: '2', startLine: 3, startCharacter: 0, arg: 2, path: [2] }, + { id: 'onArrayEnd', text: ']', startLine: 4, startCharacter: 0 }, + ]); + }); + + test('visit: object & array', () => { + assertVisit('[ { "p1": [ { "p11": 1, "p12": [ true, [ false, 2 ] ] } ] } ]', [ + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 0, path: [] }, + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 2, path: [0] }, + { id: 'onObjectProperty', text: '"p1"', startLine: 0, startCharacter: 4, arg: 'p1', path: [0] }, + { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 8, arg: ':' }, + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 10, path: [0, 'p1'] }, + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 12, path: [0, 'p1', 0] }, + { id: 'onObjectProperty', text: '"p11"', startLine: 0, startCharacter: 14, arg: 'p11', path: [0, 'p1', 0] }, + { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 19, arg: ':' }, + { id: 'onLiteralValue', text: '1', startLine: 0, startCharacter: 21, arg: 1, path: [0, 'p1', 0, 'p11'] }, + { id: 'onSeparator', text: ',', startLine: 0, startCharacter: 22, arg: ',' }, + { id: 'onObjectProperty', text: '"p12"', startLine: 0, startCharacter: 24, arg: 'p12', path: [0, 'p1', 0] }, + { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 29, arg: ':' }, + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 31, path: [0, 'p1', 0, 'p12'] }, + { id: 'onLiteralValue', text: 'true', startLine: 0, startCharacter: 33, arg: true, path: [0, 'p1', 0, 'p12', 0] }, + { id: 'onSeparator', text: ',', startLine: 0, startCharacter: 37, arg: ',' }, + { id: 'onArrayBegin', text: '[', startLine: 0, startCharacter: 39, path: [0, 'p1', 0, 'p12', 1] }, + { id: 'onLiteralValue', text: 'false', startLine: 0, startCharacter: 41, arg: false, path: [0, 'p1', 0, 'p12', 1, 0] }, + { id: 'onSeparator', text: ',', startLine: 0, startCharacter: 46, arg: ',' }, + { id: 'onLiteralValue', text: '2', startLine: 0, startCharacter: 48, arg: 2, path: [0, 'p1', 0, 'p12', 1, 1] }, + { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 50 }, + { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 52 }, + { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 54 }, + { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 56 }, + { id: 'onObjectEnd', text: '}', startLine: 0, startCharacter: 58 }, + { id: 'onArrayEnd', text: ']', startLine: 0, startCharacter: 60 }, + ]); }); test('visit: comment', () => { assertVisit('/* g */ { "foo": //f\n"bar" }', [ { id: 'onComment', text: '/* g */', startLine: 0, startCharacter: 0 }, - { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 8 }, - { id: 'onObjectProperty', text: '"foo"', startLine: 0, startCharacter: 10, arg: 'foo' }, + { id: 'onObjectBegin', text: '{', startLine: 0, startCharacter: 8, path: [] }, + { id: 'onObjectProperty', text: '"foo"', startLine: 0, startCharacter: 10, arg: 'foo', path: [] }, { id: 'onSeparator', text: ':', startLine: 0, startCharacter: 15, arg: ':' }, { id: 'onComment', text: '//f', startLine: 0, startCharacter: 17 }, - { id: 'onLiteralValue', text: '"bar"', startLine: 1, startCharacter: 0, arg: 'bar' }, + { id: 'onLiteralValue', text: '"bar"', startLine: 1, startCharacter: 0, arg: 'bar', path: ['foo'] }, { id: 'onObjectEnd', text: '}', startLine: 1, startCharacter: 6 }, ]); assertVisit('/* g\r\n */ { "foo": //f\n"bar" }', [ { id: 'onComment', text: '/* g\r\n */', startLine: 0, startCharacter: 0 }, - { id: 'onObjectBegin', text: '{', startLine: 1, startCharacter: 4 }, - { id: 'onObjectProperty', text: '"foo"', startLine: 1, startCharacter: 6, arg: 'foo' }, + { id: 'onObjectBegin', text: '{', startLine: 1, startCharacter: 4, path: [] }, + { id: 'onObjectProperty', text: '"foo"', startLine: 1, startCharacter: 6, arg: 'foo', path: [] }, { id: 'onSeparator', text: ':', startLine: 1, startCharacter: 11, arg: ':' }, { id: 'onComment', text: '//f', startLine: 1, startCharacter: 13 }, - { id: 'onLiteralValue', text: '"bar"', startLine: 2, startCharacter: 0, arg: 'bar' }, + { id: 'onLiteralValue', text: '"bar"', startLine: 2, startCharacter: 0, arg: 'bar', path: ['foo'] }, { id: 'onObjectEnd', text: '}', startLine: 2, startCharacter: 6 }, ]); assertVisit('/* g\n */ { "foo": //f\n"bar"\n}', [ - { id: 'onObjectBegin', text: '{', startLine: 1, startCharacter: 4 }, - { id: 'onObjectProperty', text: '"foo"', startLine: 1, startCharacter: 6, arg: 'foo' }, + { id: 'onObjectBegin', text: '{', startLine: 1, startCharacter: 4, path: [] }, + { id: 'onObjectProperty', text: '"foo"', startLine: 1, startCharacter: 6, arg: 'foo', path: [] }, { id: 'onSeparator', text: ':', startLine: 1, startCharacter: 11, arg: ':' }, - { id: 'onLiteralValue', text: '"bar"', startLine: 2, startCharacter: 0, arg: 'bar' }, + { id: 'onLiteralValue', text: '"bar"', startLine: 2, startCharacter: 0, arg: 'bar', path: ['foo'] }, { id: 'onObjectEnd', text: '}', startLine: 3, startCharacter: 0 }, ], [ { error: ParseErrorCode.InvalidCommentToken, offset: 0, length: 8, startLine: 0, startCharacter: 0 }, { error: ParseErrorCode.InvalidCommentToken, offset: 18, length: 3, startLine: 1, startCharacter: 13 }, ], - true); + true + ); }); test('visit: incomplete', () => { - assertVisit('{"prop1":"foo","prop2":"foo2","prop3":{"prp1":{""}}}', [ - { id: 'onObjectBegin', text: "{", startLine: 0, startCharacter: 0 }, - { id: 'onObjectProperty', text: '"prop1"', startLine: 0, startCharacter: 1, arg: "prop1" }, - { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 8, arg: ":" }, - { id: 'onLiteralValue', text: '"foo"', startLine: 0, startCharacter: 9, arg: "foo" }, - { id: 'onSeparator', text: ",", startLine: 0, startCharacter: 14, arg: "," }, - { id: 'onObjectProperty', text: '"prop2"', startLine: 0, startCharacter: 15, arg: "prop2" }, - { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 22, arg: ":" }, - { id: 'onLiteralValue', text: '"foo2"', startLine: 0, startCharacter: 23, arg: "foo2" }, - { id: 'onSeparator', text: ",", startLine: 0, startCharacter: 29, arg: "," }, - { id: 'onObjectProperty', text: '"prop3"', startLine: 0, startCharacter: 30, arg: "prop3" }, - { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 37, arg: ":" }, - { id: 'onObjectBegin', text: "{", startLine: 0, startCharacter: 38 }, - { id: 'onObjectProperty', text: '"prp1"', startLine: 0, startCharacter: 39, arg: "prp1" }, - { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 45, arg: ":" }, - { id: 'onObjectBegin', text: "{", startLine: 0, startCharacter: 46 }, - { id: 'onObjectProperty', text: '""', startLine: 0, startCharacter: 47, arg: "" }, - { id: 'onObjectEnd', text: "}", startLine: 0, startCharacter: 49 }, - { id: 'onObjectEnd', text: "}", startLine: 0, startCharacter: 50 }, - { id: 'onObjectEnd', text: "}", startLine: 0, startCharacter: 51 } - ], [{ error: ParseErrorCode.ColonExpected, offset: 49, length: 1, startLine: 0, startCharacter: 49 }]); + assertVisit('{"prop1":"foo","prop2":"foo2","prop3":{"prp1":{""}}}', + [ + { id: 'onObjectBegin', text: "{", startLine: 0, startCharacter: 0, path: [] }, + { id: 'onObjectProperty', text: '"prop1"', startLine: 0, startCharacter: 1, arg: 'prop1', path: [] }, + { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 8, arg: ":" }, + { id: 'onLiteralValue', text: '"foo"', startLine: 0, startCharacter: 9, arg: 'foo', path: ['prop1'] }, + { id: 'onSeparator', text: ",", startLine: 0, startCharacter: 14, arg: "," }, + { id: 'onObjectProperty', text: '"prop2"', startLine: 0, startCharacter: 15, arg: 'prop2', path: [] }, + { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 22, arg: ":" }, + { id: 'onLiteralValue', text: '"foo2"', startLine: 0, startCharacter: 23, arg: 'foo2', path: ['prop2'] }, + { id: 'onSeparator', text: ",", startLine: 0, startCharacter: 29, arg: "," }, + { id: 'onObjectProperty', text: '"prop3"', startLine: 0, startCharacter: 30, arg: 'prop3', path: [] }, + { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 37, arg: ":" }, + { id: 'onObjectBegin', text: "{", startLine: 0, startCharacter: 38, path: ['prop3'] }, + { id: 'onObjectProperty', text: '"prp1"', startLine: 0, startCharacter: 39, arg: 'prp1', path: ['prop3'] }, + { id: 'onSeparator', text: ":", startLine: 0, startCharacter: 45, arg: ':' }, + { id: 'onObjectBegin', text: "{", startLine: 0, startCharacter: 46, path: ['prop3', 'prp1'] }, + { id: 'onObjectProperty', text: '""', startLine: 0, startCharacter: 47, arg: '', path: ['prop3', 'prp1'] }, + { id: 'onObjectEnd', text: "}", startLine: 0, startCharacter: 49 }, + { id: 'onObjectEnd', text: "}", startLine: 0, startCharacter: 50 }, + { id: 'onObjectEnd', text: "}", startLine: 0, startCharacter: 51 }, + ], + [ + { error: ParseErrorCode.ColonExpected, offset: 49, length: 1, startLine: 0, startCharacter: 49 }, + ] + ); assertTree('{"prop1":"foo","prop2":"foo2","prop3":{"prp1":{""}}}', { type: 'object', offset: 0, length: 52, children: [