Merge pull request #29 from Sellsuki/dev

Dev

Author: boom-sellsuki

.eslintignore

@@ -0,0 +1,37 @@
+// eslint.config.js
+import js from "@eslint/js";
+import promise from "eslint-plugin-promise";
+import standard from "eslint-plugin-standard";
+
+export default [
+  {
+    ignores: ["build/**/*.js", "config/**/*.js", "lib/**/*.js"], // แทน .eslintignore
+  },
+  {
+    files: ["**/*.js"],
+    languageOptions: {
+      ecmaVersion: "latest",  // รองรับ ECMAScript รุ่นล่าสุด
+      sourceType: "module",   // ใช้ ES Modules
+      globals: {
+        angular: "readonly",  // กำหนด angular เป็น global
+      },
+    },
+    plugins: {
+      promise,
+      standard,
+    },
+    rules: {
+      ...js.configs.recommended.rules, // ใช้กฎพื้นฐานจาก ESLint
+      ...promise.configs.recommended.rules, // รวมกฎจาก plugin promise
+      "no-console": "off", // เตือนเมื่อใช้ console.log
+      "no-unused-vars": "off", // เตือนเมื่อมีตัวแปรที่ไม่ได้ใช้
+      "indent": ["error", 2], // เยื้อง 2 spaces
+      "quotes": ["error", "single"], // ใช้ single quotes
+      "semi": ["error", "never"], // ไม่ใช้ semicolon
+      "space-before-function-paren": ["error", "always"], // มี space ก่อนวงเล็บฟังก์ชัน
+      "array-callback-return": "off", // ปิดการตรวจสอบ return ใน array method
+      "no-undef": "off", // ปิดการแจ้งเตือน undefined (ใช้กับ require และ exports)
+      "prefer-const": "off", // เตือนหากตัวแปรควรใช้ const
+    },
+  },
+];

.eslintrc.js

@@ -1,27 +1,25 @@
-'use strict';
+"use strict";
 
 (function (angular) {
   'use strict';
 
   var utilAddress = require('./util/splitAddress');
   /**
-   * From jquery.Thailand.js line 38 - 100
-   */
+  * From jquery.Thailand.js line 38 - 100
+  */
   var preprocess = function preprocess(data) {
     var lookup = [];
     var words = [];
     var expanded = [];
     var useLookup = false;
-    var t = void 0;
-
+    var t;
     if (data.lookup && data.words) {
       // compact with dictionary and lookup
       useLookup = true;
       lookup = data.lookup.split('|');
       words = data.words.split('|');
       data = data.data;
     }
-
     t = function t(text) {
       function repl(m) {
         var ch = m.charCodeAt(0);
@@ -35,7 +33,6 @@
       }
       return text.replace(/[A-Z]/ig, repl);
     };
-
     if (!data[0].length) {
       // non-compacted database
       return data;
@@ -48,7 +45,6 @@
         // geographic database
         i = 2;
       }
-
       provinces[i].map(function (amphoes) {
         amphoes[i].map(function (districts) {
           districts[i] = districts[i] instanceof Array ? districts[i] : [districts[i]];
@@ -72,9 +68,7 @@
     });
     return expanded;
   };
-
   var db = preprocess(require('../database/db.json'));
-
   var resolveResultbyField = function resolveResultbyField(type, searchStr, maxResult) {
     searchStr = searchStr.toString().trim();
     if (searchStr === '') {
@@ -94,7 +88,6 @@
     }
     return possibles;
   };
-
   var searchAddressByDistrict = function searchAddressByDistrict(searchStr, maxResult) {
     return resolveResultbyField('district', searchStr, maxResult);
   };
@@ -107,7 +100,6 @@
   var searchAddressByZipcode = function searchAddressByZipcode(searchStr, maxResult) {
     return resolveResultbyField('zipcode', searchStr, maxResult);
   };
-
   var splitAddress = function splitAddress(fullAddress) {
     var regex = /\s(\d{5})(\s|$)/gi;
     var regexResult = regex.exec(fullAddress);
@@ -129,13 +121,11 @@
     }
     return null;
   };
-
   exports.searchAddressByDistrict = searchAddressByDistrict;
   exports.searchAddressByAmphoe = searchAddressByAmphoe;
   exports.searchAddressByProvince = searchAddressByProvince;
   exports.searchAddressByZipcode = searchAddressByZipcode;
   exports.splitAddress = splitAddress;
-
   if (angular) {
     angular.module('thAddress', []).config(function ($provide) {
       $provide.value('thad', {

eslint.config.js

@@ -1,7 +1,6 @@
-'use strict';
+"use strict";
 
 var lib = require('../index.js');
-
 exports.prepareAddress = function (address, zip) {
   address = address.replace(zip, '');
   address = address.replace('Thailand', '');
@@ -20,7 +19,6 @@ exports.prepareAddress = function (address, zip) {
   address = address.replace(' กรุงเทพ ', ' กรุงเทพมหานคร ');
   return address;
 };
-
 exports.getBestResult = function (zip, address) {
   var searchResult = lib.searchAddressByZipcode(zip);
   searchResult.forEach(function (element, index) {
@@ -43,19 +41,18 @@ exports.getBestResult = function (zip, address) {
     return null;
   }
 };
-
 exports.cleanupAddress = function (address, result) {
-  var regexDistrict = new RegExp('\\s' + result.district, 'g');
+  var regexDistrict = new RegExp("\\s".concat(result.district), 'g');
   var findDistrict = regexDistrict.exec(address);
   if (findDistrict) {
     address = address.replace(findDistrict[0], '');
   }
-  var regexAmphoe = new RegExp('\\s' + result.amphoe + '|\u0E40\u0E21\u0E37\u0E2D\u0E07', 'g');
+  var regexAmphoe = new RegExp("\\s".concat(result.amphoe, "|\u0E40\u0E21\u0E37\u0E2D\u0E07"), 'g');
   var findAmphoe = regexAmphoe.exec(address);
   if (findAmphoe) {
     address = address.replace(findAmphoe[0], '');
   }
-  var regexProvince = new RegExp('\\s' + result.province, 'g');
+  var regexProvince = new RegExp("\\s".concat(result.province), 'g');
   var findProvince = regexProvince.exec(address);
   if (findProvince) {
     address = address.replace(findProvince[0], '');