@drawbridge/drawbridge-utils 0.0.102 → 0.0.103

package/dist/fields-validate.cjs

@@ -0,0 +1,121 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// lib/fields-validate.js
+var fields_validate_exports = {};
+__export(fields_validate_exports, {
+  errors: () => errors,
+  validators: () => validators
+});
+module.exports = __toCommonJS(fields_validate_exports);
+
+// lib/phone.js
+var import_libphonenumber_js = require("libphonenumber-js");
+var isValid = (value, country) => {
+  if (!value) return false;
+  try {
+    return (0, import_libphonenumber_js.isValidPhoneNumber)(String(value), country);
+  } catch {
+    return false;
+  }
+};
+
+// lib/fields-validate.js
+var errors = {
+  country: "Field is not an accepted value",
+  email: "Field value must be a valid email",
+  length: (length) => "Field must be less than or equal to " + length + " characters",
+  max: (val) => "Field value must be less than or equal to " + val,
+  min: (val) => "Field value must be greater than or equal to " + val,
+  option: "Field is not an accepted value",
+  phone: "Field value is not valid",
+  required: "Field is required"
+};
+var required = (field, schema) => {
+  var _a;
+  return ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.required) === false ? schema.nullable() : schema.required(errors.required);
+};
+var validators = {
+  // An agreement that is not required is not an agreement - consent stays
+  // affirmative regardless of the toggle.
+  agreement: (field, yup) => {
+    return yup.bool().required(errors.required).oneOf([true], errors.required);
+  },
+  email: (field, yup) => {
+    const max = 320;
+    return required(field, yup.string().email(errors.email).max(max, errors.length(max)));
+  },
+  name: (field, yup) => {
+    var _a;
+    const max = 150;
+    const object = (((_a = field == null ? void 0 : field.settings) == null ? void 0 : _a.capture) || []).reduce(
+      (accumulator, item) => {
+        accumulator[item] = yup.string().required(errors.required).max(max, errors.length(max));
+        return accumulator;
+      },
+      {}
+    );
+    return required(field, yup.object(object));
+  },
+  number: (field, yup) => {
+    var _a, _b, _c, _d, _e, _f;
+    let validate = yup.number();
+    if ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.min) {
+      validate = validate.min((_b = field == null ? void 0 : field.attributes) == null ? void 0 : _b.min, errors.min((_c = field == null ? void 0 : field.attributes) == null ? void 0 : _c.min));
+    }
+    ;
+    if ((_d = field == null ? void 0 : field.attributes) == null ? void 0 : _d.max) {
+      validate = validate.max((_e = field == null ? void 0 : field.attributes) == null ? void 0 : _e.max, errors.max((_f = field == null ? void 0 : field.attributes) == null ? void 0 : _f.max));
+    }
+    ;
+    return required(field, validate);
+  },
+  phone: (field, yup) => {
+    var _a;
+    return required(
+      field,
+      yup.object({
+        country: yup.string().required(errors.required).oneOf((_a = field == null ? void 0 : field.settings) == null ? void 0 : _a.countries, errors.country),
+        number: yup.string().required(errors.required)
+      }).test("phone", errors.phone, (value) => isValid(value == null ? void 0 : value.number, value == null ? void 0 : value.country))
+    );
+  },
+  // The in-list check the share form never had: the answer must be one of the
+  // field's own options. null rides the whitelist so an optional select can be
+  // left blank - required() still rejects null when the field is required.
+  select: (field, yup) => {
+    var _a;
+    const options = (((_a = field == null ? void 0 : field.settings) == null ? void 0 : _a.options) || []).map((item) => item == null ? void 0 : item.option);
+    return required(field, yup.string().oneOf([...options, null], errors.option));
+  },
+  text: (field, yup) => {
+    var _a;
+    const max = ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.max) || 150;
+    return required(field, yup.string().max(max, errors.length(max)));
+  },
+  textarea: (field, yup) => {
+    var _a;
+    const max = ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.max) || 150;
+    return required(field, yup.string().max(max, errors.length(max)));
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  errors,
+  validators
+});

package/dist/fields-validate.d.cts

@@ -0,0 +1,116 @@
+import { isValid } from './phone.cjs';
+import 'libphonenumber-js';
+
+// Field validators shared by the share form (client) and the api submission
+// route (server). They lived only in drawbridge-share, so every additional-field
+// answer - number, select, text, textarea - was validated in the browser and
+// stored as submitted; the api only ever validated lead fields.
+//
+// yup is passed in rather than imported so each consumer keeps its own copy
+// (share bundles one, api has its own in lib/validate).
+
+
+const errors = {
+	country : 'Field is not an accepted value',
+	email : 'Field value must be a valid email',
+	length : ( length ) => 'Field must be less than or equal to ' + length + ' characters',
+	max : ( val ) => 'Field value must be less than or equal to ' + val,
+	min : ( val ) => 'Field value must be greater than or equal to ' + val,
+	option : 'Field is not an accepted value',
+	phone : 'Field value is not valid',
+	required : 'Field is required'
+};
+
+// Every stored attributes.required is currently true, so this is a no-op today -
+// it is here so the optional-field toggle does not need a second pass over
+// every builder.
+const required = ( field, schema ) => ( field?.attributes?.required === false ) ? schema.nullable() : schema.required( errors.required );
+
+const validators = {
+	// An agreement that is not required is not an agreement - consent stays
+	// affirmative regardless of the toggle.
+	agreement : ( field, yup ) => {
+
+		return yup.bool().required( errors.required ).oneOf( [ true ], errors.required );
+
+	},
+	email : ( field, yup ) => {
+
+		const max = 320;
+
+		return required( field, yup.string().email( errors.email ).max( max, errors.length( max ) ) );
+
+	},
+	name : ( field, yup ) => {
+
+		const max = 150;
+
+		const object = ( field?.settings?.capture || [] ).reduce(
+			( accumulator, item ) => {
+
+				accumulator[ item ] = yup.string().required( errors.required ).max( max, errors.length( max ) );
+
+				return accumulator;
+
+			},
+			{}
+		);
+
+		return required( field, yup.object( object ) );
+
+	},
+	number : ( field, yup ) => {
+
+		let validate = yup.number();
+
+		if( field?.attributes?.min ){
+
+			validate = validate.min( field?.attributes?.min, errors.min( field?.attributes?.min ) );
+
+		}
+		if( field?.attributes?.max ){
+
+			validate = validate.max( field?.attributes?.max, errors.max( field?.attributes?.max ) );
+
+		}
+		return required( field, validate );
+
+	},
+	phone : ( field, yup ) => {
+
+		return required(
+			field,
+			yup.object({
+				country : yup.string().required( errors.required ).oneOf( field?.settings?.countries, errors.country ),
+				number : yup.string().required( errors.required )
+			}).test( 'phone', errors.phone, ( value ) => isValid( value?.number, value?.country ) )
+		);
+
+	},
+	// The in-list check the share form never had: the answer must be one of the
+	// field's own options. null rides the whitelist so an optional select can be
+	// left blank - required() still rejects null when the field is required.
+	select : ( field, yup ) => {
+
+		const options = ( field?.settings?.options || [] ).map( ( item ) => item?.option );
+
+		return required( field, yup.string().oneOf( [ ...options, null ], errors.option ) );
+
+	},
+	text : ( field, yup ) => {
+
+		const max = field?.attributes?.max || 150;
+
+		return required( field, yup.string().max( max, errors.length( max ) ) );
+
+	},
+	textarea : ( field, yup ) => {
+
+		const max = field?.attributes?.max || 150;
+
+		return required( field, yup.string().max( max, errors.length( max ) ) );
+
+	}
+};
+
+export { errors, validators };

package/dist/fields-validate.d.ts

@@ -0,0 +1,116 @@
+import { isValid } from './phone.js';
+import 'libphonenumber-js';
+
+// Field validators shared by the share form (client) and the api submission
+// route (server). They lived only in drawbridge-share, so every additional-field
+// answer - number, select, text, textarea - was validated in the browser and
+// stored as submitted; the api only ever validated lead fields.
+//
+// yup is passed in rather than imported so each consumer keeps its own copy
+// (share bundles one, api has its own in lib/validate).
+
+
+const errors = {
+	country : 'Field is not an accepted value',
+	email : 'Field value must be a valid email',
+	length : ( length ) => 'Field must be less than or equal to ' + length + ' characters',
+	max : ( val ) => 'Field value must be less than or equal to ' + val,
+	min : ( val ) => 'Field value must be greater than or equal to ' + val,
+	option : 'Field is not an accepted value',
+	phone : 'Field value is not valid',
+	required : 'Field is required'
+};
+
+// Every stored attributes.required is currently true, so this is a no-op today -
+// it is here so the optional-field toggle does not need a second pass over
+// every builder.
+const required = ( field, schema ) => ( field?.attributes?.required === false ) ? schema.nullable() : schema.required( errors.required );
+
+const validators = {
+	// An agreement that is not required is not an agreement - consent stays
+	// affirmative regardless of the toggle.
+	agreement : ( field, yup ) => {
+
+		return yup.bool().required( errors.required ).oneOf( [ true ], errors.required );
+
+	},
+	email : ( field, yup ) => {
+
+		const max = 320;
+
+		return required( field, yup.string().email( errors.email ).max( max, errors.length( max ) ) );
+
+	},
+	name : ( field, yup ) => {
+
+		const max = 150;
+
+		const object = ( field?.settings?.capture || [] ).reduce(
+			( accumulator, item ) => {
+
+				accumulator[ item ] = yup.string().required( errors.required ).max( max, errors.length( max ) );
+
+				return accumulator;
+
+			},
+			{}
+		);
+
+		return required( field, yup.object( object ) );
+
+	},
+	number : ( field, yup ) => {
+
+		let validate = yup.number();
+
+		if( field?.attributes?.min ){
+
+			validate = validate.min( field?.attributes?.min, errors.min( field?.attributes?.min ) );
+
+		}
+		if( field?.attributes?.max ){
+
+			validate = validate.max( field?.attributes?.max, errors.max( field?.attributes?.max ) );
+
+		}
+		return required( field, validate );
+
+	},
+	phone : ( field, yup ) => {
+
+		return required(
+			field,
+			yup.object({
+				country : yup.string().required( errors.required ).oneOf( field?.settings?.countries, errors.country ),
+				number : yup.string().required( errors.required )
+			}).test( 'phone', errors.phone, ( value ) => isValid( value?.number, value?.country ) )
+		);
+
+	},
+	// The in-list check the share form never had: the answer must be one of the
+	// field's own options. null rides the whitelist so an optional select can be
+	// left blank - required() still rejects null when the field is required.
+	select : ( field, yup ) => {
+
+		const options = ( field?.settings?.options || [] ).map( ( item ) => item?.option );
+
+		return required( field, yup.string().oneOf( [ ...options, null ], errors.option ) );
+
+	},
+	text : ( field, yup ) => {
+
+		const max = field?.attributes?.max || 150;
+
+		return required( field, yup.string().max( max, errors.length( max ) ) );
+
+	},
+	textarea : ( field, yup ) => {
+
+		const max = field?.attributes?.max || 150;
+
+		return required( field, yup.string().max( max, errors.length( max ) ) );
+
+	}
+};
+
+export { errors, validators };

package/dist/fields-validate.js

@@ -0,0 +1,94 @@
+// lib/phone.js
+import { parsePhoneNumberFromString, isValidPhoneNumber } from "libphonenumber-js";
+var isValid = (value, country) => {
+  if (!value) return false;
+  try {
+    return isValidPhoneNumber(String(value), country);
+  } catch {
+    return false;
+  }
+};
+
+// lib/fields-validate.js
+var errors = {
+  country: "Field is not an accepted value",
+  email: "Field value must be a valid email",
+  length: (length) => "Field must be less than or equal to " + length + " characters",
+  max: (val) => "Field value must be less than or equal to " + val,
+  min: (val) => "Field value must be greater than or equal to " + val,
+  option: "Field is not an accepted value",
+  phone: "Field value is not valid",
+  required: "Field is required"
+};
+var required = (field, schema) => {
+  var _a;
+  return ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.required) === false ? schema.nullable() : schema.required(errors.required);
+};
+var validators = {
+  // An agreement that is not required is not an agreement - consent stays
+  // affirmative regardless of the toggle.
+  agreement: (field, yup) => {
+    return yup.bool().required(errors.required).oneOf([true], errors.required);
+  },
+  email: (field, yup) => {
+    const max = 320;
+    return required(field, yup.string().email(errors.email).max(max, errors.length(max)));
+  },
+  name: (field, yup) => {
+    var _a;
+    const max = 150;
+    const object = (((_a = field == null ? void 0 : field.settings) == null ? void 0 : _a.capture) || []).reduce(
+      (accumulator, item) => {
+        accumulator[item] = yup.string().required(errors.required).max(max, errors.length(max));
+        return accumulator;
+      },
+      {}
+    );
+    return required(field, yup.object(object));
+  },
+  number: (field, yup) => {
+    var _a, _b, _c, _d, _e, _f;
+    let validate = yup.number();
+    if ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.min) {
+      validate = validate.min((_b = field == null ? void 0 : field.attributes) == null ? void 0 : _b.min, errors.min((_c = field == null ? void 0 : field.attributes) == null ? void 0 : _c.min));
+    }
+    ;
+    if ((_d = field == null ? void 0 : field.attributes) == null ? void 0 : _d.max) {
+      validate = validate.max((_e = field == null ? void 0 : field.attributes) == null ? void 0 : _e.max, errors.max((_f = field == null ? void 0 : field.attributes) == null ? void 0 : _f.max));
+    }
+    ;
+    return required(field, validate);
+  },
+  phone: (field, yup) => {
+    var _a;
+    return required(
+      field,
+      yup.object({
+        country: yup.string().required(errors.required).oneOf((_a = field == null ? void 0 : field.settings) == null ? void 0 : _a.countries, errors.country),
+        number: yup.string().required(errors.required)
+      }).test("phone", errors.phone, (value) => isValid(value == null ? void 0 : value.number, value == null ? void 0 : value.country))
+    );
+  },
+  // The in-list check the share form never had: the answer must be one of the
+  // field's own options. null rides the whitelist so an optional select can be
+  // left blank - required() still rejects null when the field is required.
+  select: (field, yup) => {
+    var _a;
+    const options = (((_a = field == null ? void 0 : field.settings) == null ? void 0 : _a.options) || []).map((item) => item == null ? void 0 : item.option);
+    return required(field, yup.string().oneOf([...options, null], errors.option));
+  },
+  text: (field, yup) => {
+    var _a;
+    const max = ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.max) || 150;
+    return required(field, yup.string().max(max, errors.length(max)));
+  },
+  textarea: (field, yup) => {
+    var _a;
+    const max = ((_a = field == null ? void 0 : field.attributes) == null ? void 0 : _a.max) || 150;
+    return required(field, yup.string().max(max, errors.length(max)));
+  }
+};
+export {
+  errors,
+  validators
+};

package/package.json

@@ -13,10 +13,11 @@
     "tinycolor2": "1.6.0"
   },
   "devDependencies": {
-    "@drawbridge/drawbridge-agents": "0.1.36",
+    "@drawbridge/drawbridge-agents": "0.1.37",
     "@node-oauth/oauth2-server": "5.3.0",
     "tsup": "8.5.1",
-    "typescript": "5.9.3"
+    "typescript": "5.9.3",
+    "yup": "1.7.1"
   },
   "peerDependencies": {
     "@node-oauth/oauth2-server": "^5.3.0"
@@ -161,6 +162,11 @@
       "types": "./dist/plans.d.ts",
       "import": "./dist/plans.js",
       "require": "./dist/plans.cjs"
+    },
+    "./fields-validate": {
+      "types": "./dist/fields-validate.d.ts",
+      "import": "./dist/fields-validate.js",
+      "require": "./dist/fields-validate.cjs"
     }
   },
   "files": [
@@ -179,5 +185,5 @@
     "test": ". \"$HOME/.nvm/nvm.sh\" && nvm use && node --test"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.102"
+  "version": "0.0.103"
 }