effect 4.0.0-beta.31 → 4.0.0-beta.32

package/dist/unstable/cli/Prompt.js

@@ -203,7 +203,7 @@ export const date = options => {
     typed: "",
     cursor: initialCursorPosition,
     value: opts.initial,
-    error: undefined
+    error: Option.none()
   };
   return custom(initialState, {
     render: handleDateRender(opts),
@@ -219,18 +219,18 @@ export const file = (options = {}) => {
   const opts = {
     type: options.type ?? "file",
     message: options.message ?? `Choose a file`,
-    startingPath: options.startingPath,
+    startingPath: Option.fromUndefinedOr(options.startingPath),
     maxPerPage: options.maxPerPage ?? 10,
     filter: options.filter ?? (() => Effect.succeed(true))
   };
   const initialState = Effect.gen(function* () {
-    const currentPath = yield* resolveCurrentPath(undefined, opts);
+    const currentPath = yield* resolveCurrentPath(Option.none(), opts);
     const files = yield* getFileList(currentPath, opts);
     const confirm = Confirm.Hide();
     return {
       cursor: 0,
       files,
-      path: undefined,
+      path: Option.none(),
       confirm
     };
   });
@@ -276,7 +276,7 @@ export const float = options => {
   const initialState = {
     cursor: 0,
     value: "",
-    error: undefined
+    error: Option.none()
   };
   return custom(initialState, {
     render: handleRenderFloat(opts),
@@ -313,7 +313,7 @@ export const integer = options => {
   const initialState = {
     cursor: 0,
     value: "",
-    error: undefined
+    error: Option.none()
   };
   return custom(initialState, {
     render: handleRenderInteger(opts),
@@ -443,7 +443,7 @@ export const multiSelect = options => {
   const initialState = {
     index: 0,
     selectedIndices: initialSelected,
-    error: undefined
+    error: Option.none()
   };
   return custom(initialState, {
     render: handleMultiSelectRender(opts),
@@ -638,7 +638,7 @@ const handleConfirmRender = options => {
 const TRUE_VALUE_REGEXP = /^y|t$/;
 const FALSE_VALUE_REGEXP = /^n|f$/;
 const handleConfirmProcess = (input, defaultValue) => {
-  const value = input.input ?? "";
+  const value = Option.getOrElse(input.input, () => "");
   if (input.key.name === "enter" || input.key.name === "return") {
     return Effect.succeed(Action.Submit({
       value: defaultValue
@@ -666,7 +666,7 @@ const handleDateClear = options => {
     const promptText = renderDateOutput("?", figures.pointerSmall, parts, options, {
       plain: true
     });
-    const errorText = state.error !== undefined ? Arr.match(state.error.split(NEWLINE_REGEXP), {
+    const errorText = Option.isSome(state.error) ? Arr.match(state.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: errorLines => `${figures.pointerSmall} ${errorLines.join("\n")}`
     }) : "";
@@ -675,8 +675,8 @@ const handleDateClear = options => {
   });
 };
 const renderDateError = (state, pointer) => {
-  if (state.error !== undefined) {
-    const errorLines = state.error.split(NEWLINE_REGEXP);
+  if (Option.isSome(state.error)) {
+    const errorLines = state.error.value.split(NEWLINE_REGEXP);
     if (Arr.isReadonlyArrayNonEmpty(errorLines)) {
       const prefix = Ansi.annotate(pointer, Ansi.red) + " ";
       const lines = Arr.map(errorLines, str => annotateErrorLine(str));
@@ -733,12 +733,12 @@ const processDown = state => {
 };
 const processDateCursorLeft = state => {
   const previous = state.dateParts[state.cursor].previousPart();
-  if (previous !== undefined) {
+  if (Option.isSome(previous)) {
     return Action.NextFrame({
       state: {
         ...state,
         typed: "",
-        cursor: state.dateParts.indexOf(previous)
+        cursor: state.dateParts.indexOf(previous.value)
       }
     });
   }
@@ -746,12 +746,12 @@ const processDateCursorLeft = state => {
 };
 const processDateCursorRight = state => {
   const next = state.dateParts[state.cursor].nextPart();
-  if (next !== undefined) {
+  if (Option.isSome(next)) {
     return Action.NextFrame({
       state: {
         ...state,
         typed: "",
-        cursor: state.dateParts.indexOf(next)
+        cursor: state.dateParts.indexOf(next.value)
       }
     });
   }
@@ -759,7 +759,10 @@ const processDateCursorRight = state => {
 };
 const processDateNext = state => {
   const next = state.dateParts[state.cursor].nextPart();
-  const cursor = next !== undefined ? state.dateParts.indexOf(next) : state.dateParts.findIndex(part => !part.isToken());
+  const cursor = Option.match(next, {
+    onNone: () => state.dateParts.findIndex(part => !part.isToken()),
+    onSome: next => state.dateParts.indexOf(next)
+  });
   return Action.NextFrame({
     state: {
       ...state,
@@ -829,7 +832,7 @@ const handleDateProcess = options => {
             onFailure: error => Action.NextFrame({
               state: {
                 ...state,
-                error
+                error: Option.some(error)
               }
             }),
             onSuccess: value => Action.Submit({
@@ -839,7 +842,7 @@ const handleDateProcess = options => {
         }
       default:
         {
-          return Effect.succeed(defaultDateProcessor(input.input ?? "", state));
+          return Effect.succeed(defaultDateProcessor(Option.getOrElse(input.input, () => ""), state));
         }
     }
   };
@@ -919,17 +922,18 @@ class DatePart {
    * Retrieves the next date part in the list of parts.
    */
   nextPart() {
-    const currentPartIndex = Arr.findFirstIndex(this.parts, part => part === this) ?? 0;
-    return Option.getOrUndefined(Arr.findFirst(this.parts.slice(currentPartIndex + 1), part => !part.isToken()));
+    const currentPartIndex = Option.getOrElse(Arr.findFirstIndex(this.parts, part => part === this), () => 0);
+    return Arr.findFirst(this.parts.slice(currentPartIndex + 1), part => !part.isToken());
   }
   /**
    * Retrieves the previous date part in the list of parts.
    */
   previousPart() {
     const currentPartIndex = Arr.findFirstIndex(this.parts, part => part === this);
-    if (currentPartIndex !== undefined) {
-      return Option.getOrUndefined(Arr.findLast(this.parts.slice(0, currentPartIndex), part => !part.isToken()));
+    if (Option.isSome(currentPartIndex)) {
+      return Arr.findLast(this.parts.slice(0, currentPartIndex.value), part => !part.isToken());
     }
+    return Option.none();
   }
   toString() {
     return String(this.date);
@@ -1106,11 +1110,11 @@ const CONFIRM_MESSAGE = "The selected directory contains files. Would you like t
 const Confirm = /*#__PURE__*/Data.taggedEnum();
 const showConfirmation = /*#__PURE__*/Confirm.$is("Show");
 const resolveCurrentPath = (path, options) => {
-  if (path !== undefined) {
-    return Effect.succeed(path);
+  if (Option.isSome(path)) {
+    return Effect.succeed(path.value);
   }
-  const startingPath = options.startingPath;
-  if (startingPath !== undefined) {
+  if (Option.isSome(options.startingPath)) {
+    const startingPath = options.startingPath.value;
     return Effect.flatMap(FileSystem.FileSystem.asEffect(), fs =>
     // Ensure the user provided starting path exists
     Effect.orDie(fs.exists(startingPath)).pipe(Effect.flatMap(exists => exists ? Effect.void : Effect.die(`The provided starting path '${startingPath}' does not exist`)), Effect.as(startingPath)));
@@ -1288,7 +1292,7 @@ const processSelection = /*#__PURE__*/Effect.fnUntraced(function* (state, option
       state: {
         cursor: 0,
         files,
-        path: resolvedPath,
+        path: Option.some(resolvedPath),
         confirm: Confirm.Hide()
       }
     });
@@ -1329,7 +1333,7 @@ const handleFileProcess = options => {
               state: {
                 cursor: 0,
                 files,
-                path: resolvedPath,
+                path: Option.some(resolvedPath),
                 confirm: Confirm.Hide()
               }
             });
@@ -1358,8 +1362,8 @@ const handleFileProcess = options => {
   });
 };
 const renderMultiSelectError = (state, pointer, renderOptions) => {
-  if (state.error !== undefined) {
-    return Arr.match(state.error.split(NEWLINE_REGEXP), {
+  if (Option.isSome(state.error)) {
+    return Arr.match(state.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: errorLines => {
         if (renderOptions?.plain === true) {
@@ -1516,7 +1520,7 @@ const handleMultiSelectProcess = options => {
         {
           return processMultiSelectCursorUp({
             ...state,
-            error: undefined
+            error: Option.none()
           }, totalChoices);
         }
       case "j":
@@ -1525,7 +1529,7 @@ const handleMultiSelectProcess = options => {
         {
           return processMultiSelectCursorDown({
             ...state,
-            error: undefined
+            error: Option.none()
           }, totalChoices);
         }
       case "space":
@@ -1540,7 +1544,7 @@ const handleMultiSelectProcess = options => {
             return Effect.succeed(Action.NextFrame({
               state: {
                 ...state,
-                error: `At least ${options.min} are required`
+                error: Option.some(`At least ${options.min} are required`)
               }
             }));
           }
@@ -1548,7 +1552,7 @@ const handleMultiSelectProcess = options => {
             return Effect.succeed(Action.NextFrame({
               state: {
                 ...state,
-                error: `At most ${options.max} choices are allowed`
+                error: Option.some(`At most ${options.max} choices are allowed`)
               }
             }));
           }
@@ -1596,12 +1600,12 @@ const renderNumberInput = (state, submitted, renderOptions) => {
   if (submitted || renderOptions?.plain === true) {
     return value;
   }
-  const annotation = state.error !== undefined ? Ansi.red : Ansi.combine(Ansi.underlined, Ansi.cyanBright);
+  const annotation = Option.isSome(state.error) ? Ansi.red : Ansi.combine(Ansi.underlined, Ansi.cyanBright);
   return Ansi.annotate(value, annotation);
 };
 const renderNumberError = (state, pointer, renderOptions) => {
-  if (state.error !== undefined) {
-    return Arr.match(state.error.split(NEWLINE_REGEXP), {
+  if (Option.isSome(state.error)) {
+    return Arr.match(state.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: errorLines => {
         if (renderOptions?.plain === true) {
@@ -1643,7 +1647,7 @@ const processNumberBackspace = state => {
     state: {
       ...state,
       value,
-      error: undefined
+      error: Option.none()
     }
   }));
 };
@@ -1652,7 +1656,7 @@ const processNumberClear = state => Effect.succeed(Action.NextFrame({
     ...state,
     cursor: 0,
     value: "",
-    error: undefined
+    error: Option.none()
   }
 }));
 const defaultIntProcessor = (input, state) => {
@@ -1661,7 +1665,7 @@ const defaultIntProcessor = (input, state) => {
       state: {
         ...state,
         value: "-",
-        error: undefined
+        error: Option.none()
       }
     }));
   }
@@ -1673,7 +1677,7 @@ const defaultIntProcessor = (input, state) => {
       state: {
         ...state,
         value: `${parsed}`,
-        error: undefined
+        error: Option.none()
       }
     }));
   }
@@ -1687,7 +1691,7 @@ const defaultFloatProcessor = (input, state) => {
       state: {
         ...state,
         value: "-",
-        error: undefined
+        error: Option.none()
       }
     }));
   }
@@ -1699,7 +1703,7 @@ const defaultFloatProcessor = (input, state) => {
       state: {
         ...state,
         value: input === "." ? `${parsed}.` : `${parsed}`,
-        error: undefined
+        error: Option.none()
       }
     }));
   }
@@ -1732,7 +1736,7 @@ const handleProcessInteger = options => {
             state: {
               ...state,
               value: state.value === "" || state.value === "-" ? `${options.incrementBy}` : `${Number.parseInt(state.value) + options.incrementBy}`,
-              error: undefined
+              error: Option.none()
             }
           }));
         }
@@ -1743,7 +1747,7 @@ const handleProcessInteger = options => {
             state: {
               ...state,
               value: state.value === "" || state.value === "-" ? `-${options.decrementBy}` : `${Number.parseInt(state.value) - options.decrementBy}`,
-              error: undefined
+              error: Option.none()
             }
           }));
         }
@@ -1755,7 +1759,7 @@ const handleProcessInteger = options => {
             return Effect.succeed(Action.NextFrame({
               state: {
                 ...state,
-                error: "Must provide an integer value"
+                error: Option.some("Must provide an integer value")
               }
             }));
           } else {
@@ -1763,7 +1767,7 @@ const handleProcessInteger = options => {
               onFailure: error => Action.NextFrame({
                 state: {
                   ...state,
-                  error
+                  error: Option.some(error)
                 }
               }),
               onSuccess: value => Action.Submit({
@@ -1774,7 +1778,7 @@ const handleProcessInteger = options => {
         }
       default:
         {
-          return defaultIntProcessor(input.input ?? "", state);
+          return defaultIntProcessor(Option.getOrElse(input.input, () => ""), state);
         }
     }
   };
@@ -1807,7 +1811,7 @@ const handleProcessFloat = options => {
             state: {
               ...state,
               value: state.value === "" || state.value === "-" ? `${options.incrementBy}` : `${Number.parseFloat(state.value) + options.incrementBy}`,
-              error: undefined
+              error: Option.none()
             }
           }));
         }
@@ -1818,7 +1822,7 @@ const handleProcessFloat = options => {
             state: {
               ...state,
               value: state.value === "" || state.value === "-" ? `-${options.decrementBy}` : `${Number.parseFloat(state.value) - options.decrementBy}`,
-              error: undefined
+              error: Option.none()
             }
           }));
         }
@@ -1830,7 +1834,7 @@ const handleProcessFloat = options => {
             return Effect.succeed(Action.NextFrame({
               state: {
                 ...state,
-                error: "Must provide a floating point value"
+                error: Option.some("Must provide a floating point value")
               }
             }));
           } else {
@@ -1838,7 +1842,7 @@ const handleProcessFloat = options => {
               onFailure: error => Action.NextFrame({
                 state: {
                   ...state,
-                  error
+                  error: Option.some(error)
                 }
               }),
               onSuccess: value => Action.Submit({
@@ -1849,7 +1853,7 @@ const handleProcessFloat = options => {
         }
       default:
         {
-          return defaultFloatProcessor(input.input ?? "", state);
+          return defaultFloatProcessor(Option.getOrElse(input.input, () => ""), state);
         }
     }
   };
@@ -1888,7 +1892,7 @@ const updateAutoCompleteState = (state, options, query) => {
     index: filtered[0]
   };
 };
-const autoCompleteCursor = state => Arr.findFirstIndex(state.filtered, index => index === state.index) ?? 0;
+const autoCompleteCursor = state => Option.getOrElse(Arr.findFirstIndex(state.filtered, index => index === state.index), () => 0);
 const renderSelectOutput = (leadingSymbol, trailingSymbol, options, renderOptions) => renderPrompt("", options.message, leadingSymbol, trailingSymbol, renderOptions);
 const renderAutoCompleteFilter = (state, options, renderOptions) => {
   const filterValue = state.query.length === 0 ? renderOptions?.plain === true ? options.filterPlaceholder : Ansi.annotate(options.filterPlaceholder, Ansi.blackBright) : renderOptions?.plain === true ? state.query : Ansi.annotate(state.query, Ansi.combine(Ansi.underlined, Ansi.cyanBright));
@@ -2204,7 +2208,7 @@ const handleAutoCompleteProcess = options => {
         }
       default:
         {
-          return processAutoCompleteInput(input.input ?? "", state, options);
+          return processAutoCompleteInput(Option.getOrElse(input.input, () => ""), state, options);
         }
     }
   };
@@ -2240,7 +2244,7 @@ const renderTextInput = (nextState, options, submitted, renderOptions) => {
         }
     }
   }
-  const annotation = nextState.error !== undefined ? Ansi.red : submitted ? Ansi.white : nextState.value.length === 0 ? Ansi.blackBright : Ansi.combine(Ansi.underlined, Ansi.cyanBright);
+  const annotation = Option.isSome(nextState.error) ? Ansi.red : submitted ? Ansi.white : nextState.value.length === 0 ? Ansi.blackBright : Ansi.combine(Ansi.underlined, Ansi.cyanBright);
   switch (options.type) {
     case "hidden":
       {
@@ -2257,8 +2261,8 @@ const renderTextInput = (nextState, options, submitted, renderOptions) => {
   }
 };
 const renderTextError = (nextState, pointer, renderOptions) => {
-  if (nextState.error !== undefined) {
-    return Arr.match(nextState.error.split(NEWLINE_REGEXP), {
+  if (Option.isSome(nextState.error)) {
+    return Arr.match(nextState.error.value.split(NEWLINE_REGEXP), {
       onEmpty: () => "",
       onNonEmpty: errorLines => {
         if (renderOptions?.plain === true) {
@@ -2305,7 +2309,7 @@ const processTextBackspace = state => {
       ...state,
       cursor,
       value,
-      error: undefined
+      error: Option.none()
     }
   }));
 };
@@ -2314,7 +2318,7 @@ const processTextClear = state => Effect.succeed(Action.NextFrame({
     ...state,
     cursor: 0,
     value: "",
-    error: undefined
+    error: Option.none()
   }
 }));
 const processTextCursorLeft = state => {
@@ -2326,7 +2330,7 @@ const processTextCursorLeft = state => {
     state: {
       ...state,
       cursor,
-      error: undefined
+      error: Option.none()
     }
   }));
 };
@@ -2339,7 +2343,7 @@ const processTextCursorRight = state => {
     state: {
       ...state,
       cursor,
-      error: undefined
+      error: Option.none()
     }
   }));
 };
@@ -2353,7 +2357,7 @@ const processTab = (state, options) => {
       ...state,
       value,
       cursor: value.length,
-      error: undefined
+      error: Option.none()
     }
   }));
 };
@@ -2367,7 +2371,7 @@ const defaultTextProcessor = (input, state) => {
       ...state,
       cursor,
       value,
-      error: undefined
+      error: Option.none()
     }
   }));
 };
@@ -2409,7 +2413,7 @@ const handleTextProcess = options => {
               state: {
                 ...state,
                 value,
-                error
+                error: Option.some(error)
               }
             }),
             onSuccess: value => Action.Submit({
@@ -2423,7 +2427,7 @@ const handleTextProcess = options => {
         }
       default:
         {
-          return defaultTextProcessor(input.input ?? "", state);
+          return defaultTextProcessor(Option.getOrElse(input.input, () => ""), state);
         }
     }
   };
@@ -2443,7 +2447,7 @@ const basePrompt = (options, type) => {
   const initialState = {
     cursor: opts.default.length,
     value: opts.default,
-    error: undefined
+    error: Option.none()
   };
   return custom(initialState, {
     render: handleTextRender(opts),