ai-hero-cli 0.0.25 → 0.1.0

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) => {
@@ -51999,8 +51997,8 @@ var require_main = __commonJS({
         const shortPaths = [];
         for (const filePath of optionPaths) {
           try {
-            const relative2 = path11.relative(process.cwd(), filePath);
-            shortPaths.push(relative2);
+            const relative3 = path11.relative(process.cwd(), filePath);
+            shortPaths.push(relative3);
           } catch (e) {
             if (debug3) {
               _debug(`Failed to load ${filePath} ${e.message}`);
@@ -83386,306 +83384,8 @@ 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);
-  const foundLessonIndex = lessons.findIndex(
-    (l) => l.num === lesson
-  );
-  if (foundLessonIndex === -1) {
-    return yield* new LessonNotFoundError({
-      lesson,
-      message: `Lesson ${lesson} not found`
-    });
-  }
-  const foundLesson = lessons[foundLessonIndex];
-  const previousLesson = lessons[foundLessonIndex - 1];
-  const nextLesson = lessons[foundLessonIndex + 1];
-  const subfolders = yield* foundLesson.subfolders();
-  if (subfolders.length === 0) {
-    return yield* new LessonEntrypointNotFoundError({
-      lesson,
-      message: `No subfolders found for lesson ${lesson}`
-    });
-  }
-  let subfolderIndex = opts.forceSubfolderIndex;
-  if (subfolderIndex === void 0) {
-    if (subfolders.length === 1) {
-      subfolderIndex = 0;
-    } else {
-      const result = yield* selectSubfolderIndex({
-        lesson: foundLesson
-      });
-      subfolderIndex = result.subfolderIndex;
-    }
-  }
-  const subfolder = subfolders[subfolderIndex];
-  let nextExerciseToRun;
-  const nextSubfolder = subfolders[subfolderIndex + 1];
-  if (nextSubfolder) {
-    nextExerciseToRun = {
-      lessonNumber: foundLesson.num,
-      lessonName: foundLesson.name,
-      subfolderIndex: subfolderIndex + 1,
-      subfolder: nextSubfolder
-    };
-  } else if (nextLesson) {
-    nextExerciseToRun = {
-      lessonNumber: nextLesson.num,
-      lessonName: nextLesson.name,
-      subfolderIndex: 0,
-      subfolder: (yield* nextLesson.subfolders())[0]
-    };
-  } else {
-    nextExerciseToRun = void 0;
-  }
-  let previousExerciseToRun;
-  if (subfolderIndex > 0) {
-    previousExerciseToRun = {
-      lessonNumber: foundLesson.num,
-      lessonName: foundLesson.name,
-      subfolderIndex: subfolderIndex - 1,
-      subfolder: subfolders[subfolderIndex - 1]
-    };
-  } else if (previousLesson) {
-    const previousLessonSubfolders = yield* previousLesson.subfolders();
-    const previousLessonLastSubfolderIndex = previousLessonSubfolders.length - 1;
-    previousExerciseToRun = {
-      lessonNumber: previousLesson.num,
-      lessonName: previousLesson.name,
-      subfolderIndex: previousLessonLastSubfolderIndex,
-      subfolder: previousLessonSubfolders[previousLessonLastSubfolderIndex]
-    };
-  } else {
-    previousExerciseToRun = void 0;
-  }
-  const { mainFile, readmeFile } = yield* getMainAndReadmeFiles({
-    lesson: foundLesson,
-    subfolder
-  });
-  yield* Console_exports.clear;
-  yield* Console_exports.log(
-    util.styleText(
-      "bold",
-      `Running ${foundLesson.num} ${subfolder}...`
-    )
-  );
-  yield* Console_exports.log(
-    util.styleText(
-      "dim",
-      "  Press n + enter to go to the next exercise"
-    )
-  );
-  yield* Console_exports.log(
-    util.styleText("dim", "  Press h + enter for more shortcuts\n")
-  );
-  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";
-        }
-      }
-    })
-  ]).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
-    });
-  }
-  const isExplainer = yield* foundLesson.isExplainer();
-  if (isExplainer && readmeFile) {
-    yield* logReadmeFile({ readmeFile });
-  }
-  const lessonNoun = isExplainer ? {
-    successMessage: `Explainer executed! Once you've read the readme and understand the code, you can go to the next exercise.`,
-    failureMessage: `Looks like the explainer errored! Want to try again?`,
-    lowercase: "explainer"
-  } : {
-    successMessage: "Exercise complete! What's next?",
-    failureMessage: `Looks like the exercise errored! Want to try again?`,
-    lowercase: "exercise"
-  };
-  const { choice: choice6 } = yield* runPrompt(
-    () => (0, import_prompts.default)([
-      {
-        type: "select",
-        name: "choice",
-        message: processOutcome === "exit" ? lessonNoun.successMessage : lessonNoun.failureMessage,
-        choices: [
-          {
-            title: processOutcome === "failed" ? `\u{1F504} Run the ${lessonNoun.lowercase} again` : `\u{1F504} Try the ${lessonNoun.lowercase} again`,
-            value: "run-again"
-          },
-          ...nextExerciseToRun ? [
-            {
-              title: `\u27A1\uFE0F  Run the next exercise: ${nextExerciseToRun?.lessonNumber}-${nextExerciseToRun?.lessonName} ${nextExerciseToRun?.subfolder}`,
-              value: "next-exercise"
-            }
-          ] : [],
-          ...previousExerciseToRun ? [
-            {
-              title: `\u2B05\uFE0F  Run the previous exercise: ${previousExerciseToRun?.lessonNumber}-${previousExerciseToRun?.lessonName} ${previousExerciseToRun?.subfolder}`,
-              value: "previous-exercise"
-            }
-          ] : [],
-          {
-            title: "\u{1F4CB} Choose a new exercise",
-            value: "choose-exercise"
-          },
-          {
-            title: "\u2705 Finish",
-            value: "finish"
-          }
-        ]
-      }
-    ])
-  );
-  if (choice6 === "run-again") {
-    return yield* runLesson({
-      lesson,
-      root,
-      envFilePath,
-      cwd,
-      // Run the same exercise again, with the same subfolder index
-      forceSubfolderIndex: subfolderIndex,
-      simple: opts.simple
-    });
-  } else if (choice6 === "choose-exercise") {
-    return yield* chooseLessonAndRunIt({
-      root,
-      envFilePath,
-      cwd,
-      simple: opts.simple
-    });
-  } else if (choice6 === "next-exercise" && nextExerciseToRun) {
-    return yield* runLesson({
-      lesson: nextExerciseToRun.lessonNumber,
-      root,
-      envFilePath,
-      cwd,
-      forceSubfolderIndex: nextExerciseToRun.subfolderIndex,
-      simple: opts.simple
-    });
-  } else if (choice6 === "previous-exercise" && previousExerciseToRun) {
-    return yield* runLesson({
-      lesson: previousExerciseToRun.lessonNumber,
-      root,
-      envFilePath,
-      cwd,
-      forceSubfolderIndex: previousExerciseToRun.subfolderIndex,
-      simple: opts.simple
-    });
-  }
+  return yield* runLessonSimple(opts);
 });
 var logReadmeFile = Effect_exports.fn("logReadmeFile")(
   function* (opts) {
@@ -83699,6 +83399,9 @@ var logReadmeFile = Effect_exports.fn("logReadmeFile")(
     );
   }
 );
+var normalizeExerciseNumber = (str) => {
+  return str.replace(/\b0+(\d)/g, "$1");
+};
 var chooseLessonAndRunIt = (opts) => Effect_exports.gen(function* () {
   const lessonService = yield* LessonParserService;
   const lessons = yield* lessonService.getLessonsFromRepo(
@@ -83717,11 +83420,12 @@ var chooseLessonAndRunIt = (opts) => Effect_exports.gen(function* () {
           description: lesson.name
         })),
         suggest: async (input, choices) => {
-          return choices.filter(
-            (choice6) => `${choice6.title}-${choice6.description}`.includes(
-              input
-            )
-          );
+          const normalizedInput = normalizeExerciseNumber(input);
+          return choices.filter((choice6) => {
+            const searchText = `${choice6.title}-${choice6.description}`;
+            const normalizedSearchText = normalizeExerciseNumber(searchText);
+            return searchText.includes(input) || normalizedSearchText.includes(normalizedInput);
+          });
         }
       }
     ])
@@ -83734,8 +83438,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(
@@ -83762,14 +83465,24 @@ var exercise = Command_exports2.make(
   },
   ({ cwd, debug: debug3, envFilePath, lesson, root, simple: simple3 }) => {
     return Effect_exports.gen(function* () {
+      if (simple3) {
+        return yield* Effect_exports.fail(
+          new Error(
+            "Simple is now the default mode, so you no longer need to include the --simple flag"
+          )
+        );
+      }
+      const resolvedEnvFilePath = path4__namespace.relative(
+        cwd,
+        envFilePath
+      );
       if (Option_exports.isSome(lesson)) {
         return yield* runLesson({
           lesson: lesson.value,
           root,
-          envFilePath,
+          envFilePath: resolvedEnvFilePath,
           cwd,
-          forceSubfolderIndex: void 0,
-          simple: simple3
+          forceSubfolderIndex: void 0
         }).pipe(
           Logger_exports.withMinimumLogLevel(
             debug3 ? LogLevel_exports.Debug : LogLevel_exports.Info
@@ -83778,9 +83491,8 @@ var exercise = Command_exports2.make(
       }
       return yield* chooseLessonAndRunIt({
         root,
-        envFilePath,
-        cwd,
-        simple: simple3
+        envFilePath: resolvedEnvFilePath,
+        cwd
       }).pipe(
         Logger_exports.withMinimumLogLevel(
           debug3 ? LogLevel_exports.Debug : LogLevel_exports.Info
@@ -83876,7 +83588,7 @@ var runLessonSimple = (opts) => Effect_exports.gen(function* () {
     util.styleText("bold", `Running ${lesson} ${subfolder}...`)
   );
   ChildProcess.execSync(
-    `pnpm tsx --env-file "${envFilePath}" "${mainFile}"`,
+    `pnpm tsx --env-file="${envFilePath}" "${mainFile}"`,
     {
       stdio: "inherit",
       cwd
@@ -84214,6 +83926,12 @@ var lint = Command_exports2.make(
             ".gitkeep file found in the exercise."
           );
         }
+        if (files.some((file6) => file6.includes("speaker-notes.md"))) {
+          errorTracker.addError(
+            lesson,
+            "speaker-notes.md file found in the exercise. This should not be exposed to users."
+          );
+        }
       }
       const readmeContents = allReadmeContents.join("\n");
       const referenceLessons = lessons.filter(
@@ -84519,7 +84237,8 @@ var upgradePackages = Command_exports2.make(
       "ai@latest",
       "@ai-sdk/*@latest",
       "ai-hero-cli@latest",
-      "evalite@latest"
+      "evalite@latest",
+      "vitest@latest"
     ).pipe(
       verbose ? Command_exports.stdout("inherit") : Command_exports.stdout("pipe"),
       verbose ? Command_exports.stderr("inherit") : Command_exports.stderr("pipe"),

package/package.json

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