Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: support multiline graphql in curl (#3342)

Bogdan Chadkin31ceb2bc4484
diff --git a/@types/arrgv.d.ts b/@types/arrgv.d.ts
new file mode 100644
index 0000000000..fe07b3b6b7
--- /dev/null
+++ b/@types/arrgv.d.ts
@@ -0,0 +1,3 @@
+declare module "arrgv" {
+ export default function arrgv(input: string): string[];
+}
diff --git a/apps/builder/app/builder/features/settings-panel/curl.test.ts b/apps/builder/app/builder/features/settings-panel/curl.test.ts
index 191f18b7ef..5e604f457e 100644
--- a/apps/builder/app/builder/features/settings-panel/curl.test.ts
+++ b/apps/builder/app/builder/features/settings-panel/curl.test.ts
@@ -1,5 +1,5 @@
import { expect, test } from "@jest/globals";
-import { generateCurl, parseCurl } from "./curl";
+import { generateCurl, parseCurl, type CurlRequest } from "./curl";
test("support url", () => {
const result = {
@@ -126,6 +126,10 @@ test("support json body", () => {
});
});
+test("avoid failing on syntax error", () => {
+ expect(parseCurl("curl \\")).toEqual(undefined);
+});
+
test("generate curl with json body", () => {
expect(
generateCurl({
@@ -169,3 +173,24 @@ test("generate curl without body", () => {
--request post"
`);
});
+
+test("multiline graphql is idempotent", () => {
+ const request: CurlRequest = {
+ url: "https://eu-central-1-shared-euc1-02.cdn.hygraph.com/content/clorhpxi8qx7r01t6hfp1b5f6/master",
+ method: "post",
+ headers: [{ name: "Content-Type", value: "application/json" }],
+ body: {
+ query: `
+ query Posts {
+ posts {
+ slug
+ title
+ updatedAt
+ excerpt
+ }
+ }
+ `,
+ },
+ };
+ expect(parseCurl(generateCurl(request))).toEqual(request);
+});
diff --git a/apps/builder/app/builder/features/settings-panel/curl.ts b/apps/builder/app/builder/features/settings-panel/curl.ts
index e5b8cc28d7..61e2bdadad 100644
--- a/apps/builder/app/builder/features/settings-panel/curl.ts
+++ b/apps/builder/app/builder/features/settings-panel/curl.ts
@@ -1,5 +1,5 @@
import type { ResourceRequest } from "@webstudio-is/sdk";
-import { parseArgsStringToArgv } from "string-argv";
+import arrgv from "arrgv";
import { parse as parseArgs } from "ultraflag";
/*
@@ -24,10 +24,18 @@ const getMethod = (value: string): ResourceRequest["method"] => {
}
};
-type CurlRequest = Pick<ResourceRequest, "url" | "method" | "headers" | "body">;
+export type CurlRequest = Pick<
+ ResourceRequest,
+ "url" | "method" | "headers" | "body"
+>;
export const parseCurl = (curl: string): undefined | CurlRequest => {
- const argv = parseArgsStringToArgv(curl);
+ let argv;
+ try {
+ argv = arrgv(curl);
+ } catch {
+ return;
+ }
if (argv.length === 0) {
return;
}
diff --git a/apps/builder/package.json b/apps/builder/package.json
index c77e15cf03..824236d567 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -78,6 +78,7 @@
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
+ "arrgv": "^1.0.2",
"bcp-47": "^2.1.0",
"change-case": "^5.0.2",
"colord": "^2.9.3",
@@ -114,7 +115,6 @@
"remix-island": "^0.2.0",
"shallow-equal": "^3.1.0",
"slugify": "^1.6.6",
- "string-argv": "^0.3.2",
"strip-indent": "^4.0.0",
"title-case": "^4.1.0",
"ultraflag": "^0.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad2c42394c..372da4dfb1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -243,6 +243,9 @@ importers:
'@webstudio-is/trpc-interface':
specifier: workspace:*
version: link:../../packages/trpc-interface
+ arrgv:
+ specifier: ^1.0.2
+ version: 1.0.2
bcp-47:
specifier: ^2.1.0
version: 2.1.0
@@ -351,9 +354,6 @@ importers:
slugify:
specifier: ^1.6.6
version: 1.6.6
- string-argv:
- specifier: ^0.3.2
- version: 0.3.2
strip-indent:
specifier: ^4.0.0
version: 4.0.0
@@ -5317,6 +5317,10 @@ packages:
resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
engines: {node: '>=8'}
+ resolution: {integrity: sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==}
+ engines: {node: '>=8.0.0'}
+
resolution: {integrity: sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==}
@@ -8981,10 +8985,6 @@ packages:
resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
engines: {node: '>=0.6.19'}
- resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
- engines: {node: '>=0.6.19'}
-
resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==}
@@ -14682,6 +14682,8 @@ snapshots:
+
dependencies:
printable-characters: 1.0.42
@@ -19199,8 +19201,6 @@ snapshots:
-