@lcap/nasl-language-server-core 3.14.0-rc.3 → 3.14.0-rc.5

package/out/typer/collectGlobalDefs.js

@@ -40,6 +40,7 @@ const assertion_1 = require("../utils/assertion");
 const parseTsClassType_1 = require("../utils/parseTsClassType");
 const asserts_1 = require("@lcap/nasl-concepts/asserts");
 const component_def_manager_1 = require("./component-def-manager/component-def-manager");
+const lodash_1 = require("lodash");
 // FIXME wudengke 目前的namespace机制有大问题，nasl.configuration.enums中，nasl.configuration才是一个独立的namespace
 function normalizeNamespaceToMaxLevel2(nsp) {
     return nsp.split('.').slice(0, 2).join('.');
@@ -256,18 +257,49 @@ const parseTsDeclarationsToNasl = (m) => (node) => {
                     const ty = member.parameters[0]?.type;
                     if (ty && ts.isTypeReferenceNode(ty) && ty.typeName?.getText() === 'Partial') {
                         const optionClassNameType = ty.typeArguments?.at(0);
-                        if (optionClassNameType && ts.isTypeReferenceNode(optionClassNameType)) {
-                            const possibleOptionClassName = optionClassNameType.typeName?.getText();
+                        function processTypeReference(ty) {
+                            const possibleOptionClassName = ty.typeName?.getText();
                             const thisClassName = uiTy.typeName;
-                            // 检查Options后缀约定
-                            if (possibleOptionClassName &&
-                                possibleOptionClassName === `${thisClassName}Options`) {
-                                uiTy.composedBy = [possibleOptionClassName];
+                            switch (possibleOptionClassName) {
+                                case 'Omit': {
+                                    // @ts-expect-error
+                                    const first = ty.typeArguments?.[0]?.typeName?.getText();
+                                    if (first) {
+                                        return [first];
+                                    }
+                                    return undefined;
+                                }
+                                default: {
+                                    if (possibleOptionClassName) {
+                                        // 检查Options后缀约定
+                                        if (possibleOptionClassName === `${thisClassName}Options` ||
+                                            possibleOptionClassName.includes('Form')) {
+                                            return [possibleOptionClassName];
+                                        }
+                                    }
+                                }
                             }
-                            else {
-                                console.log(`${thisClassName}的constructor中引用了不合法的${possibleOptionClassName}类`);
+                            console.error(`DTS解析问题 ${thisClassName}的constructor中引用了非预期的${possibleOptionClassName}类`);
+                        }
+                        if (optionClassNameType && ts.isTypeReferenceNode(optionClassNameType)) {
+                            const res = processTypeReference(optionClassNameType);
+                            if (res) {
+                                uiTy.composedBy = res;
                             }
                         }
+                        else if (optionClassNameType && ts.isIntersectionTypeNode(optionClassNameType)) {
+                            const intersectionType = optionClassNameType;
+                            // intersectionType 为 ElFormCascaderProOptions<T, V, P, M, C> & ElFormItemProOptions & Omit<ElCascaderProOptions<T, V, P, M, C>, keyof ElFormItemProOptions>
+                            const classNames = intersectionType.types.flatMap(x => {
+                                if (ts.isTypeReferenceNode(x)) {
+                                    const res = processTypeReference(x);
+                                    return res;
+                                }
+                                return [];
+                            }).filter(types_1.isNotNil);
+                            // classNames 为 ['ElFormCascaderProOptions', 'ElFormItemProOptions', 'ElCascaderProOptions']
+                            uiTy.composedBy = classNames;
+                        }
                     }
                 }
             });
@@ -333,13 +365,45 @@ const parseTsDeclarationsToNasl = (m) => (node) => {
                 return;
             }
             // 根据存储composedBy中的虚拟继承关系，将TOptions的返回值类型作为T的参数的类型
-            const sourceClassName = d.composedBy?.at(0);
-            if (sourceClassName) {
-                // TODO wudengke 断言两个class的typeParams相同
-                const sourceDef = defMap.get(sourceClassName);
-                const propertiesFromOptionsClass = sourceDef?.returnType?.[0];
-                if (propertiesFromOptionsClass) {
-                    d.typeArguments = [(0, type_manager_1.copyTyAnn)(propertiesFromOptionsClass)];
+            const composedBy = d.composedBy;
+            if (composedBy?.length === 1) {
+                const sourceClassName = d.composedBy?.at(0);
+                if (sourceClassName) {
+                    // TODO wudengke 断言两个class的typeParams相同
+                    const sourceDef = defMap.get(sourceClassName);
+                    const propertiesFromOptionsClass = sourceDef?.returnType?.[0];
+                    if (propertiesFromOptionsClass) {
+                        d.typeArguments = [(0, type_manager_1.copyTyAnn)(propertiesFromOptionsClass)];
+                    }
+                }
+            }
+            else if (composedBy?.length === 3) {
+                // ElFormCascaderProOptions<T, V, P, M, C> & ElFormItemProOptions & Omit<ElCascaderProOptions<T, V, P, M, C>, keyof ElFormItemProOptions> 会被处理为
+                // ['ElFormCascaderProOptions', 'ElFormItemProOptions', 'ElCascaderProOptions']
+                const [A, B, C] = composedBy;
+                const ADef = defMap.get(A);
+                const BDef = defMap.get(B);
+                const CDef = defMap.get(C);
+                const aProperties = ADef?.returnType?.[0]?.properties;
+                const bProperties = BDef?.returnType?.[0]?.properties;
+                const cProperties = CDef?.returnType?.[0]?.properties;
+                if (aProperties && bProperties && cProperties) {
+                    // resultProperties = aProperties + bProperties + (cProperties - bProperties)
+                    const resultStructureProperties = [];
+                    aProperties.forEach((x) => {
+                        resultStructureProperties.push(x);
+                    });
+                    bProperties.forEach((x) => {
+                        resultStructureProperties.push(x);
+                    });
+                    cProperties.forEach((x) => {
+                        if (!bProperties.find((y) => y.name === x.name)) {
+                            resultStructureProperties.push(x);
+                        }
+                    });
+                    d.typeArguments = [
+                        nasl_concepts_1.TypeAnnotation.createTypeAnonymousStructure((0, lodash_1.uniqBy)(resultStructureProperties, (x) => x.name)),
+                    ];
                 }
             }
         });

package/out/typer/collectGlobalDefs.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectGlobalDefs.js","sourceRoot":"","sources":["../../src/typer/collectGlobalDefs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collectGlobalDefs.js","sourceRoot":"","sources":["../../src/typer/collectGlobalDefs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAW6B;AAC7B,iDAOwB;AACxB,qDAA0E;AAC1E,+CAAiC;AASpB,QAAA,aAAa,GAAG,WAAW,CAAC;AAC5B,QAAA,mBAAmB,GAAG,iBAAiB,CAAC;AACxC,QAAA,kBAAkB,GAAG,gBAAgB,CAAC;AACtC,QAAA,qBAAqB,GAAG,YAAY,CAAC;AAErC,QAAA,mBAAmB,GAAG,YAAY,CAAC;AAEnC,QAAA,mBAAmB,GAAG,uBAAuB,CAAC;AAE3D,8EAIgD;AAChD,0CAA0C;AAC1C,kDAAiD;AACjD,gEAOmC;AACnC,yDAA0D;AAC1D,yFAA+F;AAC/F,mCAAgC;AAEhC,iGAAiG;AACjG,SAAS,6BAA6B,CAAC,GAAW;IAChD,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED,SAAgB,2BAA2B,CAAC,MAAwB,EAAE,WAAmB;IACvF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,GAAG,GAAG,EAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,WAAW,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1F,MAAM,CAAC,GAAG,IAAI,GAAG,EAAsB,CAAC;IACxC,yBAAyB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAElC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjB,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,UAAU;IACV,SAAS,oBAAoB,CAAC,GAAgC,EAAE,KAAa;QAC3E,IAAI,IAAA,sDAA8B,EAAC,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAC;QAC5D,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;AACH,CAAC;AArBD,kEAqBC;AAED,4BAA4B;AAC5B,MAAM,yBAAyB,GAC7B,CAAC,CAAuB,EAAE,EAAE,CAC5B,CAAC,IAAa,EAAQ,EAAE;IACtB,SAAS,KAAK,CAAC,IAAa,EAAE,GAAkB;QAC9C,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACvC,IAAA,uBAAW,EAAC,UAAU,CAAC,CAAC;YACxB,MAAM,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC;YAC9B,6EAA6E;YAC7E,GAAG,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,gBAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnD,aAAa;YACb,MAAM,YAAY,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC;YACxD,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBACnD,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,yBAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;aAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,2CAA2C;YAC3C,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;YAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC5E,CAAC;YACD,IAAI,MAAM,GAAG,IAAA,4CAAyB,EAAC,IAAA,wCAAqB,EAAC,GAAG,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;YAC/E,IAAA,uBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YACzF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;gBACP,OAAO;YACT,CAAC;QACH,CAAC;aAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,8BAA8B;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,wBAAS,CAAC;YAC7C,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE,EAAE,IAAA,iCAAyB,EAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;YACnE,SAAS,cAAc,CAAC,IAA4B;gBAClD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,IAAA,uBAAW,EAAC,GAAG,CAAC,CAAC;oBACjB,OAAO,IAAA,8BAAW,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,IAAA,uBAAW,EAAC,GAAG,CAAC,CAAC;YACjB,MAAM,kBAAkB,GACtB,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACjC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,CAAC,eAAe,EAAE,uBAAuB,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAC/E,CACF,IAAI,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,kBAAkB,EAAE,CAAC;gBACvB,qCAAqC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACnD,CAAC;iBAAM,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,4BAA4B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,IAAA,6CAA0B,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC7C,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,SAAS,GAAiC,EAAE,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAElB,SAAS,sBAAsB,CAAC,IAAyB;QACvD,IAAI,EAAE,GAAG,SAAS,CAAC;QACnB,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAClC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,2BAA2B,EAAE,EAAE;YAC/C,IAAI,2BAA2B,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7D,MAAM,KAAK,GAAG,2BAA2B,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC7D,IAAI,KAAK,EAAE,CAAC;oBACV,EAAE,GAAG,IAAA,8BAAW,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,SAAS,SAAS,CAAC,IAAyB;QAC1C,OAAO,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,SAAS,4BAA4B,CAAC,IAAyB,EAAE,GAAW;QAC1E,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO;QAEvB,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,6BAA6B,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,IAAA,qBAAW,EAAC,MAAM,CAAC,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,SAAS;QACT,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,WAAW;QACX,MAAM,SAAS,GAAe,IAAI,CAAC,OAAO;aACvC,MAAM,CAAC,CAAC,MAAM,EAAoC,EAAE;YACnD,OAAO,CACL,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC;gBAChC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CACxE,CAAC;QACJ,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,YAAY,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACjF,OAAO,wBAAQ,CAAC,mBAAmB,CAAC;gBAClC,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACL,MAAM,OAAO,GAAG,oBAAI,CAAC,IAAI,CACvB;YACE,IAAI,EAAE,QAAQ;YACd,SAAS;YACT,SAAS,EAAE,sBAAsB,CAAC,IAAI,CAAC,IAAI,2BAAY;SACxD,EACD,MAAM,EACN,OAAO,CACR,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,MAAM,KAAK,GAAG,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;QACnC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxB,CAAC;IAED,SAAS,qCAAqC,CAAC,IAAyB,EAAE,GAAW;QACnF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,MAAM,UAAU,GAAwB,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,8BAAc,CAAC,mBAAmB,CAAC;gBAC9C,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAC7B,QAAQ,EAAE,SAAS;gBACnB,aAAa,EAAE,GAAG;aACnB,CAAC,CAAC;YAEH,0BAA0B;YAC1B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC/C,MAAM,OAAO,GAAG,8BAAc,CAAC,mBAAmB,CAAC;wBACjD,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;wBAC3B,QAAQ,EAAE,WAAW;qBACtB,CAAC,CAAC;oBACH,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;wBAClB,OAAO,CAAC,WAAW,GAAG,IAAA,yCAAsB,EAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;oBACxE,CAAC;oBACD,OAAO,OAAO,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAClF,qBAAqB;YACrB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC9B,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBACpF,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC3C,IAAI,MAAM,GAAG,IAAI,CAAC;oBAElB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBAChB,MAAM,GAAG,IAAA,8BAAW,EAAC,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,MAAM,GAAG,wBAAS,CAAC;oBACrB,CAAC;oBAED,UAAU,CAAC,IAAI,CACb,iCAAiB,CAAC,mBAAmB,CAAC;wBACpC,IAAI,EAAE,YAAY;wBAClB,cAAc,EAAE,MAAM;qBACvB,CAAC,CACH,CAAC;gBACJ,CAAC;qBAAM,IACL,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC;oBAC9B,MAAM,CAAC,IAAI;oBACX,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAC5B,CAAC;oBACD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/C,IAAI,KAAK,GAAG,IAAA,8BAAW,EAAC,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACzD,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;wBACnB,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;4BACxB,IAAI,KAAK,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;gCACnC,KAAK,GAAG,IAAA,wBAAS,EAAC,KAAK,CAAC,CAAC;4BAC3B,CAAC;4BACD,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;wBACxB,CAAC;wBACD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;oBACrD,CAAC,CAAC,CAAC;oBACH,MAAM,UAAU,GACd,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACnC,MAAM,KAAK,GAAG,IAAA,8BAAW,EAAC,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC;wBACtD,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;wBACnB,OAAO,KAAK,CAAC;oBACf,CAAC,CAAC,IAAI,EAAE,CAAC;oBACX,MAAM,KAAK,GAAG,IAAA,8BAAW,EAAC,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC5D,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;oBACnB,MAAM,MAAM,GAAG,8BAAc,CAAC,mBAAmB,CAAC;wBAChD,QAAQ,EAAE,UAAU;wBACpB,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,IAAI,CAAC;wBACtC,MAAM,EAAE,QAAQ;wBAChB,UAAU;wBACV,UAAU,EAAE,CAAC,KAAK,CAAC;qBACpB,CAAC,CAAC;oBAEH,UAAU,CAAC,IAAI,CACb,iCAAiB,CAAC,mBAAmB,CAAC;wBACpC,IAAI,EAAE,YAAY;wBAClB,cAAc,EAAE,MAAM;qBACvB,CAAC,CACH,CAAC;gBACJ,CAAC;qBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC/C;;;;;uBAKG;oBACH,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;oBACtC,IAAI,EAAE,IAAI,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;wBAC7E,MAAM,mBAAmB,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;wBACpD,SAAS,oBAAoB,CAAC,EAAwB;4BACpD,MAAM,uBAAuB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;4BACvD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC;4BACpC,QAAQ,uBAAuB,EAAE,CAAC;gCAChC,KAAK,MAAM,CAAC,CAAC,CAAC;oCACZ,mBAAmB;oCACnB,MAAM,KAAK,GAAuB,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;oCAC5E,IAAG,KAAK,EAAC,CAAC;wCACR,OAAO,CAAC,KAAK,CAAC,CAAA;oCAChB,CAAC;oCACD,OAAO,SAAS,CAAC;gCACnB,CAAC;gCACD,OAAO,CAAC,CAAC,CAAC;oCACR,IAAI,uBAAuB,EAAE,CAAC;wCAC5B,gBAAgB;wCAChB,IACE,uBAAuB,KAAK,GAAG,aAAa,SAAS;4CACrD,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,EACxC,CAAC;4CACD,OAAO,CAAC,uBAAuB,CAAC,CAAC;wCACnC,CAAC;oCACH,CAAC;gCACH,CAAC;4BACH,CAAC;4BACD,OAAO,CAAC,KAAK,CACX,WAAW,aAAa,uBAAuB,uBAAuB,GAAG,CAC1E,CAAC;wBACJ,CAAC;wBACD,IAAI,mBAAmB,IAAI,EAAE,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,CAAC;4BACvE,MAAM,GAAG,GAAG,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;4BACtD,IAAG,GAAG,EAAC,CAAC;gCACN,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;4BACxB,CAAC;wBACH,CAAC;6BAAM,IAAI,mBAAmB,IAAI,EAAE,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,EAAE,CAAC;4BACjF,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;4BAC7C,4JAA4J;4BAC5J,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA,EAAE;gCACnD,IAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAC,CAAC;oCAC5B,MAAM,GAAG,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAA;oCACnC,OAAO,GAAG,CAAC;gCACb,CAAC;gCACD,OAAO,EAAE,CAAA;4BACX,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAQ,CAAC,CAAC;4BACpB,4FAA4F;4BAC5F,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;wBAC/B,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,GAAG,CAAC,8BAAc,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5E,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,SAAS,CAAC,CAAC;IAE1E;;OAEG;IACH,SAAS,gBAAgB,CAAC,IAA6B;QACrD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiC,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAA,uBAAW,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnB,SAAS,IAAI,CAAC,EAAkB;gBAC9B,IACE,EAAE,EAAE,QAAQ,KAAK,eAAe;oBAChC,EAAE,CAAC,SAAS,EAAE,QAAQ,KAAK,SAAS;oBACpC,EAAE,CAAC,UAAU,EACb,CAAC;oBACD,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;oBACvC,IAAI,UAAU,EAAE,UAAU,EAAE,CAAC;wBAC3B,gCAAgC;wBAChC,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,EAAE,IAAI,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAChD,EAAE,cAAc,CAAC;wBAClB,IAAI,UAAU,EAAE,CAAC;4BACf,IAAI,IAAA,+BAAc,EAAC,UAAU,CAAC,EAAE,CAAC;gCAC/B,OAAO,UAAU,CAAC;4BACpB,CAAC;4BACD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;wBAC1B,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,IAAI,EAAE,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;oBACvC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAS,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC9D,OAAO,WAAW,IAAI,EAAE,CAAC;gBAC3B,CAAC;qBAAM,IAAI,EAAE,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oBACrC,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAS,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC9D,OAAO,WAAW,IAAI,EAAE,CAAC;gBAC3B,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,MAAM,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACxB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IACD,SAAS,oCAAoC,CAAC,IAAkC;QAC9E,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiC,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAA,uBAAW,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,kDAAkD;YAClD,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC;YAChC,IAAG,UAAU,EAAE,MAAM,KAAK,CAAC,EAAC,CAAC;gBAC3B,MAAM,eAAe,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC5C,IAAI,eAAe,EAAE,CAAC;oBACpB,uCAAuC;oBACvC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;oBAC9C,MAAM,0BAA0B,GAAG,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC9D,IAAI,0BAA0B,EAAE,CAAC;wBAC/B,CAAC,CAAC,aAAa,GAAG,CAAC,IAAA,wBAAS,EAAC,0BAA0B,CAAC,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,UAAU,EAAE,MAAM,KAAK,CAAC,EAAC,CAAC;gBACnC,+IAA+I;gBAC/I,+EAA+E;gBAC/E,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC;gBAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC3B,MAAM,WAAW,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;gBACtD,MAAM,WAAW,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;gBACtD,MAAM,WAAW,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;gBACtD,IAAI,WAAW,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;oBAC9C,6EAA6E;oBAC7E,MAAM,yBAAyB,GAAwB,EAAE,CAAC;oBAC1D,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBACxB,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpC,CAAC,CAAC,CAAC;oBACH,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBACxB,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpC,CAAC,CAAC,CAAC;oBACH,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBACxB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;4BAChD,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACpC,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,aAAa,GAAG;wBAChB,8BAAc,CAAC,4BAA4B,CACzC,IAAA,eAAM,EAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACjD;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IAC7D,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,CAAC,CAAC,GAAG,CAAC,IAAA,yCAAqB,EAAC,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEJ,SAAgB,aAAa,CAAC,EAAU;IACtC,OAAO,8BAAc,CAAC,mBAAmB,CAAC;QACxC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;AACL,CAAC;AAJD,sCAIC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,cAAsB;IACvD,wBAAwB;IACxB,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,6BAA6B;IAC7B,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE5F,wDAAwD;IACxD,MAAM,MAAM,GAAiC,EAAE,CAAC;IAEhD,SAAS,KAAK,CAAC,IAAa;QAC1B,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7C,MAAM,UAAU,GAAwB,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,8BAAc,CAAC,mBAAmB,CAAC;gBAC9C,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAC7B,QAAQ,EAAE,SAAS;gBACnB,aAAa,EAAE,SAAS;aACzB,CAAC,CAAC;YAEH,0BAA0B;YAC1B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBAC/C,MAAM,OAAO,GAAG,8BAAc,CAAC,mBAAmB,CAAC;wBACjD,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;wBAC3B,QAAQ,EAAE,WAAW;qBACtB,CAAC,CAAC;oBACH,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;wBAClB,OAAO,CAAC,WAAW,GAAG,IAAA,yCAAsB,EAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;oBACxE,CAAC;oBACD,OAAO,OAAO,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAClF,qBAAqB;YACrB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC9B,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBACpF,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC3C,IAAI,MAAM,GAAG,IAAI,CAAC;oBAElB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBAChB,MAAM,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC9D,CAAC;yBAAM,CAAC;wBACN,MAAM,GAAG,wBAAS,CAAC;oBACrB,CAAC;oBAED,UAAU,CAAC,IAAI,CACb,iCAAiB,CAAC,mBAAmB,CAAC;wBACpC,IAAI,EAAE,YAAY;wBAClB,cAAc,EAAE,MAAM;qBACvB,CAAC,CACH,CAAC;gBACJ,CAAC;qBAAM,IAAI,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzF,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/C,MAAM,KAAK,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAChE,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;wBACnB,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,EAAC,CAAA;oBAClD,CAAC,CAAC,CAAC;oBACH,MAAM,UAAU,GACd,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACnC,MAAM,KAAK,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC;wBAC3D,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;wBACnB,OAAO,KAAK,CAAC;oBACf,CAAC,CAAC,IAAI,EAAE,CAAC;oBACX,MAAM,KAAK,GAAG,IAAA,wCAAqB,EAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACjE,IAAA,uBAAW,EAAC,KAAK,CAAC,CAAC;oBACnB,MAAM,MAAM,GAAG,8BAAc,CAAC,mBAAmB,CAAC;wBAChD,QAAQ,EAAE,UAAU;wBACpB,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,IAAI,CAAC;wBACtC,MAAM,EAAE,QAAQ;wBAChB,UAAU;wBACV,UAAU,EAAE,CAAC,KAAK,CAAC;qBACpB,CAAC,CAAC;oBAEH,UAAU,CAAC,IAAI,CACb,iCAAiB,CAAC,mBAAmB,CAAC;wBACpC,IAAI,EAAE,YAAY;wBAClB,cAAc,EAAE,MAAM;qBACvB,CAAC,CACH,CAAC;gBACJ,CAAC;qBAAM,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC/C;;;;;uBAKG;oBACH,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;oBACtC,IAAI,EAAE,IAAI,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;wBAC7E,MAAM,mBAAmB,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;wBACpD,IAAI,mBAAmB,IAAI,EAAE,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,CAAC;4BACvE,MAAM,uBAAuB,GAAG,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;4BACxE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC;4BACpC,gBAAgB;4BAChB,IACE,uBAAuB;gCACvB,uBAAuB,KAAK,GAAG,aAAa,SAAS,EACrD,CAAC;gCACD,IAAI,CAAC,UAAU,GAAG,CAAC,uBAAuB,CAAC,CAAC;4BAC9C,CAAC;iCAAM,CAAC;gCACN,OAAO,CAAC,GAAG,CACT,GAAG,aAAa,uBAAuB,uBAAuB,GAAG,CAClE,CAAC;4BACJ,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,GAAG,CAAC,8BAAc,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;QAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,CAAC;IAElB,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACxC,SAAS,UAAU,CAAC,IAAkC;QACpD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiC,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,IAAA,uBAAW,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,kDAAkD;YAClD,MAAM,eAAe,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAC5C,IAAI,eAAe,EAAE,CAAC;gBACpB,uCAAuC;gBACvC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC9C,MAAM,0BAA0B,GAAG,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC9D,IAAI,0BAA0B,EAAE,CAAC;oBAC/B,CAAC,CAAC,aAAa,GAAG,CAAC,IAAA,wBAAS,EAAC,0BAA0B,CAAC,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAnJD,gDAmJC;AAEM,MAAM,yBAAyB,GAAG,CAAC,IAAY,EAAE,cAA8B,EAAE,IAAuB,EAAE,EAAE;IACjH,MAAM,CAAC,GAAG,wBAAQ,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;IACjE,mBAAmB;IACnB,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;IACpB,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AALW,QAAA,yBAAyB,6BAKpC"}

package/out/typer/component-def-manager/component-def-manager.d.ts

@@ -2,10 +2,6 @@ import { ViewElementDefinition } from '../collectGlobalDefs';
 import { BusinessComponent, StructureProperty, TypeAnnotation, ViewComponent, ViewComponentDeclaration, ViewElement, type SyntaxNode } from '@lcap/nasl-concepts';
 import { SemEnv } from '../typer';
 import { LegacyViewComponentDef } from './legacy-extension-library';
-export type TagToComponentMap = Map<NormalizedTag, {
-    def: ViewElementDefinition;
-    debugSource?: string;
-}[]>;
 export type GeneralViewElementDefinition = ViewElementDefinition | ViewComponent | ViewComponentDeclaration;
 declare const normalizedTag: unique symbol;
 type NormalizedTag = string & {
@@ -16,12 +12,16 @@ export declare function isGeneralViewElementDefinition(def: SyntaxNode): def is
 export declare class ComponentDefManager {
     private gComponents;
     private defToTag;
+    /**
+     * 清空一切组件定义
+     */
     clearAll(): void;
     addLegacy(def: LegacyViewComponentDef, debugSource?: string): void;
     /**
-     * 覆盖业务组件的定义。若无定义则初始化。
+     * 覆盖业务组件的定义，保证一个业务组件只会有一个定义。若无定义则初始化。
      * @param bs 业务组件
      * @param def 组件定义
+     * TODO wudengke rename to addUniqueBusinessComponentDefAnd
      */
     overwriteBusinessComponentDef(bs: BusinessComponent, def: ViewElementDefinition): void;
     removeBusinessComponentDef(bs: BusinessComponent): void;
@@ -32,9 +32,13 @@ export declare class ComponentDefManager {
      * @returns
      */
     add(def: GeneralViewElementDefinition, debugSource?: string): void;
-    remove(def: ViewElementDefinition): void;
+    removeComponentGroup(def: GeneralViewElementDefinition): void;
     private clearNormalizedTag;
-    private clearTag;
+    /**
+     * 调试用: 获取所有组件定义的 key
+     * @returns
+     */
+    debugAllComponentKeys(): NormalizedTag[];
     private queryByTag;
     /**
      * 根据ViewElement，查询组件的定义(若有多个返回最先注册的一个)

package/out/typer/component-def-manager/component-def-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-def-manager.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,wBAAwB,EAAE,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAClK,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAIpE,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,aAAa,EAAE;IAAC,GAAG,EAAE,qBAAqB,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAC,EAAE,CAAC,CAAC;AACzG,MAAM,MAAM,4BAA4B,GACpC,qBAAqB,GACrB,aAAa,GACb,wBAAwB,CAAC;AAE7B,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,KAAK,aAAa,GAAG,MAAM,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAO3D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,IAAI,qBAAqB,CASrF;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,UAAU,GACd,GAAG,IAAI,4BAA4B,CAErC;AAoBD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,WAAW,CAAgC;IAEnD,OAAO,CAAC,QAAQ;IAmBhB,QAAQ;IAIR,SAAS,CAAC,GAAG,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAAE,MAAM;IAI3D;;;;OAIG;IACH,6BAA6B,CAC3B,EAAE,EAAE,iBAAiB,EACrB,GAAG,EAAE,qBAAqB;IAQ5B,0BAA0B,CAAC,EAAE,EAAE,iBAAiB;IAKhD;;;;;OAKG;IACH,GAAG,CAAC,GAAG,EAAE,4BAA4B,EAAE,WAAW,CAAC,EAAE,MAAM;IAU3D,MAAM,CAAC,GAAG,EAAE,qBAAqB;IASjC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,UAAU;IAgBlB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,EAAE,WAAW;;;;CAQnC;AAED,KAAK,uBAAuB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAK5E,cAAM,2BAA2B;IAC/B;;OAEG;IACH,OAAO,CAAC,UAAU,CAAwB;IAC1C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAwB;gBAC1B,GAAG,EAAE,qBAAqB,EAAE,GAAG,EAAE,MAAM;IAiBnD;;;;;;OAMG;IACH,OAAO,CAAC,+BAA+B;IAoEvC;;;OAGG;IACH,gBAAgB;IAGhB;;;OAGG;IACH,0BAA0B;IAG1B,2BAA2B,IAAI,uBAAuB,EAAE;CASzD"}
+{"version":3,"file":"component-def-manager.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,wBAAwB,EAAE,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAClK,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAKpE,MAAM,MAAM,4BAA4B,GACpC,qBAAqB,GACrB,aAAa,GACb,wBAAwB,CAAC;AAE7B,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,KAAK,aAAa,GAAG,MAAM,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAO3D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,IAAI,qBAAqB,CASrF;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,UAAU,GACd,GAAG,IAAI,4BAA4B,CAErC;AAoBD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,WAAW,CAAqC;IAExD,OAAO,CAAC,QAAQ;IAmBhB;;OAEG;IACH,QAAQ;IAIR,SAAS,CAAC,GAAG,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAAE,MAAM;IAI3D;;;;;OAKG;IACH,6BAA6B,CAAC,EAAE,EAAE,iBAAiB,EAAE,GAAG,EAAE,qBAAqB;IAO/E,0BAA0B,CAAC,EAAE,EAAE,iBAAiB;IAKhD;;;;;OAKG;IACH,GAAG,CAAC,GAAG,EAAE,4BAA4B,EAAE,WAAW,CAAC,EAAE,MAAM;IAU3D,oBAAoB,CAAC,GAAG,EAAE,4BAA4B;IAStD,OAAO,CAAC,kBAAkB;IAI1B;;;OAGG;IACH,qBAAqB;IAIrB,OAAO,CAAC,UAAU;IAgBlB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,EAAE,WAAW;;;;CAQnC;AAED,KAAK,uBAAuB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAK5E,cAAM,2BAA2B;IAC/B;;OAEG;IACH,OAAO,CAAC,UAAU,CAAwB;IAC1C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAwB;gBAC1B,GAAG,EAAE,qBAAqB,EAAE,GAAG,EAAE,MAAM;IAiBnD;;;;;;OAMG;IACH,OAAO,CAAC,+BAA+B;IAoEvC;;;OAGG;IACH,gBAAgB;IAGhB;;;OAGG;IACH,0BAA0B;IAG1B,2BAA2B,IAAI,uBAAuB,EAAE;CASzD"}

package/out/typer/component-def-manager/component-def-manager.js

@@ -66,6 +66,9 @@ class ComponentDefManager {
                 (0, utils_1.checkNever)(def);
         }
     }
+    /**
+     * 清空一切组件定义
+     */
     clearAll() {
         this.gComponents.clear();
     }
@@ -73,9 +76,10 @@ class ComponentDefManager {
         this.add((0, utils_1.transformLegacyViewComponentToViewElementDefinition)(def), debugSource);
     }
     /**
-     * 覆盖业务组件的定义。若无定义则初始化。
+     * 覆盖业务组件的定义，保证一个业务组件只会有一个定义。若无定义则初始化。
      * @param bs 业务组件
      * @param def 组件定义
+     * TODO wudengke rename to addUniqueBusinessComponentDefAnd
      */
     overwriteBusinessComponentDef(bs, def) {
         const tag = this.defToTag(bs);
@@ -102,16 +106,23 @@ class ComponentDefManager {
         const unifiedDef = (0, utils_1.transformGeneralViewElementDefinition)(def);
         (0, helper_1.createOnPush)(this.gComponents, tag, { def: unifiedDef, debugSource });
     }
-    remove(def) {
+    removeComponentGroup(def) {
+        if ((0, asserts_1.isViewComponentDeclaration)(def)) {
+            // ViewComponentDeclaration 的定义无需考虑。直接使用来自其他渠道的组件定义即可。
+            return;
+        }
         const tag = this.defToTag(def);
-        const list = this.gComponents.get(tag) ?? [];
-        this.gComponents.set(tag, list.filter((d) => d.def !== def));
+        this.gComponents.delete(tag);
     }
     clearNormalizedTag(tag) {
         this.gComponents.delete(tag);
     }
-    clearTag(tag) {
-        this.gComponents.delete(ComponentTagUtils.normalizeTag(tag));
+    /**
+     * 调试用: 获取所有组件定义的 key
+     * @returns
+     */
+    debugAllComponentKeys() {
+        return Array.from(this.gComponents.keys());
     }
     queryByTag(tag) {
         // 返回最先注册的一个。没有特殊的原因，返回最后一个注册的也可以。

package/out/typer/component-def-manager/component-def-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-def-manager.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-def-manager.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"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"}

package/out/typer/component-def-manager/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAgC,MAAM,4BAA4B,CAAC;AAIlG,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAG1C;AAED,wBAAgB,qCAAqC,CACnD,GAAG,EAAE,4BAA4B,GAChC,qBAAqB,CA2BvB;AAwLD,wBAAgB,mDAAmD,CACjE,GAAG,EAAE,sBAAsB,GAC1B,qBAAqB,CAEvB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAgC,MAAM,4BAA4B,CAAC;AAIlG,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAG1C;AAED,wBAAgB,qCAAqC,CACnD,GAAG,EAAE,4BAA4B,GAChC,qBAAqB,CA2BvB;AA0LD,wBAAgB,mDAAmD,CACjE,GAAG,EAAE,sBAAsB,GAC1B,qBAAqB,CAEvB"}

package/out/typer/component-def-manager/utils.js

@@ -45,14 +45,15 @@ function extractLogicTypeAsFunction(def) {
     const params = ('params' in def ? def.params : []) ?? [];
     const typeParams = ('typeParams' in def ? def.typeParams : []) ?? [];
     const returns = ('returns' in def ? def.returns : []) ?? [];
+    const allParams = [...extraParams, ...params];
     return (options) => nasl_concepts_1.TypeAnnotation.createProtoTypeOnly({
         typeKind: 'function',
         typeParams: typeParams.map(type_manager_1.tyParam2TyAnn),
-        typeArguments: [...extraParams, ...params].map(getTyOrAny),
+        typeArguments: allParams.map(getTyOrAny),
         typeNamespace: options.nsp,
         returnType: returns.map(getTyOrAny),
         id: 'placeholder',
-        fnArgs: [...extraParams, ...params].map(p => ({
+        fnArgs: allParams.map(p => ({
             name: p.name || '',
             type: getTyOrAny(p)
         }))
@@ -150,7 +151,8 @@ function transformViewComponentToViewElementDefinition(def) {
             (0, assertion_1.assertTrusy)(param.name, '参数名不能为空');
             // TODO 还有一种情况：wangEditor中存在多个param name形如"$event.value"与"$event.editor"等等。
             const renameParam = (param) => {
-                if (param.name === '$event') {
+                // HACK: 若参数名称为$event，或者只有一个参数，则命名为event
+                if (param.name === '$event' || event.params?.length === 1) {
                     param.name = 'event';
                 }
                 return param;

package/out/typer/component-def-manager/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"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"}

package/out/typer/dispatch-def.d.ts

@@ -1,6 +1,5 @@
 import { Logic, SyntaxNode, Interface, AuthInterface, OverriddenLogic, AuthLogic, AuthLogicForCallInterface, ConnectorLogic, Connector, App, Namespace, Module, ViewComponent, ViewComponentDeclaration, ProcessComponent, View, Process, ProcessV2, TypeAnnotation } from '@lcap/nasl-concepts';
 import { DefConcept } from '../reference-manager/reference-manager';
-import { TypeSubst } from './type-manager';
 import { type SemEnv } from './typer';
 import { CallableNaslLogic } from './nasl-predicate';
 export declare function dispatchDef(env: SemEnv, nd: SyntaxNode): undefined;
@@ -20,5 +19,4 @@ export declare function getAllProcessLikeFromNamespaceOrModuleOrOtherRubbish(nd:
  * 扔到 typeBindings 里。取逻辑类型优先级： quickLibType > typeBindings > resolveRef from qNameDefs 即时构造函数类型
  */
 export declare const modifyTypeOfParseAllShit: (env: SemEnv) => void;
-export declare const checkVariableAndReturnTypeAnnotations: (variables: any[], returns: any[]) => (fileNode: SyntaxNode, severity?: 'error' | 'warning') => (env: SemEnv, pSubst: TypeSubst) => void;
 //# sourceMappingURL=dispatch-def.d.ts.map

package/out/typer/dispatch-def.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch-def.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,EAIL,UAAU,EAGV,SAAS,EACT,aAAa,EACb,eAAe,EACf,SAAS,EACT,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,GAAG,EACH,SAAS,EACT,MAAM,EAEN,aAAa,EACb,wBAAwB,EACxB,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,SAAS,EAQT,cAAc,EACjB,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,UAAU,EAAqC,MAAM,wCAAwC,CAAC;AAGvG,OAAO,EAQH,SAAS,EAEZ,MAAM,gBAAgB,CAAC;AAWxB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,aAuDtD;AAqCD,eAAO,MAAM,kBAAkB,oCAAqC,CAAC,YAEtC,IAAI,GAwBlC,CAAA;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,8BA2BtE;AAQD,eAAO,MAAM,qBAAqB,QAAS,MAAM,UAAU,MAAM,iBAAiB,CAAC,KAAG,MAAM,MAAM,IAAI,CAWrG,CAAA;AAED,eAAO,MAAM,qBAAqB,WAAY,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC,SAUjG,CAAA;AA2ED,eAAO,MAAM,WAAW,QAAS,MAAM,MAAM,SAAS,SAerD,CAAA;AAGD,eAAO,MAAM,WAAW,QAAS,MAAM,MAAM,SAAS,SAiBrD,CAAA;AAGD,eAAO,MAAM,QAAQ,QAAS,MAAM,MAAM,MAAM,SAoB/C,CAAA;AAID,wBAAgB,qEAAqE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,CA6B9J;AAGD,wBAAgB,+DAA+D,CAAC,EAAE,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAClH,KAAK,CAAC,KAAK,GAAG,eAAe,GAAG,SAAS,GAAG,yBAAyB,GAAG,cAAc,CAAC,CA2B5F;AAGD,wBAAgB,iDAAiD,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GAClF,KAAK,CAAC,IAAI,GAAG,aAAa,GAAG,wBAAwB,CAAC,CAW3D;AAED,wBAAgB,oDAAoD,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GACvF,KAAK,CAAC,OAAO,GAAG,SAAS,GAAG,gBAAgB,CAAC,CAShD;AA8BD;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAAS,MAAM,SA+BnD,CAAA;AAGD,eAAO,MAAM,qCAAqC,cAClC,GAAG,EAAE,WAAW,GAAG,EAAE,gBACtB,UAAU,aAAY,OAAO,GAAG,SAAS,WAC9C,MAAM,UAAU,SAAS,SAyB9B,CAAC"}
+{"version":3,"file":"dispatch-def.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,EAIL,UAAU,EAGV,SAAS,EACT,aAAa,EACb,eAAe,EACf,SAAS,EACT,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,GAAG,EACH,SAAS,EACT,MAAM,EAEN,aAAa,EACb,wBAAwB,EACxB,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,SAAS,EAQT,cAAc,EACjB,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,UAAU,EAAqC,MAAM,wCAAwC,CAAC;AAwBvG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,aAuDtD;AAqCD,eAAO,MAAM,kBAAkB,oCAAqC,CAAC,YAEtC,IAAI,GAwBlC,CAAA;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,8BAuBtE;AAQD,eAAO,MAAM,qBAAqB,QAAS,MAAM,UAAU,MAAM,iBAAiB,CAAC,KAAG,MAAM,MAAM,IAAI,CAWrG,CAAA;AAED,eAAO,MAAM,qBAAqB,WAAY,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC,SAUjG,CAAA;AAgFD,eAAO,MAAM,WAAW,QAAS,MAAM,MAAM,SAAS,SAerD,CAAA;AAGD,eAAO,MAAM,WAAW,QAAS,MAAM,MAAM,SAAS,SAiBrD,CAAA;AAGD,eAAO,MAAM,QAAQ,QAAS,MAAM,MAAM,MAAM,SAoB/C,CAAA;AAID,wBAAgB,qEAAqE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,CA6B9J;AAGD,wBAAgB,+DAA+D,CAAC,EAAE,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAClH,KAAK,CAAC,KAAK,GAAG,eAAe,GAAG,SAAS,GAAG,yBAAyB,GAAG,cAAc,CAAC,CA2B5F;AAGD,wBAAgB,iDAAiD,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GAClF,KAAK,CAAC,IAAI,GAAG,aAAa,GAAG,wBAAwB,CAAC,CAW3D;AAED,wBAAgB,oDAAoD,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GACvF,KAAK,CAAC,OAAO,GAAG,SAAS,GAAG,gBAAgB,CAAC,CAShD;AA8BD;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAAS,MAAM,SA+BnD,CAAA"}

package/out/typer/dispatch-def.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkVariableAndReturnTypeAnnotations = exports.modifyTypeOfParseAllShit = exports.getAllProcessLikeFromNamespaceOrModuleOrOtherRubbish = exports.getAllViewLikeFromNamespaceOrModuleOrOtherRubbish = exports.getAllLogicsFromAppOrConnectorOrNamespaceOrModuleOrOtherRubbish = exports.getAllDataTypeDefsFromAppOrConnectorOrNamespaceOrModuleOrOtherRubbish = exports.tpModule = exports.tpNamespace = exports.tpConnector = exports.setParamOptionalFlags = exports.fixAllUseBeforeAssign = exports.tpLogic = exports.fixUseBeforeAssign = exports.dispatchDef = void 0;
+exports.modifyTypeOfParseAllShit = exports.getAllProcessLikeFromNamespaceOrModuleOrOtherRubbish = exports.getAllViewLikeFromNamespaceOrModuleOrOtherRubbish = exports.getAllLogicsFromAppOrConnectorOrNamespaceOrModuleOrOtherRubbish = exports.getAllDataTypeDefsFromAppOrConnectorOrNamespaceOrModuleOrOtherRubbish = exports.tpModule = exports.tpNamespace = exports.tpConnector = exports.setParamOptionalFlags = exports.fixAllUseBeforeAssign = exports.tpLogic = exports.fixUseBeforeAssign = exports.dispatchDef = void 0;
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const file_node_cache_1 = require("../utils/file-node-cache");
 const index_1 = require("./index");
@@ -161,7 +161,7 @@ const fixUseBeforeAssign = (nd) => {
                 return;
             }
             const ty = v.node.__TypeAnnotation;
-            if (ty && !(0, type_predicate_1.isTyAnnTyParam)(ty) && !(0, type_predicate_1.isAnyTy)(ty) && !(0, type_predicate_1.isNullTy)(ty)) {
+            if (ty && (0, type_predicate_1.isResolvedUserTy)(ty)) {
                 // @ts-expect-error
                 v.node.typeAnnotation = ty;
                 // @ts-expect-error
@@ -185,18 +185,14 @@ function tpLogic(env, nd) {
     env.localVars.set(nd, logicVars.map(v => v.name));
     (0, dispatch_stmt_1.tpSolvingStmts)(env, nd.body);
     (0, index_1.tpSolvingPlayground)(env, nd.playground);
-    logicVars.forEach(env.removeVar);
     env.setType(nd, (0, type_manager_1.createRefTyAnnFromDef)(nd, env));
     // 前端采用全局类型推导，因此不清空
     if (!env.isView) {
         env.unifier.clearAll();
+        // 先这样 fix：不然这个检查会留到下次 typing Start 节点时跑，很诡异……
+        env.runPostChecks(subster_1.emptySubst);
     }
-    if (nd.nodePath?.startsWith('app.logics')) {
-        const postChk = (0, exports.checkVariableAndReturnTypeAnnotations)(nd.variables ?? [], nd.returns);
-        env.addPostCheckTask(nd, postChk(env.getCurFileNode(), env.errSeverity));
-    }
-    // 先这样 fix：不然这个检查会留到下次 typing Start 节点时跑，很诡异……
-    !env.isView && env.runPostChecks(subster_1.emptySubst);
+    logicVars.forEach(env.removeVar);
     return env.getRawType(nd);
 }
 exports.tpLogic = tpLogic;
@@ -230,7 +226,13 @@ const setParamOptionalFlags = (logics) => {
     }
 };
 exports.setParamOptionalFlags = setParamOptionalFlags;
+/**
+ * 检查变量和返回值的类型
+ * @param env
+ * @param nd
+ */
 function tpVariable(env, nd) {
+    env.allRefsInPlayground.add(nd);
     (0, index_1.createOnPush)(env.nameBindings, nd.name, nd); // 当前 namespace 为 '' 或 undefined
     const varTy = nd.typeAnnotation ?? env.unifier.nextFreshTyAnn('free');
     if (nd.defaultValue) {
@@ -250,14 +252,13 @@ function tpFrontendVariable(env, nd) {
     (0, dispatch_expr_1.dispatchExpr)(env, nd.defaultValue, nd.typeAnnotation);
     env.setType(nd, nd.typeAnnotation);
 }
-// 函数的"返回"，类似变量，不是语句。
 function tpReturn(env, nd) {
-    (0, index_1.createOnPush)(env.nameBindings, nd.name, nd); // 当前 namespace 为 '' 或 undefined
-    const ty = nd.typeAnnotation ?? env.unifier.nextFreshTyAnn('free');
-    env.setType(nd, ty);
-    (0, dispatch_expr_1.dispatchExpr)(env, nd.defaultValue, env.getRawType(nd)); // nd.typeAnnotation 优先
+    return tpVariable(env, nd);
 }
 function tpParam(env, nd) {
+    if (nd.concept !== 'InterfaceParam') {
+        env.allRefsInPlayground.add(nd);
+    }
     (0, index_1.createOnPush)(env.nameBindings, nd.name, nd); // 当前 namespace 为 '' 或 undefined
     env.setType(nd, nd.typeAnnotation); // 也能推，暂时不推了 ?? env.unifier.nextFreshTyAnn('free');
     (0, dispatch_expr_1.dispatchExpr)(env, nd.defaultValue, env.getRawType(nd)); // nd.typeAnnotation 优先
@@ -473,33 +474,4 @@ const modifyTypeOfParseAllShit = (env) => {
     env.typeBindings.set(parseAllShitLogic, logicTy);
 };
 exports.modifyTypeOfParseAllShit = modifyTypeOfParseAllShit;
-const checkVariableAndReturnTypeAnnotations = (variables, returns) => (fileNode, severity = 'error') => (env, pSubst) => {
-    for (const v of variables) {
-        if (v.typeAnnotation)
-            continue;
-        const tyAnn = env.getType(v);
-        if ((0, type_predicate_1.isVoidTy)(tyAnn)) {
-            env.addError(`局部变量 ${v.name} 必须赋值有返回值的内容`, fileNode, v, severity);
-            v.__TypeAnnotation = undefined;
-        }
-        else if (!(0, type_predicate_1.isResolvedUserTy)(tyAnn)) {
-            env.addError(`局部变量 ${v.name} 未设置类型或未赋值。直接赋值系统可以自动推断类型`, fileNode, v, severity);
-            v.__TypeAnnotation = undefined;
-        }
-    }
-    for (const r of returns) {
-        if (r.typeAnnotation)
-            continue;
-        const tyAnn = env.getType(r);
-        if ((0, type_predicate_1.isVoidTy)(tyAnn)) {
-            env.addError(`输出参数 ${r.name} 必须赋值有返回值的内容`, fileNode, r, severity);
-            r.__TypeAnnotation = undefined;
-        }
-        else if (!(0, type_predicate_1.isResolvedUserTy)(tyAnn)) {
-            env.addError(`输出参数 ${r.name} 未设置类型或未赋值。直接赋值系统可以自动推断类型`, fileNode, r, severity);
-            r.__TypeAnnotation = undefined;
-        }
-    }
-};
-exports.checkVariableAndReturnTypeAnnotations = checkVariableAndReturnTypeAnnotations;
 //# sourceMappingURL=dispatch-def.js.map