update: update logic to v2.01.2510250

Author: msojocs

.mocharc.js

@@ -12,6 +12,8 @@ module.exports = {
         // 'test/spec/issue/129/issue129.spec.ts',
         // 'test/spec/issue/115/issue115.spec.ts',
         // 'test/spec/wcc/module/module.spec.ts',
+        // 'test/spec/wcc/wxs/wxs.spec.ts',
+        // 'test/spec/wcsc/raw/raw.spec.ts',
     ],
     // spec: "test/spec/wcc/wxs/wxs.spec.ts",
     timeout: 20000,

changelog.md

@@ -2,6 +2,7 @@
 
 🚀Features
 - 架构：添加龙芯支持
+- 编译器：跟进v2.01.2510250版本
 
 ## 🌈 v0.1.5 / 2025-05-02
 

src/include/define.h

@@ -718,7 +718,7 @@ namespace WXML
     } // namespace EXPRLib
 
     namespace GlassEaselWxs {
-        const std::string sWrapper = "function n(nv_require,nv_exports,nv_module){%s}const t={nv_exports:{}};n((function(n){n.startsWith(\"p_\")&&(n=\"/\"+n.slice(2)),n.endsWith(\".wxs\")&&(n=n.slice(0,n.length-4));const t=gdc(require(n),\"nv_\");return function(){return t}}),t.nv_exports,t),Object.assign(module,gdc(t,void 0));";
+        const std::string sWrapper = "function e(nv_require,nv_exports,nv_module){\u000a%s\u000a}const n={nv_exports:{}};e((function(e){return e.startsWith(\u0022p_\u0022)&&(e=\u0022/\u0022+e.slice(2)),e.endsWith(\u0022.wxs\u0022)&&(e=e.slice(0,e.length-4)),()=>gdc(require(e)(),\u0022nv_\u0022,2)}),n.nv_exports,n),Object.assign(module,gdc(n,void 0,2));";
         const std::string sGenFuncDeepCopy = "var gdc=function(){var e=function(){return void 0!==this?this:\"undefined\"!=typeof globalThis?globalThis:\"undefine"
             "d\"!=typeof self?self:\"undefined\"!=typeof window?window:\"undefined\"!=typeof global?global:{}}();return function("
             "n,t,o,i=e){if(null==n)return n;if(\"undefined\"!=typeof __wxCodeSpace__&&\"function\"==typeof __wxCodeSpace__.isWxsS"

src/include/wxml.h

@@ -105,6 +105,7 @@ add_library(wcc_module
     ../utils/file.cpp
     ${CMAKE_JS_SRC}
 )
+target_compile_definitions(wcc_module PUBLIC -D__ADDON__)
 target_link_libraries(wcc_module PRIVATE rt pthread)
 set_target_properties(wcc_module PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set_target_properties(wcc_module PROPERTIES PREFIX "" SUFFIX ".node")
@@ -139,6 +140,7 @@ add_library(wcsc_module
     ../utils/file.cpp
     ${CMAKE_JS_SRC}
 )
+target_compile_definitions(wcsc_module PUBLIC -D__ADDON__)
 target_link_libraries(wcsc_module PRIVATE rt pthread)
 set_target_properties(wcsc_module PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set_target_properties(wcsc_module PROPERTIES PREFIX "" SUFFIX ".node")

src/module/CMakeLists.txt

@@ -963,8 +963,11 @@ namespace WXML{
             // Compile - 15
             v317 << "function _(a,b){if(typeof(b)!='undefined')a.children.push(b);}" << lineEndMark;
             v317 << "function _v(k){if(typeof(k)!='undefined')return {tag:'virtual','wxKey':k,children:[]};return {tag:'virtual',children:[]};}" << lineEndMark;
-            v317 << "function _n(tag){$gwxc++;if($gwxc>=16000){throw 'Dom limit exceeded, please check if there\\'s any mistake you"
-                    "\\'ve made.'};return {tag:'wx-'+tag,attr:{},children:[],n:[],raw:{},generics:{}}}" << lineEndMark;
+            v317 << "function _n(tag){";
+            #ifdef __ADDON__
+            v317 << "$gwxc++;if($gwxc>=16000){throw 'Dom limit exceeded, please check if there\\'s any mistake you\\'ve made.'};";
+            #endif
+            v317 << "return {tag:'wx-'+tag,attr:{},children:[],n:[],raw:{},generics:{}}}" << lineEndMark;
             v317 << "function _p(a,b){b&&a.properities.push(b);}" << lineEndMark;
             v317 << "function _s(scope,env,key){return typeof(scope[key])!='undefined'?scope[key]:env[key]}" << lineEndMark;
             v317 << "function _wp(m){console.warn(\"WXMLRT_" << gwxMark << ":\"+m)}" << lineEndMark;

src/wxml/compiler.cpp

@@ -321,7 +321,11 @@ namespace WXSS
             "{\n"
             "var op = content[0];\n"
             "if ( op == 0 )\n"
+            #ifdef __ADDON__
             "res = transformRPX(content[1], opt.deviceWidth) + \"px\" + res;\n"
+            #else
+            "res = transformRPX(content[1], opt.deviceWidth) + (window.__convertRpxToVw__ ? \"vw\" : \"px\") + res;\n"
+            #endif
             "else if ( op == 1)\n"
             "res = opt.suffix + res;\n"
             "else if ( op == 2 )\n"
@@ -590,7 +594,7 @@ namespace WXSS
             v29 += "();";
         }
         std::string v33 = v37.str();
-        int v23 = v33.length() + 3022;
+        int v23 = v33.length() + 3059;
         char buf[v23];
         snprintf(buf, v23, "var BASE_DEVICE_WIDTH = 750;\n"
             "var isIOS=navigator.userAgent.match(\"iPhone\");\n"
@@ -642,7 +646,11 @@ namespace WXSS
             "{\n"
             "var op = content[0];\n"
             "if ( op == 0 )\n"
+            #ifdef __ADDON__
             "res = transformRPX(content[1], opt.deviceWidth) + \"px\" + res;\n"
+            #else
+            "res = transformRPX(content[1], opt.deviceWidth) + (window.__convertRpxToVw__ ? \"vw\" : \"px\") + res;\n"
+            #endif
             "else if ( op == 1)\n"
             "res = opt.suffix + res;\n"
             "else if ( op == 2 )\n"

src/wxss/x_compiler.cpp

@@ -4,7 +4,7 @@ import linux from '../../../runner/binary-linux'
 import windows from '../../../runner/binary-windows'
 import * as fs from 'fs'
 
-describe("wcsc", function () {
+describe("wcsc - raw", function () {
     describe("Raw: node output should equal with wine", function () {
         // afterEach(function(){
         //   if(this.currentTest.state === 'failed'){