@astrojs/compiler 0.13.0 → 0.13.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @astrojs/compiler
 
+## 0.13.1
+
+### Patch Changes
+
+- 2f8334c: Update `parse` and `serialize` functions to combine `attributes` and `directives`, fix issue with `serialize` not respecting `attributes`.
+- b308955: Add self-close option to serialize util
+
 ## 0.13.0
 
 ### Minor Changes

package/browser/utils.d.ts

@@ -1,11 +1,11 @@
-import { Node, ParentNode, RootNode, ElementNode, CustomElementNode, ComponentNode, FragmentNode, LiteralNode, ExpressionNode, TextNode, CommentNode, DoctypeNode, FrontmatterNode } from '../shared/ast';
+import { Node, ParentNode, RootNode, ElementNode, CustomElementNode, ComponentNode, FragmentNode, LiteralNode, TagLikeNode, ExpressionNode, TextNode, CommentNode, DoctypeNode, FrontmatterNode } from '../shared/ast';
 export interface Visitor {
     (node: Node, parent?: ParentNode, index?: number): void | Promise<void>;
 }
 export declare const is: {
     parent(node: Node): node is ParentNode;
     literal(node: Node): node is LiteralNode;
-    tag(node: Node): node is ElementNode | ComponentNode | CustomElementNode;
+    tag(node: Node): node is TagLikeNode;
     whitespace(node: Node): node is TextNode;
     root: (node: Node) => node is RootNode;
     element: (node: Node) => node is ElementNode;
@@ -19,4 +19,7 @@ export declare const is: {
     frontmatter: (node: Node) => node is FrontmatterNode;
 };
 export declare function walk(node: ParentNode, callback: Visitor): void;
-export declare function serialize(root: Node): string;
+export interface SerializeOtions {
+    selfClose: boolean;
+}
+export declare function serialize(root: Node, opts?: SerializeOtions): string;

package/browser/utils.js

@@ -45,7 +45,40 @@ export function walk(node, callback) {
     const walker = new Walker(callback);
     walker.visit(node);
 }
-export function serialize(root) {
+function serializeAttributes(node) {
+    let output = '';
+    for (const attr of node.attributes) {
+        output += ' ';
+        switch (attr.kind) {
+            case 'empty': {
+                output += `${attr.name}`;
+                break;
+            }
+            case 'expression': {
+                output += `${attr.name}={${attr.value}}`;
+                break;
+            }
+            case 'quoted': {
+                output += `${attr.name}="${attr.value}"`;
+                break;
+            }
+            case 'template-literal': {
+                output += `${attr.name}=\`${attr.value}\``;
+                break;
+            }
+            case 'shorthand': {
+                output += `{${attr.name}}`;
+                break;
+            }
+            case 'spread': {
+                output += `{...${attr.value}}`;
+                break;
+            }
+        }
+    }
+    return output;
+}
+export function serialize(root, opts = { selfClose: true }) {
     let output = '';
     function visitor(node) {
         if (is.root(node)) {
@@ -66,9 +99,16 @@ export function serialize(root) {
             output += node.value;
         }
         else if (is.tag(node)) {
-            output += `<${node.name}>`;
-            node.children.forEach((child) => visitor(child));
-            output += `</${node.name}>`;
+            output += `<${node.name}`;
+            output += serializeAttributes(node);
+            if (node.children.length == 0 && opts.selfClose) {
+                output += ` />`;
+            }
+            else {
+                output += '>';
+                node.children.forEach((child) => visitor(child));
+                output += `</${node.name}>`;
+            }
         }
     }
     visitor(root);

package/node/utils.d.ts

@@ -1,11 +1,11 @@
-import { Node, ParentNode, RootNode, ElementNode, CustomElementNode, ComponentNode, FragmentNode, LiteralNode, ExpressionNode, TextNode, CommentNode, DoctypeNode, FrontmatterNode } from '../shared/ast';
+import { Node, ParentNode, RootNode, ElementNode, CustomElementNode, ComponentNode, FragmentNode, LiteralNode, TagLikeNode, ExpressionNode, TextNode, CommentNode, DoctypeNode, FrontmatterNode } from '../shared/ast';
 export interface Visitor {
     (node: Node, parent?: ParentNode, index?: number): void | Promise<void>;
 }
 export declare const is: {
     parent(node: Node): node is ParentNode;
     literal(node: Node): node is LiteralNode;
-    tag(node: Node): node is ElementNode | ComponentNode | CustomElementNode;
+    tag(node: Node): node is TagLikeNode;
     whitespace(node: Node): node is TextNode;
     root: (node: Node) => node is RootNode;
     element: (node: Node) => node is ElementNode;
@@ -19,4 +19,7 @@ export declare const is: {
     frontmatter: (node: Node) => node is FrontmatterNode;
 };
 export declare function walk(node: ParentNode, callback: Visitor): void;
-export declare function serialize(root: Node): string;
+export interface SerializeOtions {
+    selfClose: boolean;
+}
+export declare function serialize(root: Node, opts?: SerializeOtions): string;

package/node/utils.js

@@ -45,7 +45,40 @@ export function walk(node, callback) {
     const walker = new Walker(callback);
     walker.visit(node);
 }
-export function serialize(root) {
+function serializeAttributes(node) {
+    let output = '';
+    for (const attr of node.attributes) {
+        output += ' ';
+        switch (attr.kind) {
+            case 'empty': {
+                output += `${attr.name}`;
+                break;
+            }
+            case 'expression': {
+                output += `${attr.name}={${attr.value}}`;
+                break;
+            }
+            case 'quoted': {
+                output += `${attr.name}="${attr.value}"`;
+                break;
+            }
+            case 'template-literal': {
+                output += `${attr.name}=\`${attr.value}\``;
+                break;
+            }
+            case 'shorthand': {
+                output += `{${attr.name}}`;
+                break;
+            }
+            case 'spread': {
+                output += `{...${attr.value}}`;
+                break;
+            }
+        }
+    }
+    return output;
+}
+export function serialize(root, opts = { selfClose: true }) {
     let output = '';
     function visitor(node) {
         if (is.root(node)) {
@@ -66,9 +99,16 @@ export function serialize(root) {
             output += node.value;
         }
         else if (is.tag(node)) {
-            output += `<${node.name}>`;
-            node.children.forEach((child) => visitor(child));
-            output += `</${node.name}>`;
+            output += `<${node.name}`;
+            output += serializeAttributes(node);
+            if (node.children.length == 0 && opts.selfClose) {
+                output += ` />`;
+            }
+            else {
+                output += '>';
+                node.children.forEach((child) => visitor(child));
+                output += `</${node.name}>`;
+            }
         }
     }
     visitor(root);

package/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "bugs": "https://github.com/withastro/compiler/issues",
   "homepage": "https://astro.build",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "scripts": {
     "build": "tsc -p ."
   },

package/shared/ast.d.ts

@@ -33,9 +33,6 @@ export interface AttributeNode extends BaseNode {
     name: string;
     value: string;
 }
-export interface DirectiveNode extends Omit<AttributeNode, 'type'> {
-    type: 'directive';
-}
 export interface TextNode extends LiteralNode {
     type: 'text';
 }
@@ -43,26 +40,23 @@ export interface ElementNode extends ParentLikeNode {
     type: 'element';
     name: string;
     attributes: AttributeNode[];
-    directives: DirectiveNode[];
 }
 export interface FragmentNode extends ParentLikeNode {
     type: 'fragment';
     name: string;
     attributes: AttributeNode[];
-    directives: DirectiveNode[];
 }
 export interface ComponentNode extends ParentLikeNode {
     type: 'component';
     name: string;
     attributes: AttributeNode[];
-    directives: DirectiveNode[];
 }
 export interface CustomElementNode extends ParentLikeNode {
     type: 'custom-element';
     name: string;
     attributes: AttributeNode[];
-    directives: DirectiveNode[];
 }
+export declare type TagLikeNode = ElementNode | FragmentNode | ComponentNode | CustomElementNode;
 export interface DoctypeNode extends LiteralNode {
     type: 'doctype';
 }