fix: e2e error

Author: shijistar

src/enum-collection.ts

@@ -53,13 +53,13 @@ export class EnumCollectionClass<
    * **CN:** 布尔值，表示这是一个枚举集合实例
    */
   readonly [ENUM_COLLECTION] = true;
-  readonly [Symbol.hasInstance] = function (this: EnumCollectionClass<T, K, V>, instance: unknown): boolean {
+  [Symbol.hasInstance](this: EnumCollectionClass<T, K, V>, instance: unknown): boolean {
     // intentionally use == to support both number and string format value
     return this.items.some(
       // eslint-disable-next-line eqeqeq
       (i) => instance == i.value || instance === i.key
     );
-  };
+  }
 
   constructor(init: T = {} as T, options?: EnumItemOptions) {
     super();

src/enum-item.ts

@@ -42,10 +42,7 @@ export class EnumItemClass<
    *
    * @returns V | string
    */
-  readonly [Symbol.toPrimitive] = function (
-    this: EnumItemClass<T, K, V>,
-    hint: 'number' | 'string' | 'default'
-  ): V | string {
+  [Symbol.toPrimitive](this: EnumItemClass<T, K, V>, hint: 'number' | 'string' | 'default'): V | string {
     if (hint === 'number') {
       // for cases like Number(value) or +value
       return this.valueOf();
@@ -55,7 +52,7 @@ export class EnumItemClass<
     }
     // for cases like '' + value, value == 1
     return this.valueOf();
-  };
+  }
 
   private _options: EnumItemOptions | undefined;
   // should use function here to avoid closure. this is important for the e2e test cases.
@@ -67,12 +64,7 @@ export class EnumItemClass<
     return content;
   }
   private _readonlyPropMsg(name: string) {
-    // Must use this array form, otherwise the legacy mode will break the e2e test cases after compilation
-    return [
-      'Cannot modify property',
-      name,
-      'on EnumItem. EnumItem instances are readonly and should not be mutated.',
-    ].join(' ');
+    return `Cannot modify property "${name}" on EnumItem. EnumItem instances are readonly and should not be mutated.`;
   }
   private _localizedProxy = new Proxy(this, {
     get: (target, prop) => {

test/engines/playwright.ts

@@ -23,17 +23,17 @@ export class PlaywrightEngine extends TestEngineBase {
   ): void {
     const serializedEvaluateParams = serializeJavascript({ ...evaluateContext, evaluateFn: evaluate });
 
-    test(`(es) ${name}`, async ({ page }) => {
-      await page.goto('/modern.html', { waitUntil: 'domcontentloaded' });
-      await page.waitForLoadState('domcontentloaded');
-      await this.executeEvaluation({ page, assert, serializedEvaluateParams });
-    });
-
-    // test(`(es-legacy) ${name}`, async ({ page }) => {
-    //   await page.goto('/legacy.html', { waitUntil: 'domcontentloaded' });
+    // test(`(es) ${name}`, async ({ page }) => {
+    //   await page.goto('/modern.html', { waitUntil: 'domcontentloaded' });
     //   await page.waitForLoadState('domcontentloaded');
     //   await this.executeEvaluation({ page, assert, serializedEvaluateParams });
     // });
+
+    test(`(es-legacy) ${name}`, async ({ page }) => {
+      await page.goto('/legacy.html', { waitUntil: 'domcontentloaded' });
+      await page.waitForLoadState('domcontentloaded');
+      await this.executeEvaluation({ page, assert, serializedEvaluateParams });
+    });
   }
 
   // eslint-disable-next-line @typescript-eslint/ban-types
@@ -86,7 +86,7 @@ export class PlaywrightEngine extends TestEngineBase {
       return serializedStr;
     }, serializedEvaluateParams);
 
-    const initialState = deserializeJavascript(resultStr);
+    const initialState = deserializeJavascript(resultStr, { debug: true, prettyPrint: false });
     // Restore the lang to the Enum.localize
     setLang(initialState.lang, Enum, getLocales, defaultLocalize);
     if (!initialState.EnumLocalize) {

test/test-suites/enum-item.ts

@@ -86,8 +86,8 @@ const testEnumItem = (engine: TestEngineBase) => {
       ({ localeEN, sunday, monday, tuesday, friday, saturday }) => {
         engine.expect(Number(sunday)).toBe(0);
         engine.expect(String(sunday)).toBe(localeEN.Sunday);
-        // engine.expect(Boolean(sunday)).toBe(false);
-        // engine.expect(Boolean(monday)).toBe(true);
+        engine.expect(Boolean(sunday)).toBe(true);
+        engine.expect(Boolean(monday)).toBe(true);
 
         engine.expect(saturday > friday).toBeTruthy();
         engine.expect(monday < tuesday).toBeTruthy();

test/utils/serialize-javascript.ts

@@ -25,7 +25,7 @@
 const TokenStart = '$SJS$';
 const TokenEnd = '$SJE$';
 const VariablePrefix = '$SJV$_';
-const SymbolKeyRegExps: [RegExp, RegExp] = [/\[Symbol\.\w+\]/, /\[Symbol\.for\('[^']+'\)\]/];
+const SymbolKeyRegExps: [RegExp, RegExp] = [/\[Symbol\.\w+\]/, /\[Symbol\.for\([\u0027\u0022].+?[\u0027\u0022]\)\]/];
 const SymbolKeyPrefixRegExp = /\[/;
 const SymbolKeySuffixRegExp = /\]/;
 
@@ -138,7 +138,10 @@ function serializeJavascriptRecursively(obj: any, options: InternalSerializeOpti
         !funcStr.startsWith('async function*') &&
         !funcStr.replace(/\s/g, '').match(/^\(?[^)]+\)?=>/)
       ) {
-        funcStr = `function ${value}`;
+        // If it's a computed property function, for example: { [Symbol.toPrimitive]() { return 1; } }
+        // the funcStr is like: `[Symbol.toPrimitive]() { return 1; }`, so we can safely remove it.
+        funcStr = funcStr.replace(/^\[[^\]]+\]/, '');
+        funcStr = `function ${funcStr}`;
       }
       funcStr = funcStr.replace(/"/g, "'");
       return `${TS}(${funcStr})${TE}`;
@@ -224,20 +227,25 @@ export function deserializeJavascript(input: string, options?: DeserializeOption
 }
 
 function directDeserialize(result: SerializedResult, options: InternalDeserializeOptions) {
-  const { variablePrefix: VP, closure, get = getByPath, debug } = options ?? {};
+  const { variablePrefix: VP, closure, get = getByPath, debug, prettyPrint = true } = options ?? {};
   const code = getDeserializeJavascriptCode(result, options);
-  const printCode = getDeserializeJavascriptCode(result, { ...options, isPrint: true });
   if (debug) {
+    const printSourceCode = getDeserializeJavascriptCode(result, { ...options, isPrint: true });
+    const prettyPrintCode = `\`${printSourceCode.replace(/`/g, '\\`').replace(/\$\{/g, '\\${')}\``;
+    const realCode = `'${printSourceCode.replace(/\n/g, '\\n').replace(/'/g, "\\'")}'`;
+    const printCode = prettyPrint ? prettyPrintCode : realCode;
     console.log(
       '-------------- deserializeCode --------------\n',
       `${getByPath.toString()}
-    new Function('${VP}context', '${VP}options', \`\n${printCode.replace(/`/g, '\\`').replace(/\$\{/g, '\\${')}\`)(${closure ? 'closure' : 'undefined'}, { get: getByPath });`,
-      'closure=',
+    new Function('${VP}context', '${VP}options', ${printCode})(${closure ? 'closure' : 'undefined'}, { get: getByPath });`,
+      'closure =',
       closure
     );
   }
   try {
-    const deserializeResult = new Function(`${VP}context`, `${VP}options`, code)(closure, { get });
+    const deserializeResult = new Function(`${VP}context`, `${VP}options`, code)(closure, {
+      get,
+    });
     return deserializeResult;
   } catch (error) {
     console.error(error);
@@ -576,6 +584,15 @@ export type DeserializeOptions = Pick<SerializeOptions, 'tokenStart' | 'tokenEnd
    * functions which use some global variables or modules, it's a good idea to pass them here.
    */
   closure?: Record<string, unknown>;
+  /**
+   * Whether to pretty print the deserialized object. Default is `true`.
+   *
+   * - `true`: Pretty print the deserialized code with indentation and new lines, which is more
+   *   readable, but may be a little different from the real execution code.
+   * - `false` - Print the object in a single line, which is more compact and similar to the real
+   *   execution code.
+   */
+  prettyPrint?: boolean;
 };
 
 interface InternalDeserializeOptions extends DeserializeOptions {