Skip to content

fix dpsc wrapget #3

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

Merged
merged 2 commits into from
Jul 25, 2025
Merged

fix dpsc wrapget #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5cff06
fmt
r58Playz Jul 24, 2025
654e354
fix
r58Playz Jul 24, 2025
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
83 changes: 45 additions & 38 deletions rewriter/js/src/changes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use crate::{
rewrite::Rewrite,
};


macro_rules! change {
($span:expr, $($ty:tt)*) => {
$crate::changes::JsChange::new($span, $crate::changes::JsChangeType::$($ty)*)
Expand All @@ -28,37 +27,45 @@ pub(crate) use change;
#[derive(Debug, PartialEq, Eq)]
pub enum JsChangeType<'alloc: 'data, 'data> {
/// insert `${cfg.wrapfn}(`
WrapFnLeft { enclose: bool },
WrapFnLeft {
enclose: bool,
},
/// insert `)`
WrapFnRight { enclose: bool },
WrapFnRight {
enclose: bool,
},

WrapGetLeft {
ident: Atom<'data>,
enclose: bool,
ident: Atom<'data>,
enclose: bool,
},
WrapGetComputedLeft {
enclose: bool,
},
enclose: bool,
},
WrapGetRight {
enclose: bool,
},
enclose: bool,
},

WrapSet {
ident: Atom<'data>,
propspan: Span
},
WrapSetComputed,
WrapSet {
ident: Atom<'data>,
propspan: Span,
},
WrapSetComputed,

/// insert `${cfg.setrealmfn}({}).`
SetRealmFn,
/// insert `$scramerr(ident);`
ScramErrFn { ident: Atom<'data> },
ScramErrFn {
ident: Atom<'data>,
},
/// insert `$scramitize(`
ScramitizeFn,
/// insert `eval(${cfg.rewritefn}(`
EvalRewriteFn,
/// insert `: ${cfg.wrapfn}(ident)`
ShorthandObj { ident: Atom<'data> },
ShorthandObj {
ident: Atom<'data>,
},
/// insert scramtag
SourceTag,

Expand All @@ -73,10 +80,15 @@ pub enum JsChangeType<'alloc: 'data, 'data> {
},

/// insert `)`
ClosingParen { semi: bool, replace: bool },
ClosingParen {
semi: bool,
replace: bool,
},

/// replace span with text
Replace { text: &'alloc str },
Replace {
text: &'alloc str,
},
/// replace span with ""
Delete,
}
Expand Down Expand Up @@ -105,7 +117,7 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
(cfg, flags): &Self::ToLowLevelData,
offset: i32,
) -> TransformLL<'data> {
dbg!(&self);
dbg!(&self);
use JsChangeType as Ty;
use TransformLL as LL;
match self.ty {
Expand All @@ -119,33 +131,25 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
} else {
transforms![")"]
}),
Ty::WrapGetLeft {
ident,
enclose,
} => LL::insert(if enclose {
transforms!["(", &cfg.wrapgetbase, ident, "("]
Ty::WrapGetLeft { ident, enclose } => LL::insert(if enclose {
transforms!["(", &cfg.wrapgetbase, ident, "("]
} else {
transforms![&cfg.wrapgetbase, ident, "("]
transforms![&cfg.wrapgetbase, ident, "("]
}),
Ty::WrapGetComputedLeft { enclose } => LL::insert(if enclose {
transforms!["(", &cfg.wrapcomputedgetfn, "("]
} else {
transforms![&cfg.wrapcomputedgetfn, "("]
}),
transforms!["(", &cfg.wrapcomputedgetfn, "("]
} else {
transforms![&cfg.wrapcomputedgetfn, "("]
}),
Ty::WrapGetRight { enclose } => LL::replace(if enclose {
transforms!["))"]
} else {
transforms![")"]
}),
Ty::WrapSet { ident, propspan } => LL::insert(transforms![
&cfg.wrapsetbase,
ident,
"("
]),
Ty::WrapSetComputed => LL::insert(transforms![
&cfg.wrapcomputedsetfn,
"("
]),
Ty::WrapSet { ident, propspan } => {
LL::insert(transforms![&cfg.wrapsetbase, ident, "("])
}
Ty::WrapSetComputed => LL::insert(transforms![&cfg.wrapcomputedsetfn, "("]),
Ty::SetRealmFn => LL::insert(transforms![&cfg.setrealmfn, "({})."]),
Ty::ScramErrFn { ident } => LL::insert(transforms!["$scramerr(", ident, ");"]),
Ty::ScramitizeFn => LL::insert(transforms![" $scramitize("]),
Expand Down Expand Up @@ -205,6 +209,8 @@ impl Ord for JsChange<'_, '_> {
Ordering::Equal => match (&self.ty, &other.ty) {
(Ty::ScramErrFn { .. }, _) => Ordering::Less,
(_, Ty::ScramErrFn { .. }) => Ordering::Greater,
(Ty::WrapFnRight { .. }, _) => Ordering::Less,
(_, Ty::WrapFnRight { .. }) => Ordering::Greater,
_ => Ordering::Equal,
},
x => x,
Expand All @@ -226,6 +232,7 @@ impl<'alloc: 'data, 'data> JsChanges<'alloc, 'data> {

#[inline]
pub fn add(&mut self, rewrite: Rewrite<'alloc, 'data>) {
dbg!(&rewrite);
self.inner.add(rewrite.into_inner());
}

Expand Down
114 changes: 62 additions & 52 deletions rewriter/js/src/rewrite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,31 @@ pub(crate) enum RewriteType<'alloc: 'data, 'data> {
/// `cfg.metafn("cfg.base")`
MetaFn,

/// `window.location` -> cfg.wraplocation(window)
/// `window.attr` -> cfg.wrapattr(window)
WrapGet {
ident: Atom<'data>,
propspan: Span,
enclose: bool,
ident: Atom<'data>,
propspan: Span,
enclose: bool,
},
/// `window["location"]` -> cfg.wrapgetcomputed(window, "location")
/// `window["attr"]` -> cfg.wrapgetcomputed(window, "attr")
WrapGetComputed {
leftspan: Span,
propspan: Span,
enclose: bool,
leftspan: Span,
propspan: Span,
enclose: bool,
},
/// `window.location` -> cfg.wraplocation(window)
/// `window.attr` -> cfg.wrapattr(window)
WrapSet {
ident: Atom<'data>,
propspan: Span,
leftspan: Span,
rightspan: Span,
ident: Atom<'data>,
propspan: Span,
leftspan: Span,
rightspan: Span,
},
/// `cfg.wrapcomputedsetfn(window, "location", t)`
/// `cfg.wrapcomputedsetfn(window, "attr", t)`
WrapSetComputed {
propspan: Span,
leftspan: Span,
rightspan: Span,
},
propspan: Span,
leftspan: Span,
rightspan: Span,
},
// dead code only if debug is disabled
#[allow(dead_code)]
/// `$scramerr(name)`
Expand Down Expand Up @@ -84,6 +84,7 @@ pub(crate) enum RewriteType<'alloc: 'data, 'data> {
Delete,
}

#[derive(Debug)]
pub(crate) struct Rewrite<'alloc, 'data> {
span: Span,
ty: RewriteType<'alloc, 'data>,
Expand Down Expand Up @@ -114,6 +115,9 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
($span1:ident $span2:ident end) => {
Span::new($span1.end, $span2.end)
};
($span1:ident $span2:ident between) => {
Span::new($span1.end, $span2.start)
};
}

match self {
Expand All @@ -122,59 +126,65 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
change!(span!(end), WrapFnRight { enclose }),
],
Self::WrapGet {
ident,
propspan,
enclose,
ident,
propspan,
enclose,
} => smallvec![
change!(span!(start), WrapGetLeft {
ident,
enclose,
}),
change!(propspan, Delete),
change!(Span::new(propspan.start-1, propspan.start), Delete),
change!(Span::new(propspan.end, propspan.end), WrapGetRight {
enclose,
}),
change!(span!(start), WrapGetLeft { ident, enclose }),
change!(propspan.expand_left(1), WrapGetRight { enclose }),
],
Self::WrapGetComputed { leftspan, propspan, enclose } => smallvec![
change!(span!(start), WrapGetComputedLeft {
enclose
}),
Self::WrapGetComputed {
leftspan,
propspan,
enclose,
} => smallvec![
change!(span!(start), WrapGetComputedLeft { enclose }),
// replace the bracket with ,
change!(Span::new(leftspan.end, propspan.start), Replace { text: "," }),
change!(span!(leftspan propspan between), Replace { text: "," }),
// replace the other bracket with )
change!(Span::new(propspan.end, propspan.end + 1), ClosingParen { semi: false, replace: true }),

change!(
propspan.expand_right(1),
ClosingParen {
semi: false,
replace: true
}
),
],
Self::WrapSet { ident, propspan, leftspan, rightspan } => smallvec![
change!(span!(start), WrapSet {
ident,
propspan,
}),
change!(propspan, Delete),
change!(Span::new(leftspan.end, rightspan.start), Replace { text: "," }),
change!(
Self::WrapSet {
ident,
propspan,
leftspan,
rightspan,
} => smallvec![
change!(span!(start), WrapSet { ident, propspan }),
change!(propspan, Delete),
change!(span!(leftspan rightspan between), Replace { text: "," }),
change!(
span!(end),
ClosingParen {
semi: false,
replace: true
}
)
],
RewriteType::WrapSetComputed { leftspan, rightspan, propspan } => smallvec![
change!(span!(start), WrapSetComputed),
// replace the bracket with ,
change!(Span::new(leftspan.end, propspan.start), Replace { text: "," }),
],
RewriteType::WrapSetComputed {
leftspan,
rightspan,
propspan,
} => smallvec![
change!(span!(start), WrapSetComputed),
// replace the bracket with ,
change!(span!(leftspan propspan between), Replace { text: "," }),
// replace the other bracket with another ,
change!(Span::new(propspan.end, rightspan.start), Replace { text: "," }),
change!(span!(propspan rightspan between), Replace { text: "," }),
change!(
span!(end),
ClosingParen {
semi: false,
replace: true
}
)
],
],
Self::SetRealmFn => smallvec![change!(span, SetRealmFn)],
Self::ImportFn => smallvec![change!(span, ImportFn)],
Self::MetaFn => smallvec![change!(span, MetaFn)],
Expand Down
Loading
Loading