Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add pure comments to templates #9

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

add pure comments to templates #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/core/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pub struct Config {
pub validate: bool,
}

#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub enum OutputType {
Dom,
}
Expand Down
50 changes: 49 additions & 1 deletion crates/core/src/dom/template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use oxc::{
allocator::{IntoIn, Vec as OxcVec},
ast::{ast, NONE},
semantic::{ReferenceFlags, SymbolFlags},
span::{Atom, SPAN},
};
use oxc_traverse::TraverseCtx;
use oxc_traverse::{BoundIdentifier, TraverseCtx};

use crate::{
shared::transform::{Template, TemplateCreationCtx, TransformResult},
Expand Down Expand Up @@ -161,3 +162,50 @@ impl<'a> TransformResult<'a> {
self.declarators.push((id.clone(), decl_init));
}
}

impl<'a> TemplateCreationCtx<'a> {
pub fn create_template_declarators_dom(
&self,
template_fn: &BoundIdentifier<'a>,
ctx: &mut TraverseCtx<'a>,
) -> OxcVec<'a, ast::VariableDeclarator<'a>> {
ctx.ast.vec_from_iter(
self.templates
.iter()
.filter(|tmpl| tmpl.renderer == OutputType::Dom)
.map(|tmpl| {
ctx.ast.variable_declarator(
SPAN,
ast::VariableDeclarationKind::Var,
ctx.ast.binding_pattern(
ctx.ast
.binding_pattern_kind_binding_identifier(SPAN, tmpl.id.clone()),
NONE,
false,
),
Some(ctx.ast.expression_call(
SPAN,
template_fn.create_read_expression(ctx),
NONE,
ctx.ast.vec1(ctx.ast.argument_expression(
ctx.ast.expression_template_literal(
SPAN,
ctx.ast.vec1(ctx.ast.template_element(
SPAN,
true,
ast::TemplateElementValue {
raw: tmpl.template.clone().into_in(ctx.ast.allocator),
cooked: None,
},
)),
ctx.ast.vec(),
),
)),
false,
)),
false,
)
}),
)
}
}
83 changes: 30 additions & 53 deletions crates/core/src/shared/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::{hash_map::Entry, HashMap};

use html_escape::decode_html_entities;
use oxc::{
allocator::{IntoIn, Vec as OxcVec},
allocator::Vec as OxcVec,
ast::{
ast::{self},
NONE,
Expand Down Expand Up @@ -95,11 +95,8 @@ impl<'a> Traverse<'a> for JsxTransform<'a> {
}

fn exit_program(&mut self, node: &mut ast::Program<'a>, ctx: &mut TraverseCtx<'a>) {
node.body.splice(
0..0,
self.template_creation_ctx
.get_leading_stmts(&self.config.module_name, ctx),
);
self.template_creation_ctx
.postprocess(node, &self.config, ctx);
}
}

Expand Down Expand Up @@ -277,20 +274,24 @@ impl<'a> TemplateCreationCtx<'a> {
}
}

fn get_leading_stmts(
fn postprocess(
&self,
module_name: &str,
program: &mut ast::Program<'a>,
config: &Config,
ctx: &mut TraverseCtx<'a>,
) -> Vec<ast::Statement<'a>> {
let mut stmts = self.get_imports(ctx);
) {
let mut leading_stmts = self.get_imports(ctx);

if !self.templates.is_empty() {
let (tmpl_fn, tmpl_fn_import) = self.get_template_fn(module_name, ctx);
stmts.insert(0, tmpl_fn_import);
stmts.push(self.get_template_decl(&tmpl_fn, ctx))
let (tmpl_fn, tmpl_fn_import) = self.get_template_fn(&config.module_name, ctx);
leading_stmts.insert(0, tmpl_fn_import);
// TODO: validate templates (see https://github.com/ryansolid/dom-expressions/blob/b7a9d97027da77cc8f7d774edb655b074a3e5d41/packages/babel-plugin-jsx-dom-expressions/src/shared/postprocess.js#L20-L37)
if let Some(decl) = self.get_template_decl(&tmpl_fn, OutputType::Dom, ctx) {
leading_stmts.push(decl);
}
}

stmts
program.body.splice(0..0, leading_stmts);
}

fn get_imports(&self, ctx: &mut TraverseCtx<'a>) -> Vec<ast::Statement<'a>> {
Expand Down Expand Up @@ -351,46 +352,22 @@ impl<'a> TemplateCreationCtx<'a> {
fn get_template_decl(
&self,
template_fn: &BoundIdentifier<'a>,
output_type: OutputType,
ctx: &mut TraverseCtx<'a>,
) -> ast::Statement<'a> {
ctx.ast.statement_declaration(ctx.ast.declaration_variable(
SPAN,
ast::VariableDeclarationKind::Var,
ctx.ast.vec_from_iter(self.templates.iter().map(|tmpl| {
ctx.ast.variable_declarator(
SPAN,
ast::VariableDeclarationKind::Var,
ctx.ast.binding_pattern(
ctx.ast
.binding_pattern_kind_binding_identifier(SPAN, tmpl.id.clone()),
NONE,
false,
),
Some(ctx.ast.expression_call(
SPAN,
template_fn.create_read_expression(ctx),
NONE,
ctx.ast.vec1(ctx.ast.argument_expression(
ctx.ast.expression_template_literal(
SPAN,
ctx.ast.vec1(ctx.ast.template_element(
SPAN,
true,
ast::TemplateElementValue {
raw: tmpl.template.clone().into_in(ctx.ast.allocator),
cooked: None,
},
)),
ctx.ast.vec(),
),
)),
false,
)),
false,
)
})),
false,
))
) -> Option<ast::Statement<'a>> {
let decls = match output_type {
OutputType::Dom => self.create_template_declarators_dom(template_fn, ctx),
};

match decls.is_empty() {
true => None,
false => Some(ctx.ast.statement_declaration(ctx.ast.declaration_variable(
SPAN,
ast::VariableDeclarationKind::Var,
decls,
false,
))),
}
}
}

Expand Down
Loading