@lcap/nasl 3.11.2-beta.5 → 3.12.0-alpha.fix-type-1

package/out/service/autofix/index.d.ts

@@ -0,0 +1,10 @@
+import type { Diagnostic } from '../../manager/diagnostic';
+import type { AutoFixRule } from './types';
+export type { AutoFixRule };
+export declare const defaultAutoFixRuleSet: AutoFixRule[];
+export declare const findSupportedRules: (diagnostic: Diagnostic, ruleset: AutoFixRule[]) => {
+    rule: AutoFixRule;
+    hint: string;
+    disabledForBatch: boolean;
+};
+//# sourceMappingURL=index.d.ts.map

package/out/service/autofix/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/autofix/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,CAAC;AAE5B,eAAO,MAAM,qBAAqB,EAAE,WAAW,EAG9C,CAAC;AACF,eAAO,MAAM,kBAAkB,eAAgB,UAAU,WAAW,WAAW,EAAE;;;;CAShF,CAAC"}

package/out/service/autofix/index.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findSupportedRules = exports.defaultAutoFixRuleSet = void 0;
+const rule_convert_incompatible_assignment_to_union_1 = require("./rules/rule-convert-incompatible-assignment-to-union");
+const rule_delete_bind_attribute_node_1 = require("./rules/rule-delete-bind-attribute-node");
+exports.defaultAutoFixRuleSet = [
+    rule_delete_bind_attribute_node_1.ruleDeleteBindAttributeNode,
+    rule_convert_incompatible_assignment_to_union_1.ruleConvertIncompatibleAssignmentToUnion,
+];
+const findSupportedRules = (diagnostic, ruleset) => {
+    let result = undefined;
+    for (const rule of ruleset) {
+        const temp = rule.isFixable(diagnostic);
+        if (temp) {
+            return { rule, hint: temp.hint, disabledForBatch: rule.disableForBatch };
+        }
+    }
+    return undefined;
+};
+exports.findSupportedRules = findSupportedRules;
+//# sourceMappingURL=index.js.map

package/out/service/autofix/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/autofix/index.ts"],"names":[],"mappings":";;;AACA,yHAAiH;AACjH,6FAAsF;AAIzE,QAAA,qBAAqB,GAAkB;IAClD,6DAA2B;IAC3B,wFAAwC;CACzC,CAAC;AACK,MAAM,kBAAkB,GAAG,CAAC,UAAsB,EAAE,OAAsB,EAAE,EAAE;IACnF,IAAI,MAAM,GAAG,SAAS,CAAC;IACvB,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3E,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B"}

package/out/service/autofix/rules/rule-convert-incompatible-assignment-to-union.d.ts

@@ -0,0 +1,3 @@
+import { AutoFixRule } from '../types';
+export declare const ruleConvertIncompatibleAssignmentToUnion: AutoFixRule;
+//# sourceMappingURL=rule-convert-incompatible-assignment-to-union.d.ts.map

package/out/service/autofix/rules/rule-convert-incompatible-assignment-to-union.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rule-convert-incompatible-assignment-to-union.d.ts","sourceRoot":"","sources":["../../../../src/service/autofix/rules/rule-convert-incompatible-assignment-to-union.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAkCvC,eAAO,MAAM,wCAAwC,EAAE,WA4BtD,CAAC"}

package/out/service/autofix/rules/rule-convert-incompatible-assignment-to-union.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ruleConvertIncompatibleAssignmentToUnion = void 0;
+const nasl_1 = require("@lcap/nasl");
+const asserts_1 = require("@lcap/nasl-concepts/asserts");
+const regex = /赋值：类型不一致！右边类型：(.*)，左边类型：(.*)。/;
+function resolveAssignmentTarget(node) {
+    const assignment = (0, asserts_1.isAssignment)(node) ? node : node.getAncestor('Assignment');
+    if ((0, asserts_1.isAssignment)(assignment) && assignment.left && assignment.right) {
+        for (const ctx of [node.getAncestor('SubLogic'), node.getAncestor('Logic')]) {
+            if (!ctx) {
+                continue;
+            }
+            // 去掉各种奇奇怪怪的逻辑，只处理普通的前端逻辑和服务端逻辑
+            if ((0, asserts_1.isLogic)(node) && node.concept !== 'Logic') {
+                continue;
+            }
+            const lhsAnnotation = assignment.left.typeAnnotation ?? assignment.left.__TypeAnnotation;
+            const rhsAnnotation = assignment.right.typeAnnotation ?? assignment.right.__TypeAnnotation;
+            if (ctx && lhsAnnotation && rhsAnnotation) {
+                const target = ctx.returns.find((x) => x.name === assignment.left.name) ??
+                    ctx.variables.find((x) => x.name === assignment.left.name);
+                if (target) {
+                    return {
+                        target,
+                        lhsAnnotation,
+                        rhsAnnotation,
+                    };
+                }
+            }
+        }
+    }
+    return null;
+}
+exports.ruleConvertIncompatibleAssignmentToUnion = {
+    title: '自动修复不兼容的赋值为联合类型',
+    disableForBatch: true,
+    isFixable: (diagnostic) => {
+        const res = diagnostic.message?.match(regex);
+        const ty1 = res?.[1];
+        const ty2 = res?.[2];
+        if (ty1 &&
+            ty2 &&
+            // @ts-expect-error 无方法的BaseNode类型
+            !!resolveAssignmentTarget(diagnostic.node)) {
+            return { hint: `一键设置为 “${ty1} 或 ${ty2}” 类型` };
+        }
+        return false;
+    },
+    commitFix: (node) => {
+        if (!node) {
+            return;
+        }
+        const resolved = resolveAssignmentTarget(node);
+        if (resolved) {
+            const { target, lhsAnnotation, rhsAnnotation } = resolved;
+            const resultTypeAnnotation = nasl_1.TypeAnnotation.createUnion(lhsAnnotation, rhsAnnotation);
+            target.update({ typeAnnotation: resultTypeAnnotation });
+        }
+    },
+};
+//# sourceMappingURL=rule-convert-incompatible-assignment-to-union.js.map

package/out/service/autofix/rules/rule-convert-incompatible-assignment-to-union.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rule-convert-incompatible-assignment-to-union.js","sourceRoot":"","sources":["../../../../src/service/autofix/rules/rule-convert-incompatible-assignment-to-union.ts"],"names":[],"mappings":"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"}

package/out/service/autofix/rules/rule-delete-bind-attribute-node.d.ts

@@ -0,0 +1,3 @@
+import { AutoFixRule } from '../types';
+export declare const ruleDeleteBindAttributeNode: AutoFixRule;
+//# sourceMappingURL=rule-delete-bind-attribute-node.d.ts.map

package/out/service/autofix/rules/rule-delete-bind-attribute-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rule-delete-bind-attribute-node.d.ts","sourceRoot":"","sources":["../../../../src/service/autofix/rules/rule-delete-bind-attribute-node.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKvC,eAAO,MAAM,2BAA2B,EAAE,WAyBzC,CAAC"}

package/out/service/autofix/rules/rule-delete-bind-attribute-node.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ruleDeleteBindAttributeNode = void 0;
+// 迁移自ide-essential
+const nasl_concepts_1 = require("@lcap/nasl-concepts");
+const asserts_1 = require("@lcap/nasl-concepts/asserts");
+const supportFixErrorReg = /找不到\s(.*)\s上的\s(.*)。/;
+exports.ruleDeleteBindAttributeNode = {
+    isFixable(diagnostic) {
+        const match = diagnostic.message?.match(supportFixErrorReg);
+        const node = diagnostic.node;
+        if (match && (0, asserts_1.isBindAttribute)(node)) {
+            const allNodesAPI = (0, nasl_concepts_1.getConfig)()?.allNodesAPI;
+            const element = node?.parentNode;
+            if ((0, asserts_1.isViewElement)(element)) {
+                const api = allNodesAPI?.[element.tag];
+                const prop = api?.props?.find((p) => p.name === node?.name);
+                if ((/.*(f|F)ield$/.test(node?.name) ||
+                    // @ts-expect-error setter 类型不存在
+                    prop?.setter?.concept === 'PropertySelectSetter') &&
+                    typeof node.value === 'string') {
+                    return {};
+                }
+            }
+        }
+        return false;
+    },
+    commitFix(node) {
+        return node.delete();
+    },
+};
+//# sourceMappingURL=rule-delete-bind-attribute-node.js.map

package/out/service/autofix/rules/rule-delete-bind-attribute-node.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rule-delete-bind-attribute-node.js","sourceRoot":"","sources":["../../../../src/service/autofix/rules/rule-delete-bind-attribute-node.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,uDAAgD;AAEhD,yDAA6E;AAE7E,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAErC,QAAA,2BAA2B,GAAgB;IACtD,SAAS,CAAC,UAAU;QAClB,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;QAC7B,IAAI,KAAK,IAAI,IAAA,yBAAe,EAAC,IAAI,CAAC,EAAE,CAAC;YACnC,MAAM,WAAW,GAAG,IAAA,yBAAS,GAAE,EAAE,WAAW,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,EAAE,UAAU,CAAC;YACjC,IAAI,IAAA,uBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACvC,MAAM,IAAI,GAAG,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC5D,IACE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;oBAC9B,gCAAgC;oBAChC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAK,sBAAsB,CAAC;oBACnD,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAC9B,CAAC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,SAAS,CAAC,IAAI;QACZ,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;CACF,CAAC"}

package/out/service/autofix/types.d.ts

@@ -0,0 +1,14 @@
+import { Diagnostic } from '@lcap/nasl-types';
+import { BaseNode } from '@lcap/nasl-concepts';
+type Diagnostic = Diagnostic.Diagnostic;
+export type Node = BaseNode;
+export type AutoFixRule = {
+    title?: string;
+    isFixable: (diagnostic: Diagnostic) => {
+        hint?: string;
+    } | false;
+    commitFix: (node: Node) => void;
+    disableForBatch?: boolean;
+};
+export {};
+//# sourceMappingURL=types.d.ts.map

package/out/service/autofix/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/service/autofix/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,KAAK,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;AACxC,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"}

package/out/service/autofix/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/out/service/autofix/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/service/autofix/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.11.2-beta.5",
+  "version": "3.12.0-alpha.fix-type-1",
   "author": "Forrest <rainforest92@126.com>",
   "main": "./out",
   "types": "./out/index.d.ts",
@@ -18,16 +18,8 @@
     "package.json"
   ],
   "exports": {
-    "./*": {
-      "source": "./src/*",
-      "types": "./out/*.d.ts",
-      "require": "./out/*"
-    },
-    ".": {
-      "source": "./src/index.ts",
-      "types": "./out/index.d.ts",
-      "require": "./out/index.js"
-    }
+    "./*": "./out/*",
+    ".": "./out/index.js"
   },
   "license": "MIT",
   "keywords": [
@@ -71,16 +63,16 @@
     "socket.io-client": "2.4.0",
     "uuid": "8.3.2",
     "vue-template-compiler": "2.6.14",
-    "@lcap/nasl-breakpoint": "3.11.2-beta.5",
-    "@lcap/nasl-concepts": "3.11.2-beta.5",
-    "@lcap/nasl-language-server-core": "3.11.2-beta.5",
-    "@lcap/nasl-log": "3.11.2-beta.5",
-    "@lcap/nasl-sentry": "3.11.2-beta.5",
-    "@lcap/nasl-translator": "3.11.2-beta.5",
-    "@lcap/nasl-types": "3.11.2-beta.5",
-    "@lcap/nasl-typescript-worker": "3.11.2-beta.5",
-    "@lcap/nasl-unified-frontend-generator": "3.11.2-beta.5",
-    "@lcap/nasl-utils": "3.11.2-beta.5"
+    "@lcap/nasl-breakpoint": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-log": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-language-server-core": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-sentry": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-translator": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-concepts": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-types": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-utils": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-unified-frontend-generator": "3.12.0-alpha.fix-type-1",
+    "@lcap/nasl-typescript-worker": "3.12.0-alpha.fix-type-1"
   },
   "devDependencies": {
     "@types/babel__core": "7.20.1",