export-table-pulgin-csharp 1.1.83 → 1.1.85

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;AAK1H,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA6UpE;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;AAK1H,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqVpE;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

@@ -28,9 +28,8 @@ const export_table_lib_1 = require("export-table-lib");
 const fs = __importStar(require("fs-extra"));
 var isSkipExportDefaults0 = process.argv.findIndex(v => v == "--SkipDefaults") >= 0;
 function export_stuff(paras) {
-    var _a;
     let { datas, fields, inject, name, objects, packagename, tables, xxtea, exportNamespace, moreOptions, } = paras;
-    let isSkipExportDefaults = (_a = !!moreOptions.SkipDefaults) !== null && _a !== void 0 ? _a : false;
+    let isSkipExportDefaults = !!moreOptions?.SkipDefaults ?? false;
     if (isSkipExportDefaults0) {
         isSkipExportDefaults = true;
     }
@@ -229,7 +228,13 @@ ${(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)};`)}
+	public ${getFieldType(f)} ${convMemberName(f.name)};
+
+${(0, export_table_lib_1.iff)(f.rawType == "@(int,string)[]", () => `
+	/// <summary>
+${(0, export_table_lib_1.foreach)(getDescripts(f), line => `	/// ${line}`)}
+	/// </summary>
+	public (int,string)[] ${convMemberName(f.name)}Obj;`)}`)}
 
 	${(0, export_table_lib_1.cmm)( /**生成get字段 */)}
 #region get字段
@@ -366,11 +371,8 @@ ${(0, export_table_lib_1.iff)(f.type == "fk[]", () => `
 }
 exports.export_stuff = export_stuff;
 class ExportPlugin extends export_table_lib_1.PluginBase {
-    constructor() {
-        super(...arguments);
-        this.name = "csharp";
-        this.tags = ["cs"];
-    }
+    name = "csharp";
+    tags = ["cs"];
     handleSheet(paras) {
         let content = export_stuff(paras);
         if (content != null) {

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,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAMxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+CnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAiFzE;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;CAmC3C"}
+{"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAMxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8EnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAuFzE;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;CAmC3C"}

package/dist/ExportUnityCSJsonPlugin.js

@@ -39,10 +39,41 @@ function exportUJson(paras) {
     var fullName = `${table.workbookName}-${name}`;
     let jsonString = JSON.stringify(objects.map(obj => {
         var newObj = Object.create(null);
-        Object.keys(obj).forEach(key => {
+        for (let f of fields) {
+            let key = f.name;
             var newKey = convMemberName(key);
             newObj[newKey] = obj[key];
-        });
+            if (f.rawType == "@(int,string)[]") {
+                // [{"Item1":99,"Item2":"klwjefl"}]
+                let content = obj[key];
+                let index = 0;
+                let index2 = -1;
+                let objs = [];
+                while (0 <= index && index < content.length) {
+                    index2 = content.indexOf("|", index);
+                    let numStr = content.substring(index, index2);
+                    index = content.indexOf(";;", index2);
+                    let posEnd = index;
+                    if (index == -1) {
+                        posEnd = content.length;
+                    }
+                    else {
+                        index += 2;
+                    }
+                    let ssStr = content.substring(index2 + 1, posEnd);
+                    // console.log(`parseinfo: ${index2}, ${index}, ${numStr}, ${ssStr}`)
+                    objs.push({
+                        Item1: parseFloat(numStr),
+                        Item2: ssStr,
+                    });
+                }
+                newObj[newKey + "Obj"] = objs;
+            }
+        }
+        // Object.keys(obj).forEach(key => {
+        // 	var newKey = convMemberName(key);
+        // 	newObj[newKey] = obj[key];
+        // })
         return newObj;
     }));
     return jsonString;
@@ -68,6 +99,11 @@ function exportUJson(paras) {
 exports.exportUJson = exportUJson;
 function exportUJsonLoader(paras) {
     let { datas, fields, name, objects, table, exportNamespace, } = paras;
+    let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--JsonToolNamespace");
+    let jsonToolNamespace = "lang.json";
+    if (jsonToolNamespaceIndex >= 0 && process.argv.length > jsonToolNamespaceIndex + 1) {
+        jsonToolNamespace = process.argv[jsonToolNamespaceIndex + 1];
+    }
     let RowClass = firstLetterUpper(name);
     var fullName = `${table.workbookName}-${name}`;
     // !!!必须开头没有空格
@@ -75,7 +111,7 @@ function exportUJsonLoader(paras) {
 using UnityEngine.AddressableAssets;
 using System.Threading.Tasks;
 using UnityEngine;
-using lang.json;
+using ${jsonToolNamespace};
 
 namespace ${exportNamespace}
 {
@@ -141,11 +177,8 @@ namespace ${exportNamespace}
 }
 exports.exportUJsonLoader = exportUJsonLoader;
 class ExportUJsonPlugin extends export_table_lib_1.PluginBase {
-    constructor() {
-        super(...arguments);
-        this.name = "ujson";
-        this.tags = ["ujson"];
-    }
+    name = "ujson";
+    tags = ["ujson"];
     handleSheet(paras) {
         var fullName = `${paras.table.workbookName}-${paras.name}`;
         {
@@ -165,9 +198,8 @@ class ExportUJsonPlugin extends export_table_lib_1.PluginBase {
         }
     }
     handleBatch(paras) {
-        var _a;
         let { moreOptions, tables, exportNamespace, } = paras;
-        let isSkipIndexLoader = (_a = !!moreOptions.SkipIndexLoader) !== null && _a !== void 0 ? _a : false;
+        let isSkipIndexLoader = !!moreOptions.SkipIndexLoader ?? false;
         if (isSkipIndexLoader0) {
             isSkipIndexLoader = true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-table-pulgin-csharp",
-  "version": "1.1.83",
+  "version": "1.1.85",
   "description": "",
   "main": "./dist/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/node": "^17.0.18",
-    "export-table-lib": "^1.0.55",
+    "export-table-lib": "^1.0.56",
     "fs": "^0.0.1-security",
     "fs-extra": "^10.0.0",
     "fse": "^4.0.1"

package/src/ExportCSPlugin.ts

@@ -18,7 +18,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 		moreOptions,
 	} = paras;
 
-	let isSkipExportDefaults = !!moreOptions.SkipDefaults ?? false
+	let isSkipExportDefaults = !!moreOptions?.SkipDefaults ?? false
 	if (isSkipExportDefaults0) {
 		isSkipExportDefaults = true
 	}
@@ -201,8 +201,16 @@ ${foreach(getDescripts(f), line =>
 		`	/// ${line}`
 	)}
 	/// </summary>
-	public ${getFieldType(f)} ${convMemberName(f.name)};`
-	)}
+	public ${getFieldType(f)} ${convMemberName(f.name)};
+
+${iff(f.rawType == "@(int,string)[]", () => `
+	/// <summary>
+${foreach(getDescripts(f), line =>
+	`	/// ${line}`
+)}
+	/// </summary>
+	public (int,string)[] ${convMemberName(f.name)}Obj;`)}`
+)}
 
 	${cmm(/**生成get字段 */)}
 #region get字段

package/src/ExportUnityCSJsonPlugin.ts

@@ -24,10 +24,41 @@ export function exportUJson(paras: HandleSheetParams): string | null {
 	var fullName = `${table.workbookName}-${name}`
 	let jsonString = JSON.stringify(objects.map(obj => {
 		var newObj = Object.create(null);
-		Object.keys(obj).forEach(key => {
+		for (let f of fields) {
+			let key = f.name
 			var newKey = convMemberName(key);
 			newObj[newKey] = obj[key];
-		})
+
+			if (f.rawType == "@(int,string)[]") {
+				// [{"Item1":99,"Item2":"klwjefl"}]
+				let content = obj[key] as string;
+				let index = 0;
+				let index2 = -1;
+				let objs: object[] = []
+				while (0 <= index && index < content.length) {
+					index2 = content.indexOf("|", index)
+					let numStr = content.substring(index, index2)
+					index = content.indexOf(";;", index2)
+					let posEnd = index
+					if (index == -1) {
+						posEnd = content.length
+					} else {
+						index += 2
+					}
+					let ssStr = content.substring(index2 + 1, posEnd)
+					// console.log(`parseinfo: ${index2}, ${index}, ${numStr}, ${ssStr}`)
+					objs.push({
+						Item1: parseFloat(numStr),
+						Item2: ssStr,
+					})
+				}
+				newObj[newKey + "Obj"] = objs
+			}
+		}
+		// Object.keys(obj).forEach(key => {
+		// 	var newKey = convMemberName(key);
+		// 	newObj[newKey] = obj[key];
+		// })
 		return newObj
 	}));
 
@@ -64,6 +95,12 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
 		exportNamespace,
 	} = paras;
 
+	let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--JsonToolNamespace")
+	let jsonToolNamespace = "lang.json";
+	if(jsonToolNamespaceIndex>=0 && process.argv.length>jsonToolNamespaceIndex+1){
+		jsonToolNamespace = process.argv[jsonToolNamespaceIndex+1]
+	}
+
 	let RowClass = firstLetterUpper(name)
 	var fullName = `${table.workbookName}-${name}`
 	// !!!必须开头没有空格
@@ -71,7 +108,7 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
 using UnityEngine.AddressableAssets;
 using System.Threading.Tasks;
 using UnityEngine;
-using lang.json;
+using ${jsonToolNamespace};
 
 namespace ${exportNamespace}
 {

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2022",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */