Merge 54466ef into 7b3c8ce

Keimeno · Aug 30, 2020 · 291c398 · 291c398
2 parents 7b3c8ce + 54466ef
commit 291c398
Show file tree

Hide file tree

Showing 82 changed files with 280 additions and 124 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,7 +13,8 @@ jobs:
     strategy:
       matrix:
         deno:
-          - { version: v1.2.0, name: v1.2.0 }
+          - { version: v0.34.0, name: v0.34.0 }
+          - { version: v1.0.0, name: v1.0.0 }
           - { version: vx, name: latest }
     name: Deno ${{ matrix.deno.name }} testing
     steps:

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 package-lock.json
-node_modules
+node_modules
+.vscode
diff --git a/deps.ts b/deps.ts
@@ -1,4 +1,4 @@
 export {
   assertEquals,
   assertThrows,
-} from 'https://deno.land/std@0.61.0/testing/asserts.ts';
+} from 'https://deno.land/std@0.34.0/testing/asserts.ts';
diff --git a/egg.json b/egg.json
@@ -1,7 +1,7 @@
 {
   "name": "segno",
   "description": "segno (Segnosaurus). Validation library for Deno. Enforcing a high security standard.",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "unlisted": false,
   "stable": true,
   "entry": "./mod.ts",

diff --git a/lib/helpers/alpha.ts b/lib/helpers/alpha.ts
@@ -26,7 +26,7 @@ export const alpha = {
   'ku-IQ': /^[ئابپتجچحخدرڕزژسشعغفڤقکگلڵمنوۆھەیێيطؤثآإأكضصةظذ]+$/i,
   ar: /^[ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/,
   he: /^[א-ת]+$/,
-  'fa-IR': /^['آابپتثجچهخدذرزژسشصضطظعغفقکگلمنوهی']+$/i,
+  fa: /^['آاءأؤئبپتثجچحخدذرزژسشصضطظعغفقکگلمنوهةی']+$/i,
 };
 
 export const alphanumeric = {
@@ -57,12 +57,13 @@ export const alphanumeric = {
   'vi-VN': /^[0-9A-ZÀÁẠẢÃÂẦẤẬẨẪĂẰẮẶẲẴĐÈÉẸẺẼÊỀẾỆỂỄÌÍỊỈĨÒÓỌỎÕÔỒỐỘỔỖƠỜỚỢỞỠÙÚỤỦŨƯỪỨỰỬỮỲÝỴỶỸ]+$/i,
   ar: /^[٠١٢٣٤٥٦٧٨٩0-9ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/,
   he: /^[0-9א-ת]+$/,
-  'fa-IR': /^['0-9آابپتثجچهخدذرزژسشصضطظعغفقکگلمنوهی۱۲۳۴۵۶۷۸۹۰']+$/i,
+  fa: /^['0-9آاءأؤئبپتثجچحخدذرزژسشصضطظعغفقکگلمنوهةی۱۲۳۴۵۶۷۸۹۰']+$/i,
 };
 
 export const decimal = {
   'en-US': '.',
   ar: '٫',
+  fa: '٫',
 };
 
 export const englishLocales = ['AU', 'GB', 'HK', 'IN', 'NZ', 'ZA', 'ZM'];
@@ -103,6 +104,15 @@ for (let locale, i = 0; i < arabicLocales.length; i++) {
   (decimal as any)[locale] = decimal.ar;
 }
 
+export const farsiLocales = ['IR', 'AF'];
+
+for (let locale, i = 0; i < farsiLocales.length; i++) {
+  locale = `fa-${farsiLocales[i]}`;
+  (alpha as any)[locale] = alpha.fa;
+  (alphanumeric as any)[locale] = alphanumeric.fa;
+  (decimal as any)[locale] = decimal.fa;
+}
+
 // Source: https://en.wikipedia.org/wiki/Decimal_mark
 export const dotDecimal = ['ar-EG', 'ar-LB', 'ar-LY'];
 export const commaDecimal = [

diff --git a/lib/validations/isAfter.ts b/lib/validations/isAfter.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { toDate } from '../helpers/toDate.ts';
 
 export const isAfter = (str: string, date = String(new Date())) => {

diff --git a/lib/validations/isAlpha.ts b/lib/validations/isAlpha.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { alpha } from '../helpers/alpha.ts';
 
 export const isAlpha = (str: string, locale = 'en-US') => {

diff --git a/lib/validations/isAlphanumeric.ts b/lib/validations/isAlphanumeric.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { alphanumeric } from '../helpers/alpha.ts';
 
 export const isAlphanumeric = (str: string, locale = 'en-US') => {

diff --git a/lib/validations/isAscii.ts b/lib/validations/isAscii.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isBIC.ts b/lib/validations/isBIC.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isBase32.ts b/lib/validations/isBase32.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isBase64.ts b/lib/validations/isBase64.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isBefore.ts b/lib/validations/isBefore.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { toDate } from '../helpers/toDate.ts';
 
 export const isBefore = (str: string, date = String(new Date())) => {

diff --git a/lib/validations/isBoolean.ts b/lib/validations/isBoolean.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 export const isBoolean = (str: string) => {

diff --git a/lib/validations/isBtcAddress.ts b/lib/validations/isBtcAddress.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 // supports Bech32 addresses

diff --git a/lib/validations/isByteLength.ts b/lib/validations/isByteLength.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 type ByteLengthOptions = {

diff --git a/lib/validations/isCreditCard.ts b/lib/validations/isCreditCard.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isCurrency.ts b/lib/validations/isCurrency.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 type CurrencyOptions = {

diff --git a/lib/validations/isDataURI.ts b/lib/validations/isDataURI.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isDecimal.ts b/lib/validations/isDecimal.ts
@@ -1,8 +1,8 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { decimal } from '../helpers/alpha.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { includes } from '../helpers/includes.ts';
 
 type DecimalOptions = {

diff --git a/lib/validations/isDivisibleBy.ts b/lib/validations/isDivisibleBy.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { toFloat } from '../helpers/toFloat.ts';
 
 export const isDivisibleBy = (str: string, num: string) => {

diff --git a/lib/validations/isEAN.ts b/lib/validations/isEAN.ts
@@ -8,7 +8,7 @@
  * Reference: https://en.wikipedia.org/wiki/International_Article_Number
  */
 
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isEmail.ts b/lib/validations/isEmail.ts
@@ -1,10 +1,10 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { isByteLength } from './isByteLength.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { isFQDN } from './isFQDN.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { isIP } from './isIP.ts';
 
 type EmailOptions = {

diff --git a/lib/validations/isEmpty.ts b/lib/validations/isEmpty.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 type EmptyOptions = {

diff --git a/lib/validations/isEthereumAddress.ts b/lib/validations/isEthereumAddress.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isFQDN.ts b/lib/validations/isFQDN.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 type FQDNOptions = {

diff --git a/lib/validations/isFloat.ts b/lib/validations/isFloat.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { decimal } from '../helpers/alpha.ts';
 
 type FloatOptions = {

diff --git a/lib/validations/isFullWidth.ts b/lib/validations/isFullWidth.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 export const fullWidth = /[^\u0020-\u007E\uFF61-\uFF9F\uFFA0-\uFFDC\uFFE8-\uFFEE0-9a-zA-Z]/;

diff --git a/lib/validations/isHalfWidth.ts b/lib/validations/isHalfWidth.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 export const halfWidth = /[\u0020-\u007E\uFF61-\uFF9F\uFFA0-\uFFDC\uFFE8-\uFFEE0-9a-zA-Z]/;

diff --git a/lib/validations/isHash.ts b/lib/validations/isHash.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 type Algorithm =

diff --git a/lib/validations/isHexColor.ts b/lib/validations/isHexColor.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isHexadecimal.ts b/lib/validations/isHexadecimal.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isHsl.ts b/lib/validations/isHsl.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isIBAN.ts b/lib/validations/isIBAN.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**
@@ -135,17 +135,17 @@ const hasValidIbanChecksum = (str: string) => {
   const rearranged = strippedStr.slice(4) + strippedStr.slice(0, 4);
   const alphaCapsReplacedWithDigits = rearranged.replace(
     /[A-Z]/g,
-    // @ts-ignore
+    // @ts-ignore allowing typedoc to build
     (char) => char.charCodeAt(0) - 55
   );
 
-  // @ts-ignore
+  // @ts-ignore allowing typedoc to build
   const remainder = alphaCapsReplacedWithDigits
     .match(/\d{1,7}/g)
-    // @ts-ignore
+    // @ts-ignore allowing typedoc to build
     .reduce((acc, value) => Number(acc + value) % 97, '');
 
-  // @ts-ignore
+  // @ts-ignore allowing typedoc to build
   return remainder === 1;
 };
 

diff --git a/lib/validations/isIMEI.ts b/lib/validations/isIMEI.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isIP.ts b/lib/validations/isIP.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isIPRange.ts b/lib/validations/isIPRange.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { isIP } from './isIP.ts';
 
 /**

diff --git a/lib/validations/isISBN.ts b/lib/validations/isISBN.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**

diff --git a/lib/validations/isISIN.ts b/lib/validations/isISIN.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**
@@ -13,7 +13,7 @@ export const isISIN = (str: string) => {
   }
 
   const checksumStr = str.replace(/[A-Z]/g, (character) =>
-    // @ts-ignore
+    // @ts-ignore allowing typedoc to build
     parseInt(character, 36)
   );
 

diff --git a/lib/validations/isISO31661Alpha2.ts b/lib/validations/isISO31661Alpha2.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { includes } from '../helpers/includes.ts';
 
 // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2

diff --git a/lib/validations/isISO31661Alpha3.ts b/lib/validations/isISO31661Alpha3.ts
@@ -1,6 +1,6 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { includes } from '../helpers/includes.ts';
 
 // from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3

diff --git a/lib/validations/isISO8601.ts b/lib/validations/isISO8601.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 // from http://goo.gl/0ejHHW
@@ -25,7 +25,7 @@ const isValidDate = (str: string) => {
     return oDay <= 365;
   }
 
-  // @ts-ignore
+  // @ts-ignore allowing typedoc to build
   const match = str.match(/(\d{4})-?(\d{0,2})-?(\d*)/).map(Number);
   const year = match[1];
   const month = match[2];

diff --git a/lib/validations/isISRC.ts b/lib/validations/isISRC.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 // see http://isrc.ifpi.org/en/isrc-standard/code-syntax

diff --git a/lib/validations/isISSN.ts b/lib/validations/isISSN.ts
@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-ignore allowing typedoc to build
 import { assertString } from '../helpers/assertString.ts';
 
 /**