chofex-cli 0.1.8 → 0.1.9

package/dist/index.js

@@ -31431,6 +31431,20 @@ var requiredText = (message) => exports_Prompt.text({
   }
 });
 var optionalText2 = (message) => exports_Prompt.text({ message, default: "" });
+var optionalProfileUsername = (message, profilePrefix) => exports_Prompt.text({
+  message,
+  default: "",
+  theme: {
+    pointerSmall: profilePrefix,
+    ellipsis: profilePrefix
+  },
+  validate: (value3) => {
+    if (value3 === "" || /^[A-Za-z0-9._-]+$/.test(value3)) {
+      return exports_Effect.succeed(value3);
+    }
+    return exports_Effect.fail("Enter only your username");
+  }
+});
 var withoutEmptyStrings = (input) => Object.fromEntries(Object.entries(input).filter(([, value3]) => value3 !== "" && value3 !== undefined));
 var readStdin = async () => {
   const chunks = [];
@@ -31480,8 +31494,8 @@ var applicationDetailsPrompts = exports_Prompt.all({
   }),
   skills: exports_Prompt.list({ message: "Skills (comma-separated)", delimiter: "," }),
   bio: requiredText("Short bio"),
-  githubUrl: optionalText2("GitHub URL (optional)"),
-  linkedInUrl: optionalText2("LinkedIn URL (optional)"),
+  githubUrl: optionalProfileUsername("GitHub username (optional)", "github.com/"),
+  linkedInUrl: optionalProfileUsername("LinkedIn username (optional)", "linkedin.com/in/"),
   portfolioUrl: optionalText2("Portfolio URL (optional)")
 });
 var teamPreferencePrompt = exports_Prompt.select({
@@ -31492,31 +31506,58 @@ var teamPreferencePrompt = exports_Prompt.select({
     { title: "I will participate solo", value: "solo" }
   ]
 });
-var applicationConsentPrompts = exports_Prompt.all({
-  codeOfConductAccepted: exports_Prompt.confirm({
-    message: "Do you accept the code of conduct?"
-  }),
-  privacyPolicyAccepted: exports_Prompt.confirm({
-    message: "Do you accept the privacy policy?"
-  }),
-  mediaConsent: exports_Prompt.confirm({
-    message: "Do you consent to appearing in event media?"
-  })
+var publicDocumentUrl = (baseUrl, path4) => `${baseUrl.replace(/\/$/, "")}${path4}`;
+var requiredAgreement = exports_Effect.fn("requiredAgreement")(function* (name, url2) {
+  const accepted = yield* exports_Prompt.run(exports_Prompt.confirm({
+    message: `Do you accept the ${name}? Read it at ${url2}`
+  }));
+  if (accepted)
+    return true;
+  const nextStep = yield* exports_Prompt.run(exports_Prompt.select({
+    message: `You must accept the ${name} to register. What would you like to do?`,
+    choices: [
+      {
+        title: "I accept and want to continue",
+        value: "accept"
+      },
+      { title: "Cancel registration", value: "cancel" }
+    ]
+  }));
+  if (nextStep === "accept")
+    return true;
+  return yield* cliError("REGISTRATION_CANCELLED", "Registration cancelled. Your answers were not submitted.");
 });
-var interactiveApplication = exports_Effect.gen(function* () {
+var interactiveApplication = (publicBaseUrl) => exports_Effect.gen(function* () {
   const details = yield* exports_Prompt.run(applicationDetailsPrompts);
   const teamPreference = yield* exports_Prompt.run(teamPreferencePrompt);
   let teamName;
   if (teamPreference === "have_team") {
     teamName = yield* exports_Prompt.run(requiredText("Team name"));
   }
-  const consents = yield* exports_Prompt.run(applicationConsentPrompts);
-  return { ...details, teamPreference, teamName, ...consents };
+  const codeOfConductAccepted = yield* requiredAgreement("Terms and Code of Conduct", publicDocumentUrl(publicBaseUrl, "/terms"));
+  const privacyPolicyAccepted = yield* requiredAgreement("Privacy Policy", publicDocumentUrl(publicBaseUrl, "/privacy"));
+  const mediaConsent = yield* exports_Prompt.run(exports_Prompt.confirm({
+    message: "Do you consent to appearing in event media? (optional)"
+  }));
+  return {
+    ...details,
+    teamPreference,
+    teamName,
+    codeOfConductAccepted,
+    privacyPolicyAccepted,
+    mediaConsent
+  };
 }).pipe(exports_Effect.map((input) => {
   const normalized = withoutEmptyStrings(input);
   if (input.graduationYear !== "") {
     normalized.graduationYear = Number(input.graduationYear);
   }
+  if (input.githubUrl !== "") {
+    normalized.githubUrl = `github.com/${input.githubUrl}`;
+  }
+  if (input.linkedInUrl !== "") {
+    normalized.linkedInUrl = `linkedin.com/in/${input.linkedInUrl}`;
+  }
   return normalized;
 }));
 var shirtSizePrompt = (participationMode) => {
@@ -31546,9 +31587,13 @@ var inputOrInteractive = (path4, interactive) => {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     return exports_Effect.fail(cliError("INPUT_REQUIRED", "Non-interactive use requires --input <file>, or --input - for stdin"));
   }
-  return interactive.pipe(exports_Effect.mapError(() => cliError("PROMPT_CANCELLED", "Interactive input was cancelled")));
+  return interactive.pipe(exports_Effect.mapError((error2) => {
+    if (error2 instanceof CliError2)
+      return error2;
+    return cliError("PROMPT_CANCELLED", "Interactive input was cancelled");
+  }));
 };
-var applicationInput = (path4) => inputOrInteractive(path4, interactiveApplication).pipe(exports_Effect.flatMap((input) => decode2(ApplicationInput, input)), exports_Effect.flatMap((input) => validateSemantics(input, applicationSemanticRequirements(input))));
+var applicationInput = (path4, publicBaseUrl) => inputOrInteractive(path4, interactiveApplication(publicBaseUrl)).pipe(exports_Effect.flatMap((input) => decode2(ApplicationInput, input)), exports_Effect.flatMap((input) => validateSemantics(input, applicationSemanticRequirements(input))));
 var acceptedDetailsInput = (path4, participationMode) => inputOrInteractive(path4, interactiveAcceptedDetails(participationMode)).pipe(exports_Effect.flatMap((input) => decode2(AcceptedDetailsInput, input)), exports_Effect.flatMap((input) => validateSemantics(input, acceptedDetailsSemanticRequirements(input, participationMode))));
 
 // src/output.ts
@@ -31653,7 +31698,7 @@ var registerCommand = exports_Command.make("register", { input: inputFlag }, exp
   const options = yield* root;
   const operation = exports_Effect.gen(function* () {
     const token = exports_Option.getOrUndefined(options.token);
-    const body = yield* applicationInput(exports_Option.getOrUndefined(input));
+    const body = yield* applicationInput(exports_Option.getOrUndefined(input), options.apiUrl);
     return yield* register({ apiUrl: options.apiUrl, token }, body);
   });
   yield* execute(options.output, operation, createdText);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chofex-cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Command-line client for the Chofex Hackathon",
   "type": "module",
   "bin": {