fix: normalize url in fixUrl

fardad-dev · fardad-dev · commit 0113cb24eb21 · 2022-02-24T14:05:36.000+03:30
diff --git a/README.md b/README.md
@@ -86,16 +86,16 @@ starkString("345")
 
 ### 6) Decode Percent-encoding Characters in URLs
 
-Used to convert unreadable Persian characters in URL to readable characters.
+Used to normalize url
 
 Example:
 
 ```javascript
 starkString(
-  "https://fa.wikipedia.org/wiki/%D8%B5%D9%81%D8%AD%D9%87%D9%94_%D8%A7%D8%B5%D9%84%DB%8C",
+  "fa.wikipedia.org/wiki/%D8%B5%D9%81%D8%AD%D9%87%D9%94_%D8%A7%D8%B5%D9%84%DB%8C",
 )
   .fixURL()
-  .toString(); //returns https://fa.wikipedia.org/wiki/صفحهٔ_اصلی
+  .toString(); //returns http://fa.wikipedia.org/wiki/%D8%B5%D9%81%D8%AD%D9%87%D9%94_%D8%A7%D8%B5%D9%84%DB%8C/
 ```
 
 ---
diff --git a/babel.config.js b/babel.config.js
diff --git a/jest.config.js b/jest.config.js
diff --git a/package.json b/package.json
@@ -41,11 +41,12 @@
         "prettier": "^2.3.2",
         "prettier-plugin-jsdoc": "^0.3.23",
         "ts-jest": "25.5.1",
+        "react-scripts": "^5.0.0",
         "typescript": "^4.3.5"
     },
     "scripts": {
-        "prepare": "yarn build",
+        "release": "yarn test && yarn build && yarn publish",
         "build": "tsc",
-        "test": "yarn build && jest"
+        "test": "react-scripts test"
     }
-}
+}
diff --git a/src/__tests__/convert.test.js b/src/__tests__/convert.test.js
@@ -1,5 +1,5 @@
 //Prepare test
-import starkString from "./../lib";
+import starkString from "./../";
 
 //persian char
 test("should change Arabic characters to Persian", () => {
diff --git a/src/__tests__/decodeURL.test.js b/src/__tests__/decodeURL.test.js
@@ -1,6 +1,4 @@
-//Prepare test
-
-import starkString from "./../lib";
+import starkString from "../";
 
 test("should decode unreadable characters to correct Persian characters", () => {
   expect(
diff --git a/src/__tests__/digitsToWords.test.js b/src/__tests__/digitsToWords.test.js
@@ -1,5 +1,5 @@
 //Prepare test
-import starkString from "./../lib";
+import starkString from "./../";
 
 test("should convert numbers to Persian words", () => {
   expect(starkString("999999999999").digitsToWords().toString()).toBe(
diff --git a/src/__tests__/errors.test.js b/src/__tests__/errors.test.js
@@ -1,14 +1,14 @@
 //Prepare test
-import starkString from "./../lib";
+import starkString from "./../";
 
 test("should throw error", () => {
   expect(() => starkString({})).toThrowError(Error);
 });
 
-test("should throw error", () => {
+test("should throw error array with symbol", () => {
   expect(() => starkString(["", "1", Symbol()])).toThrowError(Error);
 });
 
-test("should throw error", () => {
+test("should throw error empty function", () => {
   expect(() => starkString(() => {})).toThrowError(Error);
 });
diff --git a/src/__tests__/fixUrl.test.js b/src/__tests__/fixUrl.test.js
@@ -0,0 +1,68 @@
+//Prepare test
+
+import starkString from "../";
+
+test("should decode unreadable characters to correct Persian characters", () => {
+  expect(
+    starkString(
+      "https://fa.wikipedia.org/wiki/%D8%B5%D9%81%D8%AD%D9%87%D9%94_%D8%A7%D8%B5%D9%84%DB%8C",
+    )
+      .decodeURL()
+      .toString(),
+  ).toBe("https://fa.wikipedia.org/wiki/صفحهٔ_اصلی");
+});
+
+describe("fix url", () => {
+  test("fix url", () => {
+    expect(starkString("fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "http://fa.wikipedia.org/wiki/",
+    );
+
+    expect(
+      starkString("https://fa.wikipedia.org/wiki/").fixURL().toString(),
+    ).toBe("https://fa.wikipedia.org/wiki/");
+
+    expect(
+      starkString(
+        "http://fa.wikipedia.org/wiki/%D8%B5%D9%81%D8%AD%D9%87%D9%94_%D8%A7%D8%B5%D9%84%DB%8C",
+      )
+        .fixURL()
+        .toString(),
+    ).toBe(
+      "http://fa.wikipedia.org/wiki/%D8%B5%D9%81%D8%AD%D9%87%D9%94_%D8%A7%D8%B5%D9%84%DB%8C/",
+    );
+  });
+
+  test("fix web socket or file url", () => {
+    expect(starkString("wss://fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "wss://fa.wikipedia.org/wiki/",
+    );
+
+    expect(starkString("ftp://fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "ftp://fa.wikipedia.org/wiki/",
+    );
+  });
+
+  test("dirty url", () => {
+    expect(starkString("://fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "http://fa.wikipedia.org/wiki/",
+    );
+    expect(starkString("/fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "http://fa.wikipedia.org/wiki/",
+    );
+    expect(starkString("/////fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "http://fa.wikipedia.org/wiki/",
+    );
+    expect(starkString("http:fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "http://fa.wikipedia.org/wiki/",
+    );
+
+    expect(
+      starkString("http:::fa.wikipedia.org/wiki").fixURL().toString(),
+    ).toBe("http://fa.wikipedia.org/wiki/");
+
+    expect(starkString("wss:::fa.wikipedia.org/wiki").fixURL().toString()).toBe(
+      "wss://fa.wikipedia.org/wiki/",
+    );
+  });
+});
diff --git a/src/__tests__/halfSpace.test.js b/src/__tests__/halfSpace.test.js
@@ -1,5 +1,5 @@
 //Prepare test
-import starkString from "./../lib";
+import starkString from "./../";
 
 test("should convert to Zero-width non-joiner correction", () => {
   expect(
diff --git a/src/__tests__/switch.test.js b/src/__tests__/switch.test.js
@@ -1,5 +1,5 @@
 //Prepare test
-import starkString from "./../lib";
+import starkString from "./../";
 
 test("should Convert Persian Chars to English Chars", () => {
   expect(
diff --git a/src/__tests__/validation.test.js b/src/__tests__/validation.test.js
@@ -1,5 +1,5 @@
 //Prepare test
-import starkString from "./../lib";
+import starkString from "./../";
 
 test("should validate card number 1", () => {
   expect(starkString("6104337638408961").isValidBankCard()).toBe(true);
diff --git a/src/index.ts b/src/index.ts
@@ -73,17 +73,31 @@ class StarkString extends NativeString {
   }
 
   /**
-   * Used for decode Persian Characters in URL
-   * https://fa.wikipedia.org/wiki/مدیاویکی:Gadget-Extra-Editbuttons-Functions.js
+   * Used for Normalize url
+   * https://fa.wikipedia.org/wiki/مدیاویکی:Gadget-Extra-Editbuttons-Functions.
+   * s
    */
   fixURL(): StarkString {
-    this._value = decodeURL(this._value);
+    if (!this._value) {
+      return this;
+    }
+
+    if (/^(wss?(:|\/))/i.test(this._value)) {
+      this._value = this._value.replace(/^(ws)?(s)?(:*)(\/+)?/i, `ws$2://`);
+    } else if (/^(ftps?(:|\/))/i.test(this._value)) {
+      this._value = this._value.replace(/^(ftp)?(s)?(:*)(\/+)?/i, `ftp$2://`);
+    } else {
+      this._value = this._value.replace(/^(http)?(s)?(:*)(\/+)?/i, `http$2://`);
+    }
+
+    this._value = this._value.replace(/(\/?)$/i, `/`);
     return this;
   }
 
   /**
    * Used for decode Persian Characters in URL
-   * https://fa.wikipedia.org/wiki/مدیاویکی:Gadget-Extra-Editbuttons-Functions.js
+   * https://fa.wikipedia.org/wiki/مدیاویکی:Gadget-Extra-Editbuttons-Functions.
+   * s
    */
   decodeURL(): StarkString {
     this._value = decodeURL(this._value);
diff --git a/src/lib.ts b/src/lib.ts
@@ -315,12 +315,18 @@ function halfSpace(value: string): string {
   return value;
 }
 
-/** Remove anything expect numbers, this function will remove negative and decimal */
+/**
+ * Remove anything expect numbers, this function will remove negative and
+ * decimal
+ */
 function parseNumber(value: string): string {
   return englishNumber(value).replace(/\D/g, "");
 }
 
-/** Convert numbers to english number and remove anything expect integer or decimal numbers */
+/**
+ * Convert numbers to english number and remove anything expect integer or
+ * decimal numbers
+ */
 function toNumber(
   value: string,
   {
diff --git a/yarn.lock b/yarn.lock
