export-table-pulgin-csharp 1.0.43 → 1.0.46

package/dist/ExportCSPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportCSPlugin.d.ts","sourceRoot":"","sources":["../src/ExportCSPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AAG1H,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqRpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}
+{"version":3,"file":"ExportCSPlugin.d.ts","sourceRoot":"","sources":["../src/ExportCSPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AAI1H,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAkTpE;AAED,qBAAa,YAAa,SAAQ,UAAU;IAC3C,IAAI,SAAW;IACf,IAAI,EAAE,MAAM,EAAE,CAAS;IAEvB,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAOpC"}

package/dist/ExportCSPlugin.js

@@ -58,6 +58,18 @@ function export_stuff(paras) {
         else if (t == "number[]") {
             return "double[]";
         }
+        else if (t == "int") {
+            return "int";
+        }
+        else if (t == "int[]") {
+            return "int[]";
+        }
+        else if (t == "long") {
+            return "long";
+        }
+        else if (t == "long[]") {
+            return "long[]";
+        }
         else if (t == "uid") {
             return "int";
         }
@@ -81,13 +93,13 @@ function export_stuff(paras) {
         }
         else if (t == "any") {
             console.log(f);
-            throw new Error(`invalid type ${f.name}:<any>`);
+            throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
         }
         else if (t == "key") {
             return "string";
         }
         else {
-            throw new Error(`invalid type ${f.name}:<unkown>`);
+            throw new Error(`invalid type ${f.name}:<${f.rawType} => unkown>`);
         }
         return t;
     };
@@ -117,13 +129,21 @@ function export_stuff(paras) {
                 return `new Dictionary<string,string>(){${convert}}`;
             })}}`;
         }
-        else if (t == "number") {
+        else if (t == "number" || t == "int" || t == "long") {
             return `${value}`;
         }
         else if (t == "number[]") {
             let values = value;
             return `new double[]{${values.join(", ")}}`;
         }
+        else if (t == "int[]") {
+            let values = value;
+            return `new int[]{${values.join(", ")}}`;
+        }
+        else if (t == "long[]") {
+            let values = value;
+            return `new long[]{${values.join(", ")}}`;
+        }
         else if (t == "uid") {
             return `${value}`;
         }
@@ -151,12 +171,12 @@ function export_stuff(paras) {
         }
         else if (t == "any") {
             console.log(f);
-            throw new Error(`invalid type ${f.name}:<any>`);
+            throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
         }
         else if (t == "key") {
             return `${value}`;
         }
-        throw new Error(`invalid type ${f.name}:<unkown>`);
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => unkown>`);
     };
     const getTitle = (v) => {
         return v.describe.split("\n")[0];
@@ -164,46 +184,46 @@ function export_stuff(paras) {
     const getDescripts = (v) => {
         return v.describe.split("\n");
     };
-    let temp = `
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MEEC.ExportedConfigs{
-public partial class ${RowClass} {
-
-	public static List<${RowClass}> Configs = new List<${RowClass}>()
-	{
-${(0, export_table_lib_1.foreach)(datas, data => `		new ${RowClass}(${(0, export_table_lib_1.st)(() => fields.map((f, index) => genValue(data[index], f)).join(", "))}),`)}
-	};
-
-	public ${RowClass}() { }
-	public ${RowClass}(${(0, export_table_lib_1.st)(() => fields.map(f => `${getFieldType(f)} ${convVarName(f.name)}`).join(", "))})
-	{
-${(0, export_table_lib_1.foreach)(fields, f => `		this.${convMemberName(f.name)} = ${convVarName(f.name)};`)}
-	}
-
-	public virtual ${RowClass} MergeFrom(${RowClass} source)
-	{
-${(0, export_table_lib_1.foreach)(fields, f => `		this.${convMemberName(f.name)} = source.${convMemberName(f.name)};`)}
-		return this;
-	}
-
-	public virtual ${RowClass} Clone()
-	{
-		var config = new ${RowClass}();
-		config.MergeFrom(this);
-		return config;
-	}
-
-	${(0, export_table_lib_1.cmm)( /**生成字段 */)}
-${(0, export_table_lib_1.foreach)(fields, f => `
-	/// <summary>
-${(0, export_table_lib_1.foreach)(getDescripts(f), line => `	/// ${line}`)}
-	/// </summary>
-	public ${getFieldType(f)} ${convMemberName(f.name)};`)}
-
-	${(0, export_table_lib_1.cmm)( /**生成get字段 */)}
-#region get字段
+    let temp = `
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MEEC.ExportedConfigs{
+public partial class ${RowClass} {
+
+	public static List<${RowClass}> Configs = new List<${RowClass}>()
+	{
+${(0, export_table_lib_1.foreach)(datas, data => `		new ${RowClass}(${(0, export_table_lib_1.st)(() => fields.map((f, index) => genValue(data[index], f)).join(", "))}),`)}
+	};
+
+	public ${RowClass}() { }
+	public ${RowClass}(${(0, export_table_lib_1.st)(() => fields.map(f => `${getFieldType(f)} ${convVarName(f.name)}`).join(", "))})
+	{
+${(0, export_table_lib_1.foreach)(fields, f => `		this.${convMemberName(f.name)} = ${convVarName(f.name)};`)}
+	}
+
+	public virtual ${RowClass} MergeFrom(${RowClass} source)
+	{
+${(0, export_table_lib_1.foreach)(fields, f => `		this.${convMemberName(f.name)} = source.${convMemberName(f.name)};`)}
+		return this;
+	}
+
+	public virtual ${RowClass} Clone()
+	{
+		var config = new ${RowClass}();
+		config.MergeFrom(this);
+		return config;
+	}
+
+	${(0, export_table_lib_1.cmm)( /**生成字段 */)}
+${(0, export_table_lib_1.foreach)(fields, f => `
+	/// <summary>
+${(0, export_table_lib_1.foreach)(getDescripts(f), line => `	/// ${line}`)}
+	/// </summary>
+	public ${getFieldType(f)} ${convMemberName(f.name)};`)}
+
+	${(0, export_table_lib_1.cmm)( /**生成get字段 */)}
+#region get字段
 ${(0, export_table_lib_1.foreach)(fields, f => {
         if (f.nameOrigin != f.name) {
             return `	public ${getFieldType(f)} ${getTitle(f).replace(" ", "_")} => ${convMemberName(f.name)};`;
@@ -211,110 +231,110 @@ ${(0, export_table_lib_1.foreach)(fields, f => {
         else {
             return "";
         }
-    })}
-#endregion
-
-#region uid map
+    })}
+#endregion
+
+#region uid map
 ${(0, export_table_lib_1.foreach)(fields, f => {
         if (f.isUnique) {
-            return `
-		protected static Dictionary<${getFieldType(f)}, ${RowClass}> _tempDictBy${convMemberName(f.name)};
-		public static ${RowClass} GetConfigBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
-		{
-			if (_tempDictBy${convMemberName(f.name)} == null)
-			{
-				_tempDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}>();
-				Configs.ForEach(c =>
-				{
-					_tempDictBy${convMemberName(f.name)}.Add(c.${convMemberName(f.name)}, c);
-				});
-			}
-			return _tempDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
-		}
+            return `
+		protected static Dictionary<${getFieldType(f)}, ${RowClass}> _tempDictBy${convMemberName(f.name)};
+		public static ${RowClass} GetConfigBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
+		{
+			if (_tempDictBy${convMemberName(f.name)} == null)
+			{
+				_tempDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}>();
+				Configs.ForEach(c =>
+				{
+					_tempDictBy${convMemberName(f.name)}.Add(c.${convMemberName(f.name)}, c);
+				});
+			}
+			return _tempDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
+		}
 `;
         }
-        else if (f.type == "number" || f.type == "string") {
-            return `
-		protected static Dictionary<${getFieldType(f)}, ${RowClass}[]> _tempRecordsDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}[]>();
-		public static ${RowClass}[] GetConfigsBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
-		{
-			if (_tempRecordsDictBy${convMemberName(f.name)}.ContainsKey(${convMemberName(f.name)}))
-			{
-				return _tempRecordsDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
-			}
-			else
-			{
-				var records = Configs.Where(c => c.${convMemberName(f.name)} == ${convMemberName(f.name)}).ToArray();
-				_tempRecordsDictBy${convMemberName(f.name)}.Add(${convMemberName(f.name)}, records);
-				return records;
-			}
-		}
+        else if (f.type == "number" || f.type == "int" || f.type == "long" || f.type == "string") {
+            return `
+		protected static Dictionary<${getFieldType(f)}, ${RowClass}[]> _tempRecordsDictBy${convMemberName(f.name)} = new Dictionary<${getFieldType(f)}, ${RowClass}[]>();
+		public static ${RowClass}[] GetConfigsBy${convMemberName(f.name)}(${getFieldType(f)} ${convMemberName(f.name)})
+		{
+			if (_tempRecordsDictBy${convMemberName(f.name)}.ContainsKey(${convMemberName(f.name)}))
+			{
+				return _tempRecordsDictBy${convMemberName(f.name)}.GetValueOrDefault(${convMemberName(f.name)});
+			}
+			else
+			{
+				var records = Configs.Where(c => c.${convMemberName(f.name)} == ${convMemberName(f.name)}).ToArray();
+				_tempRecordsDictBy${convMemberName(f.name)}.Add(${convMemberName(f.name)}, records);
+				return records;
+			}
+		}
 `;
         }
         else {
             return "";
         }
-    })}
-
-#endregion uid map
-
-#region 生成fk.get/set
-${(0, export_table_lib_1.foreach)(fields, f => `
-${(0, export_table_lib_1.iff)(f.type == "fk", () => `
-${(0, export_table_lib_1.iff)(getFkFieldType(f).toLowerCase() != "uid", () => `
-	protected ${convMemberName(f.fkTableName)}[] _fk${convMemberName(f.name)}=null;
-	/**
-	 * ${f.describe}
-	 **/
-	public virtual ${convMemberName(f.fkTableName)}[] ${convMemberName(f.name)}DataList{
-		get{
-			if(this._fk${convMemberName(f.name)}==null){
-				if(null==this.${convMemberName(f.name)}){
-					this._fk${convMemberName(f.name)} = new ${convMemberName(f.fkTableName)}[0];
-				}else{
-					this._fk${convMemberName(f.name)}=${convMemberName(f.fkTableName)}.FindAll(a=>a.${convMemberName(f.fkFieldName)}!=null && this.${convMemberName(f.name)}==a.${convMemberName(f.fkFieldName)}).ToArray();
-				}
-			}
-			return this._fk${convMemberName(f.name)};
-		}
-	}
-`).else(() => `
-	protected ${convMemberName(f.fkTableName)} _fk${convMemberName(f.name)}=null;
-	/**
-	 * ${f.describe}
-	 **/
-	public virtual ${convMemberName(f.fkTableName)} ${convMemberName(f.name)}Data{
-		get{
-			if(this._fk${convMemberName(f.name)}==null){
-				this._fk${convMemberName(f.name)}=${convMemberName(f.fkTableName)}.Find(a=>a.${convMemberName(f.fkFieldName)}==this.${convMemberName(f.name)});
-			}
-			return this._fk${convMemberName(f.name)};
-		}
-	}
-`)}
-`)}
-${(0, export_table_lib_1.iff)(f.type == "fk[]", () => `
-	protected ${convMemberName(f.fkTableName)}[] _fk${convMemberName(f.name)}=null;
-	/**
-	 * ${f.describe}
-	 **/
-	public virtual ${convMemberName(f.fkTableName)}[] ${convMemberName(f.name)}DataList{
-		get{
-			if(this._fk${convMemberName(f.name)}==null){
-				if(null==this.${convMemberName(f.name)}){
-					this._fk${convMemberName(f.name)} = new ${convMemberName(f.fkTableName)}[0];
-				}else{
-					this._fk${convMemberName(f.name)}=MEEC.ExportedConfigs.${convMemberName(f.fkTableName)}.Configs.FindAll(a=>a.${convMemberName(f.fkFieldName)}!=null && this.${convMemberName(f.name)}!.Contains(a.${convMemberName(f.fkFieldName)})).ToArray();
-				}
-			}
-			return this._fk${convMemberName(f.name)};
-		}
-	}
-`)}
-`)}
-#endregion 生成fk.get/set
-}
-}
+    })}
+
+#endregion uid map
+
+#region 生成fk.get/set
+${(0, export_table_lib_1.foreach)(fields, f => `
+${(0, export_table_lib_1.iff)(f.type == "fk", () => `
+${(0, export_table_lib_1.iff)(getFkFieldType(f).toLowerCase() != "uid", () => `
+	protected ${convMemberName(f.fkTableName)}[] _fk${convMemberName(f.name)}=null;
+	/**
+	 * ${f.describe}
+	 **/
+	public virtual ${convMemberName(f.fkTableName)}[] ${convMemberName(f.name)}DataList{
+		get{
+			if(this._fk${convMemberName(f.name)}==null){
+				if(null==this.${convMemberName(f.name)}){
+					this._fk${convMemberName(f.name)} = new ${convMemberName(f.fkTableName)}[0];
+				}else{
+					this._fk${convMemberName(f.name)}=${convMemberName(f.fkTableName)}.FindAll(a=>a.${convMemberName(f.fkFieldName)}!=null && this.${convMemberName(f.name)}==a.${convMemberName(f.fkFieldName)}).ToArray();
+				}
+			}
+			return this._fk${convMemberName(f.name)};
+		}
+	}
+`).else(() => `
+	protected ${convMemberName(f.fkTableName)} _fk${convMemberName(f.name)}=null;
+	/**
+	 * ${f.describe}
+	 **/
+	public virtual ${convMemberName(f.fkTableName)} ${convMemberName(f.name)}Data{
+		get{
+			if(this._fk${convMemberName(f.name)}==null){
+				this._fk${convMemberName(f.name)}=${convMemberName(f.fkTableName)}.Find(a=>a.${convMemberName(f.fkFieldName)}==this.${convMemberName(f.name)});
+			}
+			return this._fk${convMemberName(f.name)};
+		}
+	}
+`)}
+`)}
+${(0, export_table_lib_1.iff)(f.type == "fk[]", () => `
+	protected ${convMemberName(f.fkTableName)}[] _fk${convMemberName(f.name)}=null;
+	/**
+	 * ${f.describe}
+	 **/
+	public virtual ${convMemberName(f.fkTableName)}[] ${convMemberName(f.name)}DataList{
+		get{
+			if(this._fk${convMemberName(f.name)}==null){
+				if(null==this.${convMemberName(f.name)}){
+					this._fk${convMemberName(f.name)} = new ${convMemberName(f.fkTableName)}[0];
+				}else{
+					this._fk${convMemberName(f.name)}=MEEC.ExportedConfigs.${convMemberName(f.fkTableName)}.Configs.FindAll(a=>a.${convMemberName(f.fkFieldName)}!=null && this.${convMemberName(f.name)}!.Contains(a.${convMemberName(f.fkFieldName)})).ToArray();
+				}
+			}
+			return this._fk${convMemberName(f.name)};
+		}
+	}
+`)}
+`)}
+#endregion 生成fk.get/set
+}
+}
 `;
     return temp;
 }

package/dist/ExportUnityCSJsonPlugin.d.ts

@@ -1,9 +1,10 @@
-import { HandleSheetParams, PluginBase } from "export-table-lib";
+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 class ExportUJsonPlugin extends PluginBase {
     name: string;
     tags: string[];
     handleSheet(paras: HandleSheetParams): string | null;
+    handleBatch(paras: HandleBatchParams): void;
 }
 //# sourceMappingURL=ExportUnityCSJsonPlugin.d.ts.map

package/dist/ExportUnityCSJsonPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAkC,MAAM,kBAAkB,CAAA;AAGlI,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAgDnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAwCzE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAChD,IAAI,SAAU;IACd,IAAI,EAAE,MAAM,EAAE,CAAY;IAE1B,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAkBpC"}
+{"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAe,MAAM,kBAAkB,CAAA;AAGlI,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAgDnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAwCzE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAChD,IAAI,SAAU;IACd,IAAI,EAAE,MAAM,EAAE,CAAY;IAE1B,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAmBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CAiB3C"}

package/dist/ExportUnityCSJsonPlugin.js

@@ -78,10 +78,10 @@ namespace MEEC.ExportedConfigs
 {
     public partial class ${name}
     {
-        static ${name}()
+        public static async Task Load()
         {
 			var loadUrl="Assets/Bundles/GameConfigs/Auto/${fullName}.asset";
-            var configJson = Addressables.LoadAssetAsync<ExcelConfigJson>(loadUrl).WaitForCompletion();
+            var configJson = await Addressables.LoadAssetAsync<ExcelConfigJson>(loadUrl).Task;
 			if (configJson != null)
             {
 				var jsonObjs = JSON.parse<${name}[]>(configJson.JsonText);
@@ -124,5 +124,22 @@ class ExportUJsonPlugin extends export_table_lib_1.PluginBase {
             return content2;
         }
     }
+    handleBatch(paras) {
+        var tables = paras.tables;
+        var temp = `
+namespace MEEC.ExportedConfigs
+{
+	public static class DefaultConfigLoader{
+		public static IEnumerable<Func<Task>> Load(){
+${(0, export_table_lib_1.foreach)(tables, (table) => `
+			yield return ${table.name}.Load;
+`)}
+		}
+	}
+}
+`;
+        let savePath = paras.outPath + "/DefaultConfigLoader.cs";
+        fs.outputFileSync(savePath, temp, "utf-8");
+    }
 }
 exports.ExportUJsonPlugin = ExportUJsonPlugin;

package/package.json

@@ -1,25 +1,25 @@
-{
-  "name": "export-table-pulgin-csharp",
-  "version": "1.0.43",
-  "description": "",
-  "main": "./dist/index.js",
-  "scripts": {
-    "pub": "npm-publish --token=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"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/windyuuy/export-table-pulgin-csharp.git"
-  },
-  "author": "windyuuy",
-  "license": "ISC",
-  "dependencies": {
-    "@types/node": "^17.0.18",
-    "export-table-lib": "latest",
-    "fs": "^0.0.1-security",
-    "fs-extra": "^10.0.0",
-    "fse": "^4.0.1"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^9.0.13"
-  }
-}
+{
+  "name": "export-table-pulgin-csharp",
+  "version": "1.0.46",
+  "description": "",
+  "main": "./dist/index.js",
+  "scripts": {
+    "pub": "npm-publish --token=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"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/windyuuy/export-table-pulgin-csharp.git"
+  },
+  "author": "windyuuy",
+  "license": "ISC",
+  "dependencies": {
+    "@types/node": "^17.0.18",
+    "export-table-lib": "^1.0.48",
+    "fs": "^0.0.1-security",
+    "fs-extra": "^10.0.0",
+    "fse": "^4.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^9.0.13"
+  }
+}