@zwa73/utils 1.0.21 → 1.0.22

package/dist/UtilFunctions.d.ts

@@ -65,7 +65,7 @@ export declare function loadJSONFile(filePath: string): Promise<JObject>;
  * void (string,Object)
  * @async
  * @param {string} filePath - 文件路径
- * @param {JObject} obj 	    - 所要写入的JObject
+ * @param {JObject} obj 	- 所要写入的JObject
  * @returns {Promise<void>}
  */
 export declare function writeJSONFile(filePath: string, obj: JObject): Promise<void>;

package/dist/UtilFunctions.js

@@ -165,7 +165,7 @@ exports.loadJSONFile = loadJSONFile;
  * void (string,Object)
  * @async
  * @param {string} filePath - 文件路径
- * @param {JObject} obj 	    - 所要写入的JObject
+ * @param {JObject} obj 	- 所要写入的JObject
  * @returns {Promise<void>}
  */
 async function writeJSONFile(filePath, obj) {

package/dist/UtilInterfaces.d.ts

@@ -1,7 +1,7 @@
-/**可以序列化为JSON文件的Object*/
 export type JToken = JObject | JArray | JValue;
 export type JValue = number | string | boolean | null;
 export type JArray = Array<JToken>;
+/**可以序列化为JSON文件的Object*/
 export type JObject = {
     [key: string]: JToken;
 };
@@ -17,10 +17,21 @@ export type MessageEntity = {
     role: string;
     content: string;
 };
-export interface IJObjectData {
+/**可以保存为JObject的类
+ */
+export interface IJData {
+    /**保存为JObject
+     */
     saveToJObject(): JObject;
 }
-export type JObjectData = {
-    [key: string]: JToken | JObjectData | IJObjectData;
+export type JDToken = JToken | IJData | JDArray;
+export type JDArray = Array<JDToken>;
+/**可以转换为JObject的Object*/
+export type JDObject = {
+    [key: string]: JDToken;
 };
-export declare function parseJObjectData(): void;
+/**将JDToken转换为JToken
+ * @param {JDToken} token - 待转换的JDToken
+ * @returns {JToken} - 转换完成的JToken
+ */
+export declare function parseJOData(token: JDToken): JToken;

package/dist/UtilInterfaces.js

@@ -1,5 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseJObjectData = void 0;
-function parseJObjectData() { }
-exports.parseJObjectData = parseJObjectData;
+exports.parseJOData = void 0;
+/**将JDToken转换为JToken
+ * @param {JDToken} token - 待转换的JDToken
+ * @returns {JToken} - 转换完成的JToken
+ */
+function parseJOData(token) {
+    if (token && typeof token.saveToJObject === 'function')
+        return token.saveToJObject();
+    if (token && (typeof token === 'number' ||
+        typeof token === 'boolean' ||
+        typeof token === 'string' ||
+        token === null))
+        return token;
+    if (token && Array.isArray(token)) {
+        let outArr = [];
+        for (let item of token)
+            outArr.push(parseJOData(item));
+        return outArr;
+    }
+    let nobj = {};
+    for (let key in token) {
+        let value = token[key];
+        nobj[key] = parseJOData(value);
+    }
+    return nobj;
+}
+exports.parseJOData = parseJOData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "my utils",
   "main": "index.js",
   "scripts": {

package/src/UtilFunctions.ts

@@ -168,7 +168,7 @@ export async function loadJSONFile(filePath: string): Promise<JObject> {
  * void (string,Object)
  * @async
  * @param {string} filePath - 文件路径
- * @param {JObject} obj 	    - 所要写入的JObject
+ * @param {JObject} obj 	- 所要写入的JObject
  * @returns {Promise<void>}
  */
 export async function writeJSONFile(

package/src/UtilInterfaces.ts

@@ -1,10 +1,8 @@
-/**可以序列化为JSON文件的Object*/
-//export type JObject={
-//	[key: string]: JObject | string | number | boolean | null | Array<JObject| string | number | boolean | null>;
-//}
+
 export type JToken = JObject|JArray|JValue;
 export type JValue = number|string|boolean|null;
 export type JArray = Array<JToken>;
+/**可以序列化为JSON文件的Object*/
 export type JObject = {
     [key:string]:JToken;
 }
@@ -23,11 +21,44 @@ export type MessageEntity={
 	content:string;
 }
 
-export interface IJObjectData{
+/**可以保存为JObject的类
+ */
+export interface IJData{
+	/**保存为JObject
+	 */
 	saveToJObject():JObject;
 }
-export type JObjectData = {
-    [key:string]:JToken|JObjectData|IJObjectData;
+export type JDToken = JToken|IJData|JDArray;
+export type JDArray = Array<JDToken>;
+/**可以转换为JObject的Object*/
+export type JDObject = {
+    [key:string]:JDToken;
 }
+/**将JDToken转换为JToken
+ * @param {JDToken} token - 待转换的JDToken
+ * @returns {JToken} - 转换完成的JToken
+ */
+export function parseJOData(token:JDToken):JToken{
+	if(token && typeof (token as any as IJData).saveToJObject === 'function')
+		return (token as any as IJData).saveToJObject();
 
-export function parseJObjectData(){}
+	if(token && (typeof token === 'number' ||
+		typeof token === 'boolean' ||
+		typeof token === 'string' ||
+		token === null)
+	)return token;
+
+	if(token && Array.isArray(token)){
+		let outArr = [];
+		for(let item of token)
+			outArr.push(parseJOData(item));
+		return outArr;
+	}
+
+	let nobj = {} as JObject;
+	for(let key in (token as any as JDObject)){
+		let value = (token as any as JDObject)[key];
+		nobj[key] = parseJOData(value);
+	}
+	return nobj;
+}