[next] Release next version of the compiler

.changeset/afraid-elephants-live.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Add `fragment` node types to AST definitions, expose Fragment helper to utils

.changeset/chilled-colts-kick.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Adds metadata on client:only components

.changeset/long-kids-wait.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Expose AST types via `@astrojs/compiler/types`

.changeset/modern-dots-destroy.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Export `./types` rather than `./types.d.ts`

.changeset/poor-maps-fly.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix edge case with Fragment parsing in head, add `fragment` node to AST output

.changeset/pre.json

@@ -0,0 +1,24 @@
+{
+  "mode": "pre",
+  "tag": "next",
+  "initialVersions": {
+    "@astrojs/compiler": "0.9.2"
+  },
+  "changesets": [
+    "chilled-colts-kick",
+    "long-kids-wait",
+    "modern-dots-destroy",
+    "poor-maps-fly",
+    "purple-jobs-retire",
+    "quick-lamps-stare",
+    "short-tips-begin",
+    "strange-humans-roll",
+    "stupid-colts-grab",
+    "tasty-garlics-call",
+    "thirty-jobs-jam",
+    "unlucky-swans-destroy",
+    "wicked-forks-do",
+    "wise-shrimps-knock",
+    "yellow-numbers-leave"
+  ]
+}

.changeset/purple-jobs-retire.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix <slot> behavior inside of head

.changeset/quick-lamps-stare.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Improve head injection behavior

.changeset/short-tips-begin.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Update exposed types

.changeset/strange-humans-roll.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Remove usage of `escapeHTML` util

.changeset/stupid-colts-grab.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Export all types from shared types

.changeset/tasty-garlics-call.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': minor
+---
+
+Do not render implicit tags created during the parsing process

.changeset/thirty-jobs-jam.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix `head` behavior and a bug related to ParseFragment

.changeset/unlucky-swans-destroy.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Adds a warning when using an expression with a hoisted script

.changeset/wicked-forks-do.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': minor
+---
+
+Remove "as" option, treats all documents as fragments that generate no implicit tags

.changeset/wise-shrimps-knock.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': minor
+---
+
+Add `parse` function which generates an AST

.changeset/yellow-numbers-leave.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': minor
+---
+
+Adds support for `Astro.self` (as accepted in the [Recursive Components RFC](https://github.com/withastro/rfcs/blob/main/active-rfcs/0000-recursive-components.md)).

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: Test
 
 on:
   push:
-    branches: ['main']
+    branches: ['main', 'next']
   pull_request:
-    branches: ['main']
+    branches: ['main', 'next']
 
 # Automatically cancel in-progress actions on the same branch
 concurrency:
@@ -53,7 +53,7 @@ jobs:
         run: yarn build:compiler
 
       - name: Test WASM
-        run: yarn test
+        run: yarn test:ci
 
   lint:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - next
 
 jobs:
   release:

cmd/astro-wasm/astro-wasm.go

@@ -14,9 +14,9 @@ import (
 	"github.com/norunners/vert"
 	astro "github.com/withastro/compiler/internal"
 	"github.com/withastro/compiler/internal/printer"
+	t "github.com/withastro/compiler/internal/t"
 	"github.com/withastro/compiler/internal/transform"
 	wasm_utils "github.com/withastro/compiler/internal_wasm/utils"
-	"golang.org/x/net/html/atom"
 )
 
 var done chan bool
@@ -25,6 +25,7 @@ func main() {
 	js.Global().Set("@astrojs/compiler", js.ValueOf(make(map[string]interface{})))
 	module := js.Global().Get("@astrojs/compiler")
 	module.Set("transform", Transform())
+	module.Set("parse", Parse())
 
 	<-make(chan struct{})
 }
@@ -43,6 +44,19 @@ func jsBool(j js.Value) bool {
 	return j.Bool()
 }
 
+func makeParseOptions(options js.Value) t.ParseOptions {
+	position := true
+
+	pos := options.Get("position")
+	if !pos.IsNull() && !pos.IsUndefined() {
+		position = pos.Bool()
+	}
+
+	return t.ParseOptions{
+		Position: position,
+	}
+}
+
 func makeTransformOptions(options js.Value, hash string) transform.TransformOptions {
 	filename := jsString(options.Get("sourcefile"))
 	if filename == "" {
@@ -54,11 +68,6 @@ func makeTransformOptions(options js.Value, hash string) transform.TransformOpti
 		pathname = "<stdin>"
 	}
 
-	as := jsString(options.Get("as"))
-	if as == "" {
-		as = "document"
-	}
-
 	internalURL := jsString(options.Get("internalURL"))
 	if internalURL == "" {
 		internalURL = "astro/internal"
@@ -87,7 +96,6 @@ func makeTransformOptions(options js.Value, hash string) transform.TransformOpti
 	preprocessStyle := options.Get("preprocessStyle")
 
 	return transform.TransformOptions{
-		As:               as,
 		Scope:            hash,
 		Filename:         filename,
 		Pathname:         pathname,
@@ -115,6 +123,10 @@ type HoistedScript struct {
 	Type string `js:"type"`
 }
 
+type ParseResult struct {
+	AST string `js:"ast"`
+}
+
 type TransformResult struct {
 	Code    string          `js:"code"`
 	Map     string          `js:"map"`
@@ -141,6 +153,24 @@ func preprocessStyle(i int, style *astro.Node, transformOptions transform.Transf
 	style.FirstChild.Data = str
 }
 
+func Parse() interface{} {
+	return js.FuncOf(func(this js.Value, args []js.Value) interface{} {
+		source := jsString(args[0])
+		parseOptions := makeParseOptions(js.Value(args[1]))
+
+		var doc *astro.Node
+		doc, err := astro.Parse(strings.NewReader(source))
+		if err != nil {
+			fmt.Println(err)
+		}
+		result := printer.PrintToJSON(source, doc, parseOptions)
+
+		return vert.ValueOf(ParseResult{
+			AST: string(result.Output),
+		})
+	})
+}
+
 func Transform() interface{} {
 	return js.FuncOf(func(this js.Value, args []js.Value) interface{} {
 		source := jsString(args[0])
@@ -153,29 +183,9 @@ func Transform() interface{} {
 			go func() {
 				var doc *astro.Node
 
-				if transformOptions.As == "document" {
-					docNode, err := astro.Parse(strings.NewReader(source))
-					doc = docNode
-					if err != nil {
-						fmt.Println(err)
-					}
-				} else if transformOptions.As == "fragment" {
-					nodes, err := astro.ParseFragment(strings.NewReader(source), &astro.Node{
-						Type:     astro.ElementNode,
-						Data:     atom.Template.String(),
-						DataAtom: atom.Template,
-					})
-					if err != nil {
-						fmt.Println(err)
-					}
-					doc = &astro.Node{
-						Type:                astro.DocumentNode,
-						HydrationDirectives: make(map[string]bool),
-					}
-					for i := 0; i < len(nodes); i++ {
-						n := nodes[i]
-						doc.AppendChild(n)
-					}
+				doc, err := astro.Parse(strings.NewReader(source))
+				if err != nil {
+					fmt.Println(err)
 				}
 
 				// Hoist styles and scripts to the top-level

internal/const.go

@@ -4,6 +4,8 @@
 
 package astro
 
+import a "golang.org/x/net/html/atom"
+
 // Section 12.2.4.2 of the HTML5 specification says "The following elements
 // have varying levels of special parsing rules".
 // https://html.spec.whatwg.org/multipage/syntax.html#the-stack-of-open-elements
@@ -109,3 +111,26 @@ func isSpecialElement(element *Node) bool {
 	}
 	return false
 }
+
+var knownDirectiveMap = map[string]bool{
+	"client:load":    true,
+	"client:idle":    true,
+	"client:visible": true,
+	"client:only":    true,
+	"class:list":     true,
+	"set:text":       true,
+	"set:html":       true,
+}
+
+func IsKnownDirective(element *Node, attr *Attribute) bool {
+	if knownDirectiveMap[attr.Key] {
+		return true
+	}
+	if element.DataAtom == a.Script {
+		return attr.Key == "hoist"
+	}
+	if element.DataAtom == a.Style {
+		return attr.Key == "global"
+	}
+	return false
+}

internal/node.go

@@ -30,6 +30,29 @@ const (
 	ExpressionNode
 )
 
+func (t NodeType) String() string {
+	switch t {
+	case ErrorNode:
+		return "error"
+	case TextNode:
+		return "text"
+	case DocumentNode:
+		return "root"
+	case ElementNode:
+		return "element"
+	case CommentNode:
+		return "comment"
+	case DoctypeNode:
+		return "doctype"
+	case FrontmatterNode:
+		return "frontmatter"
+	case ExpressionNode:
+		return "expression"
+	default:
+		return ""
+	}
+}
+
 // Used as an Attribute Key to mark implicit nodes
 const ImplicitNodeMarker = "\x00implicit"
 

internal/parser.go

@@ -365,6 +365,7 @@ func (p *parser) addFrontmatter(empty bool) {
 		}
 		if empty {
 			p.frontmatterState = FrontmatterClosed
+			p.fm.Attr = append(p.fm.Attr, Attribute{Key: ImplicitNodeMarker, Type: EmptyAttribute})
 		} else {
 			p.frontmatterState = FrontmatterOpen
 			p.oe = append(p.oe, p.fm)
@@ -749,6 +750,9 @@ func inHeadIM(p *parser) bool {
 				return true
 			}
 			p.tok.Data = s
+		} else if p.oe.top() != nil && (isComponent(p.oe.top().Data) || isFragment((p.oe.top().Data))) {
+			p.addText(p.tok.Data)
+			return true
 		}
 	case StartTagToken:
 		// Allow components in Head
@@ -769,6 +773,16 @@ func inHeadIM(p *parser) bool {
 			p.oe.pop()
 			p.acknowledgeSelfClosingTag()
 			return true
+		case a.Slot:
+			p.addElement()
+			p.setOriginalIM()
+			p.im = inBodyIM
+			if p.hasSelfClosingToken {
+				p.addLoc()
+				p.oe.pop()
+				p.acknowledgeSelfClosingTag()
+			}
+			return true
 		case a.Noscript:
 			if p.scripting {
 				p.parseGenericRawTextElement()