export-table-pulgin-csharp 1.1.114 → 1.1.116

package/dist/ExportLiteDBUnityCSJsonPlugin.d.ts

@@ -1,11 +1,12 @@
 import { HandleSheetParams, PluginBase, HandleBatchParams } from "export-table-lib";
 export declare function exportUJson(paras: HandleSheetParams): string | null;
 export declare function exportUJsonLoader(paras: HandleSheetParams): string | null;
-export declare function ConvJson2LiteDB(litedbpath: string, savePaths: string[]): void;
+export declare function RemoveJsonFiles(savePaths2: string[]): Promise<void>;
+export declare function ConvJson2LiteDB(litedbpath: string, savePaths: string[]): Promise<void>;
 export declare class ExportLiteDBUJsonPlugin extends PluginBase {
     name: string;
     tags: string[];
     handleSheet(paras: HandleSheetParams): string | null;
-    handleBatch(paras: HandleBatchParams): void;
+    handleBatch(paras: HandleBatchParams): Promise<void>;
 }
 //# sourceMappingURL=ExportLiteDBUnityCSJsonPlugin.d.ts.map

package/dist/ExportLiteDBUnityCSJsonPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportLiteDBUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportLiteDBUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAUxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAuFnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAsDzE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QA6BtE;AAED,qBAAa,uBAAwB,SAAQ,UAAU;IACtD,IAAI,SAAgB;IACpB,IAAI,EAAE,MAAM,EAAE,CAAkB;IAEhC,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAoBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CA+C3C"}
+{"version":3,"file":"ExportLiteDBUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportLiteDBUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAUxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAuFnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAsDzE;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,iBAczD;AACD,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAmB5E;AAED,qBAAa,uBAAwB,SAAQ,UAAU;IACtD,IAAI,SAAgB;IACpB,IAAI,EAAE,MAAM,EAAE,CAAkB;IAEhC,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAoB9B,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAgD1C"}

package/dist/ExportLiteDBUnityCSJsonPlugin.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExportLiteDBUJsonPlugin = exports.ConvJson2LiteDB = exports.exportUJsonLoader = exports.exportUJson = void 0;
+exports.ExportLiteDBUJsonPlugin = exports.ConvJson2LiteDB = exports.RemoveJsonFiles = exports.exportUJsonLoader = exports.exportUJson = void 0;
 const export_table_lib_1 = require("export-table-lib");
 const fs = __importStar(require("fs-extra"));
 const CSParseTool_1 = require("./CSParseTool");
@@ -160,7 +160,23 @@ namespace ${exportNamespace}
     return temp;
 }
 exports.exportUJsonLoader = exportUJsonLoader;
-function ConvJson2LiteDB(litedbpath, savePaths) {
+async function RemoveJsonFiles(savePaths2) {
+    let deleteTasks = savePaths2.map(async (savePath2) => {
+        console.log(`delete file: ${savePath2}`);
+        try {
+            if (fs.existsSync(savePath2)) {
+                fs.removeSync(savePath2);
+            }
+        }
+        catch (ex) {
+            console.error(`error: cannot delete file ${savePath2}`);
+            console.error(ex);
+        }
+    });
+    await Promise.all(deleteTasks);
+}
+exports.RemoveJsonFiles = RemoveJsonFiles;
+async function ConvJson2LiteDB(litedbpath, savePaths) {
     if (litedbpath != null) {
         let modulePath = require.resolve(".");
         let binPath = path_1.default.resolve(modulePath, "../../bin/Json2LiteDB.exe");
@@ -174,18 +190,7 @@ function ConvJson2LiteDB(litedbpath, savePaths) {
         console.log("execute-cmdline: " + cmdline);
         var output = cp.spawnSync(binPath, cmdParas);
         console.log(output.output.toString());
-        for (let savePath2 of savePaths2) {
-            console.log(`delete file: ${savePath2}`);
-            try {
-                if (fs.existsSync(savePath2)) {
-                    fs.removeSync(savePath2);
-                }
-            }
-            catch (ex) {
-                console.error(`error: cannot delete file ${savePath2}`);
-                console.error(ex);
-            }
-        }
+        RemoveJsonFiles(savePaths2);
     }
     else {
         console.log(`no litedbpath given, skip conv database`);
@@ -213,7 +218,7 @@ class ExportLiteDBUJsonPlugin extends export_table_lib_1.PluginBase {
             return content2;
         }
     }
-    handleBatch(paras) {
+    async handleBatch(paras) {
         let { moreOptions, tables, exportNamespace, } = paras;
         let isSkipIndexLoader = !!moreOptions?.SkipIndexLoader ?? false;
         if (isSkipIndexLoader0) {
@@ -249,7 +254,7 @@ ${(0, export_table_lib_1.foreach)(tables.sort((ta, tb) => ta.name.localeCompare(
             let savePath = new export_table_lib_1.OutFilePath(paras.outPath, fullName, ".json").fullPath;
             return savePath;
         });
-        ConvJson2LiteDB(litedbpath, cmdParas);
+        await ConvJson2LiteDB(litedbpath, cmdParas);
     }
 }
 exports.ExportLiteDBUJsonPlugin = ExportLiteDBUJsonPlugin;

package/dist/ExportUnityCSJsonPlugin.js

@@ -121,7 +121,7 @@ function exportUJsonLoader(paras) {
 using UnityEngine.AddressableAssets;
 using System.Threading.Tasks;
 using UnityEngine;
-using ${jsonToolNamespace};
+// using ${jsonToolNamespace};
 
 namespace ${exportNamespace}
 {
@@ -149,7 +149,7 @@ namespace ${exportNamespace}
 				${RowClass}[] jsonObjs;
 				try
 				{
-					jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+					jsonObjs = JsonUtility.FromJson<${RowClass}[]>(configJson.text);
 				}
 				catch(System.Exception ex)
 				{
@@ -179,7 +179,7 @@ namespace ${exportNamespace}
 			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
 			if (configJson != null)
 			{
-				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+				var jsonObjs = JsonUtility.FromJson<${RowClass}[]>(configJson.text);
 				var configs = ${RowClass}.Configs;
 				configs.Clear();
 				configs.AddRange(jsonObjs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-table-pulgin-csharp",
-  "version": "1.1.114",
+  "version": "1.1.116",
   "description": "",
   "main": "./dist/index.js",
   "scripts": {},

package/src/ExportLiteDBUnityCSJsonPlugin.ts

@@ -154,7 +154,22 @@ namespace ${exportNamespace}
 
 }
 
-export function ConvJson2LiteDB(litedbpath: string, savePaths: string[]) {
+export async function RemoveJsonFiles(savePaths2: string[]) {
+	let deleteTasks = savePaths2.map(async (savePath2) => {
+		console.log(`delete file: ${savePath2}`)
+		try {
+			if (fs.existsSync(savePath2)) {
+				fs.removeSync(savePath2);
+			}
+		} catch (ex) {
+			console.error(`error: cannot delete file ${savePath2}`);
+			console.error(ex);
+		}
+	})
+
+	await Promise.all(deleteTasks)
+}
+export async function ConvJson2LiteDB(litedbpath: string, savePaths: string[]) {
 	if (litedbpath != null) {
 		let modulePath = require.resolve(".")
 		let binPath = path.resolve(modulePath, "../../bin/Json2LiteDB.exe")
@@ -169,17 +184,7 @@ export function ConvJson2LiteDB(litedbpath: string, savePaths: string[]) {
 		var output = cp.spawnSync(binPath, cmdParas)
 		console.log(output.output.toString())
 
-		for (let savePath2 of savePaths2) {
-			console.log(`delete file: ${savePath2}`)
-			try {
-				if (fs.existsSync(savePath2)) {
-					fs.removeSync(savePath2);
-				}
-			} catch (ex) {
-				console.error(`error: cannot delete file ${savePath2}`);
-				console.error(ex);
-			}
-		}
+		RemoveJsonFiles(savePaths2)
 	} else {
 		console.log(`no litedbpath given, skip conv database`)
 	}
@@ -209,7 +214,7 @@ export class ExportLiteDBUJsonPlugin extends PluginBase {
 		}
 	}
 
-	handleBatch(paras: HandleBatchParams): void {
+	async handleBatch(paras: HandleBatchParams) {
 
 		let {
 			moreOptions,
@@ -253,7 +258,8 @@ ${foreach(tables.sort((ta, tb) => ta.name.localeCompare(tb.name)), (table) => `
 			let savePath = new OutFilePath(paras.outPath, fullName, ".json").fullPath
 			return savePath
 		})
-		ConvJson2LiteDB(litedbpath, cmdParas);
+
+		await ConvJson2LiteDB(litedbpath, cmdParas);
 
 	}
 }

package/src/ExportUnityCSJsonPlugin.ts

@@ -117,7 +117,7 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
 using UnityEngine.AddressableAssets;
 using System.Threading.Tasks;
 using UnityEngine;
-using ${jsonToolNamespace};
+// using ${jsonToolNamespace};
 
 namespace ${exportNamespace}
 {
@@ -145,7 +145,7 @@ namespace ${exportNamespace}
 				${RowClass}[] jsonObjs;
 				try
 				{
-					jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+					jsonObjs = JsonUtility.FromJson<${RowClass}[]>(configJson.text);
 				}
 				catch(System.Exception ex)
 				{
@@ -175,7 +175,7 @@ namespace ${exportNamespace}
 			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
 			if (configJson != null)
 			{
-				var jsonObjs = JSON.parse<${RowClass}[]>(configJson.text);
+				var jsonObjs = JsonUtility.FromJson<${RowClass}[]>(configJson.text);
 				var configs = ${RowClass}.Configs;
 				configs.Clear();
 				configs.AddRange(jsonObjs);