Changeset 270923 in webkit

Timestamp:

Dec 16, 2020, 6:46:48 PM (6 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Accept arbitrary module namespace identifier names
​https://bugs.webkit.org/show_bug.cgi?id=217576
JSTests:

<rdar://problem/70416104>

Reviewed by Darin Adler.

• modules/arbitrary-module-names.js: Added.
• modules/arbitrary-module-names/export.js: Added.
• modules/arbitrary-module-names/export2.js: Added.
• stress/modules-syntax-error.js:
• test262/config.yaml:

Source/JavaScriptCore:

<rdar://problem/70416104>

Reviewed by Darin Adler.

This patch implements arbitrary module namespace identifier names[1].
After this, we can export and import arbitrary module export names which are not valid as a variable identifier.
For example,

import { "delete" as deletedValue } from "./ok.js";

...

export {

deletedValue as "delete"

};

[1]: ​https://github.com/tc39/ecma262/pull/2154

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseImportClauseItem):
(JSC::Parser<LexerType>::parseImportDeclaration):
(JSC::Parser<LexerType>::parseExportSpecifier):
(JSC::Parser<LexerType>::parseExportDeclaration):

• parser/Parser.h:

Source/WebCore:

Reviewed by Darin Adler.

• bindings/js/JSDOMConvertStrings.cpp:

(WebCore::hasUnpairedSurrogate): Deleted.

Source/WTF:

Reviewed by Darin Adler.

• wtf/text/StringView.h:

(WTF::hasUnpairedSurrogate):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/modules/arbitrary-module-names (added)
• JSTests/modules/arbitrary-module-names.js (added)
• JSTests/modules/arbitrary-module-names/export.js (added)
• JSTests/modules/arbitrary-module-names/export2.js (added)
• JSTests/stress/modules-syntax-error.js (modified) (7 diffs)
• JSTests/test262/config.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (7 diffs)
• Source/JavaScriptCore/parser/Parser.h (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/text/StringView.h (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMConvertStrings.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-12-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Accept arbitrary module namespace identifier names
+        https://bugs.webkit.org/show_bug.cgi?id=217576
+        <rdar://problem/70416104>
+
+        Reviewed by Darin Adler.
+
+        * modules/arbitrary-module-names.js: Added.
+        * modules/arbitrary-module-names/export.js: Added.
+        * modules/arbitrary-module-names/export2.js: Added.
+        * stress/modules-syntax-error.js:
+        * test262/config.yaml:
+
 2020-12-15  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/JSTests/stress/modules-syntax-error.js

@@ -22 +22 @@
 checkModuleSyntaxError(String.raw`
 import {,} from "Cocoa"
-`, `SyntaxError: Unexpected token ','. Expected an imported name for the import declaration.:2`);
+`, `SyntaxError: Unexpected token ','. Expected an imported name or a module export name string for the import declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
@@ -159 +159 @@
 checkModuleSyntaxError(String.raw`
 import a, { [assign] as c } from "Cocoa"
-`, `SyntaxError: Unexpected token '['. Expected an imported name for the import declaration.:2`);
+`, `SyntaxError: Unexpected token '['. Expected an imported name or a module export name string for the import declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
@@ -167 +167 @@
 checkModuleSyntaxError(String.raw`
 import d, { {obj} } from "Cappuccino"
-`, `SyntaxError: Unexpected token '{'. Expected an imported name for the import declaration.:2`);
+`, `SyntaxError: Unexpected token '{'. Expected an imported name or a module export name string for the import declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
@@ -185 +185 @@
 checkModuleSyntaxError(String.raw`
 export { , } from "Cocoa"
-`, `SyntaxError: Unexpected token ','. Expected a variable name for the export declaration.:2`);
+`, `SyntaxError: Unexpected token ','. Expected a variable name or a module export name string for the export declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
 export { a, , } from "Cocoa"
-`, `SyntaxError: Unexpected token ','. Expected a variable name for the export declaration.:2`);
+`, `SyntaxError: Unexpected token ','. Expected a variable name or a module export name string for the export declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
@@ -201 +201 @@
 checkModuleSyntaxError(String.raw`
 export { * as b } from "Cocoa"
-`, `SyntaxError: Unexpected token '*'. Expected a variable name for the export declaration.:2`);
+`, `SyntaxError: Unexpected token '*'. Expected a variable name or a module export name string for the export declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
@@ -209 +209 @@
 checkModuleSyntaxError(String.raw`
 export * as 42 from "Cocoa"
-`, `SyntaxError: Unexpected number '42'. Expected an exported name for the export declaration.:2`);
+`, `SyntaxError: Unexpected number '42'. Expected an exported name or a module export name string for the export declaration.:2`);
 
 checkModuleSyntaxError(String.raw`
@@ -317 +317 @@
 `, `SyntaxError: Unexpected keyword 'export':3`);
 
+checkModuleSyntaxError(String.raw`
+import { "\ud800" as test } from "./ok.js"
+`, String.raw`SyntaxError: Unexpected string literal "\ud800". Expected a well-formed-unicode string for the module export name.:2`);
+
+checkModuleSyntaxError(String.raw`
+import { "test" } from "./ok.js"
+`, String.raw`SyntaxError: Unexpected token '}'. Expected 'as' after the module export name string.:2`);
+
+checkModuleSyntaxError(String.raw`
+export { "test" }
+`, String.raw`SyntaxError: Cannot use module export names if they reference variable names in the current module.:3`);
+
+checkModuleSyntaxError(String.raw`
+export { "test" as "ok" }
+`, String.raw`SyntaxError: Cannot use module export names if they reference variable names in the current module.:3`);
+
+checkModuleSyntaxError(String.raw`
+export { "\ud800" } from "./ok.js"
+`, String.raw`SyntaxError: Unexpected string literal "\ud800". Expected a well-formed-unicode string for the module export name.:2`);
+
+checkModuleSyntaxError(String.raw`
+export { ok as "\ud800" } from "./ok.js"
+`, String.raw`SyntaxError: Unexpected string literal "\ud800". Expected a well-formed-unicode string for the module export name.:2`);
+
+checkModuleSyntaxError(String.raw`
+export { "hello" as "\ud800" } from "./ok.js"
+`, String.raw`SyntaxError: Unexpected string literal "\ud800". Expected a well-formed-unicode string for the module export name.:2`);
+
+checkModuleSyntaxError(String.raw`
+export { "\ud800" as "hello" } from "./ok.js"
+`, String.raw`SyntaxError: Unexpected string literal "\ud800". Expected a well-formed-unicode string for the module export name.:2`);
+
+checkModuleSyntaxError(String.raw`
+export * as "\ud800" from "./ok.js"
+`, String.raw`SyntaxError: Unexpected string literal "\ud800". Expected a well-formed-unicode string for the module export name.:2`);
+
 // --------------- other ---------------------
 

trunk/JSTests/test262/config.yaml

@@ -20 +20 @@
     - legacy-regexp
 
-    - arbitrary-module-namespace-names
     - class-methods-private
     - class-static-methods-private

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-12-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Accept arbitrary module namespace identifier names
+        https://bugs.webkit.org/show_bug.cgi?id=217576
+        <rdar://problem/70416104>
+
+        Reviewed by Darin Adler.
+
+        This patch implements arbitrary module namespace identifier names[1].
+        After this, we can export and import arbitrary module export names which are not valid as a variable identifier.
+        For example,
+
+            import { "delete" as deletedValue } from "./ok.js";
+
+            ...
+
+            export {
+                deletedValue as "delete"
+            };
+
+        [1]: https://github.com/tc39/ecma262/pull/2154
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseImportClauseItem):
+        (JSC::Parser<LexerType>::parseImportDeclaration):
+        (JSC::Parser<LexerType>::parseExportSpecifier):
+        (JSC::Parser<LexerType>::parseExportDeclaration):
+        * parser/Parser.h:
+
 2020-12-16  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -3415 +3415 @@
         // ImportedBinding
         // IdentifierName as ImportedBinding
+        // ModuleExportName as ImportedBinding
         // e.g.
         //     A
         //     A as B
-        ASSERT(matchIdentifierOrKeyword());
-        localNameToken = m_token;
+        ASSERT(matchIdentifierOrKeyword() || match(STRING));
+        bool isModuleExportName = match(STRING);
         localName = m_token.m_data.ident;
         importedName = localName;
-        next();
-
-        if (matchContextualKeyword(m_vm.propertyNames->as)) {
+        localNameToken = m_token;
+        if (isModuleExportName)
+            failIfTrue(hasUnpairedSurrogate(localName->string()), "Expected a well-formed-unicode string for the module export name");
+        next();
+
+        bool useAs = matchContextualKeyword(m_vm.propertyNames->as);
+        if (isModuleExportName)
+            failIfFalse(useAs, "Expected 'as' after the module export name string");
+        if (useAs) {
             next();
             failIfFalse(matchSpecIdentifier(), "Expected a variable name for the import declaration");
@@ -3503 +3510 @@
 
             while (!match(CLOSEBRACE)) {
-                failIfFalse(matchIdentifierOrKeyword(), "Expected an imported name for the import declaration");
+                failIfFalse(matchIdentifierOrKeyword() || match(STRING), "Expected an imported name or a module export name string for the import declaration");
                 auto specifier = parseImportClauseItem(context, ImportSpecifierType::NamedImport);
                 failIfFalse(specifier, "Cannot parse the named import");
@@ -3529 +3536 @@
 
 template <typename LexerType>
-template <class TreeBuilder> typename TreeBuilder::ExportSpecifier Parser<LexerType>::parseExportSpecifier(TreeBuilder& context, Vector<std::pair<const Identifier*, const Identifier*>>& maybeExportedLocalNames, bool& hasKeywordForLocalBindings)
+template <class TreeBuilder> typename TreeBuilder::ExportSpecifier Parser<LexerType>::parseExportSpecifier(TreeBuilder& context, Vector<std::pair<const Identifier*, const Identifier*>>& maybeExportedLocalNames, bool& hasKeywordForLocalBindings, bool& hasReferencedModuleExportNames)
 {
     // ExportSpecifier :
     // IdentifierName
     // IdentifierName as IdentifierName
+    // IdentifierName as ModuleExportName
+    // ModuleExportName
+    // ModuleExportName as IdentifierName
+    // ModuleExportName as ModuleExportName
     // http://www.ecma-international.org/ecma-262/6.0/#sec-exports
-    ASSERT(matchIdentifierOrKeyword());
+    ASSERT(matchIdentifierOrKeyword() || match(STRING));
     JSTokenLocation specifierLocation(tokenLocation());
-    if (m_token.m_type & KeywordTokenFlag)
-        hasKeywordForLocalBindings = true;
     const Identifier* localName = m_token.m_data.ident;
     const Identifier* exportedName = localName;
+    if (match(STRING)) {
+        hasReferencedModuleExportNames = true;
+        failIfTrue(hasUnpairedSurrogate(exportedName->string()), "Expected a well-formed-unicode string for the module export name");
+    } else {
+        if (m_token.m_type & KeywordTokenFlag)
+            hasKeywordForLocalBindings = true;
+    }
     next();
 
     if (matchContextualKeyword(m_vm.propertyNames->as)) {
         next();
-        failIfFalse(matchIdentifierOrKeyword(), "Expected an exported name for the export declaration");
+        failIfFalse(matchIdentifierOrKeyword() || match(STRING), "Expected an exported name or a module export name string for the export declaration");
         exportedName = m_token.m_data.ident;
+        if (match(STRING))
+            failIfTrue(hasUnpairedSurrogate(exportedName->string()), "Expected a well-formed-unicode string for the module export name");
         next();
     }
@@ -3567 +3585 @@
         // export * FromClause ;
         // export * as IdentifierName FromClause ;
+        // export * as ModuleExportName FromClause ;
         next();
 
@@ -3574 +3593 @@
             next();
             specifierLocation = JSTokenLocation(tokenLocation());
-            failIfFalse(matchIdentifierOrKeyword(), "Expected an exported name for the export declaration");
+            failIfFalse(matchIdentifierOrKeyword() || match(STRING), "Expected an exported name or a module export name string for the export declaration");
             exportedName = m_token.m_data.ident;
+            if (match(STRING))
+                failIfTrue(hasUnpairedSurrogate(exportedName->string()), "Expected a well-formed-unicode string for the module export name");
             next();
         }
@@ -3704 +3725 @@
 
         bool hasKeywordForLocalBindings = false;
+        bool hasReferencedModuleExportNames = false;
         while (!match(CLOSEBRACE)) {
-            failIfFalse(matchIdentifierOrKeyword(), "Expected a variable name for the export declaration");
-            auto specifier = parseExportSpecifier(context, maybeExportedLocalNames, hasKeywordForLocalBindings);
+            failIfFalse(matchIdentifierOrKeyword() || match(STRING), "Expected a variable name or a module export name string for the export declaration");
+            auto specifier = parseExportSpecifier(context, maybeExportedLocalNames, hasKeywordForLocalBindings, hasReferencedModuleExportNames);
             failIfFalse(specifier, "Cannot parse the named export");
             context.appendExportSpecifier(specifierList, specifier);
@@ -3719 +3741 @@
             moduleName = parseModuleName(context);
             failIfFalse(moduleName, "Cannot parse the 'from' clause");
-        }
+        } else
+            semanticFailIfTrue(hasReferencedModuleExportNames, "Cannot use module export names if they reference variable names in the current module");
         failIfFalse(autoSemiColon(), "Expected a ';' following a targeted export declaration");
 

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -1785 +1785 @@
     template <class TreeBuilder> typename TreeBuilder::ModuleName parseModuleName(TreeBuilder&);
     template <class TreeBuilder> TreeStatement parseImportDeclaration(TreeBuilder&);
-    template <class TreeBuilder> typename TreeBuilder::ExportSpecifier parseExportSpecifier(TreeBuilder& context, Vector<std::pair<const Identifier*, const Identifier*>>& maybeExportedLocalNames, bool& hasKeywordForLocalBindings);
+    template <class TreeBuilder> typename TreeBuilder::ExportSpecifier parseExportSpecifier(TreeBuilder& context, Vector<std::pair<const Identifier*, const Identifier*>>& maybeExportedLocalNames, bool& hasKeywordForLocalBindings, bool& hasReferencedModuleExportNames);
     template <class TreeBuilder> TreeStatement parseExportDeclaration(TreeBuilder&);
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-12-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Accept arbitrary module namespace identifier names
+        https://bugs.webkit.org/show_bug.cgi?id=217576
+
+        Reviewed by Darin Adler.
+
+        * wtf/text/StringView.h:
+        (WTF::hasUnpairedSurrogate):
+
 2020-12-15  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WTF/wtf/text/StringView.h

@@ -1088 +1088 @@
 WTF_EXPORT_PRIVATE int codePointCompare(StringView, StringView);
 
+inline bool hasUnpairedSurrogate(StringView string)
+{
+    // Fast path for 8-bit strings; they can't have any surrogates.
+    if (string.is8Bit())
+        return false;
+    for (auto codePoint : string.codePoints()) {
+        if (U_IS_SURROGATE(codePoint))
+            return true;
+    }
+    return false;
+}
+
 } // namespace WTF
 
@@ -1094 +1106 @@
 using WTF::StringView;
 using WTF::StringViewWithUnderlyingString;
+using WTF::hasUnpairedSurrogate;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Accept arbitrary module namespace identifier names
+        https://bugs.webkit.org/show_bug.cgi?id=217576
+
+        Reviewed by Darin Adler.
+
+        * bindings/js/JSDOMConvertStrings.cpp:
+        (WebCore::hasUnpairedSurrogate): Deleted.
+
 2020-12-16  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMConvertStrings.cpp

@@ -63 +63 @@
 }
 
-static inline bool hasUnpairedSurrogate(StringView string)
-{
-    // Fast path for 8-bit strings; they can't have any surrogates.
-    if (string.is8Bit())
-        return false;
-    for (auto codePoint : string.codePoints()) {
-        if (U_IS_SURROGATE(codePoint))
-            return true;
-    }
-    return false;
-}
-
 static inline String stringToUSVString(String&& string)
 {