@vdhewei/xlsx-template-lib 1.4.2 → 1.4.3

package/dist/bin.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   ExprResolver
-} from "./chunk-XYVHFW4V.mjs";
+} from "./chunk-2UQSPJKC.mjs";
 
 // src/bin.ts
 import chalk from "chalk";

package/dist/{chunk-XYVHFW4V.mjs → chunk-2UQSPJKC.mjs}

@@ -2997,7 +2997,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();
@@ -3013,12 +3013,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 "";
@@ -3029,11 +3032,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) {
@@ -3131,7 +3134,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);
           });
         });
@@ -3159,6 +3162,8 @@ var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, t
       exprValue = resolveCompileMacroGen(ctx, macroCurrent, currentCellIndex);
     }
     macroExpr = exprValue;
+  } else {
+    macroExpr = resolveAliasExpr(ctx, macroExpr, currentCellIndex);
   }
   return macroExpr;
 };
@@ -4024,4 +4029,4 @@ export {
   autoRegisterAlias,
   generateCommandsXlsxTemplateWithCompile
 };
-//# sourceMappingURL=chunk-XYVHFW4V.mjs.map
+//# sourceMappingURL=chunk-2UQSPJKC.mjs.map