Changeset 288473 in webkit for trunk/Source/JavaScriptCore/parser/Nodes.h

Timestamp:

Jan 24, 2022, 2:51:13 PM (3 years ago)

Author:

[email protected]

Message:

[JSC] Support import assertion syntax
​https://bugs.webkit.org/show_bug.cgi?id=235312

Reviewed by Ross Kirsling.

JSTests:

• modules/import-meta-syntax.js:

(shouldThrow):

• stress/import-syntax.js:
• stress/modules-syntax-error.js:
• stress/modules-syntax-import-assertion-error.js: Added.

(shouldThrow):

• stress/modules-syntax-import-assertion.js: Added.

LayoutTests/imported/w3c:

• web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/css-module-worker-test-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/css-module/import-css-module-dynamic-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.any-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/import-assertions/dynamic-import-with-assertion-argument.any.worker-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset-bom.any-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/charset-bom.any.worker-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/invalid-content-type.any.worker-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/json-module-service-worker-test.https-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.any-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.any.worker-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any-expected.txt:
• web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/repeated-imports.any.worker-expected.txt:
• web-platform-tests/service-workers/service-worker/dedicated-worker-service-worker-interception.https-expected.txt:
• web-platform-tests/workers/dedicated-worker-parse-error-failure-expected.txt:
• web-platform-tests/workers/modules/dedicated-worker-options-credentials-expected.txt:

Source/JavaScriptCore:

This patch adds syntax support for import assertion[1].
This does not add the actual feature propagating import assertion
to the module request yet.

[1]: ​https://github.com/tc39/proposal-import-assertions

• bytecompiler/NodesCodegen.cpp:

(JSC::ImportNode::emitBytecode):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createImportExpr):
(JSC::ASTBuilder::createImportAssertionList):
(JSC::ASTBuilder::appendImportAssertion):
(JSC::ASTBuilder::createImportDeclaration):
(JSC::ASTBuilder::createExportAllDeclaration):
(JSC::ASTBuilder::createExportNamedDeclaration):

• parser/NodeConstructors.h:

(JSC::ImportNode::ImportNode):
(JSC::ImportDeclarationNode::ImportDeclarationNode):
(JSC::ExportAllDeclarationNode::ExportAllDeclarationNode):
(JSC::ExportNamedDeclarationNode::ExportNamedDeclarationNode):

• parser/Nodes.h:
• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseImportAssertions):
(JSC::Parser<LexerType>::parseImportDeclaration):
(JSC::Parser<LexerType>::parseExportDeclaration):
(JSC::Parser<LexerType>::parseMemberExpression):

• parser/Parser.h:
• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createImportExpr):
(JSC::SyntaxChecker::createImportAssertionList):
(JSC::SyntaxChecker::appendImportAssertion):
(JSC::SyntaxChecker::createImportDeclaration):
(JSC::SyntaxChecker::createExportAllDeclaration):
(JSC::SyntaxChecker::createExportNamedDeclaration):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::JSC_DEFINE_HOST_FUNCTION):

• runtime/OptionsList.h:

File:

• trunk/Source/JavaScriptCore/parser/Nodes.h (modified) (8 diffs)

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -628 +628 @@
     class ImportNode final : public ExpressionNode, public ThrowableExpressionData {
     public:
-        ImportNode(const JSTokenLocation&, ExpressionNode*);
+        ImportNode(const JSTokenLocation&, ExpressionNode*, ExpressionNode*);
 
     private:
@@ -635 +635 @@
 
         ExpressionNode* m_expr;
+        ExpressionNode* m_option;
     };
 
@@ -2058 +2059 @@
     };
 
+    class ImportAssertionListNode final : public ParserArenaDeletable {
+        JSC_MAKE_PARSER_ARENA_DELETABLE_ALLOCATED(ImportAssertionListNode);
+    public:
+        using Assertions = Vector<std::tuple<const Identifier*, const Identifier*>, 3>;
+
+        const Assertions& assertions() const { return m_assertions; }
+        void append(const Identifier& key, const Identifier& value)
+        {
+            m_assertions.append(std::tuple { &key, &value });
+        }
+
+    private:
+        Assertions m_assertions;
+    };
+
     class ModuleDeclarationNode : public StatementNode {
     public:
@@ -2070 +2086 @@
     class ImportDeclarationNode final : public ModuleDeclarationNode {
     public:
-        ImportDeclarationNode(const JSTokenLocation&, ImportSpecifierListNode*, ModuleNameNode*);
+        ImportDeclarationNode(const JSTokenLocation&, ImportSpecifierListNode*, ModuleNameNode*, ImportAssertionListNode*);
 
         ImportSpecifierListNode* specifierList() const { return m_specifierList; }
         ModuleNameNode* moduleName() const { return m_moduleName; }
+        ImportAssertionListNode* assertionList() const { return m_assertionList; }
 
     private:
@@ -2081 +2098 @@
         ImportSpecifierListNode* m_specifierList;
         ModuleNameNode* m_moduleName;
+        ImportAssertionListNode* m_assertionList;
     };
 
     class ExportAllDeclarationNode final : public ModuleDeclarationNode {
     public:
-        ExportAllDeclarationNode(const JSTokenLocation&, ModuleNameNode*);
+        ExportAllDeclarationNode(const JSTokenLocation&, ModuleNameNode*, ImportAssertionListNode*);
 
         ModuleNameNode* moduleName() const { return m_moduleName; }
+        ImportAssertionListNode* assertionList() const { return m_assertionList; }
 
     private:
@@ -2094 +2113 @@
 
         ModuleNameNode* m_moduleName;
+        ImportAssertionListNode* m_assertionList;
     };
 
@@ -2151 +2171 @@
     class ExportNamedDeclarationNode final : public ModuleDeclarationNode {
     public:
-        ExportNamedDeclarationNode(const JSTokenLocation&, ExportSpecifierListNode*, ModuleNameNode*);
+        ExportNamedDeclarationNode(const JSTokenLocation&, ExportSpecifierListNode*, ModuleNameNode*, ImportAssertionListNode*);
 
         ExportSpecifierListNode* specifierList() const { return m_specifierList; }
         ModuleNameNode* moduleName() const { return m_moduleName; }
+        ImportAssertionListNode* assertionList() const { return m_assertionList; }
 
     private:
@@ -2161 +2182 @@
         ExportSpecifierListNode* m_specifierList;
         ModuleNameNode* m_moduleName { nullptr };
+        ImportAssertionListNode* m_assertionList { nullptr };
     };