@wix/create-new 0.0.74 → 0.0.76

package/build/{generator-2JIICGOZ.js → generator-CUTI2BWL.js}

@@ -13,7 +13,7 @@ import {
   require_lib,
   temporaryDirectory,
   updateEnvFile
-} from "./chunk-FUS6MQZW.js";
+} from "./chunk-SP6CBGLK.js";
 import {
   __toESM,
   init_esm_shims
@@ -115,4 +115,4 @@ async function generateApp({
 export {
   generateApp
 };
-//# sourceMappingURL=generator-2JIICGOZ.js.map
+//# sourceMappingURL=generator-CUTI2BWL.js.map

package/build/index.js

@@ -118,7 +118,7 @@ import {
   writeJson,
   writePackageJson,
   zod_default
-} from "./chunk-FUS6MQZW.js";
+} from "./chunk-SP6CBGLK.js";
 import {
   __commonJS,
   __dirname,
@@ -65643,7 +65643,7 @@ ${errorMessage2}`
         }
       );
     },
-    ProjectNameArgumentIsInvalid: ({ errorMessage: errorMessage2 }) => {
+    HeadlessArgumentIsInvalid: ({ errorMessage: errorMessage2 }) => {
       return () => /* @__PURE__ */ import_react83.default.createElement(
         ErrorMessage,
         {
@@ -81801,7 +81801,7 @@ function getTasks({
         cause: e2
       });
     }
-    const { generateApp } = await import("./generator-2JIICGOZ.js");
+    const { generateApp } = await import("./generator-CUTI2BWL.js");
     await generateApp({
       packageName,
       packageFolder,
@@ -82343,22 +82343,48 @@ import process26 from "node:process";
 
 // ../create-new-packages/headless-command/src/validations/validate-business-name.ts
 init_esm_shims();
+
+// ../create-new-packages/headless-command/src/project-slug.ts
+init_esm_shims();
+var import_kebabCase4 = __toESM(require_kebabCase(), 1);
+import { randomBytes as randomBytes2 } from "node:crypto";
+var INVALID_PROJECT_SLUG_MESSAGE = "The business name must include at least one English letter or number so we can generate a valid project URL.";
+function isProjectSlugValid(name) {
+  const projectSlug = getProjectSlugBase(name);
+  if (!projectSlug) {
+    throw new InvalidArgumentError(INVALID_PROJECT_SLUG_MESSAGE);
+  }
+}
+function getProjectSlugBase(name) {
+  return (0, import_kebabCase4.default)(name).replaceAll(/[^a-z0-9-]/gi, "").replace(/^-+/, "").slice(0, 10).replace(/-+$/, "");
+}
+function generateProjectSlug(name) {
+  const base = getProjectSlugBase(name);
+  if (!base) {
+    throw new Error(INVALID_PROJECT_SLUG_MESSAGE);
+  }
+  const salt = randomBytes2(4).toString("hex");
+  return `${base}-${salt}`;
+}
+
+// ../create-new-packages/headless-command/src/validations/validate-business-name.ts
 var schema3 = external_exports.string().min(1).max(255);
 var validateBusinessName = (value2) => {
   const result = schema3.safeParse(value2);
   if (!result.success) {
     throw new InvalidArgumentError("The name must be 1 to 255 characters long");
   }
+  isProjectSlugValid(value2);
   return value2;
 };
 
-// ../create-new-packages/headless-command/src/validations/validate-project-name.ts
+// ../create-new-packages/headless-command/src/validations/folder-name.ts
 init_esm_shims();
-var validateProjectName = (value2) => {
-  const re = /^[a-z0-9]{3,20}$/;
+var validateFolderName = (value2) => {
+  const re = /^[a-z0-9][a-z0-9-]*$/;
   if (!re.test(value2)) {
     throw new InvalidArgumentError(
-      "The value must be 3 to 20 characters long and contain only lowercase letters, numbers."
+      "The value must contain only lowercase letters, numbers, and hyphens."
     );
   }
   return value2;
@@ -82542,14 +82568,7 @@ var import_variant47 = __toESM(require_lib(), 1);
 
 // ../create-new-packages/headless-command/src/hooks/create-project.ts
 init_esm_shims();
-var import_kebabCase4 = __toESM(require_kebabCase(), 1);
-import { randomBytes as randomBytes2 } from "node:crypto";
 var DEFAULT_ENVIRONMENT_NAME2 = "system_global";
-function generateSlug(projectName) {
-  const base = (0, import_kebabCase4.default)(projectName).replaceAll(/[^a-z0-9-]/gi, "").slice(0, 10).replace(/-$/, "");
-  const salt = randomBytes2(4).toString("hex");
-  return `${base}-${salt}`;
-}
 function truncateName(name, maxLength) {
   if (name.length > maxLength) {
     return `${name.slice(0, maxLength - 3)}...`;
@@ -82557,22 +82576,33 @@ function truncateName(name, maxLength) {
   return name;
 }
 var useCreateProject = (businessId) => {
-  const { updateOAuthApp: updateOAuthApp2, getAppSecret, createCompanionApp, installApp: installApp2 } = useDevCenterClient({
+  const {
+    updateOAuthApp: updateOAuthApp2,
+    getAppSecret,
+    createCompanionApp,
+    installApp: installApp2,
+    setNamespace: setNamespace2
+  } = useDevCenterClient({
     siteId: businessId
   });
   const { createAppProject: createAppProject2, upsertAppEnvironment: upsertAppEnvironment2 } = useBackendAsAServiceClient();
   return useAsyncCallback3(
     async (_2, {
-      projectName,
+      businessName,
       cloudProviders
     }) => {
       const { id: projectId } = await createCompanionApp();
+      const slug = generateProjectSlug(businessName);
+      await setNamespace2({
+        appId: projectId,
+        namespace: slug
+      });
       const appInstall = await installApp2(businessId, projectId);
       const publicKeyAndSecret = await getAppSecret({ appId: projectId });
       const appProject = await createAppProject2({
         id: projectId,
-        displayName: truncateName(projectName, 50),
-        slug: generateSlug(projectName),
+        displayName: truncateName(businessName, 50),
+        slug,
         cloudProvider: cloudProviders?.[0],
         projectType: "HEADLESS"
       });
@@ -82608,7 +82638,7 @@ var useCreateProject = (businessId) => {
       );
       const projectData = {
         projectId,
-        projectName,
+        businessName,
         instanceId: appInstall.appInstance.id,
         appSecret: publicKeyAndSecret.appSecret,
         webhookPublicKey: publicKeyAndSecret.webhookPublicKey,
@@ -82621,12 +82651,7 @@ var useCreateProject = (businessId) => {
 };
 
 // ../create-new-packages/headless-command/src/components/CreateProject.tsx
-var CreateProject = ({
-  onSubmit,
-  projectName: providedProjectName,
-  businessId,
-  cloudProviders
-}) => {
+var CreateProject = ({ onSubmit, businessName, businessId, cloudProviders }) => {
   const { status, execute } = useCreateProject(businessId);
   (0, import_react139.useEffect)(() => {
     if ((0, import_variant47.isType)(status, "Success")) {
@@ -82634,27 +82659,11 @@ var CreateProject = ({
     }
   }, [status, onSubmit]);
   (0, import_react139.useEffect)(() => {
-    if (providedProjectName) {
-      void execute({ projectName: providedProjectName, cloudProviders });
-    }
-  }, [providedProjectName, cloudProviders, execute]);
-  const validate3 = (0, import_react139.useCallback)(async (projectName) => {
-    try {
-      validateProjectName(projectName);
-      return true;
-    } catch (e2) {
-      return e2.message;
-    }
-  }, []);
-  return /* @__PURE__ */ import_react139.default.createElement(import_react139.default.Fragment, null, !providedProjectName && /* @__PURE__ */ import_react139.default.createElement(
-    TextInput2,
-    {
-      label: "Enter the name of your Custom Frontend project.",
-      onSubmit: (projectName) => execute({ projectName, cloudProviders }),
-      validate: validate3,
-      inCreateFlow: true
+    if (businessName) {
+      void execute({ businessName, cloudProviders });
     }
-  ), (0, import_variant47.match)(status, {
+  }, [businessName, cloudProviders, execute]);
+  return /* @__PURE__ */ import_react139.default.createElement(import_react139.default.Fragment, null, (0, import_variant47.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react139.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react139.default.createElement(Spinner2, { text: "Creating your project..." })),
     Success: () => /* @__PURE__ */ import_react139.default.createElement(Box_default, { marginLeft: -2, marginBottom: 1 }, /* @__PURE__ */ import_react139.default.createElement(Alert, { type: "success" }, /* @__PURE__ */ import_react139.default.createElement(Badge, { skin: "success" }, "Success"), " ", /* @__PURE__ */ import_react139.default.createElement(Text2, null, "Project created."))),
@@ -91874,7 +91883,6 @@ async function hasAstroConfigurationFile(projectFolder) {
 }
 var LinkCommand = ({
   projectFolder,
-  projectName: preEnteredProjectName,
   businessName: preEnteredBusinessName
 }) => {
   const [businessName, setBusinessName] = (0, import_react144.useState)(preEnteredBusinessName);
@@ -91934,7 +91942,7 @@ var LinkCommand = ({
           CreateProject,
           {
             businessId,
-            projectName: preEnteredProjectName,
+            businessName,
             onSubmit: (data) => setProjectData(data)
           }
         )),
@@ -92044,7 +92052,7 @@ function parseProviderString(cloudProvider) {
       return CloudProvider.KUBERNETES;
     default:
       throw new CliError({
-        code: CliErrorCode.ProjectNameArgumentIsInvalid({
+        code: CliErrorCode.HeadlessArgumentIsInvalid({
           errorMessage: `Invalid cloud provider: "${cloudProvider}".`
         }),
         cause: null
@@ -92088,57 +92096,54 @@ async function parseTemplateOptions2(options) {
     return TemplateSource2.HeadlessApp(appTemplate);
   }
 }
-async function parseProjectNameOptions(targetParentFolder2, options) {
-  const projectName = options.projectName;
-  if (projectName) {
-    if (!await validateDirectory2(join12(targetParentFolder2, projectName))) {
+async function parseFolderNameOptions(targetParentFolder2, options) {
+  const folderName = options.folderName;
+  if (folderName) {
+    if (!await validateDirectory2(join12(targetParentFolder2, folderName))) {
       throw new CliError({
-        code: CliErrorCode.ProjectNameArgumentIsInvalid({
-          errorMessage: `"${projectName}" directory is not empty`
+        code: CliErrorCode.HeadlessArgumentIsInvalid({
+          errorMessage: `"${folderName}" directory is not empty`
         }),
         cause: void 0
       });
     }
-    const npmValidationErrors = await validatePackageName2(projectName);
+    const npmValidationErrors = await validatePackageName2(folderName);
     if ((0, import_variant52.isType)(npmValidationErrors, "Error")) {
       throw new CliError({
-        code: CliErrorCode.ProjectNameArgumentIsInvalid({
-          errorMessage: `Invalid package name "${projectName}". Fix the following issues: ${npmValidationErrors.payload.join(", ")}`
+        code: CliErrorCode.HeadlessArgumentIsInvalid({
+          errorMessage: `Invalid package name "${folderName}". Fix the following issues: ${npmValidationErrors.payload.join(", ")}`
         }),
         cause: void 0
       });
     }
-    return projectName;
+    return folderName;
   }
   return;
 }
 var processPublish = ({
   template,
-  projectName,
+  folderName,
   businessName,
   publish
 }) => {
-  if (template && projectName && businessName) {
+  if (template && folderName && businessName) {
     return publish ?? false;
   }
   return publish;
 };
 async function parseCommandOptions2(targetParentFolder2, options) {
   const template = await parseTemplateOptions2(options);
-  const projectName = await parseProjectNameOptions(
-    targetParentFolder2,
-    options
-  );
   const cloudProviders = parseCloudProviders();
+  const folderName = await parseFolderNameOptions(targetParentFolder2, options);
   const publish = processPublish({
     template,
-    projectName,
+    folderName,
     businessName: options.businessName,
     publish: options.publish
   });
   return {
     template,
-    projectName,
+    folderName,
     businessName: options.businessName,
     cloudProviders,
     publish
@@ -92198,11 +92203,16 @@ init_esm_shims();
 var import_react145 = __toESM(require_react(), 1);
 var import_variant53 = __toESM(require_lib(), 1);
 import { join as join13 } from "node:path";
-var validateAppDirectory = async (targetParentFolder2, packageName) => {
-  if (!await validateDirectory2(join13(targetParentFolder2, packageName))) {
-    return `Provided directory "${packageName}" is not empty`;
+var validateAppFolder = async (targetParentFolder2, appFolder) => {
+  try {
+    validateFolderName(appFolder);
+  } catch (error) {
+    return error.message;
+  }
+  if (!await validateDirectory2(join13(targetParentFolder2, appFolder))) {
+    return `Provided directory "${appFolder}" is not empty`;
   }
-  const npmValidationErrors = await validatePackageName2(packageName);
+  const npmValidationErrors = await validatePackageName2(appFolder);
   return (0, import_variant53.match)(npmValidationErrors, {
     Ok: () => true,
     Error: ({ payload: payload7 }) => `Invalid folder name. Fix the following issues: ${payload7.join(", ")}`
@@ -92210,7 +92220,7 @@ var validateAppDirectory = async (targetParentFolder2, packageName) => {
 };
 var ChooseFolder = ({ initialFolderName, targetParentFolder: targetParentFolder2, onSubmit }) => {
   const validate3 = (0, import_react145.useCallback)(
-    async (packageName) => validateAppDirectory(targetParentFolder2, packageName),
+    async (appFolder) => validateAppFolder(targetParentFolder2, appFolder),
     [targetParentFolder2]
   );
   return /* @__PURE__ */ import_react145.default.createElement(
@@ -93644,7 +93654,7 @@ var CreateHeadlessSiteCommand = ({
   commandOptions,
   template: defaultTemplate,
   publish,
-  projectName: defaultProjectName,
+  folderName: defaultFolderName,
   businessName: defaultBusinessName,
   cloudProviders
 }) => {
@@ -93653,7 +93663,7 @@ var CreateHeadlessSiteCommand = ({
   );
   const [selectedTemplate, setSelectedTemplate] = (0, import_react154.useState)(defaultTemplate);
   const [folderName, setFolderName] = (0, import_react154.useState)(
-    defaultProjectName
+    defaultFolderName
   );
   const [businessId, setBusinessId] = (0, import_react154.useState)();
   const [projectData, setProjectData] = (0, import_react154.useState)();
@@ -93711,10 +93721,10 @@ var CreateHeadlessSiteCommand = ({
             onDone: ({ businessId: businessId2 }) => setBusinessId(businessId2)
           }
         )),
-        !defaultProjectName && businessName && selectedTemplate && businessId && /* @__PURE__ */ import_react154.default.createElement(
+        !defaultFolderName && businessName && selectedTemplate && businessId && /* @__PURE__ */ import_react154.default.createElement(
           ChooseFolder,
           {
-            initialFolderName: (0, import_kebabCase5.default)(businessName),
+            initialFolderName: folderName ?? (0, import_kebabCase5.default)(businessName),
             targetParentFolder: targetParentFolder2,
             onSubmit: ({ folderName: folderName2 }) => setFolderName(folderName2)
           }
@@ -93723,7 +93733,7 @@ var CreateHeadlessSiteCommand = ({
           CreateProject,
           {
             businessId,
-            projectName: businessName,
+            businessName,
             cloudProviders,
             onSubmit: (data) => setProjectData(data)
           }
@@ -93778,14 +93788,14 @@ var ProcessCommand = ({ targetParentFolder: targetParentFolder2, commandOptions
       targetParentFolder2,
       commandOptions
     );
-    if (result.projectName) {
-      const dirValidationResult = await validateAppDirectory(
+    if (result.folderName) {
+      const dirValidationResult = await validateAppFolder(
         targetParentFolder2,
-        result.projectName
+        result.folderName
       );
       if (dirValidationResult !== true) {
         throw new CliError({
-          code: CliErrorCode.ProjectNameArgumentIsInvalid({
+          code: CliErrorCode.HeadlessArgumentIsInvalid({
             errorMessage: dirValidationResult
           }),
           cause: void 0
@@ -93798,7 +93808,7 @@ var ProcessCommand = ({ targetParentFolder: targetParentFolder2, commandOptions
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react155.default.createElement(Spinner2, { text: "Loading..." }),
     Success: ({
-      result: { template, projectName, businessName, cloudProviders, publish }
+      result: { template, folderName, businessName, cloudProviders, publish }
     }) => {
       return /* @__PURE__ */ import_react155.default.createElement(
         CreateHeadlessSiteCommand,
@@ -93806,7 +93816,7 @@ var ProcessCommand = ({ targetParentFolder: targetParentFolder2, commandOptions
           targetParentFolder: targetParentFolder2,
           commandOptions,
           template,
-          projectName,
+          folderName,
           businessName,
           cloudProviders,
           publish
@@ -93924,7 +93934,18 @@ var InitHeadlessSiteCommand = ({ targetParentFolder: targetParentFolder2 }) => {
       });
     }
     const name = basename(targetParentFolder2).trim();
-    return { businessName: (0, import_startCase.default)(name).slice(0, 255) };
+    const businessName = (0, import_startCase.default)(name).slice(0, 255);
+    try {
+      validateBusinessName(businessName);
+    } catch (error) {
+      throw new CliError({
+        code: CliErrorCode.BusinessNameArgumentIsInvalid({
+          errorMessage: error.message
+        }),
+        cause: void 0
+      });
+    }
+    return { businessName };
   }, []);
   return (0, import_variant62.match)(status, {
     Error: () => null,
@@ -93952,7 +93973,7 @@ var InitHeadlessSiteCommand = ({ targetParentFolder: targetParentFolder2 }) => {
         CreateProject,
         {
           businessId,
-          projectName: businessName,
+          businessName,
           onSubmit: (data) => setProjectData(data)
         }
       )),
@@ -94037,19 +94058,12 @@ var getHeadlessCommand = ({
       "--business-name <business-name>",
       "The name of your business"
     ).argParser(validateBusinessName)
-  ).addOption(
-    new Option(
-      "--project-name <project-name>",
-      "The name of your Custom Frontend project"
-    ).argParser(validateProjectName)
   ).action(async (options, command) => {
     errorReporter2.setContext("Command Info", {
       Arguments: command.args,
       Options: command.opts()
     });
-    assertInteractiveTerminalIfNeeded(
-      Boolean(options.businessName && options.projectName)
-    );
+    assertInteractiveTerminalIfNeeded(Boolean(options.businessName));
     const { biLogger, reportCommandStartEvent: reportCommandStartEvent2 } = await createBiLogger3({
       errorReporter: errorReporter2,
       cliVersion,
@@ -94065,7 +94079,6 @@ var getHeadlessCommand = ({
         /* @__PURE__ */ import_react159.default.createElement(BiProvider, { value: biLogger }, /* @__PURE__ */ import_react159.default.createElement(ErrorReporterProvider, { value: errorReporter2 }, /* @__PURE__ */ import_react159.default.createElement(PanoramaProvider, { value: panorama2 }, /* @__PURE__ */ import_react159.default.createElement(
           LinkCommand,
           {
-            projectName: options.projectName,
             businessName: options.businessName,
             projectFolder: targetParentFolder2
           }
@@ -94117,9 +94130,9 @@ var getHeadlessCommand = ({
     ).argParser(validateBusinessName)
   ).addOption(
     new Option(
-      "--project-name <project-name>",
-      "The name of your Custom Frontend project"
-    ).argParser(validateProjectName)
+      "--folder-name <folder-name>",
+      "The name of your project folder"
+    ).argParser(validateFolderName)
   ).addOption(
     new Option(
       "--no-publish",
@@ -94134,7 +94147,7 @@ var getHeadlessCommand = ({
     });
     assertInteractiveTerminalIfNeeded(
       Boolean(
-        options.siteTemplate && options.businessName && options.projectName
+        options.siteTemplate && options.businessName && options.folderName
       )
     );
     const { biLogger, reportCommandStartEvent: reportCommandStartEvent2 } = await createBiLogger3({
@@ -94175,7 +94188,7 @@ import { randomUUID as randomUUID3 } from "node:crypto";
 var package_default = {
   name: "@wix/create-new",
   description: "General entry point for creating Wix projects",
-  version: "0.0.74",
+  version: "0.0.76",
   bin: "bin/index.cjs",
   devDependencies: {
     "@commander-js/extra-typings": "^13.0.0",