ai-hero-cli 0.0.26 → 0.1.1

package/bin.cjs

@@ -8,7 +8,6 @@ var OS = require('os');
 var path4 = require('path');
 var NodeUrl = require('url');
 var readline = require('readline');
-var readline2 = require('readline/promises');
 var util = require('util');
 
 function _interopNamespace(e) {
@@ -36,7 +35,6 @@ var OS__namespace = /*#__PURE__*/_interopNamespace(OS);
 var path4__namespace = /*#__PURE__*/_interopNamespace(path4);
 var NodeUrl__namespace = /*#__PURE__*/_interopNamespace(NodeUrl);
 var readline__namespace = /*#__PURE__*/_interopNamespace(readline);
-var readline2__namespace = /*#__PURE__*/_interopNamespace(readline2);
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -11646,7 +11644,7 @@ var require_util = __commonJS({
 // node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/dist/elements/prompt.js
 var require_prompt = __commonJS({
   "node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/dist/elements/prompt.js"(exports, module) {
-    var readline3 = __require("readline");
+    var readline2 = __require("readline");
     var _require = require_util();
     var action = _require.action;
     var EventEmitter = __require("events");
@@ -11661,11 +11659,11 @@ var require_prompt = __commonJS({
         this.in = opts.stdin || process.stdin;
         this.out = opts.stdout || process.stdout;
         this.onRender = (opts.onRender || (() => void 0)).bind(this);
-        const rl = readline3.createInterface({
+        const rl = readline2.createInterface({
           input: this.in,
           escapeCodeTimeout: 50
         });
-        readline3.emitKeypressEvents(this.in, rl);
+        readline2.emitKeypressEvents(this.in, rl);
         if (this.in.isTTY) this.in.setRawMode(true);
         const isSelect = ["SelectPrompt", "MultiselectPrompt"].indexOf(this.constructor.name) > -1;
         const keypress = (str, key) => {
@@ -14080,7 +14078,7 @@ var require_util2 = __commonJS({
 // node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/lib/elements/prompt.js
 var require_prompt2 = __commonJS({
   "node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/lib/elements/prompt.js"(exports, module) {
-    var readline3 = __require("readline");
+    var readline2 = __require("readline");
     var { action } = require_util2();
     var EventEmitter = __require("events");
     var { beep: beep4, cursor } = require_src();
@@ -14092,8 +14090,8 @@ var require_prompt2 = __commonJS({
         this.in = opts.stdin || process.stdin;
         this.out = opts.stdout || process.stdout;
         this.onRender = (opts.onRender || (() => void 0)).bind(this);
-        const rl = readline3.createInterface({ input: this.in, escapeCodeTimeout: 50 });
-        readline3.emitKeypressEvents(this.in, rl);
+        const rl = readline2.createInterface({ input: this.in, escapeCodeTimeout: 50 });
+        readline2.emitKeypressEvents(this.in, rl);
         if (this.in.isTTY) this.in.setRawMode(true);
         const isSelect = ["SelectPrompt", "MultiselectPrompt"].indexOf(this.constructor.name) > -1;
         const keypress = (str, key) => {
@@ -83386,16 +83384,7 @@ var LessonEntrypointNotFoundError = class extends Data_exports.TaggedError(
   "LessonEntrypointNotFoundError"
 ) {
 };
-var shortcuts = {
-  enter: "Choose a new exercise to run",
-  n: "Go to the next exercise",
-  p: "Go to the previous exercise",
-  q: "Quit the exercise"
-};
 var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
-  if (opts.simple) {
-    return yield* runLessonSimple(opts);
-  }
   const { cwd, envFilePath, lesson, root } = opts;
   const service2 = yield* LessonParserService;
   const lessons = yield* service2.getLessonsFromRepo(root);
@@ -83423,10 +83412,10 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
     if (subfolders.length === 1) {
       subfolderIndex = 0;
     } else {
-      const result = yield* selectSubfolderIndex({
+      const result2 = yield* selectSubfolderIndex({
         lesson: foundLesson
       });
-      subfolderIndex = result.subfolderIndex;
+      subfolderIndex = result2.subfolderIndex;
     }
   }
   const subfolder = subfolders[subfolderIndex];
@@ -83492,116 +83481,19 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
   if (readmeFile) {
     yield* logReadmeFile({ readmeFile });
   }
-  const command2 = Command_exports.make(
-    "pnpm",
-    "tsx",
-    `--env-file`,
-    envFilePath,
-    mainFile
-  ).pipe(
-    Command_exports.stdout("inherit"),
-    Command_exports.stderr("inherit"),
-    Command_exports.workingDirectory(cwd)
-  );
-  const processOutcome = yield* Effect_exports.raceAll([
-    Effect_exports.gen(function* () {
-      const proc = yield* Command_exports.start(command2);
-      const killWithLogging = () => Effect_exports.gen(function* () {
-        if (yield* proc.isRunning) {
-          return yield* proc.kill();
-        }
-      }).pipe(
-        Effect_exports.catchAll(
-          (e) => Effect_exports.logDebug(
-            `Error occurred when killing child process.`,
-            e
-          )
-        )
-      );
-      yield* Effect_exports.addFinalizer(() => killWithLogging());
-      const killAsCallback = () => killWithLogging().pipe(Effect_exports.runPromise);
-      yield* Effect_exports.fork(
-        Effect_exports.sync(() => {
-          process.on("SIGINT", killAsCallback);
-        })
-      );
-      yield* Effect_exports.fork(
-        Effect_exports.sync(() => {
-          process.on("SIGTERM", killAsCallback);
-        })
-      );
-      yield* Effect_exports.addFinalizer(() => {
-        return Effect_exports.sync(
-          () => process.removeListener("SIGINT", killAsCallback)
-        );
-      });
-      yield* Effect_exports.addFinalizer(() => {
-        return Effect_exports.sync(
-          () => process.removeListener("SIGTERM", killAsCallback)
-        );
-      });
-      const result = yield* proc.exitCode;
-      return result === 0 ? "exit" : "failed";
-    }),
-    Effect_exports.gen(function* () {
-      const rl = readline2__namespace.createInterface({
-        input: process.stdin
-      });
-      yield* Effect_exports.addFinalizer(() => {
-        return Effect_exports.succeed(rl.close());
-      });
-      while (true) {
-        const line4 = yield* Effect_exports.promise(async (signal) => {
-          const result = await rl.question("", { signal });
-          rl.close();
-          return result;
-        });
-        if (line4 === "h") {
-          yield* Console_exports.log(util.styleText("bold", "Shortcuts:"));
-          for (const [key, value5] of Object.entries(shortcuts)) {
-            yield* Console_exports.log(
-              `  ${key} ${util.styleText("dim", `- ${value5}`)}`
-            );
-          }
-        } else if (line4 === "q") {
-          return "quit";
-        } else if (line4 === "n") {
-          return "next";
-        } else if (line4 === "p") {
-          return "previous";
-        } else if (line4.trim() === "") {
-          return "choose-exercise";
-        }
+  const result = yield* Effect_exports.try({
+    try: () => ChildProcess.execSync(
+      `pnpm tsx --env-file="${envFilePath}" "${mainFile}"`,
+      {
+        stdio: "inherit",
+        cwd
       }
-    })
-  ]).pipe(Effect_exports.scoped);
-  yield* Console_exports.log("");
-  if (processOutcome === "next" && nextExerciseToRun) {
-    return yield* runLesson({
-      simple: opts.simple,
-      lesson: nextExerciseToRun.lessonNumber,
-      root,
-      envFilePath,
-      cwd,
-      forceSubfolderIndex: nextExerciseToRun.subfolderIndex
-    });
-  } else if (processOutcome === "previous" && previousExerciseToRun) {
-    return yield* runLesson({
-      simple: opts.simple,
-      lesson: previousExerciseToRun.lessonNumber,
-      root,
-      envFilePath,
-      cwd,
-      forceSubfolderIndex: previousExerciseToRun.subfolderIndex
-    });
-  } else if (processOutcome === "choose-exercise") {
-    return yield* chooseLessonAndRunIt({
-      simple: opts.simple,
-      root,
-      envFilePath,
-      cwd
-    });
-  }
+    ),
+    catch: (error4) => new RunLessonSimpleError({ cause: error4 })
+  }).pipe(
+    Effect_exports.map(() => "success"),
+    Effect_exports.catchAll(() => Effect_exports.succeed("failed"))
+  );
   const isExplainer = yield* foundLesson.isExplainer();
   if (isExplainer && readmeFile) {
     yield* logReadmeFile({ readmeFile });
@@ -83620,10 +83512,10 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
       {
         type: "select",
         name: "choice",
-        message: processOutcome === "exit" ? lessonNoun.successMessage : lessonNoun.failureMessage,
+        message: result === "success" ? lessonNoun.successMessage : lessonNoun.failureMessage,
         choices: [
           {
-            title: processOutcome === "failed" ? `\u{1F504} Run the ${lessonNoun.lowercase} again` : `\u{1F504} Try the ${lessonNoun.lowercase} again`,
+            title: result === "failed" ? `\u{1F504} Run the ${lessonNoun.lowercase} again` : `\u{1F504} Try the ${lessonNoun.lowercase} again`,
             value: "run-again"
           },
           ...nextExerciseToRun ? [
@@ -83657,15 +83549,13 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
       envFilePath,
       cwd,
       // Run the same exercise again, with the same subfolder index
-      forceSubfolderIndex: subfolderIndex,
-      simple: opts.simple
+      forceSubfolderIndex: subfolderIndex
     });
   } else if (choice6 === "choose-exercise") {
     return yield* chooseLessonAndRunIt({
       root,
       envFilePath,
-      cwd,
-      simple: opts.simple
+      cwd
     });
   } else if (choice6 === "next-exercise" && nextExerciseToRun) {
     return yield* runLesson({
@@ -83673,8 +83563,7 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
       root,
       envFilePath,
       cwd,
-      forceSubfolderIndex: nextExerciseToRun.subfolderIndex,
-      simple: opts.simple
+      forceSubfolderIndex: nextExerciseToRun.subfolderIndex
     });
   } else if (choice6 === "previous-exercise" && previousExerciseToRun) {
     return yield* runLesson({
@@ -83682,8 +83571,7 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
       root,
       envFilePath,
       cwd,
-      forceSubfolderIndex: previousExerciseToRun.subfolderIndex,
-      simple: opts.simple
+      forceSubfolderIndex: previousExerciseToRun.subfolderIndex
     });
   }
 });
@@ -83738,8 +83626,7 @@ var chooseLessonAndRunIt = (opts) => Effect_exports.gen(function* () {
     root: opts.root,
     envFilePath: opts.envFilePath,
     cwd: opts.cwd,
-    forceSubfolderIndex: void 0,
-    simple: opts.simple
+    forceSubfolderIndex: void 0
   });
 }).pipe(Effect_exports.catchAll(Console_exports.log));
 var exercise = Command_exports2.make(
@@ -83766,6 +83653,11 @@ var exercise = Command_exports2.make(
   },
   ({ cwd, debug: debug3, envFilePath, lesson, root, simple: simple3 }) => {
     return Effect_exports.gen(function* () {
+      if (simple3) {
+        return yield* Console_exports.log(
+          "Simple mode is now the default mode! No need to use the --simple flag."
+        );
+      }
       const resolvedEnvFilePath = path4__namespace.relative(
         cwd,
         envFilePath
@@ -83776,8 +83668,7 @@ var exercise = Command_exports2.make(
           root,
           envFilePath: resolvedEnvFilePath,
           cwd,
-          forceSubfolderIndex: void 0,
-          simple: simple3
+          forceSubfolderIndex: void 0
         }).pipe(
           Logger_exports.withMinimumLogLevel(
             debug3 ? LogLevel_exports.Debug : LogLevel_exports.Info
@@ -83787,8 +83678,7 @@ var exercise = Command_exports2.make(
       return yield* chooseLessonAndRunIt({
         root,
         envFilePath: resolvedEnvFilePath,
-        cwd,
-        simple: simple3
+        cwd
       }).pipe(
         Logger_exports.withMinimumLogLevel(
           debug3 ? LogLevel_exports.Debug : LogLevel_exports.Info
@@ -83797,20 +83687,6 @@ var exercise = Command_exports2.make(
     });
   }
 );
-var findLesson = Effect_exports.fn("findLesson")(function* (opts) {
-  const service2 = yield* LessonParserService;
-  const lessons = yield* service2.getLessonsFromRepo(opts.root);
-  const foundLessonIndex = lessons.findIndex(
-    (l) => l.num === opts.lesson
-  );
-  if (foundLessonIndex === -1) {
-    return yield* new LessonNotFoundError({
-      lesson: opts.lesson,
-      message: `Lesson ${opts.lesson} not found`
-    });
-  }
-  return lessons[foundLessonIndex];
-});
 var selectSubfolderIndex = Effect_exports.fn("selectSubfolder")(
   function* (opts) {
     const subfolders = yield* opts.lesson.subfolders();
@@ -83864,36 +83740,10 @@ var getMainAndReadmeFiles = Effect_exports.fn("getMainAndReadmeFiles")(
     return { mainFile, readmeFile };
   }
 );
-var runLessonSimple = (opts) => Effect_exports.gen(function* () {
-  const { cwd, envFilePath, lesson, root } = opts;
-  const foundLesson = yield* findLesson({
-    lesson,
-    root
-  });
-  const { subfolder } = yield* selectSubfolderIndex({
-    lesson: foundLesson
-  });
-  const { mainFile, readmeFile } = yield* getMainAndReadmeFiles({
-    lesson: foundLesson,
-    subfolder
-  });
-  if (readmeFile) {
-    yield* logReadmeFile({ readmeFile });
-  }
-  yield* Console_exports.log(
-    util.styleText("bold", `Running ${lesson} ${subfolder}...`)
-  );
-  ChildProcess.execSync(
-    `pnpm tsx --env-file="${envFilePath}" "${mainFile}"`,
-    {
-      stdio: "inherit",
-      cwd
-    }
-  );
-  if ((yield* foundLesson.isExplainer()) && readmeFile) {
-    yield* logReadmeFile({ readmeFile });
-  }
-});
+var RunLessonSimpleError = class extends Data_exports.TaggedError(
+  "RunLessonSimpleError"
+) {
+};
 var notFound2 = Symbol("notFound");
 var getNumberFromPathSegment = (path11) => {
   const numberSegment = path11.split("-")[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-hero-cli",
-  "version": "0.0.26",
+  "version": "0.1.1",
   "type": "module",
   "description": "The CLI used to run exercises for the AI Hero course",
   "bin": "bin.cjs",