@hzw-tech/utils 0.2.2 → 0.2.3

package/dist/eslint.js

@@ -1,12 +1,14 @@
 import { antfu } from '@antfu/eslint-config'
+import { mergeObject } from './utils.js'
 
 function eslint(options) {
-  return antfu({
+  const optionsDefault = {
     formatters: true,
     vue: {
       overrides: {
         'vue/component-definition-name-casing': ['error', 'kebab-case'],
         'vue/component-name-in-template-casing': ['error', 'kebab-case'],
+        'vue/custom-event-name-casing': ['error', 'kebab-case'],
       },
     },
     rules: {
@@ -52,8 +54,8 @@ function eslint(options) {
       '**/auto-import?(s).d.ts',
       '**/components.d.ts',
     ],
-    ...options,
-  })
+  }
+  return antfu(mergeObject(optionsDefault, options))
 }
 
 export default eslint

package/dist/utils.js

@@ -0,0 +1,29 @@
+function getType(data) {
+  const typeStr = Object.prototype.toString.call(data)
+  const end = typeStr.length - 1
+  return typeStr.substring(8, end)
+}
+
+export function mergeObject(oldObj, newObj) {
+  if (getType(oldObj) !== 'Object') {
+    console.error('utils.mergeObjectParams方法传递的默认参数不是Object类型')
+    return newObj
+  }
+  if (!newObj) {
+    return oldObj
+  }
+  for (const key in oldObj) {
+    if (Object.prototype.hasOwnProperty.call(oldObj, key)) {
+      const item = oldObj[key]
+      // 仅当新对象是Object类型才进行比对，其他类型的newObj不变
+      if (getType(newObj) === 'Object') {
+        if (newObj[key] === undefined) {
+          newObj[key] = item
+        } else if (getType(item) === 'Object') {
+          mergeObject(item, newObj[key])
+        }
+      }
+    }
+  }
+  return newObj
+}

package/dist/vite.js

@@ -1,5 +1,6 @@
 import process from 'node:process'
 import AutoImportVite from 'unplugin-auto-import/vite'
+import { mergeObject } from './utils.js'
 
 function autoImport(options) {
   const { mode } = process.env
@@ -28,13 +29,9 @@ function scss(options) {
   if (options && options.additionalData) {
     additionalData = options.additionalData
   }
-  return {
-    additionalData: `
-    @use "@hzw-tech/utils/dist/styles/reference/index.scss" as *;
-    ${additionalData}
-    `,
-    ...options,
-  }
+  return mergeObject({
+    additionalData,
+  }, options)
 }
 
 export default {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hzw-tech/utils",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "通用前端工具包，包含请求,正则校验,全局ts声明等",
   "author": "hzw-tech",
   "license": "MIT",