@akanjs/devkit 0.0.62 → 0.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.62",
+  "version": "0.0.63",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/src/executors.cjs

@@ -107,15 +107,22 @@ class Executor {
       });
     });
   }
+  #getPath(filePath) {
+    return import_path.default.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+  }
   mkdir(dirPath) {
-    const writePath = import_path.default.isAbsolute(dirPath) ? dirPath : `${this.cwdPath}/${dirPath}`;
+    const writePath = this.#getPath(dirPath);
     if (!import_fs.default.existsSync(writePath))
       import_fs.default.mkdirSync(writePath, { recursive: true });
     this.logger.verbose(`Make directory ${writePath}`);
     return this;
   }
+  exists(filePath) {
+    const readPath = this.#getPath(filePath);
+    return import_fs.default.existsSync(readPath);
+  }
   writeFile(filePath, content) {
-    const writePath = import_path.default.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+    const writePath = this.#getPath(filePath);
     const dir = import_path.default.dirname(writePath);
     if (!import_fs.default.existsSync(dir))
       import_fs.default.mkdirSync(dir, { recursive: true });
@@ -144,16 +151,16 @@ class Executor {
     return { filepath, content };
   }
   readFile(filePath) {
-    const readPath = import_path.default.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+    const readPath = this.#getPath(filePath);
     return import_fs.default.readFileSync(readPath, "utf8");
   }
   readJson(filePath) {
-    const readPath = import_path.default.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+    const readPath = this.#getPath(filePath);
     return JSON.parse(import_fs.default.readFileSync(readPath, "utf8"));
   }
   async cp(srcPath, destPath) {
-    const src = import_path.default.isAbsolute(srcPath) ? srcPath : `${this.cwdPath}/${srcPath}`;
-    const dest = import_path.default.isAbsolute(destPath) ? destPath : `${this.cwdPath}/${destPath}`;
+    const src = this.#getPath(srcPath);
+    const dest = this.#getPath(destPath);
     await import_promises.default.cp(src, dest, { recursive: true });
   }
   log(msg) {
@@ -183,13 +190,16 @@ class Executor {
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const content = getContent.default(scanResult ?? null, dict);
+      const result = getContent.default(scanResult ?? null, dict);
+      if (result === null)
+        return;
+      const filename = typeof result === "object" ? result.filename : import_path.default.basename(targetPath).replace(".js", ".ts");
+      const content = typeof result === "object" ? result.content : result;
+      const dirname = import_path.default.dirname(targetPath);
       const convertedTargetPath = Object.entries(dict).reduce(
         (path2, [key, value]) => path2.replace(new RegExp(`__${key}__`, "g"), value),
-        targetPath.replace(".js", ".ts")
+        `${dirname}/${filename}`
       );
-      if (content === null)
-        return;
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       this.writeFile(convertedTargetPath, content);
     } else if (targetPath.endsWith(".template")) {
@@ -217,8 +227,6 @@ class Executor {
       const filename = import_path.default.basename(templatePath);
       await this.#applyTemplateFile({ templatePath, targetPath: import_path.default.join(basePath, filename), scanResult }, dict);
     } else {
-      if (!import_fs.default.existsSync(basePath))
-        await import_promises.default.mkdir(basePath, { recursive: true });
       const subdirs = await import_promises.default.readdir(templatePath);
       await Promise.all(
         subdirs.map(async (subdir) => {

package/src/executors.d.ts

@@ -14,6 +14,7 @@ export declare class Executor {
     }>;
     fork(modulePath: string, args?: string[], options?: ForkOptions): Promise<unknown>;
     mkdir(dirPath: string): this;
+    exists(filePath: string): boolean;
     writeFile(filePath: string, content: string | object): this;
     writeJson(filePath: string, content: object): this;
     getLocalFile(filePath: string): {

package/src/executors.js

@@ -71,15 +71,22 @@ class Executor {
       });
     });
   }
+  #getPath(filePath) {
+    return path.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+  }
   mkdir(dirPath) {
-    const writePath = path.isAbsolute(dirPath) ? dirPath : `${this.cwdPath}/${dirPath}`;
+    const writePath = this.#getPath(dirPath);
     if (!fs.existsSync(writePath))
       fs.mkdirSync(writePath, { recursive: true });
     this.logger.verbose(`Make directory ${writePath}`);
     return this;
   }
+  exists(filePath) {
+    const readPath = this.#getPath(filePath);
+    return fs.existsSync(readPath);
+  }
   writeFile(filePath, content) {
-    const writePath = path.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+    const writePath = this.#getPath(filePath);
     const dir = path.dirname(writePath);
     if (!fs.existsSync(dir))
       fs.mkdirSync(dir, { recursive: true });
@@ -108,16 +115,16 @@ class Executor {
     return { filepath, content };
   }
   readFile(filePath) {
-    const readPath = path.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+    const readPath = this.#getPath(filePath);
     return fs.readFileSync(readPath, "utf8");
   }
   readJson(filePath) {
-    const readPath = path.isAbsolute(filePath) ? filePath : `${this.cwdPath}/${filePath}`;
+    const readPath = this.#getPath(filePath);
     return JSON.parse(fs.readFileSync(readPath, "utf8"));
   }
   async cp(srcPath, destPath) {
-    const src = path.isAbsolute(srcPath) ? srcPath : `${this.cwdPath}/${srcPath}`;
-    const dest = path.isAbsolute(destPath) ? destPath : `${this.cwdPath}/${destPath}`;
+    const src = this.#getPath(srcPath);
+    const dest = this.#getPath(destPath);
     await fsPromise.cp(src, dest, { recursive: true });
   }
   log(msg) {
@@ -147,13 +154,16 @@ class Executor {
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
-      const content = getContent.default(scanResult ?? null, dict);
+      const result = getContent.default(scanResult ?? null, dict);
+      if (result === null)
+        return;
+      const filename = typeof result === "object" ? result.filename : path.basename(targetPath).replace(".js", ".ts");
+      const content = typeof result === "object" ? result.content : result;
+      const dirname = path.dirname(targetPath);
       const convertedTargetPath = Object.entries(dict).reduce(
         (path2, [key, value]) => path2.replace(new RegExp(`__${key}__`, "g"), value),
-        targetPath.replace(".js", ".ts")
+        `${dirname}/${filename}`
       );
-      if (content === null)
-        return;
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       this.writeFile(convertedTargetPath, content);
     } else if (targetPath.endsWith(".template")) {
@@ -181,8 +191,6 @@ class Executor {
       const filename = path.basename(templatePath);
       await this.#applyTemplateFile({ templatePath, targetPath: path.join(basePath, filename), scanResult }, dict);
     } else {
-      if (!fs.existsSync(basePath))
-        await fsPromise.mkdir(basePath, { recursive: true });
       const subdirs = await fsPromise.readdir(templatePath);
       await Promise.all(
         subdirs.map(async (subdir) => {