@hybridly/utils 0.0.1-dev.4 → 0.1.0-alpha.0

package/dist/index.cjs

@@ -3,11 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const baseMerge = require('deepmerge');
+const lodash_clonedeep = require('lodash.clonedeep');
 const makeDebugger = require('debug');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
 const baseMerge__default = /*#__PURE__*/_interopDefaultLegacy(baseMerge);
+const lodash_clonedeep__default = /*#__PURE__*/_interopDefaultLegacy(lodash_clonedeep);
 const makeDebugger__default = /*#__PURE__*/_interopDefaultLegacy(makeDebugger);
 
 function hasFiles(data) {
@@ -19,7 +21,7 @@ function hasFiles(data) {
 function objectToFormData(source, form, parentKey) {
   source ?? (source = {});
   form ?? (form = new FormData());
-  if (typeof source !== "object" || Array.isArray(source) || source instanceof Blob || source instanceof Date || source instanceof FormData) {
+  if (typeof source !== "object" || source instanceof Set || Array.isArray(source) || source instanceof Blob || source instanceof Date || source instanceof FormData) {
     throw new TypeError("Source must be an object literal to be converted to a FormData object.");
   }
   for (const key in source) {
@@ -33,7 +35,12 @@ function composeKey(key, parentKey) {
   return parentKey ? `${parentKey}[${key}]` : key;
 }
 function append(form, key, value) {
-  if (Array.isArray(value)) {
+  if (value instanceof Set) {
+    return [...value].forEach((_value, index) => append(form, composeKey(index.toString(), key), _value));
+  } else if (Array.isArray(value)) {
+    if (!value.length) {
+      return form.append(key, "");
+    }
     return Array.from(value.keys()).forEach((index) => append(form, composeKey(index.toString(), key), value[index]));
   } else if (value instanceof Date) {
     return form.append(key, value.toISOString());
@@ -53,17 +60,23 @@ function append(form, key, value) {
   objectToFormData(value, form, key);
 }
 
+const stack = [];
 class Modal {
-  constructor(html, animationDurationInMs = 200) {
+  constructor(html, id) {
     this.html = html;
-    this.animationDurationInMs = animationDurationInMs;
-    if (this.initializeDOM() !== false) {
-      this.show();
+    this.id = id;
+    this.animationDurationInMs = 200;
+    if (stack.includes(id)) {
+      return;
+    }
+    if (this.initializeDOM() === false) {
+      return;
     }
+    this.show();
   }
-  static fromException(response) {
+  static fromException(response, id) {
     if (typeof response === "string" && response.trim() !== "") {
-      return new Modal(`<style>${htmlStyle()}</style>${response.toString()}`);
+      return new Modal(`<style>${htmlStyle()}</style>${response.toString()}`, id);
     }
     return new Modal(`
 			<style>${style()}</style>
@@ -74,9 +87,9 @@ class Modal {
 					<pre class="text-sm opacity-80 max-h-[500px] w-full mx-auto text-left mt-6">${JSON.stringify(response, null, 2)}</pre>
 				</div>
 			</div>
-		`);
+		`, id);
   }
-  static forPageComponent(component) {
+  static forPageComponent(component, id) {
     return new Modal(`
 			<style>${style()}</style>
 			<div class="h-full text-center flex">
@@ -86,7 +99,22 @@ class Modal {
 					<div class="m-2 flex justify-center text-xl opacity-30 underline underline-dotted">${component}</div>
 				</div>
 			</div>
-		`);
+		`, id);
+  }
+  static domainsDisabled(component, id) {
+    return new Modal(`
+			<style>${style()}</style>
+			<div class="h-full text-center flex">
+				<div class="m-auto">
+					<div class="text-5xl font-thin">Error</div>
+					<div class="opacity-30 text-lg font-thin m-1">
+						A domain-based page component was specificed, but domains are disabled. <br />
+						Set <code>domains</code> to <code>true</code> in <a class="underline underline-dotted" href="https://hybridly.dev/configuration/architecture.html#domains"><code>hybridly.config.ts</code></a>.
+					</div>
+					<div class="m-2 flex justify-center text-xl opacity-30 underline underline-dotted">${component}</div>
+				</div>
+			</div>
+		`, id);
   }
   initializeDOM() {
     if (!this.html) {
@@ -146,6 +174,7 @@ class Modal {
     this.style = style2;
   }
   show() {
+    stack.push(this.id);
     this.overlay.addEventListener("click", () => this.destroy());
     this.hideOnEscape = (event) => {
       if (event.keyCode === 27) {
@@ -161,6 +190,7 @@ class Modal {
     this.overlay.dataset.hybridly = "visible";
   }
   destroy() {
+    stack.splice(stack.indexOf(this.html), 1);
     this.overlay.dataset.hybridly = "";
     setTimeout(() => {
       this.overlay.outerHTML = "";
@@ -171,10 +201,13 @@ class Modal {
   }
 }
 function showResponseErrorModal(response) {
-  return Modal.fromException(response);
+  return Modal.fromException(response, "non-hybrid-response");
 }
 function showPageComponentErrorModal(response) {
-  return Modal.forPageComponent(response);
+  return Modal.forPageComponent(response, `page-component-${response}`);
+}
+function showDomainsDisabledErrorModal(response) {
+  return Modal.domainsDisabled(response, `domains-disabled-${response}`);
 }
 function htmlStyle() {
   return `
@@ -186,6 +219,10 @@ function htmlStyle() {
 			flex-direction: column;
 			height: 100%;
 		}
+
+		a {
+			color: white;
+		}
 	`;
 }
 function style() {
@@ -298,36 +335,12 @@ function when(condition, data, _default) {
   }
   return data;
 }
-function clone(val) {
-  let k, out, tmp;
-  if (Array.isArray(val)) {
-    out = Array(k = val.length);
-    while (k--) {
-      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
-    }
-    return out;
-  }
-  if (Object.prototype.toString.call(val) === "[object Object]") {
-    out = {};
-    for (k in val) {
-      if (k === "__proto__") {
-        Object.defineProperty(out, k, {
-          value: clone(val[k]),
-          configurable: true,
-          enumerable: true,
-          writable: true
-        });
-      } else {
-        out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
-      }
-    }
-    return out;
-  }
-  return val;
-}
 function merge(x, y) {
   return baseMerge__default(x, y, { arrayMerge: (_, s) => s });
 }
+function removeTrailingSlash(string) {
+  return string.replace(/\/+$/, "");
+}
 
 const debug = {
   router: makeDebugger__default("hybridly:core:router"),
@@ -341,7 +354,7 @@ const debug = {
   adapter: (name, ...args) => makeDebugger__default("hybridly:adapter").extend(name)(args.shift(), ...args)
 };
 
-exports.clone = clone;
+exports.clone = lodash_clonedeep__default;
 exports.debounce = debounce;
 exports.debug = debug;
 exports.hasFiles = hasFiles;
@@ -349,6 +362,8 @@ exports.match = match;
 exports.merge = merge;
 exports.objectToFormData = objectToFormData;
 exports.random = random;
+exports.removeTrailingSlash = removeTrailingSlash;
+exports.showDomainsDisabledErrorModal = showDomainsDisabledErrorModal;
 exports.showPageComponentErrorModal = showPageComponentErrorModal;
 exports.showResponseErrorModal = showResponseErrorModal;
 exports.value = value;

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 import makeDebugger from 'debug';
+export { default as clone } from 'lodash.clonedeep';
 
-declare type RequestData = Record<string, FormDataConvertible> | FormDataConvertible | FormData;
-declare type FormDataConvertible = {
+type RequestData = Record<string, FormDataConvertible> | FormDataConvertible | FormData;
+type FormDataConvertible = {
     [key: string]: FormDataConvertible;
-} | Array<FormDataConvertible> | Blob | File | FormDataEntryValue | Date | boolean | number | null | undefined | string;
+} | Array<FormDataConvertible> | Set<FormDataConvertible> | Blob | File | FormDataEntryValue | Date | boolean | number | null | undefined | string;
 /**
  * Checks if the given object has a file.
  */
@@ -15,29 +16,33 @@ declare function objectToFormData(source?: RequestData, form?: FormData, parentK
 
 declare class Modal {
     private html;
-    private animationDurationInMs;
+    private id;
     private main;
     private overlay;
     private iframe;
     private style;
     private hideOnEscape?;
-    constructor(html: string, animationDurationInMs?: number);
-    static fromException(response: string): Modal;
-    static forPageComponent(component: string): Modal;
+    private animationDurationInMs;
+    constructor(html: string, id: string);
+    static fromException(response: string, id: string): Modal;
+    static forPageComponent(component: string, id: string): Modal;
+    static domainsDisabled(component: string, id: string): Modal;
     initializeDOM(): false | undefined;
     show(): void;
     destroy(): void;
 }
 declare function showResponseErrorModal(response: string): Modal;
 declare function showPageComponentErrorModal(response: string): Modal;
+declare function showDomainsDisabledErrorModal(response: string): Modal;
 
 declare function random(length?: number): string;
+/** Simple pattern matching util. */
 declare function match<TValue extends string | number = string, TReturnValue = unknown>(value: TValue, lookup: Record<TValue | 'default', TReturnValue | ((...args: any[]) => TReturnValue)>, ...args: any[]): TReturnValue | Promise<TReturnValue>;
 declare function debounce<F extends (...params: any[]) => ReturnType<F>>(fn: F, delay: number): F;
 declare function value<T>(value: T | (() => T)): T;
 declare function when<T, D>(condition: any, data: T, _default?: D): T | D | undefined;
-declare function clone<T>(val: T): T;
 declare function merge<T>(x: Partial<T>, y: Partial<T>): T;
+declare function removeTrailingSlash(string: string): string;
 
 declare const debug: {
     router: makeDebugger.Debugger;
@@ -51,4 +56,4 @@ declare const debug: {
     adapter: (name: string, ...args: any[]) => void;
 };
 
-export { FormDataConvertible, RequestData, clone, debounce, debug, hasFiles, match, merge, objectToFormData, random, showPageComponentErrorModal, showResponseErrorModal, value, when };
+export { FormDataConvertible, RequestData, debounce, debug, hasFiles, match, merge, objectToFormData, random, removeTrailingSlash, showDomainsDisabledErrorModal, showPageComponentErrorModal, showResponseErrorModal, value, when };

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import baseMerge from 'deepmerge';
+export { default as clone } from 'lodash.clonedeep';
 import makeDebugger from 'debug';
 
 function hasFiles(data) {
@@ -10,7 +11,7 @@ function hasFiles(data) {
 function objectToFormData(source, form, parentKey) {
   source ?? (source = {});
   form ?? (form = new FormData());
-  if (typeof source !== "object" || Array.isArray(source) || source instanceof Blob || source instanceof Date || source instanceof FormData) {
+  if (typeof source !== "object" || source instanceof Set || Array.isArray(source) || source instanceof Blob || source instanceof Date || source instanceof FormData) {
     throw new TypeError("Source must be an object literal to be converted to a FormData object.");
   }
   for (const key in source) {
@@ -24,7 +25,12 @@ function composeKey(key, parentKey) {
   return parentKey ? `${parentKey}[${key}]` : key;
 }
 function append(form, key, value) {
-  if (Array.isArray(value)) {
+  if (value instanceof Set) {
+    return [...value].forEach((_value, index) => append(form, composeKey(index.toString(), key), _value));
+  } else if (Array.isArray(value)) {
+    if (!value.length) {
+      return form.append(key, "");
+    }
     return Array.from(value.keys()).forEach((index) => append(form, composeKey(index.toString(), key), value[index]));
   } else if (value instanceof Date) {
     return form.append(key, value.toISOString());
@@ -44,17 +50,23 @@ function append(form, key, value) {
   objectToFormData(value, form, key);
 }
 
+const stack = [];
 class Modal {
-  constructor(html, animationDurationInMs = 200) {
+  constructor(html, id) {
     this.html = html;
-    this.animationDurationInMs = animationDurationInMs;
-    if (this.initializeDOM() !== false) {
-      this.show();
+    this.id = id;
+    this.animationDurationInMs = 200;
+    if (stack.includes(id)) {
+      return;
+    }
+    if (this.initializeDOM() === false) {
+      return;
     }
+    this.show();
   }
-  static fromException(response) {
+  static fromException(response, id) {
     if (typeof response === "string" && response.trim() !== "") {
-      return new Modal(`<style>${htmlStyle()}</style>${response.toString()}`);
+      return new Modal(`<style>${htmlStyle()}</style>${response.toString()}`, id);
     }
     return new Modal(`
 			<style>${style()}</style>
@@ -65,9 +77,9 @@ class Modal {
 					<pre class="text-sm opacity-80 max-h-[500px] w-full mx-auto text-left mt-6">${JSON.stringify(response, null, 2)}</pre>
 				</div>
 			</div>
-		`);
+		`, id);
   }
-  static forPageComponent(component) {
+  static forPageComponent(component, id) {
     return new Modal(`
 			<style>${style()}</style>
 			<div class="h-full text-center flex">
@@ -77,7 +89,22 @@ class Modal {
 					<div class="m-2 flex justify-center text-xl opacity-30 underline underline-dotted">${component}</div>
 				</div>
 			</div>
-		`);
+		`, id);
+  }
+  static domainsDisabled(component, id) {
+    return new Modal(`
+			<style>${style()}</style>
+			<div class="h-full text-center flex">
+				<div class="m-auto">
+					<div class="text-5xl font-thin">Error</div>
+					<div class="opacity-30 text-lg font-thin m-1">
+						A domain-based page component was specificed, but domains are disabled. <br />
+						Set <code>domains</code> to <code>true</code> in <a class="underline underline-dotted" href="https://hybridly.dev/configuration/architecture.html#domains"><code>hybridly.config.ts</code></a>.
+					</div>
+					<div class="m-2 flex justify-center text-xl opacity-30 underline underline-dotted">${component}</div>
+				</div>
+			</div>
+		`, id);
   }
   initializeDOM() {
     if (!this.html) {
@@ -137,6 +164,7 @@ class Modal {
     this.style = style2;
   }
   show() {
+    stack.push(this.id);
     this.overlay.addEventListener("click", () => this.destroy());
     this.hideOnEscape = (event) => {
       if (event.keyCode === 27) {
@@ -152,6 +180,7 @@ class Modal {
     this.overlay.dataset.hybridly = "visible";
   }
   destroy() {
+    stack.splice(stack.indexOf(this.html), 1);
     this.overlay.dataset.hybridly = "";
     setTimeout(() => {
       this.overlay.outerHTML = "";
@@ -162,10 +191,13 @@ class Modal {
   }
 }
 function showResponseErrorModal(response) {
-  return Modal.fromException(response);
+  return Modal.fromException(response, "non-hybrid-response");
 }
 function showPageComponentErrorModal(response) {
-  return Modal.forPageComponent(response);
+  return Modal.forPageComponent(response, `page-component-${response}`);
+}
+function showDomainsDisabledErrorModal(response) {
+  return Modal.domainsDisabled(response, `domains-disabled-${response}`);
 }
 function htmlStyle() {
   return `
@@ -177,6 +209,10 @@ function htmlStyle() {
 			flex-direction: column;
 			height: 100%;
 		}
+
+		a {
+			color: white;
+		}
 	`;
 }
 function style() {
@@ -289,36 +325,12 @@ function when(condition, data, _default) {
   }
   return data;
 }
-function clone(val) {
-  let k, out, tmp;
-  if (Array.isArray(val)) {
-    out = Array(k = val.length);
-    while (k--) {
-      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
-    }
-    return out;
-  }
-  if (Object.prototype.toString.call(val) === "[object Object]") {
-    out = {};
-    for (k in val) {
-      if (k === "__proto__") {
-        Object.defineProperty(out, k, {
-          value: clone(val[k]),
-          configurable: true,
-          enumerable: true,
-          writable: true
-        });
-      } else {
-        out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
-      }
-    }
-    return out;
-  }
-  return val;
-}
 function merge(x, y) {
   return baseMerge(x, y, { arrayMerge: (_, s) => s });
 }
+function removeTrailingSlash(string) {
+  return string.replace(/\/+$/, "");
+}
 
 const debug = {
   router: makeDebugger("hybridly:core:router"),
@@ -332,4 +344,4 @@ const debug = {
   adapter: (name, ...args) => makeDebugger("hybridly:adapter").extend(name)(args.shift(), ...args)
 };
 
-export { clone, debounce, debug, hasFiles, match, merge, objectToFormData, random, showPageComponentErrorModal, showResponseErrorModal, value, when };
+export { debounce, debug, hasFiles, match, merge, objectToFormData, random, removeTrailingSlash, showDomainsDisabledErrorModal, showPageComponentErrorModal, showResponseErrorModal, value, when };

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@hybridly/utils",
-  "version": "0.0.1-dev.4",
-  "description": "A solution to develop server-driven, client-rendered applications",
+  "version": "0.1.0-alpha.0",
+  "description": "Utils used in Hybridly packages",
   "keywords": [
-    "hybridly",
-    "inertiajs"
+    "hybridly"
   ],
-  "homepage": "https://github.com/hybridly/hybridly#readme",
+  "homepage": "https://github.com/hybridly/hybridly/tree/main/packages/config#readme",
   "bugs": {
     "url": "https://github.com/hybridly/hybridly/issues"
   },
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/hybridly/hybridly.git"
+    "url": "git+https://github.com/hybridly/hybridly.git",
+    "directory": "packages/utils"
   },
   "funding": "https://github.com/sponsors/innocenzi",
   "author": "Enzo Innocenzi <enzo@innocenzi.dev>",
@@ -34,7 +34,8 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "debug": "^4.3.4",
-    "deepmerge": "^4.2.2"
+    "deepmerge": "^4.3.0",
+    "lodash.clonedeep": "^4.5.0"
   },
   "scripts": {
     "build": "unbuild",