@nasl/cli 0.2.3 → 0.3.1
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 +714 -133
- package/dist/bin/nasl.mjs.map +1 -1
- package/dist/bin/naslc.mjs +315 -62
- package/dist/bin/naslc.mjs.map +1 -1
- package/dist/index.mjs +11851 -11261
- 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 +30 -2
- package/out/apis/compileApi.js.map +1 -1
- package/out/apis/dependencyApi.d.ts +29 -0
- package/out/apis/dependencyApi.d.ts.map +1 -0
- package/out/apis/dependencyApi.js +17 -0
- package/out/apis/dependencyApi.js.map +1 -0
- package/out/apis/index.d.ts +1 -0
- package/out/apis/index.d.ts.map +1 -1
- package/out/apis/index.js +1 -0
- package/out/apis/index.js.map +1 -1
- package/out/apis/openapi.d.ts +12 -0
- package/out/apis/openapi.d.ts.map +1 -1
- package/out/apis/openapi.js +15 -0
- package/out/apis/openapi.js.map +1 -1
- package/out/apis/transformApi.d.ts.map +1 -1
- package/out/apis/transformApi.js +2 -0
- package/out/apis/transformApi.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 +40 -4
- package/out/bin/nasl.js.map +1 -1
- package/out/commands/check.d.ts.map +1 -1
- package/out/commands/check.js +2 -1
- package/out/commands/check.js.map +1 -1
- package/out/commands/compile.d.ts.map +1 -1
- package/out/commands/compile.js +3 -2
- package/out/commands/compile.js.map +1 -1
- package/out/commands/dep.d.ts +4 -2
- package/out/commands/dep.d.ts.map +1 -1
- package/out/commands/dep.js +44 -2
- package/out/commands/dep.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 +2 -0
- package/out/commands/index.d.ts.map +1 -1
- package/out/commands/index.js +2 -0
- package/out/commands/index.js.map +1 -1
- package/out/commands/install.d.ts +9 -0
- package/out/commands/install.d.ts.map +1 -0
- package/out/commands/install.js +123 -0
- package/out/commands/install.js.map +1 -0
- package/out/commands/transform.d.ts +1 -1
- package/out/commands/transform.d.ts.map +1 -1
- package/out/commands/transform.js +31 -2
- package/out/commands/transform.js.map +1 -1
- package/out/constants/nasl-file-types.d.ts.map +1 -1
- package/out/constants/nasl-file-types.js +21 -0
- package/out/constants/nasl-file-types.js.map +1 -1
- package/out/services/compose.d.ts +12 -1
- package/out/services/compose.d.ts.map +1 -1
- package/out/services/compose.js +25 -5
- package/out/services/compose.js.map +1 -1
- package/out/services/resolve.d.ts +18 -0
- package/out/services/resolve.d.ts.map +1 -1
- package/out/services/resolve.js +208 -9
- package/out/services/resolve.js.map +1 -1
- package/out/types/config.d.ts +2 -0
- package/out/types/config.d.ts.map +1 -1
- package/out/types/config.js +1 -0
- package/out/types/config.js.map +1 -1
- package/out/utils/config.d.ts.map +1 -1
- package/out/utils/config.js +2 -0
- package/out/utils/config.js.map +1 -1
- package/package.json +5 -2
|
@@ -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"}
|
|
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
|
@@ -22,4 +22,6 @@ __exportStar(require("./dev"), exports);
|
|
|
22
22
|
__exportStar(require("./build"), exports);
|
|
23
23
|
__exportStar(require("./createAppInIde"), exports);
|
|
24
24
|
__exportStar(require("./transform"), exports);
|
|
25
|
+
__exportStar(require("./install"), exports);
|
|
26
|
+
__exportStar(require("./docCheck"), exports);
|
|
25
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"}
|
|
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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { DependenciesJSON } from '../apis';
|
|
2
|
+
import { type DependencyKind } from '../apis';
|
|
3
|
+
import type { CommandOptions } from '../types';
|
|
4
|
+
export declare function installAuto(options?: CommandOptions): Promise<void>;
|
|
5
|
+
export declare function installByKind(kind: DependencyKind, deps: string[], options?: CommandOptions): Promise<void>;
|
|
6
|
+
export declare function installByJSON(json: DependenciesJSON, options?: CommandOptions & {
|
|
7
|
+
savePotential?: boolean;
|
|
8
|
+
}): Promise<void>;
|
|
9
|
+
//# sourceMappingURL=install.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAmD,MAAM,SAAS,CAAC;AACjG,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAsB,WAAW,CAAC,OAAO,CAAC,EAAE,cAAc,iBAWzD;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,iBA2BjG;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,iBA+CjH"}
|
|
@@ -0,0 +1,123 @@
|
|
|
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.installAuto = installAuto;
|
|
37
|
+
exports.installByKind = installByKind;
|
|
38
|
+
exports.installByJSON = installByJSON;
|
|
39
|
+
const path = __importStar(require("path"));
|
|
40
|
+
const fs = __importStar(require("fs-extra"));
|
|
41
|
+
const utils_1 = require("../utils");
|
|
42
|
+
const config_1 = require("../utils/config");
|
|
43
|
+
const apis_1 = require("../apis");
|
|
44
|
+
async function installAuto(options) {
|
|
45
|
+
const logger = options?.logger || utils_1.defaultLogger;
|
|
46
|
+
const config = (0, config_1.loadConfig)();
|
|
47
|
+
const projectRoot = (0, config_1.getProjectRoot)();
|
|
48
|
+
const srcDir = path.join(projectRoot, config.srcDir);
|
|
49
|
+
const appDependenciesJsonPath = path.join(srcDir, 'app.dependencies.json');
|
|
50
|
+
const appDependenciesJson = fs.readJsonSync(appDependenciesJsonPath);
|
|
51
|
+
logger.info(`开始按照 ${appDependenciesJsonPath} 安装依赖`);
|
|
52
|
+
return installByJSON(appDependenciesJson, options);
|
|
53
|
+
}
|
|
54
|
+
async function installByKind(kind, deps, options) {
|
|
55
|
+
const logger = options?.logger || utils_1.defaultLogger;
|
|
56
|
+
if (!deps || deps.length === 0) {
|
|
57
|
+
logger.error(`请至少指定一个要安装的 ${kind},例如:nasl install ${kind} aaa@0.1.0`);
|
|
58
|
+
return logger.exit(1);
|
|
59
|
+
}
|
|
60
|
+
const dependencyMap = {};
|
|
61
|
+
for (const dep of deps) {
|
|
62
|
+
if (kind === 'api') {
|
|
63
|
+
const [service, interfaces] = dep.split(':');
|
|
64
|
+
if (!service || !interfaces) {
|
|
65
|
+
logger.error(`无效的依赖格式:${dep},请使用 service:api1,api2 格式,例如:some_service:api1,api2`);
|
|
66
|
+
return logger.exit(1);
|
|
67
|
+
}
|
|
68
|
+
dependencyMap[service] = interfaces.split(',');
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const [name, version] = dep.split('@');
|
|
72
|
+
if (!name || !version) {
|
|
73
|
+
logger.error(`无效的依赖格式:${dep},请使用 name@version 格式,例如:aaa@0.1.0`);
|
|
74
|
+
return logger.exit(1);
|
|
75
|
+
}
|
|
76
|
+
dependencyMap[name] = version;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return installByJSON({ [kind + 's']: dependencyMap }, options);
|
|
80
|
+
}
|
|
81
|
+
async function installByJSON(json, options) {
|
|
82
|
+
const logger = options?.logger || utils_1.defaultLogger;
|
|
83
|
+
if (!Object.keys(json).length) {
|
|
84
|
+
logger.error('没有需要安装的依赖');
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const config = (0, config_1.loadConfig)();
|
|
88
|
+
const projectRoot = (0, config_1.getProjectRoot)();
|
|
89
|
+
const srcDir = path.join(projectRoot, config.srcDir);
|
|
90
|
+
const result = await (0, apis_1.installDependenciesApi)(json, config);
|
|
91
|
+
if (!result.files || result.files.length <= 1)
|
|
92
|
+
throw new Error(`安装依赖失败,没有生成任何文件:\n${JSON.stringify(result)}`);
|
|
93
|
+
if (result.errors.length > 0) {
|
|
94
|
+
logger.error(`某些依赖安装失败:`);
|
|
95
|
+
for (const error of result.errors)
|
|
96
|
+
logger.error(error);
|
|
97
|
+
}
|
|
98
|
+
// const appDepsFile = result.files.find((f) => f.path === 'app.dependencies.json');
|
|
99
|
+
const otherFiles = result.files.filter((f) => f.path !== 'app.dependencies.json');
|
|
100
|
+
const jsonToSave = JSON.parse(JSON.stringify(json));
|
|
101
|
+
for (const err of result.errors) {
|
|
102
|
+
const { name, category } = err;
|
|
103
|
+
const record = jsonToSave[category];
|
|
104
|
+
if (record && typeof record === 'object') {
|
|
105
|
+
delete record[name];
|
|
106
|
+
if (Object.keys(record).length === 0)
|
|
107
|
+
delete jsonToSave[category];
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
if (options?.savePotential) {
|
|
111
|
+
const potentialPath = path.join(srcDir, 'potential.dependencies.json');
|
|
112
|
+
await fs.writeJson(potentialPath, jsonToSave, { spaces: 2 });
|
|
113
|
+
logger.success(`依赖信息已写入: ${path.relative(projectRoot, potentialPath)}`);
|
|
114
|
+
}
|
|
115
|
+
await Promise.all(otherFiles.map(async (file) => {
|
|
116
|
+
const filePath = path.join(srcDir, file.path);
|
|
117
|
+
await fs.outputFile(filePath, file.content, 'utf-8');
|
|
118
|
+
logger.success(`依赖文件已写入: ${path.relative(projectRoot, filePath)}`);
|
|
119
|
+
}));
|
|
120
|
+
const writtenCount = otherFiles.length;
|
|
121
|
+
logger.success(`成功写入 ${writtenCount} 个依赖文件到 ${config.srcDir} 目录`);
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=install.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,kCAWC;AAED,sCA2BC;AAED,sCA+CC;AAjGD,2CAA6B;AAC7B,6CAA+B;AAC/B,oCAAyC;AACzC,4CAA6D;AAE7D,kCAAsE;AAG/D,KAAK,UAAU,WAAW,CAAC,OAAwB;IACtD,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,qBAAa,CAAC;IAChD,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAA,uBAAc,GAAE,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAErD,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IAC3E,MAAM,mBAAmB,GAAG,EAAE,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;IAErE,MAAM,CAAC,IAAI,CAAC,QAAQ,uBAAuB,OAAO,CAAC,CAAC;IACpD,OAAO,aAAa,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,IAAoB,EAAE,IAAc,EAAE,OAAwB;IAC9F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,qBAAa,CAAC;IAEhD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,oBAAoB,IAAI,YAAY,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,aAAa,GAAsC,EAAE,CAAC;IAC5D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC1B,MAAM,CAAC,KAAK,CAAC,WAAW,GAAG,qDAAqD,CAAC,CAAC;gBAClF,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;YACD,aAAa,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC,WAAW,GAAG,mCAAmC,CAAC,CAAC;gBAChE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;YACD,aAAa,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;QAClC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,EAAE,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,IAAsB,EAAE,OAAsD;IAC9G,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,qBAAa,CAAC;IAEhD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1B,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,mBAAU,GAAE,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAA,uBAAc,GAAE,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAErD,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAsB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE1D,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9G,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM;YAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED,oFAAoF;IACpF,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uBAAuB,CAAC,CAAC;IAElF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAqB,CAAC;IACxE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAA+D,EAAE,CAAC;QACvF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;QAC/B,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACvC,OAAQ,MAAkC,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAiC,CAAC,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAED,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;QACzB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;QACvE,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC,CAAC;IAEJ,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,QAAQ,YAAY,WAAW,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AACtE,CAAC"}
|
|
@@ -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
|
|
@@ -47,7 +48,7 @@ const transformFns = {
|
|
|
47
48
|
async files2full(entry, options) {
|
|
48
49
|
const logger = options?.logger || utils_1.defaultLogger;
|
|
49
50
|
// 收集需要处理的文件
|
|
50
|
-
const { collectedFiles, projectRoot } = await (0, resolve_1.resolveNASLFiles)(entry, logger, false, options?.verbose);
|
|
51
|
+
const { collectedFiles, projectRoot, mergedDependencies } = await (0, resolve_1.resolveNASLFiles)(entry, logger, false, options?.verbose);
|
|
51
52
|
if (collectedFiles.length === 0) {
|
|
52
53
|
logger.error('未找到需要转换的文件');
|
|
53
54
|
logger.exit(1);
|
|
@@ -56,7 +57,8 @@ const transformFns = {
|
|
|
56
57
|
// 组合成 fullNaturalTS
|
|
57
58
|
logger.newLine();
|
|
58
59
|
logger.info('正在组合文件...');
|
|
59
|
-
|
|
60
|
+
let fullNaturalTS = (0, compose_1.composeToString)(collectedFiles);
|
|
61
|
+
fullNaturalTS = (0, compose_1.prependDependencies)(fullNaturalTS, mergedDependencies);
|
|
60
62
|
// 确定输出路径
|
|
61
63
|
const outputPath = options?.output
|
|
62
64
|
? path.resolve(projectRoot, options.output)
|
|
@@ -65,6 +67,33 @@ const transformFns = {
|
|
|
65
67
|
(0, utils_1.writeFileWithLog)(outputPath, fullNaturalTS, logger);
|
|
66
68
|
logger.success(`文件已输出到: ${outputPath}`);
|
|
67
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
|
+
},
|
|
68
97
|
/**
|
|
69
98
|
* 将 JSON 文件转换成 src 的 files
|
|
70
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nasl-file-types.d.ts","sourceRoot":"","sources":["../../src/constants/nasl-file-types.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,MAAM,WAAW,kBAAkB;IAC/B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY;IACZ,SAAS,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;CACnC;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"nasl-file-types.d.ts","sourceRoot":"","sources":["../../src/constants/nasl-file-types.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,MAAM,WAAW,kBAAkB;IAC/B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,6BAA6B;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY;IACZ,SAAS,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;CACnC;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,kBAAkB,EAqF/C,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,EAAE,CAE9C;AAED,eAAO,MAAM,gBAAgB,UAAwB,CAAC;AAEtD;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAE7C;AAED,eAAO,MAAM,eAAe,UAAuB,CAAC;AAEpD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIzD"}
|
|
@@ -105,6 +105,27 @@ exports.NASL_FILE_TYPES = [
|
|
|
105
105
|
codeRefPattern: 'extensions\\.\\w+(?:\\.\\w+)*',
|
|
106
106
|
extension: 'ts',
|
|
107
107
|
},
|
|
108
|
+
{
|
|
109
|
+
name: 'apis',
|
|
110
|
+
description: 'API',
|
|
111
|
+
fileNamePattern: 'apis\\.\\w+\\.ts',
|
|
112
|
+
codeRefPattern: 'apis\\.\\w+(?:\\.\\w+)*',
|
|
113
|
+
extension: 'ts',
|
|
114
|
+
},
|
|
115
|
+
{
|
|
116
|
+
name: 'connectors',
|
|
117
|
+
description: '连接器',
|
|
118
|
+
fileNamePattern: 'connectors\\.\\w+\\.ts',
|
|
119
|
+
codeRefPattern: 'connectors\\.\\w+(?:\\.\\w+)*',
|
|
120
|
+
extension: 'ts',
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
name: 'uilibs',
|
|
124
|
+
description: 'UI 库',
|
|
125
|
+
fileNamePattern: 'uilibs\\.\\w+\\.ts',
|
|
126
|
+
codeRefPattern: 'uilibs\\.\\w+(?:\\.\\w+)*',
|
|
127
|
+
extension: 'ts',
|
|
128
|
+
},
|
|
108
129
|
];
|
|
109
130
|
/**
|
|
110
131
|
* 获取用于验证文件名的正则表达式数组
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nasl-file-types.js","sourceRoot":"","sources":["../../src/constants/nasl-file-types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"nasl-file-types.js","sourceRoot":"","sources":["../../src/constants/nasl-file-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
import type { FileInfo } from '../types';
|
|
2
|
+
import type { DependenciesJSON } from '../apis/dependencyApi';
|
|
2
3
|
export declare function createSorter(): (a: string, b: string) => number;
|
|
3
4
|
export declare const sorter: (a: string, b: string) => number;
|
|
4
|
-
export
|
|
5
|
+
export interface ComposeOptions {
|
|
6
|
+
isDocCheck?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare function composeToString(files: FileInfo[], options?: ComposeOptions): string;
|
|
9
|
+
/**
|
|
10
|
+
* 将依赖信息拼接到 fullNaturalTS 顶部
|
|
11
|
+
* @param fullNaturalTS 组合后的 NASL 代码
|
|
12
|
+
* @param dependencies mergedDependencies 对象或 JSON 字符串
|
|
13
|
+
* @returns 拼接后的完整内容
|
|
14
|
+
*/
|
|
15
|
+
export declare function prependDependencies(fullNaturalTS: string, dependencies?: DependenciesJSON): string;
|
|
5
16
|
//# sourceMappingURL=compose.d.ts.map
|
|
@@ -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;
|
|
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
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.sorter = void 0;
|
|
4
4
|
exports.createSorter = createSorter;
|
|
5
5
|
exports.composeToString = composeToString;
|
|
6
|
+
exports.prependDependencies = prependDependencies;
|
|
6
7
|
function createSorter() {
|
|
7
8
|
const priorityOrder = ['app.dataSources', 'app.enums', 'app.structures', 'app.logics', 'app.frontendTypes'];
|
|
8
9
|
// 获取优先级索引
|
|
@@ -59,7 +60,7 @@ function validateExtensionsFile(file, errors) {
|
|
|
59
60
|
/**
|
|
60
61
|
* 验证普通文件(枚举、实体、数据结构、逻辑、页面)
|
|
61
62
|
*/
|
|
62
|
-
function validateNormalFile(file, nameFromPath, namespace, errors) {
|
|
63
|
+
function validateNormalFile(file, nameFromPath, namespace, errors, options) {
|
|
63
64
|
const matchArr = Array.from(file.content.matchAll(/^(export\s+)?(declare\s+)?(function|class|interface)\s+(\w+)/gm));
|
|
64
65
|
if (matchArr.length === 0)
|
|
65
66
|
errors.push(`${file.path} 必须有一个函数或类,错误代码:${file.content}`);
|
|
@@ -71,14 +72,14 @@ function validateNormalFile(file, nameFromPath, namespace, errors) {
|
|
|
71
72
|
if (!isExport)
|
|
72
73
|
errors.push(`${file.path} 必须使用 export,错误代码:${match[0]}`);
|
|
73
74
|
if (name !== nameFromPath)
|
|
74
|
-
errors.push(`${file.path}
|
|
75
|
+
errors.push(`${file.path} 的函数或类名必须与${options?.isDocCheck ? ' path 属性' : '文件名'}一致,错误代码:${match[0]}`);
|
|
75
76
|
if (/\.(entities|enums|structures)/.test(namespace) && type !== 'class')
|
|
76
77
|
errors.push(`${file.path} 实体、数据结构和枚举只能使用 class 定义,错误代码:${match[0]}`);
|
|
77
78
|
if (/\.(logics|views)/.test(namespace) && type !== 'function')
|
|
78
79
|
errors.push(`${file.path} 逻辑和页面只能使用 function 定义,错误代码:${match[0]}`);
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
|
-
function composeToString(files) {
|
|
82
|
+
function composeToString(files, options) {
|
|
82
83
|
files.sort((a, b) => (0, exports.sorter)(a.path, b.path));
|
|
83
84
|
const errors = [];
|
|
84
85
|
let currentLine = 1;
|
|
@@ -93,7 +94,7 @@ function composeToString(files) {
|
|
|
93
94
|
const isExtensionsFile = arr[0] === 'extensions';
|
|
94
95
|
const isThemeCss = ext === 'css' && nameFromPath === 'theme';
|
|
95
96
|
const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss;
|
|
96
|
-
// 特殊文件的 namespace 包含文件名,普通文件不包含
|
|
97
|
+
// 特殊文件的 namespace ${包含文件名,普通文件不包含
|
|
97
98
|
const namespace = isSpecialFile ? [...arr, nameFromPath].join('.') : arr.join('.');
|
|
98
99
|
let content = file.content;
|
|
99
100
|
if (['ts', 'tsx'].includes(ext)) {
|
|
@@ -104,7 +105,7 @@ function composeToString(files) {
|
|
|
104
105
|
validateExtensionsFile(file, errors);
|
|
105
106
|
}
|
|
106
107
|
else {
|
|
107
|
-
validateNormalFile(file, nameFromPath, namespace, errors);
|
|
108
|
+
validateNormalFile(file, nameFromPath, namespace, errors, options);
|
|
108
109
|
}
|
|
109
110
|
}
|
|
110
111
|
else if (isThemeCss) {
|
|
@@ -125,4 +126,23 @@ function composeToString(files) {
|
|
|
125
126
|
}
|
|
126
127
|
return result;
|
|
127
128
|
}
|
|
129
|
+
/**
|
|
130
|
+
* 将依赖信息拼接到 fullNaturalTS 顶部
|
|
131
|
+
* @param fullNaturalTS 组合后的 NASL 代码
|
|
132
|
+
* @param dependencies mergedDependencies 对象或 JSON 字符串
|
|
133
|
+
* @returns 拼接后的完整内容
|
|
134
|
+
*/
|
|
135
|
+
function prependDependencies(fullNaturalTS, dependencies) {
|
|
136
|
+
if (!dependencies)
|
|
137
|
+
return fullNaturalTS;
|
|
138
|
+
const jsonStr = JSON.stringify(dependencies, null, 2);
|
|
139
|
+
const header = `/*
|
|
140
|
+
-----------app.dependencies.json7xdhjutehm.start
|
|
141
|
+
${jsonStr}
|
|
142
|
+
-----------app.dependencies.json7xdhjutehm.end
|
|
143
|
+
*/
|
|
144
|
+
|
|
145
|
+
`;
|
|
146
|
+
return header + fullNaturalTS;
|
|
147
|
+
}
|
|
128
148
|
//# sourceMappingURL=compose.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/services/compose.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/services/compose.ts"],"names":[],"mappings":"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"}
|