typepki-strconv 0.7.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typepki-strconv",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "author": "Kenji Urushima <kenji.urushima@gmail.com>",
   "description": "TypeScript string converters and utilities sub module for TypePKI library (alpha version)",
   "homepage": "https://kjur.github.io/typepki-strconv",
@@ -67,7 +67,7 @@
     "jest": "^29.7.0",
     "run-z": "^2.0.0",
     "typedoc": "^0.25.13",
-    "typepki-strconv": "^0.2.0",
+    "typepki-strconv": "^0.8.0",
     "typescript": "^5.4.5"
   }
 }

package/src/conv.mts

@@ -360,7 +360,7 @@ export function namearraytobinstr(
  */
 export function binstrtonamearray(
   binstr: string,
-  namedb: Record<string, number>
+  namedb: Record<string, number>,
 ): string[] {
   const aKey: string[] = Object.keys(namedb);
   //console.log("aKey=", aKey);
@@ -368,12 +368,14 @@ export function binstrtonamearray(
   //console.log("aVal=", aVal);
 
   const namedbrev: Record<string, string> = {};
-  Object.keys(namedb).map((k) => { namedbrev[namedb[k]] = k; });
+  Object.keys(namedb).map((k) => {
+    namedbrev[namedb[k]] = k;
+  });
   //console.log("namedbrev=", JSON.stringify(namedbrev, null, 2));
 
-  let aResult: string[] = [];  
-  binstr.split('').map((k, idx) => {
-    if (k == '1') aResult.push(namedbrev[idx.toString()]);
+  const aResult: string[] = [];
+  binstr.split("").map((k, idx) => {
+    if (k === "1") aResult.push(namedbrev[idx.toString()]);
   });
 
   return aResult;

package/src/conv_uricmp.test.mts

@@ -1,6 +1,11 @@
 import { describe, expect, test } from "bun:test";
 
-import { encodeURIComponentAll, hextouricmp, uricmptohex, hextoutf8 } from "./index.mts";
+import {
+  encodeURIComponentAll,
+  hextouricmp,
+  hextoutf8,
+  uricmptohex,
+} from "./index.mts";
 
 test("uricmptohex", () => {
   expect(uricmptohex("%67%68")).toBe("6768");

package/src/conv_zulu.mts

@@ -206,3 +206,37 @@ export function timetogen(s: string): string {
   }
   return s;
 }
+
+/**
+ * convert GeneralizedTime or UTCTime string to ISO8601 time string
+ * @param s - GeneralizedTime or UTCTime string (ex. 20170412235959Z)
+ * @return ISO8601 time string (ex. 2020-07-14T13:03:42Z)
+ * @since 0.8.0
+ *
+ * @example
+ * zulutoiso8601(  "071231235959Z") -> "2007-12-31T23:59:59Z"
+ * zulutoiso8601(  "971231235959Z") -> "1997-12-31T23:59:59Z"
+ * zulutoiso8601("20071231235959Z") -> "2007-12-31T23:59:59Z"
+ * zulutoiso8601( "0071231235959Z") -> raise error
+ * zulutoiso8601(     "aaaaaaaaaa") -> raise error
+ */
+export function zulutoiso8601(s: string): string {
+  const m = s.match(/^(\d{2,4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})Z$/);
+  if (!m) {
+    throw new Error(
+      "Invalid format: expected YYYYMMDDHHmmssZ or YYYYMMDDHHmmssZ",
+    );
+  }
+
+  const [, y, mm, dd, hh, min, ss] = m;
+  let y2: string = y;
+  if (y2.length === 2) {
+    if (parseInt(y2.slice(0, 1)) < 5) {
+      y2 = `20${y2}`;
+    } else {
+      y2 = `19${y2}`;
+    }
+  }
+
+  return `${y2}-${mm}-${dd}T${hh}:${min}:${ss}Z`;
+}

package/src/conv_zulu.test.mts

@@ -4,6 +4,7 @@ import {
   datetozulu,
   msectozulu,
   zulutodate,
+  zulutoiso8601,
   zulutomsec,
   zulutosec,
 } from "./index.mts";
@@ -47,3 +48,17 @@ test("datetozulu", () => {
   expect(datetozulu(d, true)).toBe("170520235959Z");
   expect(datetozulu(d, false, true)).toBe("20170520235959.67Z");
 });
+
+test("zulutoiso8601", () => {
+  expect(zulutoiso8601("071231235959Z")).toBe("2007-12-31T23:59:59Z");
+  expect(zulutoiso8601("471231235959Z")).toBe("2047-12-31T23:59:59Z");
+  expect(zulutoiso8601("501231235959Z")).toBe("1950-12-31T23:59:59Z");
+  expect(zulutoiso8601("971231235959Z")).toBe("1997-12-31T23:59:59Z");
+  expect(zulutoiso8601("20071231235959Z")).toBe("2007-12-31T23:59:59Z");
+  expect(() => {
+    zulutoiso8601(" 0071231235959Z");
+  }).toThrow(/Invalid format/);
+  expect(() => {
+    zulutoiso8601("aaaaaaa");
+  }).toThrow(/Invalid format/);
+});

package/src/hexutil.mts

@@ -7,5 +7,5 @@
  * hexpad("ab3c") -> "ab3c"
  */
 export function hexpad(s: string): string {
-  return (s.length % 2 === 1) ? `0${s}` : s;
+  return s.length % 2 === 1 ? `0${s}` : s;
 }

package/src/index.mts

@@ -1,4 +1,4 @@
-const VERSION: string = "typepki-strconv 0.7.0 kjur.github.io/typepki-strconv";
+const VERSION: string = "typepki-strconv 0.8.0 kjur.github.io/typepki-strconv";
 export { VERSION };
 
 import { isBase64, isBase64URL, ishex } from "./checker.mts";
@@ -79,10 +79,19 @@ import {
   msectozulu,
   timetogen,
   zulutodate,
+  zulutoiso8601,
   zulutomsec,
   zulutosec,
 } from "./conv_zulu.mts";
-export { zulutomsec, msectozulu, zulutosec, zulutodate, datetozulu, timetogen };
+export {
+  zulutomsec,
+  msectozulu,
+  zulutosec,
+  zulutodate,
+  datetozulu,
+  timetogen,
+  zulutoiso8601,
+};
 
 import {
   encodeURIComponentAll,