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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: improve CLI link command (#3449)
Bogdan Chadkin42a145d72926
diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 699920a23c..1b0bfc9907 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -24,6 +24,7 @@},"license": "AGPL-3.0-or-later","dependencies": {+ "@clack/prompts": "^0.7.0","@webstudio-is/http-client": "workspace:*","@webstudio-is/image": "workspace:*","@webstudio-is/react-sdk": "workspace:*",@@ -36,7 +37,7 @@"execa": "^7.2.0","ora": "^7.0.1","p-limit": "^4.0.0",- "picocolors": "^1.0.0",+ "picocolors": "^1.0.1","prompts": "^2.4.2","strip-indent": "^4.0.0","title-case": "^4.1.0",diff --git a/packages/cli/src/commands/link.ts b/packages/cli/src/commands/link.tsindex 215f0d5769..8e0b4576d2 100644--- a/packages/cli/src/commands/link.ts+++ b/packages/cli/src/commands/link.ts@@ -1,7 +1,7 @@-import { stdin, stdout, cwd } from "node:process";+import { cwd, exit } from "node:process";import { join } from "node:path";-import * as readline from "node:readline/promises";import { readFile, writeFile } from "node:fs/promises";+import { cancel, isCancel, log, text } from "@clack/prompts";import {GLOBAL_CONFIG_FILE,LOCAL_CONFIG_FILE,@@ -15,6 +15,40 @@ import type {StrictYargsOptionsToInterface,} from "./yargs-types";+const parseShareLink = (value: string) => {+ const url = new URL(value);+ const origin = url.origin;+ const token = url.searchParams.get("authToken");+ // @todo parse with URLPattern once landed in node+ const segments = url.pathname.split("/").slice(1);+ if (segments.length !== 2 || segments[0] !== "builder") {+ throw Error("Segments not matching");+ }+ const [_builder, projectId] = segments;+ if (token == null) {+ throw Error("Token is missing");+ }+ return {+ origin,+ projectId,+ token,+ };+};++export const validateShareLink = (value: string) => {+ if (value.length === 0) {+ return "Share link is required";+ }+ if (URL.canParse(value) === false) {+ return "Share link is invalid";+ }+ try {+ parseShareLink(value);+ } catch {+ return "Share link is invalid";+ }+};+export const linkOptions = (yargs: CommonYargsArgv) =>yargs.option("link", {alias: "l",@@ -25,62 +59,44 @@ export const linkOptions = (yargs: CommonYargsArgv) =>export const link = async (options: StrictYargsOptionsToInterface<typeof linkOptions> | { link?: string }) => {- let shareLink: string;+ let shareLink: string | symbol;if (options.link) {shareLink = options.link;} else {- const rl = readline.createInterface({ input: stdin, output: stdout });- shareLink = await rl.question(- `Please paste a link from the Share Dialog in the builder: `- );- rl.close();- }-- const shareLinkUrl = new URL(shareLink);- const origin = shareLinkUrl.origin;- const token = shareLinkUrl.searchParams.get("authToken");- const paths = shareLinkUrl.pathname.split("/").slice(1);-- if (paths[0] !== "builder" || paths.length !== 2) {- throw new Error("Invalid share link.");- }-- const projectId = paths[1];-- if (token == null) {- throw new Error("Invalid share link.");+ shareLink = await text({+ message: "Please paste a link from the Share Dialog in the builder",+ validate: validateShareLink,+ });+ if (isCancel(shareLink)) {+ cancel("Project linking is cancelled");+ exit(1);+ }}- try {- const currentConfig = await readFile(GLOBAL_CONFIG_FILE, "utf-8");- const currentConfigJson = jsonToGlobalConfig(JSON.parse(currentConfig));+ const { origin, projectId, token } = parseShareLink(shareLink);- const newConfig: GlobalConfig = {- ...currentConfigJson,- [projectId]: {- origin,- token,- },- };+ const currentConfig = await readFile(GLOBAL_CONFIG_FILE, "utf-8");+ const currentConfigJson = jsonToGlobalConfig(JSON.parse(currentConfig));- await writeFile(GLOBAL_CONFIG_FILE, JSON.stringify(newConfig, null, 2));- console.info(`Saved credentials for project ${projectId}.- You can find your config at ${GLOBAL_CONFIG_FILE}- `);+ const newConfig: GlobalConfig = {+ ...currentConfigJson,+ [projectId]: {+ origin,+ token,+ },+ };- const localConfig: LocalConfig = {- projectId,- };+ await writeFile(GLOBAL_CONFIG_FILE, JSON.stringify(newConfig, null, 2));+ log.info(`Saved credentials for project ${projectId}.+You can find your config at ${GLOBAL_CONFIG_FILE}`);- await createFileIfNotExists(- join(cwd(), LOCAL_CONFIG_FILE),- JSON.stringify(localConfig, null, 2)- );- } catch (error: unknown) {- if (error instanceof Error && "code" in error && error.code === "ENONET") {- throw new Error(`Global config file is not found`);- }+ const localConfig: LocalConfig = {+ projectId,+ };- throw error;- }+ await createFileIfNotExists(+ join(cwd(), LOCAL_CONFIG_FILE),+ JSON.stringify(localConfig, null, 2)+ );+ log.success("The project is linked successfully.");};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 498c7d140a..8c5ad0c840 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -936,6 +936,9 @@ importers:packages/cli:dependencies:+ '@clack/prompts':+ specifier: ^0.7.0+ version: 0.7.0'@webstudio-is/http-client':specifier: workspace:*version: link:../http-client@@ -973,8 +976,8 @@ importers:specifier: ^4.0.0version: 4.0.0picocolors:- specifier: ^1.0.0- version: 1.0.0+ specifier: ^1.0.1+ version: 1.0.1prompts:specifier: ^2.4.2version: 2.4.2@@ -2857,6 +2860,14 @@ packages:'@bcoe/[email protected]':resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}+ '@clack/[email protected]':+ resolution: {integrity: sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==}++ '@clack/[email protected]':+ resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==}+ bundledDependencies:+ - is-unicode-supported+'@cloudflare/[email protected]':resolution: {integrity: sha512-FNcunDuTmEfQTLRLtA6zz+buIXUHj1soPvSWzzQFBC+n2lsy+CGf/NIrR3SEPCmsVNQj70/Jx2lViCpq+09YpQ==}@@ -9600,7 +9611,7 @@ snapshots:'@babel/[email protected]':dependencies:'@babel/highlight': 7.24.2- picocolors: 1.0.0+ picocolors: 1.0.1'@babel/[email protected]': {}@@ -9888,7 +9899,7 @@ snapshots:'@babel/helper-validator-identifier': 7.22.20chalk: 2.4.2js-tokens: 4.0.0- picocolors: 1.0.0+ picocolors: 1.0.1'@babel/[email protected]':dependencies:@@ -10636,6 +10647,17 @@ snapshots:'@bcoe/[email protected]': {}+ '@clack/[email protected]':+ dependencies:+ picocolors: 1.0.1+ sisteransi: 1.0.5++ '@clack/[email protected]':+ dependencies:+ '@clack/core': 0.3.4+ picocolors: 1.0.1+ sisteransi: 1.0.5+'@cloudflare/[email protected]':dependencies:mime: 2.6.0@@ -16931,7 +16953,7 @@ snapshots:dependencies:- picocolors: 1.0.0+ picocolors: 1.0.1@@ -17352,13 +17374,13 @@ snapshots:dependencies:nanoid: 3.3.6- picocolors: 1.0.0+ picocolors: 1.0.1source-map-js: 1.0.2dependencies:nanoid: 3.3.7- picocolors: 1.0.0+ picocolors: 1.0.1source-map-js: 1.2.0@@ -18019,7 +18041,7 @@ snapshots:globby: 11.1.0lilconfig: 2.1.0nanospinner: 1.1.0- picocolors: 1.0.0+ picocolors: 1.0.1@@ -18242,7 +18264,7 @@ snapshots:css-select: 5.1.0css-tree: 2.3.1(patch_hash=epgcmebti7rfrc2ej4odb3t4jy)csso: 5.0.5- picocolors: 1.0.0+ picocolors: 1.0.1dependencies:@@ -18276,7 +18298,7 @@ snapshots:micromatch: 4.0.5normalize-path: 3.0.0object-hash: 3.0.0- picocolors: 1.0.0+ picocolors: 1.0.1postcss: 8.4.27postcss-import: 15.1.0([email protected])postcss-js: 4.0.1([email protected])@@ -18614,7 +18636,7 @@ snapshots:dependencies:browserslist: 4.21.9escalade: 3.1.1- picocolors: 1.0.0+ picocolors: 1.0.1dependencies:@@ -18721,7 +18743,7 @@ snapshots:debug: 4.3.4mlly: 1.6.1pathe: 1.1.2- picocolors: 1.0.0+ picocolors: 1.0.1source-map: 0.6.1source-map-support: 0.5.21vite: 4.4.9(@types/[email protected])