@ouroboros/browser 0.1.4 → 0.1.6

package/cookies.d.ts

@@ -46,7 +46,7 @@ declare function remove(name: string, domain?: string, path?: string): void;
  * @param {string?} path The optional path of the cookie
  * @return {void}
  */
-declare function set(name: string, value: string, expires: number, domain?: string, path?: string): void;
+declare function set(name: string, value: string, expires?: number, domain?: string, path?: string): void;
 declare const cookies: {
     get: typeof get;
     remove: typeof remove;

package/cookies.js

@@ -67,20 +67,28 @@ function remove(name, domain, path) {
  * @return {void}
  */
 function set(name, value, expires, domain, path) {
-    // Generate the expires time
-    const d = new Date();
-    d.setTime(d.getTime() + (expires * 1000));
-    // Generate the cookie string
-    let s = name + '=' + encodeURIComponent(value) +
-        '; expires=' + d.toUTCString() + ';';
+    // Init the sections with the name and value
+    const lSections = [
+        `${name}=${encodeURIComponent(value)}`
+    ];
+    // If we have an expires
+    if (expires) {
+        // Generate the expires time
+        const d = new Date();
+        d.setTime(d.getTime() + (expires * 1000));
+        // Add it to the sections
+        lSections.push(`expires=${d.toUTCString()}`);
+    }
+    // If we have a domain
     if (domain) {
-        s += ' domain=' + domain + ';';
+        lSections.push(`domain=${domain}`);
     }
+    // If we have a path
     if (path) {
-        s += ' path=' + path + ';';
+        lSections.push(`path=${path}`);
     }
-    // Set the cookie
-    document.cookie = s;
+    // Set the cookie by combining the sections
+    document.cookie = lSections.join('; ');
 }
 // Default export
 const cookies = { get, remove, set };

package/cookies.ts

@@ -73,24 +73,36 @@ function remove(name: string, domain?: string, path?: string): void {
  * @param {string?} path The optional path of the cookie
  * @return {void}
  */
-function set(name: string, value: string, expires: number, domain?: string, path?: string): void {
+function set(name: string, value: string, expires?: number, domain?: string, path?: string): void {
 
-	// Generate the expires time
-	const d = new Date();
-	d.setTime(d.getTime() + (expires*1000))
+	// Init the sections with the name and value
+	const lSections = [
+		`${name}=${encodeURIComponent(value)}`
+	];
 
-	// Generate the cookie string
-	let s = name + '=' + encodeURIComponent(value) +
-			'; expires=' + d.toUTCString() + ';';
+	// If we have an expires
+	if(expires) {
+
+		// Generate the expires time
+		const d = new Date();
+		d.setTime(d.getTime() + (expires * 1000))
+
+		// Add it to the sections
+		lSections.push(`expires=${d.toUTCString()}`);
+	}
+
+	// If we have a domain
 	if(domain) {
-		s += ' domain=' + domain + ';';
+		lSections.push(`domain=${domain}`);
 	}
+
+	// If we have a path
 	if(path) {
-		s += ' path=' + path + ';';
+		lSections.push(`path=${path}`);
 	}
 
-	// Set the cookie
-	document.cookie = s;
+	// Set the cookie by combining the sections
+	document.cookie = lSections.join('; ');
 }
 
 // Default export

package/hash.js

@@ -8,7 +8,8 @@
  * @created 2018-12-09
  */
 // Generic modules
-import { clone, empty, isObject, parseQuery } from '@ouroboros/tools';
+import clone from '@ouroboros/clone';
+import { empty, isObject, parseQuery } from '@ouroboros/tools';
 // name regex
 const nameRE = /^[a-zA-Z_]+$/;
 // Callbacks

package/hash.ts

@@ -9,7 +9,8 @@
  */
 
 // Generic modules
-import { clone, empty, isObject, parseQuery } from '@ouroboros/tools';
+import clone from '@ouroboros/clone';
+import { empty, isObject, parseQuery } from '@ouroboros/tools';
 
 // Callback type
 type Callback = (value: string | null) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ouroboros/browser",
-	"version": "0.1.4",
+	"version": "0.1.6",
 	"description": "Package to handle common browser functionality.",
 	"main": "index.js",
 	"types": "index.d.ts",
@@ -33,7 +33,7 @@
 		"typescript": "^4.8.3"
 	},
 	"dependencies": {
-		"@ouroboros/tools": "^0.3.0"
-	},
-	"peerDependencies": {}
-}
+		"@ouroboros/clone": "^1.0.1",
+		"@ouroboros/tools": "^0.4.1"
+	}
+}