@kosmojs/dev 0.0.10 → 0.0.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@kosmojs/dev",
-  "version": "0.0.10",
+  "version": "0.0.20",
   "cacheVersion": "001",
   "author": "Slee Woo",
   "license": "MIT",
@@ -11,71 +11,38 @@
   "files": [
     "pkg/*"
   ],
-  "bin": {
-    "kosmo": "pkg/cli/cli.js"
-  },
   "exports": {
     ".": {
       "types": "./pkg/src/index.d.ts",
       "default": "./pkg/index.js"
     },
-    "./routes": {
-      "types": "./pkg/src/base-plugin/routes.d.ts",
-      "default": "./pkg/base-plugin/routes.js"
-    },
     "./stub-generator": {
       "types": "./pkg/src/stub-generator/index.d.ts",
       "default": "./pkg/stub-generator/index.js"
     },
-    "./cli": {
-      "types": "./pkg/src/cli/index.d.ts",
-      "default": "./pkg/cli/index.js"
-    },
     "./package.json": "./package.json"
   },
   "dependencies": {
     "chokidar": "^5.0.0",
-    "concurrently": "^9.2.1",
     "crc": "^4.3.2",
     "dotenv": "^17.2.3",
-    "esbuild": "^0.27.1",
+    "esbuild": "^0.27.2",
+    "handlebars": "^4.7.8",
     "ora": "^9.0.0",
     "picomatch": "^4.0.3",
-    "prompts": "^2.4.2",
     "tfusion": "^0.0.23",
     "tinyglobby": "^0.2.15",
     "ts-morph": "^27.0.2",
-    "typescript": "^5.9.3",
-    "@kosmojs/api": "^0.0.10",
-    "@kosmojs/api-generator": "^0.0.10",
-    "@kosmojs/devlib": "^0.0.10",
-    "@kosmojs/fetch-generator": "^0.0.10"
+    "typescript": "^5.9.3"
   },
   "devDependencies": {
-    "@solidjs/router": "^0.15.4",
-    "@types/koa": "^3.0.1",
-    "@types/koa__router": "^12.0.5",
-    "@types/node": "^24.10.1",
-    "@types/picomatch": "^4.0.2",
-    "@types/prompts": "^2.4.9",
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.1.2",
-    "@vitejs/plugin-vue": "^6.0.2",
-    "react": "^19.2.1",
-    "react-dom": "^19.2.1",
-    "react-router": "^7.10.1",
-    "solid-js": "^1.9.10",
-    "tslib": "^2.8.1",
-    "vite": "^7.2.7",
-    "vite-plugin-solid": "^2.11.10",
-    "vue": "^3.5.25",
-    "vue-router": "^4.6.3",
-    "@kosmojs/config": "^0.0.10"
+    "@types/picomatch": "^4.0.2"
+  },
+  "peerDependencies": {
+    "@kosmojs/api": "^0.0.20"
   },
   "scripts": {
-    "build": "esbuilder src/index.ts src/base-plugin/routes.ts src/base-plugin/worker.ts src/stub-generator/index.ts src/cli/cli.ts src/cli/index.ts",
-    "postbuild": "rsync -av --delete src/cli/templates/ pkg/cli/templates",
+    "build": "esbuilder src/index.ts src/base-plugin/worker.ts src/stub-generator/index.ts",
     "test": "vitest --root ../../.. --project core/dev"
   }
 }

package/pkg/base-plugin/worker.js

@@ -1,32 +1,161 @@
 // src/base-plugin/worker.ts
 import { parentPort, workerData } from "node:worker_threads";
 import chokidar from "chokidar";
-import crc4 from "crc/crc32";
-import {
-  pathResolver as pathResolver3
-} from "@kosmojs/devlib";
+import crc6 from "crc/crc32";
 
-// src/base-plugin/routes.ts
-import {
-  defaults as defaults2
-} from "@kosmojs/devlib";
+// src/paths.ts
+import { join } from "node:path";
 
-// src/base-plugin/routes/resolve.ts
-import { dirname as dirname2, join, resolve as resolve3 } from "node:path";
-import crc3 from "crc/crc32";
+// src/defaults.ts
+var defaults = {
+  appPrefix: "~",
+  srcPrefix: "@",
+  libPrefix: "_",
+  coreDir: "core",
+  srcDir: "src",
+  libDir: "lib",
+  configDir: "config",
+  apiDir: "api",
+  pagesDir: "pages",
+  entryDir: "entry",
+  fetchDir: "fetch"
+};
+
+// src/paths.ts
+var pathResolver = ({
+  appRoot: appRoot2,
+  sourceFolder: sourceFolder2
+}) => {
+  const createPath2 = (...a) => {
+    return appRoot2 ? join(appRoot2, ...a) : join(...a);
+  };
+  const createImport = {
+    coreApi(...a) {
+      return join(defaults.appPrefix, defaults.coreDir, defaults.apiDir, ...a);
+    },
+    src(...a) {
+      return join(defaults.srcPrefix, sourceFolder2, ...a);
+    },
+    config(...a) {
+      return this.src(defaults.configDir, ...a);
+    },
+    api(...a) {
+      return this.src(defaults.apiDir, ...a);
+    },
+    pages(...a) {
+      return this.src(defaults.pagesDir, ...a);
+    },
+    lib(...a) {
+      return join(defaults.libPrefix, sourceFolder2, ...a);
+    },
+    libApi(...a) {
+      return this.lib(defaults.apiDir, ...a);
+    },
+    libEntry(...a) {
+      return this.lib(defaults.entryDir, ...a);
+    },
+    fetch(...a) {
+      return this.lib(defaults.fetchDir, ...a);
+    }
+  };
+  return {
+    createPath: {
+      coreApi(...a) {
+        return createPath2(defaults.coreDir, defaults.apiDir, ...a);
+      },
+      src(...a) {
+        return createPath2(defaults.srcDir, sourceFolder2, ...a);
+      },
+      api(...a) {
+        return this.src(defaults.apiDir, ...a);
+      },
+      pages(...a) {
+        return this.src(defaults.pagesDir, ...a);
+      },
+      config(...a) {
+        return this.src(defaults.configDir, ...a);
+      },
+      entry(...a) {
+        return this.src(defaults.entryDir, ...a);
+      },
+      lib(...a) {
+        return createPath2(defaults.libDir, defaults.srcDir, sourceFolder2, ...a);
+      },
+      libApi(...a) {
+        return this.lib(defaults.apiDir, ...a);
+      },
+      libEntry(...a) {
+        return this.lib(defaults.entryDir, ...a);
+      },
+      libPages(...a) {
+        return this.lib(defaults.pagesDir, ...a);
+      },
+      fetch(...a) {
+        return this.lib(defaults.fetchDir, ...a);
+      }
+    },
+    createImport,
+    createImportHelper: (key, ...a) => {
+      return createImport[key](...a.slice(0, -1));
+    }
+  };
+};
+
+// src/routes-factory/resolve.ts
+import { dirname as dirname3, join as join3, resolve as resolve3 } from "node:path";
+import crc5 from "crc/crc32";
 import picomatch from "picomatch";
 import { glob } from "tinyglobby";
-import {
-  defaults,
-  pathResolver as pathResolver2,
-  pathTokensFactory,
-  render,
-  renderToFile
-} from "@kosmojs/devlib";
 
-// src/base-plugin/ast.ts
-import { resolve } from "node:path";
+// src/render.ts
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join as join2 } from "node:path";
 import crc from "crc/crc32";
+import handlebars from "handlebars";
+
+// src/fs.ts
+import { access, constants } from "node:fs/promises";
+var pathExists = async (path) => {
+  try {
+    await access(path, constants.F_OK);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+// src/render.ts
+var render = (template, context, options) => {
+  const { noEscape = true, renderer = handlebars } = { ...options };
+  return renderer.compile(template, { noEscape })(context);
+};
+var renderAsFile = (file, template, context, options) => {
+  const { formatters: formatters2, ...renderOpts } = { ...options };
+  const content = render(template, context, renderOpts);
+  return Array.isArray(formatters2) ? formatters2.reduce((c, f) => f(c, file), content) : content;
+};
+var renderToFile = async (file, template, context, options) => {
+  const content = renderAsFile(file, template, context, options);
+  if (await pathExists(file)) {
+    const { overwrite = true } = { ...options };
+    if (overwrite === false) {
+      return;
+    }
+    const fileContent = await readFile(file, "utf8");
+    if (typeof overwrite === "function" && !overwrite(fileContent)) {
+      return;
+    }
+    if (crc(content) === crc(fileContent)) {
+      return;
+    }
+  }
+  await mkdir(dirname(file), { recursive: true });
+  await writeFile(file, content, "utf8");
+};
+
+// src/ast.ts
+import { resolve } from "node:path";
+import crc2 from "crc/crc32";
 import { flattener } from "tfusion";
 import {
   Project,
@@ -113,14 +242,14 @@ var extractRouteMethods = (callExpression, route) => {
     const payloadText = payloadGeneric?.node ? payloadGeneric.node.getChildren().length === 0 ? "{}" : payloadGeneric.node.getFullText() : void 0;
     const responseText = responseGeneric?.node.getText();
     const responseType = responseText ? {
-      id: ["ResponseT", crc(route.importName + method)].join(""),
+      id: ["ResponseT", crc2(route.id + method)].join(""),
       method,
       skipValidation: responseGeneric?.comments ? responseGeneric.comments.some(skipValidationFilter) : false,
       text: ["never", "object"].includes(responseText) ? "{}" : responseText,
       resolvedType: void 0
     } : void 0;
     const payloadType = payloadText ? {
-      id: ["PayloadT", crc(route.importName + method)].join(""),
+      id: ["PayloadT", crc2(route.id + method)].join(""),
       responseTypeId: responseType?.id,
       method,
       skipValidation: payloadGeneric?.comments ? payloadGeneric.comments.some(skipValidationFilter) : false,
@@ -254,7 +383,7 @@ var typeResolverFactory = ({ appRoot: appRoot2 }) => {
   });
   const literalTypesResolver = (literalTypes, options) => {
     const sourceFile = project.createSourceFile(
-      `${crc(literalTypes)}-${Date.now()}.ts`,
+      `${crc2(literalTypes)}-${Date.now()}.ts`,
       literalTypes,
       { overwrite: true }
     );
@@ -279,12 +408,11 @@ var typeResolverFactory = ({ appRoot: appRoot2 }) => {
   };
 };
 
-// src/base-plugin/cache.ts
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { dirname, resolve as resolve2 } from "node:path";
-import crc2 from "crc/crc32";
+// src/cache.ts
+import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
+import { dirname as dirname2, resolve as resolve2 } from "node:path";
+import crc3 from "crc/crc32";
 import self from "@kosmojs/dev/package.json" with { type: "json" };
-import { pathExists, pathResolver } from "@kosmojs/devlib";
 var cacheFactory = (route, {
   appRoot: appRoot2,
   sourceFolder: sourceFolder2,
@@ -293,11 +421,11 @@ var cacheFactory = (route, {
   const cacheFile = pathResolver({
     appRoot: appRoot2,
     sourceFolder: sourceFolder2
-  }).resolve("apiLibDir", dirname(route.file), "cache.json");
+  }).createPath.libApi(dirname2(route.file), "cache.json");
   const getCache = async (opt) => {
     if (await pathExists(cacheFile)) {
       try {
-        const cache = JSON.parse(await readFile(cacheFile, "utf8"));
+        const cache = JSON.parse(await readFile2(cacheFile, "utf8"));
         return opt?.validate ? validateCache(cache) : cache;
       } catch (_e) {
       }
@@ -320,8 +448,8 @@ var cacheFactory = (route, {
       ] = await generateFileHash(file);
     }
     const cache = { ...rest, hash, referencedFiles };
-    await mkdir(dirname(cacheFile), { recursive: true });
-    await writeFile(cacheFile, JSON.stringify(cache, null, 2), "utf8");
+    await mkdir2(dirname2(cacheFile), { recursive: true });
+    await writeFile2(cacheFile, JSON.stringify(cache, null, 2), "utf8");
     return cache;
   };
   const validateCache = async (cache) => {
@@ -353,11 +481,11 @@ var cacheFactory = (route, {
 var generateFileHash = async (file, extraContext) => {
   let fileContent;
   try {
-    fileContent = await readFile(file, "utf8");
+    fileContent = await readFile2(file, "utf8");
   } catch (_e) {
     return 0;
   }
-  return fileContent ? crc2(
+  return fileContent ? crc3(
     JSON.stringify({
       ...extraContext,
       [self.cacheVersion]: fileContent
@@ -368,13 +496,63 @@ var identicalHashSum = (a, b) => {
   return a === b;
 };
 
-// src/base-plugin/templates/resolved-types.hbs
+// src/routes-factory/base.ts
+import crc4 from "crc/crc32";
+var pathTokensFactory = (path) => {
+  const requiredParamRegex = /^\[([^\]]+)\]$/;
+  const optionalParamRegex = /^\[\[([^\]]+)\]\]$/;
+  const restParamRegex = /^\[\.\.\.([^\]]+)\]$/;
+  return path.split("/").map((orig, i) => {
+    const [base, ext = ""] = orig.split(/(\.([\w\d-]+)$)/);
+    const paramBase = (regex) => {
+      const name = base.replace(regex, "$1") || base;
+      return {
+        name,
+        const: /\W/.test(name) ? [name.replace(/\W/g, "_"), crc4(orig)].join("_") : name
+      };
+    };
+    let param;
+    if (base.startsWith("[")) {
+      if (restParamRegex.test(base)) {
+        param = {
+          ...paramBase(restParamRegex),
+          isRequired: false,
+          isOptional: false,
+          isRest: true
+        };
+      } else if (optionalParamRegex.test(base)) {
+        param = {
+          ...paramBase(optionalParamRegex),
+          isRequired: false,
+          isOptional: true,
+          isRest: false
+        };
+      } else if (requiredParamRegex.test(base)) {
+        param = {
+          ...paramBase(requiredParamRegex),
+          isRequired: true,
+          isOptional: false,
+          isRest: false
+        };
+      }
+    }
+    return {
+      orig,
+      base,
+      path: i === 0 ? orig.replace(/^index$/, "/") : orig,
+      ext,
+      ...param ? { param } : {}
+    };
+  });
+};
+
+// src/routes-factory/templates/resolved-types.hbs
 var resolved_types_default = "{{#each resolvedTypes}}\nexport type {{name}} = {{text}};\n{{/each}}\n";
 
-// src/base-plugin/templates/types.hbs
+// src/routes-factory/templates/types.hbs
 var types_default = '{{#each typeDeclarations}}{{text}}\n{{/each}}\n\nexport type {{params.id}} = {\n  {{#each paramsSchema}}\n  "{{name}}"{{#unless isRequired}}?{{/unless}}:{{#if isRest}} Array<{{/if}}\n    {{#if refinement}}{{refinement.text}}{{else}}string{{/if}}\n  {{#if isRest}}>{{/if}}\n  {{/each}}\n};\n\n{{#each payloadTypes}}\nexport type {{id}} = {{text}};\n{{/each}}\n\n{{#each responseTypes}}\nexport type {{id}} = {{text}};\n{{/each}}\n';
 
-// src/base-plugin/routes/resolve.ts
+// src/routes-factory/resolve.ts
 var API_INDEX_BASENAME = "index";
 var API_INDEX_PATTERN = `${API_INDEX_BASENAME}.ts`;
 var API_USE_BASENAME = "use";
@@ -397,8 +575,9 @@ var scanRoutes = async ({
   appRoot: appRoot2,
   sourceFolder: sourceFolder2
 }) => {
+  const { createPath: createPath2 } = pathResolver({ appRoot: appRoot2, sourceFolder: sourceFolder2 });
   return glob(ROUTE_FILE_PATTERNS, {
-    cwd: resolve3(appRoot2, sourceFolder2),
+    cwd: createPath2.src(),
     absolute: true,
     onlyFiles: true,
     followSymbolicLinks: false,
@@ -415,11 +594,11 @@ var isRouteFile = (file, {
   appRoot: appRoot2,
   sourceFolder: sourceFolder2
 }) => {
-  const [_sourceFolder, folder, ...rest] = resolve3(appRoot2, file).replace(`${appRoot2}/`, "").split("/");
+  const [_sourceFolder, folder, ...rest] = resolve3(appRoot2, file).replace(`${appRoot2}/${defaults.srcDir}/`, "").split("/");
   if (!folder || _sourceFolder !== sourceFolder2 || rest.length < 2) {
-    return;
+    return false;
   }
-  return picomatch.isMatch(join(folder, ...rest), ROUTE_FILE_PATTERNS) ? [folder, rest.join("/")] : void 0;
+  return picomatch.isMatch(join3(folder, ...rest), ROUTE_FILE_PATTERNS) ? [folder, rest.join("/")] : false;
 };
 var isApiRoute = (file) => {
   return picomatch.matchBase(file, `**/${API_INDEX_PATTERN}`);
@@ -433,28 +612,23 @@ var isPageRoute = (file) => {
 var isPageLayout = (file) => {
   return picomatch.matchBase(file, `**/${PAGE_LAYOUT_PATTERN}`);
 };
-var createRouteEntry = (_file, {
+var createRouteEntry = (fileFullpath, {
   appRoot: appRoot2,
   sourceFolder: sourceFolder2
 }) => {
-  const resolvedPaths = isRouteFile(_file, { appRoot: appRoot2, sourceFolder: sourceFolder2 });
+  const resolvedPaths = isRouteFile(fileFullpath, { appRoot: appRoot2, sourceFolder: sourceFolder2 });
   if (!resolvedPaths) {
     return;
   }
   const [folder, file] = resolvedPaths;
-  const fileFullpath = join(appRoot2, sourceFolder2, folder, file);
-  const pathTokens = pathTokensFactory(dirname2(file));
-  const name = pathTokens.map((e) => e.orig).join("/");
-  const importFile = file;
-  const importName = `${importFile.replace(/\W+/g, "_")}_${crc3(importFile)}`;
+  const pathTokens = pathTokensFactory(dirname3(file));
   return {
-    name,
+    id: `${file.replace(/\W+/g, "_")}_${crc5(file)}`,
+    name: pathTokens.map((e) => e.orig).join("/"),
     folder,
     file,
     fileFullpath,
-    pathTokens,
-    importFile,
-    importName
+    pathTokens
   };
 };
 var pageLayoutResolverFactory = () => {
@@ -471,17 +645,10 @@ var pageLayoutResolverFactory = () => {
 };
 var pageRouteResolverFactory = () => {
   return (entry) => {
-    const {
-      name,
-      folder,
-      file,
-      fileFullpath,
-      pathTokens,
-      importFile,
-      importName
-    } = entry;
+    const { id, name, folder, file, fileFullpath, pathTokens } = entry;
     const handler = async () => {
       const entry2 = {
+        id,
         name,
         pathTokens,
         params: {
@@ -489,9 +656,7 @@ var pageRouteResolverFactory = () => {
         },
         folder,
         file,
-        fileFullpath,
-        importFile,
-        importName
+        fileFullpath
       };
       return {
         kind: "pageRoute",
@@ -534,22 +699,14 @@ var apiRouteResolverFactory = (pluginOptions) => {
     refreshSourceFile
   } = typeResolverFactory(pluginOptions);
   return (entry) => {
-    const {
-      name,
-      file,
-      folder,
-      fileFullpath,
-      pathTokens,
-      importFile,
-      importName
-    } = entry;
+    const { id, name, file, folder, fileFullpath, pathTokens } = entry;
     const handler = async (updatedFile) => {
       const paramsSchema = pathTokens.flatMap((e) => {
         return e.param ? [e.param] : [];
       });
       const optionalParams = paramsSchema.length ? !paramsSchema.some((e) => e.isRequired) : true;
       const { getCache, persistCache } = cacheFactory(
-        { file, fileFullpath, importName },
+        { id, file, fileFullpath },
         {
           appRoot: appRoot2,
           sourceFolder: sourceFolder2,
@@ -569,12 +726,12 @@ var apiRouteResolverFactory = (pluginOptions) => {
           responseTypes,
           referencedFiles = []
         } = await resolveRouteSignature(
-          { importName, fileFullpath, optionalParams },
+          { id, fileFullpath, optionalParams },
           {
             withReferencedFiles: true,
             sourceFile: getSourceFile(fileFullpath),
             relpathResolver(path) {
-              return join(sourceFolder2, defaults.apiDir, dirname2(file), path);
+              return join3(sourceFolder2, defaults.apiDir, dirname3(file), path);
             }
           }
         );
@@ -585,13 +742,12 @@ var apiRouteResolverFactory = (pluginOptions) => {
           }
           return [];
         }) : [];
-        const typesFile = pathResolver2({ appRoot: appRoot2, sourceFolder: sourceFolder2 }).resolve(
-          "apiLibDir",
-          dirname2(file),
-          "types.ts"
-        );
+        const typesFile = pathResolver({
+          appRoot: appRoot2,
+          sourceFolder: sourceFolder2
+        }).createPath.libApi(dirname3(file), "types.ts");
         const params = {
-          id: ["ParamsT", crc3(name)].join(""),
+          id: ["ParamsT", crc5(name)].join(""),
           schema: paramsSchema,
           resolvedType: void 0
         };
@@ -609,9 +765,9 @@ var apiRouteResolverFactory = (pluginOptions) => {
         });
         const resolvedTypes = resolveTypes ? literalTypesResolver(typesFileContent, {
           overrides: [...payloadTypes, ...responseTypes].reduce(
-            (map, { id, skipValidation }) => {
+            (map, { id: id2, skipValidation }) => {
               if (skipValidation) {
-                map[id] = "never";
+                map[id2] = "never";
               }
               return map;
             },
@@ -648,13 +804,12 @@ var apiRouteResolverFactory = (pluginOptions) => {
         });
       }
       const entry2 = {
+        id,
         name,
         pathTokens,
         params: cache.params,
         numericParams: cache.numericParams,
         optionalParams,
-        importName,
-        importFile,
         folder,
         file,
         fileFullpath,
@@ -677,13 +832,8 @@ var apiRouteResolverFactory = (pluginOptions) => {
   };
 };
 
-// src/base-plugin/routes/nesting.ts
-import {
-  sortRoutes
-} from "@kosmojs/devlib";
-
-// src/base-plugin/routes.ts
-var routes_default = async (pluginOptions) => {
+// src/routes-factory/index.ts
+var routesFactory = async (pluginOptions) => {
   const { appRoot: appRoot2, sourceFolder: sourceFolder2 } = pluginOptions;
   const apiRouteResolver = apiRouteResolverFactory(pluginOptions);
   const apiUseResolver = apiUseResolverFactory(pluginOptions);
@@ -696,13 +846,13 @@ var routes_default = async (pluginOptions) => {
       return entry ? [entry] : [];
     });
     for (const entry of entries) {
-      if (entry.folder === defaults2.apiDir) {
+      if (entry.folder === defaults.apiDir) {
         if (isApiRoute(entry.file)) {
           resolvers2.set(entry.fileFullpath, apiRouteResolver(entry));
         } else if (isApiUse(entry.file)) {
           resolvers2.set(entry.fileFullpath, apiUseResolver(entry));
         }
-      } else if (entry.folder === defaults2.pagesDir) {
+      } else if (entry.folder === defaults.pagesDir) {
         if (isPageRoute(entry.file)) {
           resolvers2.set(entry.fileFullpath, pageRouteResolver(entry));
         } else if (isPageLayout(entry.file)) {
@@ -742,10 +892,9 @@ var resolvedOptions = {
 var { appRoot, sourceFolder } = resolvedOptions;
 var watchHandlers = [];
 var resolvedEntries = /* @__PURE__ */ new Map();
-var { resolvers, resolversFactory } = await routes_default(resolvedOptions);
-var { resolve: resolve4 } = pathResolver3({ appRoot, sourceFolder });
+var { resolvers, resolversFactory } = await routesFactory(resolvedOptions);
 var spinnerFactory = (startText) => {
-  const id = [startText, Date.now().toString()].map(crc4).join(":");
+  const id = [startText, Date.now().toString()].map(crc6).join(":");
   const postMessage = (method, text) => {
     const spinner = { id, startText, method, text };
     parentPort?.postMessage({ spinner });
@@ -832,11 +981,12 @@ var runWatchHandlers = async (event) => {
   }
   spinner.succeed();
 };
+var { createPath } = pathResolver({ appRoot, sourceFolder });
 var watcher = chokidar.watch(
   [
     // watching for changes in sourceFolder's apiDir and pagesDir
-    resolve4("apiDir"),
-    resolve4("pagesDir")
+    createPath.api(),
+    createPath.pages()
   ],
   {
     ...resolvedOptions.watcher.options,
@@ -889,8 +1039,8 @@ watcher.on("all", async (event, file) => {
   for (const { name, factory } of generators) {
     spinner.append(name);
     try {
-      const { watchHandler } = await factory(resolvedOptions);
-      watchHandlers.push({ name, handler: watchHandler });
+      const { watch } = await factory(resolvedOptions);
+      watchHandlers.push({ name, handler: watch });
     } catch (error) {
       spinner.failed(error);
       spinner = spinnerFactory("Initializing Generators");