feat: support revert array in vm

Author: 对二

lib/revert.js

@@ -9,13 +9,18 @@ function derecycle(java, refs, path) {
 
   // simple type, null, undefined
   if (typeof java !== 'object' ||
-             java === null ||
-             //java === undefined ||
-             java instanceof Boolean ||
-             java instanceof Date ||
-             java instanceof Number ||
-             java instanceof RegExp ||
-             java instanceof String) {
+      java === null ||
+      //java === undefined ||
+      java instanceof Boolean ||
+      java instanceof Date ||
+      java instanceof Number ||
+      java instanceof RegExp ||
+      java instanceof String ||
+      Object.prototype.toString.call(java) === '[object Boolean]'||
+      Object.prototype.toString.call(java) === '[object Date]' ||
+      Object.prototype.toString.call(java) === '[object Number]' ||
+      Object.prototype.toString.call(java) === '[object RegExp]' ||
+      Object.prototype.toString.call(java) === '[object String]') {
     return java;
   }
 
@@ -48,12 +53,12 @@ function derecycle(java, refs, path) {
       result[k] = derecycle(v, refs, path ? path + DELIMITER + k : k);
     });
   */
-  } else if (java instanceof Array) {
+  } else if (java instanceof Array || Array.isArray(java)) {
     result = [];
     java.forEach(function(v, i) {
       result[i] = derecycle(v, refs, path ? path + DELIMITER + i : i + '');
     });
-  } else if (java instanceof Error) {
+  } else if (java instanceof Error || Object.prototype.toString.call(java) === "[object Error]") {
     result = java;
   } else {
     // plain object
@@ -93,7 +98,7 @@ function retrocycle(js, root) {
   var i, l, item, path;
 
   if (js && typeof js === 'object') {
-    if (js instanceof Array) {
+    if (js instanceof Array || Array.isArray(js)) {
       for (i = 0, l = js.length; i < l; i++) {
         item = js[i];
         if (item && typeof item === 'object') {
@@ -105,7 +110,7 @@ function retrocycle(js, root) {
           }
         }
       }
-    } else if (js instanceof Error) {
+    } else if (js instanceof Error || Object.prototype.toString.call(js) === "[object Error]") {
       return js;
     } else {
       for (i in js) {

test/revert.test.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var assert = require('assert');
+var vm = require('vm');
 require('should');
 var revert = require('../index').revert;
 
@@ -85,7 +87,6 @@ describe('revert: java to js', function() {
     revert(java).should.eql(['foo', 'bar', 'zoo']);
   });
 
-
   it('should work when used with cycular reference', function() {
     var java, result;
 
@@ -182,4 +183,59 @@ describe('revert: java to js', function() {
     result[1] = result[0];
     revert(java).should.eql(result);
   });
+
+  it('should work in vm', function() {
+    revert(new vm.Script(`33`).runInNewContext({})).should.equal(33);
+    revert(new vm.Script(`'foo'`).runInNewContext({})).should.equal('foo');
+    revert(new vm.Script(`true`).runInNewContext({})).should.equal(true);
+
+    assert.deepEqual(revert(new vm.Script(`new Boolean(true)`).runInNewContext({})), new Boolean(true));
+    assert.deepEqual(revert(new vm.Script(`new Date('2023-01-01')`).runInNewContext({})), new Date('2023-01-01'));
+    assert.deepEqual(revert(new vm.Script(`new Number(1)`).runInNewContext({})), new Number(1));
+    assert.deepEqual(revert(new vm.Script(`new RegExp(/[12]/)`).runInNewContext({})), new RegExp(/[12]/));
+    assert.deepEqual(revert(new vm.Script(`new String('foo')`).runInNewContext({})), new String('foo'));
+
+    var java = new vm.Script(`[
+      {$class: 'string', $: 'foo'},
+      {$class: 'string', $: 'bar'},
+      {$class: 'string', $: 'zoo'},
+    ]`).runInNewContext({});
+    revert(java).should.eql(['foo', 'bar', 'zoo']);
+
+    var error = new Error();
+    error.message = 'this is a java IOException instance';
+    error.name = 'java.io.IOException';
+    error.cause = error;
+    assert.deepEqual(revert(new vm.Script(`var error = new Error();
+      error.message = 'this is a java IOException instance';
+      error.name = 'java.io.IOException';
+      error.cause = error;
+      var java = {
+        $class: 'java.io.IOException',
+        $: error,
+      };`).runInNewContext({})), error);
+
+    class javaError extends Error {
+      constructor(message) {
+        super(message);
+        this.name = 'java.io.IOException';
+        this.cause = this;
+      }
+    }
+    var error2 = new javaError('this is a java IOException instance');
+
+    assert.deepEqual(revert(new vm.Script(`class javaError extends Error {
+      constructor(message) {
+        super(message);
+        this.name = 'java.io.IOException';
+        this.cause = this;
+      }
+    }
+    var error2 = new javaError('this is a java IOException instance');
+    var java = {
+      $class: 'java.io.IOException',
+      $: error2,
+    };
+    java`).runInNewContext({})), error2);
+  });
 });