chore: address feedback

fixup! fix(marshal): remove ambient types, but still use JSDoc
endojs · Feb 2, 2022 · c5f2ef7 · c5f2ef7
1 parent 409cd6c
commit c5f2ef7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/packages/marshal/src/helpers/copyArray.js b/packages/marshal/src/helpers/copyArray.js
@@ -2,11 +2,7 @@
 
 /// <reference types="ses"/>
 
-import {
-  assertChecker,
-  checkNormalProperty,
-  conditionChecker,
-} from './passStyle-helpers.js';
+import { assertChecker, checkNormalProperty } from './passStyle-helpers.js';
 
 const { details: X } = assert;
 const { getPrototypeOf } = Object;
@@ -20,7 +16,7 @@ const { isArray, prototype: arrayPrototype } = Array;
 export const CopyArrayHelper = harden({
   styleName: 'copyArray',
 
-  canBeValid: (candidate, check = conditionChecker) =>
+  canBeValid: (candidate, check = v => v) =>
     check(isArray(candidate), X`Array expected: ${candidate}`),
 
   assertValid: (candidate, passStyleOfRecur) => {

diff --git a/packages/marshal/src/helpers/copyRecord.js b/packages/marshal/src/helpers/copyRecord.js
@@ -6,7 +6,6 @@ import {
   assertChecker,
   canBeMethod,
   checkNormalProperty,
-  conditionChecker,
 } from './passStyle-helpers.js';
 
 const { details: X } = assert;
@@ -24,7 +23,7 @@ const {
 export const CopyRecordHelper = harden({
   styleName: 'copyRecord',
 
-  canBeValid: (candidate, check = conditionChecker) => {
+  canBeValid: (candidate, check = v => v) => {
     const proto = getPrototypeOf(candidate);
     if (proto !== objectPrototype && proto !== null) {
       return check(false, X`Unexpected prototype for: ${candidate}`);

diff --git a/packages/marshal/src/helpers/error.js b/packages/marshal/src/helpers/error.js
@@ -2,7 +2,7 @@
 
 /// <reference types="ses"/>
 
-import { assertChecker, conditionChecker } from './passStyle-helpers.js';
+import { assertChecker } from './passStyle-helpers.js';
 
 /** @typedef {import('./internal-types.js').PassStyleHelper} PassStyleHelper */
 
@@ -46,7 +46,7 @@ harden(getErrorConstructor);
 export const ErrorHelper = harden({
   styleName: 'error',
 
-  canBeValid: (candidate, check = conditionChecker) => {
+  canBeValid: (candidate, check = v => v) => {
     // TODO: Need a better test than instanceof
     if (!(candidate instanceof Error)) {
       return check(false, X`Error expected: ${candidate}`);

diff --git a/packages/marshal/src/helpers/passStyle-helpers.js b/packages/marshal/src/helpers/passStyle-helpers.js
@@ -13,10 +13,6 @@ const {
 const { apply } = Reflect;
 const { isArray } = Array;
 
-/** @type {Checker} */
-export const conditionChecker = (cond, _details = undefined) => cond;
-harden(conditionChecker);
-
 export const hasOwnPropertyOf = (obj, prop) =>
   apply(objectHasOwnProperty, obj, [prop]);
 harden(hasOwnPropertyOf);

diff --git a/packages/marshal/src/helpers/remotable.js b/packages/marshal/src/helpers/remotable.js
@@ -4,7 +4,6 @@
 
 import {
   assertChecker,
-  conditionChecker,
   canBeMethod,
   hasOwnPropertyOf,
   PASS_STYLE,
@@ -45,7 +44,7 @@ export const ALLOW_IMPLICIT_REMOTABLES =
  * @param {InterfaceSpec} iface
  * @param {Checker=} check
  */
-const checkIface = (iface, check = conditionChecker) => {
+const checkIface = (iface, check = v => v) => {
   return (
     // TODO other possible ifaces, once we have third party veracity
     check(
@@ -72,7 +71,7 @@ harden(assertIface);
  * @param {Checker} [check]
  * @returns {boolean}
  */
-const checkRemotableProtoOf = (original, check = conditionChecker) => {
+const checkRemotableProtoOf = (original, check = v => v) => {
   /**
    * TODO: It would be nice to typedef this shape, but we can't declare a type
    * with PASS_STYLE from JSDoc.
@@ -144,7 +143,7 @@ const checkRemotableProtoOf = (original, check = conditionChecker) => {
  * @param {Checker} [check]
  * @returns {boolean}
  */
-const checkRemotable = (val, check = conditionChecker) => {
+const checkRemotable = (val, check = v => v) => {
   const not = (cond, details) => !check(cond, details);
   if (not(isFrozen(val), X`cannot serialize non-frozen objects like ${val}`)) {
     return false;
@@ -189,7 +188,7 @@ harden(getInterfaceOf);
 export const RemotableHelper = harden({
   styleName: 'remotable',
 
-  canBeValid: (candidate, check = conditionChecker) => {
+  canBeValid: (candidate, check = v => v) => {
     if (
       !(
         check(

diff --git a/packages/marshal/src/helpers/tagged.js b/packages/marshal/src/helpers/tagged.js
@@ -7,7 +7,6 @@ import {
   checkTagRecord,
   PASS_STYLE,
   checkNormalProperty,
-  conditionChecker,
 } from './passStyle-helpers.js';
 
 const { details: X } = assert;
@@ -21,7 +20,7 @@ const { getPrototypeOf, prototype: objectPrototype } = Object;
 export const TaggedHelper = harden({
   styleName: 'tagged',
 
-  canBeValid: (candidate, check = conditionChecker) =>
+  canBeValid: (candidate, check = v => v) =>
     checkTagRecord(candidate, 'tagged', check),
 
   assertValid: (candidate, passStyleOfRecur) => {