@nethru/ui 2.1.15 → 2.1.16

package/base/editor/Editor.js

@@ -23,6 +23,7 @@ export default function Editor({
   basicSetup,
   keymap = [],
   eslintRules,
+  customVariables = [],
   extensions = [],
   format = 'javascript',
   keyword,
@@ -145,9 +146,12 @@ export default function Editor({
     }
   }, [format]);
   const eslintLinter = useMemo(() => {
+    const regex = /\{\{(\S+)\}\}/g;
     return format === 'javascript' ? linter(view => {
       const text = view.state.doc.toString();
       const linter = new Linter();
+      let replaced = text;
+      let hints = [];
       const config = {
         rules: {
           "func-names": "off",
@@ -155,18 +159,35 @@ export default function Editor({
           ...eslintRules
         }
       };
-      const hints = linter.verify(text, config).map(hint => ({
-        line: hint.line,
-        column: hint.column,
-        from: view.state.doc.line(hint.line).from + hint.column - 1,
-        to: view.state.doc.line(hint.line).from + hint.column - 1 + (linter.getSourceCode()?.length || 0),
-        severity: hint.severity === 2 ? "error" : "warning",
-        message: hint.message
-      }));
+      if (customVariables.length > 0) {
+        let match;
+        while ((match = regex.exec(text)) !== null) {
+          if (!customVariables.includes(match[1])) {
+            hints.push({
+              from: match.index + 2,
+              to: match.index + 2,
+              severity: 'error',
+              message: `${match[1]}는 정의된 변수가 아닙니다.`
+            });
+            break;
+          }
+        }
+        replaced = text.replace(regex, () => `''`);
+      }
+      if (hints.length === 0) {
+        hints = linter.verify(replaced, config).map(hint => ({
+          line: hint.line,
+          column: hint.column,
+          from: view.state.doc.line(hint.line).from + hint.column - 1,
+          to: view.state.doc.line(hint.line).from + hint.column - 1 + (linter.getSourceCode()?.length || 0),
+          severity: hint.severity === 2 ? "error" : "warning",
+          message: hint.message
+        }));
+      }
       if (onEslintUpdate) onEslintUpdate(hints);
       return hints;
     }) : undefined;
-  }, [format, eslintRules, onEslintUpdate]);
+  }, [format, eslintRules, onEslintUpdate, customVariables]);
   const keymapExtension = useMemo(() => {
     return [keyMapper.of(keymap), keyMapper.of(defaultKeymap)];
   }, [keymap]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nethru/ui",
-  "version": "2.1.15",
+  "version": "2.1.16",
   "main": "base/index.js",
   "files": [
     "/base"
@@ -26,7 +26,7 @@
     "dayjs": "^1.11.13",
     "days": "^1.1.1",
     "eslint-browser": "^3.8.1",
-    "eslint-linter-browserify": "^9.17.0",
+    "eslint-linter-browserify": "^8.20.0",
     "eslint-utils": "^3.0.0",
     "eslint4b": "^7.32.0",
     "immer": "^10.0.3",