Parse regex objects to strings

Author: delvedor

example.js

@@ -17,6 +17,9 @@ const stringify = fastJson({
     },
     now: {
       type: 'string'
+    },
+    reg: {
+      type: 'string'
     }
   }
 })
@@ -25,5 +28,6 @@ console.log(stringify({
   firstName: 'Matteo',
   lastName: 'Collina',
   age: 32,
-  now: new Date()
+  now: new Date(),
+  reg: /"([^"]|\\")*"/
 }))

index.js

@@ -37,9 +37,6 @@ function build (schema) {
       main = '$main'
       code = buildArray(schema, code, main)
       break
-    case 'RegExp':
-      main = $asRegExp.name
-      break
     default:
       throw new Error(`${schema.type} unsupported`)
   }
@@ -72,6 +69,8 @@ function $asBoolean (bool) {
 function $asString (str) {
   if (str instanceof Date) {
     return '"' + str.toISOString() + '"'
+  } else if (str instanceof RegExp) {
+    return $asRegExp(str)
   } else if (typeof str !== 'string') {
     str = str.toString()
   }
@@ -120,7 +119,7 @@ function $asStringSmall (str) {
 }
 
 function $asRegExp (reg) {
-  reg = reg instanceof RegExp ? reg.source : reg
+  reg = reg.source
 
   for (var i = 0, len = reg.length; i < len; i++) {
     if (reg[i] === '\\' || reg[i] === '"') {
@@ -240,11 +239,6 @@ function nested (laterCode, name, key, schema) {
         json += ${funcName}(obj${key})
       `
       break
-    case 'RegExp':
-      code += `
-        json += $asRegExp(obj${key})
-      `
-      break
     default:
       throw new Error(`${type} unsupported`)
   }

test.js

@@ -231,20 +231,17 @@ test('object with RexExp', (t) => {
     type: 'object',
     properties: {
       reg: {
-        type: 'RegExp'
-      },
-      streg: {
-        type: 'RegExp'
+        type: 'string'
       }
     }
   }
 
   const obj = {
-    reg: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-    streg: '^(([^<>()\\[\\]\\\\.,;:\\s@"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@"]+)*)|(".+"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$'
+    reg: /"([^"]|\\")*"/
   }
 
   const stringify = build(schema)
+  const validate = validator(schema)
   const output = stringify(obj)
 
   try {
@@ -255,5 +252,5 @@ test('object with RexExp', (t) => {
   }
 
   t.equal(obj.reg.source, new RegExp(JSON.parse(output).reg).source)
-  t.equal(obj.streg, JSON.parse(output).streg)
+  t.ok(validate(JSON.parse(output)), 'valid schema')
 })