@svta/cml-structured-field-values 1.1.5 → 1.1.7

package/dist/index.js

@@ -1,5 +1,4 @@
 import { decodeBase64, encodeBase64, roundToEven } from "@svta/cml-utils";
-
 //#region src/SfItem.ts
 /**
 * Structured Field Item
@@ -19,11 +18,9 @@ var SfItem = class SfItem {
 		this.params = params;
 	}
 };
-
 //#endregion
 //#region src/utils/DICT.ts
 const DICT = "Dict";
-
 //#endregion
 //#region src/parse/ParsedValue.ts
 /**
@@ -35,7 +32,6 @@ function parsedValue(value, src) {
 		src
 	};
 }
-
 //#endregion
 //#region src/utils/throwError.ts
 function format(value) {
@@ -48,7 +44,6 @@ function format(value) {
 function throwError(action, src, type, cause) {
 	return new Error(`failed to ${action} "${format(src)}" as ${type}`, { cause });
 }
-
 //#endregion
 //#region src/parse/parseError.ts
 /**
@@ -57,19 +52,15 @@ function throwError(action, src, type, cause) {
 function parseError(src, type, cause) {
 	return throwError("parse", src, type, cause);
 }
-
 //#endregion
 //#region src/utils/INNER.ts
 const INNER = "Inner List";
-
 //#endregion
 //#region src/utils/BARE_ITEM.ts
 const BARE_ITEM = "Bare Item";
-
 //#endregion
 //#region src/utils/BOOLEAN.ts
 const BOOLEAN = "Boolean";
-
 //#endregion
 //#region src/parse/parseBoolean.ts
 /**
@@ -83,11 +74,9 @@ function parseBoolean(src) {
 	if (src[i] === "0") return parsedValue(false, src.substring(++i));
 	throw parseError(src, BOOLEAN);
 }
-
 //#endregion
 //#region src/utils/BYTES.ts
 const BYTES = "Byte Sequence";
-
 //#endregion
 //#region src/parse/parseByteSequence.ts
 /**
@@ -102,31 +91,25 @@ function parseByteSequence(src) {
 	src = src.substring(re.lastIndex);
 	return parsedValue(decodeBase64(b64_content), src);
 }
-
 //#endregion
 //#region src/utils/DATE.ts
 const DATE = "Date";
-
 //#endregion
 //#region src/utils/DECIMAL.ts
 const DECIMAL = "Decimal";
-
 //#endregion
 //#region src/utils/INTEGER.ts
 const INTEGER = "Integer";
-
-//#endregion
-//#region src/utils/INTEGER_DECIMAL.ts
-const INTEGER_DECIMAL = `${INTEGER} or ${DECIMAL}`;
-
 //#endregion
 //#region src/utils/isInvalidInt.ts
 function isInvalidInt(value) {
 	return value < -999999999999999 || 999999999999999 < value;
 }
-
 //#endregion
 //#region src/parse/parseIntegerOrDecimal.ts
+function integerOrDecimalError(src) {
+	return parseError(src, `${INTEGER} or ${DECIMAL}`);
+}
 /**
 * @internal
 */
@@ -135,35 +118,32 @@ function parseIntegerOrDecimal(src) {
 	let sign = 1;
 	let num = "";
 	let value;
-	const i = 0;
-	const error = parseError(orig, INTEGER_DECIMAL);
-	if (src[i] === "-") {
+	if (src[0] === "-") {
 		sign = -1;
 		src = src.substring(1);
 	}
-	if (src.length <= 0) throw error;
+	if (src.length <= 0) throw integerOrDecimalError(orig);
 	const re_integer = /^(\d+)?/g;
 	const result_integer = re_integer.exec(src);
-	if (result_integer[0].length === 0) throw error;
+	if (result_integer[0].length === 0) throw integerOrDecimalError(orig);
 	num += result_integer[1];
 	src = src.substring(re_integer.lastIndex);
 	if (src[0] === ".") {
-		if (num.length > 12) throw error;
+		if (num.length > 12) throw integerOrDecimalError(orig);
 		const re_decimal = /^(\.\d+)?/g;
 		const result_decimal = re_decimal.exec(src);
 		src = src.substring(re_decimal.lastIndex);
-		if (result_decimal[0].length === 0 || result_decimal[1].length > 4) throw error;
+		if (result_decimal[0].length === 0 || result_decimal[1].length > 4) throw integerOrDecimalError(orig);
 		num += result_decimal[1];
-		if (num.length > 16) throw error;
+		if (num.length > 16) throw integerOrDecimalError(orig);
 		value = parseFloat(num) * sign;
 	} else {
-		if (num.length > 15) throw error;
+		if (num.length > 15) throw integerOrDecimalError(orig);
 		value = parseInt(num) * sign;
-		if (isInvalidInt(value)) throw parseError(num, INTEGER_DECIMAL);
+		if (isInvalidInt(value)) throw integerOrDecimalError(num);
 	}
 	return parsedValue(value, src);
 }
-
 //#endregion
 //#region src/parse/parseDate.ts
 /**
@@ -177,15 +157,12 @@ function parseDate(src) {
 	if (Number.isInteger(date.value) === false) throw parseError(src, DATE);
 	return parsedValue(/* @__PURE__ */ new Date(date.value * 1e3), date.src);
 }
-
 //#endregion
 //#region src/utils/STRING.ts
 const STRING = "String";
-
 //#endregion
 //#region src/utils/STRING_REGEX.ts
 const STRING_REGEX = /[\x00-\x1f\x7f]+/;
-
 //#endregion
 //#region src/parse/parseString.ts
 /**
@@ -209,7 +186,6 @@ function parseString(src) {
 	}
 	throw parseError(src, STRING);
 }
-
 //#endregion
 //#region src/SfToken.ts
 /**
@@ -222,11 +198,9 @@ var SfToken = class {
 		this.description = description;
 	}
 };
-
 //#endregion
 //#region src/utils/TOKEN.ts
 const TOKEN = "Token";
-
 //#endregion
 //#region src/parse/parseToken.ts
 /**
@@ -239,7 +213,6 @@ function parseToken(src, options) {
 	src = src.substring(re.lastIndex);
 	return parsedValue(options?.useSymbol === false ? new SfToken(value) : Symbol.for(value), src);
 }
-
 //#endregion
 //#region src/parse/parseBareItem.ts
 /**
@@ -255,11 +228,6 @@ function parseBareItem(src, options) {
 	if (first === `@`) return parseDate(src);
 	throw parseError(src, BARE_ITEM);
 }
-
-//#endregion
-//#region src/utils/KEY.ts
-const KEY = "Key";
-
 //#endregion
 //#region src/parse/parseKey.ts
 /**
@@ -267,7 +235,7 @@ const KEY = "Key";
 */
 function parseKey(src) {
 	let i = 0;
-	if (/^[a-z*]$/.test(src[i]) === false) throw parseError(src, KEY);
+	if (/^[a-z*]$/.test(src[i]) === false) throw parseError(src, "Key");
 	let value = "";
 	while (src.length > i) {
 		if (/^[a-z0-9_\-.*]$/.test(src[i]) === false) return parsedValue(value, src.substring(i));
@@ -276,7 +244,6 @@ function parseKey(src) {
 	}
 	return parsedValue(value, src.substring(i));
 }
-
 //#endregion
 //#region src/parse/parseParameters.ts
 /**
@@ -302,7 +269,6 @@ function parseParameters(src, options) {
 	}
 	return parsedValue(parameters, src);
 }
-
 //#endregion
 //#region src/parse/parseItem.ts
 /**
@@ -315,7 +281,6 @@ function parseItem(src, options) {
 	src = parsedParameters.src;
 	return parsedValue(new SfItem(parsedBareItem.value, parsedParameters.value), src);
 }
-
 //#endregion
 //#region src/parse/parseInnerList.ts
 /**
@@ -339,7 +304,6 @@ function parseInnerList(src, options) {
 	}
 	throw parseError(src, INNER);
 }
-
 //#endregion
 //#region src/parse/parseItemOrInnerList.ts
 /**
@@ -349,7 +313,6 @@ function parseItemOrInnerList(src, options) {
 	if (src[0] === "(") return parseInnerList(src, options);
 	return parseItem(src, options);
 }
-
 //#endregion
 //#region src/parse/parseDict.ts
 /**
@@ -380,7 +343,6 @@ function parseDict(src, options) {
 	}
 	return parsedValue(value, src);
 }
-
 //#endregion
 //#region src/decodeSfDict.ts
 /**
@@ -400,11 +362,9 @@ function decodeSfDict(input, options) {
 		throw parseError(input, DICT, cause);
 	}
 }
-
 //#endregion
 //#region src/utils/ITEM.ts
 const ITEM = "Item";
-
 //#endregion
 //#region src/decodeSfItem.ts
 /**
@@ -424,11 +384,9 @@ function decodeSfItem(input, options) {
 		throw parseError(input, ITEM, cause);
 	}
 }
-
 //#endregion
 //#region src/utils/LIST.ts
 const LIST = "List";
-
 //#endregion
 //#region src/parse/parseList.ts
 /**
@@ -447,7 +405,6 @@ function parseList(src, options) {
 	}
 	return parsedValue(value, src);
 }
-
 //#endregion
 //#region src/decodeSfList.ts
 /**
@@ -467,7 +424,6 @@ function decodeSfList(input, options) {
 		throw parseError(input, LIST, cause);
 	}
 }
-
 //#endregion
 //#region src/serialize/serializeError.ts
 /**
@@ -476,7 +432,6 @@ function decodeSfList(input, options) {
 function serializeError(src, type, cause) {
 	return throwError("serialize", src, type, cause);
 }
-
 //#endregion
 //#region src/serialize/serializeBoolean.ts
 /**
@@ -486,7 +441,6 @@ function serializeBoolean(value) {
 	if (typeof value !== "boolean") throw serializeError(value, BOOLEAN);
 	return value ? "?1" : "?0";
 }
-
 //#endregion
 //#region src/serialize/serializeByteSequence.ts
 /**
@@ -496,7 +450,6 @@ function serializeByteSequence(value) {
 	if (ArrayBuffer.isView(value) === false) throw serializeError(value, BYTES);
 	return `:${encodeBase64(value)}:`;
 }
-
 //#endregion
 //#region src/serialize/serializeInteger.ts
 /**
@@ -506,7 +459,6 @@ function serializeInteger(value) {
 	if (isInvalidInt(value)) throw serializeError(value, INTEGER);
 	return value.toString();
 }
-
 //#endregion
 //#region src/serialize/serializeDate.ts
 /**
@@ -515,7 +467,6 @@ function serializeInteger(value) {
 function serializeDate(value) {
 	return `@${serializeInteger(value.getTime() / 1e3)}`;
 }
-
 //#endregion
 //#region src/serialize/serializeDecimal.ts
 /**
@@ -523,21 +474,23 @@ function serializeDate(value) {
 */
 function serializeDecimal(value) {
 	const roundedValue = roundToEven(value, 3);
-	if (Math.floor(Math.abs(roundedValue)).toString().length > 12) throw serializeError(value, DECIMAL);
+	if (Math.abs(roundedValue) >= 0xe8d4a51000) throw serializeError(value, DECIMAL);
 	const stringValue = roundedValue.toString();
 	return stringValue.includes(".") ? stringValue : `${stringValue}.0`;
 }
-
 //#endregion
 //#region src/serialize/serializeString.ts
+const ESCAPE_OR_CONTROL_REGEX = /[\x00-\x1f\x7f"\\]/;
+const BACKSLASH_REGEX = /\\/g;
+const DQUOTE_REGEX = /"/g;
 /**
 * @internal
 */
 function serializeString(value) {
+	if (ESCAPE_OR_CONTROL_REGEX.test(value) === false) return `"${value}"`;
 	if (STRING_REGEX.test(value)) throw serializeError(value, STRING);
-	return `"${value.replace(/\\/g, `\\\\`).replace(/"/g, `\\"`)}"`;
+	return `"${value.replace(BACKSLASH_REGEX, "\\\\").replace(DQUOTE_REGEX, "\\\"")}"`;
 }
-
 //#endregion
 //#region src/utils/symbolToStr.ts
 /**
@@ -552,18 +505,17 @@ function serializeString(value) {
 function symbolToStr(symbol) {
 	return symbol.description || symbol.toString().slice(7, -1);
 }
-
 //#endregion
 //#region src/serialize/serializeToken.ts
+const TOKEN_REGEX = /^[a-zA-Z*][!#$%&'*+\-.^_`|~\w:/]*$/;
 /**
 * @internal
 */
 function serializeToken(token) {
 	const value = symbolToStr(token);
-	if (/^([a-zA-Z*])([!#$%&'*+\-.^_`|~\w:/]*)$/.test(value) === false) throw serializeError(value, TOKEN);
+	if (TOKEN_REGEX.test(value) === false) throw serializeError(value, TOKEN);
 	return value;
 }
-
 //#endregion
 //#region src/serialize/serializeBareItem.ts
 /**
@@ -585,17 +537,21 @@ function serializeBareItem(value) {
 		default: throw serializeError(value, BARE_ITEM);
 	}
 }
-
 //#endregion
 //#region src/serialize/serializeKey.ts
 /**
 * @internal
 */
 function serializeKey(value) {
-	if (/^[a-z*][a-z0-9\-_.*]*$/.test(value) === false) throw serializeError(value, KEY);
+	if (typeof value !== "string" || value.length === 0) throw serializeError(value, "Key");
+	let code = value.charCodeAt(0);
+	if ((code < 97 || code > 122) && code !== 42) throw serializeError(value, "Key");
+	for (let i = 1; i < value.length; i++) {
+		code = value.charCodeAt(i);
+		if ((code < 97 || code > 122) && (code < 48 || code > 57) && code !== 95 && code !== 45 && code !== 46 && code !== 42) throw serializeError(value, "Key");
+	}
 	return value;
 }
-
 //#endregion
 //#region src/serialize/serializeParams.ts
 /**
@@ -603,12 +559,14 @@ function serializeKey(value) {
 */
 function serializeParams(params) {
 	if (params == null) return "";
-	return Object.entries(params).map(([key, value]) => {
-		if (value === true) return `;${serializeKey(key)}`;
-		return `;${serializeKey(key)}=${serializeBareItem(value)}`;
-	}).join("");
+	let output = "";
+	for (const key of Object.keys(params)) {
+		const value = params[key];
+		output += `;${serializeKey(key)}`;
+		if (value !== true) output += `=${serializeBareItem(value)}`;
+	}
+	return output;
 }
-
 //#endregion
 //#region src/serialize/serializeItem.ts
 /**
@@ -618,16 +576,41 @@ function serializeItem(value) {
 	if (value instanceof SfItem) return `${serializeBareItem(value.value)}${serializeParams(value.params)}`;
 	else return serializeBareItem(value);
 }
-
 //#endregion
 //#region src/serialize/serializeInnerList.ts
+function serializeInnerList(value, params) {
+	let list;
+	if (Array.isArray(value)) list = value;
+	else {
+		list = value.value;
+		params = value.params;
+	}
+	let output = "(";
+	for (let i = 0; i < list.length; i++) {
+		if (i > 0) output += " ";
+		output += serializeItem(list[i]);
+	}
+	return `${output})${serializeParams(params)}`;
+}
+//#endregion
+//#region src/serialize/serializeDictMember.ts
 /**
+* Serialize one dictionary member: the key, then the parameters alone for a `true` value, otherwise `=` and the member.
+*
 * @internal
 */
-function serializeInnerList(value) {
-	return `(${value.value.map(serializeItem).join(" ")})${serializeParams(value.params)}`;
+function serializeDictMember(key, member) {
+	const output = serializeKey(key);
+	if (member instanceof SfItem) {
+		const { value, params } = member;
+		if (value === true) return `${output}${serializeParams(params)}`;
+		if (Array.isArray(value)) return `${output}=${serializeInnerList(value, params)}`;
+		return `${output}=${serializeBareItem(value)}${serializeParams(params)}`;
+	}
+	if (member === true) return output;
+	if (Array.isArray(member)) return `${output}=${serializeInnerList(member)}`;
+	return `${output}=${serializeBareItem(member)}`;
 }
-
 //#endregion
 //#region src/serialize/serializeDict.ts
 /**
@@ -635,25 +618,15 @@ function serializeInnerList(value) {
 */
 function serializeDict(dict, options) {
 	if (typeof dict !== "object" || dict == null) throw serializeError(dict, DICT);
-	const entries = dict instanceof Map ? dict.entries() : Object.entries(dict);
-	const optionalWhiteSpace = options?.whitespace === false ? "" : " ";
-	return Array.from(entries).map(([key, item]) => {
-		if (item instanceof SfItem === false) item = new SfItem(item);
-		let output = serializeKey(key);
-		if (item.value === true) output += serializeParams(item.params);
-		else {
-			output += "=";
-			if (Array.isArray(item.value)) output += serializeInnerList(item);
-			else output += serializeItem(item);
-		}
-		return output;
-	}).join(`,${optionalWhiteSpace}`);
+	const parts = [];
+	if (dict instanceof Map) dict.forEach((member, key) => parts.push(serializeDictMember(key, member)));
+	else for (const key of Object.keys(dict)) parts.push(serializeDictMember(key, dict[key]));
+	return parts.join(options?.whitespace === false ? "," : ", ");
 }
-
 //#endregion
 //#region src/encodeSfDict.ts
 /**
-* Encode an object into a structured field dictionary
+* Encode a structured field dictionary to a string
 *
 * @param value - The structured field dictionary to encode
 * @param options - Encoding options
@@ -665,14 +638,28 @@ function serializeDict(dict, options) {
 function encodeSfDict(value, options) {
 	return serializeDict(value, options);
 }
-
 //#endregion
 //#region src/encodeSfItem.ts
 function encodeSfItem(value, params) {
-	if (!(value instanceof SfItem)) value = new SfItem(value, params);
-	return serializeItem(value);
+	if (value instanceof SfItem) return serializeItem(value);
+	return `${serializeBareItem(value)}${serializeParams(params)}`;
+}
+//#endregion
+//#region src/serialize/serializeMember.ts
+/**
+* Serialize a list member: an inner list when the value is an array, an item otherwise.
+*
+* @internal
+*/
+function serializeMember(member) {
+	if (member instanceof SfItem) {
+		const { value, params } = member;
+		if (Array.isArray(value)) return serializeInnerList(value, params);
+		return `${serializeBareItem(value)}${serializeParams(params)}`;
+	}
+	if (Array.isArray(member)) return serializeInnerList(member);
+	return serializeBareItem(member);
 }
-
 //#endregion
 //#region src/serialize/serializeList.ts
 /**
@@ -680,19 +667,18 @@ function encodeSfItem(value, params) {
 */
 function serializeList(list, options) {
 	if (Array.isArray(list) === false) throw serializeError(list, LIST);
-	const optionalWhiteSpace = options?.whitespace === false ? "" : " ";
-	return list.map((item) => {
-		if (item instanceof SfItem === false) item = new SfItem(item);
-		const i = item;
-		if (Array.isArray(i.value)) return serializeInnerList(i);
-		return serializeItem(i);
-	}).join(`,${optionalWhiteSpace}`);
+	const separator = options?.whitespace === false ? "," : ", ";
+	let output = "";
+	for (let i = 0; i < list.length; i++) {
+		if (i > 0) output += separator;
+		output += serializeMember(list[i]);
+	}
+	return output;
 }
-
 //#endregion
 //#region src/encodeSfList.ts
 /**
-* Encode a list into a structured field dictionary
+* Encode a structured field list to a string
 *
 * @param value - The structured field list to encode
 * @param options - Encoding options
@@ -704,7 +690,7 @@ function serializeList(list, options) {
 function encodeSfList(value, options) {
 	return serializeList(value, options);
 }
-
 //#endregion
 export { SfItem, SfToken, decodeSfDict, decodeSfItem, decodeSfList, encodeSfDict, encodeSfItem, encodeSfList, parseBareItem, parseBoolean, parseByteSequence, parseDate, parseDict, parseError, parseInnerList, parseIntegerOrDecimal, parseItem, parseItemOrInnerList, parseKey, parseList, parseParameters, parseString, parseToken, serializeBareItem, serializeBoolean, serializeByteSequence, serializeDate, serializeDecimal, serializeDict, serializeError, serializeInnerList, serializeInteger, serializeItem, serializeKey, serializeList, serializeParams, serializeString, serializeToken, symbolToStr };
+
 //# sourceMappingURL=index.js.map