forked from WebKit/WebKit
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JSC] Implement JSON.parse source text access proposal
https://bugs.webkit.org/show_bug.cgi?id=248031 rdar://102646189 Reviewed by NOBODY (OOPS!). This patch implements JSON.parse source text access proposal[1], which is now stage-3. However, we found that the proposal has a critical bug, which causes crash[2]. So, we do not enable this by default until it is fixed. Right now, JSC is adding non-specified guards to avoid crashes due to [2], but this breaks the compatibility of the behavior of JSON.parse, so we are not enabling this feature. We will expect that some semantics changes will happen in the proposal. This patch implements two major things in the proposal. 1. JSON.rawJSON mechaism. Now new object type is integrated, and JSON.rawJSON can wrap JSON text with this object, which is a tool to inject raw JSON text into JSON.stringify. JSON.stringify uses held string from rawJSON-created object. 2. JSON.parse collects source information during parsing, and offer substring of text as a third parameter of JSON.parse reviver function. (but right now, this has a spec bug). [1]: https://github.com/tc39/proposal-json-parse-with-source [2]: tc39/proposal-json-parse-with-source#39 * JSTests/stress/json-parse-source-text-access.js: Added. (shouldBe): * JSTests/stress/json-raw-json-stringify.js: Added. (shouldBe): (shouldBe.JSON.stringify): * JSTests/stress/json-raw-json.js: Added. (shouldBe): (shouldThrow): (SyntaxError.JSON.Parse.error.Single.quotes.shouldThrow): * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: * Source/JavaScriptCore/Sources.txt: * Source/JavaScriptCore/heap/Heap.cpp: * Source/JavaScriptCore/heap/Heap.h: * Source/JavaScriptCore/runtime/CommonIdentifiers.h: * Source/JavaScriptCore/runtime/JSGlobalObject.cpp: (JSC::createJSONProperty): (JSC::JSGlobalObject::init): * Source/JavaScriptCore/runtime/JSGlobalObject.h: (JSC::JSGlobalObject::rawJSONObjectStructure const): * Source/JavaScriptCore/runtime/JSONObject.cpp: (JSC::JSONObject::finishCreation): (JSC::Stringifier::appendStringifiedValue): (JSC::Walker::Walker): (JSC::Walker::callReviver): (JSC::Walker::walk): (JSC::JSC_DEFINE_HOST_FUNCTION): * Source/JavaScriptCore/runtime/JSONObject.h: * Source/JavaScriptCore/runtime/JSRawJSONObject.cpp: Added. (JSC::JSRawJSONObject::JSRawJSONObject): (JSC::JSRawJSONObject::finishCreation): (JSC::JSRawJSONObject::createStructure): (JSC::JSRawJSONObject::rawJSON): * Source/JavaScriptCore/runtime/JSRawJSONObject.h: Copied from Source/JavaScriptCore/runtime/JSONObject.h. * Source/JavaScriptCore/runtime/LiteralParser.cpp: (JSC::LiteralParser<CharType>::tryJSONPParse): (JSC::LiteralParser<CharType>::parse): * Source/JavaScriptCore/runtime/LiteralParser.h: (JSC::JSONRanges::JSONRanges): (JSC::JSONRanges::root const): (JSC::LiteralParser::tryLiteralParse): (JSC::LiteralParser::tryLiteralParsePrimitiveValue): (JSC::LiteralParser::Lexer::Lexer): (JSC::LiteralParser::Lexer::start const): * Source/JavaScriptCore/runtime/OptionsList.h:
- Loading branch information
1 parent
3244603
commit 8d3885f
Showing
17 changed files
with
630 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| //@ requireOptions("--useJSONSourceTextAccess=1") | ||
|
|
||
| function shouldBe(actual, expected) { | ||
| if (actual !== expected) | ||
| throw new Error('bad value: ' + actual); | ||
| } | ||
|
|
||
| const digitsToBigInt = (key, val, {source}) => /^[0-9]+$/.test(source) ? BigInt(source) : val; | ||
|
|
||
| const bigIntToRawJSON = (key, val) => typeof val === "bigint" ? JSON.rawJSON(String(val)) : val; | ||
|
|
||
| const tooBigForNumber = BigInt(Number.MAX_SAFE_INTEGER) + 2n; | ||
| shouldBe(JSON.parse(String(tooBigForNumber), digitsToBigInt), tooBigForNumber); | ||
|
|
||
| const wayTooBig = BigInt("1" + "0".repeat(1000)); | ||
| shouldBe(JSON.parse(String(wayTooBig), digitsToBigInt), wayTooBig); | ||
|
|
||
| const embedded = JSON.stringify({ tooBigForNumber }, bigIntToRawJSON); | ||
| shouldBe(embedded, '{"tooBigForNumber":9007199254740993}'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| //@ requireOptions("--useJSONSourceTextAccess=1") | ||
|
|
||
| function shouldBe(actual, expected) { | ||
| if (actual !== expected) | ||
| throw new Error('bad value: ' + actual); | ||
| } | ||
|
|
||
| var object = { | ||
| "Hello": JSON.rawJSON(`"World"`) | ||
| }; | ||
|
|
||
| shouldBe(JSON.stringify(object), `{"Hello":"World"}`); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| //@ requireOptions("--useJSONSourceTextAccess=1") | ||
|
|
||
| function shouldBe(actual, expected) { | ||
| if (actual !== expected) | ||
| throw new Error('bad value: ' + actual); | ||
| } | ||
|
|
||
| function shouldThrow(func, errorMessage) { | ||
| var errorThrown = false; | ||
| var error = null; | ||
| try { | ||
| func(); | ||
| } catch (e) { | ||
| errorThrown = true; | ||
| error = e; | ||
| } | ||
| if (!errorThrown) | ||
| throw new Error('not thrown'); | ||
| if (String(error) !== errorMessage) | ||
| throw new Error(`bad error: ${String(error)}`); | ||
| } | ||
|
|
||
| shouldThrow(() => { | ||
| JSON.rawJSON("42: 42"); | ||
| }, `SyntaxError: JSON Parse error: Unexpected content at end of JSON literal`); | ||
| shouldThrow(() => { | ||
| JSON.rawJSON("42n"); | ||
| }, `SyntaxError: JSON Parse error: Unexpected content at end of JSON literal`); | ||
| shouldThrow(() => { | ||
| JSON.rawJSON("[]"); | ||
| }, `SyntaxError: JSON Parse error: Could not parse value expression`); | ||
| shouldThrow(() => { | ||
| JSON.rawJSON("{}"); | ||
| }, `SyntaxError: JSON Parse error: Could not parse value expression`); | ||
| shouldThrow(() => { | ||
| JSON.rawJSON("'string'"); | ||
| }, `SyntaxError: JSON Parse error: Single quotes (') are not allowed in JSON`); | ||
| shouldThrow(() => { | ||
| JSON.rawJSON("Hello"); | ||
| }, `SyntaxError: JSON Parse error: Unexpected identifier "Hello"`); | ||
|
|
||
| var texts = [ | ||
| '42', | ||
| 'null', | ||
| 'false', | ||
| 'true', | ||
| '"Hello"', | ||
| ]; | ||
|
|
||
| for (let text of texts) { | ||
| let object = JSON.rawJSON(text); | ||
| shouldBe(typeof object, "object"); | ||
| shouldBe(JSON.isRawJSON(object), true); | ||
| shouldBe(Object.isFrozen(object), true); | ||
| shouldBe(Object.getPrototypeOf(object), null); | ||
| shouldBe(object.rawJSON, text); | ||
| } | ||
| shouldBe(JSON.isRawJSON({}), false); | ||
| shouldBe(JSON.isRawJSON({rawJSON:"hello"}), false); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.