pokit 0.0.6 → 0.0.8

package/bin/pok.ts

@@ -6,8 +6,7 @@
  * 1. Searches for pok.config.ts (or .config/pok.config.ts) starting from cwd
  * 2. Loads and validates the config
  * 3. Resolves paths relative to config file location
- * 4. Dynamically imports adapters
- * 5. Calls runCli() with resolved configuration
+ * 4. Calls runCli() with the config
  *
  * Install globally with: bun add -g pokit
  * Then run `pok` from any project with a pok.config.ts file.
@@ -56,10 +55,10 @@ function findConfigFileSimple(startDir: string): { configPath: string; configDir
 }
 
 async function main() {
-  const cwd = process.cwd();
+  const processCwd = process.cwd();
 
   // Step 1: Find config file using simple inline search
-  const configResult = findConfigFileSimple(cwd);
+  const configResult = findConfigFileSimple(processCwd);
 
   if (!configResult) {
     console.error(`Error: No pok configuration found.
@@ -73,13 +72,17 @@ Run \`pok init\` to create a pok.config.ts file.
 
   // Step 2: Dynamically resolve @pokit/config from the project directory
   let configModule: {
-    validateConfig: (config: unknown, configPath: string) => {
+    validateConfig: (
+      config: unknown,
+      configPath: string
+    ) => {
+      appDir: string;
+      cwd: string;
       commandsDir: string;
-      projectRoot?: string;
       appName?: string;
-      reporterAdapter: string;
-      prompter: string;
-      tabs?: string;
+      reporter: unknown;
+      prompter: unknown;
+      tabs?: unknown;
       version?: string;
     };
   };
@@ -109,10 +112,10 @@ Run \`pok init\` to create a pok.config.ts file.
   }
 
   // Step 4: Resolve paths relative to config file location
-  const commandsDir = path.resolve(configDir, config.commandsDir);
-  const projectRoot = config.projectRoot
-    ? path.resolve(configDir, config.projectRoot)
-    : configDir;
+  // appDir is relative to configDir, commandsDir is relative to appDir
+  const appDir = path.resolve(configDir, config.appDir);
+  const commandsDir = path.resolve(appDir, config.commandsDir);
+  const cwd = path.resolve(configDir, config.cwd);
 
   // Verify commands directory exists
   if (!fs.existsSync(commandsDir)) {
@@ -121,79 +124,30 @@ Run \`pok init\` to create a pok.config.ts file.
     process.exit(1);
   }
 
-  // Step 5: Resolve @pokit/core from the config directory
+  // Step 5: Resolve @pokit/core from appDir (where packages are installed)
   let corePath: string;
   try {
-    corePath = await resolve('@pokit/core', configDir);
+    corePath = await resolve('@pokit/core', appDir);
   } catch {
     console.error(
-      `Error: @pokit/core is not installed in ${configDir}\n\n` +
+      `Error: @pokit/core is not installed in ${appDir}\n\n` +
         'Install it with:\n' +
         '  bun add @pokit/core\n'
     );
     process.exit(1);
   }
 
-  // Step 6: Dynamically import adapters from the config directory
-  let createReporterAdapter: (options?: { output?: unknown }) => unknown;
-  let createPrompter: () => unknown;
-  let createTabs: (() => unknown) | undefined;
-
-  // Import reporter adapter
-  try {
-    const reporterPath = await resolve(config.reporterAdapter, configDir);
-    const reporterModule = await import(reporterPath);
-    createReporterAdapter = reporterModule.createReporterAdapter;
-  } catch {
-    console.error(
-      `Error: Reporter adapter "${config.reporterAdapter}" is not installed.\n\n` +
-        `Install it with:\n` +
-        `  bun add ${config.reporterAdapter}\n`
-    );
-    process.exit(1);
-  }
-
-  // Import prompter
-  try {
-    const prompterPath = await resolve(config.prompter, configDir);
-    const prompterModule = await import(prompterPath);
-    createPrompter = prompterModule.createPrompter;
-  } catch {
-    console.error(
-      `Error: Prompter "${config.prompter}" is not installed.\n\n` +
-        `Install it with:\n` +
-        `  bun add ${config.prompter}\n`
-    );
-    process.exit(1);
-  }
-
-  // Import tabs adapter if configured
-  if (config.tabs) {
-    try {
-      const tabsPath = await resolve(config.tabs, configDir);
-      const tabsModule = await import(tabsPath);
-      createTabs = tabsModule.createTabs;
-    } catch {
-      console.error(
-        `Error: Tabs adapter "${config.tabs}" is not installed.\n\n` +
-          `Install it with:\n` +
-          `  bun add ${config.tabs}\n`
-      );
-      process.exit(1);
-    }
-  }
-
-  // Step 7: Import core and call runCli
+  // Step 6: Import core and call runCli with config adapters
   const { runCli } = await import(corePath);
 
   await runCli(process.argv.slice(2), {
     commandsDir,
-    projectRoot,
+    projectRoot: cwd, // core uses projectRoot, config uses cwd
     appName: config.appName,
     version: config.version,
-    reporterAdapter: createReporterAdapter(),
-    prompter: createPrompter(),
-    tabs: createTabs?.(),
+    reporterAdapter: config.reporter,
+    prompter: config.prompter,
+    tabs: config.tabs,
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pokit",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Global CLI launcher for pok - install once, run anywhere",
   "type": "module",
   "license": "MIT",

package/src/init.ts

@@ -14,12 +14,13 @@ const CONFIG_FILENAME = 'pok.config.ts';
  * Fallback template used when @pokit/config isn't installed yet.
  * This enables bootstrapping new projects.
  */
-const FALLBACK_CONFIG_TEMPLATE = `import { defineConfig } from 'pokit'
+const FALLBACK_CONFIG_TEMPLATE = `import { defineConfig } from '@pokit/config'
+import { createReporterAdapter } from '@pokit/reporter-clack'
+import { createPrompter } from '@pokit/prompter-clack'
 
 export default defineConfig({
-  commandsDir: './commands',
-  reporterAdapter: '@pokit/reporter-clack',
-  prompter: '@pokit/prompter-clack',
+  reporter: createReporterAdapter(),
+  prompter: createPrompter(),
 })
 `;