export-table-pulgin-csharp 1.1.151 → 1.1.152

package/dist/CSParseTool.d.ts

@@ -28,4 +28,6 @@ export declare const getDescripts: (v: Field) => string[];
 export declare const convTupleArrayType: (f: Field) => Field | undefined;
 export declare const convTupleArrayTypeDefine: (f: Field) => string;
 export declare function GetUsingJsonToolNamespace(): string;
+export declare let isEnableMMP: boolean;
+export declare let useMMPNamespace: 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,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"}
+{"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;AAED,eAAO,IAAI,WAAW,SAAwD,CAAA;AAC9E,eAAO,IAAI,eAAe,QAAgC,CAAA"}

package/dist/CSParseTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.useMMPNamespace = exports.isEnableMMP = 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 {
@@ -479,3 +479,5 @@ function GetUsingJsonToolNamespace() {
     return useJsonToolNamesapce;
 }
 exports.GetUsingJsonToolNamespace = GetUsingJsonToolNamespace;
+exports.isEnableMMP = process.argv.findIndex(v => v == "--EnableMMPB") >= 0;
+exports.useMMPNamespace = "using LoadTableMMP.Runtime;";

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,CAqOpE;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,CA0OpE;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,7 +28,7 @@ const export_table_lib_1 = require("export-table-lib");
 const CSParseTool_1 = require("./CSParseTool");
 const fs = __importStar(require("fs-extra"));
 function export_stuff(paras) {
-    let { datas, fields, inject, name, objects, packagename, tables, xxtea, exportNamespace, moreOptions, } = paras;
+    let { datas, fields, inject, name, objects, packagename, tables, xxtea, exportNamespace, moreOptions, allTags, } = paras;
     let isSkipExportDefaults = !!(moreOptions?.SkipDefaults ?? false);
     if (CSParseTool_1.isSkipExportDefaults0) {
         isSkipExportDefaults = true;
@@ -45,10 +45,13 @@ function export_stuff(paras) {
             customFields.push(f3);
         }
     }
+    let isMMPEnabled = allTags.indexOf('csharp:mmp') != -1;
+    let mmpNamespace = isMMPEnabled ? CSParseTool_1.useMMPNamespace : "";
     let temp = `
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+${mmpNamespace}
 
 namespace ${exportNamespace}{
 [System.Serializable]

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,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"}
+{"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;AAOxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA2DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAwGzE;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

@@ -28,7 +28,6 @@ const export_table_lib_1 = require("export-table-lib");
 const fs = __importStar(require("fs-extra"));
 const CSParseTool_1 = require("./CSParseTool");
 var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0;
-var isEnableMMPB = process.argv.findIndex(v => v == "--EnableMMPB") >= 0;
 let firstLetterUpper = export_table_lib_1.makeFirstLetterUpper;
 function exportUJson(paras) {
     let { datas, fields, name, objects, table, } = paras;
@@ -86,7 +85,6 @@ function exportUJsonLoader(paras) {
     let useJsonToolNamesapce = (0, CSParseTool_1.GetUsingJsonToolNamespace)();
     let RowClass = firstLetterUpper(name);
     var fullName = `${table.workbookName}-${name}`;
-    var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "";
     // !!!必须开头没有空格
     let temp = `
 using System.Collections.Generic;
@@ -96,7 +94,6 @@ ${useJsonToolNamesapce}
 
 namespace ${exportNamespace}
 {
-	${mmpMark}
 	public partial class ${RowClass}
 	{
 #if UNITY_EDITOR && ENABLE_CONFIG_LOG

package/dist/ExportUnityMMPPlugin.js

@@ -33,13 +33,13 @@ function exportMMP(paras) {
     let { datas, fields, name, objects, table, exportNamespace, } = paras;
     let RowClass = firstLetterUpper(name);
     var fullName = `${table.workbookName}-${name}`;
-    var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "[System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Ansi)]";
+    var mmpMark = "[System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Ansi)]";
     // TODO: 支持FK类型
     let temp = `
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using LoadTableMMP.Runtime;
+${CSParseTool_1.useMMPNamespace}
 
 namespace ${exportNamespace}
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-table-pulgin-csharp",
-  "version": "1.1.151",
+  "version": "1.1.152",
   "description": "",
   "main": "./dist/index.js",
   "scripts": {},
@@ -13,7 +13,7 @@
   "dependencies": {
     "@types/commander": "2.12.2",
     "@types/node": "^17.0.18",
-    "export-table-lib": "^1.0.64",
+    "export-table-lib": "^1.0.65",
     "fs": "^0.0.1-security",
     "fs-extra": "^10.0.0",
     "fse": "^4.0.1"

package/src/CSParseTool.ts

@@ -403,4 +403,7 @@ export function GetUsingJsonToolNamespace() {
 	}
 	let useJsonToolNamesapce = jsonToolNamespace != null ? `using ${jsonToolNamespace};` : ``
 	return useJsonToolNamesapce
-}
+}
+
+export let isEnableMMP = process.argv.findIndex(v => v == "--EnableMMPB") >= 0
+export let useMMPNamespace = "using LoadTableMMP.Runtime;"

package/src/ExportCSPlugin.ts

@@ -1,6 +1,6 @@
 
 import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, iff, FieldType, makeFirstLetterLower, DataTable } from "export-table-lib"
-import { convMemberName, convTupleArrayType, convTupleArrayTypeDefine, convVarName, firstLetterUpper, genValue, getCustomFieldTypeAnnotation, getDescripts, getFieldAnnotation, getFieldType, getFkFieldType, getTitle, isSkipExportDefaults0 } from "./CSParseTool"
+import { convMemberName, convTupleArrayType, convTupleArrayTypeDefine, convVarName, firstLetterUpper, genValue, getCustomFieldTypeAnnotation, getDescripts, getFieldAnnotation, getFieldType, getFkFieldType, getTitle, isSkipExportDefaults0, useMMPNamespace } from "./CSParseTool"
 import * as fs from "fs-extra"
 
 export function export_stuff(paras: HandleSheetParams): string | null {
@@ -15,6 +15,7 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 		xxtea,
 		exportNamespace,
 		moreOptions,
+		allTags,
 	} = paras;
 
 	let isSkipExportDefaults = !!(moreOptions?.SkipDefaults ?? false)
@@ -36,10 +37,14 @@ export function export_stuff(paras: HandleSheetParams): string | null {
 		}
 	}
 
+	let isMMPEnabled = allTags.indexOf('csharp:mmp') != -1
+	let mmpNamespace = isMMPEnabled ? useMMPNamespace : ""
+
 	let temp = `
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+${mmpNamespace}
 
 namespace ${exportNamespace}{
 [System.Serializable]

package/src/ExportUnityCSJsonPlugin.ts

@@ -4,7 +4,6 @@ import * as fs from "fs-extra"
 import { GetUsingJsonToolNamespace, TryConvValue, convMemberName, genTupleArrayValue } from "./CSParseTool";
 
 var isSkipIndexLoader0 = process.argv.findIndex(v => v == "--SkipIndexLoader") >= 0
-var isEnableMMPB = process.argv.findIndex(v => v == "--EnableMMPB") >= 0
 
 let firstLetterUpper = makeFirstLetterUpper;
 export function exportUJson(paras: HandleSheetParams): string | null {
@@ -82,7 +81,6 @@ export function exportUJsonLoader(paras: HandleSheetParams): string | null {
 
 	let RowClass = firstLetterUpper(name)
 	var fullName = `${table.workbookName}-${name}`
-	var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "";
 	// !!!必须开头没有空格
 	let temp = `
 using System.Collections.Generic;
@@ -92,7 +90,6 @@ ${useJsonToolNamesapce}
 
 namespace ${exportNamespace}
 {
-	${mmpMark}
 	public partial class ${RowClass}
 	{
 #if UNITY_EDITOR && ENABLE_CONFIG_LOG

package/src/ExportUnityMMPPlugin.ts

@@ -1,7 +1,7 @@
 
 import { cmm, HandleSheetParams, Field, foreach, IPlugin, st, PluginBase, HandleBatchParams, OutFilePath, makeFirstLetterUpper, iff } from "export-table-lib"
 import * as fs from "fs-extra"
-import { convMemberName, convVarName, getFieldElementType, getFieldType, isTypeArray } from "./CSParseTool";
+import { convMemberName, convVarName, getFieldElementType, getFieldType, isTypeArray, useMMPNamespace } from "./CSParseTool";
 
 var isEnableMMPB = process.argv.findIndex(v => v == "--EnableMMPB") >= 0
 
@@ -19,13 +19,13 @@ export function exportMMP(paras: HandleSheetParams): string | null {
 
 	let RowClass = firstLetterUpper(name)
 	var fullName = `${table.workbookName}-${name}`
-	var mmpMark = isEnableMMPB ? "[MemoryPack.MemoryPackable]" : "[System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Ansi)]";
+	var mmpMark = "[System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Ansi)]";
 	// TODO: 支持FK类型
 	let temp = `
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using LoadTableMMP.Runtime;
+${useMMPNamespace}
 
 namespace ${exportNamespace}
 {