fix(core): incorrect ids export

Author: HoyosJuan

packages/core/src/openbim/IDSSpecifications/index.ts

@@ -196,22 +196,22 @@ export class IDSSpecifications extends Component {
     specifications: Iterable<IDSSpecification> = this.list.values(),
   ) {
     const _specifications = specifications ?? this.list;
-    const xml = `<ids:ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd" xmlns:ids="http://standards.buildingsmart.org/IDS">
+    const xml = `<ids xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd" xmlns:ids="http://standards.buildingsmart.org/IDS">
   <!-- Made with That Open Engine ${Components.release} (https://github.com/thatopen/engine_components) -->
-  <ids:info>
-    <ids:title>${info.title}</ids:title>
-    ${info.copyright ? `<ids:copyright>${info.copyright}</ids:copyright>` : ""}
-    ${info.version ? `<ids:version>${info.version}</ids:version>` : ""}
-    ${info.description ? `<ids:description>${info.description}</ids:description>` : ""}
-    ${info.author ? `<ids:author>${info.author}</ids:author>` : ""}
-    ${info.date ? `<ids:date>${info.date.toISOString().split("T")[0]}</ids:date>` : ""}
-    ${info.purpose ? `<ids:purpose>${info.purpose}</ids:purpose>` : ""}
-    ${info.milestone ? `<ids:milestone>${info.milestone}</ids:milestone>` : ""}
-  </ids:info>
-  <ids:specifications>
+  <info>
+    <title>${info.title}</title>
+    ${info.copyright ? `<copyright>${info.copyright}</copyright>` : ""}
+    ${info.version ? `<version>${info.version}</version>` : ""}
+    ${info.description ? `<description>${info.description}</description>` : ""}
+    ${info.author ? `<author>${info.author}</author>` : ""}
+    ${info.date ? `<date>${info.date.toISOString().split("T")[0]}</date>` : ""}
+    ${info.purpose ? `<purpose>${info.purpose}</purpose>` : ""}
+    ${info.milestone ? `<milestone>${info.milestone}</milestone>` : ""}
+  </info>
+  <specifications>
     ${[..._specifications].map((spec) => spec.serialize()).join("\n")}
-  </ids:specifications>
-</ids:ids>`;
+  </specifications>
+</ids>`;
 
     return xml;
   }

packages/core/src/openbim/IDSSpecifications/src/Specification.ts

@@ -113,14 +113,14 @@ export class IDSSpecification implements IDSSpecificationData {
       ? `instructions="${this.instructions}"`
       : "";
 
-    const xml = `<ids:specification ifcVersion="${[...this.ifcVersion].join(" ")}" ${name} ${identifier} ${description} ${instructions}>
-      <ids:applicability minOccurs="1" maxOccurs="unbounded">
-        ${[...this.applicability].map((facet) => facet.serialize("applicability"))}
-      </ids:applicability>
-      <ids:requirements>
-        ${[...this.requirements].map((facet) => facet.serialize("requirement"))}
-      </ids:requirements>
-    </ids:specification>`;
+    const xml = `<specification ifcVersion="${[...this.ifcVersion].join(" ")}" ${name} ${identifier} ${description} ${instructions}>
+      <applicability minOccurs="1" maxOccurs="unbounded">
+        ${[...this.applicability].map((facet) => facet.serialize("applicability")).join("\n")}
+      </applicability>
+      <requirements>
+        ${[...this.requirements].map((facet) => facet.serialize("requirement")).join("\n")}
+      </requirements>
+    </specification>`;
     return xml;
   }
 }

packages/core/src/openbim/IDSSpecifications/src/exporters/parameter.ts

@@ -6,14 +6,15 @@ export const getParameterXML = (
 ) => {
   let parameterXML = "";
   if (!parameter) return parameterXML;
+
   if (parameter.type === "simple") {
-    parameterXML = `<ids:simpleValue>${parameter.parameter}</ids:simpleValue>`;
+    parameterXML = `<simpleValue>${parameter.parameter}</simpleValue>`;
   }
 
   if (parameter.type === "enumeration") {
     const value = parameter.parameter;
     parameterXML = `<xs:restriction base="xs:string">
-    ${value.map((v) => `<xs:enumeration value="${v}" />`).join("\r\n")}
+    ${value.map((v) => `<xs:enumeration value="${v}" />`).join("\n")}
     </xs:restriction>`;
   }
 
@@ -24,9 +25,51 @@ export const getParameterXML = (
     </xs:restriction>`;
   }
 
-  const xml = `<ids:${name[0].toLowerCase() + name.slice(1)}>
+  if (parameter.type === "bounds") {
+    const { min, minInclusive, max, maxInclusive } = parameter.parameter;
+    let minTag = "";
+    if (min !== undefined) {
+      minTag = `<xs:min${minInclusive ? "Inclusive" : "Exclusive"} value="${min}">`;
+    }
+
+    let maxTag = "";
+    if (max !== undefined) {
+      maxTag = `<xs:max${maxInclusive ? "Inclusive" : "Exclusive"} value="${max}">`;
+    }
+
+    parameterXML = `<xs:restriction base="xs:double">
+      ${minTag}
+      ${maxTag}
+    </xs:restriction>`;
+  }
+
+  if (parameter.type === "length") {
+    const { length, min, max } = parameter.parameter;
+    let lengthTag = "";
+    if (length !== undefined && min === undefined && max === undefined) {
+      lengthTag = `<xs:length value="${length}" />`;
+    }
+
+    let minTag = "";
+    if (min !== undefined && length === undefined) {
+      minTag = `<xs:minLength value="${min}" />`;
+    }
+
+    let maxTag = "";
+    if (max !== undefined && length === undefined) {
+      maxTag = `<xs:maxLength value="${max}" />`;
+    }
+
+    parameterXML = `<xs:restriction base="xs:string">
+      ${lengthTag}
+      ${minTag}
+      ${maxTag}
+    </xs:restriction>`;
+  }
+
+  const xml = `<${name[0].toLowerCase() + name.slice(1)}>
     ${parameterXML}
-  </ids:${name[0].toLowerCase() + name.slice(1)}>`;
+  </${name[0].toLowerCase() + name.slice(1)}>`;
 
   return xml;
 };

packages/core/src/openbim/IDSSpecifications/src/facets/Attribute.ts

@@ -26,10 +26,10 @@ export class IDSAttribute extends IDSFacet {
         ? `instructions="${this.instructions}"`
         : "";
     }
-    return `<ids:attribute ${attributes}>
+    return `<attribute ${attributes}>
   ${nameXML}
   ${valueXML}
-</ids:attribute>`;
+</attribute>`;
   }
 
   // This can be very ineficcient as we do not have an easy way to get an entity based on an attribute

packages/core/src/openbim/IDSSpecifications/src/facets/Classification.ts

@@ -30,10 +30,10 @@ export class IDSClassification extends IDSFacet {
         ? `instructions="${this.instructions}"`
         : "";
     }
-    return `<ids:classification ${attributes}>
+    return `<classification ${attributes}>
   ${systemXML}
   ${valueXML}
-</ids:classification>`;
+</classification>`;
   }
 
   async getEntities(

packages/core/src/openbim/IDSSpecifications/src/facets/Entity.ts

@@ -27,10 +27,10 @@ export class IDSEntity extends IDSFacet {
         ? `instructions="${this.instructions}"`
         : "";
     }
-    return `<ids:entity ${attributes}>
+    return `<entity ${attributes}>
   ${nameXML}
   ${predefinedTypeXML}
-</ids:entity>`;
+</entity>`;
   }
 
   // IFCSURFACESTYLEREFRACTION is not present in the FragmentsGroup

packages/core/src/openbim/IDSSpecifications/src/facets/Material.ts

@@ -10,7 +10,7 @@ export class IdsMaterialFacet extends IDSFacet {
   uri?: string;
 
   serialize(type: "applicability" | "requirement") {
-    if (!(this.value && this.uri)) return "<ids:material />";
+    if (!(this.value && this.uri)) return "<material />";
     const valueXML = getParameterXML("Value", this.value);
     let attributes = "";
     if (type === "requirement") {
@@ -20,9 +20,9 @@ export class IdsMaterialFacet extends IDSFacet {
         ? `instructions="${this.instructions}"`
         : "";
     }
-    return `<ids:material ${attributes}>
+    return `<material ${attributes}>
   ${valueXML}
-</ids:material>`;
+</material>`;
   }
 
   async getEntities() {

packages/core/src/openbim/IDSSpecifications/src/facets/Property.ts

@@ -45,11 +45,11 @@ export class IDSProperty extends IDSFacet {
         ? `instructions="${this.instructions}"`
         : "";
     }
-    return `<ids:property ${dataTypeXML} ${attributes}>
+    return `<property ${dataTypeXML} ${attributes}>
   ${propertySetXML}
   ${baseNameXML}
   ${valueXML}
-</ids:property>`;
+</property>`;
   }
 
   async getEntities(