export-table-pulgin-csharp 1.1.147 → 1.1.149

package/dist/CSParseTool.d.ts

@@ -1,16 +1,31 @@
 import { Field, FieldType, DataTable } from "export-table-lib";
 export declare function TryConvValue(value: any, t: FieldType, f: Field): any;
 export declare function ConvValue(value: any, t: FieldType, f: Field): any;
+export type ValueTuple = {
+    Item1?: any;
+    Item2?: any;
+};
+export declare function genTupleArrayValue(f: Field, content: string): {
+    isArray: boolean;
+    objs: ValueTuple[];
+} | undefined;
+export declare function ToNewTupleStatement(obj: ValueTuple): string;
 export declare function ConvValue2Literal(value: any, t: FieldType, f: Field): string;
 export declare let isSkipExportDefaults0: boolean;
 export declare let firstLetterUpper: (str: string) => string;
 export declare let firstLetterLower: (str: string) => string;
 export declare let convMemberName: (str: string) => string;
 export declare let convVarName: (str: string) => string;
+export declare let getFieldElementType: (f: Field) => string;
 export declare let getFieldType: (f: Field) => FieldType | "Dictionary<string,string>" | "List<Dictionary<string,string>>" | "double" | "double[]";
+export declare let isTypeArray: (f: Field) => boolean;
+export declare let getFieldAnnotation: (f: Field) => string;
+export declare let getCustomFieldTypeAnnotation: (f: Field) => string;
 export declare let getFkFieldType: (tables: DataTable[], field: Field) => FieldType;
 export declare const genValue: (value: any, f: Field) => string;
 export declare const getTitle: (v: Field) => string;
 export declare const getDescripts: (v: Field) => string[];
-export declare const convTupleArrayType: (f: Field) => string;
+export declare const convTupleArrayType: (f: Field) => Field | undefined;
+export declare const convTupleArrayTypeDefine: (f: Field) => string;
+export declare function GetUsingJsonToolNamespace(): string;
 //# sourceMappingURL=CSParseTool.d.ts.map

package/dist/CSParseTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CSParseTool.d.ts","sourceRoot":"","sources":["../src/CSParseTool.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,KAAK,EAA4D,SAAS,EAAwB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEtK,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CAWpE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CA0CjE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CA0D5E;AAED,eAAO,IAAI,qBAAqB,SAA0D,CAAA;AAE1F,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,cAAc,QAAkB,MAAM,WAEhD,CAAA;AACD,eAAO,IAAI,WAAW,QANuB,MAAM,WAMV,CAAA;AAEzC,eAAO,IAAI,YAAY,MAAgB,KAAK,wGA+C3C,CAAA;AAED,eAAO,IAAI,cAAc,WAAqB,SAAS,EAAE,SAAS,KAAK,cAEtE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,GAAG,KAAK,KAAK,KAAG,MAE/C,CAAA;AAED,eAAO,MAAM,QAAQ,MAAO,KAAK,WAEhC,CAAA;AAED,eAAO,MAAM,YAAY,MAAO,KAAK,aAEpC,CAAA;AAED,eAAO,MAAM,kBAAkB,MAAO,KAAK,WAa1C,CAAA"}
+{"version":3,"file":"CSParseTool.d.ts","sourceRoot":"","sources":["../src/CSParseTool.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,KAAK,EAA4D,SAAS,EAAwB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEtK,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CAWpE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CA0CjE;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,UAAU,EAAE,CAAA;CAAE,GAAG,SAAS,CAoDlH;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,UAElD;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,GAAG,MAAM,CAwE5E;AAED,eAAO,IAAI,qBAAqB,SAA0D,CAAA;AAE1F,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,gBAAgB,QAAkB,MAAM,WAElD,CAAC;AACF,eAAO,IAAI,cAAc,QAAkB,MAAM,WAEhD,CAAA;AACD,eAAO,IAAI,WAAW,QANuB,MAAM,WAMV,CAAA;AAEzC,eAAO,IAAI,mBAAmB,MAAgB,KAAK,WAclD,CAAA;AAED,eAAO,IAAI,YAAY,MAAgB,KAAK,wGAiD3C,CAAA;AAED,eAAO,IAAI,WAAW,MAAgB,KAAK,YAI1C,CAAA;AAED,eAAO,IAAI,kBAAkB,MAAgB,KAAK,WA+CjD,CAAA;AAED,eAAO,IAAI,4BAA4B,MAAgB,KAAK,WAiB3D,CAAA;AAED,eAAO,IAAI,cAAc,WAAqB,SAAS,EAAE,SAAS,KAAK,cAEtE,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,GAAG,KAAK,KAAK,KAAG,MAE/C,CAAA;AAED,eAAO,MAAM,QAAQ,MAAO,KAAK,WAEhC,CAAA;AAED,eAAO,MAAM,YAAY,MAAO,KAAK,aAEpC,CAAA;AAED,eAAO,MAAM,kBAAkB,MAAO,KAAK,sBAc1C,CAAA;AAED,eAAO,MAAM,wBAAwB,MAAO,KAAK,WAYhD,CAAA;AAED,wBAAgB,yBAAyB,WAQxC"}

package/dist/CSParseTool.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convTupleArrayType = exports.getDescripts = exports.getTitle = exports.genValue = exports.getFkFieldType = exports.getFieldType = exports.convVarName = exports.convMemberName = exports.firstLetterLower = exports.firstLetterUpper = exports.isSkipExportDefaults0 = exports.ConvValue2Literal = exports.ConvValue = exports.TryConvValue = void 0;
+exports.GetUsingJsonToolNamespace = exports.convTupleArrayTypeDefine = exports.convTupleArrayType = exports.getDescripts = exports.getTitle = exports.genValue = exports.getFkFieldType = exports.getCustomFieldTypeAnnotation = exports.getFieldAnnotation = exports.isTypeArray = exports.getFieldType = exports.getFieldElementType = exports.convVarName = exports.convMemberName = exports.firstLetterLower = exports.firstLetterUpper = exports.isSkipExportDefaults0 = exports.ConvValue2Literal = exports.ToNewTupleStatement = exports.genTupleArrayValue = exports.ConvValue = exports.TryConvValue = void 0;
+const export_table_lib_1 = require("export-table-lib");
 function TryConvValue(value, t, f) {
     try {
         return ConvValue(value, t, f);
@@ -75,7 +76,61 @@ function ConvValue(value, t, f) {
     throw new TypeError(`invalid unkown type ${f.name}:<${f.rawType} => ${f.type} << ${t}>`);
 }
 exports.ConvValue = ConvValue;
+function genTupleArrayValue(f, content) {
+    var line = f.rawType.replaceAll(/(?<=[^\w])(boolean)(?=[^\w]|$)/g, "bool");
+    let m = line.match(/\@\((\w+),(\w+)\)(\[\])?/);
+    if (m != null) {
+        // [{"Item1":99,"Item2":"klwjefl"}]
+        let index = 0;
+        let objs = [];
+        let isArray = false;
+        // console.log(`input: ${content}`)
+        while (0 <= index && index < content.length) {
+            let segIndex = content.indexOf(";;", index);
+            if (segIndex == -1) {
+                segIndex = content.length;
+            }
+            let index2 = content.indexOf("|", index);
+            if (index2 == -1 || index2 >= segIndex) {
+                if (content.length > 0) {
+                    console.error(`表格格式错误，缺少部分数据，将用默认值填充<${f.name}>: ${content}`);
+                }
+                index2 = segIndex;
+            }
+            let numStr = content.substring(index, index2);
+            let t1 = m[1];
+            let v1 = index == index2 ? undefined : TryConvValue(numStr, t1, f);
+            // console.log(`parseinfo1: ${content}, ${index}, ${index2}, ${numStr}, ${t1}, ${v1}`)
+            let index3 = Math.min(index2 + 1, segIndex);
+            let ssStr = content.substring(index3, segIndex);
+            let t2 = m[2];
+            let v2 = index3 == segIndex ? undefined : TryConvValue(ssStr, t2, f);
+            // console.log(`parseinfo2: ${content}, ${index3}, ${segIndex}, ${ssStr}, ${t2}, ${v2}`)
+            let obj = {};
+            if (v1 != undefined) {
+                obj.Item1 = v1;
+            }
+            if (v2 != undefined) {
+                obj.Item2 = v2;
+            }
+            objs.push(obj);
+            if (segIndex >= content.length) {
+                break;
+            }
+            index = segIndex + 2;
+        }
+        isArray = m[3] == "[]";
+        return { isArray, objs };
+    }
+    return undefined;
+}
+exports.genTupleArrayValue = genTupleArrayValue;
+function ToNewTupleStatement(obj) {
+    return `new(){${(0, export_table_lib_1.iff)(obj.Item1 != null, () => `Item1=${obj.Item1},`)}${(0, export_table_lib_1.iff)(obj.Item2 != null, () => `Item2=${obj.Item2},`)}}`;
+}
+exports.ToNewTupleStatement = ToNewTupleStatement;
 function ConvValue2Literal(value, t, f) {
+    // console.log(t)
     if (t == "object") {
         //throw new Error("invalid type <object>")
         let convert = [];
@@ -134,6 +189,21 @@ function ConvValue2Literal(value, t, f) {
         let values = value;
         return `new string[]{${values.map(v => JSON.stringify(v)).join(", ")}}`;
     }
+    else if (t.startsWith("WritableValueTuple<")) {
+        let result = genTupleArrayValue(f, value);
+        // console.log(`result: ${value}=> ${JSON.stringify(result)}`)
+        if (result == null) {
+            throw new Error(`invalid tuple/tuple[] format: ${value}`);
+        }
+        let { isArray, objs } = result;
+        if (isArray) {
+            return `new ${f.type}{${(0, export_table_lib_1.foreach)(objs, obj => ToNewTupleStatement(obj), ",")}}`;
+        }
+        else {
+            let obj = objs[0] ?? {};
+            return ToNewTupleStatement(obj);
+        }
+    }
     else if (t == "fk") {
         return `${value}`;
     }
@@ -143,7 +213,7 @@ function ConvValue2Literal(value, t, f) {
     }
     else if (t == "any") {
         console.log(f);
-        throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
+        throw new Error(`invalid type ${f.name}:<${f.rawType} | ${f.type} => any>`);
     }
     else if (t == "key") {
         return `${value}`;
@@ -165,6 +235,25 @@ let convMemberName = function (str) {
 };
 exports.convMemberName = convMemberName;
 exports.convVarName = exports.firstLetterLower;
+let getFieldElementType = function (f) {
+    let t = f.type;
+    if (t.endsWith("[]")) {
+        var type = (0, exports.getFieldType)(f);
+        return type.substring(0, type.length - 2);
+    }
+    else if (t == "any") {
+        console.log(f);
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
+    }
+    else if (t == "key") {
+        return "string";
+    }
+    else {
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => unkown>`);
+    }
+    return t;
+};
+exports.getFieldElementType = getFieldElementType;
 let getFieldType = function (f) {
     let t = f.type;
     if (t == "object") {
@@ -220,6 +309,9 @@ let getFieldType = function (f) {
     else if (t == "fk[]") {
         return "int[]";
     }
+    else if (t.startsWith("WritableValueTuple<")) {
+        return t;
+    }
     else if (t == "any") {
         console.log(f);
         throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
@@ -233,6 +325,102 @@ let getFieldType = function (f) {
     return t;
 };
 exports.getFieldType = getFieldType;
+let isTypeArray = function (f) {
+    let t = f.type;
+    let isArray = t.endsWith("[]");
+    return isArray;
+};
+exports.isTypeArray = isTypeArray;
+let getFieldAnnotation = function (f) {
+    let anno = '[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0)]';
+    let t = f.type;
+    if (t == "object") {
+        return "";
+    }
+    else if (t == "object[]") {
+        //throw new Error("invalid type <Dictionary<string,string>[]>")
+        return "";
+    }
+    else if (t == "number") {
+        return "";
+    }
+    else if (t == "number[]") {
+        return anno;
+    }
+    else if (t == "float") {
+        return "";
+    }
+    else if (t == "float[]") {
+        return anno;
+    }
+    else if (t == "int") {
+        return "";
+    }
+    else if (t == "int[]") {
+        return anno;
+    }
+    else if (t == "long") {
+        return "";
+    }
+    else if (t == "long[]") {
+        return anno;
+    }
+    else if (t == "uid") {
+        return "";
+    }
+    else if (t == "bool") {
+        return "";
+    }
+    else if (t == "bool[]") {
+        return anno;
+    }
+    else if (t == "string") {
+        return "";
+    }
+    else if (t == "string[]") {
+        return anno;
+    }
+    else if (t == "fk") {
+        return "";
+    }
+    else if (t == "fk[]") {
+        return anno;
+    }
+    else if (t == "any") {
+        console.log(f);
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
+    }
+    else if (t == "key") {
+        return "string";
+    }
+    else {
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => unkown>`);
+    }
+    return t;
+};
+exports.getFieldAnnotation = getFieldAnnotation;
+let getCustomFieldTypeAnnotation = function (f) {
+    let anno = '[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0)]';
+    let t = f.type;
+    if (t == "string") {
+        if (f.rawType.endsWith("[]")) {
+            return anno;
+        }
+        return "";
+    }
+    else if (t == "any") {
+        console.log(f);
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => any>`);
+    }
+    else if (t == "key") {
+        return "string";
+    }
+    else {
+        throw new Error(`invalid type ${f.name}:<${f.rawType} => unkown>`);
+    }
+    return t;
+};
+exports.getCustomFieldTypeAnnotation = getCustomFieldTypeAnnotation;
 let getFkFieldType = function (tables, field) {
     return tables.find(a => a.name == field.fkTableName).fields.find(a => a.name == field.fkFieldName).type;
 };
@@ -251,7 +439,23 @@ const getDescripts = (v) => {
 exports.getDescripts = getDescripts;
 const convTupleArrayType = (f) => {
     let line0 = f.rawType.replaceAll(/(?<=[^\w])(number)(?=[^\w]|$)/g, "double").replaceAll(/(?<=[^\w])(boolean)(?=[^\w]|$)/g, "bool");
-    console.log(line0);
+    let m = line0.match(/\@\((\w+),(\w+)\)(\[\])?/);
+    if (m != null) {
+        let type1 = m[1];
+        let type2 = m[2];
+        let isArray = m[3] != null;
+        let type = `WritableValueTuple<${type1}, ${type2}>${isArray ? "[]" : ""}`;
+        let name = `${(0, exports.convMemberName)(f.name)}Obj`;
+        let f2 = { ...f, type, name };
+        return f2;
+    }
+    else {
+        return undefined;
+    }
+};
+exports.convTupleArrayType = convTupleArrayType;
+const convTupleArrayTypeDefine = (f) => {
+    let line0 = f.rawType.replaceAll(/(?<=[^\w])(number)(?=[^\w]|$)/g, "double").replaceAll(/(?<=[^\w])(boolean)(?=[^\w]|$)/g, "bool");
     let m = line0.match(/\@\((\w+),(\w+)\)(\[\])?/);
     if (m != null) {
         let type1 = m[1];
@@ -264,4 +468,14 @@ const convTupleArrayType = (f) => {
         return `public ${line0}  ${(0, exports.convMemberName)(f.name)}Obj;`;
     }
 };
-exports.convTupleArrayType = convTupleArrayType;
+exports.convTupleArrayTypeDefine = convTupleArrayTypeDefine;
+function GetUsingJsonToolNamespace() {
+    let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--AssetToolNamespace");
+    let jsonToolNamespace = null;
+    if (jsonToolNamespaceIndex >= 0 && process.argv.length > jsonToolNamespaceIndex + 1) {
+        jsonToolNamespace = process.argv[jsonToolNamespaceIndex + 1];
+    }
+    let useJsonToolNamesapce = jsonToolNamespace != null ? `using ${jsonToolNamespace};` : ``;
+    return useJsonToolNamesapce;
+}
+exports.GetUsingJsonToolNamespace = GetUsingJsonToolNamespace;

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,EAAsE,MAAM,kBAAkB,CAAA;AAItK,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAyNpE;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,EAAsE,MAAM,kBAAkB,CAAA;AAItK,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqOpE;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

@@ -37,9 +37,18 @@ function export_stuff(paras) {
     let initFunc = name + "Init";
     let mapfield = fields.find(a => a.type == "key"); //如果是map，则生成对应的map
     let mapName = name + "Map";
+    let customFields = [];
+    for (let f2 of fields) {
+        customFields.push(f2);
+        let f3 = (0, CSParseTool_1.convTupleArrayType)(f2);
+        if (f3 != undefined) {
+            customFields.push(f3);
+        }
+    }
     let temp = `
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace ${exportNamespace}{
 [System.Serializable]
@@ -48,19 +57,19 @@ public partial class ${RowClass} {
 	public static List<${RowClass}> Configs = new List<${RowClass}>()
 	{
 ${(0, export_table_lib_1.iff)(!isSkipExportDefaults, () => `
-${(0, export_table_lib_1.foreach)(datas, data => `		new ${RowClass}(${(0, export_table_lib_1.st)(() => fields.map((f, index) => (0, CSParseTool_1.genValue)(data[index], f)).join(", "))}),`)}
+${(0, export_table_lib_1.foreach)(datas, data => `		new ${RowClass}(${(0, export_table_lib_1.st)(() => customFields.map((f, index) => (0, CSParseTool_1.genValue)(data[f.index], f)).join(", "))}),`)}
 `)}
 	};
 
 	public ${RowClass}() { }
-	public ${RowClass}(${(0, export_table_lib_1.st)(() => fields.map(f => `${(0, CSParseTool_1.getFieldType)(f)} ${(0, CSParseTool_1.convVarName)(f.name)}`).join(", "))})
+	public ${RowClass}(${(0, export_table_lib_1.st)(() => customFields.map(f => `${(0, CSParseTool_1.getFieldType)(f)} ${(0, CSParseTool_1.convVarName)(f.name)}`).join(", "))})
 	{
-${(0, export_table_lib_1.foreach)(fields, f => `		this.${(0, CSParseTool_1.convMemberName)(f.name)} = ${(0, CSParseTool_1.convVarName)(f.name)};`)}
+${(0, export_table_lib_1.foreach)(customFields, f => `		this.${(0, CSParseTool_1.convMemberName)(f.name)} = ${(0, CSParseTool_1.convVarName)(f.name)};`)}
 	}
 
 	public virtual ${RowClass} MergeFrom(${RowClass} source)
 	{
-${(0, export_table_lib_1.foreach)(fields, f => `		this.${(0, CSParseTool_1.convMemberName)(f.name)} = source.${(0, CSParseTool_1.convMemberName)(f.name)};`)}
+${(0, export_table_lib_1.foreach)(customFields, f => `		this.${(0, CSParseTool_1.convMemberName)(f.name)} = source.${(0, CSParseTool_1.convMemberName)(f.name)};`)}
 		return this;
 	}
 
@@ -76,13 +85,15 @@ ${(0, export_table_lib_1.foreach)(fields, f => `
 	/// <summary>
 ${(0, export_table_lib_1.foreach)((0, CSParseTool_1.getDescripts)(f), line => `	/// ${line}`)}
 	/// </summary>
+	${(0, CSParseTool_1.getFieldAnnotation)(f)}
 	public ${(0, CSParseTool_1.getFieldType)(f)} ${(0, CSParseTool_1.convMemberName)(f.name)};
 
 ${(0, export_table_lib_1.iff)(f.rawType.startsWith("@"), () => `
 	/// <summary>
 ${(0, export_table_lib_1.foreach)((0, CSParseTool_1.getDescripts)(f), line => `	/// ${line}`)}
 	/// </summary>
-	${(0, CSParseTool_1.convTupleArrayType)(f)}`)}`)}
+	${(0, CSParseTool_1.getCustomFieldTypeAnnotation)(f)}
+	${(0, CSParseTool_1.convTupleArrayTypeDefine)(f)}`)}`)}
 
 	${(0, export_table_lib_1.cmm)( /**生成get字段 */)}
 #region get字段

package/dist/ExportLiteDBCSPlugin.js

@@ -94,7 +94,7 @@ ${(0, export_table_lib_1.iff)(f.rawType.startsWith("@"), () => `
 		/// <summary>
 ${(0, export_table_lib_1.foreach)((0, CSParseTool_1.getDescripts)(f), line => `		/// ${line}`)}
 		/// </summary>
-		${(0, CSParseTool_1.convTupleArrayType)(f)}`)}`)}
+		${(0, CSParseTool_1.convTupleArrayTypeDefine)(f)}`)}`)}
 
 	${(0, export_table_lib_1.cmm)( /**生成get字段 */)}
 #region get字段

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,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqDzE;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;CAqD1C"}
+{"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,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAiDzE;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;CAqD1C"}

package/dist/ExportLiteDBUnityCSJsonPlugin.js

@@ -36,11 +36,7 @@ const ExportUnityCSJsonPlugin_1 = require("./ExportUnityCSJsonPlugin");
 var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0;
 function exportUJsonLoader(paras) {
     let { datas, fields, name, objects, table, exportNamespace, } = paras;
-    let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--AssetToolNamespace");
-    let jsonToolNamespace = "lang.json";
-    if (jsonToolNamespaceIndex >= 0 && process.argv.length > jsonToolNamespaceIndex + 1) {
-        jsonToolNamespace = process.argv[jsonToolNamespaceIndex + 1];
-    }
+    let useJsonToolNamesapce = (0, CSParseTool_1.GetUsingJsonToolNamespace)();
     let RowClass = (0, CSParseTool_1.firstLetterUpper)(name);
     var fullName = `${table.workbookName}-${name}`;
     // !!!必须开头没有空格
@@ -48,7 +44,7 @@ function exportUJsonLoader(paras) {
 using System.Threading.Tasks;
 using LiteDB;
 using UnityEngine;
-using ${jsonToolNamespace};
+${useJsonToolNamesapce}
 
 namespace ${exportNamespace}
 {

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;AAQxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+FnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8GzE;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;CA4C3C"}
+{"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;AAQxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA2DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA0GzE;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;CA4C3C"}

package/dist/ExportUnityCSJsonPlugin.js

@@ -39,47 +39,10 @@ function exportUJson(paras) {
             let key = f.name;
             var newKey = (0, CSParseTool_1.convMemberName)(key);
             newObj[newKey] = obj[key];
-            var line = f.rawType.replaceAll(/(?<=[^\w])(boolean)(?=[^\w]|$)/g, "bool");
-            let m = line.match(/\@\((\w+),(\w+)\)(\[\])?/);
-            if (m != null) {
-                // [{"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);
-                    if (index2 == -1) {
-                        if (content.length > 0) {
-                            console.error(`表格格式错误，缺少部分数据，将用默认值填充<${key}>: ${content}`);
-                        }
-                        index2 = content.indexOf(";;", index);
-                        index = index2;
-                    }
-                    else {
-                        index = content.indexOf(";;", index2);
-                    }
-                    let numStr = content.substring(index, index2);
-                    let t1 = m[1];
-                    let v1 = (0, CSParseTool_1.TryConvValue)(numStr, t1, f);
-                    let posEnd = index;
-                    if (index == -1) {
-                        posEnd = content.length;
-                    }
-                    else {
-                        index += 2;
-                    }
-                    let ssStr = content.substring(index2 + 1, posEnd);
-                    let t2 = m[2];
-                    let v2 = (0, CSParseTool_1.TryConvValue)(ssStr, t2, f);
-                    // console.log(`parseinfo1: ${content}, ${index2}, ${index}, ${numStr}, ${t1}, ${v1}`)
-                    // console.log(`parseinfo2: ${content}, ${index2}, ${index}, ${ssStr}, ${t2}, ${v2}`)
-                    objs.push({
-                        Item1: v1,
-                        Item2: v2,
-                    });
-                }
-                let isArray = m[3] == "[]";
+            let content = obj[key];
+            let result = (0, CSParseTool_1.genTupleArrayValue)(f, content);
+            if (result != null) {
+                let { isArray, objs } = result;
                 if (isArray) {
                     newObj[newKey + "Obj"] = objs;
                 }
@@ -120,11 +83,7 @@ function exportUJson(paras) {
 exports.exportUJson = exportUJson;
 function exportUJsonLoader(paras) {
     let { datas, fields, name, objects, table, exportNamespace, } = paras;
-    let jsonToolNamespaceIndex = process.argv.findIndex(v => v == "--AssetToolNamespace");
-    let jsonToolNamespace = "lang.json";
-    if (jsonToolNamespaceIndex >= 0 && process.argv.length > jsonToolNamespaceIndex + 1) {
-        jsonToolNamespace = process.argv[jsonToolNamespaceIndex + 1];
-    }
+    let useJsonToolNamesapce = (0, CSParseTool_1.GetUsingJsonToolNamespace)();
     let RowClass = firstLetterUpper(name);
     var fullName = `${table.workbookName}-${name}`;
     var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "";
@@ -133,7 +92,7 @@ function exportUJsonLoader(paras) {
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
-using ${jsonToolNamespace};
+${useJsonToolNamesapce}
 
 namespace ${exportNamespace}
 {
@@ -147,7 +106,7 @@ namespace ${exportNamespace}
 		}
 #endif
 		[System.Serializable]
-		internal struct TempA
+		private struct TempA
 		{
 			public List<${RowClass}> a;
 		}
@@ -182,7 +141,7 @@ namespace ${exportNamespace}
 		}
 
 #if UNITY_EDITOR
-		public static void LoadInEditor(bool force = false)
+		public static void LoadInEditor(bool force = false, System.Func<string, string> pathConverter = null)
 		{
 			if (Application.isPlaying && (!force))
 			{
@@ -190,8 +149,8 @@ namespace ${exportNamespace}
 				Debug.LogError(tip);
 				throw new System.Exception(tip);
 			}
-			var loadUrl = LoadUrl;
-			var configJson = UnityEditor.AssetDatabase.LoadAssetAtPath<TextAsset>(loadUrl);
+			var loadUrl = pathConverter == null ? LoadUrl : pathConverter(LoadUrl);
+			var configJson = System.IO.File.ReadAllText(loadUrl, Encoding.UTF8);
 			if (configJson != null)
 			{
 				var obj = new TempA()
@@ -266,7 +225,7 @@ ${(0, export_table_lib_1.foreach)(tables.sort((ta, tb) => ta.name.localeCompare(
 		}
 		
 #if UNITY_EDITOR
-		public static IEnumerable<Action<bool>> LoadInEditor(){
+		public static IEnumerable<Action<bool, System.Func<string, string>>> LoadInEditor(){
 ${(0, export_table_lib_1.foreach)(tables.sort((ta, tb) => ta.name.localeCompare(tb.name)), (table) => `
 			yield return ${firstLetterUpper(table.name)}.LoadInEditor;
 `)}

package/dist/ExportUnityMMPPlugin.d.ts

@@ -0,0 +1,8 @@
+import { HandleSheetParams, PluginBase } from "export-table-lib";
+export declare function exportMMP(paras: HandleSheetParams): string | null;
+export declare class ExportUnityMMPPlugin extends PluginBase {
+    name: string;
+    tags: string[];
+    handleSheet(paras: HandleSheetParams): void;
+}
+//# sourceMappingURL=ExportUnityMMPPlugin.d.ts.map

package/dist/ExportUnityMMPPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExportUnityMMPPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityMMPPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAA6D,MAAM,kBAAkB,CAAA;AAQ7J,wBAAgB,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqGjE;AAED,qBAAa,oBAAqB,SAAQ,UAAU;IACnD,IAAI,SAAQ;IACZ,IAAI,EAAE,MAAM,EAAE,CAAU;IAExB,WAAW,CAAC,KAAK,EAAE,iBAAiB;CAUpC"}