xcn 1.0.0 → 1.1.0

package/LICENSE

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) <2025> <earthnut.dev>
+Copyright (c) <2025> <Mr.MudBean>
     
 Permission to use, copy, modify, and/or distribute this software for any  
 purpose with or without fee is hereby granted, provided that the above  
@@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 # MIT 许可证
 
-版权所有 (c) [2025] [花生亻]
+版权所有 (c) [2025] [泥豆君]
 
 特此免费授予任何获得本软件及相关文档文件（以下简称“软件”）副本的人不受限制地处置该软件的权利，包括不受限制地使用、复制、修改、合并、发布、分发、再许可和/或出售该软件副本的权利，并允许向其提供该软件的人这样做，但须遵守以下条件：
 

package/README.md

@@ -1,6 +1,6 @@
 # xcn
 
-[![version](<https://img.shields.io/npm/v/xcn.svg?logo=npm&logoColor=rgb(0,0,0)&label=版本号&labelColor=rgb(73,73,228)&color=rgb(0,0,0)>)](https://www.npmjs.com/package/xcn) [![issues 提交](<https://img.shields.io/badge/issues-提交-rgb(255,0,63)?logo=github>)](https://github.com/earthnutDev/xcn/issues)
+[![version](<https://img.shields.io/npm/v/xcn.svg?logo=npm&logoColor=rgb(0,0,0)&label=版本号&labelColor=rgb(73,73,228)&color=rgb(0,0,0)>)](https://www.npmjs.com/package/xcn) [![issues 提交](<https://img.shields.io/badge/issues-提交-rgb(255,0,63)?logo=github>)](https://github.com/MrMudBean/xcn/issues)
 
 `xcn = mix + class name` 组装 html 元素的 class 属性值，`xcn` 仅是 `mix-cn` 的缩写。
 
@@ -8,8 +8,6 @@
 
 ```sh
 npm install --save xcn@latest
-# 或者
-npm install --save mix-cn@latest
 ```
 
 ## 使用
@@ -24,8 +22,6 @@ import { xcn } from 'xcn';
 > xcn('a', { c: false }, true , false ,null , {d: true}, 'b');
 
 'a b d'
-
-
 ```
 
 ## 文档地址

package/cjs/index.js

@@ -0,0 +1,67 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var aTypeOfJs = require('a-type-of-js');
+
+/**
+ *
+ * 合并 class
+ *
+ * merge class name
+ *
+ */
+function xcn(...classNameList) {
+    /**  临时  */
+    const template = [];
+    /**  移除空白  */
+    const removeBlank = (str) => str
+        .trim()
+        .replace(/undefined/g, ' ')
+        .replace(/\s+/g, ' ')
+        .split(' ')
+        .sort()
+        .join(' ');
+    /**  混合值  */
+    const mergeNewValue = (newValue) => {
+        if (aTypeOfJs.isUndefined(newValue) || !aTypeOfJs.isString(newValue))
+            return;
+        const newList = removeBlank(newValue).split(' ');
+        if (newList.length)
+            template.push(...newList);
+    };
+    classNameList.forEach(classNameItem => {
+        // 数据为 undefined 或 null 或 false 或 true 或 '' 或 [] 或 {}
+        if (!classNameItem || aTypeOfJs.isTrue(classNameItem))
+            return;
+        // 数据为数组类型
+        if (aTypeOfJs.isArray(classNameItem))
+            classNameItem.forEach(childItem => mergeNewValue(xcn(childItem)));
+        // 数据为 string 类型
+        else if (aTypeOfJs.isString(classNameItem) || aTypeOfJs.isNumber(classNameItem))
+            mergeNewValue(classNameItem.toString());
+        // 数据为函数类型
+        else if (aTypeOfJs.isFunction(classNameItem)) {
+            const result = classNameItem();
+            if (aTypeOfJs.isString(result))
+                mergeNewValue(result);
+            else
+                result.forEach(item => mergeNewValue(xcn(item)));
+        }
+        else {
+            // 数据为 object 类型
+            for (const key in classNameItem) {
+                if (Object.prototype.hasOwnProperty.call(classNameItem, key)) {
+                    const element = classNameItem[key];
+                    if (true === element)
+                        mergeNewValue(key);
+                }
+            }
+        }
+    });
+    const result = removeBlank(Array.from(new Set(template)).filter(Boolean).join(' '));
+    return (result ?? undefined);
+}
+
+exports.default = xcn;
+exports.xcn = xcn;

package/es/index.js

@@ -0,0 +1,62 @@
+import { isTrue, isArray, isString, isNumber, isFunction, isUndefined } from 'a-type-of-js';
+
+/**
+ *
+ * 合并 class
+ *
+ * merge class name
+ *
+ */
+function xcn(...classNameList) {
+    /**  临时  */
+    const template = [];
+    /**  移除空白  */
+    const removeBlank = (str) => str
+        .trim()
+        .replace(/undefined/g, ' ')
+        .replace(/\s+/g, ' ')
+        .split(' ')
+        .sort()
+        .join(' ');
+    /**  混合值  */
+    const mergeNewValue = (newValue) => {
+        if (isUndefined(newValue) || !isString(newValue))
+            return;
+        const newList = removeBlank(newValue).split(' ');
+        if (newList.length)
+            template.push(...newList);
+    };
+    classNameList.forEach(classNameItem => {
+        // 数据为 undefined 或 null 或 false 或 true 或 '' 或 [] 或 {}
+        if (!classNameItem || isTrue(classNameItem))
+            return;
+        // 数据为数组类型
+        if (isArray(classNameItem))
+            classNameItem.forEach(childItem => mergeNewValue(xcn(childItem)));
+        // 数据为 string 类型
+        else if (isString(classNameItem) || isNumber(classNameItem))
+            mergeNewValue(classNameItem.toString());
+        // 数据为函数类型
+        else if (isFunction(classNameItem)) {
+            const result = classNameItem();
+            if (isString(result))
+                mergeNewValue(result);
+            else
+                result.forEach(item => mergeNewValue(xcn(item)));
+        }
+        else {
+            // 数据为 object 类型
+            for (const key in classNameItem) {
+                if (Object.prototype.hasOwnProperty.call(classNameItem, key)) {
+                    const element = classNameItem[key];
+                    if (true === element)
+                        mergeNewValue(key);
+                }
+            }
+        }
+    });
+    const result = removeBlank(Array.from(new Set(template)).filter(Boolean).join(' '));
+    return (result ?? undefined);
+}
+
+export { xcn as default, xcn };

package/{index.d.ts → es/src/index.d.ts}

@@ -22,3 +22,4 @@ export type EnXcn<T> = T extends [infer U, ...infer V] ? `${U & string}  ${EnXcn
 export declare function xcn<T extends EnClassNameItem[]>(...classNameList: T): EnXcn<{
     [K in keyof T]: EnTypeofClassNameItem<T[K]>;
 }>;
+export default xcn;

package/package.json

@@ -1,59 +1,55 @@
 {
-  "main": "index.cjs",
-  "module": "index.mjs",
-  "types": "index.d.ts",
   "name": "xcn",
   "type": "module",
-  "version": "1.0.0",
-  "description": "一个用于字符串拼接的小工具，常用于 class name 的拼接",
-  "license": "ISC",
-  "dependencies": {
-    "a-type-of-js": "^1.0.7"
+  "version": "1.1.0",
+  "main": "cjs/index.js",
+  "module": "es/index.js",
+  "types": "es/src/index.d.ts",
+  "author": {
+    "name": "泥豆君",
+    "email": "Mr.MudBean@outlook.com",
+    "url": "https://earthnut.dev"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "description": "一个用于字符串拼接的小工具，多用于 class name 的拼接",
+  "sideEffects": false,
+  "license": "MIT",
   "files": [
-    "index.mjs",
-    "index.cjs",
-    "index.d.ts",
-    "src"
+    "cjs",
+    "es",
+    "LICENSE",
+    "README.md"
   ],
   "exports": {
-    ".": {
-      "import": {
-        "default": "./index.mjs",
-        "types": "./index.d.ts"
-      },
-      "require": {
-        "default": "./index.cjs",
-        "types": "./index.d.ts"
-      }
-    }
+    "import": "./es/index.js",
+    "default": "./es/index.js",
+    "require": "./cjs/index.js",
+    "types": "./es/src/index.d.ts"
+  },
+  "keywords": [
+    "xcn",
+    "混合 className",
+    "拼接字符串"
+  ],
+  "homepage": "https://earthnut.dev/npm/xcn",
+  "dependencies": {
+    "a-type-of-js": "^2.0.0"
+  },
+  "bugs": {
+    "url": "https://github.com/MrMudBean/xcn/issues",
+    "email": "Mr.MudBean@outlook.com"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/earthnutDev/xcn.git"
-  },
-  "author": {
-    "name": "🥜",
-    "email": "earthnut.dev@outlook.com",
-    "url": "https://earthnut.dev"
+    "url": "git+https://github.com/MrMudBean/xcn.git"
   },
   "browserslist": [
-    "node>=18.0.0"
+    "last 2 versions not ie <= 11"
   ],
   "engines": {
     "node": ">=18.0.0"
-  },
-  "keywords": [
-    "xcn",
-    "mix-cn"
-  ],
-  "homepage": "https://earthnut.dev/npm/xcn",
-  "bugs": {
-    "url": "https://github.com/earthnutDev/xcn/issues",
-    "email": "earthnut.dev@outlook.com"
   }
 }

package/index.cjs

@@ -1 +0,0 @@
-"use strict";var i=require("a-type-of-js");exports.xcn=function r(...e){const t=[],n=i=>i.trim().replace(/undefined/g," ").replace(/\s+/g," ").split(" ").sort().join(" "),s=r=>{if(i.isUndefined(r)||!i.isString(r))return;const e=n(r).split(" ");e.length&&t.push(...e)};return e.forEach(e=>{if(e&&!i.isTrue(e))if(i.isArray(e))e.forEach(i=>s(r(i)));else if(i.isString(e)||i.isNumber(e))s(e.toString());else if(i.isFunction(e)){const t=e();i.isString(t)?s(t):t.forEach(i=>s(r(i)))}else for(const i in e)if(Object.prototype.hasOwnProperty.call(e,i)){!0===e[i]&&s(i)}}),n(Array.from(new Set(t)).filter(Boolean).join(" "))??void 0};

package/index.mjs

@@ -1 +0,0 @@
-import{isTrue as e,isArray as o,isString as r,isNumber as t,isFunction as i,isUndefined as n}from"a-type-of-js";function f(...s){const c=[],l=e=>e.trim().replace(/undefined/g," ").replace(/\s+/g," ").split(" ").sort().join(" "),p=e=>{if(n(e)||!r(e))return;const o=l(e).split(" ");o.length&&c.push(...o)};s.forEach(n=>{if(n&&!e(n))if(o(n))n.forEach(e=>p(f(e)));else if(r(n)||t(n))p(n.toString());else if(i(n)){const e=n();r(e)?p(e):e.forEach(e=>p(f(e)))}else for(const e in n)if(Object.prototype.hasOwnProperty.call(n,e)){!0===n[e]&&p(e)}});return l(Array.from(new Set(c)).filter(Boolean).join(" "))??void 0}export{f as xcn};