Merge pull request #128 from myitcv/remove_aria_hack

react: revert Aria hack; JSX parsing to follow

Author: myitcv

.vendor.txt

@@ -3,7 +3,7 @@
     ./_vendor/src/golang.org/x/crypto                        3cb07270c9455e8ad27956a70891c962d121a228  https://go.googlesource.com/crypto
     ./_vendor/src/golang.org/x/tools                         620ecdb8d7943e20dc030b61bfe898d1b000bdea  https://go.googlesource.com/tools
     ./_vendor/src/github.com/jteeuwen/go-bindata             a0ff2567cfb70903282db057e799fd826784d41d  [email protected]:jteeuwen/go-bindata
-    ./_vendor/src/github.com/gopherjs/gopherjs               558a9132744c22476178edf3126fd35a9754f565  [email protected]:gopherjs/gopherjs
+    ./_vendor/src/github.com/gopherjs/gopherjs               e14987c0ef06db387b90fec85e8d06dc05598e24  [email protected]:gopherjs/gopherjs
     ./_vendor/src/github.com/gopherjs/jsbuiltin              67703bfb044e3192fbcab025c3aeaeedafad1f2f  [email protected]:gopherjs/jsbuiltin
     ./_vendor/src/github.com/kisielk/gotool                  0de1eaf82fa3f583ce21fde859f1e7e0c5e9b220  [email protected]:kisielk/gotool
     ./_vendor/src/github.com/fsnotify/fsnotify               7d7316ed6e1ed2de075aab8dfc76de5d158d66e1  [email protected]:fsnotify/fsnotify

_vendor/src/github.com/gopherjs/gopherjs/compiler/expressions.go

@@ -516,9 +516,9 @@ func (c *funcContext) translateExpr(expr ast.Expr) *expression {
 			fields, jsTag := c.translateSelection(sel, e.Pos())
 			if jsTag != "" {
 				if _, ok := sel.Type().(*types.Signature); ok {
-					return c.formatExpr("$internalize(%1e.%2s.%3s, %4s, %1e.%2s)", e.X, strings.Join(fields, "."), jsTag, c.typeName(sel.Type()))
+					return c.formatExpr("$internalize(%1e.%2s%3s, %4s, %1e.%2s)", e.X, strings.Join(fields, "."), formatJSStructTagVal(jsTag), c.typeName(sel.Type()))
 				}
-				return c.internalize(c.formatExpr("%e.%s.%s", e.X, strings.Join(fields, "."), jsTag), sel.Type())
+				return c.internalize(c.formatExpr("%e.%s%s", e.X, strings.Join(fields, "."), formatJSStructTagVal(jsTag)), sel.Type())
 			}
 			return c.formatExpr("%e.%s", e.X, strings.Join(fields, "."))
 		case types.MethodVal:
@@ -669,7 +669,7 @@ func (c *funcContext) translateExpr(expr ast.Expr) *expression {
 			case types.FieldVal:
 				fields, jsTag := c.translateSelection(sel, f.Pos())
 				if jsTag != "" {
-					call := c.formatExpr("%e.%s.%s(%s)", f.X, strings.Join(fields, "."), jsTag, externalizeArgs(e.Args))
+					call := c.formatExpr("%e.%s%s(%s)", f.X, strings.Join(fields, "."), formatJSStructTagVal(jsTag), externalizeArgs(e.Args))
 					switch sig.Results().Len() {
 					case 0:
 						return call

_vendor/src/github.com/gopherjs/gopherjs/compiler/statements.go

@@ -703,7 +703,7 @@ func (c *funcContext) translateAssign(lhs, rhs ast.Expr, define bool) string {
 		}
 		fields, jsTag := c.translateSelection(sel, l.Pos())
 		if jsTag != "" {
-			return fmt.Sprintf("%s.%s.%s = %s;", c.translateExpr(l.X), strings.Join(fields, "."), jsTag, c.externalize(rhsExpr.String(), sel.Type()))
+			return fmt.Sprintf("%s.%s%s = %s;", c.translateExpr(l.X), strings.Join(fields, "."), formatJSStructTagVal(jsTag), c.externalize(rhsExpr.String(), sel.Type()))
 		}
 		return fmt.Sprintf("%s.%s = %s;", c.translateExpr(l.X), strings.Join(fields, "."), rhsExpr)
 	case *ast.StarExpr:

_vendor/src/github.com/gopherjs/gopherjs/compiler/utils.go

@@ -12,6 +12,8 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"text/template"
+	"unicode"
 
 	"github.com/gopherjs/gopherjs/compiler/analysis"
 	"github.com/gopherjs/gopherjs/compiler/typesutil"
@@ -643,3 +645,29 @@ func endsWithReturn(stmts []ast.Stmt) bool {
 func encodeIdent(name string) string {
 	return strings.Replace(url.QueryEscape(name), "%", "$", -1)
 }
+
+// formatJSStructTagVal returns JavaScript code for accessing an object's property
+// identified by jsTag. It prefers the dot notation over the bracket notation when
+// possible, since the dot notation produces slightly smaller output.
+//
+// For example:
+//
+// 	"my_name" -> ".my_name"
+// 	"my name" -> `["my name"]`
+//
+// For more information about JavaScript property accessors and identifiers, see
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Property_Accessors and
+// https://developer.mozilla.org/en-US/docs/Glossary/Identifier.
+//
+func formatJSStructTagVal(jsTag string) string {
+	for i, r := range jsTag {
+		ok := unicode.IsLetter(r) || (i != 0 && unicode.IsNumber(r)) || r == '$' || r == '_'
+		if !ok {
+			// Saw an invalid JavaScript identifier character,
+			// so use bracket notation.
+			return `["` + template.JSEscapeString(jsTag) + `"]`
+		}
+	}
+	// Safe to use dot notation without any escaping.
+	return "." + jsTag
+}

_vendor/src/github.com/gopherjs/gopherjs/js/js_test.go

@@ -597,3 +597,26 @@ func TestTypeSwitchJSObject(t *testing.T) {
 		}
 	}
 }
+
+func TestStructWithNonIdentifierJSTag(t *testing.T) {
+	type S struct {
+		*js.Object
+		Name string `js:"@&\"'<>//my name"`
+	}
+	s := S{Object: js.Global.Get("Object").New()}
+
+	// externalise a value via field
+	s.Name = "Paul"
+
+	// internalise via field
+	got := s.Name
+	if want := "Paul"; got != want {
+		t.Errorf("value via field with non-identifier js tag gave %q, want %q", got, want)
+	}
+
+	// verify we can do a Get with the struct tag
+	got = s.Get("@&\"'<>//my name").String()
+	if want := "Paul"; got != want {
+		t.Errorf("value via js.Object.Get gave %q, want %q", got, want)
+	}
+}

core.go

@@ -28,13 +28,16 @@ type DataSet map[string]string
 type BasicHTMLElement struct {
 	*BasicElement
 
+	AriaHasPopup   bool   `js:"aria-haspopup"`
+	AriaExpanded   bool   `js:"aria-expanded"`
+	AriaLabelledBy string `js:"aria-labelledby"`
+
 	ID        string `js:"id" react:"omitempty"`
 	Key       string `js:"key" react:"omitempty"`
 	ClassName string `js:"className"`
 	Role      string `js:"role"`
 	Style     *CSS   `js:"style"`
 
-	AriaSet
 	DataSet
 
 	OnChange `js:"onChange"`

examples/sites/syntaxviewer/app.go

@@ -75,22 +75,20 @@ func (a AppDef) Render() react.Element {
 				&react.DivProps{ClassName: "dropdown", Style: &react.CSS{Float: "right"}},
 				react.Button(
 					&react.ButtonProps{
-						ClassName: "btn btn-default dropdown-toggle",
-						Type:      "button",
-						ID:        "dropdownMenu1",
-						DataSet:   react.DataSet{"toggle": "dropdown"},
-						AriaSet: react.AriaSet{
-							"haspopup": "true",
-							"expanded": "true",
-						},
+						ClassName:    "btn btn-default dropdown-toggle",
+						Type:         "button",
+						ID:           "dropdownMenu1",
+						DataSet:      react.DataSet{"toggle": "dropdown"},
+						AriaHasPopup: true,
+						AriaExpanded: true,
 					},
 					react.S(s.Name+" "),
 					react.Span(&react.SpanProps{ClassName: "caret"}),
 				),
 				react.Ul(
 					&react.UlProps{
-						ClassName: "dropdown-menu dropdown-menu-right",
-						AriaSet:   react.AriaSet{"labelledby": "dropdownMenu1"},
+						ClassName:      "dropdown-menu dropdown-menu-right",
+						AriaLabelledBy: "dropdownMenu1",
 					},
 					buildLi(a.State().Go),
 					buildLi(a.State().Shell),