jsrsasign-util update

kjur · Feb 15, 2021 · 8f20766 · 8f20766
1 parent 9e6973e
commit 8f20766
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,6 +1,12 @@
 
 ChangeLog for jsrsasign
 
+TBD
+* Changes from 10.1.10 to next release (2021-xx-xx)
+  - src/nodeutil.js
+    - add saveFileUTF8
+    - saveFileJSON API document fix
+
 extend support for distinguished name
 * Changes from 10.1.9 to 10.1.10 release (2021-02-14)
   - src/asn1x509.js

diff --git a/min/nodeutil-1.0.min.js b/min/nodeutil-1.0.min.js
diff --git a/npm_util/lib/jsrsasign-util.js b/npm_util/lib/jsrsasign-util.js
@@ -1,6 +1,6 @@
 /*! jsrsasign-util-1.0.1 (c) 2016-2020 Kenji Urushima | kjur.github.com/jsrsasign/license
  */
-var fs=require("fs");var JSONC=require("jsonc-parser");var rs=require("jsrsasign");function readFileUTF8(a){return require("fs").readFileSync(a,"utf8")}function readFileHexByBin(a){return rs.rstrtohex(fs.readFileSync(a,"binary"))}function readFile(a){return fs.readFileSync(a,"binary")}function saveFile(c,b){var a=require("fs");a.writeFileSync(c,b,"binary")}function saveFileBinByHex(c,a){var b=rs.hextorstr(a);fs.writeFileSync(c,b,"binary")}function readJSON(b){var a=fs.readFileSync(b,"utf8");var c=JSON.parse(a);return c}function readJSONC(b){var a=fs.readFileSync(b,"utf8");var c=JSONC.parse(a);return c}function saveFileJSON(a,b){var c=JSON.stringify(b,null,"  ");saveFile(a,c)}function printJSON(a,c){var b="";if(c!=undefined){b=c}console.log(b+JSON.stringify(a,null,"  "))};
+var fs=require("fs");var JSONC=require("jsonc-parser");var rs=require("jsrsasign");function readFileUTF8(a){return require("fs").readFileSync(a,"utf8")}function readFileHexByBin(a){return rs.rstrtohex(fs.readFileSync(a,"binary"))}function readFile(a){return fs.readFileSync(a,"binary")}function saveFile(c,b){var a=require("fs");a.writeFileSync(c,b,"binary")}function saveFileUTF8(c,b){var a=require("fs");a.writeFileSync(c,b,"utf8")}function saveFileBinByHex(c,a){var b=rs.hextorstr(a);fs.writeFileSync(c,b,"binary")}function readJSON(b){var a=fs.readFileSync(b,"utf8");var c=JSON.parse(a);return c}function readJSONC(b){var a=fs.readFileSync(b,"utf8");var c=JSONC.parse(a);return c}function saveFileJSON(a,b){var c=JSON.stringify(b,null,"  ");saveFileUTF8(a,c)}function printJSON(a,c){var b="";if(c!=undefined){b=c}console.log(b+JSON.stringify(a,null,"  "))};
 exports.readFileUTF8 = readFileUTF8;
 exports.readFileHexByBin = readFileHexByBin;
 exports.readFile = readFile;

diff --git a/npm_util/package.json b/npm_util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jsrsasign-util",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "utilities for jsrsasign (kjur.github.io/jsrsasign) such like file utilities",
     "main": "lib/jsrsasign-util.js",
     "scripts": {

diff --git a/src/nodeutil-1.0.js b/src/nodeutil-1.0.js
@@ -1,9 +1,9 @@
-/* nodeutil-1.0.1 (c) 2015-2020 Kenji Urushima | kjur.github.com/jsrsasign/license
+/* nodeutil-1.0.2 (c) 2015-2021 Kenji Urushima | kjur.github.com/jsrsasign/license
  */
 /*
  * nodeutil.js - Utilities for Node
  *
- * Copyright (c) 2015-2020 Kenji Urushima (kenji.urushima@gmail.com)
+ * Copyright (c) 2015-2021 Kenji Urushima (kenji.urushima@gmail.com)
  *
  * This software is licensed under the terms of the MIT License.
  * https://kjur.github.io/jsrsasign/license/
@@ -16,7 +16,7 @@
  * @fileOverview
  * @name nodeutil-1.0.js
  * @author Kenji Urushima kenji.urushima@gmail.com
- * @version jsrsasign-util 1.0.1 nodeutil 1.0.1 (2020-Oct-23)
+ * @version jsrsasign-util 1.0.3 nodeutil 1.0.2 (2021-Feb-15)
  * @since jsrsasign 5.0.2
  * @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
  */
@@ -69,6 +69,18 @@ function saveFile(binFile, rawString) {
     fs.writeFileSync(binFile, rawString, 'binary');
 }
 
+/**
+ * save UTF-8 string to file
+ * @param {String} binFile file name to save contents.
+ * @param {String} utf8String string contents to be saved.
+ * @description
+ * This function only works in Node.js.
+ */
+function saveFileUTF8(binFile, utf8String) {
+    var fs = require('fs');
+    fs.writeFileSync(binFile, utf8String, 'utf8');
+}
+
 /**
  * save data represented by hexadecimal string to file
  * @param {String} binFile file name to save contents.
@@ -132,11 +144,11 @@ function readJSONC(jsonFile) {
  * 
  * @example
  * var rsu = require("jsrsasign-util");
- * rsu.saveJSONC("aaa.jsonc", json);
+ * rsu.saveFileJSON("aaa.jsonc", json);
  */
 function saveFileJSON(jsonFile, json) {
     var s = JSON.stringify(json, null, "  ");
-    saveFile(jsonFile, s);
+    saveFileUTF8(jsonFile, s);
 }
 
 /**