@funkai/cli 0.3.0 → 0.3.1

package/src/lib/prompts/pipeline.ts

@@ -3,6 +3,7 @@ import { relative, resolve } from "node:path";
 
 import type { PromptGroup } from "@funkai/config";
 import { clean, PARTIALS_DIR } from "@funkai/prompts/cli";
+import { isNil } from "es-toolkit";
 import picomatch from "picomatch";
 
 import { toFileSlug } from "./codegen.js";
@@ -10,6 +11,7 @@ import type { ParsedPrompt } from "./codegen.js";
 import { extractVariables } from "./extract-variables.js";
 import { flattenPartials } from "./flatten.js";
 import { parseFrontmatter } from "./frontmatter.js";
+import type { SchemaVariable } from "./frontmatter.js";
 import { lintPrompt } from "./lint.js";
 import type { LintResult } from "./lint.js";
 import { discoverPrompts } from "./paths.js";
@@ -51,15 +53,17 @@ function resolveGroupFromConfig(
 ): string | undefined {
   const matchPath = relative(process.cwd(), filePath).replaceAll("\\", "/");
 
-  for (const group of groups) {
+  const matched = groups.find((group) => {
     const isIncluded = picomatch(group.includes as string[]);
     const isExcluded = picomatch((group.excludes ?? []) as string[]);
+    return isIncluded(matchPath) && !isExcluded(matchPath);
+  });
 
-    if (isIncluded(matchPath) && !isExcluded(matchPath)) {
-      return group.name;
-    }
+  if (isNil(matched)) {
+    return undefined;
   }
-  return undefined;
+
+  return matched.name;
 }
 
 /**
@@ -101,14 +105,14 @@ export interface LintPipelineResult {
  * @returns Lint results for all discovered prompts.
  */
 export function runLintPipeline(options: LintPipelineOptions): LintPipelineResult {
-  let excludes: string[] | undefined;
-  if (options.excludes) {
-    excludes = [...options.excludes];
+  const discoverLintOptions: {
+    includes: string[];
+    excludes?: string[];
+  } = { includes: [...options.includes] };
+  if (options.excludes !== undefined) {
+    discoverLintOptions.excludes = [...options.excludes];
   }
-  const discovered = discoverPrompts({
-    includes: [...options.includes],
-    excludes,
-  });
+  const discovered = discoverPrompts(discoverLintOptions);
   const customPartialsDir = resolve(options.partials ?? ".prompts/partials");
   const partialsDirs = resolvePartialsDirs(customPartialsDir);
 
@@ -118,7 +122,12 @@ export function runLintPipeline(options: LintPipelineOptions): LintPipelineResul
     const frontmatter = parseFrontmatter({ content: raw, filePath: d.filePath });
     const template = flattenPartials({ template: clean(raw), partialsDirs });
     const templateVars = extractVariables(template);
-    return lintPrompt(frontmatter.name, d.filePath, frontmatter.schema, templateVars);
+    return lintPrompt({
+      name: frontmatter.name,
+      filePath: d.filePath,
+      schemaVars: frontmatter.schema,
+      templateVars,
+    });
   });
 
   return { discovered: discovered.length, results };
@@ -153,14 +162,14 @@ export interface GeneratePipelineResult {
  * @returns Parsed prompts ready for code generation, along with lint results.
  */
 export function runGeneratePipeline(options: GeneratePipelineOptions): GeneratePipelineResult {
-  let excludes: string[] | undefined;
-  if (options.excludes) {
-    excludes = [...options.excludes];
+  const discoverGenerateOptions: {
+    includes: string[];
+    excludes?: string[];
+  } = { includes: [...options.includes] };
+  if (options.excludes !== undefined) {
+    discoverGenerateOptions.excludes = [...options.excludes];
   }
-  const discovered = discoverPrompts({
-    includes: [...options.includes],
-    excludes,
-  });
+  const discovered = discoverPrompts(discoverGenerateOptions);
   const customPartialsDir = resolve(options.partials ?? resolve(options.out, "../partials"));
   const partialsDirs = resolvePartialsDirs(customPartialsDir);
   const configGroups = options.groups ?? [];
@@ -175,15 +184,29 @@ export function runGeneratePipeline(options: GeneratePipelineOptions): GenerateP
     // Frontmatter group wins; fall back to config-defined group patterns
     const group = frontmatter.group ?? resolveGroupFromConfig(d.filePath, configGroups);
 
+    const promptObj: {
+      name: string;
+      schema: readonly SchemaVariable[];
+      template: string;
+      sourcePath: string;
+      group?: string;
+    } = {
+      name: frontmatter.name,
+      schema: frontmatter.schema,
+      template,
+      sourcePath: d.filePath,
+    };
+    if (group !== undefined) {
+      promptObj.group = group;
+    }
     return {
-      lintResult: lintPrompt(frontmatter.name, d.filePath, frontmatter.schema, templateVars),
-      prompt: {
+      lintResult: lintPrompt({
         name: frontmatter.name,
-        group,
-        schema: frontmatter.schema,
-        template,
-        sourcePath: d.filePath,
-      } satisfies ParsedPrompt,
+        filePath: d.filePath,
+        schemaVars: frontmatter.schema,
+        templateVars,
+      }),
+      prompt: promptObj satisfies ParsedPrompt,
     };
   });
 

package/tsconfig.json

@@ -5,15 +5,23 @@
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "lib": ["ES2024"],
+    "types": ["node"],
+
     "strict": true,
-    "esModuleInterop": true,
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
+    "noFallthroughCasesInSwitch": true,
+    "noPropertyAccessFromIndexSignature": true,
+
+    "verbatimModuleSyntax": true,
+    "resolveJsonModule": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
+
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
+
     "outDir": "./dist",
     "rootDir": ".",
     "paths": {