@biuxiu/codegen 0.3.2 → 0.4.1

package/dist/code/nest.d.ts

@@ -2,7 +2,7 @@ import { ApiServiceField, DtoField, EntityField } from '../types';
 export declare class RenderNest {
     #private;
     constructor(name: string, path?: string);
-    remove(): Promise<void>;
+    remove(): void;
     editAppModule(isDelete?: boolean): Promise<void>;
     genModule(): Promise<void>;
     genApiService(apiService: ApiServiceField[]): Promise<void>;

package/dist/code/nest.js

@@ -1,14 +1,13 @@
 import xiu from "../render";
 import { join } from "path";
-import { writeFormatFile } from "../util";
-import { existsSync, mkdirSync, statSync } from "fs";
+import { deleteDir, writeFormatFile } from "../util";
+import { existsSync, mkdirSync } from "fs";
 import { DTOFromat } from "../format/dto";
 import { EntityFormat } from "../format/entity";
 import { ApiFormat } from "../format/api";
 import { ServiceFormat } from "../format/service";
 import { getApiDir } from "../config";
 import { Project, SyntaxKind } from "ts-morph";
-import { readdir, rmdir, unlink } from "fs/promises";
 const editFileQueue = [];
 let isRunning = false;
 const runEditTask = async () => {
@@ -34,21 +33,9 @@ class RenderNest {
     this.#name = name;
     this.#moduleDir = join(apiDir, this.#path);
   }
-  async #deleteDir(path) {
-    const files = await readdir(path);
-    for (let i = 0; i < files.length; i++) {
-      const filePath = join(path, files[i]);
-      if (statSync(filePath).isDirectory()) {
-        await this.#deleteDir(filePath);
-      } else {
-        await unlink(filePath);
-      }
-    }
-    await rmdir(path);
-  }
-  async remove() {
+  remove() {
     if (existsSync(this.#moduleDir)) {
-      await this.#deleteDir(this.#moduleDir);
+      deleteDir(this.#moduleDir);
     }
   }
   async editAppModule(isDelete = false) {

package/dist/code/vue.d.ts

@@ -2,8 +2,7 @@ import { ApiServiceField, FieldSchema, ModuleConfig, ModuleRoute } from '../type
 export declare class RenderVue {
     #private;
     constructor(name: string, path?: string);
-    editDir(isDelete?: boolean): Promise<void>;
-    setDatabase(route: ModuleRoute, isDelete?: boolean): Promise<undefined>;
+    editDir(isDelete?: boolean): void;
     genRoute(route: ModuleRoute): Promise<void>;
     genVueTable({ name, comment }: ModuleConfig, fields: FieldSchema[]): Promise<void>;
     genVueForm(config: ModuleConfig, fields: FieldSchema[]): Promise<void>;

package/dist/code/vue.js

@@ -1,10 +1,8 @@
-import { getSqliteFile, getWebDir } from "../config";
+import { getWebDir } from "../config";
 import xiu from "../render";
-import { writeFormatFile } from "../util";
-import { existsSync, mkdirSync, statSync } from "fs";
-import { readdir, rmdir, unlink } from "fs/promises";
+import { deleteDir, writeFormatFile } from "../util";
+import { existsSync, mkdirSync } from "fs";
 import { join } from "path";
-import Database from "better-sqlite3";
 class RenderVue {
   #moduleDir;
   #name;
@@ -18,22 +16,10 @@ class RenderVue {
     this.#name = name;
     this.#moduleDir = join(webDir, this.#path);
   }
-  async #deleteDir(path) {
-    const files = await readdir(path);
-    for (let i = 0; i < files.length; i++) {
-      const filePath = join(path, files[i]);
-      if (statSync(filePath).isDirectory()) {
-        await this.#deleteDir(filePath);
-      } else {
-        await unlink(filePath);
-      }
-    }
-    await rmdir(path);
-  }
-  async editDir(isDelete = false) {
+  editDir(isDelete = false) {
     if (isDelete) {
       if (existsSync(this.#moduleDir)) {
-        await this.#deleteDir(this.#moduleDir);
+        deleteDir(this.#moduleDir);
       }
     } else {
       let basePath = "";
@@ -59,77 +45,6 @@ class RenderVue {
       }
     }
   }
-  #findIdByKey(key, select) {
-    const result = select.get(key);
-    return result ? result.id : void 0;
-  }
-  async setDatabase(route, isDelete = false) {
-    const sqliteFile = getSqliteFile();
-    if (!existsSync(sqliteFile)) {
-      return;
-    }
-    const db = new Database(sqliteFile);
-    const selectStmt = db.prepare(
-      `SELECT id FROM w_permission WHERE key = ?`
-    );
-    const insertStmt = db.prepare(
-      `INSERT INTO w_permission (title, key, description, pid) VALUES (@title, @key, @description, @pid)`
-    );
-    const deleteStmt = db.prepare(`DELETE FROM w_permission WHERE key = ?`);
-    const hasPremissionTbl = db.prepare(
-      `SELECT name FROM sqlite_master WHERE type='table' AND name=?`
-    ).get("w_permission");
-    if (!hasPremissionTbl) {
-      return Promise.reject("\u6743\u9650\u8868\u4E0D\u5B58\u5728");
-    }
-    const pathList = route.path.split("/").filter((p) => p);
-    const prefixKey = pathList.length > 1 ? "#" + pathList[0].replaceAll("-", "_") : "";
-    let pid = null;
-    if (prefixKey) {
-      const id = this.#findIdByKey(prefixKey, selectStmt);
-      if (!id) return Promise.reject(`\u7236\u7EA7\u6743\u9650${prefixKey}\u4E0D\u5B58\u5728`);
-      pid = id;
-    }
-    const key = "#" + pathList.join("_").replaceAll("-", "_");
-    let fn;
-    if (isDelete) {
-      const list = ["@add", "@update", "@delete"].map((k) => key + k);
-      fn = db.transaction(() => {
-        for (const k of list) {
-          deleteStmt.run(k);
-        }
-        deleteStmt.run(key);
-      });
-    } else {
-      const keyId = this.#findIdByKey(key, selectStmt);
-      if (keyId) return Promise.reject(`\u5F53\u524D\u6743\u9650${key}\u5DF2\u5B58\u5728`);
-      const list = [
-        { k: "@add", title: "\u6DFB\u52A0" },
-        { k: "@update", title: "\u4FEE\u6539" },
-        { k: "@delete", title: "\u5220\u9664" }
-      ].map(({ k, title }) => ({
-        title: title + route.title,
-        key: key + k,
-        description: title + route.title + "\u4FE1\u606F"
-      }));
-      fn = db.transaction(() => {
-        const { lastInsertRowid } = insertStmt.run({
-          key,
-          title: route.title,
-          description: `${route.title}\u9875\u9762\u67E5\u770B`,
-          pid
-        });
-        for (const item of list) {
-          insertStmt.run({ ...item, pid: lastInsertRowid });
-        }
-      });
-    }
-    try {
-      fn();
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  }
   async genRoute(route) {
     const filePath = join(this.#moduleDir, "meta.json");
     const source = await xiu.render("route-mata", route);

package/dist/config.d.ts

@@ -1,7 +1,6 @@
 declare const CodegenConfig: {
     webDir: string;
     apiDir: string;
-    sqliteFile: string;
     reverse: boolean;
 };
 export type ConfigType = Omit<Partial<typeof CodegenConfig>, 'reverse'>;
@@ -9,6 +8,5 @@ export declare function setConfig(config: ConfigType): void;
 export declare const setReverse: (reverse: boolean) => boolean;
 export declare const getWebDir: () => string;
 export declare const getApiDir: () => string;
-export declare const getSqliteFile: () => string;
 export declare const isReverse: () => boolean;
 export {};

package/dist/config.js

@@ -2,7 +2,6 @@ import { resolve } from "path";
 const CodegenConfig = {
   webDir: resolve(__dirname, ".."),
   apiDir: resolve(__dirname, ".."),
-  sqliteFile: resolve(__dirname, "..", "admin.db"),
   reverse: false
 };
 function setConfig(config) {
@@ -12,18 +11,13 @@ function setConfig(config) {
   if (config.apiDir) {
     CodegenConfig.apiDir = config.apiDir;
   }
-  if (config.sqliteFile) {
-    CodegenConfig.sqliteFile = config.sqliteFile;
-  }
 }
 const setReverse = (reverse) => CodegenConfig.reverse = reverse;
 const getWebDir = () => CodegenConfig.webDir;
 const getApiDir = () => CodegenConfig.apiDir;
-const getSqliteFile = () => CodegenConfig.sqliteFile;
 const isReverse = () => CodegenConfig.reverse;
 export {
   getApiDir,
-  getSqliteFile,
   getWebDir,
   isReverse,
   setConfig,

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 import { ConfigType } from './config';
+import { ModuleRoute } from './types';
 declare const _default: {
-    startGen: (filePath: string, config?: ConfigType | undefined) => Promise<undefined>;
-    startRemove: (filePath: string, config?: ConfigType | undefined) => Promise<undefined>;
+    startGen: (filePath: string, config?: ConfigType | undefined) => Promise<ModuleRoute[]>;
+    startRemove: (filePath: string, config?: ConfigType | undefined) => Promise<ModuleRoute[]>;
     genLuaTypes: (path: string) => Promise<void>;
 };
 export default _default;

package/dist/index.js

@@ -12,7 +12,7 @@ function startRun(isDelete) {
         const data = await compileToByte(filePath);
         const { run } = await import("./lua_codegen");
 			run(new Uint8Array(data), filePath);
-        await runTask();
+        return (await runTask()).filter((c) => !!c);
       } catch (error) {
         return Promise.reject(error);
       }

package/dist/libs.js

@@ -6,7 +6,8 @@ function renderNestCode(config, entity, dto, apiService) {
   setTask(async () => {
     const nest = new RenderNest(config.name, config.path);
     if (isReverse()) {
-      await Promise.all([nest.remove(), nest.editAppModule(true)]);
+      nest.remove();
+      await nest.editAppModule(true);
     } else {
       await nest.editAppModule();
       await Promise.all([
@@ -28,17 +29,16 @@ function renderVueCode(config, route, fieldList, api) {
     const vue = new RenderVue(config.name, config.path);
     if (isReverse()) {
       vue.editDir(true);
-      vue.setDatabase(route, true);
     } else {
-      await vue.editDir();
+      vue.editDir();
       await Promise.all([
-        vue.setDatabase(route),
         vue.genTsFile(fields, api),
         vue.genRoute(route),
         vue.genVueForm(config, fields),
         vue.genVueTable(config, fields)
       ]);
     }
+    return route;
   });
 }
 function printToNode(info) {

package/dist/task.d.ts

@@ -1,6 +1,7 @@
+import { ModuleRoute } from './types';
 type TaskFn = {
-    (): Promise<void>;
+    (): Promise<void | ModuleRoute>;
 };
 export declare function setTask(fn: TaskFn): void;
-export declare function runTask(): Promise<void[]>;
+export declare function runTask(): Promise<(void | ModuleRoute)[]>;
 export {};

package/dist/task.js

@@ -1,13 +1,14 @@
-const TaskQueue = [];
+let taskQueue = [];
 function setTask(fn) {
-  TaskQueue.push(fn);
+  taskQueue.push(fn);
 }
 function runTask() {
   const currentTask = [];
-  for (let i = 0; i < TaskQueue.length; i++) {
-    const fn = TaskQueue[i];
+  for (let i = 0; i < taskQueue.length; i++) {
+    const fn = taskQueue[i];
     currentTask.push(fn);
   }
+  taskQueue = [];
   return Promise.all(currentTask.map((f) => f()));
 }
 export {

package/dist/util.d.ts

@@ -1,2 +1,3 @@
 import { BuiltInParserName, LiteralUnion } from 'prettier';
 export declare const writeFormatFile: (filePath: string, content: string, parser?: LiteralUnion<BuiltInParserName>) => Promise<undefined>;
+export declare function deleteDir(path: string): void;

package/dist/util.js

@@ -1,4 +1,6 @@
+import { readdirSync, rmdirSync, statSync, unlinkSync } from "fs";
 import { writeFile } from "fs/promises";
+import { join } from "path";
 import {
   format,
   resolveConfig,
@@ -17,6 +19,22 @@ const writeFormatFile = async (filePath, content, parser = "typescript") => {
     return Promise.reject(error);
   }
 };
+function deleteDir(path) {
+  if (!statSync(path).isDirectory()) {
+    return;
+  }
+  const files = readdirSync(path);
+  for (let i = 0; i < files.length; i++) {
+    const filePath = join(path, files[i]);
+    if (statSync(filePath).isDirectory()) {
+      deleteDir(filePath);
+    } else {
+      unlinkSync(filePath);
+    }
+  }
+  rmdirSync(path);
+}
 export {
+  deleteDir,
   writeFormatFile
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@biuxiu/codegen",
-	"version": "0.3.2",
+	"version": "0.4.1",
 	"description": "代码生成工具",
 	"main": "dist/index.js",
 	"scripts": {
@@ -19,7 +19,6 @@
 	"license": "ISC",
 	"devDependencies": {
 		"@biuxiu/publish": "^1.2.11",
-		"@types/better-sqlite3": "^7.6.11",
 		"@types/node": "^20.14.2",
 		"@types/shelljs": "^0.8.15",
 		"esbuild": "^0.21.5",
@@ -28,9 +27,6 @@
 		"tsx": "^4.15.1",
 		"typescript": "^5.4.5"
 	},
-	"peerDependencies": {
-		"better-sqlite3": "^11.1.2"
-	},
 	"dependencies": {
 		"@biuxiu/template": "^1.5.2",
 		"prettier": "^3.3.2",