@wiajs/core 1.1.30 → 1.1.32

package/dist/core.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.30
+  * wia core v1.1.32
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/core.js

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.30
+  * wia core v1.1.32
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/core.min.js

@@ -1,10 +1,10 @@
 /*!
-  * wia core v1.1.30
+  * wia core v1.1.32
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 /*!
-  * wia core v1.1.30
+  * wia core v1.1.32
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/core.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.30
+  * wia core v1.1.32
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/jsx-runtime.js

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.30
+  * wia core v1.1.32
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -16,7 +16,39 @@ function jsx(tag, {children, ...props} = {}) {
   if (typeof tag === 'function') R = tag({children, ...props});
   else if (typeof tag === 'string') {
     const attrs = props || {};
-    const attrsString = Object.keys(attrs)
+    const attrsArray = [];
+
+    // 特殊处理 className 和 htmlFor
+    if (attrs.className) {
+      attrsArray.push(`class="${attrs.className}"`);
+      delete attrs.className;
+    }
+    
+    if (attrs.htmlFor) {
+      attrsArray.push(`for="${attrs.htmlFor}"`);
+      delete attrs.htmlFor;
+    }
+
+    // 处理其他属性
+    for (const [key, value] of Object.entries(attrs)) {
+      // 跳过特殊处理的属性
+      if (key === 'children' || key === 'className' || key === 'htmlFor') continue;
+      
+      // 处理布尔属性（如 disabled, checked 等）
+      if (typeof value === 'boolean') {
+        if (value) {
+          attrsArray.push(key);
+        }
+      } 
+      // 处理动态值属性
+      else if (value != null) {
+        attrsArray.push(`${key}="${value}"`);
+      }
+    }
+
+    const attrsString = attrsArray.join(' ');
+
+/*    const attrsString = Object.keys(attrs)
       .map(attr => {
         if (attr[0] === '_') {
           if (attrs[attr]) return attr.replace('_', '');
@@ -26,18 +58,20 @@ function jsx(tag, {children, ...props} = {}) {
       })
       .filter(attr => !!attr)
       .join(' ');
-
-    if (['path', 'img', 'circle', 'polygon', 'line', 'input'].indexOf(tag) >= 0)
+*/
+    // 自闭合标签处理
+    const voidElements = ['input', 'img', 'br', 'hr', 'meta', 'link', 'area', 'base', 'col', 'embed', 'param', 'source', 'track', 'wbr', 'path', 'circle', 'polygon', 'line', 'rect', 'ellipse', 'use', 'stop'];
+    if (voidElements.includes(tag))
       R = `<${tag} ${attrsString} />`.trim();
     else {
       const childrenContent = Array.isArray(children)
         ? children
-            .filter(c => !!c)
+            .filter(c => c != null)
             .map(c => (Array.isArray(c) ? c.join('') : c))
             .join('')
-        : children;
+        : children || '';
 
-      R = `<${tag} ${attrsString}>${childrenContent ?? ''}</${tag}>`.trim();
+      R = `<${tag} ${attrsString}>${childrenContent}</${tag}>`.trim();
     }
   }
 
@@ -47,12 +81,12 @@ function jsx(tag, {children, ...props} = {}) {
 function Fragment({children} = {}) {
   const R = Array.isArray(children)
     ? children
-        .filter(c => !!c)
+        .filter(c => c != null)
         .map(c => (Array.isArray(c) ? c.join('') : c))
         .join('')
-    : children;
+    : children || '';
 
-  return R ?? '';
+  return R;
 }
 
 var Fragment_1 = jsxRuntime.Fragment = Fragment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiajs/core",
-  "version": "1.1.30",
+  "version": "1.1.32",
   "description": "wia app core package",
   "main": "./dist/core.cjs",
   "module": "./dist/core.mjs",

package/util/tool.js

@@ -130,43 +130,47 @@ function newFileName(len) {
 
 /**
  * 比较方法，用于对象数组排序，常用于数据表排序
- * @param {*} k 对象属性key
- * @param {*} asc 升序、降序，默认升序
- * @param {*} type 类型auto, number、datetime、string，缺省 auto
+ * @param {string} k 对象属性key
+ * @param {boolean} desc 升序、降序，默认升序
+ * @param {string} type 类型auto, number、date、string，缺省 auto
+ * @param {string} [sub] 子对象
  */
-function compareObj(k, desc, type) {
-  return function (o1, o2) {
-		let R = 0;
-		try {
-			let v1 = o1[k];
-			let v2 = o2[k];
-			// 数字、日期字符串，按数字、日期排序
-			if ($.isStr(v1) || $.isStr(v2)) {
-				// 金额可能有千字分隔符，需替换
-				if (type.toLowerCase() === 'number') {
-					v1 = v1.replaceAll(',', '');
-					v2 = v2.replaceAll(',', '');
-				}
-
-				if ($.isDateStr(v1) && $.isDateStr(v2)) {
-					v1 = Date.parse(v1);
-					v2 = Date.parse(v2);
-				} else if ($.isNumStr(v1) && $.isNumStr(v2)) {
-					v1 = Number(v1);
-					v2 = Number(v2);
-				}
-			}
-
-			if (v1 < v2) {
-				R = desc ? 1 : -1;
-			} else if (v1 > v2) {
-				R = desc ? -1 : 1;
-			}
-		} catch(ex) {
-			console.log('compareObj exp:', ex.message);
-		}
-    return R;
-  };
+function compareObj(k, desc, type, sub) {
+  return (o1, o2) => {
+    let R = 0
+    try {
+      let v1 = sub ? o1[sub][k] : o1[k]
+      let v2 = sub ? o2[sub][k] : o2[k]
+
+      // log({v1, v2, type}, 'compareObj')
+
+      if (typeof v1 === 'string' || typeof v2 === 'string') {
+        // 数字、日期字符串，按数字、日期排序
+        // 金额可能有千字分隔符，需替换
+        if (type.toLowerCase() === 'number') {
+          if (typeof v1 === 'string') {
+            v1 = v1.replaceAll(',', '').replaceAll(/null|-|^$/g, '0')
+            v1 = Number(v1)
+          }
+          if (typeof v2 === 'string') {
+            v2 = v2.replaceAll(',', '').replaceAll(/null|-|^$/g, '0')
+            v2 = Number(v2)
+          }
+        } else if (type.toLowerCase() === 'date') {
+          v1 = Date.parse(v1)
+          v2 = Date.parse(v2)
+        }
+      }
+
+      if (v1 < v2) R = desc ? 1 : -1
+      else if (v1 > v2) R = desc ? -1 : 1
+
+      // log({v1, v2, R}, 'compareObj')
+    } catch (ex) {
+      console.log('compareObj exp:', ex.message)
+    }
+    return R
+  }
 }
 
 /**

package/util/wiapack.js

@@ -15,8 +15,6 @@ import ld from 'lodash'
 // const {minify, minify_sync} = require('terser')
 import {parseSync, Compiler, minify} from '@swc/core' // acorn 替换为 swc
 
-import cfg from './config.js'
-
 const gzip = util.promisify(zlib.gzip)
 
 /**
@@ -30,6 +28,7 @@ const gzip = util.promisify(zlib.gzip)
  * @prop {string[]} [load] - 启动时需加载的模块，启动器需要，一般加载wia公用模块
  * @prop {boolean} [press] - 压缩代码
  * @prop {boolean} [gzip] - gzip打包
+ * @prop {*} [cfg] - 打包配置文件
  */
 
 /**
@@ -43,6 +42,7 @@ const gzip = util.promisify(zlib.gzip)
  * @prop {string} out
  * @prop {boolean} press - 压缩代码
  * @prop {boolean} gzip - gzip打包
+ * @prop {*} cfg - 打包配置文件
  */
 
 const def = {
@@ -50,10 +50,11 @@ const def = {
   name: '',
   ver: '1.0.0',
   cos: 'https://cos.wia.pub', // 资源主机
-  dir: cfg.code.dir,
+  dir: '',
   out: 'dist', // 输出路径
   press: true,
   gzip: true,
+  cfg: {},
 }
 
 export default class WiaPack {
@@ -69,7 +70,10 @@ export default class WiaPack {
   constructor(opts) {
     /** @type {Opt} */
     const opt = {...def, ...opts}
+    const {cfg} = opt
+    opt.dir = cfg.code.dir
     this.opt = opt
+    this.cfg = cfg
   }
 
   /**
@@ -107,7 +111,7 @@ export default class WiaPack {
   async process(uf, pf) {
     const R = []
     const _ = this
-    const {opt} = _
+    const {opt, cfg} = _
     const {owner, name, ver, dir, out} = opt
 
     console.log(`${owner}/${name} process ...`)
@@ -277,7 +281,7 @@ export default class WiaPack {
   async procFile(u, rf, index, wia, page) {
     let R = ''
     const _ = this
-    const {opt} = _
+    const {opt, cfg} = _
 
     try {
       const js = {}
@@ -383,8 +387,10 @@ export default class WiaPack {
   async procPgfile(u, rf, index, wia, page, load) {
     let R = ''
 
+    const _ = this
+
     try {
-      const {owner, name: app} = this
+      const {cfg, owner, name: app} = _
       // 页面引用模块，排除自己
       const rg = new RegExp(cfg.code.wia.join('|'))
       const ljs = u.pf.js
@@ -518,9 +524,7 @@ export default class WiaPack {
       const buf = await gzip(wf)
       await fs.ensureDir(path.dirname(f))
       fs.writeFile(f, buf)
-      console.log(
-        `Build ${name} gzipped(${(wf.length / 1024).toFixed(2)}KB -> ${(buf.length / 1024).toFixed(2)}KB)`
-      )
+      console.log(`Build ${name} gzipped(${(wf.length / 1024).toFixed(2)}KB -> ${(buf.length / 1024).toFixed(2)}KB)`)
     } catch (e) {
       console.error(`pack exp:${e.message}`)
     }
@@ -780,10 +784,7 @@ export default class WiaPack {
                 code = `${head}${body}}`
               }
 
-              console.log(
-                {name, offset, span: v.span, start: code.slice(0, 50), tail: code.slice(-50)},
-                'getModule'
-              )
+              console.log({name, offset, span: v.span, start: code.slice(0, 50), tail: code.slice(-50)}, 'getModule')
 
               // 路径替换，以最后一个 node_modules 路径为准
               pos = name.lastIndexOf('/node_modules/')
@@ -792,16 +793,12 @@ export default class WiaPack {
                 // ../../node_modules/.pnpm/@wiajs+core@1.1.28/node_modules/@wiajs/core/dist/core.mjs
                 /** @type {string} */
                 const pre = name.slice(0, pos)
-                if (name.endsWith('.less') && pre.includes('/node_modules/less-loader/'))
-                  name = `~~/${name.slice(pos + 14)}`
+                if (name.endsWith('.less') && pre.includes('/node_modules/less-loader/')) name = `~~/${name.slice(pos + 14)}`
                 else name = `~/${name.slice(pos + 14)}`
               } else if (/^\.\/src\//.test(name)) {
                 name = name.replace(/^\.\/src\//, `${opt.owner}/${opt.name}/`)
               } else if (/^\.\/wia\.config\.js/.test(name)) {
-                name = name.replace(
-                  /^\.\/wia\.config\.js/,
-                  `${opt.owner}/${opt.name}/wia.config.js`
-                )
+                name = name.replace(/^\.\/wia\.config\.js/, `${opt.owner}/${opt.name}/wia.config.js`)
               }
 
               // name = name.replace(/[.]{1,2}\/[./]*\/node_modules\//gi, '~/')