@sswroom/sswr 1.6.0 → 1.6.1

package/Changelog

@@ -1,3 +1,13 @@
+1.6.1
+-Fixed parser: parseJpg and parseWebp problem
+-Modified data.Timestamp.fromStr to return null if error
+-Added data.LocalDate.fromStr
+-Added data.LocalDate.today
+-Added text.toUTF32Length
+-Added text.isUInteger
+-Added text.isEmailAddress, isHKID
+-Added text.charIsAlphaNumeric, text.charIsDigit, text.charIsUpperCase, text.charIsLowerCase
+
 1.6.0
 -Added data.ByteReader.readInt24/readUInt24
 -Added data.ByteReader.readUTF16

package/data.d.ts

@@ -97,6 +97,8 @@ export class LocalDate
 	toString(pattern: string | null): string;
 	compareTo(obj: Date): number;
 	isNull(): boolean;
+	static today(): LocalDate;
+	static fromStr(s: string): LocalDate | null;
 }
 
 export class TimeInstant
@@ -133,7 +135,7 @@ export class TimeInstant
 export class Timestamp {
 	constructor(inst: TimeInstant, tzQhr?: number);
 	static fromTicks(ticks: number | number, tzQhr?: number): Timestamp;
-	static fromStr(str: string, defTzQhr?: number): Timestamp;
+	static fromStr(str: string, defTzQhr?: number): Timestamp | null;
 	static now(): Timestamp;
 	static utcNow(): Timestamp;
 	static fromVariTime(variTime: any): Timestamp;

package/data.js

@@ -1784,6 +1784,22 @@ export class LocalDate
 	{
 		return this.dateVal == LocalDate.DATE_NULL;
 	}
+
+	static today()
+	{
+		let d = new Date();
+		return new LocalDate(d.getFullYear(), d.getMonth() + 1, d.getDate());
+	}
+
+	static fromStr(s)
+	{
+		let timeVal = DateTimeUtil.string2TimeValue(s, 0);
+		if (timeVal)
+		{
+			return new LocalDate(timeVal.year, timeVal.month, timeVal.day);
+		}
+		return null;
+	}
 }
 
 export class TimeInstant
@@ -1979,9 +1995,9 @@ export class Timestamp
 	static fromStr(str, defTzQhr)
 	{
 		let tval = DateTimeUtil.string2TimeValue(str, defTzQhr);
-		if (tval == 0)
+		if (tval == null)
 		{
-			return new Timestamp(new TimeInstant(0, 0), defTzQhr);
+			return null;
 		}
 		else
 		{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sswroom/sswr",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Libraries made by sswroom",
   "main": "sswr.js",
   "scripts": {

package/parser.js

@@ -795,7 +795,7 @@ function parseKMLNode(kmlNode, doc)
 	}
 }
 
-async function parseJpg(reader)
+async function parseJpg(reader, sourceName)
 {
 	if (!(reader instanceof data.ByteReader))
 		return null;
@@ -933,7 +933,7 @@ async function parseJpg(reader)
 	return null;
 }
 
-async function parseWebp(reader)
+async function parseWebp(reader, sourceName)
 {
 	if (!(reader instanceof data.ByteReader))
 		return null;

package/text.d.ts

@@ -14,6 +14,7 @@ export enum LineBreakType
 
 export function zeroPad(val: string | number, ndigits: number): string;
 export function isInteger(s: string): boolean;
+export function isUInteger(s: string): boolean;
 export function toJSText(s: string): string;
 export function toXMLText(s: string): string;
 export function toAttrText(s: string): string;
@@ -25,6 +26,13 @@ export function toHex16(v: number): string;
 export function toHex32(v: number): string;
 export function u8Arr2Hex(buff: Uint8Array, byteSep: string, rowSep: string): string;
 export function splitLines(txt: string): string[];
+export function isEmailAddress(s: string): boolean;
+export function toUTF32Length(s: string): number;
+export function isHKID(s: string): boolean;
+export function charIsAlphaNumeric(s: string, index: number): boolean;
+export function charIsDigit(s: string, index: number): boolean;
+export function charIsUpperCase(s: string, index: number): boolean;
+export function charIsLowerCase(s: string, index: number): boolean;
 export function getEncList(): TextBinEnc[];
 
 export class TextBinEnc

package/text.js

@@ -42,6 +42,25 @@ export function isInteger(s)
 	return true;
 }
 
+export function isUInteger(s)
+{
+	if (s === null)
+		return false;
+	let j = s.length;
+	if (j == 0)
+		return false;
+	let i = 0;
+	let c;
+	while (i < j)
+	{
+		c = s.charCodeAt(i);
+		if (c < 0x30 || c > 0x39)
+			return false;
+		i++;
+	}
+	return true;
+}
+
 export function toJSText(s)
 {
 	let out = "\"";
@@ -288,6 +307,228 @@ export function splitLines(txt)
 	return lines;
 }
 
+export function isEmailAddress(s)
+{
+	let atPos = -1;
+	let dotIndex = -1;
+	let c;
+	let i = 0;
+	let j = s.length;
+	while (i < j)
+	{
+		c = s.charAt(i);
+		if (charIsAlphaNumeric(s, i) || c == '-')
+		{
+
+		}
+		else if (c == '.')
+		{
+			if (atPos != -1)
+			{
+				dotIndex = i;
+			}
+		}
+		else if (c == '@')
+		{
+			if (atPos != -1)
+			{
+				return false;
+			}
+			atPos = i;
+			dotIndex = -1;
+		}
+		else
+		{
+			return false;
+		}
+		i++;
+	}
+	if (atPos == -1 || atPos == 0 || dotIndex == -1 || (j - dotIndex) < 2)
+	{
+		return false;
+	}
+	return true;
+}
+
+export function toUTF32Length(s)
+{
+	let i = 0;
+	let j = s.length;
+	let ret = 0;
+	while (i < j)
+	{
+		if (i + 1 < j)
+		{
+			let c1 = s.charCodeAt(i);
+			let c2 = s.charCodeAt(i + 1);
+			if (c1 >= 0xd800 && c1 < 0xdc00 && c2 >= 0xdc00 && c2 < 0xe000)
+			{
+				i += 2;
+			}
+			else
+			{
+				i++;
+			}
+		}
+		else
+		{
+			i++;
+		}
+		ret++;
+	}
+	return ret;
+}
+
+export function isHKID(s)
+{
+	let hkid;
+	let chk;
+	let ichk;
+	if (s.endsWith(')'))
+	{
+		if (s.length == 10)
+		{
+			if (s.charAt(7) == '(')
+			{
+				hkid = s.substring(0, 7);
+				chk = s.charAt(8);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else if (s.length == 11)
+		{
+			if (s.charAt(8) == '(')
+			{
+				hkid = s.substring(0, 8);
+				chk = s.charAt(9);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		if (s.length == 8)
+		{
+			hkid = s.substring(0, 7);
+			chk = s.charAt(7);
+		}
+		else if (s.length == 9)
+		{
+			hkid = s.substring(0, 8);
+			chk = s.charAt(8);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	if (charIsDigit(chk, 0))
+		ichk = Number.parseInt(chk);
+	else if (chk == 'A')
+		ichk = 10;
+	else
+	{
+		return false;
+	}
+
+	let thisChk;
+	if (hkid.length == 8)
+	{
+		if (!charIsUpperCase(hkid, 0) ||
+			!charIsUpperCase(hkid, 1) ||
+			!charIsDigit(hkid, 2) ||
+			!charIsDigit(hkid, 3) ||
+			!charIsDigit(hkid, 4) ||
+			!charIsDigit(hkid, 5) ||
+			!charIsDigit(hkid, 6) ||
+			!charIsDigit(hkid, 7))
+				return false;
+		
+		thisChk = 0;
+		thisChk += (hkid.charCodeAt(0) - 0x41 + 10) * 9;
+		thisChk += (hkid.charCodeAt(1) - 0x41 + 10) * 8;
+		thisChk += (hkid.charCodeAt(2) - 0x30) * 7;
+		thisChk += (hkid.charCodeAt(3) - 0x30) * 6;
+		thisChk += (hkid.charCodeAt(4) - 0x30) * 5;
+		thisChk += (hkid.charCodeAt(5) - 0x30) * 4;
+		thisChk += (hkid.charCodeAt(6) - 0x30) * 3;
+		thisChk += (hkid.charCodeAt(7) - 0x30) * 2;
+		if (ichk != (thisChk % 11))
+			return false;
+		return true;
+	}
+	else
+	{
+		if (!charIsUpperCase(hkid, 0) ||
+			!charIsDigit(hkid, 1) ||
+			!charIsDigit(hkid, 2) ||
+			!charIsDigit(hkid, 3) ||
+			!charIsDigit(hkid, 4) ||
+			!charIsDigit(hkid, 5) ||
+			!charIsDigit(hkid, 6))
+				return false;
+
+		thisChk = 36 * 9;
+		thisChk += (hkid.charCodeAt(0) - 0x41 + 10) * 8;
+		thisChk += (hkid.charCodeAt(1) - 0x30) * 7;
+		thisChk += (hkid.charCodeAt(2) - 0x30) * 6;
+		thisChk += (hkid.charCodeAt(3) - 0x30) * 5;
+		thisChk += (hkid.charCodeAt(4) - 0x30) * 4;
+		thisChk += (hkid.charCodeAt(5) - 0x30) * 3;
+		thisChk += (hkid.charCodeAt(6) - 0x30) * 2;
+		if (ichk != (thisChk % 11))
+			return false;
+		return true;
+	}
+}
+
+export function charIsAlphaNumeric(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x30 && c <= 0x39)
+		return true;
+	if (c >= 0x41 && c <= 0x5A)
+		return true;
+	if (c >= 0x61 && c <= 0x7A)
+		return true;
+	return false;
+}
+
+export function charIsDigit(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x30 && c <= 0x39)
+		return true;
+	return false;
+}
+
+export function charIsUpperCase(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x41 && c <= 0x5A)
+		return true;
+	return false;
+}
+
+export function charIsLowerCase(s, index)
+{
+	let c = s.charCodeAt(index);
+	if (c >= 0x61 && c <= 0x7A)
+		return true;
+	return false;
+}
+
 export function getEncList()
 {
 	let ret = [];