feat: Bump scw_core to the 15.0.1, update readme (#149)

Author: timofei-iatsenko

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lingui_macro_plugin"
-version = "5.4.0"
+version = "5.5.0"
 edition = "2021"
 
 [lib]
@@ -22,7 +22,7 @@ serde = "1.0.207"
 serde_json = "1.0.125"
 regex = "1.10.6"
 once_cell = "1.19.0"
-swc_core = { version = "14.1.0", features = [
+swc_core = { version = "15.0.1", features = [
   "ecma_plugin_transform",
   "ecma_utils",
   "ecma_visit",

Cargo.toml

@@ -106,6 +106,7 @@ Below is a table referencing the swc_core version used during the plugin build,
 | `4.1.0`, `5.0.0` ~ `5.2.0`                        | [`0.106.3`](https://plugins.swc.rs/versions/range/95) |
 | `5.3.0`                                           | [`5.0.4`](https://plugins.swc.rs/versions/range/116)  |
 | `5.4.0`                                           | [`14.1.0`](https://plugins.swc.rs/versions/range/138) |
+| `5.5.0`                                           | [`15.0.1`](https://plugins.swc.rs/versions/range/271) |
 
 
 > **Note**

README.md

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/swc-plugin",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "description": "A SWC Plugin for LinguiJS",
   "author": {
     "name": "Timofei Iatsenko",

package.json

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use swc_core::common::DUMMY_SP;
 use swc_core::ecma::ast::*;
-use swc_core::ecma::atoms::JsWord;
+use swc_core::ecma::atoms::Atom;
 use swc_core::ecma::utils::quote_ident;
 
 pub fn get_jsx_attr<'a>(el: &'a JSXOpeningElement, name: &str) -> Option<&'a JSXAttr> {
@@ -151,7 +151,7 @@ pub fn get_object_prop<'a>(props: &'a Vec<PropOrSpread>, name: &str) -> Option<&
         })
 }
 
-pub fn get_prop_key(prop: &KeyValueProp) -> Option<&JsWord> {
+pub fn get_prop_key(prop: &KeyValueProp) -> Option<&Atom> {
     match &prop.key {
         PropName::Ident(IdentName { sym, .. }) | PropName::Str(Str { value: sym, .. }) => Some(sym),
         _ => None,
@@ -176,7 +176,7 @@ pub fn create_key_value_prop(key: &str, value: Box<Expr>) -> PropOrSpread {
     })));
 }
 
-pub fn create_import(source: JsWord, imported: IdentName, local: IdentName) -> ModuleItem {
+pub fn create_import(source: Atom, imported: IdentName, local: IdentName) -> ModuleItem {
     ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl {
         span: DUMMY_SP,
         phase: ImportPhase::default(),

src/ast_utils.rs

@@ -5,7 +5,7 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use swc_core::common::DUMMY_SP;
 use swc_core::ecma::ast::*;
-use swc_core::ecma::atoms::JsWord;
+use swc_core::ecma::atoms::Atom;
 use swc_core::ecma::visit::{Visit, VisitWith};
 use swc_core::plugin::errors::HANDLER;
 
@@ -77,7 +77,7 @@ fn clean_jsx_element_literal_child(value: &str) -> String {
     result
 }
 
-fn is_allowed_plural_option(key: &str) -> Option<JsWord> {
+fn is_allowed_plural_option(key: &str) -> Option<Atom> {
     if PLURAL_OPTIONS_WHITELIST.is_match(key) {
         let key = NUM_OPTION.replace(key, "=$1");
         let key = WORD_OPTION.replace(&key, "$1");

src/jsx_visitor.rs

@@ -3,16 +3,16 @@ use crate::tokens::*;
 use crate::LinguiOptions;
 use std::collections::{HashMap, HashSet};
 use swc_core::ecma::utils::quote_ident;
-use swc_core::ecma::{ast::*, atoms::JsWord};
+use swc_core::ecma::{ast::*, atoms::Atom};
 
 const LINGUI_T: &str = &"t";
 
 #[derive(Default, Clone)]
 pub struct MacroCtx {
     // export name -> local name
-    symbol_to_id_map: HashMap<JsWord, HashSet<Id>>,
+    symbol_to_id_map: HashMap<Atom, HashSet<Id>>,
     // local name -> export name
-    id_to_symbol_map: HashMap<Id, JsWord>,
+    id_to_symbol_map: HashMap<Id, Atom>,
 
     pub should_add_18n_import: bool,
     pub should_add_trans_import: bool,
@@ -74,7 +74,7 @@ impl MacroCtx {
 
     /// given import {plural as i18nPlural} from "@lingui/macro";
     /// get_ident_export_name("i18nPlural") would return `plural`
-    pub fn get_ident_export_name(&self, ident: &Ident) -> Option<&JsWord> {
+    pub fn get_ident_export_name(&self, ident: &Ident) -> Option<&Atom> {
         if let Some(name) = self.id_to_symbol_map.get(&ident.to_id()) {
             return Some(name);
         }
@@ -88,7 +88,7 @@ impl MacroCtx {
             || self.is_lingui_ident("SelectOrdinal", ident)
     }
 
-    pub fn register_reference(&mut self, symbol: &JsWord, id: &Id) {
+    pub fn register_reference(&mut self, symbol: &Atom, id: &Id) {
         self.symbol_to_id_map
             .entry(symbol.clone())
             .or_default()
@@ -228,7 +228,7 @@ impl MacroCtx {
 
     /// Take KeyValueProp and return Key as string if parsable
     /// If key is numeric, return an exact match syntax `={number}`
-    pub fn get_js_choice_case_key(&self, prop: &KeyValueProp) -> Option<JsWord> {
+    pub fn get_js_choice_case_key(&self, prop: &KeyValueProp) -> Option<Atom> {
         match &prop.key {
             // {one: ""}
             PropName::Ident(IdentName { sym, .. })

src/macro_utils.rs

@@ -1,5 +1,5 @@
 use swc_core::ecma::ast::{Expr, JSXOpeningElement};
-use swc_core::ecma::atoms::JsWord;
+use swc_core::ecma::atoms::Atom;
 
 pub enum MsgToken {
     String(String),
@@ -17,7 +17,7 @@ pub struct TagOpening {
 pub struct IcuChoice {
     pub value: Box<Expr>,
     /// plural | select | selectOrdinal
-    pub format: JsWord,
+    pub format: Atom,
     pub cases: Vec<CaseOrOffset>,
 }
 
@@ -26,7 +26,7 @@ pub enum CaseOrOffset {
     Offset(String),
 }
 pub struct ChoiceCase {
-    pub key: JsWord,
+    pub key: Atom,
     pub tokens: Vec<MsgToken>,
 }