@karibulab/wsdl2tsx 0.26.0 → 0.28.0

package/dist/cli.js

@@ -24048,14 +24048,17 @@ function prepareTags(key, elementObject, namespacesTypeMapping, baseNamespacePre
   const tagLocalName = extractLocalName(key);
   const tagCamelCase = toCamelCase2(tagLocalName);
   const isQualified = shouldHavePrefix(elementObject);
-  const openTag = isQualified ? `<${namespacePrefix}.${tagLocalName}>` : `<xml.${tagLocalName}>`;
-  const closeTag = isQualified ? `</${namespacePrefix}.${tagLocalName}>` : `</xml.${tagLocalName}>`;
+  const openTag = isQualified ? `<${namespacePrefix}.${tagLocalName}>` : `<${tagLocalName}>`;
+  const closeTag = isQualified ? `</${namespacePrefix}.${tagLocalName}>` : `</${tagLocalName}>`;
   if (tagUsageCollector && isQualified) {
     tagUsageCollector.tagToPrefix.set(tagLocalName, namespacePrefix);
     if (prefixesMapping && prefixesMapping[namespacePrefix]) {
       tagUsageCollector.prefixToNamespace.set(namespacePrefix, prefixesMapping[namespacePrefix]);
     }
   }
+  if (tagUsageCollector && !isQualified) {
+    tagUsageCollector.unqualifiedTags.add(tagLocalName);
+  }
   return {
     namespacePrefix,
     tagLocalName,
@@ -24181,8 +24184,11 @@ function generateReferenceWrapper(referencedType, elementObject, key, tagLocalNa
       }
     }
     const wrapperIsQualified = referencedElement.$qualified !== false;
-    const wrapperOpenTag = wrapperIsQualified ? `<${wrapperNamespacePrefix}.${tagLocalName}>` : `<xml.${tagLocalName}>`;
-    const wrapperCloseTag = wrapperIsQualified ? `</${wrapperNamespacePrefix}.${tagLocalName}>` : `</xml.${tagLocalName}>`;
+    const wrapperOpenTag = wrapperIsQualified ? `<${wrapperNamespacePrefix}.${tagLocalName}>` : `<${tagLocalName}>`;
+    const wrapperCloseTag = wrapperIsQualified ? `</${wrapperNamespacePrefix}.${tagLocalName}>` : `</${tagLocalName}>`;
+    if (tagUsageCollector && !wrapperIsQualified) {
+      tagUsageCollector.unqualifiedTags.add(tagLocalName);
+    }
     if (tagUsageCollector && wrapperIsQualified) {
       tagUsageCollector.tagToPrefix.set(tagLocalName, wrapperNamespacePrefix);
       if (prefixesMapping && prefixesMapping[wrapperNamespacePrefix]) {
@@ -24275,7 +24281,7 @@ function generateReferenceWrapper(referencedType, elementObject, key, tagLocalNa
 }
 
 // src/codegen/xml-generator/xml-property/array-property.ts
-function generateArrayPropertyCode(elementObject, keys, openTag, closeTag, propertyPath, currentPropertyPath, namespacesTypeMapping, baseNamespacePrefix, key, isQualified, prefixesMapping, schemaObject, allComplexTypes) {
+function generateArrayPropertyCode(elementObject, keys, openTag, closeTag, propertyPath, currentPropertyPath, namespacesTypeMapping, baseNamespacePrefix, key, isQualified, prefixesMapping, schemaObject, allComplexTypes, tagUsageCollector) {
   const nestedProperties = keys.map((elementKey) => {
     const nestedElement = elementObject.type[elementKey];
     if (typeof nestedElement === "object" && nestedElement !== null) {
@@ -24292,7 +24298,8 @@ function generateArrayPropertyCode(elementObject, keys, openTag, closeTag, prope
           isQualified,
           prefixesMapping,
           schemaObject,
-          allComplexTypes
+          allComplexTypes,
+          tagUsageCollector
         );
       } else {
         const nestedTagLocalName = extractLocalName(elementKey);
@@ -24309,7 +24316,10 @@ function generateArrayPropertyCode(elementObject, keys, openTag, closeTag, prope
           );
           return `<${nestedNamespacePrefix}.${nestedTagLocalName}>{item.${nestedTagCamelCase}}</${nestedNamespacePrefix}.${nestedTagLocalName}>`;
         } else {
-          return `<xml.${nestedTagLocalName}>{item.${nestedTagCamelCase}}</xml.${nestedTagLocalName}>`;
+          if (tagUsageCollector) {
+            tagUsageCollector.unqualifiedTags.add(nestedTagLocalName);
+          }
+          return `<${nestedTagLocalName}>{item.${nestedTagCamelCase}}</${nestedTagLocalName}>`;
         }
       }
     }
@@ -24366,7 +24376,8 @@ function routeByType(elementObject, keys, isArray2, openTag, closeTag, propertyP
       isQualified,
       prefixesMapping,
       schemaObject,
-      allComplexTypes
+      allComplexTypes,
+      tagUsageCollector
     );
   } else {
     return generateComplexPropertyCode(
@@ -24620,8 +24631,11 @@ function processStringElement(element, key, propsInterfaceName, namespacesTypeMa
               prefixesMapping
             );
             const isQualified = shouldHavePrefix(referencedElement);
-            const wrapperOpenTag = isQualified ? `<${namespacePrefix2}.${keyLocalName3}>` : `<xml.${keyLocalName3}>`;
-            const wrapperCloseTag = isQualified ? `</${namespacePrefix2}.${keyLocalName3}>` : `</xml.${keyLocalName3}>`;
+            const wrapperOpenTag = isQualified ? `<${namespacePrefix2}.${keyLocalName3}>` : `<${keyLocalName3}>`;
+            const wrapperCloseTag = isQualified ? `</${namespacePrefix2}.${keyLocalName3}>` : `</${keyLocalName3}>`;
+            if (tagUsageCollector && !isQualified) {
+              tagUsageCollector.unqualifiedTags.add(keyLocalName3);
+            }
             return `${wrapperOpenTag}
     ${nestedProperties}
 ${wrapperCloseTag}`;
@@ -24880,7 +24894,8 @@ function extractAllNamespaceMappings(baseTypeName, baseTypeObject, schemaObject,
   }
   const tagUsageCollector = {
     tagToPrefix: /* @__PURE__ */ new Map(),
-    prefixToNamespace: /* @__PURE__ */ new Map()
+    prefixToNamespace: /* @__PURE__ */ new Map(),
+    unqualifiedTags: /* @__PURE__ */ new Set()
   };
   generateXmlBodyCode(
     baseNamespacePrefix,
@@ -24934,10 +24949,12 @@ function extractAllNamespaceMappings(baseTypeName, baseTypeObject, schemaObject,
     }
   }
   Object.assign(tagsMapping, newTagsMapping);
+  const unqualifiedTags = Array.from(tagUsageCollector.unqualifiedTags).sort();
   return {
     tagsMapping,
     prefixesMapping,
-    typesMapping
+    typesMapping,
+    unqualifiedTags
   };
 }
 
@@ -26211,7 +26228,7 @@ function prepareTypesForInterfaces(requestTypeObject, headersInfo, allTypesForIn
 }
 
 // src/codegen/data-preparer/template-data.ts
-function prepareTemplateData(requestType, requestTypeObject, namespacesTagsMapping, namespacesPrefixMapping, namespacesTypeMapping, soapNamespaceURI, baseNamespacePrefix, allTypesForInterfaces, schemaObject, allComplexTypes, headersInfo, responseType, responseTypeObject, responseAllTypesForInterfaces) {
+function prepareTemplateData(requestType, requestTypeObject, namespacesTagsMapping, namespacesPrefixMapping, namespacesTypeMapping, soapNamespaceURI, baseNamespacePrefix, allTypesForInterfaces, schemaObject, allComplexTypes, headersInfo, responseType, responseTypeObject, responseAllTypesForInterfaces, unqualifiedTags) {
   const simpleTypes = prepareSimpleTypesData(requestTypeObject, XML_SCHEMA_URI);
   const propsInterface = preparePropsInterfaceData(requestType, requestTypeObject, allTypesForInterfaces, schemaObject, allComplexTypes);
   const typesForInterfaces = requestTypeObject;
@@ -26305,6 +26322,7 @@ function prepareTemplateData(requestType, requestTypeObject, namespacesTagsMappi
   return {
     requestType: requestTypeLocalName,
     namespaces: filteredNamespaces,
+    unqualifiedTags: unqualifiedTags && unqualifiedTags.length > 0 ? unqualifiedTags : void 0,
     simpleTypes,
     propsInterface,
     interfaces,
@@ -26534,6 +26552,7 @@ function processOperation(operationNode, definitionsNode, schemaObject, allCompl
   const namespacesTagsMapping = namespaceMappings.tagsMapping;
   const namespacesPrefixMapping = namespaceMappings.prefixesMapping;
   const namespacesTypeMapping = namespaceMappings.typesMapping;
+  const unqualifiedTags = namespaceMappings.unqualifiedTags;
   const baseNamespacePrefix = namespacesTypeMapping[requestType].prefix;
   let responseType;
   let responseTypeObject;
@@ -26608,8 +26627,9 @@ function processOperation(operationNode, definitionsNode, schemaObject, allCompl
     // Pasar tipo de respuesta si existe
     responseTypeObject,
     // Pasar objeto de tipo de respuesta si existe
-    responseAllTypesForInterfaces
+    responseAllTypesForInterfaces,
     // Pasar tipos referenciados del response
+    unqualifiedTags
   );
   const generatedCode = compileTemplate(templateData);
   const typeNameForFile = opName;

package/dist/templates/component.hbs

@@ -1,4 +1,4 @@
-import { soap, ns, xml } from "@karibulab/wsdl2tsx-runtime";
+import { soap, ns } from "@karibulab/wsdl2tsx-runtime";
 
 {{#each namespaces}}
 const {{@key}} = ns("{{@key}}", [{{tagNamesArray this}}] as const);
@@ -31,6 +31,11 @@ export interface {{pascalCase responseType}}Props {
 {{/if}}
 
 export function {{pascalCase requestType}}(props: {{pascalCase requestType}}Props) {
+{{#if unqualifiedTags}}
+{{#each unqualifiedTags}}
+    const {{this}} = () => "{{this}}";
+{{/each}}
+{{/if}}
     return <soap.Envelope xmlns:soap="{{soapNamespaceURI}}"
     {{xmlnsAttributes xmlnsAttributes}}>
     <soap.Header>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karibulab/wsdl2tsx",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "description": "Generador de código TSX desde archivos WSDL",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -13,7 +13,7 @@
     "start": "node dist/cli.js"
   },
   "dependencies": {
-    "@karibulab/wsdl2tsx-runtime": "0.26.0",
+    "@karibulab/wsdl2tsx-runtime": "0.28.0",
     "axios": "^1.7.9",
     "fast-xml-parser": "5.3.3",
     "handlebars": "4.7.8"