@lcap/nasl 1.0.0 → 2.12.0-beta

package/out/server/getScope.js

@@ -1,20 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProcessScopeWords = exports.getViewScopeWords = exports.getLogicScopeWords = void 0;
+exports.combineScope = exports.getProcessScopeWords = exports.getViewScopeWords = exports.getLogicScopeWords = void 0;
 function getLogicScopeWords(logic) {
     const scope = {
-        Param: logic.params.map(p => p.name),
-        Return: logic.returns.map(p => p.name),
-        Variable: logic.variables.map(p => p.name),
+        Param: logic.params.map((p) => p.name),
+        Return: logic.returns.map((p) => p.name),
+        Variable: logic.variables.map((p) => p.name),
+        Constant: [],
+        Logic: []
     };
     return scope;
 }
 exports.getLogicScopeWords = getLogicScopeWords;
 function getViewScopeWords(view) {
     const scope = {
-        Param: view.params.map(p => p.name),
-        // returns: View.returns.map(p => p.name),
-        Variable: view.variables.map(p => p.name),
+        Param: view.params.map((p) => p.name),
+        Variable: view.variables.map((p) => p.name),
+        Return: [],
+        Constant: [],
+        Logic: view.logics.map(l => l.name),
     };
     return scope;
 }
@@ -22,24 +26,36 @@ exports.getViewScopeWords = getViewScopeWords;
 function getProcessScopeWords(process) {
     const processName = process.name;
     const scope = {
-        Param: process.params.map(p => `${processName}.${p.name}`),
-        Return: process.returns.map(p => `${processName}.${p.name}`),
-        Constant: process.constants.map(p => `${processName}.${p.name}`),
+        Param: process.params.map((p) => `${processName}.${p.name}`),
+        Return: process.returns.map((p) => `${processName}.${p.name}`),
+        Constant: process.constants.map((p) => `${processName}.${p.name}`),
         Variable: [],
+        Logic: []
     };
-    process.elements.forEach(el => {
+    process.elements.forEach((el) => {
         const elname = el.name;
-        el.variables.forEach(v => {
+        el.variables.forEach((v) => {
             scope.Variable.push(`${processName}.${elname}.${v.name}`);
         });
-        el.returns.forEach(v => {
+        el.returns.forEach((v) => {
             scope.Return.push(`${processName}.${elname}.${v.name}`);
         });
-        el.constants.forEach(v => {
+        el.constants.forEach((v) => {
             scope.Constant.push(`${processName}.${elname}.${v.name}`);
         });
     });
     return scope;
 }
 exports.getProcessScopeWords = getProcessScopeWords;
+function combineScope(a, b) {
+    const scope = {
+        Param: [...a.Param, ...b.Param],
+        Return: [...a.Return, ...b.Return],
+        Constant: [...a.Constant, ...b.Constant],
+        Variable: [...a.Variable, ...b.Variable],
+        Logic: [...a.Logic, ...b.Logic],
+    };
+    return scope;
+}
+exports.combineScope = combineScope;
 //# sourceMappingURL=getScope.js.map

package/out/server/getScope.js.map

@@ -1 +1 @@
-{"version":3,"file":"getScope.js","sourceRoot":"","sources":["../../src/server/getScope.ts"],"names":[],"mappings":";;;AASA,SAAgB,kBAAkB,CAAC,KAAY;IAC3C,MAAM,KAAK,GAAc;QACrB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACpC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KAC7C,CAAA;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAPD,gDAOC;AAED,SAAgB,iBAAiB,CAAC,IAAU;IACxC,MAAM,KAAK,GAAc;QACrB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACnC,0CAA0C;QAC1C,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KAC5C,CAAA;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAPD,8CAOC;AAED,SAAgB,oBAAoB,CAAC,OAAgB;IACjD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IACjC,MAAM,KAAK,GAAc;QACrB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5D,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,QAAQ,EAAE,EAAE;KACf,CAAA;IAED,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAC1B,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC;QACvB,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACnB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACrB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,CAAC;AACjB,CAAC;AAtBD,oDAsBC"}
+{"version":3,"file":"getScope.js","sourceRoot":"","sources":["../../src/server/getScope.ts"],"names":[],"mappings":"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"}

package/out/server/index.d.ts

@@ -1,2 +1,3 @@
+import './extendBaseNode';
 declare const server: any;
 export default server;

package/out/server/index.js

@@ -10,6 +10,7 @@ const getValidates_1 = require("./getValidates");
 const getProcessComponents_1 = require("./getProcessComponents");
 const getMemberIdentifier_1 = require("./getMemberIdentifier");
 const naslServer_1 = __importDefault(require("./naslServer"));
+require("./extendBaseNode");
 const server = {
     ...naslServer_1.default,
     getLogics: getLogics_1.getLogics,

package/out/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;AAAA,2CAAsD;AACtD,mDAAgD;AAChD,iDAAkE;AAClE,iDAAmE;AACnE,iEAAmF;AACnF,+DAO+B;AAC/B,8DAAsC;AAEtC,MAAM,MAAM,GAAQ;IAChB,GAAG,oBAAU;IACb,SAAS,EAAT,qBAAS;IACT,YAAY,EAAZ,wBAAY;IACZ,aAAa,EAAb,6BAAa;IACb,YAAY,EAAZ,2BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,oBAAoB,EAApB,2CAAoB;IACpB,mBAAmB,EAAnB,0CAAmB;IACnB,mBAAmB,EAAnB,yCAAmB;IACnB,YAAY,EAAZ,2BAAY;IACZ,mBAAmB,EAAnB,kCAAmB;IACnB,2BAA2B,EAA3B,iDAA2B;IAC3B,qBAAqB,EAArB,2CAAqB;IACrB,kBAAkB,EAAlB,wCAAkB;IAClB,2BAA2B,EAA3B,iDAA2B;IAC3B,qBAAqB,EAArB,2CAAqB;CACxB,CAAC;AACF,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;AAAA,2CAAsD;AACtD,mDAAgD;AAChD,iDAAkE;AAClE,iDAAmE;AACnE,iEAAmF;AACnF,+DAO+B;AAC/B,8DAAsC;AACtC,4BAA0B;AAE1B,MAAM,MAAM,GAAQ;IAChB,GAAG,oBAAU;IACb,SAAS,EAAT,qBAAS;IACT,YAAY,EAAZ,wBAAY;IACZ,aAAa,EAAb,6BAAa;IACb,YAAY,EAAZ,2BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,oBAAoB,EAApB,2CAAoB;IACpB,mBAAmB,EAAnB,0CAAmB;IACnB,mBAAmB,EAAnB,yCAAmB;IACnB,YAAY,EAAZ,2BAAY;IACZ,mBAAmB,EAAnB,kCAAmB;IACnB,2BAA2B,EAA3B,iDAA2B;IAC3B,qBAAqB,EAArB,2CAAqB;IACrB,kBAAkB,EAAlB,wCAAkB;IAClB,2BAA2B,EAA3B,iDAA2B;IAC3B,qBAAqB,EAArB,2CAAqB;CACxB,CAAC;AACF,kBAAe,MAAM,CAAC"}

package/out/server/naslServer.d.ts

@@ -1,10 +1,10 @@
 import Messager from '../common/Messager';
 import * as tsProtocol from 'typescript/lib/protocol';
-import { Module, BaseNode, App, Structure, Logic, TypeAnnotation, View } from '../concepts';
+import { Module, BaseNode, App, Structure, Logic, TypeAnnotation, View, Param } from '../concepts';
 import { SourceMap, SourceMapItem } from '../translator';
 import { MinRange } from './translator';
 import { DiagnosticRecord, Diagnostic } from '../manager/diagnostic';
-interface FileNode extends BaseNode {
+export interface FileNode extends BaseNode {
     getEmbeddedFilePath(name?: string): string;
     toEmbeddedTSFile(): {
         code: string;
@@ -12,7 +12,7 @@ interface FileNode extends BaseNode {
         sourceMap: SourceMap;
     };
 }
-interface reNameMinRange extends MinRange {
+interface RenameMinRange extends MinRange {
     newValue?: any;
     setTypeMethods?: string;
 }
@@ -85,6 +85,7 @@ declare const naslServer: {
     getDiagnosticRecords(fileNames?: Array<string>): Promise<Array<DiagnosticRecord>>;
     getDiagnosticRecordsAndPushAll(fileNames?: Array<string>): Promise<void>;
     _resolveDiagnosticRecords(records: Array<DiagnosticRecord>): DiagnosticRecord[];
+    _attachDiagnostics(fileNode: BaseNode): Diagnostic[];
     _resolveDiagnostic(diagnostic: tsProtocol.DiagnosticWithFileName, fileNode: FileNode): Diagnostic;
     _findMinRange(diagnostic: tsProtocol.DiagnosticWithFileName | tsProtocol.ReferencesResponseItem, fileNode: FileNode): MinRange;
     _isHaveRef(node: BaseNode): Promise<tsProtocol.ReferencesResponseItem[]>;
@@ -96,8 +97,9 @@ declare const naslServer: {
      * 而且，这个新值不一定会用到，MemberExpression在批量更新的时候，可以取到新的value， 这里需要位置信息防止 a.a.a.a 中的一个a发生修改
      * @returns 找到的引用
      */
-    _renamePrepare(node: BaseNode, refsList: any[], newValue: string): reNameMinRange[];
-    _addParamsPrepare(node: BaseNode, refsList: any[]): void;
+    _renamePrepare(node: BaseNode, refsList: any[], newValue: string): RenameMinRange[];
+    _addParamsEffect(refsList: any[], node: Param): void;
+    _addParamsPrepare(node: BaseNode, refsList: any[], needAdd: boolean): BaseNode;
     findReferences(node: BaseNode): Promise<Map<any, any>>;
     _getTreeMap(minRange: MinRange, fileNode: BaseNode, resMap: Map<BaseNode, Array<Array<QuoteNode>>>, nodeMap: Map<BaseNode, QuoteNode>): void;
     handleTreeMap(resMap: Map<BaseNode, Array<Array<QuoteNode>>>): Map<any, any>;