@lcap/nasl 4.4.0-beta.33 → 4.4.0-beta.35
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/out/generator/ui-library-declaration/types.d.ts +2 -0
- package/out/generator/ui-library-declaration/types.d.ts.map +1 -1
- package/out/index.d.ts +1 -1
- package/out/index.d.ts.map +1 -1
- package/out/index.js +5 -1
- package/out/index.js.map +1 -1
- package/out/manager/diagnostic.d.ts +5 -5
- package/out/manager/diagnostic.d.ts.map +1 -1
- package/out/natural/exports/transform2BatchActions/parse.d.ts.map +1 -1
- package/out/natural/exports/transform2BatchActions/parse.js +1 -0
- package/out/natural/exports/transform2BatchActions/parse.js.map +1 -1
- package/out/natural/old/parser/transformTS2UI.js +1 -1
- package/out/natural/old/parser/transformTS2UI.js.map +1 -1
- package/out/natural/parser/parseNaturalTSXView.d.ts.map +1 -1
- package/out/natural/parser/parseNaturalTSXView.js +4 -27
- package/out/natural/parser/parseNaturalTSXView.js.map +1 -1
- package/out/natural/transforms/checker/checkIdentifierName.d.ts +1 -1
- package/out/natural/transforms/checker/checkIdentifierName.d.ts.map +1 -1
- package/out/natural/transforms/checker/checkIdentifierName.js.map +1 -1
- package/out/natural/transforms/checker/checkViewElement.d.ts.map +1 -1
- package/out/natural/transforms/checker/checkViewElement.js +2 -0
- package/out/natural/transforms/checker/checkViewElement.js.map +1 -1
- package/out/natural/transforms/transform2Entity.d.ts +2 -2
- package/out/natural/transforms/transform2Entity.d.ts.map +1 -1
- package/out/natural/transforms/transform2Entity.js +5 -2
- package/out/natural/transforms/transform2Entity.js.map +1 -1
- package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
- package/out/natural/transforms/transform2LogicItem.js +36 -6
- package/out/natural/transforms/transform2LogicItem.js.map +1 -1
- package/out/natural/transforms/utils/ensureBindRoles.d.ts +9 -0
- package/out/natural/transforms/utils/ensureBindRoles.d.ts.map +1 -0
- package/out/natural/transforms/utils/ensureBindRoles.js +25 -0
- package/out/natural/transforms/utils/ensureBindRoles.js.map +1 -0
- package/out/natural/transforms/utils/parseDecorator.d.ts.map +1 -1
- package/out/natural/transforms/utils/parseDecorator.js +5 -9
- package/out/natural/transforms/utils/parseDecorator.js.map +1 -1
- package/out/server/extendBaseNode.js +4 -4
- package/out/server/extendBaseNode.js.map +1 -1
- package/out/server/index.d.ts +1 -0
- package/out/server/index.d.ts.map +1 -1
- package/out/server/index.js +6 -1
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +2 -0
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +11 -5
- package/out/server/naslServer.js.map +1 -1
- package/out/server/naslUiComponentTs.d.ts +16 -0
- package/out/server/naslUiComponentTs.d.ts.map +1 -0
- package/out/server/naslUiComponentTs.default.d.ts +47 -0
- package/out/server/naslUiComponentTs.js +111 -0
- package/out/server/naslUiComponentTs.js.map +1 -0
- package/out/service/autofix/types.d.ts +2 -2
- package/out/service/autofix/types.d.ts.map +1 -1
- package/out/service/storage/specTools.d.ts.map +1 -1
- package/out/service/storage/specTools.js +14 -5
- package/out/service/storage/specTools.js.map +1 -1
- package/out/templator/genQueryComponent.d.ts +13 -1
- package/out/templator/genQueryComponent.d.ts.map +1 -1
- package/out/templator/genQueryComponent.js +18 -14
- package/out/templator/genQueryComponent.js.map +1 -1
- package/package.json +10 -10
- package/sandbox/stdlib/nasl.util.ts +10 -10
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export declare function buildNaslUiComponentTsFileContent(convertTsCode: (code: string) => string, opts: {
|
|
2
|
+
basicUITsCode: string;
|
|
3
|
+
/** 传入(含 `''`)则仅用该段,忽略 basicUITsCode */
|
|
4
|
+
naslUiComponentTsOverride?: string;
|
|
5
|
+
}): string;
|
|
6
|
+
export declare const DEFAULT_NASL_UI_COMPONENT_TS: string;
|
|
7
|
+
/** 地址栏:`true` / `1` / `yes`(大小写不敏感) */
|
|
8
|
+
export declare function isNaslUiTsUrlFlagEnabled(value: string | null | undefined): boolean;
|
|
9
|
+
/**
|
|
10
|
+
* `?nasl-ui-ts-override=true`(或 `1`、`yes`)→ 使用 {@link DEFAULT_NASL_UI_COMPONENT_TS} 整段替换。
|
|
11
|
+
* `createUiTs` 已传 `naslUiComponentTsOverride`(含 `''`)时优先于地址栏。
|
|
12
|
+
*/
|
|
13
|
+
export declare function getNaslUiComponentTsQueryOpts(): {
|
|
14
|
+
overrideFragment?: string;
|
|
15
|
+
};
|
|
16
|
+
//# sourceMappingURL=naslUiComponentTs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"naslUiComponentTs.d.ts","sourceRoot":"","sources":["../../src/server/naslUiComponentTs.ts"],"names":[],"mappings":"AAQA,wBAAgB,iCAAiC,CAC/C,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EACvC,IAAI,EAAE;IACJ,aAAa,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,GACA,MAAM,CAKR;AAsBD,eAAO,MAAM,4BAA4B,QAOnC,CAAC;AAEP,uCAAuC;AACvC,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAMlF;AA0CD;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI;IAC/C,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAYA"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
declare namespace nasl.ui {
|
|
2
|
+
type DateConverterToType<C extends 'auto' | 'string' | 'Integer', IsDate extends nasl.core.Boolean> = C extends 'Integer' ? nasl.core.Integer :
|
|
3
|
+
C extends 'string' ? nasl.core.String :
|
|
4
|
+
IsDate extends true ? nasl.core.Date : nasl.core.DateTime;
|
|
5
|
+
|
|
6
|
+
export class ElDatePicker<T, V, P, M, C extends 'auto' | 'string' | 'Integer', DT extends 'datetime'
|
|
7
|
+
| 'date'
|
|
8
|
+
| 'year'
|
|
9
|
+
| 'month'
|
|
10
|
+
| 'week'
|
|
11
|
+
| 'datetimerange'
|
|
12
|
+
| 'daterange'
|
|
13
|
+
| 'yearrange'
|
|
14
|
+
| 'monthrange'
|
|
15
|
+
| 'dates'
|
|
16
|
+
| 'years'
|
|
17
|
+
| 'months'> extends ViewComponent {
|
|
18
|
+
constructor(options?: Partial<ElDatePickerOptions<T, V, P, M, C, DT>>);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export class ElDatePickerOptions<T, V, P, M, C extends 'auto' | 'string' | 'Integer', DT extends 'datetime'
|
|
22
|
+
| 'date'
|
|
23
|
+
| 'year'
|
|
24
|
+
| 'month'
|
|
25
|
+
| 'week'
|
|
26
|
+
| 'datetimerange'
|
|
27
|
+
| 'daterange'
|
|
28
|
+
| 'yearrange'
|
|
29
|
+
| 'monthrange'
|
|
30
|
+
| 'dates'
|
|
31
|
+
| 'years'
|
|
32
|
+
| 'months'> extends ViewComponentOptions {
|
|
33
|
+
converter: C;
|
|
34
|
+
type: DT;
|
|
35
|
+
modelValue: DT extends 'date' ? DateConverterToType<C, true> :
|
|
36
|
+
DT extends 'datetime' | 'year' | 'month' | 'week' ? DateConverterToType<C, false> :
|
|
37
|
+
DT extends 'dates' ? nasl.collection.List<DateConverterToType<C, true>> :
|
|
38
|
+
DT extends 'years' | 'months' ? nasl.collection.List<DateConverterToType<C, false>> :
|
|
39
|
+
null;
|
|
40
|
+
startValue: DT extends 'daterange' ? DateConverterToType<C, true> :
|
|
41
|
+
DT extends 'datetimerange' | 'yearrange' | 'monthrange' ? DateConverterToType<C, false> :
|
|
42
|
+
null;
|
|
43
|
+
endValue: DT extends 'daterange' ? DateConverterToType<C, true> :
|
|
44
|
+
DT extends 'datetimerange' | 'yearrange' | 'monthrange' ? DateConverterToType<C, false> :
|
|
45
|
+
null;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getNaslUiComponentTsQueryOpts = exports.isNaslUiTsUrlFlagEnabled = exports.DEFAULT_NASL_UI_COMPONENT_TS = exports.buildNaslUiComponentTsFileContent = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* 组装传给 `parseTsFnToNaslQNameRefMaps` 的 nasl.ui 组件 d.ts。
|
|
6
|
+
* 无 override 时用 `convertTsCode(basicUITsCode)`;有 override 时**整段替换**(不经 union→String,仅 Integer→Long)。
|
|
7
|
+
*/
|
|
8
|
+
function convertNaslUiPatchTsCode(code) {
|
|
9
|
+
return (code || '').replace(/nasl.core.Integer/g, 'nasl.core.Long');
|
|
10
|
+
}
|
|
11
|
+
function buildNaslUiComponentTsFileContent(convertTsCode, opts) {
|
|
12
|
+
if (opts.naslUiComponentTsOverride !== undefined) {
|
|
13
|
+
return convertNaslUiPatchTsCode(opts.naslUiComponentTsOverride);
|
|
14
|
+
}
|
|
15
|
+
return convertTsCode(opts.basicUITsCode);
|
|
16
|
+
}
|
|
17
|
+
exports.buildNaslUiComponentTsFileContent = buildNaslUiComponentTsFileContent;
|
|
18
|
+
/** 地址栏 `nasl-ui-ts-override` 为真且未在代码里传 override 时使用的默认 d.ts 片段(从文件读取,惰性缓存) */
|
|
19
|
+
function loadDefaultNaslUiComponentTsFromFile() {
|
|
20
|
+
let content = '';
|
|
21
|
+
/// #if process.env.BUILD_TARGET === 'node'
|
|
22
|
+
if (globalThis.process) { // For TS build
|
|
23
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
24
|
+
const fs = require('fs');
|
|
25
|
+
content = fs.readFileSync(require.resolve('./naslUiComponentTs.default.d.ts'), 'utf8');
|
|
26
|
+
}
|
|
27
|
+
/// #endif
|
|
28
|
+
/// #if process.env.BUILD_TARGET !== 'node'
|
|
29
|
+
if (globalThis.window) { // For TS build
|
|
30
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
31
|
+
content = require('!!raw-loader!./naslUiComponentTs.default.d.ts').default;
|
|
32
|
+
}
|
|
33
|
+
/// #endif
|
|
34
|
+
return content;
|
|
35
|
+
}
|
|
36
|
+
let defaultNaslUiComponentTsCache;
|
|
37
|
+
exports.DEFAULT_NASL_UI_COMPONENT_TS = (() => {
|
|
38
|
+
if (defaultNaslUiComponentTsCache !== undefined) {
|
|
39
|
+
return defaultNaslUiComponentTsCache;
|
|
40
|
+
}
|
|
41
|
+
defaultNaslUiComponentTsCache = loadDefaultNaslUiComponentTsFromFile();
|
|
42
|
+
return defaultNaslUiComponentTsCache;
|
|
43
|
+
})();
|
|
44
|
+
/** 地址栏:`true` / `1` / `yes`(大小写不敏感) */
|
|
45
|
+
function isNaslUiTsUrlFlagEnabled(value) {
|
|
46
|
+
if (value == null || value === '') {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
const v = value.trim().toLowerCase();
|
|
50
|
+
return v === 'true' || v === '1' || v === 'yes';
|
|
51
|
+
}
|
|
52
|
+
exports.isNaslUiTsUrlFlagEnabled = isNaslUiTsUrlFlagEnabled;
|
|
53
|
+
function fragmentWhenUrlFlag(value) {
|
|
54
|
+
return isNaslUiTsUrlFlagEnabled(value) ? exports.DEFAULT_NASL_UI_COMPONENT_TS : undefined;
|
|
55
|
+
}
|
|
56
|
+
function getNaslUiTsQueryStringForSearchParams() {
|
|
57
|
+
if (typeof globalThis === 'undefined') {
|
|
58
|
+
return '';
|
|
59
|
+
}
|
|
60
|
+
const pickFromLocation = (locationLike) => {
|
|
61
|
+
if (!locationLike) {
|
|
62
|
+
return '';
|
|
63
|
+
}
|
|
64
|
+
const s = locationLike.search;
|
|
65
|
+
if (typeof s === 'string' && s.length > 1) {
|
|
66
|
+
return s;
|
|
67
|
+
}
|
|
68
|
+
const hash = typeof locationLike.hash === 'string' ? locationLike.hash : '';
|
|
69
|
+
const qi = hash.indexOf('?');
|
|
70
|
+
if (qi >= 0) {
|
|
71
|
+
return hash.slice(qi);
|
|
72
|
+
}
|
|
73
|
+
return '';
|
|
74
|
+
};
|
|
75
|
+
try {
|
|
76
|
+
const g = globalThis;
|
|
77
|
+
let q = pickFromLocation(g.location);
|
|
78
|
+
if (!q && typeof window !== 'undefined' && window.parent !== window) {
|
|
79
|
+
try {
|
|
80
|
+
q = pickFromLocation(window.parent.location);
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
// 跨域 iframe 无法读 parent
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return q;
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
return '';
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* `?nasl-ui-ts-override=true`(或 `1`、`yes`)→ 使用 {@link DEFAULT_NASL_UI_COMPONENT_TS} 整段替换。
|
|
94
|
+
* `createUiTs` 已传 `naslUiComponentTsOverride`(含 `''`)时优先于地址栏。
|
|
95
|
+
*/
|
|
96
|
+
function getNaslUiComponentTsQueryOpts() {
|
|
97
|
+
try {
|
|
98
|
+
const raw = getNaslUiTsQueryStringForSearchParams();
|
|
99
|
+
if (!raw) {
|
|
100
|
+
return {};
|
|
101
|
+
}
|
|
102
|
+
const qs = new URLSearchParams(raw.startsWith('?') ? raw.slice(1) : raw);
|
|
103
|
+
const overrideFragment = fragmentWhenUrlFlag(qs.get('nasl-ui-ts-override'));
|
|
104
|
+
return overrideFragment ? { overrideFragment } : {};
|
|
105
|
+
}
|
|
106
|
+
catch {
|
|
107
|
+
return {};
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
exports.getNaslUiComponentTsQueryOpts = getNaslUiComponentTsQueryOpts;
|
|
111
|
+
//# sourceMappingURL=naslUiComponentTs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"naslUiComponentTs.js","sourceRoot":"","sources":["../../src/server/naslUiComponentTs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Diagnostic } from '@lcap/nasl-types';
|
|
1
|
+
import { Diagnostic as DiagnosticNS } from '@lcap/nasl-types';
|
|
2
2
|
import { BaseNode } from '@lcap/nasl-concepts';
|
|
3
|
-
type Diagnostic =
|
|
3
|
+
type Diagnostic = DiagnosticNS.Diagnostic;
|
|
4
4
|
export type Node = BaseNode;
|
|
5
5
|
export type AutoFixRule = {
|
|
6
6
|
title?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/service/autofix/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/service/autofix/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,KAAK,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;AAC1C,MAAM,MAAM,IAAI,GAAG,QAAQ,CAAC;AAC5B,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,KAAK,CAAC;IAC/D,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specTools.d.ts","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,UAAU,EAAc,MAAM,aAAa,CAAC;AAM7E,KAAK,gBAAgB,GAAG;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"specTools.d.ts","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,UAAU,EAAc,MAAM,aAAa,CAAC;AAM7E,KAAK,gBAAgB,GAAG;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;AAkI1E;;GAEG;AACH,UAAU,cAAc;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;CACxB;AA6BD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,2CAK7B;IACD,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC3B;;;;;;;;;;;;EAgFA,CAAC"}
|
|
@@ -35,7 +35,11 @@ const getChangeView = async (body) => {
|
|
|
35
35
|
// 如果调用失败,返回失败状态和错误信息
|
|
36
36
|
return {
|
|
37
37
|
status: 'fail',
|
|
38
|
-
error: error instanceof Error
|
|
38
|
+
error: error instanceof Error
|
|
39
|
+
? error.message
|
|
40
|
+
: typeof error === 'object'
|
|
41
|
+
? JSON.stringify(error)
|
|
42
|
+
: String(error),
|
|
39
43
|
};
|
|
40
44
|
}
|
|
41
45
|
};
|
|
@@ -146,16 +150,21 @@ const transform2BatchView = async ({ codeActions, app, sessionId, type = 'normal
|
|
|
146
150
|
console.log('codeActions', codeActions);
|
|
147
151
|
}
|
|
148
152
|
const existFiles = (0, index_1.nasl2Files)({ app, range: 'all' });
|
|
149
|
-
|
|
150
|
-
|
|
153
|
+
// 仅保留 roles、theme、configuration 和 tmp/ 作为上下文,避免全量转换的性能开销
|
|
154
|
+
const existMappedFiles = existFiles
|
|
155
|
+
.filter((file) => file.path === 'app.roles.json' ||
|
|
156
|
+
file.path.endsWith('.theme.css') ||
|
|
157
|
+
file.path.startsWith('app.configuration.') ||
|
|
158
|
+
file.path.startsWith('tmp/'))
|
|
151
159
|
.map((file) => ({
|
|
152
160
|
...file,
|
|
161
|
+
path: `src/${file.path}`,
|
|
153
162
|
type: 'exist',
|
|
154
163
|
}));
|
|
155
164
|
// 用 codeActions 合并出一份完整的 files,按 path 做覆盖
|
|
156
165
|
const filesMap = new Map();
|
|
157
166
|
// 先添加已存在的文件
|
|
158
|
-
|
|
167
|
+
existMappedFiles.forEach((file) => {
|
|
159
168
|
filesMap.set(file.path, file);
|
|
160
169
|
});
|
|
161
170
|
// 再添加 codeActions,如果 path 相同会覆盖已存在的文件
|
|
@@ -178,7 +187,7 @@ const transform2BatchView = async ({ codeActions, app, sessionId, type = 'normal
|
|
|
178
187
|
batchActions: null,
|
|
179
188
|
batchView: null,
|
|
180
189
|
dependencies: null,
|
|
181
|
-
connectorUsages: []
|
|
190
|
+
connectorUsages: [],
|
|
182
191
|
};
|
|
183
192
|
}
|
|
184
193
|
const batchView = await getChangeView([result.batchActions]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specTools.js","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAuC;AACvC,uCAA6E;AAE7E,OAAO;AACP,MAAM,sBAAsB,GAAG,uBAAgC,CAAC;AAYhE;;GAEG;AACH,MAAM,aAAa,GAAG,CAAC,KAAU,EAAW,EAAE;IAC5C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,aAAa,GAAG,KAAK,EAAE,IAAS,EAA6B,EAAE;IACnE,IAAI,CAAC;QACH,gBAAgB;QAChB,MAAM,MAAM,GAAG,MAAM,iBAAc,CAAC,UAAU,CAAC;YAC7C,IAAI;SACL,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,MAAM;SACP,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qBAAqB;QACrB,OAAO;YACL,MAAM,EAAE,MAAM;YACd,KAAK,
|
|
1
|
+
{"version":3,"file":"specTools.js","sourceRoot":"","sources":["../../../src/service/storage/specTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,19 @@ export declare function genQueryStructure(allEntities: Array<Entity>, nameGroup:
|
|
|
6
6
|
properties: any[];
|
|
7
7
|
origin: "CallQueryComponent";
|
|
8
8
|
};
|
|
9
|
-
export declare function genWhereExpression(entity: Entity):
|
|
9
|
+
export declare function genWhereExpression(entity: Entity): {
|
|
10
|
+
concept: string;
|
|
11
|
+
operator: string;
|
|
12
|
+
expressions: {
|
|
13
|
+
concept: string;
|
|
14
|
+
name: string;
|
|
15
|
+
kind: string;
|
|
16
|
+
label: string;
|
|
17
|
+
operator: string;
|
|
18
|
+
left: any;
|
|
19
|
+
right: any;
|
|
20
|
+
}[];
|
|
21
|
+
};
|
|
10
22
|
export declare function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGroup, supportFilter: boolean, supportSort: boolean): {
|
|
11
23
|
concept: string;
|
|
12
24
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genQueryComponent.d.ts","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,MAAM,EACN,SAAS,EAIT,kBAAkB,EAGlB,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,SAAS,EAOV,MAAM,SAAS,CAAC;AAEjB,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS;;;;;EAejF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"genQueryComponent.d.ts","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,MAAM,EACN,SAAS,EAIT,kBAAkB,EAGlB,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,SAAS,EAOV,MAAM,SAAS,CAAC;AAEjB,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS;;;;;EAejF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM;;;;;;;;;;;;EA+ChD;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO;;;;;;;EAkHhI;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG;;;;;;;;;EAqD5I;AAED,wBAAsB,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,GAAG,cAAc,iBAsFnI;AAED,eAAe,kBAAkB,CAAC;AAElC,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS;;;;;EAqBrF"}
|
|
@@ -69,20 +69,24 @@ function genWhereExpression(entity) {
|
|
|
69
69
|
}
|
|
70
70
|
return res;
|
|
71
71
|
});
|
|
72
|
-
function transList2Tree(arr) {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
return
|
|
72
|
+
// function transList2Tree(arr: Array<object>): object {
|
|
73
|
+
// if (arr.length <= 1) return arr[0];
|
|
74
|
+
// const len = arr.length;
|
|
75
|
+
// const mid = len >> 1;
|
|
76
|
+
// const left = arr.slice(0, mid);
|
|
77
|
+
// const right = arr.slice(mid);
|
|
78
|
+
// return NaslLogicItem.BinaryExpression({
|
|
79
|
+
// operator: '&&',
|
|
80
|
+
// left: transList2Tree(left),
|
|
81
|
+
// right: transList2Tree(right),
|
|
82
|
+
// });
|
|
83
|
+
// }
|
|
84
|
+
// return transList2Tree(expressions);
|
|
85
|
+
return {
|
|
86
|
+
concept: 'VariadicExpression',
|
|
87
|
+
operator: '&&',
|
|
88
|
+
expressions,
|
|
89
|
+
};
|
|
86
90
|
}
|
|
87
91
|
exports.genWhereExpression = genWhereExpression;
|
|
88
92
|
function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAClC,0CAaqB;AACrB,mCAQiB;AAEjB,SAAgB,iBAAiB,CAAC,WAA0B,EAAE,SAAoB;IAChF,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAC/C,OAAO,gBAAQ,CAAC,SAAS,CAAC;QACxB,IAAI,EAAE,SAAS,CAAC,SAAS;QACzB,MAAM,EAAE,oBAAoB;QAC5B,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACrC,gBAAQ,CAAC,iBAAiB,CAAC;YACzB,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;YACvC,cAAc,EAAE,0BAAkB,CAAC,SAAS,CAAC;gBAC3C,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;gBACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;aACtB,CAAC;SACH,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC;AAfD,8CAeC;AAED,SAAgB,kBAAkB,CAAC,MAAc;IAC/C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtF,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9C,MAAM,GAAG,GAAG,qBAAa,CAAC,gBAAgB,CAAC;YACzC,IAAI,EAAE,2BAAmB,CAAC,oBAAoB,CAAC;gBAC7C,KAAK,EAAE,UAAU;gBACjB,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,MAAM,CAAC,IAAI;gBACzB,YAAY,EAAE,QAAQ,CAAC,IAAI;aAC5B,CAAC;YACF,KAAK,EAAE,qBAAa,CAAC,gBAAgB,CAAC;gBACpC,MAAM,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC/B,IAAI,EAAE,QAAQ;iBACf,CAAC;gBACF,QAAQ,EAAE,qBAAa,CAAC,UAAU,CAAC;oBACjC,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACpB,CAAC;aACH,CAAC;YACF,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjB,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,
|
|
1
|
+
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lcap/nasl",
|
|
3
3
|
"description": "NetEase Application Specific Language",
|
|
4
|
-
"version": "4.4.0-beta.
|
|
4
|
+
"version": "4.4.0-beta.35",
|
|
5
5
|
"author": "Forrest <rainforest92@126.com>",
|
|
6
6
|
"main": "./out",
|
|
7
7
|
"types": "./out/index.d.ts",
|
|
@@ -79,14 +79,14 @@
|
|
|
79
79
|
"vue": "3.4.33",
|
|
80
80
|
"vue-template-compiler": "2.6.14",
|
|
81
81
|
"vue-template-es2015-compiler": "1.9.1",
|
|
82
|
-
"@lcap/nasl-
|
|
83
|
-
"@lcap/nasl-language-server-core": "4.4.0-beta.
|
|
84
|
-
"@lcap/nasl-
|
|
85
|
-
"@lcap/nasl-log": "4.4.0-beta.
|
|
86
|
-
"@lcap/nasl-
|
|
87
|
-
"@lcap/nasl-
|
|
88
|
-
"@lcap/nasl-unified-frontend-generator": "4.4.0-beta.
|
|
89
|
-
"@lcap/nasl-utils": "4.4.0-beta.
|
|
82
|
+
"@lcap/nasl-concepts": "4.4.0-beta.35",
|
|
83
|
+
"@lcap/nasl-language-server-core": "4.4.0-beta.35",
|
|
84
|
+
"@lcap/nasl-breakpoint": "4.4.0-beta.35",
|
|
85
|
+
"@lcap/nasl-log": "4.4.0-beta.35",
|
|
86
|
+
"@lcap/nasl-types": "4.4.0-beta.35",
|
|
87
|
+
"@lcap/nasl-translator": "4.4.0-beta.35",
|
|
88
|
+
"@lcap/nasl-unified-frontend-generator": "4.4.0-beta.35",
|
|
89
|
+
"@lcap/nasl-utils": "4.4.0-beta.35"
|
|
90
90
|
},
|
|
91
91
|
"devDependencies": {
|
|
92
92
|
"@babel/preset-react": "7.24.1",
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
"clear": "rimraf ./out",
|
|
108
108
|
"dev": "npm run build -- -w",
|
|
109
109
|
"watch": "npm run dev",
|
|
110
|
-
"build": "npm run clear && tsc -p ./tsconfig.build.json",
|
|
110
|
+
"build": "npm run clear && tsc -p ./tsconfig.build.json && cp ./src/server/naslUiComponentTs.default.d.ts ./out/server/naslUiComponentTs.default.d.ts",
|
|
111
111
|
"test:gen": "pnpm run --filter @lcap/nasl-test-toolkit ts-node $PWD/tests/gen-cases.ts",
|
|
112
112
|
"test": "pnpm test:gen && pnpm run --filter @lcap/nasl-test-toolkit runtest --require $PWD/tests/setup.ts --config $PWD/.mocharc.js --j 3",
|
|
113
113
|
"test:ci": "pnpm test:gen && pnpm run --filter @lcap/nasl-test-toolkit runtest:ci --require $PWD/tests/setup.ts --config $PWD/.mocharc.js --j 3",
|
|
@@ -37,13 +37,13 @@ declare namespace nasl.util {
|
|
|
37
37
|
export function Length(str1: nasl.core.String): nasl.core.Long;
|
|
38
38
|
export function Length<K, V>(str1: nasl.collection.Map<K, V>): nasl.core.Long;
|
|
39
39
|
export function Length<T>(str1: nasl.collection.List<T>): nasl.core.Long;
|
|
40
|
-
export function IndexOf(str: nasl.core.String, search: nasl.core.String,
|
|
40
|
+
export function IndexOf(str: nasl.core.String, search: nasl.core.String, fromIndex: nasl.core.Long, ignoreCase: nasl.core.Boolean): nasl.core.Long;
|
|
41
41
|
export function LastIndexOf(str: nasl.core.String, search: nasl.core.String, ignoreCase: nasl.core.Boolean): nasl.core.Long;
|
|
42
42
|
export function Replace(str: nasl.core.String, search: nasl.core.String | nasl.util.Regex, replace: nasl.core.String): nasl.core.String;
|
|
43
43
|
export function SubString(str: nasl.core.String, start: nasl.core.Long, length?: nasl.core.Long): nasl.core.String;
|
|
44
|
-
export function ToLower(
|
|
45
|
-
export function ToUpper(
|
|
46
|
-
export function Trim(
|
|
44
|
+
export function ToLower(str: nasl.core.String): nasl.core.String;
|
|
45
|
+
export function ToUpper(str: nasl.core.String): nasl.core.String;
|
|
46
|
+
export function Trim(str: nasl.core.String): nasl.core.String;
|
|
47
47
|
|
|
48
48
|
export function Get<T>(list: nasl.collection.List<T>, index: nasl.core.Long): T;
|
|
49
49
|
export function Set<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Long, item: K): T;
|
|
@@ -117,8 +117,8 @@ declare namespace nasl.util {
|
|
|
117
117
|
export function FormatDate(date: nasl.core.Date, formatter: nasl.core.String): nasl.core.String;
|
|
118
118
|
export function FormatDateTime(dateTime: nasl.core.DateTime, formatter: nasl.core.String, timeZone?: nasl.core.String): nasl.core.String;
|
|
119
119
|
export function FormatTime(time: nasl.core.Time, formatter: nasl.core.String): nasl.core.String;
|
|
120
|
-
export function FormatNumber(
|
|
121
|
-
export function FormatPercent(
|
|
120
|
+
export function FormatNumber(value: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, omit: nasl.core.Boolean, showGroups: nasl.core.Boolean, fix: nasl.core.String, unit: nasl.core.String): nasl.core.String;
|
|
121
|
+
export function FormatPercent(value: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, omit: nasl.core.Boolean, showGroups: nasl.core.Boolean): nasl.core.String;
|
|
122
122
|
|
|
123
123
|
export function AddDays(dateTime: nasl.core.Date, amount: nasl.core.Long): nasl.core.Date;
|
|
124
124
|
export function AddDays(dateTime: nasl.core.DateTime, amount: nasl.core.Long): nasl.core.DateTime;
|
|
@@ -126,12 +126,12 @@ declare namespace nasl.util {
|
|
|
126
126
|
export function AddMonths(dateTime: nasl.core.Date, amount: nasl.core.Long): nasl.core.Date;
|
|
127
127
|
export function AddMonths(dateTime: nasl.core.DateTime, amount: nasl.core.Long): nasl.core.DateTime;
|
|
128
128
|
|
|
129
|
-
export function DateDiff<T extends nasl.core.Date | nasl.core.Time | nasl.core.DateTime>(
|
|
129
|
+
export function DateDiff<T extends nasl.core.Date | nasl.core.Time | nasl.core.DateTime>(startDateTime: T, endDateTime: T, calcType: nasl.core.String, isAbs: nasl.core.Boolean): nasl.core.Long;
|
|
130
130
|
export function ConvertTimezone<T extends nasl.core.DateTime>(dateTime: T, timeZone: nasl.core.String): T;
|
|
131
131
|
export function AlterDateTime<T extends nasl.core.Date | nasl.core.DateTime>(dateTime: T, option: nasl.core.String, amount: nasl.core.Long, unit: nasl.core.String): T;
|
|
132
132
|
|
|
133
133
|
export function GetDateCount(dateTime: nasl.core.Date, metric: nasl.core.String): nasl.core.Long;
|
|
134
|
-
export function GetDateCount(dateTime: nasl.core.
|
|
134
|
+
export function GetDateCount(dateTime: nasl.core.DateTime, metric: nasl.core.String, timeZone: nasl.core.String): nasl.core.Long;
|
|
135
135
|
export function GetDateCountOld<T extends nasl.core.Date | nasl.core.DateTime>
|
|
136
136
|
(dateTime: T, metric: nasl.core.String, timeZone?: nasl.core.String): nasl.core.Long;
|
|
137
137
|
|
|
@@ -196,8 +196,8 @@ declare namespace nasl.util {
|
|
|
196
196
|
export function Cbrt(value: nasl.core.Decimal): nasl.core.Decimal;
|
|
197
197
|
export function Log(value: nasl.core.Decimal): nasl.core.Decimal;
|
|
198
198
|
|
|
199
|
-
export function PadStart(str: nasl.core.String,
|
|
200
|
-
export function PadEnd(str: nasl.core.String,
|
|
199
|
+
export function PadStart(str: nasl.core.String, targetLength: nasl.core.Long, fillStr: nasl.core.String): nasl.core.String;
|
|
200
|
+
export function PadEnd(str: nasl.core.String, targetLength: nasl.core.Long, fillStr: nasl.core.String): nasl.core.String;
|
|
201
201
|
export function TrimStart(str: nasl.core.String): nasl.core.String;
|
|
202
202
|
export function TrimEnd(str: nasl.core.String): nasl.core.String;
|
|
203
203
|
export function MatchRegex(
|