@vdhewei/xlsx-template-lib 1.3.3 → 1.3.5

package/dist/index.d.mts

@@ -385,6 +385,7 @@ declare class TokenParserManger {
 declare function columnLetterToNumber(letter: string): number;
 declare function columnNumberToLetter(num: number): string;
 type MacroUnitHelper = (v: string) => string;
+declare const toCellValue: (value: exceljs.CellValue) => string;
 declare const loadWorkbook: <T extends ArrayBuffer | Buffer | string>(data: T) => Promise<exceljs.Workbook>;
 declare const scanCellSetPlaceholder: <T extends ArrayBuffer | Buffer | string>(excelBuffer: T, cell: CellPosition & {
     Sheet: string | number;
@@ -470,4 +471,4 @@ declare const mergeMap: (source: Map<string, string>, dest: Map<string, string>)
 declare const autoRegisterAlias: (values: Object, configure: RuleResult) => Object;
 declare const generateCommandsXlsxTemplateWithCompile: <T extends JsZip.OutputType>(data: Buffer, values: Object, compileOptions: AutoOptions, options?: JsZip.JSZipGeneratorOptions<T> & FullOptions) => Promise<OutputByType[T]>;
 
-export { AddCommand, AddCommandMust, type AfterReplaceHook, type Argument, ArgumentData, ArgumentValue, ArgumentValueLoader, type AutoOptions, type BeforeReplaceHook, BufferType, type CellPosition, type CmdFunction, CompileContext, type CompileResult, type CustomFormatter, type CustomPlaceholderExtractor, type CustomReplacer, DefaultPlaceholderCellValue, type DrawingInfo, ExprResolver, type ExtensionOptions, type ExtractMacroArgs, type FilterMacroResult, type FullOptions, type MacroArgs, type MacroUnitHelper, type OutputByType, type Placeholder, type PlaceholderCellValue, type QueryFunction, type Range, type Ref, type RelsInfo, RuleMapOptions, type RuleOptions, type RuleResult, RuleToken, type SheetInfo, type TableInfo, TokenParserManger, Workbook, type WorkbookOptions, autoRegisterAlias, columnLetterToNumber, columnNumberToLetter, commandExtendQuery, compileRuleSheetName, compileWorkSheet, compileWorkSheetPlaceholder, defaultExtractPlaceholders, defaultFormatters, defaultValueDotGet, generateCommandsXlsxTemplate, generateCommandsXlsxTemplateWithCompile, generateXlsxTemplate, getCommands, getTokenParser, hasGeneratorToken, isRuleToken, isUrl, loadCompileSheets, loadWorkbook, mergeMap, parseWorkSheetRules, registerTokenParser, registerTokenParserMust, resolveArgument, scanCellSetPlaceholder, toArrayBuffer, valueDotGet, workSheetSetPlaceholder };
+export { AddCommand, AddCommandMust, type AfterReplaceHook, type Argument, ArgumentData, ArgumentValue, ArgumentValueLoader, type AutoOptions, type BeforeReplaceHook, BufferType, type CellPosition, type CmdFunction, CompileContext, type CompileResult, type CustomFormatter, type CustomPlaceholderExtractor, type CustomReplacer, DefaultPlaceholderCellValue, type DrawingInfo, ExprResolver, type ExtensionOptions, type ExtractMacroArgs, type FilterMacroResult, type FullOptions, type MacroArgs, type MacroUnitHelper, type OutputByType, type Placeholder, type PlaceholderCellValue, type QueryFunction, type Range, type Ref, type RelsInfo, RuleMapOptions, type RuleOptions, type RuleResult, RuleToken, type SheetInfo, type TableInfo, TokenParserManger, Workbook, type WorkbookOptions, autoRegisterAlias, columnLetterToNumber, columnNumberToLetter, commandExtendQuery, compileRuleSheetName, compileWorkSheet, compileWorkSheetPlaceholder, defaultExtractPlaceholders, defaultFormatters, defaultValueDotGet, generateCommandsXlsxTemplate, generateCommandsXlsxTemplateWithCompile, generateXlsxTemplate, getCommands, getTokenParser, hasGeneratorToken, isRuleToken, isUrl, loadCompileSheets, loadWorkbook, mergeMap, parseWorkSheetRules, registerTokenParser, registerTokenParserMust, resolveArgument, scanCellSetPlaceholder, toArrayBuffer, toCellValue, valueDotGet, workSheetSetPlaceholder };

package/dist/index.d.ts

@@ -385,6 +385,7 @@ declare class TokenParserManger {
 declare function columnLetterToNumber(letter: string): number;
 declare function columnNumberToLetter(num: number): string;
 type MacroUnitHelper = (v: string) => string;
+declare const toCellValue: (value: exceljs.CellValue) => string;
 declare const loadWorkbook: <T extends ArrayBuffer | Buffer | string>(data: T) => Promise<exceljs.Workbook>;
 declare const scanCellSetPlaceholder: <T extends ArrayBuffer | Buffer | string>(excelBuffer: T, cell: CellPosition & {
     Sheet: string | number;
@@ -470,4 +471,4 @@ declare const mergeMap: (source: Map<string, string>, dest: Map<string, string>)
 declare const autoRegisterAlias: (values: Object, configure: RuleResult) => Object;
 declare const generateCommandsXlsxTemplateWithCompile: <T extends JsZip.OutputType>(data: Buffer, values: Object, compileOptions: AutoOptions, options?: JsZip.JSZipGeneratorOptions<T> & FullOptions) => Promise<OutputByType[T]>;
 
-export { AddCommand, AddCommandMust, type AfterReplaceHook, type Argument, ArgumentData, ArgumentValue, ArgumentValueLoader, type AutoOptions, type BeforeReplaceHook, BufferType, type CellPosition, type CmdFunction, CompileContext, type CompileResult, type CustomFormatter, type CustomPlaceholderExtractor, type CustomReplacer, DefaultPlaceholderCellValue, type DrawingInfo, ExprResolver, type ExtensionOptions, type ExtractMacroArgs, type FilterMacroResult, type FullOptions, type MacroArgs, type MacroUnitHelper, type OutputByType, type Placeholder, type PlaceholderCellValue, type QueryFunction, type Range, type Ref, type RelsInfo, RuleMapOptions, type RuleOptions, type RuleResult, RuleToken, type SheetInfo, type TableInfo, TokenParserManger, Workbook, type WorkbookOptions, autoRegisterAlias, columnLetterToNumber, columnNumberToLetter, commandExtendQuery, compileRuleSheetName, compileWorkSheet, compileWorkSheetPlaceholder, defaultExtractPlaceholders, defaultFormatters, defaultValueDotGet, generateCommandsXlsxTemplate, generateCommandsXlsxTemplateWithCompile, generateXlsxTemplate, getCommands, getTokenParser, hasGeneratorToken, isRuleToken, isUrl, loadCompileSheets, loadWorkbook, mergeMap, parseWorkSheetRules, registerTokenParser, registerTokenParserMust, resolveArgument, scanCellSetPlaceholder, toArrayBuffer, valueDotGet, workSheetSetPlaceholder };
+export { AddCommand, AddCommandMust, type AfterReplaceHook, type Argument, ArgumentData, ArgumentValue, ArgumentValueLoader, type AutoOptions, type BeforeReplaceHook, BufferType, type CellPosition, type CmdFunction, CompileContext, type CompileResult, type CustomFormatter, type CustomPlaceholderExtractor, type CustomReplacer, DefaultPlaceholderCellValue, type DrawingInfo, ExprResolver, type ExtensionOptions, type ExtractMacroArgs, type FilterMacroResult, type FullOptions, type MacroArgs, type MacroUnitHelper, type OutputByType, type Placeholder, type PlaceholderCellValue, type QueryFunction, type Range, type Ref, type RelsInfo, RuleMapOptions, type RuleOptions, type RuleResult, RuleToken, type SheetInfo, type TableInfo, TokenParserManger, Workbook, type WorkbookOptions, autoRegisterAlias, columnLetterToNumber, columnNumberToLetter, commandExtendQuery, compileRuleSheetName, compileWorkSheet, compileWorkSheetPlaceholder, defaultExtractPlaceholders, defaultFormatters, defaultValueDotGet, generateCommandsXlsxTemplate, generateCommandsXlsxTemplateWithCompile, generateXlsxTemplate, getCommands, getTokenParser, hasGeneratorToken, isRuleToken, isUrl, loadCompileSheets, loadWorkbook, mergeMap, parseWorkSheetRules, registerTokenParser, registerTokenParserMust, resolveArgument, scanCellSetPlaceholder, toArrayBuffer, toCellValue, valueDotGet, workSheetSetPlaceholder };

package/dist/index.js

@@ -71,6 +71,7 @@ __export(index_exports, {
   resolveArgument: () => resolveArgument,
   scanCellSetPlaceholder: () => scanCellSetPlaceholder,
   toArrayBuffer: () => toArrayBuffer,
+  toCellValue: () => toCellValue,
   valueDotGet: () => valueDotGet,
   workSheetSetPlaceholder: () => workSheetSetPlaceholder
 });
@@ -3076,11 +3077,11 @@ var extractMacro = function(expr, options) {
   return extracResult;
 };
 var __codeKey = (str) => {
-  const replaces = [` `, `-`, `/`, `,`, `'`, `&`, `.`, `(`, `)`, `{`, `}`, `@`, `\\`, `[`, `]`, `#`, `:`];
-  for (const k in replaces) {
-    str = str.replace(k, "_").trim();
+  const replaces = [" ", `-`, `/`, `,`, `'`, `&`, `.`, `(`, `)`, `{`, `}`, `@`, `\\`, `[`, `]`, `#`, `:`];
+  for (const k of replaces) {
+    str = str.replaceAll(k, "_").trim();
     if (str.indexOf("__") >= 0) {
-      str = str.replace("__", "_");
+      str = str.replaceAll("__", "_");
     }
   }
   if (str.startsWith("_")) {
@@ -3129,6 +3130,29 @@ var toCellRow = (rowVals, setup) => {
 var toCellColumn = (columnVals, setup) => {
   return toCellRow(columnVals, setup);
 };
+var toCellValue = (value) => {
+  if (typeof value !== "string") {
+    const rText = value;
+    if (rText !== void 0 && rText.richText !== void 0 && rText.richText.length > 0) {
+      const values = [];
+      for (const [_, v] of rText.richText.entries()) {
+        if (v === void 0 || v === null) {
+          continue;
+        }
+        const text = v.text !== void 0 && v.text !== null ? v.text : void 0;
+        if (text !== void 0 && text !== "" && text !== "[object]") {
+          values.push(text.trim());
+        }
+      }
+      return values.join(" ");
+    }
+    const hText = value;
+    if (hText !== void 0 && hText.text !== null && hText.hyperlink !== null) {
+      return `[${hText.text}](${hText.hyperlink})`;
+    }
+  }
+  return value.toString();
+};
 var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, totalCells) => {
   if (macroTokens2 === void 0 || macroTokens2.length <= 0) {
     return macroExpr;
@@ -3185,8 +3209,9 @@ var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, t
             if (cellValue === void 0 || cellValue.value === null) {
               return;
             }
-            const value = execMacroFormat(cellValue.value.toString(), formatter);
-            parts.push(value);
+            const value = toCellValue(cellValue.value);
+            let exprValue2 = execMacroFormat(value, formatter);
+            parts.push(exprValue2);
           });
         });
       }
@@ -4074,6 +4099,7 @@ var generateCommandsXlsxTemplateWithCompile = async function(data, values, compi
   resolveArgument,
   scanCellSetPlaceholder,
   toArrayBuffer,
+  toCellValue,
   valueDotGet,
   workSheetSetPlaceholder
 });