diff --git a/.prettierignore b/.prettierignore index e4b891be..16c96ad4 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ node_modules/ dist/ +out/ .prettierrc.cjs diff --git a/src-tauri/plugins/importer-insomnia/out/index.js b/src-tauri/plugins/importer-insomnia/out/index.js index 7a86bcc1..53a9fe08 100644 --- a/src-tauri/plugins/importer-insomnia/out/index.js +++ b/src-tauri/plugins/importer-insomnia/out/index.js @@ -1,139 +1,124 @@ function S(e, t) { - return ( - console.log('IMPORTING Environment', e._id, e.name, JSON.stringify(e, null, 2)), - { - id: e._id, - createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''), - updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''), - workspaceId: t, - model: 'environment', - name: e.name, - variables: Object.entries(e.data).map(([n, a]) => ({ - enabled: !0, - name: n, - value: `${a}`, - })), - } - ); + return console.log("IMPORTING Environment", e._id, e.name, JSON.stringify(e, null, 2)), { + id: e._id, + createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""), + updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""), + workspaceId: t, + model: "environment", + name: e.name, + variables: Object.entries(e.data).map(([n, a]) => ({ + enabled: !0, + name: n, + value: `${a}` + })) + }; } function I(e) { - return m(e) && e._type === 'workspace'; + return m(e) && e._type === "workspace"; } function y(e) { - return m(e) && e._type === 'request_group'; + return m(e) && e._type === "request_group"; } function g(e) { - return m(e) && e._type === 'request'; + return m(e) && e._type === "request"; } function f(e) { - return m(e) && e._type === 'environment'; + return m(e) && e._type === "environment"; } function m(e) { - return Object.prototype.toString.call(e) === '[object Object]'; + return Object.prototype.toString.call(e) === "[object Object]"; } function w(e) { - return Object.prototype.toString.call(e) === '[object String]'; + return Object.prototype.toString.call(e) === "[object String]"; } function O(e) { return Object.entries(e).map(([t, n]) => ({ enabled: !0, name: t, - value: `${n}`, + value: `${n}` })); } function l(e) { - return w(e) ? e.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}') : e; + return w(e) ? e.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : e; } function h(e, t, n = 0) { var c, o; - console.log('IMPORTING REQUEST', e._id, e.name, JSON.stringify(e, null, 2)); - let a = null, - r = null; - ((c = e.body) == null ? void 0 : c.mimeType) === 'application/graphql' - ? ((a = 'graphql'), (r = l(e.body.text))) - : ((o = e.body) == null ? void 0 : o.mimeType) === 'application/json' && - ((a = 'application/json'), (r = l(e.body.text))); - let i = null, - u = {}; - return ( - e.authentication.type === 'bearer' - ? ((i = 'bearer'), - (u = { - token: l(e.authentication.token), - })) - : e.authentication.type === 'basic' && - ((i = 'basic'), - (u = { - username: l(e.authentication.username), - password: l(e.authentication.password), - })), - { - id: e._id, - createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''), - updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''), - workspaceId: t, - folderId: e.parentId === t ? null : e.parentId, - model: 'http_request', - sortPriority: n, - name: e.name, - url: l(e.url), - body: r, - bodyType: a, - authentication: u, - authenticationType: i, - method: e.method, - headers: (e.headers ?? []) - .map(({ name: d, value: p, disabled: s }) => ({ - enabled: !s, - name: d, - value: p, - })) - .filter(({ name: d, value: p }) => d !== '' || p !== ''), - } - ); + console.log("IMPORTING REQUEST", e._id, e.name, JSON.stringify(e, null, 2)); + let a = null, r = null; + ((c = e.body) == null ? void 0 : c.mimeType) === "application/graphql" ? (a = "graphql", r = l(e.body.text)) : ((o = e.body) == null ? void 0 : o.mimeType) === "application/json" && (a = "application/json", r = l(e.body.text)); + let i = null, u = {}; + return e.authentication.type === "bearer" ? (i = "bearer", u = { + token: l(e.authentication.token) + }) : e.authentication.type === "basic" && (i = "basic", u = { + username: l(e.authentication.username), + password: l(e.authentication.password) + }), { + id: e._id, + createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""), + updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""), + workspaceId: t, + folderId: e.parentId === t ? null : e.parentId, + model: "http_request", + sortPriority: n, + name: e.name, + url: l(e.url), + body: r, + bodyType: a, + authentication: u, + authenticationType: i, + method: e.method, + headers: (e.headers ?? []).map(({ name: d, value: p, disabled: s }) => ({ + enabled: !s, + name: d, + value: p + })).filter(({ name: d, value: p }) => d !== "" || p !== "") + }; } function _(e, t) { - return ( - console.log('IMPORTING FOLDER', e._id, e.name, JSON.stringify(e, null, 2)), - { - id: e._id, - createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''), - updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''), - folderId: e.parentId === t ? null : e.parentId, - workspaceId: t, - model: 'folder', - name: e.name, - } - ); + return console.log("IMPORTING FOLDER", e._id, e.name, JSON.stringify(e, null, 2)), { + id: e._id, + createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""), + updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""), + folderId: e.parentId === t ? null : e.parentId, + workspaceId: t, + model: "folder", + name: e.name + }; } function b(e) { - console.log('RUNNING INSOMNIA'); + console.log("RUNNING INSOMNIA"); let t; try { t = JSON.parse(e); } catch { return; } - if (!m(t) || !Array.isArray(t.resources)) return; + if (!m(t) || !Array.isArray(t.resources)) + return; const n = { - workspaces: [], - requests: [], - environments: [], - folders: [], - }, - a = t.resources.filter(I); + workspaces: [], + requests: [], + environments: [], + folders: [] + }, a = t.resources.filter(I); for (const r of a) { - const i = t.resources.find((o) => f(o) && o.parentId === r._id); + const i = t.resources.find( + (o) => f(o) && o.parentId === r._id + ); n.workspaces.push({ id: r._id, - createdAt: new Date(a.created ?? Date.now()).toISOString().replace('Z', ''), - updatedAt: new Date(a.updated ?? Date.now()).toISOString().replace('Z', ''), - model: 'workspace', + createdAt: new Date(a.created ?? Date.now()).toISOString().replace("Z", ""), + updatedAt: new Date(a.updated ?? Date.now()).toISOString().replace("Z", ""), + model: "workspace", name: r.name, - variables: i ? O(i.data) : [], + variables: i ? O(i.data) : [] }); - const u = t.resources.filter((o) => f(o) && o.parentId === (i == null ? void 0 : i._id)); - n.environments.push(...u.map((o) => S(o, r._id))); + const u = t.resources.filter( + (o) => f(o) && o.parentId === (i == null ? void 0 : i._id) + ); + n.environments.push( + ...u.map((o) => S(o, r._id)) + ); const c = (o) => { const d = t.resources.filter((s) => s.parentId === o); let p = 0; @@ -142,11 +127,8 @@ function b(e) { }; c(r._id); } - return ( - (n.requests = n.requests.filter(Boolean)), - (n.environments = n.environments.filter(Boolean)), - (n.workspaces = n.workspaces.filter(Boolean)), - { resources: n } - ); + return n.requests = n.requests.filter(Boolean), n.environments = n.environments.filter(Boolean), n.workspaces = n.workspaces.filter(Boolean), { resources: n }; } -export { b as pluginHookImport }; +export { + b as pluginHookImport +}; diff --git a/src-tauri/plugins/importer-postman/out/index.js b/src-tauri/plugins/importer-postman/out/index.js index a2e5644d..71b18c89 100644 --- a/src-tauri/plugins/importer-postman/out/index.js +++ b/src-tauri/plugins/importer-postman/out/index.js @@ -1,130 +1,126 @@ -const f = 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json', - b = 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json', - w = [b, f]; +const f = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", b = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", w = [b, f]; function A(t) { const e = m(t); - if (e == null) return; + if (e == null) + return; const r = s(e.info); - if (!w.includes(r.schema) || !Array.isArray(e.item)) return; + if (!w.includes(r.schema) || !Array.isArray(e.item)) + return; const a = { - workspaces: [], - environments: [], - requests: [], - folders: [], - }, - c = { - model: 'workspace', - id: 'wrk_0', - name: r.name || 'Postman Import', - description: r.description || '', - }; + workspaces: [], + environments: [], + requests: [], + folders: [] + }, c = { + model: "workspace", + id: "wrk_0", + name: r.name || "Postman Import", + description: r.description || "" + }; a.workspaces.push(c); const p = (o, l = null) => { - if (typeof o.name == 'string' && Array.isArray(o.item)) { + if (typeof o.name == "string" && Array.isArray(o.item)) { const n = { - model: 'folder', + model: "folder", workspaceId: c.id, id: `fld_${a.folders.length}`, name: o.name, - folderId: l, + folderId: l }; a.folders.push(n); - for (const i of o.item) p(i, n.id); - } else if (typeof o.name == 'string' && 'request' in o) { - const n = s(o.request), - i = T(n.body), - u = g(n.auth), - y = { - model: 'http_request', - id: `req_${a.requests.length}`, - workspaceId: c.id, - folderId: l, - name: o.name, - method: n.method || 'GET', - url: typeof n.url == 'string' ? n.url : s(n.url).raw, - body: i.body, - bodyType: i.bodyType, - authentication: u.authentication, - authenticationType: u.authenticationType, - headers: [ - ...i.headers, - ...u.headers, - ...h(n.header).map((d) => ({ - name: d.key, - value: d.value, - enabled: !d.disabled, - })), - ], - }; + for (const i of o.item) + p(i, n.id); + } else if (typeof o.name == "string" && "request" in o) { + const n = s(o.request), i = T(n.body), u = g(n.auth), y = { + model: "http_request", + id: `req_${a.requests.length}`, + workspaceId: c.id, + folderId: l, + name: o.name, + method: n.method || "GET", + url: typeof n.url == "string" ? n.url : s(n.url).raw, + body: i.body, + bodyType: i.bodyType, + authentication: u.authentication, + authenticationType: u.authenticationType, + headers: [ + ...i.headers, + ...u.headers, + ...h(n.header).map((d) => ({ + name: d.key, + value: d.value, + enabled: !d.disabled + })) + ] + }; a.requests.push(y); - } else console.log('Unknown item', o, l); + } else + console.log("Unknown item", o, l); }; - for (const o of e.item) p(o); + for (const o of e.item) + p(o); return { resources: a }; } function g(t) { const e = s(t); - return 'basic' in e - ? { - headers: [], - authenticationType: 'basic', - authentication: { - username: e.basic.username || '', - password: e.basic.password || '', - }, - } - : { headers: [], authenticationType: null, authentication: {} }; + return "basic" in e ? { + headers: [], + authenticationType: "basic", + authentication: { + username: e.basic.username || "", + password: e.basic.password || "" + } + } : { headers: [], authenticationType: null, authentication: {} }; } function T(t) { const e = s(t); - return 'graphql' in e - ? { - headers: [ - { - name: 'Content-Type', - value: 'application/json', - enabled: !0, - }, - ], - bodyType: 'graphql', - body: { - text: JSON.stringify( - { query: e.graphql.query, variables: m(e.graphql.variables) }, - null, - 2, - ), - }, + return "graphql" in e ? { + headers: [ + { + name: "Content-Type", + value: "application/json", + enabled: !0 } - : 'formdata' in e - ? { - headers: [ - { - name: 'Content-Type', - value: 'application/x-www-form-urlencoded', - enabled: !0, - }, - ], - bodyType: 'application/x-www-form-urlencoded', - body: { - form: h(e.formdata).map((r) => ({ - enabled: !r.disabled, - name: r.key ?? '', - value: r.value ?? '', - })), - }, + ], + bodyType: "graphql", + body: { + text: JSON.stringify( + { query: e.graphql.query, variables: m(e.graphql.variables) }, + null, + 2 + ) + } + } : "formdata" in e ? { + headers: [ + { + name: "Content-Type", + value: "application/x-www-form-urlencoded", + enabled: !0 } - : { headers: [], bodyType: null, body: {} }; + ], + bodyType: "application/x-www-form-urlencoded", + body: { + form: h(e.formdata).map((r) => ({ + enabled: !r.disabled, + name: r.key ?? "", + value: r.value ?? "" + })) + } + } : { headers: [], bodyType: null, body: {} }; } function m(t) { try { return s(JSON.parse(t)); - } catch {} + } catch { + } return null; } function s(t) { - return Object.prototype.toString.call(t) === '[object Object]' ? t : {}; + return Object.prototype.toString.call(t) === "[object Object]" ? t : {}; } function h(t) { - return Object.prototype.toString.call(t) === '[object Array]' ? t : []; + return Object.prototype.toString.call(t) === "[object Array]" ? t : []; } -export { A as pluginHookImport }; +export { + A as pluginHookImport +}; diff --git a/src-tauri/plugins/importer-yaak/out/index.js b/src-tauri/plugins/importer-yaak/out/index.js index 7bccfa82..f97a9f90 100644 --- a/src-tauri/plugins/importer-yaak/out/index.js +++ b/src-tauri/plugins/importer-yaak/out/index.js @@ -5,9 +5,13 @@ function u(r) { } catch { return; } - if (t(e) && e.yaakSchema === 1) return { resources: e.resources }; + if (t(e) && e.yaakSchema === 1) + return { resources: e.resources }; } function t(r) { - return Object.prototype.toString.call(r) === '[object Object]'; + return Object.prototype.toString.call(r) === "[object Object]"; } -export { t as isJSObject, u as pluginHookImport }; +export { + t as isJSObject, + u as pluginHookImport +}; diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index bf288c36..90fba22d 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -13,7 +13,7 @@ use std::fs::{create_dir_all, File}; use std::process::exit; use fern::colors::ColoredLevelConfig; -use log::{debug, error, info}; +use log::{debug, info, warn}; use rand::random; use serde::Serialize; use sqlx::{Pool, Sqlite, SqlitePool}; @@ -749,7 +749,7 @@ fn main() { debug!("Updater downloaded"); } tauri::UpdaterEvent::Error(e) => { - error!("Updater error: {:?}", e); + warn!("Updater received error: {:?}", e); } _ => {} },