@nethru/ui 1.0.80 → 1.0.82

package/dist/colors/blue.js

@@ -0,0 +1,13 @@
+const blue = {
+  50: 'rgba(54,115,237,0.1)',
+  100: 'rgba(54,115,237,0.2)',
+  200: 'rgba(54,115,237,0.4)',
+  300: 'rgba(54,115,237,0.6)',
+  400: 'rgba(54,115,237,0.8)',
+  500: '#3673ed',
+  600: '#3169d8',
+  700: '#2652a8',
+  800: '#1e3f82',
+  900: '#173064'
+};
+export default blue;

package/dist/colors/blueGrey.js

@@ -0,0 +1,6 @@
+const blueGrey = {
+  contentBg: '#fcfcfd',
+  cnbBg: '#f4f5f5',
+  frameBg: '#ecedee'
+};
+export default blueGrey;

package/dist/colors/green.js

@@ -0,0 +1,13 @@
+const green = {
+  50: '#e9f8f1',
+  100: '#bae8d5',
+  200: '#98ddc0',
+  300: '#6acda3',
+  400: '#4dc391',
+  500: '#20b476',
+  600: '#1da46b',
+  700: '#178054',
+  800: '#126341',
+  900: '#0d4c32'
+};
+export default green;

package/dist/colors/grey.js

@@ -0,0 +1,18 @@
+const grey = {
+  5: 'rgba(51,51,51,0.05)',
+  7: 'rgba(51,51,51,0.07)',
+  10: 'rgba(51,51,51,0.1)',
+  20: 'rgba(51,51,51,0.2)',
+  50: '#f9f9f9',
+  100: '#efefef',
+  150: '#ebebeb',
+  200: '#e0e0e0',
+  300: '#c7c7c7',
+  400: '#b9b9b9',
+  500: '#9d9d9d',
+  600: '#7b7b7b',
+  700: '#656565',
+  800: '#4e4e4e',
+  900: '#333'
+};
+export default grey;

package/dist/colors/index.js

@@ -0,0 +1,9 @@
+export { default as blue } from './blue';
+export { default as blueGrey } from './blueGrey';
+export { default as green } from './green';
+export { default as grey } from './grey';
+export { default as lime } from './lime';
+export { default as orange } from './orange';
+export { default as purple } from './purple';
+export { default as red } from './red';
+export { default as yellow } from './yellow';

package/dist/colors/lime.js

@@ -0,0 +1,13 @@
+const lime = {
+  50: '#f5fce6',
+  100: '#def4b0',
+  200: '#cfef8a',
+  300: '#b9e854',
+  400: '#abe333',
+  500: '#96dc00',
+  600: '#89c800',
+  700: '#6b9c00',
+  800: '#537900',
+  900: '#3f5c00'
+};
+export default lime;

package/dist/colors/orange.js

@@ -0,0 +1,13 @@
+const orange = {
+  50: '#fff0ea',
+  100: '#ffd1bd',
+  200: '#ffba9d',
+  300: '#ff9b71',
+  400: '#ff8855',
+  500: '#ff6a2b',
+  600: '#e86027',
+  700: '#b54b1f',
+  800: '#8c3a18',
+  900: '#6b2d12'
+};
+export default orange;

package/dist/colors/purple.js

@@ -0,0 +1,13 @@
+const purple = {
+  50: 'rgba(149,77,241,0.1)',
+  100: 'rgba(149,77,241,0.2)',
+  200: 'rgba(149,77,241,0.4)',
+  300: 'rgba(149,77,241,0.6)',
+  400: 'rgba(149,77,241,0.8)',
+  500: '#954df1',
+  600: '#8846db',
+  700: '#6a37ab',
+  800: '#522a85',
+  900: '#3f2065'
+};
+export default purple;

package/dist/colors/red.js

@@ -0,0 +1,13 @@
+const red = {
+  50: '#fde7ed',
+  100: '#fab6c6',
+  200: '#f892ab',
+  300: '#f46184',
+  400: '#f2426d',
+  500: '#ef1348',
+  600: '#d91142',
+  700: '#aa0d33',
+  800: '#830a28',
+  900: '#64081e'
+};
+export default red;

package/dist/colors/yellow.js

@@ -0,0 +1,13 @@
+const yellow = {
+  50: '#fff6e7',
+  100: '#fde4b4',
+  200: '#fdd78f',
+  300: '#fcc55c',
+  400: '#fbba3d',
+  500: '#faa90c',
+  600: '#e49a0b',
+  700: '#b27809',
+  800: '#8a5d07',
+  900: '#694705'
+};
+export default yellow;

package/dist/editor/nScript.js

@@ -2,30 +2,51 @@
 import { LanguageSupport, StreamLanguage, syntaxTree } from "@codemirror/language";
 import { nScriptKeywords } from "./nScriptKeywords";
 
-// 현재 코드에서 사용하는 이름: 테마 스타일(색상)이름
+// 토큰 타입별 스타일 색상명
 var color = {
   comment: "comment",
   number: "number",
   string: "string",
+  property: "atom",
+  // 곤색 - API 변수 (true, false, 속성)
+  function: "keyword",
+  // 자색 - API 함수 (while, foreach, map, find)
   keyword: "keyword",
-  // 스크립트 변수
-  variable: "attributeValue",
-  // API 변수(속성)
-  function: "propertyName",
-  // API 함수
-  customer: "variableName",
-  // 고객사 변수 (읽기 전용)
-  operator: "squareBracket",
-  // 일반 연산자
-  punctuation: "punctuation" // 범위 관련 연산자
+  // 자색 - 디폴트 API (if, else)
+  variable: "variable",
+  // 흑색 - 스크립트 변수
+  tagging: "def",
+  // 청색 - 태깅 변수
+  namespace: "meta",
+  // 회색 - 고객사 네임스페이스 경로, 별칭
+  customer: "tagName",
+  // 녹색 - 고객사 변수
+  operator: "operator",
+  // 흑색 - 일반 연산자
+  punctuation: "bracket",
+  // 흑색 - 범위 관련 연산자
+  error: "error" // 적색 - 찾을 수 없는 API
 };
 
 // 기본 키워드
 var defaultKeywords = ["if", "else"];
+
+// 난독화 전처리기 지시문
+var preprocessorKeywords = [{
+  k: "using",
+  t: "(String)"
+}, {
+  k: "as",
+  t: "(String)"
+}, {
+  k: "obfuscationLog",
+  t: "-> String"
+}];
 var operators = "+-/*%=|&<>~^?!";
 var punc = ":;,.(){}[]";
 var regexName = /^[a-zA-Z_]\w*/;
-var regexColon = /[\s:]+/;
+var regexPath = /^['"][a-zA-Z_][\w.$]*['"]/;
+var regexColon = /^\s*:\s*/;
 
 // 기본 토큰 처리기
 function tokenBase(stream, state, prev) {
@@ -48,35 +69,42 @@ function tokenBase(stream, state, prev) {
     stream.match(/^\d+/);
     return color.number;
   }
+  // 태깅 변수
+  if (ch == '{') {
+    if (stream.match("{{")) {
+      state.tokenize.push(tokenTaggingVariable);
+      return color.punctuation;
+    }
+  }
   // 스크립트 변수
   if (ch == '@' || ch == '#') {
     stream.next();
-    stream.match(regexName);
-    stream.match(regexColon);
-    stream.match(regexName);
-    return color.variable;
+    let puncColor = color.variable;
+    state.tokenize.push(tokenVariable('c', false, color.variable, puncColor));
+    return puncColor;
   }
   // 테이블 변수
   if (ch == '`') {
     stream.next();
-    stream.match(regexName);
-    return color.variable;
+    let puncColor = color.variable;
+    state.tokenize.push(tokenVariable('v', false, color.variable, puncColor));
+    return puncColor;
   }
   // 고객사 변수
   if (ch == '$') {
     stream.next();
-    stream.match(regexName);
-    stream.match(regexColon);
-    stream.match(regexName);
-    return color.customer;
+    let puncColor = color.customer;
+    state.tokenize.push(tokenVariable('c', true, color.customer, puncColor));
+    return puncColor;
   }
-  // 빠른 문자열 매개변수
+  // 빠른 매개변수
   if (ch == ':') {
     stream.next();
-    stream.eatSpace();
-    stream.match(regexName);
-    return color.string;
+    state.tokenize.push(tokenClass);
+    return color.punctuation;
   }
+  // 널 병합 연산자
+  if (stream.match("?:")) return color.operator;
   // 일반 연산자
   if (operators.indexOf(ch) > -1) {
     stream.next();
@@ -97,82 +125,134 @@ function tokenBase(stream, state, prev) {
   }
   // 예약어
   if (stream.match(regexName)) {
+    // 난독화 전처리기
     var ident = stream.current();
-    var api = nScriptKeywords.find(api => api.k === ident);
+    var pre = preprocessorKeywords.find(key => key.k === ident);
+    if (pre) {
+      if (pre.t.at(0) == '-') return color.property;
+      state.tokenize.push(tokenNamespace);
+      return color.customer;
+    }
+    // API (대소문자 구별 안 함)
+    var lower = stream.current().toLowerCase();
+    var api = nScriptKeywords.find(api => api.k.toLowerCase() === lower);
     if (api) {
-      if (api.t.at(0) == '-') return color.keyword;else return color.function;
+      if (api.t.at(0) == '-') return color.property;else return color.function;
     }
-    if (defaultKeywords.find(key => key === ident)) return color.keyword;
-    return null;
+    // 키워드
+    if (defaultKeywords.find(key => key === lower)) return color.keyword;
+    return color.error;
   }
   stream.next();
   return null;
 }
 
-// 문자열 템플릿 토큰 처리기
-function tokenUntilClosingParen() {
-  var depth = 0;
-  return function (stream, state, prev) {
-    var inner = tokenBase(stream, state, prev);
-    if (inner == color.punctuation) {
-      let cur = stream.current();
-      if (cur == "(" || cur == "{") {
-        // 소괄호 중괄호 모두 지원
-        ++depth;
-      } else if (cur == ")" || cur == "}") {
-        // 소괄호 중괄호 모두 지원
-        if (depth == 0) {
-          stream.backUp(1);
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length - 1](stream, state);
-        } else --depth;
-      }
+// 주석 토큰 처리기
+function tokenComment(stream, state) {
+  var ch;
+  while (ch = stream.next()) {
+    if (ch === "*" && stream.eat("/")) {
+      state.tokenize.pop();
+      break;
     }
-    return inner;
-  };
+  }
+  return color.comment;
 }
 
 // 문자열 토큰 처리기
 function tokenString(openQuote, stream, state) {
-  var singleLine = openQuote.length == 1;
   var ch,
     escaped = false;
   while (ch = stream.peek()) {
     if (escaped) {
       stream.next();
+      // 스위프트 방식 문자열 템플릿
       if (ch == "(" || ch == "{") {
-        // 소괄호 중괄호 모두 지원
         state.tokenize.push(tokenUntilClosingParen());
         return color.string;
       }
       escaped = false;
     } else if (stream.match(openQuote)) {
+      // 문자열 종료
       state.tokenize.pop();
       return color.string;
+    } else if (stream.match(/\$[\(\{]/)) {
+      // 코틀린 방식 문자열 템플릿
+      state.tokenize.push(tokenUntilClosingParen());
+      return color.string;
     } else {
       stream.next();
-      escaped = ch == "$"; // 코틀린 방식 문자열 템플릿
+      // 이스케이프 시퀀스
+      escaped = ch == "\\";
     }
   }
-
-  if (singleLine) {
-    state.tokenize.pop();
-  }
   return color.string;
 }
 
-// 주석 토큰 처리기
-function tokenComment(stream, state) {
-  var ch;
-  while (ch = stream.next()) {
-    if (ch === "/" && stream.eat("*")) {
-      state.tokenize.push(tokenComment);
-    } else if (ch === "*" && stream.eat("/")) {
+// 문자열 템플릿 토큰 처리기
+function tokenUntilClosingParen() {
+  var depth = 0;
+  return function (stream, state, prev) {
+    var inner = tokenBase(stream, state, prev);
+    if (inner == color.punctuation) {
+      let cur = stream.current();
+      if (cur == "(" || cur == "{" || cur == "[") {
+        ++depth;
+      } else if (cur == ")" || cur == "}" || cur == "]") {
+        if (depth == 0) {
+          stream.backUp(1);
+          state.tokenize.pop();
+          return state.tokenize[state.tokenize.length - 1](stream, state);
+        } else --depth;
+      }
+    }
+    return inner;
+  };
+}
+
+// 전처리기 토큰 처리기
+function tokenNamespace(stream, state) {
+  stream.match(/^\s*['"]?[\w.*/$]+['"]?\s*/);
+  state.tokenize.pop();
+  return color.namespace;
+}
+
+// 클래스 매개변수
+function tokenClass(stream, state) {
+  stream.eatSpace();
+  state.tokenize.pop();
+  if (stream.match(regexName) || stream.match(regexPath)) return color.string;else return color.punctuation;
+}
+
+// 모든 변수
+function tokenVariable(firstScope, usePath, nameColor, puncColor) {
+  var scope = firstScope;
+  return function (stream, state, prev) {
+    if (scope == 'c') {
+      stream.eatSpace();
+      stream.match(regexName) || usePath && stream.match(regexPath);
+      scope = ':';
+      return nameColor;
+    } else if (scope == ':') {
+      if (stream.match(regexColon)) scope = 'v';else state.tokenize.pop();
+      return puncColor;
+    } else {
+      stream.eatSpace();
+      stream.match(regexName) || usePath && stream.match(regexPath);
       state.tokenize.pop();
-      break;
+      return nameColor;
     }
+  };
+}
+
+// 태깅 변수 토큰 처리기
+function tokenTaggingVariable(stream, state) {
+  var ch = stream.next();
+  if (ch === "}" && stream.eat("}")) {
+    state.tokenize.pop();
+    return color.punctuation;
   }
-  return color.comment;
+  return color.tagging;
 }
 function Context(prev, align, indented) {
   this.prev = prev;
@@ -229,15 +309,31 @@ export const nScriptParser = {
         close: "*/"
       }
     },
-    //closeBrackets: {brackets: ["(", "[", "{", "'", '"', "`"]}
     closeBrackets: {
       brackets: ["(", "[", "{", "'", '"']
     }
   }
 };
 export const nScriptLanguage = StreamLanguage.define(nScriptParser);
+let nScriptOptions = [...nScriptKeywords.map(it => ({
+  label: it.k,
+  type: it.t.at(0) == '-' ? it.t.at(3) == 'c' ? "constant" : "variable" : "function",
+  detail: it.t,
+  info: it.i + "." + it.k + " " + it.t + " " + it.d,
+  boost: 1
+})), ...defaultKeywords.map(it => ({
+  label: it,
+  type: "keyword",
+  boost: 0
+})), ...preprocessorKeywords.map(it => ({
+  label: it.k,
+  type: it.t.at(0) == '-' ? "variable" : "keyword",
+  detial: it.t,
+  info: it.k + " " + it.t,
+  boost: 1
+}))];
 
-// nScript 자동 완성 메인 처리기
+// nScript 자동 완성 처리기
 function nScriptCompletion(context) {
   const {
     state,
@@ -245,27 +341,16 @@ function nScriptCompletion(context) {
   } = context;
   const nodeBefore = syntaxTree(state).resolveInner(pos, -1);
   const typeName = nodeBefore.type.name;
-  //console.log(typeName);
+
+  //console.log(nodeBefore, typeName);
 
   // 주석이나 문자열 등은 스킵
-  if (typeName === color.comment || typeName === color.string || typeName === color.variable || typeName === color.customer) return null;
+  if (typeName === color.comment || typeName === color.string || typeName === color.variable || typeName === "variableName" || typeName === "variableName.definition" || typeName === color.customer || typeName === color.namespace) return null;
   let word = context.matchBefore(/\w*/);
   if (word.from == word.to && !context.explicit) return null;
   return {
     from: word.from,
-    options: [...nScriptKeywords.map(it => ({
-      //section: it.i,
-      //displayLabel: it.i + "." + it.k,
-      label: it.k,
-      type: it.t.at(0) == '-' ? it.t.at(3) == 'c' ? "constant" : "variable" : "function",
-      detail: it.t,
-      info: it.i + "." + it.k + it.t + " " + it.d,
-      boost: 1
-    })), ...defaultKeywords.map(it => ({
-      label: it,
-      type: "keyword",
-      boost: 0
-    }))]
+    options: nScriptOptions
   };
 }
 export const nScriptExtension = nScriptLanguage.data.of({