@lcap/nasl 3.8.0-beta.3 → 3.8.0-beta.5

package/out/concepts/ViewElement__.js

@@ -956,30 +956,42 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
         code += (0, translator_1.indent)((state?.tabSize || 0) + 2);
         let levelIndex = parentLevel || 0;
         code += `${self.name}: () => {\n`;
-        const getType = (name) => {
-            let t;
+        const getMultipleDefaultValue = (name) => {
+            let v = 'new nasl.core.BooleanFalse()';
             const attr = self.bindAttrs?.find((attr) => attr.name === name);
             if (['static', 'string'].includes(attr?.type)) {
-                t = attr.value ? 'true' : 'false';
+                v = attr.value ? 'new nasl.core.BooleanTrue()' : 'new nasl.core.BooleanFalse()';
             }
-            else if (['dynamic'].includes(attr?.type)) {
-                t = 'nasl.core.Boolean';
-            }
-            else {
-                t = false;
+            return v;
+        };
+        const getConverterDefaultValue = (name) => {
+            let v = 'new nasl.core.StringLiteral<\`\`>()';
+            const attr = self.bindAttrs?.find((attr) => attr.name === name);
+            if (['static', 'string'].includes(attr?.type)) {
+                if ([true, 'true'].includes(attr.value)) {
+                    v = 'new nasl.core.BooleanTrue()';
+                }
+                else if ([false, 'false'].includes(attr.value)) {
+                    v = 'new nasl.core.BooleanFalse()';
+                }
+                else {
+                    v = `new nasl.core.StringLiteral<\`${attr.value}\`>()`;
+                }
             }
-            return t;
+            return v;
         };
-        const hasDataSource = config_1.config?.allNodesAPI?.[self.tag]?.props?.findIndex((prop) => ['dataSource', 'data-source'].includes(prop.name)) >
-            -1;
+        const hasDataSource = config_1.config?.allNodesAPI?.[self.tag]?.props?.findIndex((prop) => ['dataSource', 'data-source'].includes(prop.name)) > -1;
+        let dataSourceSetted = false;
+        let staticItem = '';
         // 有数据源属性的组件 才需要生成 item
         if (hasDataSource && T) {
             const key = T1 ? '__columnItem' : '__item';
             const dataSourceAttr = self.bindAttrs?.find((attr) => attr.name === 'dataSource');
             if (dataSourceAttr?.expression) {
+                dataSourceSetted = true;
                 if (asserts.isMemberExpression(dataSourceAttr.expression) ||
                     asserts.isIdentifier(dataSourceAttr.expression) ||
-                    asserts.isCallLogic(dataSourceAttr.expression)) {
+                    (asserts.isCallLogic(dataSourceAttr.expression) && !dataSourceAttr.expression?.calleeNamespace?.startsWith('extensions'))) {
                     const value = yield* dataSourceAttr.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, dataSourceAttr.expression.concept === 'CallLogic'
                         ? {
                             tabSize: 4,
@@ -1025,41 +1037,83 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
                 }
             }
             else {
-                code += `let ${key}: any;\n`;
+                // 根据静态子节点生成类型
+                const attrs = {
+                    'u-checkbox': 'label',
+                    'u-radio': 'label',
+                    'van-radio': 'name',
+                    'van-checkbox': 'label',
+                };
+                const child = self.children?.filter((item) => item.tag !== 'template')[0];
+                if (child) {
+                    const valueAttr = child.bindAttrs?.find((attr) => attr.name === (attrs[child.tag] || 'value'));
+                    if (valueAttr) {
+                        // 开启了绑定
+                        if (valueAttr.expression) {
+                            const attrCode = yield* valueAttr.expression.toEmbeddedTS((0, translator_1.shiftState)(state, '', { tabSize: 0 }));
+                            staticItem = `${attrCode}`;
+                        }
+                        else {
+                            try {
+                                if (valueAttr.type === 'static') {
+                                    const value = json5.parse(valueAttr.value);
+                                    const map = {
+                                        'string': 'new nasl.core.String("")',
+                                        'number': 'new nasl.core.Long(1)',
+                                        'boolean': 'new nasl.core.Boolean(false)',
+                                    };
+                                    staticItem = map[typeof value] || 'new nasl.core.String("")';
+                                }
+                                else {
+                                    staticItem = 'new nasl.core.String("")';
+                                }
+                            }
+                            catch (error) {
+                                // @ts-ignore
+                            }
+                        }
+                    }
+                    else {
+                        staticItem = 'new nasl.core.String("")';
+                    }
+                }
+                code += `let __staticItem = ${staticItem};\n`;
+                code += `let ${key}: typeof __staticItem;\n`;
             }
         }
         // 值
         let valueType;
         if (hasDataSource && V && !T1) {
             const valueFieldAttr = self.bindAttrs?.find((attr) => attr.name === 'valueField');
-            if (['static', 'string'].includes(valueFieldAttr?.type)) {
+            if (dataSourceSetted && ['static', 'string'].includes(valueFieldAttr?.type)) {
                 valueType = `typeof __item.${valueFieldAttr.value}`;
             }
             else {
-                valueType = 'any';
+                valueType = `typeof __staticItem`;
             }
         }
         // 分页
-        let pageableType;
+        let pageableDefaultValue;
         if (hasDataSource && P && !T1) {
-            pageableType = getType('pageable');
-            code += `let __pageable: ${pageableType};\n`;
+            pageableDefaultValue = getMultipleDefaultValue('pageable');
+            code += `let __pageable = ${pageableDefaultValue};\n`;
         }
         // 多选
-        let multipleType;
+        let multipleDefaultValue;
         if (hasDataSource && M && !T1) {
-            multipleType = getType('multiple');
-            code += `let __multiple: ${multipleType};\n`;
+            multipleDefaultValue = getMultipleDefaultValue('multiple');
+            code += `let __multiple = ${multipleDefaultValue};\n`;
         }
         if (hasDataSource && V && !T1) {
             code += `// @ts-ignore
-      let __value: ${valueType}${[true, 'true'].includes(multipleType) ? '[]' : ''};\n`;
+      let __value: typeof __multiple extends nasl.core.BooleanTrue ? ${valueType}[] : ${valueType};\n`;
             code += `// @ts-ignore
       let __V: ${valueType};\n`;
         }
+        let converterDefaultValue;
         if (C) {
-            // code += `let converter: ${getType('converter')};\n`;
-            code += `let __converter: any;\n`;
+            converterDefaultValue = getConverterDefaultValue('converter');
+            code += `let __converter = ${converterDefaultValue};\n`;
         }
         if (self.tag === 'template' && self.haveScope() && asserts.isViewElement(self.parentNode)) {
             const currentType = self.parentNode.tag === 'u-table-view-column-dynamic' ? 'CurrentDynamic' : 'Current';
@@ -1327,11 +1381,9 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
             if (shouldFilter) {
                 return;
             }
-            let attrCode = yield* attr.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 1 }));
+            let attrCode = yield* attr.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 1 }), { carryName: true });
             if (attrCode.trim()) {
-                const humpName = self.toHump(attr.name);
-                code += `${humpName}: `;
-                attrCode = yield* attr.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 1 }));
+                attrCode = yield* attr.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: 1 }), { carryName: true });
                 code += attrCode;
                 code += `,\n`;
             }
@@ -1412,7 +1464,8 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
                 const param = hasScope ? `current${levelIndex === 0 ? '' : levelIndex}` : '';
                 const levelIndexDelta = Number(hasScope);
                 code += `slotDefault: (${param}) => [\n`;
-                yield* (0, time_slicing_1.wrapForEachToGenerator)(children, function* warpForEachGenerator(element) {
+                const defaultArr = self.shouldHandleChildren(self) ? children : [];
+                yield* (0, time_slicing_1.wrapForEachToGenerator)(defaultArr, function* warpForEachGenerator(element) {
                     code += yield* element.toEmbeddedTS((0, translator_1.shiftState)(state, code, {
                         tabSize: (state?.tabSize || 0) + 2,
                     }), levelIndex + levelIndexDelta);
@@ -1433,6 +1486,25 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
         }
         return code;
     }
+    shouldHandleChildren(element) {
+        // 数据源与静态子节点不共存的组件
+        const tags = [
+            'u-tabs',
+            'u-selectable-steps',
+            'van-swipe',
+            'van-steps',
+        ]; // 数据源与静态子节点不共存的组件
+        // 判断当前是否配置了数据源
+        const isDataSourceConfigured = () => element.bindAttrs.some((attr) => {
+            if (['data-source', 'dataSource'].includes(attr.name)) {
+                if (attr.type === 'dynamic' && attr.expression) {
+                    return true;
+                }
+            }
+            return false;
+        });
+        return !tags.includes(element.tag) || !isDataSourceConfigured();
+    }
     toNaturalTS(state = (0, translator_1.createCompilerState)(), parentLevel) {
         let code = '';
         code += `$refs.${this.name} = new ${(0, utils_1.kebab2Camel)(this.tag)}({\n`;
@@ -1527,6 +1599,7 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
                         code += element.toTextualNASL((0, translator_1.shiftState)(state, code, {
                             tabSize: state.tabSize + 2,
                         }));
+                        code += ',\n';
                     });
                     code += `${(0, translator_1.indent)(state.tabSize + 1)}] },\n`;
                 }
@@ -1536,15 +1609,13 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
             });
             // 翻译其余的子集
             if (defaultArr.length) {
-                throw new Error('多个插槽必须都在 template 内');
-                // defaultArr.forEach((element) => {
-                //   code += element.toTextualNASL(
-                //     shiftState(state, code, {
-                //       tabSize: state.tabSize,
-                //     }),
-                //     // levelIndex,
-                //   );
-                // });
+                // throw new Error('多个插槽必须都在 template 内');
+                defaultArr.forEach((element) => {
+                    code += element.toTextualNASL((0, translator_1.shiftState)(state, code, {
+                        tabSize: state.tabSize,
+                    }));
+                    code += ',\n';
+                });
             }
         }
         else {
@@ -2227,7 +2298,7 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
                     }
                 });
             }
-            if (options?.isExport &&
+            if ((options?.isExport || options?.isRelease) &&
                 attr?.concept === 'BindAttribute' &&
                 attr?.name === 'src' &&
                 /^\/assets\/(.*?)$/.test(attr?.value) &&
@@ -2264,7 +2335,6 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
                         argsList,
                         dataRefList,
                     };
-                    // debugger
                     // 所有参数序列化之后当字符串传进指令参数 （目前不支持<div v-demo="{ color: 'white', text: 'hello!' }"></div>
                     let expression = StringLiteral__1.StringLiteral.from({
                         concept: 'StringLiteral',
@@ -2294,21 +2364,23 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
                 ve?.bindAttrs?.find((attr) => {
                     let type = attr?.expression?.object?.__TypeAnnotation;
                     if (type) {
-                        console.log('type: ', type);
                         let { typeKind, typeName, typeNamespace } = type || {};
-                        // todo 这里可能不是匿名数据结构吗
                         if (typeKind === 'anonymousStructure') {
                             let parent = this.getAncestorByTag('ViewElement', 'u-table-view') ||
                                 this.getAncestorByTag('ViewElement', 'u-list-view') ||
                                 this.getAncestorByTag('ViewElement', 'u-grid-view') ||
                                 this.getAncestorByTag('ViewElement', 'van-grid-view') ||
                                 this.getAncestorByTag('ViewElement', 'van-list-view');
-                            if (parent?.tag) {
+                            let canAdd = parent?.tag;
+                            if (isGridViewLayout || isListViewLayout) {
+                                let nestLinearLayout = this.children.find(c => c.tag === 'u-linear-layout');
+                                canAdd = canAdd && !nestLinearLayout;
+                            }
+                            if (canAdd) {
                                 let dataSourceAttr = parent?.bindAttrs?.find((it) => it?.name === 'dataSource');
                                 if (dataSourceAttr?.expression?.concept === 'CallLogic') {
                                     if (dataSourceAttr?.expression?.calleeNamespace === 'app.logics') {
                                         logicName = dataSourceAttr?.expression?.calleeName;
-                                        //  debugger
                                         let ref = {
                                             typeNamespace: 'app.logics',
                                             typeName: logicName,
@@ -2345,11 +2417,15 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
             const addDataRefDriective = (ve) => {
                 ve?.bindAttrs?.find((attr) => {
                     let type = attr?.expression?.object?.__TypeAnnotation;
-                    if (type) {
+                    let canAdd = type;
+                    if (isGridViewLayout || isListViewLayout) {
+                        let nestLinearLayout = this.children.find(c => c.tag === 'u-linear-layout');
+                        canAdd = canAdd && !nestLinearLayout;
+                    }
+                    if (canAdd) {
                         let { typeKind, typeName, typeNamespace } = type || {};
                         if (typeKind === 'reference' && typeNamespace) {
                             let entityPropName = attr?.expression?.property?.name;
-                            // debugger;
                             let ref = {
                                 typeNamespace,
                                 typeName,
@@ -2488,7 +2564,14 @@ let ViewElement = ViewElement_1 = class ViewElement extends Annotatable__1.defau
      * 从父级删除该节点
      * @internal
      */
-    delete() { }
+    delete() {
+        super.delete();
+        if (this.parentNode) {
+            this.traverseChildren((ele) => {
+                this.likeComponent?.removeExistingViewElement(ele);
+            });
+        }
+    }
     findElementByName(name) {
         return utils.traverse((current) => {
             if (current.node.name === name)