@vdhewei/xlsx-template-lib 1.3.1 → 1.3.3

package/dist/index.js

@@ -3076,14 +3076,20 @@ var extractMacro = function(expr, options) {
   return extracResult;
 };
 var __codeKey = (str) => {
-  let vs = str.trim().replace("-", "_").replace("/", "_").trim();
-  for (; vs.indexOf("__") >= 0; ) {
-    vs = vs.replace("__", "_");
+  const replaces = [` `, `-`, `/`, `,`, `'`, `&`, `.`, `(`, `)`, `{`, `}`, `@`, `\\`, `[`, `]`, `#`, `:`];
+  for (const k in replaces) {
+    str = str.replace(k, "_").trim();
+    if (str.indexOf("__") >= 0) {
+      str = str.replace("__", "_");
+    }
+  }
+  if (str.startsWith("_")) {
+    str = str.substring(1);
   }
-  for (; vs.indexOf(" ") >= 0; ) {
-    vs = vs.replace(" ", "");
+  if (str.endsWith("_")) {
+    str = str.substring(0, str.length - 1);
   }
-  return vs.trim().toUpperCase();
+  return str.toUpperCase();
 };
 var __numberKey = (str) => {
   return Number.parseInt(str, 10).toString();
@@ -3513,21 +3519,26 @@ var compileRowCells = function(ctx, expr, cellPoints, rowIndex, errs) {
     return;
   }
   ctx.currentExpr = expr;
-  cellPoints.forEach((cellPoint, index) => {
-    const r = cellPoint.Row;
-    const sheet = ctx.sheet;
-    const c = cellPoint.Column;
-    const cell = sheet.findCell(r, c);
-    if (cell === void 0 || cell.value !== void 0 && cell.value !== null && cell.value !== "") {
-      return;
-    }
-    let templateValue = String(expr.value);
-    const macroTokens2 = getMacroTokens(expr);
-    templateValue = resolveFunctionExpr(ctx, templateValue, expr);
-    templateValue = resolveCompileMacroExpr(ctx, templateValue, macroTokens2, index, cellPoints.length);
-    templateValue = resolveAliasExpr(ctx, templateValue, index);
-    cell.value = resolveValueExpr(ctx, templateValue);
-  });
+  try {
+    cellPoints.forEach((cellPoint, index) => {
+      const r = cellPoint.Row;
+      const sheet = ctx.sheet;
+      const c = cellPoint.Column;
+      const cell = sheet.findCell(r, c);
+      if (cell === void 0 || cell.value !== void 0 && cell.value !== null && cell.value !== "") {
+        return;
+      }
+      let templateValue = String(expr.value);
+      const macroTokens2 = getMacroTokens(expr);
+      templateValue = resolveFunctionExpr(ctx, templateValue, expr);
+      templateValue = resolveCompileMacroExpr(ctx, templateValue, macroTokens2, index, cellPoints.length);
+      templateValue = resolveAliasExpr(ctx, templateValue, index);
+      cell.value = resolveValueExpr(ctx, templateValue);
+    });
+  } catch (err) {
+    const msg = err.message;
+    throw new Error(`expr:${expr.express}, resolve error: ${msg}`);
+  }
 };
 var generateWorkSheetCellsPlaceholder = function(ctx, expr, sheet) {
   const errs = [];