@symbo.ls/fetch 2.10.162 → 2.10.168

package/dist/cjs/index.js

@@ -55,7 +55,7 @@ const fetchRemote = async (key, options = defaultOptions) => {
   } catch (e) {
     console.error(e);
   }
-  return await response ? response.json() : {};
+  return await response.json();
 };
 const fetchProject = async (key, options) => {
   const { editor } = options;
@@ -63,9 +63,13 @@ const fetchProject = async (key, options) => {
     const data = await fetchRemote(key, editor);
     const evalData = deepDestringify(data);
     if (editor.serviceRoute) {
-      overwriteDeep(options[editor.serviceRoute], evalData);
-    } else
-      overwriteDeep(options, evalData);
+      overwriteDeep(evalData, options[editor.serviceRoute]);
+    } else {
+      const obj = { ...evalData, designSystem: evalData.designsystem };
+      delete obj.designsystem;
+      overwriteDeep(obj, options);
+    }
+    console.log(options);
   }
   return options;
 };
@@ -74,6 +78,8 @@ const fetchStateAsync = async (key, options, callback) => {
   if (editor && editor.remote) {
     const data = await fetchRemote(key, editor);
     const state = editor.serviceRoute === "state" ? data : data.state;
+    console.log(editor);
+    console.log(state);
     if (isObject(state))
       callback(state);
   }

package/index.js

@@ -32,7 +32,7 @@ export const fetchRemote = async (key, options = defaultOptions) => {
     console.error(e)
   }
 
-  return await response ? response.json() : {}
+  return await response.json()
 }
 
 export const fetchProject = async (key, options) => {
@@ -43,8 +43,14 @@ export const fetchProject = async (key, options) => {
     const evalData = deepDestringify(data)
 
     if (editor.serviceRoute) {
-      overwriteDeep(options[editor.serviceRoute], evalData)
-    } else overwriteDeep(options, evalData)
+      overwriteDeep(evalData, options[editor.serviceRoute])
+    } else {
+      const obj = { ...evalData, designSystem: evalData.designsystem }
+      delete obj.designsystem
+      overwriteDeep(obj, options)
+    }
+
+    console.log(options)
   }
 
   return options
@@ -56,6 +62,8 @@ export const fetchStateAsync = async (key, options, callback) => {
   if (editor && editor.remote) {
     const data = await fetchRemote(key, editor)
     const state = editor.serviceRoute === 'state' ? data : data.state
+    console.log(editor)
+    console.log(state)
     if (isObject(state)) callback(state)
   }
 }

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@symbo.ls/fetch",
-  "version": "2.10.162",
+  "version": "2.10.168",
   "license": "MIT",
-  "gitHead": "bcb75a861d22f204893bc7f58a4432b1126f8e17",
-  "dependencies": {
-    "@domql/utils": "latest"
-  },
+  "gitHead": "c9937422aa846691fa6187c7a3975c313114617a",
   "type": "module",
-  "module": "dist/esm/index.js",
-  "main": "dist/esm/index.js",
+  "module": "index.js",
+  "main": "index.js",
   "exports": "./dist/cjs/index.js",
   "source": "index.js",
   "files": [
     "*.js",
     "dist"
   ],
+  "dependencies": {
+    "@domql/utils": "latest"
+  },
   "scripts": {
     "copy:package:cjs": "cp ../../.build/package-cjs.json dist/cjs/package.json",
     "build:esm": "npx esbuild ./index.js --target=es2020 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild ./index.js --target=node16 --format=cjs --outdir=dist/cjs",
     "build:iife": "npx esbuild ./index.js --target=es2020 --format=iife --outdir=dist/iife --bundle --minify",
-    "build": "yarn build:esm && yarn build:cjs",
+    "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   }
 }

package/dist/esm/index.js

@@ -1,50 +0,0 @@
-import * as utils from "@domql/utils";
-import * as globals from "@domql/globals";
-const { overwriteDeep, deepDestringify, isObject } = utils;
-const { window } = globals;
-const SERVER_URL = window && window.location && window.location.host.includes("local") ? "localhost:13335" : "https://api.symbols.dev";
-const defaultOptions = {
-  endpoint: SERVER_URL
-};
-const fetch = window ? window.fetch : fetch;
-const fetchRemote = async (key, options = defaultOptions) => {
-  const baseUrl = `https://${options.endpoint || SERVER_URL}/`;
-  const route = options.serviceRoute || "";
-  let response;
-  try {
-    response = await window.fetch(baseUrl + route, {
-      method: "GET",
-      headers: { "Content-Type": "application/json", "X-AppKey": key }
-    });
-  } catch (e) {
-    console.error(e);
-  }
-  return await response ? response.json() : {};
-};
-const fetchProject = async (key, options) => {
-  const { editor } = options;
-  if (editor && editor.remote) {
-    const data = await fetchRemote(key, editor);
-    const evalData = deepDestringify(data);
-    if (editor.serviceRoute) {
-      overwriteDeep(options[editor.serviceRoute], evalData);
-    } else
-      overwriteDeep(options, evalData);
-  }
-  return options;
-};
-const fetchStateAsync = async (key, options, callback) => {
-  const { editor } = options;
-  if (editor && editor.remote) {
-    const data = await fetchRemote(key, editor);
-    const state = editor.serviceRoute === "state" ? data : data.state;
-    if (isObject(state))
-      callback(state);
-  }
-};
-export {
-  fetch,
-  fetchProject,
-  fetchRemote,
-  fetchStateAsync
-};