@salesforcedevs/docs-components 1.3.300-async-fix-alpha2 → 1.3.300-async-fix-alpha4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.3.300-async-fix-alpha2",
+    "version": "1.3.300-async-fix-alpha4",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",
@@ -17,8 +17,7 @@
         "lodash.orderby": "^4.6.0",
         "lodash.uniqby": "^4.7.0",
         "query-string": "^7.1.3",
-        "sentence-case": "^3.0.4",
-        "yieldable-json": "^2.0.1"
+        "sentence-case": "^3.0.4"
     },
     "devDependencies": {
         "@types/classnames": "^2.2.10",

package/src/modules/doc/amfTopic/amfTopic.ts

@@ -23,19 +23,17 @@ export default class AmfTopic extends LightningElement {
     }
 
     set model(value: TopicModel) {
-        const amfClonePromise =
+        const amfNeedsClone =
             !this.amf ||
-            (value && this._model && value.amf !== this._model?.amf)
-                ? clone(value.amf)
-                : Promise.resolve(this.amf);
-
-        const typeClonePromise =
+            (value && this._model && value.amf !== this._model?.amf);
+        const typeNeedsClone =
             !this.type ||
-            (value && this._model && value.type !== this._model?.type)
-                ? clone(value.type)
-                : Promise.resolve(this.type);
+            (value && this._model && value.type !== this._model?.type);
 
-        Promise.all([amfClonePromise, typeClonePromise])
+        this.cloneData(
+            amfNeedsClone ? value.amf : this.amf,
+            typeNeedsClone ? value.type : this.type
+        )
             .then(([clonedAmf, clonedType]) => {
                 this.amf = clonedAmf;
                 this.type = clonedType;
@@ -47,6 +45,25 @@ export default class AmfTopic extends LightningElement {
             });
     }
 
+    async cloneData(
+        amf: Json | undefined,
+        type: string | undefined
+    ): Promise<[Json, string]> {
+        const clonedAmf = amf ? await this.clone(amf) : amf;
+        const clonedType = type ? await this.clone(type) : type;
+        return [clonedAmf, clonedType];
+    }
+
+    async clone(value: any): Promise<any> {
+        return new Promise((resolve, reject) => {
+            try {
+                resolve(JSON.parse(JSON.stringify(value)));
+            } catch (error) {
+                reject(error);
+            }
+        });
+    }
+
     update(): void {
         if (!this.model) {
             throw new Error("Amf TopicModel undefined when trying to update");
@@ -95,7 +112,6 @@ export default class AmfTopic extends LightningElement {
         const isTabletOrDesktop = window.matchMedia(
             `(min-width: ${TABLE_SIZE_MATCH})`
         ).matches;
-
         if (isTabletOrDesktop) {
             window.scrollTo(0, 0);
         }
@@ -111,53 +127,3 @@ export default class AmfTopic extends LightningElement {
         }
     }
 }
-
-/**
- * The underlying web components we use from api-console mutate their models we pass in.
- * Since LWC makes them Read Only, we need to copy them before passing to the Web Component.
- * @param value JSON Serializable object to clone.
- * @returns A Promise that resolves with a copy of Value, serialized and parsed via JSON.
- */
-function clone(value: any): Promise<any> {
-    return new Promise((resolve, reject) => {
-        if (window.Worker) {
-            const workerCode = `
-            onmessage = function(e) {
-                try {
-                    const jsonObject = JSON.parse(e.data);
-                    postMessage({ success: true, data: jsonObject });
-                } catch (error) {
-                    postMessage({ success: false, error: error.message });
-                }
-            };
-            `;
-
-            const blob = new Blob([workerCode], {
-                type: "application/javascript"
-            });
-            const workerURL = URL.createObjectURL(blob);
-            const worker = new Worker(workerURL);
-
-            try {
-                const jsonObj = JSON.stringify(value);
-                worker.postMessage(jsonObj);
-            } catch (err) {
-                reject(err);
-            }
-
-            worker.onmessage = function (e) {
-                if (e.data.success) {
-                    resolve(e.data.data);
-                } else {
-                    reject(new Error(e.data.error));
-                }
-            };
-
-            worker.onerror = function (e) {
-                reject(new Error(e.message));
-            };
-        } else {
-            reject(new Error("Your browser doesn't support web workers."));
-        }
-    });
-}