@vdhewei/xlsx-template-lib 1.3.5 → 1.4.3

package/dist/index.d.mts

@@ -384,7 +384,7 @@ declare class TokenParserManger {
 }
 declare function columnLetterToNumber(letter: string): number;
 declare function columnNumberToLetter(num: number): string;
-type MacroUnitHelper = (v: string) => string;
+type MacroUnitHelper = (v: string, expr?: RuleValue) => 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 & {

package/dist/index.d.ts

@@ -384,7 +384,7 @@ declare class TokenParserManger {
 }
 declare function columnLetterToNumber(letter: string): number;
 declare function columnNumberToLetter(num: number): string;
-type MacroUnitHelper = (v: string) => string;
+type MacroUnitHelper = (v: string, expr?: RuleValue) => 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 & {

package/dist/index.js

@@ -3076,7 +3076,7 @@ var extractMacro = function(expr, options) {
   }
   return extracResult;
 };
-var __codeKey = (str) => {
+var __codeKey = (str, expr) => {
   const replaces = [" ", `-`, `/`, `,`, `'`, `&`, `.`, `(`, `)`, `{`, `}`, `@`, `\\`, `[`, `]`, `#`, `:`];
   for (const k of replaces) {
     str = str.replaceAll(k, "_").trim();
@@ -3092,12 +3092,15 @@ var __codeKey = (str) => {
   }
   return str.toUpperCase();
 };
-var __numberKey = (str) => {
+var __numberKey = (str, expr) => {
   return Number.parseInt(str, 10).toString();
 };
-var __codeAliasKey = (str) => {
+var __codeAliasKey = (str, expr) => {
   const key = __codeKey(str);
   if (key !== "") {
+    if (expr !== void 0 && expr.tokens.length > 0) {
+      expr.tokens.push("@" /* UseAliasToken */);
+    }
     return `${defaultRuleTokenMap.get("@" /* UseAliasToken */)}${key}`;
   }
   return "";
@@ -3108,11 +3111,11 @@ var macroFormatter = /* @__PURE__ */ new Map([
   [codeAliasKey, __codeAliasKey],
   [defaultKey, (v) => v]
 ]);
-var execMacroFormat = function(value, formatter) {
+var execMacroFormat = function(value, formatter, expr) {
   if (!macroFormatter.has(formatter)) {
     return value;
   }
-  return macroFormatter.get(formatter)(value);
+  return macroFormatter.get(formatter)(value, expr);
 };
 var toCellRow = (rowVals, setup) => {
   if (setup === void 0) {
@@ -3210,7 +3213,7 @@ var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, t
               return;
             }
             const value = toCellValue(cellValue.value);
-            let exprValue2 = execMacroFormat(value, formatter);
+            let exprValue2 = execMacroFormat(value, formatter, ctx.currentExpr || void 0);
             parts.push(exprValue2);
           });
         });
@@ -3238,6 +3241,8 @@ var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, t
       exprValue = resolveCompileMacroGen(ctx, macroCurrent, currentCellIndex);
     }
     macroExpr = exprValue;
+  } else {
+    macroExpr = resolveAliasExpr(ctx, macroExpr, currentCellIndex);
   }
   return macroExpr;
 };
@@ -3698,7 +3703,7 @@ var compileWorkSheet = async function(data, sheetName, options) {
 var fetchAlias = (m) => {
   let sv;
   const alias = /* @__PURE__ */ new Map();
-  if (!(m instanceof Map) && m.rules !== void 0) {
+  if (m !== void 0 && m !== null && !(m instanceof Map) && m?.rules !== void 0) {
     sv = m.rules;
   } else if (m instanceof Map) {
     if (m.size <= 0 || !m.has("alias" /* AliasToken */)) {