ai-hero-cli 0.0.24 → 0.0.26

package/bin.cjs

@@ -5595,8 +5595,8 @@ ${ctx.indent}`;
         const vs0 = valueStr[0];
         const nl0 = valueStr.indexOf("\n");
         const hasNewline = nl0 !== -1;
-        const flow2 = ctx.inFlow ?? value5.flow ?? value5.items.length === 0;
-        if (hasNewline || !flow2) {
+        const flow3 = ctx.inFlow ?? value5.flow ?? value5.items.length === 0;
+        if (hasNewline || !flow3) {
           let hasPropsLine = false;
           if (hasNewline && (vs0 === "&" || vs0 === "!")) {
             let sp0 = valueStr.indexOf(" ");
@@ -5814,8 +5814,8 @@ var require_stringifyCollection = __commonJS({
     var stringify2 = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyCollection(collection, ctx, options3) {
-      const flow2 = ctx.inFlow ?? collection.flow;
-      const stringify3 = flow2 ? stringifyFlowCollection : stringifyBlockCollection;
+      const flow3 = ctx.inFlow ?? collection.flow;
+      const stringify3 = flow3 ? stringifyFlowCollection : stringifyBlockCollection;
       return stringify3(collection, ctx, options3);
     }
     function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, flowChars, itemIndent, onChompKeep, onComment }) {
@@ -7426,7 +7426,7 @@ var require_Document = __commonJS({
           options3 = replacer;
           replacer = void 0;
         }
-        const { aliasDuplicateObjects, anchorPrefix, flow: flow2, keepUndefined, onTagObj, tag: tag4 } = options3 ?? {};
+        const { aliasDuplicateObjects, anchorPrefix, flow: flow3, keepUndefined, onTagObj, tag: tag4 } = options3 ?? {};
         const { onAnchor, setAnchors, sourceObjects } = anchors.createNodeAnchors(
           this,
           // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -7442,7 +7442,7 @@ var require_Document = __commonJS({
           sourceObjects
         };
         const node = createNode.createNode(value5, tag4, ctx);
-        if (flow2 && identity3.isCollection(node))
+        if (flow3 && identity3.isCollection(node))
           node.flow = true;
         setAnchors();
         return node;
@@ -7688,7 +7688,7 @@ ${pointer}
 // node_modules/.pnpm/yaml@2.8.1/node_modules/yaml/dist/compose/resolve-props.js
 var require_resolve_props = __commonJS({
   "node_modules/.pnpm/yaml@2.8.1/node_modules/yaml/dist/compose/resolve-props.js"(exports) {
-    function resolveProps(tokens, { flow: flow2, indicator, next, offset, onError: onError4, parentIndent, startOnNewline }) {
+    function resolveProps(tokens, { flow: flow3, indicator, next, offset, onError: onError4, parentIndent, startOnNewline }) {
       let spaceBefore = false;
       let atNewline = startOnNewline;
       let hasSpace = startOnNewline;
@@ -7717,7 +7717,7 @@ var require_resolve_props = __commonJS({
         }
         switch (token.type) {
           case "space":
-            if (!flow2 && (indicator !== "doc-start" || next?.type !== "flow-collection") && token.source.includes("	")) {
+            if (!flow3 && (indicator !== "doc-start" || next?.type !== "flow-collection") && token.source.includes("	")) {
               tab = token;
             }
             hasSpace = true;
@@ -7773,15 +7773,15 @@ var require_resolve_props = __commonJS({
             if (anchor || tag4)
               onError4(token, "BAD_PROP_ORDER", `Anchors and tags must be after the ${token.source} indicator`);
             if (found)
-              onError4(token, "UNEXPECTED_TOKEN", `Unexpected ${token.source} in ${flow2 ?? "collection"}`);
+              onError4(token, "UNEXPECTED_TOKEN", `Unexpected ${token.source} in ${flow3 ?? "collection"}`);
             found = token;
             atNewline = indicator === "seq-item-ind" || indicator === "explicit-key-ind";
             hasSpace = false;
             break;
           case "comma":
-            if (flow2) {
+            if (flow3) {
               if (comma3)
-                onError4(token, "UNEXPECTED_TOKEN", `Unexpected , in ${flow2}`);
+                onError4(token, "UNEXPECTED_TOKEN", `Unexpected , in ${flow3}`);
               comma3 = token;
               atNewline = false;
               hasSpace = false;
@@ -42031,7 +42031,7 @@ var require_lodash = __commonJS({
         function defaultTo(value5, defaultValue) {
           return value5 == null || value5 !== value5 ? defaultValue : value5;
         }
-        var flow2 = createFlow();
+        var flow3 = createFlow();
         var flowRight = createFlow(true);
         function identity3(value5) {
           return value5;
@@ -42231,7 +42231,7 @@ var require_lodash = __commonJS({
         lodash.flattenDeep = flattenDeep;
         lodash.flattenDepth = flattenDepth;
         lodash.flip = flip3;
-        lodash.flow = flow2;
+        lodash.flow = flow3;
         lodash.flowRight = flowRight;
         lodash.fromPairs = fromPairs;
         lodash.functions = functions;
@@ -51999,8 +51999,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}`);
@@ -83495,7 +83495,7 @@ var runLesson = Effect_exports.fn("runLesson")(function* (opts) {
   const command2 = Command_exports.make(
     "pnpm",
     "tsx",
-    "--env-file",
+    `--env-file`,
     envFilePath,
     mainFile
   ).pipe(
@@ -83699,6 +83699,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 +83720,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);
+          });
         }
       }
     ])
@@ -83762,11 +83766,15 @@ var exercise = Command_exports2.make(
   },
   ({ cwd, debug: debug3, envFilePath, lesson, root, simple: simple3 }) => {
     return Effect_exports.gen(function* () {
+      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
@@ -83778,7 +83786,7 @@ var exercise = Command_exports2.make(
       }
       return yield* chooseLessonAndRunIt({
         root,
-        envFilePath,
+        envFilePath: resolvedEnvFilePath,
         cwd,
         simple: simple3
       }).pipe(
@@ -83876,7 +83884,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 +84222,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(
@@ -84350,11 +84364,7 @@ var ImageUploadError = class extends Data_exports.TaggedError(
 var uploadToCloudinary = Command_exports2.make(
   "upload-to-cloudinary",
   {
-    filePath: Options_exports.text("file-path").pipe(
-      Options_exports.withDescription(
-        "The markdown file to extract images from"
-      )
-    ),
+    root: rootOption,
     cwd: Options_exports.text("cwd").pipe(
       Options_exports.withDescription("The working directory"),
       Options_exports.withDefault(process.cwd())
@@ -84364,7 +84374,7 @@ var uploadToCloudinary = Command_exports2.make(
   Effect_exports.fn("upload-to-cloudinary")(function* ({
     cwd,
     envFilePath,
-    filePath
+    root
   }) {
     const fs = yield* FileSystem_exports.FileSystem;
     const envConfig = dotenv.config({
@@ -84394,66 +84404,87 @@ var uploadToCloudinary = Command_exports2.make(
       api_secret: apiSecret,
       cloud_name: cloudName
     });
-    const fileContent5 = yield* fs.readFileString(filePath);
-    const imageRegex = /!\[([^\]]*)\]\(([^)]+)\)/g;
-    const imageMatches = Array.from(
-      fileContent5.matchAll(imageRegex)
-    );
-    if (imageMatches.length === 0) {
-      return yield* new NoImagesFoundError({
-        message: "No images found in the markdown file"
-      });
+    const lessonParserService = yield* LessonParserService;
+    const lessons = yield* lessonParserService.getLessonsFromRepo(root);
+    const readmeFiles = [];
+    for (const lesson of lessons) {
+      const allFiles = yield* lesson.allFiles();
+      const foundReadmes = allFiles.filter(
+        (file6) => file6.includes("readme.md")
+      );
+      for (const readmeFile of foundReadmes) {
+        readmeFiles.push(readmeFile);
+      }
     }
-    let updatedContent = fileContent5;
-    const markdownDir = path4__namespace.dirname(filePath);
-    for (const [fullMatch, altText, imagePath] of imageMatches) {
-      let resolvedImagePath;
-      if (imagePath.startsWith("/")) {
-        resolvedImagePath = path4__namespace.resolve(
-          cwd,
-          // Remove the leading slash
-          imagePath.slice(1)
-        );
-      } else if (imagePath.startsWith("http")) {
-        continue;
-      } else {
-        resolvedImagePath = path4__namespace.resolve(markdownDir, imagePath);
+    for (const readmeFile of readmeFiles) {
+      const fileContent5 = yield* fs.readFileString(readmeFile);
+      const imageRegex = /!\[([^\]]*)\]\(([^)]+)\)/g;
+      const imageMatches = Array.from(
+        fileContent5.matchAll(imageRegex)
+      );
+      if (imageMatches.length === 0) {
+        return yield* new NoImagesFoundError({
+          message: "No images found in the markdown file"
+        });
       }
-      const imageExists = yield* fs.exists(resolvedImagePath);
-      if (!imageExists) {
+      let updatedContent = fileContent5;
+      const markdownDir = path4__namespace.dirname(readmeFile);
+      for (const [
+        fullMatch,
+        altText,
+        imagePath
+      ] of imageMatches) {
+        let resolvedImagePath;
+        if (imagePath.startsWith("/")) {
+          resolvedImagePath = path4__namespace.resolve(
+            cwd,
+            // Remove the leading slash
+            imagePath.slice(1)
+          );
+        } else if (imagePath.startsWith("http")) {
+          continue;
+        } else {
+          resolvedImagePath = path4__namespace.resolve(
+            markdownDir,
+            imagePath
+          );
+        }
+        const imageExists = yield* fs.exists(resolvedImagePath);
+        if (!imageExists) {
+          yield* Console_exports.log(
+            `Warning: Image file not found: ${resolvedImagePath}`
+          );
+          continue;
+        }
+        yield* Console_exports.log(`Uploading: ${resolvedImagePath}`);
+        const uploadResult = yield* Effect_exports.tryPromise({
+          try: () => {
+            return import_cloudinary.v2.uploader.upload(
+              resolvedImagePath,
+              {
+                resource_type: "auto",
+                folder: "ai-hero-images"
+                // Optional: organize uploads in a folder
+              }
+            );
+          },
+          catch: (error4) => {
+            return new ImageUploadError({
+              message: `Error uploading ${imagePath}`,
+              cause: error4
+            });
+          }
+        });
+        updatedContent = updatedContent.replace(
+          fullMatch,
+          `![${altText}](${uploadResult.secure_url})`
+        );
         yield* Console_exports.log(
-          `Warning: Image file not found: ${resolvedImagePath}`
+          `\u2713 Uploaded: ${uploadResult.secure_url}`
         );
-        continue;
       }
-      yield* Console_exports.log(`Uploading: ${resolvedImagePath}`);
-      const uploadResult = yield* Effect_exports.tryPromise({
-        try: () => {
-          return import_cloudinary.v2.uploader.upload(resolvedImagePath, {
-            resource_type: "auto",
-            folder: "ai-hero-images"
-            // Optional: organize uploads in a folder
-          });
-        },
-        catch: (error4) => {
-          return new ImageUploadError({
-            message: `Error uploading ${imagePath}`,
-            cause: error4
-          });
-        }
-      });
-      updatedContent = updatedContent.replace(
-        fullMatch,
-        `![${altText}](${uploadResult.secure_url})`
-      );
-      yield* Console_exports.log(
-        `\u2713 Uploaded: ${uploadResult.secure_url}`
-      );
+      yield* fs.writeFileString(readmeFile, updatedContent);
     }
-    yield* fs.writeFileString(filePath, updatedContent);
-    yield* Console_exports.log(
-      "\u2713 Markdown file updated with Cloudinary URLs"
-    );
   })
 ).pipe(
   Command_exports2.withDescription(
@@ -84501,7 +84532,9 @@ var upgradePackages = Command_exports2.make(
       "upgrade",
       "ai@latest",
       "@ai-sdk/*@latest",
-      "ai-hero-cli@latest"
+      "ai-hero-cli@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.24",
+  "version": "0.0.26",
   "type": "module",
   "description": "The CLI used to run exercises for the AI Hero course",
   "bin": "bin.cjs",