go fmt + adding 'as' attribute to link tag

Author: John Doak

html/component_else.go

@@ -17,4 +17,4 @@ type GearType interface {
 	GearID() string
 	TagType() html.HTMLAttr
 	Execute(pipe Pipeline) string
-}
+}

html/component_test.go

@@ -2,9 +2,9 @@ package html
 
 import (
 	"context"
+	"html/template"
 	"strings"
 	"testing"
-	"html/template"
 )
 
 type fakeGear struct {
@@ -33,7 +33,7 @@ func TestComponent(t *testing.T) {
 				GlobalAttrs: GlobalAttrs{
 					AccessKey: "key",
 				},
-				Gear: fakeGear{name: "myComponent"},
+				Gear:     fakeGear{name: "myComponent"},
 				TagValue: TextElement("value"),
 				Events:   (&Events{}).AddScript(OnError, "handleError"),
 			},

html/component_wasm.go

@@ -21,4 +21,4 @@ type GearType interface {
 	SetUpdateFlag()
 	RemoveUpdateFlag()
 	UpdateDOM() error
-}
+}

html/event_wasm.go

@@ -13,7 +13,7 @@ import (
 // to events in WASM code. "this" is set to the js.Value of the object that the event was attached to
 // in its state at the time of the call. root is set to the value of the root object that the "this"
 // object is within. Without componenets, this will be "document". If contained in a set of components,
-// this will be the component's shadowRoot that this element is contained within. 
+// this will be the component's shadowRoot that this element is contained within.
 // "args" represents arguments sent to this function, which are application defined.
 type WasmFunc func(this js.Value, root js.Value, args interface{})
 
@@ -23,7 +23,7 @@ type wasmEvent struct {
 	listenerEvent ListenerType
 	release       bool
 	fn            WasmFunc
-	args interface{}
+	args          interface{}
 }
 
 // Call calls the attached event passing along the component's shadowPath to allow finding the
@@ -118,7 +118,7 @@ func (e *Events) AddWasmHandler(id string, et EventType, fn WasmFunc, args inter
 			handlerEvent: et,
 			release:      release,
 			fn:           fn,
-			args: args,
+			args:         args,
 		},
 	)
 	return e
@@ -148,15 +148,15 @@ func (e *Events) AddWasmListener(id string, et ListenerType, fn WasmFunc, args i
 			listenerEvent: et,
 			release:       release,
 			fn:            fn,
-			args: args,
+			args:          args,
 		},
 	)
 	return e
 }
 
 // WasmEvents returns a list of functions that will attach Wasm events specified by
 // .AddWasm(). This is for internal use only and has no compatibility promises.
-func (e *Events) WasmEvents() ([]func(*Doc, []string)) {
+func (e *Events) WasmEvents() []func(*Doc, []string) {
 	if e.wasmEvents == nil {
 		return nil
 	}

html/form_test.go

@@ -8,16 +8,16 @@ import (
 
 func TestLabel(t *testing.T) {
 	tests := []struct {
-		desc string
-		label   *Label
-		want string
+		desc  string
+		label *Label
+		want  string
 	}{
 		{
-			desc: "Empty attributes",
-			label:   &Label{},
-			want: "<label  >\n</label>",
+			desc:  "Empty attributes",
+			label: &Label{},
+			want:  "<label  >\n</label>",
 		},
-		
+
 		{
 			desc: "All attributes + 1 global + 1 event + 1 element",
 			label: &Label{

html/i_test.go

@@ -24,8 +24,8 @@ func TestI(t *testing.T) {
 				GlobalAttrs: GlobalAttrs{
 					AccessKey: "key",
 				},
-				Element:       TextElement("text"),
-				Events:         (&Events{}).AddScript(OnError, "handleError"),
+				Element: TextElement("text"),
+				Events:  (&Events{}).AddScript(OnError, "handleError"),
 			},
 			want: `<i  accesskey="key" onerror="handleError">text
 </i>`,

html/link.go

@@ -34,6 +34,24 @@ const (
 	StylesheetRL  RelationshipLink = "stylesheet"
 )
 
+// AsLink is a a value used in the Link As attribute.
+type AsLink string
+
+const (
+	AsAudio    AsLink = "audio"
+	AsDocument AsLink = "document"
+	AsEmbed    AsLink = "embed"
+	AsFetch    AsLink = "fetch"
+	AsFont     AsLink = "font"
+	AsImage    AsLink = "image"
+	AsObject   AsLink = "object"
+	AsScript   AsLink = "script"
+	AsStyle    AsLink = "style"
+	AsTrack    AsLink = "track"
+	AsVideo    AsLink = "video"
+	AsWorker   AsLink = "worker"
+)
+
 type Sizes struct {
 	Height int
 	Width  int
@@ -80,6 +98,12 @@ type Link struct {
 	// Rel (required) specifies the relationship between the current document and the linked document.
 	Rel RelationshipLink
 
+	// As is only used when rel="preload" or rel="prefetch" has been set on the <link> element.
+	// It specifies the type of content being loaded by the <link>, which is necessary for request matching,
+	// application of correct content security policy, and setting of correct Accept request header.
+	// Furthermore, rel="preload" uses this as a signal for request prioritization.
+	As AsLink
+
 	// Sizes specifies the size of the linked resource. Only for rel="icon".
 	Sizes Sizes
 

html/link_test.go

@@ -36,14 +36,15 @@ func TestLink(t *testing.T) {
 				Href:           u,
 				CrossOrigin:    AnnonymousCO,
 				HrefLang:       "english",
+				As:             AsVideo,
 				Media:          "media",
 				ReferrerPolicy: Origin,
 				Rel:            AlternateRL,
 				Sizes:          Sizes{Width: 5, Height: 10},
 				Type:           "type",
 			},
 			want: `<link href="/subpage" crossorigin="anonymous" hreflang="english" media="media" ` +
-				`referrerpolicy="origin" rel="alternate" sizes="10x5" type="type" accesskey="key">`,
+				`referrerpolicy="origin" rel="alternate" as="video" sizes="10x5" type="type" accesskey="key">`,
 		},
 	}
 

html/textarea.go

@@ -19,7 +19,7 @@ type WrapType string
 const (
 	// SoftWrap specifies the text in the textarea is not wrapped when submitted in a form. This is default.
 	SoftWrap WrapType = "soft"
-	// HardWrap specifies the text in the textarea is wrapped (contains newlines) 
+	// HardWrap specifies the text in the textarea is wrapped (contains newlines)
 	// when submitted in a form. When "hard" is used, the cols attribute must be specified.
 	HardWrap WrapType = "hard"
 )

html/textarea_test.go

@@ -8,30 +8,30 @@ import (
 
 func TestTextArea(t *testing.T) {
 	tests := []struct {
-		desc string
+		desc     string
 		textArea *TextArea
-		want string
+		want     string
 	}{
 		{
 			desc: "All attributes + 1 global + 1 event ",
 			textArea: &TextArea{
 				GlobalAttrs: GlobalAttrs{
 					AccessKey: "key",
 				},
-				Name: "name",
-				Form: "formid",
-				Cols: 10,
-				MaxLength: 1000,
-				Rows: 40,
-				DirName: "name.dir",
-				Wrap: HardWrap,
+				Name:        "name",
+				Form:        "formid",
+				Cols:        10,
+				MaxLength:   1000,
+				Rows:        40,
+				DirName:     "name.dir",
+				Wrap:        HardWrap,
 				Placeholder: "placeholder",
-				AutoFocus: true,
-				Disabled: true,
-				ReadOnly: true, 
-				Required: true,
-				Element: TextElement("text"),
-				Events:   (&Events{}).AddScript(OnError, "handleError"),
+				AutoFocus:   true,
+				Disabled:    true,
+				ReadOnly:    true,
+				Required:    true,
+				Element:     TextElement("text"),
+				Events:      (&Events{}).AddScript(OnError, "handleError"),
 			},
 
 			want: strings.TrimSpace(`