Update test

cocos · Oct 17, 2024 · 4278130 · 4278130
1 parent 82e5aa1
commit 4278130
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 10 deletions.
diff --git a/modules/build-engine/src/engine-js/rollup-plugins/inline-enum/index.ts b/modules/build-engine/src/engine-js/rollup-plugins/inline-enum/index.ts
@@ -57,11 +57,6 @@ export async function rpInlineEnum(rawOptions: Options, meta?: any): Promise<rol
 
     const name = 'cc-inline-enum';
 
-    const moduleOverrides = options.moduleOverrides;
-    for (const k in moduleOverrides) {
-        const v = moduleOverrides[k];
-        console.info(`[${name}], overrides[${k}]=${v}`);
-    }
     return [
         {
             name,
@@ -71,11 +66,10 @@ export async function rpInlineEnum(rawOptions: Options, meta?: any): Promise<rol
                 return filter(source) ? source : null;
             },
 
-            transform(this, code: string, key: string): rollup.TransformResult {
+            transform(this, code: string, moduleId: string): rollup.TransformResult {
                 // Don't transform a module that is overrode
-                const moduleId = pathUtils.makePathEqualityKey(key);
-                console.info(`[${name}], transform: ${moduleId}`);
-                if (options.moduleOverrides && (moduleId in options.moduleOverrides)) {
+                const cacheKey = pathUtils.makePathEqualityKey(moduleId);
+                if (options.moduleOverrides && (cacheKey in options.moduleOverrides)) {
                     return;
                 }
 

diff --git a/test/build-engine/__snapshots__/engine-js.test.ts.snap b/test/build-engine/__snapshots__/engine-js.test.ts.snap
@@ -1940,6 +1940,28 @@ exports[`engine-js inline enum 2`] = `
             console.log(4026531840);
             console.log(268435455);
 
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            console.log("Testing enum override .......");
+            var TestOverrideEnum;
+            (function (TestOverrideEnum) {
+              TestOverrideEnum["HAHA"] = "hello_haha";
+              TestOverrideEnum["WOWO"] = "hello_wowo";
+              TestOverrideEnum["HEIHEI"] = "hello_heihei";
+            })(TestOverrideEnum || (TestOverrideEnum = {}));
+
+            console.log(2);
+            console.log(0);
+            console.log(1);
+
             var MyEnum2 = exports("MyEnum2", {
               "AAABBB": 0,
               "Haha": 0,

diff --git a/test/test-engine-source/cc.config.json b/test/test-engine-source/cc.config.json
@@ -53,10 +53,19 @@
                 "internal:native": "./audio/internal-native.ts"
             }
         },
+        {
+            "test": "true",
+            "isVirtualModule": false,
+            "overrides": {
+                "./cocos/enums/TestOverride.ts": "./cocos/enums/TestOverride.jsb.ts",
+                "./cocos/enums/test-override-entry.ts": "./cocos/enums/test-override-entry.jsb.ts"
+            }
+        },
         {
             "test": "context.mode === 'BUILD'",
             "isVirtualModule": false,
-            "overrides": {}
+            "overrides": {
+            }
         },
         {
             "test": "context.buildTimeConstants.NATIVE",

diff --git a/test/test-engine-source/cocos/enums/TestOverride.jsb.ts b/test/test-engine-source/cocos/enums/TestOverride.jsb.ts
@@ -0,0 +1,17 @@
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+console.log(`Testing enum override .......`);
+export enum TestOverrideEnum {
+    HAHA = 'hello_haha',
+    WOWO = 'hello_wowo',
+    HEIHEI = 'hello_heihei'
+}
+
diff --git a/test/test-engine-source/cocos/enums/TestOverride.ts b/test/test-engine-source/cocos/enums/TestOverride.ts
@@ -0,0 +1,14 @@
+import { MyEnum4 } from './my-enum-4';
+
+export enum TestOverrideEnum {
+    HAHA,
+    WOWO,
+    HEIHEI
+}
+
+console.log(TestOverrideEnum.WOWO);
+console.log(TestOverrideEnum.HAHA);
+console.log(TestOverrideEnum.HEIHEI);
+
+
+console.log(MyEnum4.AAABBB, MyEnum4.Haha, MyEnum4.Hi);
diff --git a/test/test-engine-source/cocos/enums/index.ts b/test/test-engine-source/cocos/enums/index.ts
@@ -4,6 +4,7 @@ import * as gfx from './define';
 
 import { PixelFormat } from './define';
 
+import './test-override-entry';
 
 export enum MyEnum2 {
     AAABBB,

diff --git a/test/test-engine-source/cocos/enums/test-override-entry.jsb.ts b/test/test-engine-source/cocos/enums/test-override-entry.jsb.ts
@@ -0,0 +1,4 @@
+import * as Override from './TestOverride';
+console.log(Override.TestOverrideEnum.HEIHEI);
+console.log(Override.TestOverrideEnum.HAHA);
+console.log(Override.TestOverrideEnum.WOWO);
diff --git a/test/test-engine-source/cocos/enums/test-override-entry.ts b/test/test-engine-source/cocos/enums/test-override-entry.ts
@@ -0,0 +1,8 @@
+
+
+import * as Override from './TestOverride';
+
+console.log(Override.TestOverrideEnum.WOWO);
+console.log(Override.TestOverrideEnum.HAHA);
+console.log(Override.TestOverrideEnum.HEIHEI);
+