Support object value assertions, and improve code quality

chuigda · Sep 20, 2022 · 7d3fcd3 · 7d3fcd3
1 parent dfd70f1
commit 7d3fcd3
Show file tree

Hide file tree

Showing 4 changed files with 161 additions and 18 deletions.
diff --git a/test.cjs b/test.cjs
@@ -1,3 +1,5 @@
+// noinspection JSUnresolvedFunction
+
 const { typeAssert, enableChainAPI, preventErrTrace } = require('./typeAssert.cjs')
 
 preventErrTrace(true)
@@ -85,10 +87,22 @@ typeAssert({
   ]
 }, compoundAssertion)
 
-typeAssert(5, 'number'.chainWith(x => x > 0 ? true : 'no negative numbers'))
-expectFailure(() => typeAssert(-1, 'number'.chainWith(x => x > 0 ? true : 'no negative numbers')))
+const nonNegativeAssertion = 'number'.chainWith(x => x > 0 || 'no negative numbers')
+typeAssert(5, nonNegativeAssertion)
+expectFailure(() => typeAssert(-1, nonNegativeAssertion))
 
 typeAssert(5, 'number'.assertValue(5))
 expectFailure(() => typeAssert(5, 'number'.assertValue(114514)))
 
+const objectValueAssertion = {}.assertObjectValue('number')
+typeAssert({ a: 114, b: 514 }, objectValueAssertion)
+expectFailure(() => typeAssert({ a: 114, b: '514' }, objectValueAssertion))
+
+const objectValueAssertion2 = 'object?'.assertObjectValue('number'.chainWith(x => x >= 100 || 'no less than 100'))
+typeAssert({ a: 114, b: 514 }, objectValueAssertion2)
+typeAssert(null, objectValueAssertion2)
+typeAssert(undefined, objectValueAssertion2)
+expectFailure(() => typeAssert({ a: 114, b: '514' }, objectValueAssertion2))
+expectFailure(() => typeAssert({ a: 114, b: 90 }, objectValueAssertion2))
+
 console.info('mission accomplished')
diff --git a/test.js b/test.js
@@ -1,3 +1,5 @@
+// noinspection JSUnresolvedFunction
+
 import { typeAssert, enableChainAPI, preventErrTrace } from './typeAssert.js'
 
 preventErrTrace(true)
@@ -85,10 +87,22 @@ typeAssert({
   ]
 }, compoundAssertion)
 
-typeAssert(5, 'number'.chainWith(x => x > 0 ? true : 'no negative numbers'))
-expectFailure(() => typeAssert(-1, 'number'.chainWith(x => x > 0 ? true : 'no negative numbers')))
+const nonNegativeAssertion = 'number'.chainWith(x => x > 0 || 'no negative numbers')
+typeAssert(5, nonNegativeAssertion)
+expectFailure(() => typeAssert(-1, nonNegativeAssertion))
 
 typeAssert(5, 'number'.assertValue(5))
 expectFailure(() => typeAssert(5, 'number'.assertValue(114514)))
 
+const objectValueAssertion = {}.assertObjectValue('number')
+typeAssert({ a: 114, b: 514 }, objectValueAssertion)
+expectFailure(() => typeAssert({ a: 114, b: '514' }, objectValueAssertion))
+
+const objectValueAssertion2 = 'object?'.assertObjectValue('number'.chainWith(x => x >= 100 || 'no less than 100'))
+typeAssert({ a: 114, b: 514 }, objectValueAssertion2)
+typeAssert(null, objectValueAssertion2)
+typeAssert(undefined, objectValueAssertion2)
+expectFailure(() => typeAssert({ a: 114, b: '514' }, objectValueAssertion2))
+expectFailure(() => typeAssert({ a: 114, b: 90 }, objectValueAssertion2))
+
 console.info('mission accomplished')
diff --git a/typeAssert.cjs b/typeAssert.cjs
@@ -133,6 +133,11 @@ const typeAssertImpl = (path, object, assertion, preventErr) => {
     }
   } else if (assertion.constructor === ValueAssertion.prototype.constructor) {
     assertEquals(`${path}:value`, assertion.value, object, preventErr)
+  } else if (assertion.constructor === ObjectValueAssertion.prototype.constructor) {
+    typeAssertImpl(path, object, {}, preventErr)
+    for (const [key, value] of Object.entries(object)) {
+      typeAssertImpl(`${path}.${key}`, value, assertion.valueAssertion, preventErr)
+    }
   } else if (object === undefined) {
     typeAssertError(path, 'unexpected "undefined" value', preventErr)
   } else if (object === null) {
@@ -192,18 +197,28 @@ const ValueAssertion = (function() {
   return ValueAssertion
 }())
 
+const ObjectValueAssertion = (function() {
+  function ObjectValueAssertion(valueAssertion) {
+    this.valueAssertion = valueAssertion
+  }
+
+  return ObjectValueAssertion
+}())
+
 const enableChainAPI = methodNames => {
   let orNullName = 'orNull'
   let sumWithName = 'sumWith'
   let chainWithName = 'chainWith'
   let assertValueName = 'assertValue'
-
-  if (methodNames !== null && methodNames !== undefined) {
-    const { orNull, sumWith, chainWith, assertValue } = methodNames
-    orNullName = orNull ? orNull : orNullName
-    sumWithName = sumWith ? sumWith : sumWithName
-    chainWithName = chainWith ? chainWith : chainWithName
-    assertValueName = assertValue ? assertValue : assertValueName
+  let assertObjectValueName = 'assertObjectValue'
+
+  if (methodNames) {
+    const { orNull, sumWith, chainWith, assertValue, assertObjectValue } = methodNames
+    orNullName = orNull || orNullName
+    sumWithName = sumWith || sumWithName
+    chainWithName = chainWith || chainWithName
+    assertValueName = assertValue || assertValueName
+    assertObjectValueName = assertObjectValue || assertObjectValueName
   }
 
   const checkChainNotEndedByValueAssertion = types => {
@@ -311,6 +326,48 @@ const enableChainAPI = methodNames => {
       return new ChainType([...this.types, new ValueAssertion(that)])
     }
   })
+
+  Object.defineProperty(Object.prototype, assertObjectValueName, {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value(valueAssertion) {
+      if (this.constructor !== Object.prototype.constructor) {
+        typeAssertError(
+          '<onbuild> Object.prototype.assertObjectValue',
+          `cannot assert object values of "${this.constructor.name}"`
+        )
+      }
+      return new ObjectValueAssertion(valueAssertion)
+    }
+  })
+
+  Object.defineProperty(String.prototype, assertObjectValueName, {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value(valueAssertion) {
+      let nullable = false
+      let self = `${this}`
+      if (self.endsWith('?')) {
+        nullable = true
+        self = self.slice(0, -1)
+      }
+
+      if (self !== 'object') {
+        typeAssertError(
+          '<onbuild> String.prototype.assertObjectValue',
+          `cannot assert object values of "${self}"`
+        )
+      }
+
+      let ret = new ObjectValueAssertion(valueAssertion)
+      if (nullable) {
+        ret = new NullableType(ret)
+      }
+      return ret
+    }
+  })
 }
 
 module.exports = {
@@ -320,6 +377,7 @@ module.exports = {
   SumType,
   ChainType,
   ValueAssertion,
+  ObjectValueAssertion,
   enableChainAPI,
   preventErrTrace
 }
diff --git a/typeAssert.js b/typeAssert.js
@@ -133,6 +133,11 @@ const typeAssertImpl = (path, object, assertion, preventErr) => {
     }
   } else if (assertion.constructor === ValueAssertion.prototype.constructor) {
     assertEquals(`${path}:value`, assertion.value, object, preventErr)
+  } else if (assertion.constructor === ObjectValueAssertion.prototype.constructor) {
+    typeAssertImpl(path, object, {}, preventErr)
+    for (const [key, value] of Object.entries(object)) {
+      typeAssertImpl(`${path}.${key}`, value, assertion.valueAssertion, preventErr)
+    }
   } else if (object === undefined) {
     typeAssertError(path, 'unexpected "undefined" value', preventErr)
   } else if (object === null) {
@@ -192,18 +197,28 @@ export const ValueAssertion = (function() {
   return ValueAssertion
 }())
 
+export const ObjectValueAssertion = (function() {
+  function ObjectValueAssertion(valueAssertion) {
+    this.valueAssertion = valueAssertion
+  }
+
+  return ObjectValueAssertion
+}())
+
 export const enableChainAPI = methodNames => {
   let orNullName = 'orNull'
   let sumWithName = 'sumWith'
   let chainWithName = 'chainWith'
   let assertValueName = 'assertValue'
-
-  if (methodNames !== null && methodNames !== undefined) {
-    const { orNull, sumWith, chainWith, assertValue } = methodNames
-    orNullName = orNull ? orNull : orNullName
-    sumWithName = sumWith ? sumWith : sumWithName
-    chainWithName = chainWith ? chainWith : chainWithName
-    assertValueName = assertValue ? assertValue : assertValueName
+  let assertObjectValueName = 'assertObjectValue'
+
+  if (methodNames) {
+    const { orNull, sumWith, chainWith, assertValue, assertObjectValue } = methodNames
+    orNullName = orNull || orNullName
+    sumWithName = sumWith || sumWithName
+    chainWithName = chainWith || chainWithName
+    assertValueName = assertValue || assertValueName
+    assertObjectValueName = assertObjectValue || assertObjectValueName
   }
 
   const checkChainNotEndedByValueAssertion = types => {
@@ -311,4 +326,46 @@ export const enableChainAPI = methodNames => {
       return new ChainType([...this.types, new ValueAssertion(that)])
     }
   })
+
+  Object.defineProperty(Object.prototype, assertObjectValueName, {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value(valueAssertion) {
+      if (this.constructor !== Object.prototype.constructor) {
+        typeAssertError(
+            '<onbuild> Object.prototype.assertObjectValue',
+            `cannot assert object values of "${this.constructor.name}"`
+        )
+      }
+      return new ObjectValueAssertion(valueAssertion)
+    }
+  })
+
+  Object.defineProperty(String.prototype, assertObjectValueName, {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value(valueAssertion) {
+      let nullable = false
+      let self = `${this}`
+      if (self.endsWith('?')) {
+        nullable = true
+        self = self.slice(0, -1)
+      }
+
+      if (self !== 'object') {
+        typeAssertError(
+            '<onbuild> String.prototype.assertObjectValue',
+            `cannot assert object values of "${self}"`
+        )
+      }
+
+      let ret = new ObjectValueAssertion(valueAssertion)
+      if (nullable) {
+        ret = new NullableType(ret)
+      }
+      return ret
+    }
+  })
 }