@nasl/cli 0.3.0 → 0.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -0
- package/dist/bin/nasl.mjs +201 -10
- package/dist/bin/nasl.mjs.map +1 -1
- package/dist/bin/naslc.mjs +7 -7
- package/dist/bin/naslc.mjs.map +1 -1
- package/dist/index.mjs +243 -8
- package/dist/index.mjs.map +1 -1
- package/out/apis/compileApi.d.ts +4 -0
- package/out/apis/compileApi.d.ts.map +1 -1
- package/out/apis/compileApi.js +27 -0
- package/out/apis/compileApi.js.map +1 -1
- package/out/bin/nasl-doc.d.ts +3 -0
- package/out/bin/nasl-doc.d.ts.map +1 -0
- package/out/bin/nasl-doc.js +36 -0
- package/out/bin/nasl-doc.js.map +1 -0
- package/out/bin/nasl.js +2 -2
- package/out/bin/nasl.js.map +1 -1
- package/out/commands/docCheck.d.ts +18 -0
- package/out/commands/docCheck.d.ts.map +1 -0
- package/out/commands/docCheck.js +172 -0
- package/out/commands/docCheck.js.map +1 -0
- package/out/commands/index.d.ts +1 -0
- package/out/commands/index.d.ts.map +1 -1
- package/out/commands/index.js +1 -0
- package/out/commands/index.js.map +1 -1
- package/out/commands/transform.d.ts +1 -1
- package/out/commands/transform.d.ts.map +1 -1
- package/out/commands/transform.js +28 -0
- package/out/commands/transform.js.map +1 -1
- package/out/services/compose.d.ts +4 -1
- package/out/services/compose.d.ts.map +1 -1
- package/out/services/compose.js +5 -5
- package/out/services/compose.js.map +1 -1
- package/package.json +6 -4
package/out/apis/compileApi.d.ts
CHANGED
|
@@ -9,6 +9,10 @@ export declare function compileApi(fullNaturalTS: string, options: ServerOptions
|
|
|
9
9
|
* TODO: 实现具体的 API 调用逻辑
|
|
10
10
|
*/
|
|
11
11
|
export declare function checkApi(fullNaturalTS: string, options: ServerOptions): Promise<string>;
|
|
12
|
+
/**
|
|
13
|
+
* 解析 NASL 代码（parse）
|
|
14
|
+
*/
|
|
15
|
+
export declare function parseApi(fullNaturalTS: string, options: ServerOptions): Promise<string>;
|
|
12
16
|
/**
|
|
13
17
|
* 转换 NASL 代码为 AST JSON
|
|
14
18
|
* TODO: 实现具体的 API 调用逻辑
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileApi.d.ts","sourceRoot":"","sources":["../../src/apis/compileApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,aAAa,EAAE,gBAAgB,EAA8B,eAAe,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAMvI;;;GAGG;AACH,wBAAsB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAgCnG;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAa7F;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmBtG"}
|
|
1
|
+
{"version":3,"file":"compileApi.d.ts","sourceRoot":"","sources":["../../src/apis/compileApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,aAAa,EAAE,gBAAgB,EAA8B,eAAe,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAMvI;;;GAGG;AACH,wBAAsB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAgCnG;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAa7F;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAoB7F;AAED;;;GAGG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CAmBtG"}
|
package/out/apis/compileApi.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.compileApi = compileApi;
|
|
4
4
|
exports.checkApi = checkApi;
|
|
5
|
+
exports.parseApi = parseApi;
|
|
5
6
|
exports.transpile = transpile;
|
|
6
7
|
const createAxios_1 = require("./createAxios");
|
|
7
8
|
const logger_1 = require("../utils/logger");
|
|
@@ -58,6 +59,32 @@ async function checkApi(fullNaturalTS, options) {
|
|
|
58
59
|
}
|
|
59
60
|
return '';
|
|
60
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* 解析 NASL 代码（parse）
|
|
64
|
+
*/
|
|
65
|
+
async function parseApi(fullNaturalTS, options) {
|
|
66
|
+
const axios = await (0, createAxios_1.createAxios)(options);
|
|
67
|
+
try {
|
|
68
|
+
const res = await axios.post(`/parse/tsx?ideVersion=${options.ideVersion}`, fullNaturalTS, {
|
|
69
|
+
headers: (0, openapi_1.buildNaslHeaders)(options),
|
|
70
|
+
});
|
|
71
|
+
const result = res.data.result;
|
|
72
|
+
const errors = (result.errors || []);
|
|
73
|
+
if (errors.length > 0) {
|
|
74
|
+
return (0, string_1.truncate)(`解析到以下错误（共 ${errors.length} 个）：\n` + result.errorStr, 10000);
|
|
75
|
+
}
|
|
76
|
+
return '';
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
try {
|
|
80
|
+
const data = JSON.parse(error?.message || '');
|
|
81
|
+
return (0, string_1.truncate)(data.message || error?.message || String(error), 10000);
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
return (0, string_1.truncate)(error?.message || String(error), 10000);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
61
88
|
/**
|
|
62
89
|
* 转换 NASL 代码为 AST JSON
|
|
63
90
|
* TODO: 实现具体的 API 调用逻辑
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileApi.js","sourceRoot":"","sources":["../../src/apis/compileApi.ts"],"names":[],"mappings":";;AAUA,gCAgCC;AAMD,4BAaC;AAMD,8BAmBC;
|
|
1
|
+
{"version":3,"file":"compileApi.js","sourceRoot":"","sources":["../../src/apis/compileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nasl-doc.d.ts","sourceRoot":"","sources":["../../src/bin/nasl-doc.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
"use strict";
|
|
3
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
+
};
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const commander_1 = require("commander");
|
|
9
|
+
const commands_1 = require("../commands");
|
|
10
|
+
const logger_1 = require("../utils/logger");
|
|
11
|
+
const package_json_1 = __importDefault(require("../../package.json"));
|
|
12
|
+
const program = new commander_1.Command();
|
|
13
|
+
const invokedName = path_1.default.basename(process.argv[1] ?? 'nasl-doc', path_1.default.extname(process.argv[1] ?? ''));
|
|
14
|
+
program
|
|
15
|
+
.name(invokedName)
|
|
16
|
+
.description('检查 plan 文档（markdown）中的 naturalts 代码块语法')
|
|
17
|
+
.version(package_json_1.default.version);
|
|
18
|
+
program
|
|
19
|
+
.command('check <path>')
|
|
20
|
+
.description('检查 plan 文档（markdown）中的 naturalts 代码块语法\n 支持类型：enums.md, entity-*.md, structure-*.md, logic-*.md, view-*.md')
|
|
21
|
+
.action(async (filePath) => {
|
|
22
|
+
try {
|
|
23
|
+
const result = await (0, commands_1.docCheck)(filePath);
|
|
24
|
+
if (!result.success)
|
|
25
|
+
process.exit(1);
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
logger_1.defaultLogger.error(`检查过程发生错误：${error.message}`);
|
|
29
|
+
process.exit(1);
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
program.parse(process.argv);
|
|
33
|
+
if (!process.argv.slice(2).length) {
|
|
34
|
+
program.outputHelp();
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=nasl-doc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nasl-doc.js","sourceRoot":"","sources":["../../src/bin/nasl-doc.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,yCAAoC;AACpC,0CAAuC;AACvC,4CAAgD;AAChD,sEAAqC;AAErC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAC9B,MAAM,WAAW,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAEtG,OAAO;KACF,IAAI,CAAC,WAAW,CAAC;KACjB,WAAW,CAAC,wCAAwC,CAAC;KACrD,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC,CAAC;AAE1B,OAAO;KACF,OAAO,CAAC,cAAc,CAAC;KACvB,WAAW,CAAC,6GAA6G,CAAC;KAC1H,MAAM,CAAC,KAAK,EAAE,QAAgB,EAAE,EAAE;IAC/B,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,YAAa,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,OAAO,CAAC,UAAU,EAAE,CAAC;AACzB,CAAC"}
|
package/out/bin/nasl.js
CHANGED
|
@@ -201,12 +201,12 @@ program
|
|
|
201
201
|
});
|
|
202
202
|
program
|
|
203
203
|
.command('transform <transformType> [entry]')
|
|
204
|
-
.description('转换文件格式\n transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件), files2json (将 src 文件转换为 JSON)')
|
|
204
|
+
.description('转换文件格式\n transformType: files2full (将 src 文件组合成 fullNaturalTS), json2files (将 JSON 转换为文件), files2json (将 src 文件转换为 JSON), doc2full (将 plan markdown 文档组合成 fullNaturalTS)')
|
|
205
205
|
.option('-o, --output <outputPath>', '指定输出路径')
|
|
206
206
|
.option('-v, --verbose', '显示详细信息，如依赖分析树')
|
|
207
207
|
.action(async (transformType, entry, options) => {
|
|
208
208
|
try {
|
|
209
|
-
const validTypes = ['files2full', 'json2files', 'files2json'];
|
|
209
|
+
const validTypes = ['files2full', 'json2files', 'files2json', 'doc2full'];
|
|
210
210
|
if (!validTypes.includes(transformType)) {
|
|
211
211
|
logger_1.defaultLogger.error(`无效的转换类型: ${transformType}。支持的类型: ${validTypes.join(', ')}`);
|
|
212
212
|
process.exit(1);
|
package/out/bin/nasl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nasl.js","sourceRoot":"","sources":["../../src/bin/nasl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAAoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"nasl.js","sourceRoot":"","sources":["../../src/bin/nasl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAAoC;AAEpC,0CAAwI;AAExI,4CAAgD;AAChD,sEAAqC;AACrC,yCAAsC;AACtC,mDAAqC;AAIrC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B;;GAEG;AACH,SAAS,kBAAkB,CAAC,QAAgB;IACxC,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;QAChC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACzB,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;YAC7B,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrD,OAAO,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,KAAK,GAAG,IAAI,gBAAgB,KAAK,KAAK,IAAI,gBAAgB,KAAK,GAAG,CAAC,CAAC;QACrH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;yBAKA,CAAC;AAE1B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;;;0BAGP,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAChG,OAAO;KACF,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,eAAe,CAAC;KAC5B,MAAM,CAAC,GAAG,EAAE;IACT,IAAA,eAAI,GAAE,CAAC;AACX,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,iBAAiB,CAAC;KAC1B,WAAW,CAAC,sBAAsB,CAAC;KACnC,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC;KACxC,MAAM,CAAC,qBAAU,CAAC,CAAC;AAExB,OAAO;KACF,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,0BAA0B,CAAC;KACvC,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC;KACxC,MAAM,CAAC,KAAK,EAAE,KAAc,EAAE,OAAwB,EAAE,EAAE;IACvD,IAAI,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAA,gBAAK,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,CAAC,OAAO;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,YAAa,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,eAAe,CAAC;KAC5B,MAAM,CAAC,QAAQ,EAAE,0DAA0D,CAAC;KAC5E,MAAM,CAAC,KAAK,EAAE,KAAc,EAAE,OAA6C,EAAE,EAAE;IAC5E,IAAI,CAAC;QACD,MAAM,IAAA,SAAG,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,cAAe,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,kCAAkC,CAAC;KAC3C,MAAM,CAAC,kBAAkB,EAAE,wDAAwD,CAAC;KACpF,WAAW,CAAC;;;;;;CAMhB,CAAC;KACG,MAAM,CAAC,KAAK,EAAE,IAA4C,EAAE,IAAc,EAAE,OAAsD,EAAE,EAAE;IACnI,IAAI,CAAC;QACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;iBAClD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAChE,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,IAAA,wBAAa,EAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,6CAA6C,CAAC,CAAC;YACnF,CAAC;YACD,MAAM,IAAA,wBAAa,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACJ,MAAM,IAAA,sBAAW,EAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,YAAa,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,aAAa,CAAC;KACtB,WAAW,CAAC,QAAQ,CAAC;KACrB,MAAM,CAAC,mBAAmB,EAAE,YAAY,CAAC;KACzC,MAAM,CAAC,mBAAmB,EAAE,YAAY,CAAC;KACzC,MAAM,CAAC,6BAA6B,EAAE,QAAQ,CAAC;KAC/C,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC;KACjC,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC;KACnC,MAAM,CAAC,KAAK,EAAE,KAAc,EAAE,OAAoB,EAAE,EAAE;IACnD,IAAI,CAAC;QACD,MAAM,IAAA,cAAG,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,YAAa,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,MAAM,CAAC;KACnB,MAAM,CAAC,mBAAmB,EAAE,iCAAiC,EAAE,YAAY,CAAC;KAC5E,MAAM,CAAC,KAAK,EAAE,KAAc,EAAE,OAAsB,EAAE,EAAE;IACrD,IAAI,CAAC;QACD,MAAM,IAAA,gBAAK,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,YAAa,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,2BAA2B,CAAC;KACpC,WAAW,CAAC,aAAa,CAAC;KAC1B,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC;KACxC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC;KAC9B,MAAM,CAAC,KAAK,EAAE,KAAc,EAAE,OAAwB,EAAE,EAAE;IACvD,IAAI,CAAC;QACD,uBAAuB;QACvB,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;YAClB,sBAAa,CAAC,OAAO,EAAE,CAAC;YACxB,sBAAa,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YAC9D,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,sBAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;YACD,sBAAa,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC;QACD,MAAM,IAAA,yBAAc,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,cAAe,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO;KACF,OAAO,CAAC,mCAAmC,CAAC;KAC5C,WAAW,CAAC,2KAA2K,CAAC;KACxL,MAAM,CAAC,2BAA2B,EAAE,QAAQ,CAAC;KAC7C,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC;KACxC,MAAM,CAAC,KAAK,EAAE,aAAqB,EAAE,KAAc,EAAE,OAA8C,EAAE,EAAE;IACpG,IAAI,CAAC;QACD,MAAM,UAAU,GAAoB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAC3F,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAA8B,CAAC,EAAE,CAAC;YACvD,sBAAa,CAAC,KAAK,CAAC,YAAY,aAAa,WAAW,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,IAAA,oBAAS,EAAC,aAA8B,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,sBAAa,CAAC,KAAK,CAAC,YAAa,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,oBAAoB;AACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,OAAO,CAAC,UAAU,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { type BaseLogger } from '../utils';
|
|
2
|
+
import type { CommandOptions } from '../types';
|
|
3
|
+
/**
|
|
4
|
+
* 从 plan markdown 文件中提取并组装 fullNaturalTS，返回字符串或错误信息
|
|
5
|
+
*/
|
|
6
|
+
export declare function extractFullNaturalTS(filePath: string, logger?: BaseLogger): {
|
|
7
|
+
fullNaturalTS: string;
|
|
8
|
+
} | {
|
|
9
|
+
success: false;
|
|
10
|
+
};
|
|
11
|
+
export declare function docCheck(filePath: string, options?: CommandOptions): Promise<{
|
|
12
|
+
success: boolean;
|
|
13
|
+
result?: undefined;
|
|
14
|
+
} | {
|
|
15
|
+
success: boolean;
|
|
16
|
+
result: string;
|
|
17
|
+
}>;
|
|
18
|
+
//# sourceMappingURL=docCheck.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"docCheck.d.ts","sourceRoot":"","sources":["../../src/commands/docCheck.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAK1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAqD/C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,UAA0B,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAmEzI;AAED,wBAAsB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc;;;;;;GAmBxE"}
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.extractFullNaturalTS = extractFullNaturalTS;
|
|
37
|
+
exports.docCheck = docCheck;
|
|
38
|
+
const fse = __importStar(require("fs-extra"));
|
|
39
|
+
const path = __importStar(require("path"));
|
|
40
|
+
const ai_dash_1 = require("ai-dash");
|
|
41
|
+
const utils_1 = require("../utils");
|
|
42
|
+
const config_1 = require("../utils/config");
|
|
43
|
+
const compileApi_1 = require("../apis/compileApi");
|
|
44
|
+
const compose_1 = require("../services/compose");
|
|
45
|
+
const nasl_file_types_1 = require("../constants/nasl-file-types");
|
|
46
|
+
const DOC_PATTERNS = [
|
|
47
|
+
/^enums\.md$/,
|
|
48
|
+
/^entity-.+\.md$/,
|
|
49
|
+
/^structure-.+\.md$/,
|
|
50
|
+
/^logic-.+\.md$/,
|
|
51
|
+
/^view-.+\.md$/,
|
|
52
|
+
];
|
|
53
|
+
// 文档类型前缀 → NASL 文件类型名
|
|
54
|
+
const DOC_TO_NASL_TYPE = {
|
|
55
|
+
enums: 'enums',
|
|
56
|
+
entity: 'entities',
|
|
57
|
+
structure: 'structures',
|
|
58
|
+
logic: 'logics',
|
|
59
|
+
view: 'views',
|
|
60
|
+
};
|
|
61
|
+
/**
|
|
62
|
+
* 从 tsx FileInfo 中解析出所有祖先 view，生成空壳 stub
|
|
63
|
+
* 例如 path=a.views.dashboard.views.knowledgeAccess.views.accessBrowse.tsx
|
|
64
|
+
* 会生成 dashboard 和 knowledgeAccess 的 stub
|
|
65
|
+
*/
|
|
66
|
+
function buildViewStubs(files) {
|
|
67
|
+
const existingPaths = new Set(files.map((f) => f.path));
|
|
68
|
+
const stubs = [];
|
|
69
|
+
for (const file of files) {
|
|
70
|
+
if (!file.path.endsWith('.tsx'))
|
|
71
|
+
continue;
|
|
72
|
+
const parts = file.path.split('.').slice(0, -2);
|
|
73
|
+
for (let i = 0; i < parts.length - 1; i++) {
|
|
74
|
+
if (parts[i] === 'views') {
|
|
75
|
+
const viewName = parts[i + 1];
|
|
76
|
+
if (!viewName)
|
|
77
|
+
continue;
|
|
78
|
+
const stubPath = [...parts.slice(0, i + 2), 'tsx'].join('.');
|
|
79
|
+
if (!existingPaths.has(stubPath)) {
|
|
80
|
+
existingPaths.add(stubPath);
|
|
81
|
+
stubs.push({
|
|
82
|
+
path: stubPath,
|
|
83
|
+
content: `$View({\n title: "",\n auth: false,\n isIndex: false,\n});\nexport function ${viewName}() {\n return ( <ElRouterView /> );\n}`,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return stubs;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* 从 plan markdown 文件中提取并组装 fullNaturalTS，返回字符串或错误信息
|
|
93
|
+
*/
|
|
94
|
+
function extractFullNaturalTS(filePath, logger = utils_1.defaultLogger) {
|
|
95
|
+
// 1. 验证路径模式（只检查文件名）
|
|
96
|
+
const basename = path.basename(filePath);
|
|
97
|
+
if (!DOC_PATTERNS.some((p) => p.test(basename))) {
|
|
98
|
+
logger.error(`路径不匹配任何支持的文档类型：${basename}\n` +
|
|
99
|
+
`支持的类型：enums.md, entity-*.md, structure-*.md, logic-*.md, view-*.md`);
|
|
100
|
+
return { success: false };
|
|
101
|
+
}
|
|
102
|
+
// 2. 读取文件
|
|
103
|
+
if (!fse.existsSync(filePath)) {
|
|
104
|
+
logger.error(`文件不存在：${filePath}`);
|
|
105
|
+
return { success: false };
|
|
106
|
+
}
|
|
107
|
+
const content = fse.readFileSync(filePath, 'utf-8');
|
|
108
|
+
// 3. 提取 naturalts 代码块，转换为 FileInfo[]
|
|
109
|
+
const blocks = (0, ai_dash_1.extractCodeBlocks)(content).filter((b) => b.lang === 'naturalts');
|
|
110
|
+
if (blocks.length === 0) {
|
|
111
|
+
// logger.warn('未发现 naturalts 代码块');
|
|
112
|
+
return { fullNaturalTS: '' };
|
|
113
|
+
}
|
|
114
|
+
const isViewDoc = /^view-.+\.md$/.test(basename);
|
|
115
|
+
const expectedExt = isViewDoc ? '.tsx' : '.ts';
|
|
116
|
+
const docTypePrefix = basename.split(/[-.]/)[0] ?? '';
|
|
117
|
+
const naslTypeName = DOC_TO_NASL_TYPE[docTypePrefix];
|
|
118
|
+
const expectedPattern = nasl_file_types_1.NASL_FILE_TYPES.find((t) => t.name === naslTypeName)?.fileNamePattern;
|
|
119
|
+
const errors = [];
|
|
120
|
+
const files = blocks.map((block) => {
|
|
121
|
+
const match = block.langExtra?.match(/path="([^"]+)"/);
|
|
122
|
+
if (!match) {
|
|
123
|
+
errors.push(`代码块缺少 path 属性（第 ${block.startLine} 行）`);
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
126
|
+
const blockPath = match[1];
|
|
127
|
+
if (!blockPath.endsWith(expectedExt)) {
|
|
128
|
+
errors.push(`代码块 path 扩展名不正确，应为 ${expectedExt}（第 ${block.startLine} 行）：${blockPath}`);
|
|
129
|
+
return null;
|
|
130
|
+
}
|
|
131
|
+
if (!(0, nasl_file_types_1.isKnownFileType)(blockPath)) {
|
|
132
|
+
const hint = expectedPattern ? `\n正确格式应匹配：${expectedPattern}` : '';
|
|
133
|
+
errors.push(`代码块 path 不是合法的 NASL 文件类型（第 ${block.startLine} 行）：${blockPath}${hint}`);
|
|
134
|
+
return null;
|
|
135
|
+
}
|
|
136
|
+
const fileInfo = { path: blockPath, content: block.code };
|
|
137
|
+
return fileInfo;
|
|
138
|
+
}).filter((f) => f !== null);
|
|
139
|
+
if (errors.length > 0) {
|
|
140
|
+
logger.error(`在 ${filePath} 检测到以下错误：\n` + errors.join('\n'));
|
|
141
|
+
return { success: false };
|
|
142
|
+
}
|
|
143
|
+
// 4. 补充父级 view stub（tsx 文件需要祖先页面定义）
|
|
144
|
+
const stubs = buildViewStubs(files);
|
|
145
|
+
// 5. 复用 composeToString 组装（包含排序和 namespace 构建）
|
|
146
|
+
try {
|
|
147
|
+
return { fullNaturalTS: (0, compose_1.composeToString)([...files, ...stubs], { isDocCheck: true }) };
|
|
148
|
+
}
|
|
149
|
+
catch (err) {
|
|
150
|
+
logger.error(`在 ${filePath} 检测到以下错误：\n` + err.message);
|
|
151
|
+
return { success: false };
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
async function docCheck(filePath, options) {
|
|
155
|
+
const logger = options?.logger || utils_1.defaultLogger;
|
|
156
|
+
const extracted = extractFullNaturalTS(filePath, logger);
|
|
157
|
+
if ('success' in extracted)
|
|
158
|
+
return extracted;
|
|
159
|
+
if (!extracted.fullNaturalTS)
|
|
160
|
+
return { success: true };
|
|
161
|
+
logger.info(`正在调用 parse 服务，校验文档...`);
|
|
162
|
+
const config = (0, config_1.loadConfig)();
|
|
163
|
+
const rawResult = (await (0, compileApi_1.parseApi)(extracted.fullNaturalTS, config)).trim();
|
|
164
|
+
const result = rawResult.replace(/\*\*可能的位置\*\*:.*\n?/g, '').trim();
|
|
165
|
+
if (result) {
|
|
166
|
+
logger.error(`\n在 ${filePath} 检测到以下错误：\n` + result);
|
|
167
|
+
return { success: false, result };
|
|
168
|
+
}
|
|
169
|
+
logger.success('发现 0 个错误，检查通过！');
|
|
170
|
+
return { success: true };
|
|
171
|
+
}
|
|
172
|
+
//# sourceMappingURL=docCheck.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"docCheck.js","sourceRoot":"","sources":["../../src/commands/docCheck.ts"],"names":[],"mappings":"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"}
|
package/out/commands/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC"}
|
package/out/commands/index.js
CHANGED
|
@@ -23,4 +23,5 @@ __exportStar(require("./build"), exports);
|
|
|
23
23
|
__exportStar(require("./createAppInIde"), exports);
|
|
24
24
|
__exportStar(require("./transform"), exports);
|
|
25
25
|
__exportStar(require("./install"), exports);
|
|
26
|
+
__exportStar(require("./docCheck"), exports);
|
|
26
27
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB;AACxB,wCAAsB;AACtB,wCAAsB;AACtB,0CAAwB;AACxB,mDAAiC;AACjC,8CAA4B;AAC5B,4CAA0B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB;AACxB,wCAAsB;AACtB,wCAAsB;AACtB,0CAAwB;AACxB,mDAAiC;AACjC,8CAA4B;AAC5B,4CAA0B;AAC1B,6CAA2B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CommandOptions } from '../types';
|
|
2
|
-
export type TransformType = 'files2full' | 'json2files' | 'files2json';
|
|
2
|
+
export type TransformType = 'files2full' | 'json2files' | 'files2json' | 'doc2full';
|
|
3
3
|
export interface TransformOptions extends CommandOptions {
|
|
4
4
|
output?: string;
|
|
5
5
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/commands/transform.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/commands/transform.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI/C,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAEpF,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AA8GD;;GAEG;AACH,wBAAsB,SAAS,CAC3B,aAAa,EAAE,aAAa,EAC5B,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,gBAAgB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAWf"}
|
|
@@ -40,6 +40,7 @@ const utils_1 = require("../utils");
|
|
|
40
40
|
const compose_1 = require("../services/compose");
|
|
41
41
|
const resolve_1 = require("../services/resolve");
|
|
42
42
|
const transformApi_1 = require("../apis/transformApi");
|
|
43
|
+
const docCheck_1 = require("./docCheck");
|
|
43
44
|
const transformFns = {
|
|
44
45
|
/**
|
|
45
46
|
* 将 src 中的文件组合成 fullNaturalTS
|
|
@@ -66,6 +67,33 @@ const transformFns = {
|
|
|
66
67
|
(0, utils_1.writeFileWithLog)(outputPath, fullNaturalTS, logger);
|
|
67
68
|
logger.success(`文件已输出到: ${outputPath}`);
|
|
68
69
|
},
|
|
70
|
+
/**
|
|
71
|
+
* 将 plan markdown 文档中的 naturalts 代码块组合成 fullNaturalTS 文件
|
|
72
|
+
*/
|
|
73
|
+
async doc2full(entry, options) {
|
|
74
|
+
const logger = options?.logger || utils_1.defaultLogger;
|
|
75
|
+
if (!entry) {
|
|
76
|
+
logger.error('请指定 plan 文档路径');
|
|
77
|
+
logger.exit(1);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const extracted = (0, docCheck_1.extractFullNaturalTS)(entry, logger);
|
|
81
|
+
if ('success' in extracted) {
|
|
82
|
+
logger.exit(1);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
if (!extracted.fullNaturalTS) {
|
|
86
|
+
logger.warn('未发现 naturalts 代码块，跳过输出');
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
// 确定输出路径
|
|
90
|
+
const projectRoot = (0, utils_1.getProjectRoot)();
|
|
91
|
+
const outputPath = options?.output
|
|
92
|
+
? path.resolve(projectRoot, options.output)
|
|
93
|
+
: path.join(projectRoot, './full-natural.ts');
|
|
94
|
+
(0, utils_1.writeFileWithLog)(outputPath, extracted.fullNaturalTS, logger);
|
|
95
|
+
logger.success(`文件已输出到: ${outputPath}`);
|
|
96
|
+
},
|
|
69
97
|
/**
|
|
70
98
|
* 将 JSON 文件转换成 src 的 files
|
|
71
99
|
* TODO: 待实现
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../src/commands/transform.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../src/commands/transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,10 @@ import type { FileInfo } from '../types';
|
|
|
2
2
|
import type { DependenciesJSON } from '../apis/dependencyApi';
|
|
3
3
|
export declare function createSorter(): (a: string, b: string) => number;
|
|
4
4
|
export declare const sorter: (a: string, b: string) => number;
|
|
5
|
-
export
|
|
5
|
+
export interface ComposeOptions {
|
|
6
|
+
isDocCheck?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare function composeToString(files: FileInfo[], options?: ComposeOptions): string;
|
|
6
9
|
/**
|
|
7
10
|
* 将依赖信息拼接到 fullNaturalTS 顶部
|
|
8
11
|
* @param fullNaturalTS 组合后的 NASL 代码
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/services/compose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,wBAAgB,YAAY,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CA0B/D;AACD,eAAO,MAAM,MAAM,MA3BiB,MAAM,KAAK,MAAM,KAAK,MA2BtB,CAAC;AA+CrC,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/services/compose.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,wBAAgB,YAAY,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CA0B/D;AACD,eAAO,MAAM,MAAM,MA3BiB,MAAM,KAAK,MAAM,KAAK,MA2BtB,CAAC;AA+CrC,MAAM,WAAW,cAAc;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,MAAM,CAuDnF;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAYlG"}
|
package/out/services/compose.js
CHANGED
|
@@ -60,7 +60,7 @@ function validateExtensionsFile(file, errors) {
|
|
|
60
60
|
/**
|
|
61
61
|
* 验证普通文件（枚举、实体、数据结构、逻辑、页面）
|
|
62
62
|
*/
|
|
63
|
-
function validateNormalFile(file, nameFromPath, namespace, errors) {
|
|
63
|
+
function validateNormalFile(file, nameFromPath, namespace, errors, options) {
|
|
64
64
|
const matchArr = Array.from(file.content.matchAll(/^(export\s+)?(declare\s+)?(function|class|interface)\s+(\w+)/gm));
|
|
65
65
|
if (matchArr.length === 0)
|
|
66
66
|
errors.push(`${file.path} 必须有一个函数或类，错误代码：${file.content}`);
|
|
@@ -72,14 +72,14 @@ function validateNormalFile(file, nameFromPath, namespace, errors) {
|
|
|
72
72
|
if (!isExport)
|
|
73
73
|
errors.push(`${file.path} 必须使用 export，错误代码：${match[0]}`);
|
|
74
74
|
if (name !== nameFromPath)
|
|
75
|
-
errors.push(`${file.path}
|
|
75
|
+
errors.push(`${file.path} 的函数或类名必须与${options?.isDocCheck ? ' path 属性' : '文件名'}一致，错误代码：${match[0]}`);
|
|
76
76
|
if (/\.(entities|enums|structures)/.test(namespace) && type !== 'class')
|
|
77
77
|
errors.push(`${file.path} 实体、数据结构和枚举只能使用 class 定义，错误代码：${match[0]}`);
|
|
78
78
|
if (/\.(logics|views)/.test(namespace) && type !== 'function')
|
|
79
79
|
errors.push(`${file.path} 逻辑和页面只能使用 function 定义，错误代码：${match[0]}`);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
function composeToString(files) {
|
|
82
|
+
function composeToString(files, options) {
|
|
83
83
|
files.sort((a, b) => (0, exports.sorter)(a.path, b.path));
|
|
84
84
|
const errors = [];
|
|
85
85
|
let currentLine = 1;
|
|
@@ -94,7 +94,7 @@ function composeToString(files) {
|
|
|
94
94
|
const isExtensionsFile = arr[0] === 'extensions';
|
|
95
95
|
const isThemeCss = ext === 'css' && nameFromPath === 'theme';
|
|
96
96
|
const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss;
|
|
97
|
-
// 特殊文件的 namespace 包含文件名，普通文件不包含
|
|
97
|
+
// 特殊文件的 namespace ${包含文件名，普通文件不包含
|
|
98
98
|
const namespace = isSpecialFile ? [...arr, nameFromPath].join('.') : arr.join('.');
|
|
99
99
|
let content = file.content;
|
|
100
100
|
if (['ts', 'tsx'].includes(ext)) {
|
|
@@ -105,7 +105,7 @@ function composeToString(files) {
|
|
|
105
105
|
validateExtensionsFile(file, errors);
|
|
106
106
|
}
|
|
107
107
|
else {
|
|
108
|
-
validateNormalFile(file, nameFromPath, namespace, errors);
|
|
108
|
+
validateNormalFile(file, nameFromPath, namespace, errors, options);
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
else if (isThemeCss) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/services/compose.ts"],"names":[],"mappings":";;;AAGA,oCA0BC;
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/services/compose.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nasl/cli",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.2",
|
|
4
4
|
"description": "NASL (Next Application Specific Language) CLI tool for checking, compiling and developing NASL code",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -14,7 +14,9 @@
|
|
|
14
14
|
},
|
|
15
15
|
"bin": {
|
|
16
16
|
"nasl": "out/bin/nasl.js",
|
|
17
|
-
"naslc": "out/bin/naslc.js"
|
|
17
|
+
"naslc": "out/bin/naslc.js",
|
|
18
|
+
"nasl-doc": "out/bin/nasl-doc.js",
|
|
19
|
+
"nasld": "out/bin/nasl-doc.js"
|
|
18
20
|
},
|
|
19
21
|
"scripts": {
|
|
20
22
|
"build": "tsc && rollup -c",
|
|
@@ -52,9 +54,9 @@
|
|
|
52
54
|
"typescript": "^5.9.0"
|
|
53
55
|
},
|
|
54
56
|
"dependencies": {
|
|
55
|
-
"@lcap/axios-fixed": "^1.13.
|
|
57
|
+
"@lcap/axios-fixed": "^1.13.4",
|
|
56
58
|
"@types/fs-extra": "^11.0.4",
|
|
57
|
-
"
|
|
59
|
+
"ai-dash": "^0.1.1",
|
|
58
60
|
"chalk": "^4.1.2",
|
|
59
61
|
"chokidar": "^4.0.3",
|
|
60
62
|
"commander": "^11.0.0",
|