@cnbcool/cnb-api-generate 2.2.2 → 2.3.1

package/built/codegen/printer/printer-skill-client-modules.js

@@ -39,13 +39,12 @@ const fs = __importStar(require("fs"));
 const get_skills_codegen_target_1 = require("../../utils/get-skills-codegen-target");
 const get_codegen_target_1 = require("../../utils/get-codegen-target");
 const printer_ts_ast_to_js_file_1 = require("./printer-ts-ast-to-js-file");
-async function printerSkillClientModules(data) {
+async function printerSkillClientModules(data, loaderMap) {
     const { filename, astNode, descriptionMap, category, source } = data;
+    loaderMap[category] = loaderMap[category] || {};
+    loaderMap[category][filename] = `../modules/${category}/${filename}`;
     const filePath = path.join((0, get_codegen_target_1.getCodegenTarget)(), 'apis', category, `${filename}.ts`);
-    const skillScriptDir = path.join((0, get_skills_codegen_target_1.getSkillCodegenTarget)(), 'scripts');
-    if (!fs.existsSync(skillScriptDir)) {
-        fs.mkdirSync(skillScriptDir);
-    }
+    const skillScriptDir = (0, get_skills_codegen_target_1.getSkillScriptCodegenTarget)();
     const skillScriptModulesDir = path.join(skillScriptDir, 'modules');
     if (!fs.existsSync(skillScriptModulesDir)) {
         fs.mkdirSync(skillScriptModulesDir);
@@ -55,4 +54,5 @@ async function printerSkillClientModules(data) {
         fs.mkdirSync(skillScriptModulesCategoryDir);
     }
     await (0, printer_ts_ast_to_js_file_1.printerTsASTToJsFile)(filePath, skillScriptModulesCategoryDir);
+    return loaderMap;
 }

package/built/codegen/printer/printer-skills-client-core.js

@@ -49,10 +49,7 @@ async function printerSkillsClientCore(helpData) {
     const packageDir = path.resolve(__dirname, '../../../');
     const clientDir = path.join(packageDir, 'client');
     const requestFiles = glob_1.glob.sync(`${clientDir}/**/*.ts`);
-    const skillScriptDir = path.join((0, get_skills_codegen_target_1.getSkillCodegenTarget)(), 'scripts');
-    if (!fs.existsSync(skillScriptDir)) {
-        fs.mkdirSync(skillScriptDir);
-    }
+    const skillScriptDir = (0, get_skills_codegen_target_1.getSkillScriptCodegenTarget)();
     const skillScriptCoreDir = path.join(skillScriptDir, 'core');
     if (!fs.existsSync(skillScriptCoreDir)) {
         fs.mkdirSync(skillScriptCoreDir);

package/built/codegen/printer/printer-skills-client-loader.js

@@ -0,0 +1,85 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printerSkillsClientLoader = printerSkillsClientLoader;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const debug_1 = __importDefault(require("debug"));
+const typescript_1 = __importDefault(require("typescript"));
+const get_skills_codegen_target_1 = require("../../utils/get-skills-codegen-target");
+const generate_import_ast_node_1 = require("../api/generate-import-ast-node");
+const to_camel_case_1 = require("../../utils/to-camel-case");
+const format_interface_name_1 = require("../../utils/format-interface-name");
+const printer_ts_ast_to_js_file_1 = require("./printer-ts-ast-to-js-file");
+const logger = (0, debug_1.default)('csg:cli-loader');
+async function printerSkillsClientLoader(loaderMap) {
+    const skillScriptDir = (0, get_skills_codegen_target_1.getSkillScriptCodegenTarget)();
+    const skillScriptLoaderDir = path.join(skillScriptDir, 'loader');
+    if (!fs.existsSync(skillScriptLoaderDir)) {
+        fs.mkdirSync(skillScriptLoaderDir);
+    }
+    const importASTList = [];
+    const mapProperties = [];
+    for (const [category, modules] of Object.entries(loaderMap)) {
+        const toolProperties = [];
+        for (const [filename, filePath] of Object.entries(modules)) {
+            const importName = `${(0, to_camel_case_1.toCamelCase)(category)}${(0, format_interface_name_1.formatInterfaceName)(filename)}`;
+            importASTList.push((0, generate_import_ast_node_1.generateDefaultImportAstNode)(importName, filePath, false));
+            toolProperties.push(typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral(filename), typescript_1.default.factory.createIdentifier(importName)));
+        }
+        mapProperties.push(typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createStringLiteral(category), typescript_1.default.factory.createObjectLiteralExpression(toolProperties, true)));
+    }
+    // const loaderMap = { ... }
+    const loaderMapStatement = typescript_1.default.factory.createVariableStatement(undefined, typescript_1.default.factory.createVariableDeclarationList([
+        typescript_1.default.factory.createVariableDeclaration('loaderMap', undefined, undefined, typescript_1.default.factory.createObjectLiteralExpression(mapProperties, true)),
+    ], typescript_1.default.NodeFlags.Const));
+    // export function getLoader(module: string, tool: string) { return loaderMap[module]?.[tool]; }
+    const getLoaderFunction = typescript_1.default.factory.createFunctionDeclaration([typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.ExportKeyword)], undefined, 'getLoader', undefined, [
+        typescript_1.default.factory.createParameterDeclaration(undefined, undefined, 'module', undefined, typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.StringKeyword)),
+        typescript_1.default.factory.createParameterDeclaration(undefined, undefined, 'tool', undefined, typescript_1.default.factory.createKeywordTypeNode(typescript_1.default.SyntaxKind.StringKeyword)),
+    ], undefined, typescript_1.default.factory.createBlock([
+        typescript_1.default.factory.createReturnStatement(typescript_1.default.factory.createElementAccessChain(typescript_1.default.factory.createElementAccessExpression(typescript_1.default.factory.createIdentifier('loaderMap'), typescript_1.default.factory.createIdentifier('module')), typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.QuestionDotToken), typescript_1.default.factory.createIdentifier('tool'))),
+    ], true));
+    const sourceFile = typescript_1.default.factory.createSourceFile([...importASTList, loaderMapStatement, getLoaderFunction], typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.EndOfFileToken), typescript_1.default.NodeFlags.None);
+    const printer = typescript_1.default.createPrinter({
+        newLine: typescript_1.default.NewLineKind.LineFeed,
+    });
+    const result = printer.printFile(sourceFile);
+    await (0, printer_ts_ast_to_js_file_1.printerTsCodeToJsFile)(result, 'index', skillScriptLoaderDir);
+    logger(`generate skill cli loader: ${skillScriptLoaderDir}/index.js`);
+}

package/built/codegen/printer/printer-ts-ast-to-js-file.js

@@ -37,17 +37,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printerTsASTToJsFile = printerTsASTToJsFile;
+exports.printerTsCodeToJsFile = printerTsCodeToJsFile;
 const babel = __importStar(require("@babel/core"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const skills_1 = require("../../constants/skills");
 const logger = (0, debug_1.default)('csg:babel');
-async function printerTsASTToJsFile(sourceFile, outputDir) {
-    const tsCode = fs.readFileSync(sourceFile, 'utf8');
-    const { name, base } = path.parse(sourceFile);
-    const result = babel.transformSync(tsCode, {
-        filename: base,
+function transformTsToJs(tsCode, filename) {
+    return babel.transformSync(tsCode, {
+        filename,
         presets: [
             ['@babel/preset-env', { targets: { node: '20' } }],
             '@babel/preset-typescript',
@@ -63,6 +62,11 @@ async function printerTsASTToJsFile(sourceFile, outputDir) {
         ast: false,
         sourceMaps: false,
     });
+}
+async function printerTsASTToJsFile(sourceFile, outputDir) {
+    const tsCode = fs.readFileSync(sourceFile, 'utf8');
+    const { name, base } = path.parse(sourceFile);
+    const result = transformTsToJs(tsCode, base);
     const targetDir = path.join(outputDir);
     fs.mkdirSync(targetDir, { recursive: true });
     if (result === null || result === void 0 ? void 0 : result.code) {
@@ -70,3 +74,12 @@ async function printerTsASTToJsFile(sourceFile, outputDir) {
         logger(`print: ${sourceFile} -> ${path.join(targetDir, `${name}.js`)}`);
     }
 }
+async function printerTsCodeToJsFile(tsCode, outputName, outputDir) {
+    const result = transformTsToJs(tsCode, `${outputName}.ts`);
+    const targetDir = path.join(outputDir);
+    fs.mkdirSync(targetDir, { recursive: true });
+    if (result === null || result === void 0 ? void 0 : result.code) {
+        fs.writeFileSync(path.join(targetDir, `${outputName}.js`), result.code);
+        logger(`print: [code] -> ${path.join(targetDir, `${outputName}.js`)}`);
+    }
+}

package/built/skills-tools/generate-config.js

@@ -9,10 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const get_skills_codegen_target_1 = require("../utils/get-skills-codegen-target");
 const constants_1 = require("../constants");
 const generateConfig = () => {
-    const skillScriptDir = path_1.default.join((0, get_skills_codegen_target_1.getSkillCodegenTarget)(), 'scripts');
-    if (!fs_1.default.existsSync(skillScriptDir)) {
-        fs_1.default.mkdirSync(skillScriptDir);
-    }
+    const skillScriptDir = (0, get_skills_codegen_target_1.getSkillScriptCodegenTarget)();
     const skillScriptCoreDir = path_1.default.join(skillScriptDir, 'core');
     if (!fs_1.default.existsSync(skillScriptCoreDir)) {
         fs_1.default.mkdirSync(skillScriptCoreDir);

package/built/skills-tools/generate-skill-cli-scripts.js

@@ -8,13 +8,16 @@ const debug_1 = __importDefault(require("debug"));
 const printer_skill_client_modules_1 = require("../codegen/printer/printer-skill-client-modules");
 const logger = (0, debug_1.default)('csg:cli-scripts');
 async function generateSkillCliScripts(requestMap) {
+    // 加载器Map
+    const loaderMap = {};
     // eslint-disable-next-line no-restricted-syntax
     for (const key in requestMap) {
         const pathItem = requestMap[key];
         // eslint-disable-next-line no-restricted-syntax
         for (const method in pathItem) {
             logger(`generate skill cli scripts: [${method}] ${key} `);
-            await (0, printer_skill_client_modules_1.printerSkillClientModules)(pathItem[method]);
+            await (0, printer_skill_client_modules_1.printerSkillClientModules)(pathItem[method], loaderMap);
         }
     }
+    return loaderMap;
 }

package/built/skills.js

@@ -12,6 +12,7 @@ const generate_skill_cli_help_1 = require("./skills-tools/generate-skill-cli-hel
 const generate_skill_cli_scripts_1 = require("./skills-tools/generate-skill-cli-scripts");
 const generate_skill_md_1 = require("./skills-tools/generate-skill-md");
 const generate_config_1 = require("./skills-tools/generate-config");
+const printer_skills_client_loader_1 = require("./codegen/printer/printer-skills-client-loader");
 const logger = (0, debug_1.default)('csg:main');
 async function start() {
     process.env.CNB_GENERATE_MODE = 'skills';
@@ -22,12 +23,14 @@ async function start() {
     (0, progress_1.infoProgress)(`Output Dir: ${config.outputDir}`, configSpinner);
     const { requestMap, defintionsMap } = await (0, generate_entrypoint_1.generateEntrypoint)();
     logger(`generate skills start`);
+    // 编译ts转为js
+    const loaderMap = await (0, generate_skill_cli_scripts_1.generateSkillCliScripts)(requestMap);
+    // 生成loader
+    await (0, printer_skills_client_loader_1.printerSkillsClientLoader)(loaderMap);
     // 生成help数据
     const helpData = (0, generate_skill_cli_help_1.generateSkillCliHelp)(requestMap, defintionsMap);
     // 编译core
     await (0, printer_skills_client_core_1.printerSkillsClientCore)(helpData);
-    // 编译ts转为js
-    await (0, generate_skill_cli_scripts_1.generateSkillCliScripts)(requestMap);
     // 编译skills.md
     await (0, generate_skill_md_1.generateSkillMd)(helpData, requestMap);
     // 生成config文件

package/built/utils/get-skills-codegen-target.js

@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSkillCodegenTarget = getSkillCodegenTarget;
+exports.getSkillScriptCodegenTarget = getSkillScriptCodegenTarget;
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const get_config_1 = require("./get-config");
 function getSkillCodegenTarget() {
     const config = (0, get_config_1.getConfig)();
@@ -13,3 +15,11 @@ function getSkillCodegenTarget() {
     }
     return config.skillsOutputDir;
 }
+function getSkillScriptCodegenTarget() {
+    const config = (0, get_config_1.getConfig)();
+    const targetDir = config.skillScriptOutputDir || path_1.default.join(config.skillsOutputDir, 'scripts');
+    if (!fs_1.default.existsSync(targetDir)) {
+        fs_1.default.mkdirSync(targetDir, { recursive: true });
+    }
+    return targetDir;
+}

package/client/lib/execute-action.ts

@@ -5,24 +5,13 @@ import { showShort, resolveShortcut, type ResolvedShortcut } from '../shortcuts'
 import { handleUpload } from '../utils/upload';
 import { formatParams } from './format-params';
 import { formatOutput } from './format-output';
-
+// @ts-ignore
+import {getLoader} from '../../loader';
 /**
  * 加载 tool 模块并返回其 default 导出函数
  */
 function loadToolFunction(moduleName: string, toolName: string): any {
-  const toolPath = path.join(
-    __dirname,
-    '../../modules',
-    `${moduleName}/${toolName}.js`,
-  );
-
-  if (!fs.existsSync(toolPath)) {
-    console.error(`工具文件不存在: ${toolPath}`);
-    process.exit(1);
-  }
-
-  const toolModule = require(toolPath);
-  const toolFunction = toolModule.default;
+  const toolFunction = getLoader(moduleName, toolName);
 
   if (!toolFunction) {
     console.error(`工具函数不存在`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnbcool/cnb-api-generate",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "main": "./built/index.js",
   "module": "./src/index.ts",
   "types": "./src/index.ts",