diff --git a/scripts/sputnik.polyfills.mjs b/scripts/sputnik.polyfills.mjs index 958947f796..6533f56ba0 100644 --- a/scripts/sputnik.polyfills.mjs +++ b/scripts/sputnik.polyfills.mjs @@ -48,8 +48,8 @@ const transformTextEncodingPolyfill = (content) => { return `use std::str; -use crate::js::apis::node::text_encoding::javy::impls::Args; -use crate::js::apis::node::text_encoding::javy::utils::{to_js_error, to_string_lossy}; +use crate::js::apis::node::javy::text_encoding::impls::Args; +use crate::js::apis::node::javy::text_encoding::utils::{to_js_error, to_string_lossy}; use crate::{hold, hold_and_release}; use anyhow::{anyhow, bail, Error, Result}; use rquickjs::{ @@ -79,11 +79,11 @@ const savePolyfill = async ({ dest, content, transform }) => { const resources = [ { src: '/bytecodealliance/javy/refs/heads/main/crates/javy/src/apis/text_encoding/text-encoding.js', - dest: join(process.cwd(), 'src/sputnik/src/js/apis/node/text_encoding/javy/text-encoding.js') + dest: join(process.cwd(), 'src/sputnik/src/js/apis/node/javy/text_encoding/text-encoding.js') }, { src: '/bytecodealliance/javy/refs/heads/main/crates/javy/src/apis/text_encoding/mod.rs', - dest: join(process.cwd(), 'src/sputnik/src/js/apis/node/text_encoding/javy/polyfill.rs'), + dest: join(process.cwd(), 'src/sputnik/src/js/apis/node/javy/text_encoding/polyfill.rs'), transform: transformTextEncodingPolyfill }, { diff --git a/src/sputnik/src/js/apis/node/text_encoding/mod.rs b/src/sputnik/src/js/apis/node/javy/mod.rs similarity index 90% rename from src/sputnik/src/js/apis/node/text_encoding/mod.rs rename to src/sputnik/src/js/apis/node/javy/mod.rs index cca2e98d23..ac6f86fbe9 100644 --- a/src/sputnik/src/js/apis/node/text_encoding/mod.rs +++ b/src/sputnik/src/js/apis/node/javy/mod.rs @@ -1,7 +1,7 @@ -mod javy; +mod text_encoding; use crate::errors::js::JUNO_SPUTNIK_ERROR_JS_API_TEXT_ENCODING; -use crate::js::apis::node::text_encoding::javy::polyfill::register; +use crate::js::apis::node::javy::text_encoding::polyfill::register; use crate::js::inner_utils::throw_js_exception; use rquickjs::{Ctx, Error as JsError}; diff --git a/src/sputnik/src/js/apis/node/text_encoding/javy/impls.rs b/src/sputnik/src/js/apis/node/javy/text_encoding/impls.rs similarity index 100% rename from src/sputnik/src/js/apis/node/text_encoding/javy/impls.rs rename to src/sputnik/src/js/apis/node/javy/text_encoding/impls.rs diff --git a/src/sputnik/src/js/apis/node/text_encoding/javy/macros.rs b/src/sputnik/src/js/apis/node/javy/text_encoding/macros.rs similarity index 100% rename from src/sputnik/src/js/apis/node/text_encoding/javy/macros.rs rename to src/sputnik/src/js/apis/node/javy/text_encoding/macros.rs diff --git a/src/sputnik/src/js/apis/node/text_encoding/javy/mod.rs b/src/sputnik/src/js/apis/node/javy/text_encoding/mod.rs similarity index 100% rename from src/sputnik/src/js/apis/node/text_encoding/javy/mod.rs rename to src/sputnik/src/js/apis/node/javy/text_encoding/mod.rs diff --git a/src/sputnik/src/js/apis/node/text_encoding/javy/polyfill.rs b/src/sputnik/src/js/apis/node/javy/text_encoding/polyfill.rs similarity index 96% rename from src/sputnik/src/js/apis/node/text_encoding/javy/polyfill.rs rename to src/sputnik/src/js/apis/node/javy/text_encoding/polyfill.rs index 8c9d88284c..753715a85d 100644 --- a/src/sputnik/src/js/apis/node/text_encoding/javy/polyfill.rs +++ b/src/sputnik/src/js/apis/node/javy/text_encoding/polyfill.rs @@ -1,7 +1,7 @@ use std::str; -use crate::js::apis::node::text_encoding::javy::impls::Args; -use crate::js::apis::node::text_encoding::javy::utils::{to_js_error, to_string_lossy}; +use crate::js::apis::node::javy::text_encoding::impls::Args; +use crate::js::apis::node::javy::text_encoding::utils::{to_js_error, to_string_lossy}; use crate::{hold, hold_and_release}; use anyhow::{anyhow, bail, Error, Result}; use rquickjs::{ diff --git a/src/sputnik/src/js/apis/node/text_encoding/javy/text-encoding.js b/src/sputnik/src/js/apis/node/javy/text_encoding/text-encoding.js similarity index 100% rename from src/sputnik/src/js/apis/node/text_encoding/javy/text-encoding.js rename to src/sputnik/src/js/apis/node/javy/text_encoding/text-encoding.js diff --git a/src/sputnik/src/js/apis/node/text_encoding/javy/utils.rs b/src/sputnik/src/js/apis/node/javy/text_encoding/utils.rs similarity index 100% rename from src/sputnik/src/js/apis/node/text_encoding/javy/utils.rs rename to src/sputnik/src/js/apis/node/javy/text_encoding/utils.rs diff --git a/src/sputnik/src/js/apis/node/mod.rs b/src/sputnik/src/js/apis/node/mod.rs index 99a9165330..0a64d72671 100644 --- a/src/sputnik/src/js/apis/node/mod.rs +++ b/src/sputnik/src/js/apis/node/mod.rs @@ -1,8 +1,8 @@ mod blob; -mod text_encoding; +mod javy; use crate::js::apis::node::blob::init_blob; -use crate::js::apis::node::text_encoding::init_text_encoding; +use crate::js::apis::node::javy::init_text_encoding; use rquickjs::{Ctx, Error as JsError}; pub fn init_node_apis(ctx: &Ctx) -> Result<(), JsError> {