@m1212e/rumble 0.25.1 → 0.25.2

package/out/index.cjs

@@ -216,7 +216,7 @@ function mapNullFieldsToUndefined(obj) {
 }
 //#endregion
 //#region package.json
-var version = "0.25.1";
+var version = "0.25.2";
 //#endregion
 //#region lib/helpers/tableHelpers.ts
 const indexCache = /* @__PURE__ */ new WeakMap();
@@ -3115,9 +3115,13 @@ function implementDefaultAddressTypes(schemaBuilder) {
 //#endregion
 //#region lib/scalars/emailAddress.ts
 /**
-* Validates an email address using graphql-scalars' own format check, then lowercases it.
+* Validates an email address using graphql-scalars' own format check, then lowercases it, exactly
+* as the `EmailAddress` scalar does. Exported for values that do not arrive as GraphQL input,
+* such as OIDC claims.
+*
+* @throws RumbleErrorSafe if the value is not a valid email address
 */
-const normalize$1 = (value) => {
+const normalizeEmailAddress = (value) => {
 	try {
 		return graphql_scalars.EmailAddressResolver.parseValue(value).toLowerCase();
 	} catch (error) {
@@ -3128,23 +3132,28 @@ const EmailAddressResolver = new graphql.GraphQLScalarType({
 	name: "EmailAddress",
 	description: `${graphql_scalars.EmailAddressResolver.description} Lowercased.`,
 	specifiedByURL: graphql_scalars.EmailAddressResolver.specifiedByURL,
-	serialize: normalize$1,
-	parseValue: normalize$1,
+	serialize: normalizeEmailAddress,
+	parseValue: normalizeEmailAddress,
 	parseLiteral(ast) {
 		if (ast.kind !== graphql.Kind.STRING) throw new RumbleErrorSafe(`Can only validate strings as email addresses but got a: ${ast.kind}`);
-		return normalize$1(ast.value);
+		return normalizeEmailAddress(ast.value);
 	}
 });
 //#endregion
 //#region lib/scalars/personName.ts
 const MAX_LENGTH = 200;
 const NAME_REGEX = /^[\p{L}\p{M}]+(?:(?:[ '-]|\.\x20?)[\p{L}\p{M}]+)*\.?$/u;
+const APOSTROPHE_VARIANTS = /[\u2018\u2019\u02BC\u00B4\u0060]/gu;
+const HYPHEN_VARIANTS = /[\u2010-\u2015\u2212]/gu;
 /**
-* Normalizes and validates a person's name.
+* Normalizes and validates a person's name, exactly as the `PersonName` scalar does. Exported
+* for values that do not arrive as GraphQL input, such as OIDC claims.
+*
+* @throws RumbleErrorSafe if the value is not a valid name
 */
-const normalize = (value) => {
+const normalizePersonName = (value) => {
 	if (typeof value !== "string") throw new RumbleErrorSafe(`Name value is not a string: ${value}`);
-	const normalized = value.normalize("NFC").replace(/[\p{Cc}\p{Cf}]/gu, "").replace(/\p{Zs}+/gu, " ").trim().replace(/([-'])\1+/gu, "$1").replace(/^[-']+|[-']+$/gu, "").trim();
+	const normalized = value.normalize("NFC").replace(/[\p{Cc}\p{Cf}]/gu, "").replace(APOSTROPHE_VARIANTS, "'").replace(HYPHEN_VARIANTS, "-").replace(/\p{Zs}+/gu, " ").trim().replace(/ ?- ?/gu, "-").replace(/([-'])\1+/gu, "$1").replace(/^[-']+|[-']+$/gu, "").trim();
 	if (normalized.length === 0) throw new RumbleErrorSafe("Name must not be empty.");
 	if (normalized.length > MAX_LENGTH) throw new RumbleErrorSafe(`Name must not be longer than ${MAX_LENGTH} characters.`);
 	if (!NAME_REGEX.test(normalized)) throw new RumbleErrorSafe(`Invalid name: ${value}. Names may only contain letters and the separators space, apostrophe, hyphen and period, and may not start with or repeat a separator.`);
@@ -3152,12 +3161,12 @@ const normalize = (value) => {
 };
 const PersonNameResolver = new graphql.GraphQLScalarType({
 	name: "PersonName",
-	description: "A person's name. Unicode letters from any script are allowed, along with space, apostrophe, hyphen and period as separators between name parts. The value is Unicode NFC normalized, has invisible/control characters stripped, has its whitespace collapsed, and has unambiguous typos (a doubled or stray leading/trailing hyphen/apostrophe) silently corrected rather than rejected.",
-	serialize: normalize,
-	parseValue: normalize,
+	description: "A person's name. Unicode letters from any script are allowed, along with space, apostrophe, hyphen and period as separators between name parts. The value is Unicode NFC normalized, has invisible/control characters stripped, has its whitespace collapsed, and has unambiguous typos (typographic apostrophe or dash variants, spaces around a hyphen, a doubled or stray leading/trailing hyphen/apostrophe) silently corrected rather than rejected.",
+	serialize: normalizePersonName,
+	parseValue: normalizePersonName,
 	parseLiteral(ast) {
 		if (ast.kind !== graphql.Kind.STRING) throw new RumbleErrorSafe(`Can only validate strings as names but got a: ${ast.kind}`);
-		return normalize(ast.value);
+		return normalizePersonName(ast.value);
 	}
 });
 //#endregion
@@ -3165,9 +3174,12 @@ const PersonNameResolver = new graphql.GraphQLScalarType({
 /**
 * Parses and validates a phone number using libphonenumber-js (Google's phone number metadata),
 * which checks real per-country validity (length, area code plausibility, ...) rather than just
-* the E.164 shape.
+* the E.164 shape. This is what the `PhoneNumber` scalar does with its input; exported for values
+* that do not arrive as GraphQL input. `.number` of the result is the E.164 form.
+*
+* @throws RumbleErrorSafe if the value is not a valid phone number
 */
-const parse = (value) => {
+const parsePhoneNumber = (value) => {
 	if (typeof value !== "string") throw new RumbleErrorSafe(`Phone number value is not a string: ${value}`);
 	const phoneNumber = (0, libphonenumber_js.parsePhoneNumberFromString)(value);
 	if (!phoneNumber?.isValid()) throw new RumbleErrorSafe(`Invalid phone number: ${value}. Please provide a valid phone number including its country calling code, e.g. +4915123456789.`);
@@ -3183,16 +3195,16 @@ const serialize = (value) => {
 		if (!phoneNumber.isValid()) throw new RumbleErrorSafe(`Invalid phone number: ${phoneNumber.number}`);
 		return phoneNumber.number;
 	}
-	return parse(value).number;
+	return parsePhoneNumber(value).number;
 };
 const PhoneNumberResolver = new graphql.GraphQLScalarType({
 	name: "PhoneNumber",
 	description: "A phone number, validated using real per-country validity rules and represented as a parsed libphonenumber-js PhoneNumber. On the wire it is transported as the E.164 format (https://en.wikipedia.org/wiki/E.164), e.g. +4915123456789. The country calling code is required.",
 	serialize,
-	parseValue: parse,
+	parseValue: parsePhoneNumber,
 	parseLiteral(ast) {
 		if (ast.kind !== graphql.Kind.STRING) throw new RumbleErrorSafe(`Can only validate strings as phone numbers but got a: ${ast.kind}`);
-		return parse(ast.value);
+		return parsePhoneNumber(ast.value);
 	}
 });
 //#endregion
@@ -3614,6 +3626,9 @@ exports.RumbleErrorSafe = RumbleErrorSafe;
 exports.assertFindFirstExists = assertFindFirstExists;
 exports.assertFirstEntryExists = assertFirstEntryExists;
 exports.mapNullFieldsToUndefined = mapNullFieldsToUndefined;
+exports.normalizeEmailAddress = normalizeEmailAddress;
+exports.normalizePersonName = normalizePersonName;
+exports.parsePhoneNumber = parsePhoneNumber;
 exports.rumble = rumble;
 
 //# sourceMappingURL=index.cjs.map