@wix/cli 1.1.62 → 1.1.64

package/build/{chunk-G34I4OXF.js → chunk-IC6K6CSD.js}

@@ -14,14 +14,14 @@ import {
 } from "./chunk-W423UTD3.js";
 import {
   readUserConfig
-} from "./chunk-LWQGSEXR.js";
+} from "./chunk-YX66M2XN.js";
 import {
   getTestOverrides
 } from "./chunk-PX2L3CCA.js";
 import {
   isCliError,
   isCliSystemError
-} from "./chunk-YQW75RJ5.js";
+} from "./chunk-PWEJ3IWM.js";
 import {
   __commonJS,
   __toESM,
@@ -1281,4 +1281,4 @@ export {
   createBiLogger,
   reportCommandStartEvent
 };
-//# sourceMappingURL=chunk-G34I4OXF.js.map
+//# sourceMappingURL=chunk-IC6K6CSD.js.map

package/build/{chunk-ZIXYUOVJ.js → chunk-JASQWANH.js}

@@ -10,11 +10,11 @@ import {
 import {
   readJson,
   writeJson
-} from "./chunk-ETAVRPIY.js";
+} from "./chunk-QPYNVASM.js";
 import {
   CliError,
   CliErrorCode
-} from "./chunk-YQW75RJ5.js";
+} from "./chunk-PWEJ3IWM.js";
 import {
   init_esm_shims
 } from "./chunk-PYIAC2GK.js";
@@ -64,4 +64,4 @@ export {
   loadProjectModel,
   saveProjectModel
 };
-//# sourceMappingURL=chunk-ZIXYUOVJ.js.map
+//# sourceMappingURL=chunk-JASQWANH.js.map

package/build/{chunk-OSWRZGLN.js → chunk-JKBX72QC.js}

@@ -2,21 +2,21 @@ import { createRequire as _createRequire } from 'node:module';
 const require = _createRequire(import.meta.url);
 import {
   require_react
-} from "./chunk-4YD2W3LA.js";
+} from "./chunk-4XPWCRGU.js";
 import {
   WIX_CONFIG_FILENAME,
   getWixConfigFilePath
 } from "./chunk-SEOIN2A6.js";
 import {
   readJson
-} from "./chunk-ETAVRPIY.js";
+} from "./chunk-QPYNVASM.js";
 import {
   z
 } from "./chunk-PX2L3CCA.js";
 import {
   CliError,
   CliErrorCode
-} from "./chunk-YQW75RJ5.js";
+} from "./chunk-PWEJ3IWM.js";
 import {
   __toESM,
   init_esm_shims
@@ -80,4 +80,4 @@ export {
   ProjectModelProvider,
   useProjectModel
 };
-//# sourceMappingURL=chunk-OSWRZGLN.js.map
+//# sourceMappingURL=chunk-JKBX72QC.js.map

package/build/{chunk-DTRL25IG.js → chunk-JXGBYZK7.js}

@@ -3,7 +3,7 @@ const require = _createRequire(import.meta.url);
 import {
   listFiles,
   updateFiles
-} from "./chunk-OEYFKLWJ.js";
+} from "./chunk-YHMLI3NZ.js";
 import {
   GridAppLayout
 } from "./chunk-6LI4WGAW.js";
@@ -13,15 +13,15 @@ import {
   RcLabel,
   createApp,
   deployApp
-} from "./chunk-YYH6VZI3.js";
+} from "./chunk-QP2SHVU3.js";
 import {
   createHttpClient,
   pRetry,
   useAuth
-} from "./chunk-XOFZJ3JQ.js";
+} from "./chunk-KJCRO3PB.js";
 import {
   require_react
-} from "./chunk-4YD2W3LA.js";
+} from "./chunk-4XPWCRGU.js";
 import {
   getTestOverrides,
   z
@@ -29,7 +29,7 @@ import {
 import {
   CliError,
   CliErrorCode
-} from "./chunk-YQW75RJ5.js";
+} from "./chunk-PWEJ3IWM.js";
 import {
   __toESM,
   init_esm_shims
@@ -76,13 +76,14 @@ var listFilesSchema = z.object({
     })
   )
 });
-var deploymentInfo = z.object({
-  deploymentId: z.string(),
-  deploymentUrl: z.string().url(),
-  deploymentShortUrl: z.string().url().optional(),
-  isPublishPipelineDeployment: z.boolean()
+var deployAppSchema = z.object({
+  deploymentInfo: z.object({
+    deploymentId: z.string().uuid(),
+    deploymentUrl: z.string().url(),
+    deploymentShortUrl: z.string().url().optional(),
+    isPublishPipelineDeployment: z.boolean()
+  })
 });
-var deployAppSchema = z.object({ deploymentInfo });
 
 // ../velo-client/src/velo-client.ts
 var VeloClient = class {
@@ -102,10 +103,7 @@ var VeloClient = class {
         () => this.httpClient.request(
           createApp({
             app: { mutable: true, appType: AppType.VELO_ISOLATED },
-            content: {
-              ...content,
-              layout: GridAppLayout[content.layout]
-            }
+            content
           })
         ),
         this.retryOptions
@@ -145,7 +143,6 @@ var VeloClient = class {
         () => this.httpClient.request(
           updateFiles({
             ...content,
-            layout: GridAppLayout[content.layout],
             gridAppId: appId
           })
         ),
@@ -193,4 +190,4 @@ export {
   useHttpClient,
   useVeloClient
 };
-//# sourceMappingURL=chunk-DTRL25IG.js.map
+//# sourceMappingURL=chunk-JXGBYZK7.js.map

package/build/chunk-JXGBYZK7.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../cli-http-client-react/src/useHttpClient.ts","../../cli-http-client-react/src/index.ts","../../velo-client/src/useVeloClient.ts","../../velo-client/src/velo-client.ts","../../velo-client/src/schemas.ts","../../velo-client/src/index.ts"],"sourcesContent":["import { useMemo } from 'react';\nimport { useAuth } from '@wix/cli-auth';\nimport type { CreateHttpClientOptions, HttpClient } from '@wix/cli-http-client';\nimport { createHttpClient } from '@wix/cli-http-client';\n\nexport function useHttpClient({\n  type,\n}: Pick<CreateHttpClientOptions, 'type'>): HttpClient {\n  const { getAccessToken: getAppToken, getRequestHeaders: createHeaders } =\n    useAuth();\n\n  return useMemo(\n    () => createHttpClient({ type, getAppToken, createHeaders }),\n    [type, getAppToken, createHeaders]\n  );\n}\n","export { useHttpClient } from './useHttpClient.js';\n","import { useMemo } from 'react';\nimport { useHttpClient } from '@wix/cli-http-client-react';\nimport { VeloClient } from './velo-client.js';\n\nexport function useVeloClient(): VeloClient {\n  const httpClient = useHttpClient({ type: 'code' });\n  return useMemo(() => new VeloClient(httpClient), [httpClient]);\n}\n","import type { HttpClient } from '@wix/cli-http-client';\nimport pRetry from 'p-retry';\nimport type { Options } from 'p-retry';\nimport { CliError, CliErrorCode } from '@wix/cli-error';\nimport { getTestOverrides } from '@wix/cli-test-overrides';\nimport {\n  AppType,\n  RcLabel,\n  DeploymentOperation,\n} from '@wix/ambassador-velo-apps-v1-app/types';\nimport type { DeploymentData } from '@wix/ambassador-velo-apps-v1-app/types';\nimport { createApp, deployApp } from '@wix/ambassador-velo-apps-v1-app/http';\nimport {\n  listFiles,\n  updateFiles,\n} from '@wix/ambassador-velo-ide-v1-gridapp-filestructure/http';\nimport { GridAppLayout } from '@wix/ambassador-velo-ide-v1-gridapp-filestructure/types';\nimport {\n  createAppSchema,\n  listFilesSchema,\n  deployAppSchema,\n} from './schemas.js';\nimport type { AppContent, UpdateFilesContent } from './types.js';\n\nexport class VeloClient {\n  private readonly retryOptions: Options;\n\n  constructor(private readonly httpClient: HttpClient) {\n    const { minRetryTimeout } = getTestOverrides();\n\n    this.retryOptions = {\n      retries: 3,\n      minTimeout: minRetryTimeout,\n      maxTimeout: 3 * 1000,\n    };\n  }\n\n  createMutableApp = async (content: AppContent) => {\n    try {\n      const { data } = await pRetry(\n        () =>\n          this.httpClient.request(\n            createApp({\n              app: { mutable: true, appType: AppType.VELO_ISOLATED },\n              content,\n            })\n          ),\n        this.retryOptions\n      );\n\n      return createAppSchema.parse(data).app;\n    } catch (e) {\n      throw new CliError({\n        code: CliErrorCode.FailedToCreateVeloApp(),\n        cause: e,\n      });\n    }\n  };\n\n  listAppFiles = async (appId: string) => {\n    try {\n      const { data } = await pRetry(\n        () =>\n          this.httpClient.request(\n            listFiles({\n              gridAppId: appId,\n              layout: GridAppLayout.GITHUB,\n              hideDeletedPages: true,\n              includeNewPages: false,\n            })\n          ),\n        this.retryOptions\n      );\n      return listFilesSchema.parse(data);\n    } catch (e) {\n      throw new CliError({\n        code: CliErrorCode.FailedToGetFilesFromVelo(),\n        cause: e,\n      });\n    }\n  };\n\n  updateAppFiles = async (appId: string, content: UpdateFilesContent) => {\n    try {\n      await pRetry(\n        () =>\n          this.httpClient.request(\n            updateFiles({\n              ...content,\n              gridAppId: appId,\n            })\n          ),\n        this.retryOptions\n      );\n    } catch (e) {\n      throw new CliError({\n        code: CliErrorCode.FailedToUpdateVeloAppFiles(),\n        cause: e,\n      });\n    }\n  };\n\n  deploySitePreview = async (deploymentData: DeploymentData) => {\n    try {\n      const { data } = await this.httpClient.request(\n        deployApp({\n          appType: AppType.VELO,\n          deploymentOperation: DeploymentOperation.RC,\n          deploymentData,\n          rcDeploymentParams: {\n            rcLabel: RcLabel.WIX_CLI,\n          },\n        })\n      );\n\n      return deployAppSchema.parse(data).deploymentInfo;\n    } catch (e) {\n      throw new CliError({\n        code: CliErrorCode.FailedToDeploySitePreview(),\n        cause: e,\n      });\n    }\n  };\n}\n","import { z } from 'zod';\n\nexport const createAppSchema = z.object({\n  app: z.object({ id: z.string() }),\n});\n\nexport const listFilesSchema = z.object({\n  files: z.array(\n    z.object({\n      path: z.string(),\n      content: z.string(),\n    })\n  ),\n  directories: z.array(\n    z.object({\n      path: z.string(),\n    })\n  ),\n});\n\nexport const deployAppSchema = z.object({\n  deploymentInfo: z.object({\n    deploymentId: z.string().uuid(),\n    deploymentUrl: z.string().url(),\n    deploymentShortUrl: z.string().url().optional(),\n    isPublishPipelineDeployment: z.boolean(),\n  }),\n});\n","export type { Directory, File } from './types.js';\nexport { GridAppLayout } from '@wix/ambassador-velo-ide-v1-gridapp-filestructure/types';\nexport { VeloClient } from './velo-client.js';\nexport { useVeloClient } from './useVeloClient.js';\n"],"mappings":"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","names":["import_react"]}

package/build/{chunk-KCTZ5EX4.js → chunk-K74KSKUR.js}

@@ -1011,20 +1011,35 @@ var require_option = __commonJS({
       const flagParts = flags.split(/[ |,]+/).concat("guard");
       if (shortFlagExp.test(flagParts[0])) shortFlag = flagParts.shift();
       if (longFlagExp.test(flagParts[0])) longFlag = flagParts.shift();
-      if (/^-[^-][^-]/.test(flagParts[0]))
-        throw new Error(
-          `invalid Option flags, short option is dash and single character: '${flags}'`
-        );
-      if (shortFlag && shortFlagExp.test(flagParts[0]))
-        throw new Error(
-          `invalid Option flags, more than one short flag: '${flags}'`
-        );
-      if (longFlag && longFlagExp.test(flagParts[0]))
+      if (!shortFlag && shortFlagExp.test(flagParts[0]))
+        shortFlag = flagParts.shift();
+      if (!shortFlag && longFlagExp.test(flagParts[0])) {
+        shortFlag = longFlag;
+        longFlag = flagParts.shift();
+      }
+      if (flagParts[0].startsWith("-")) {
+        const unsupportedFlag = flagParts[0];
+        const baseError = `option creation failed due to '${unsupportedFlag}' in option flags '${flags}'`;
+        if (/^-[^-][^-]/.test(unsupportedFlag))
+          throw new Error(
+            `${baseError}
+- a short flag is a single dash and a single character
+  - either use a single dash and a single character (for a short flag)
+  - or use a double dash for a long option (and can have two, like '--ws, --workspace')`
+          );
+        if (shortFlagExp.test(unsupportedFlag))
+          throw new Error(`${baseError}
+- too many short flags`);
+        if (longFlagExp.test(unsupportedFlag))
+          throw new Error(`${baseError}
+- too many long flags`);
+        throw new Error(`${baseError}
+- unrecognised flag format`);
+      }
+      if (shortFlag === void 0 && longFlag === void 0)
         throw new Error(
-          `invalid Option flags, more than one long flag: '${flags}'`
+          `option creation failed due to no flags found in '${flags}'.`
         );
-      if (!(shortFlag || longFlag) || flagParts[0].startsWith("-"))
-        throw new Error(`invalid Option flags: '${flags}'`);
       return { shortFlag, longFlag };
     }
     exports.Option = Option2;
@@ -1756,7 +1771,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @example
        * program
        *     .option('-p, --pepper', 'add pepper')
-       *     .option('-p, --pizza-type <TYPE>', 'type of pizza') // required option-argument
+       *     .option('--pt, --pizza-type <TYPE>', 'type of pizza') // required option-argument
        *     .option('-c, --cheese [CHEESE]', 'add extra cheese', 'mozzarella') // optional option-argument with default
        *     .option('-t, --tip <VALUE>', 'add tip to purchase cost', parseFloat) // custom parse function
        *
@@ -3344,4 +3359,4 @@ export {
   Argument,
   Option
 };
-//# sourceMappingURL=chunk-KCTZ5EX4.js.map
+//# sourceMappingURL=chunk-K74KSKUR.js.map