basyx-typescript-sdk 2.1.0 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { jsonization } from '@aas-core-works/aas-core3.1-typescript';
2
- import { AdministrativeInformation, AnnotatedRelationshipElement, AssetAdministrationShell, AssetInformation, AssetKind, BasicEventElement, Blob, Capability, ConceptDescription, DataSpecificationIec61360, DataTypeDefXsd, EmbeddedDataSpecification, Entity, Extension, File, Key, KeyTypes, LangStringDefinitionTypeIec61360, LangStringNameType, LangStringPreferredNameTypeIec61360, LangStringShortNameTypeIec61360, LangStringTextType, LevelType, MultiLanguageProperty, Operation, OperationVariable, Property, Qualifier, Range, Reference, ReferenceElement, ReferenceTypes, RelationshipElement, Resource, SpecificAssetId, Submodel, SubmodelElementCollection, SubmodelElementList, ValueList, ValueReferencePair, } from '@aas-core-works/aas-core3.1-typescript/types';
2
+ import { AdministrativeInformation, AnnotatedRelationshipElement, AssetAdministrationShell, AssetInformation, AssetKind, BasicEventElement, Blob, Capability, ConceptDescription, DataSpecificationIec61360, EmbeddedDataSpecification, Entity, Extension, File, Key, KeyTypes, LangStringDefinitionTypeIec61360, LangStringNameType, LangStringPreferredNameTypeIec61360, LangStringShortNameTypeIec61360, LangStringTextType, LevelType, MultiLanguageProperty, Operation, OperationVariable, Property, Qualifier, Range, Reference, ReferenceElement, ReferenceTypes, RelationshipElement, Resource, SpecificAssetId, Submodel, SubmodelElementCollection, SubmodelElementList, ValueList, ValueReferencePair, } from '@aas-core-works/aas-core3.1-typescript/types';
3
3
  import { buildObject, buildXmlNode, parseXmlString, serializeXml as serializeXmlNode } from 'xml-sax-ts';
4
4
  import { BaSyxEnvironment } from '../../models/BaSyxEnvironment';
5
5
  export function serializeXml(data, namespacePrefix = 'aas') {
@@ -930,6 +930,24 @@ const ARRAY_ELEMENTS = new Set([
930
930
  'qualifier',
931
931
  'operationVariable',
932
932
  ]);
933
+ function parseDataTypeDefXsd(dataType) {
934
+ if (dataType === undefined || dataType === null || dataType === '') {
935
+ return undefined;
936
+ }
937
+ if (typeof dataType !== 'string' || !dataType.startsWith('xs:')) {
938
+ throw new Error(`Invalid literal of DataTypeDefXsd: ${String(dataType)}`);
939
+ }
940
+ const result = jsonization.dataTypeDefXsdFromJsonable(dataType);
941
+ if (result.error !== null || result.value === null) {
942
+ const errorMessage = typeof result.error === 'string'
943
+ ? result.error
944
+ : typeof result.error?.message === 'string'
945
+ ? result.error.message
946
+ : `Invalid literal of DataTypeDefXsd: ${dataType}`;
947
+ throw new Error(errorMessage);
948
+ }
949
+ return result.value;
950
+ }
933
951
  function parseAssetAdministrationShell(data) {
934
952
  return new AssetAdministrationShell(data.id, parseAssetInformation(data.assetInformation), data.extensions?.extension ? data.extensions.extension.map(parseExtension) : undefined, data.category || undefined, data.idShort || undefined, data.displayName?.langStringNameType
935
953
  ? data.displayName.langStringNameType.map(parseLangStringNameType)
@@ -940,15 +958,7 @@ function parseAssetAdministrationShell(data) {
940
958
  : undefined, data.derivedFrom ? parseReference(data.derivedFrom) : undefined, data.submodels?.reference ? data.submodels.reference.map(parseReference) : undefined);
941
959
  }
942
960
  function parseExtension(data) {
943
- // Map XML valueType string to DataTypeDefXsd enum
944
- let valueType = data.valueType || undefined;
945
- if (valueType && typeof valueType === 'string' && valueType.startsWith('xs:')) {
946
- // Extract the type after 'xs:' prefix and map to enum
947
- const typeValue = valueType.substring(3);
948
- const capitalizedType = typeValue.charAt(0).toUpperCase() + typeValue.slice(1);
949
- // Map string to DataTypeDefXsd enum value
950
- valueType = DataTypeDefXsd[capitalizedType];
951
- }
961
+ const valueType = parseDataTypeDefXsd(data.valueType);
952
962
  return new Extension(data.name, data.semanticId ? parseReference(data.semanticId) : undefined, data.supplementalSemanticIds?.reference
953
963
  ? data.supplementalSemanticIds.reference.map(parseReference)
954
964
  : undefined, valueType, data.value || undefined, data.refersTo?.reference ? data.refersTo.reference.map(parseReference) : undefined);
@@ -1056,15 +1066,7 @@ function parseSubmodel(data) {
1056
1066
  : undefined, data.submodelElements ? parseSubmodelElements(data.submodelElements) : undefined);
1057
1067
  }
1058
1068
  function parseQualifier(data) {
1059
- // Map XML valueType string to DataTypeDefXsd enum
1060
- let valueType = data.valueType || undefined;
1061
- if (valueType && typeof valueType === 'string') {
1062
- // Convert string to enum value using jsonization (expects xs: prefix)
1063
- const result = jsonization.dataTypeDefXsdFromJsonable(valueType);
1064
- if (result.error === null && result.value !== null) {
1065
- valueType = result.value;
1066
- }
1067
- }
1069
+ const valueType = parseDataTypeDefXsd(data.valueType);
1068
1070
  return new Qualifier(data.type, valueType, data.semanticId ? parseReference(data.semanticId) : undefined, data.supplementalSemanticIds?.reference
1069
1071
  ? data.supplementalSemanticIds.reference.map(parseReference)
1070
1072
  : undefined, data.kind ? (jsonization.qualifierKindFromJsonable(data.kind).value ?? data.kind) : undefined, data.value || undefined, data.valueId ? parseReference(data.valueId) : undefined);
@@ -1097,15 +1099,7 @@ function parseSubmodelElements(data) {
1097
1099
  return elements;
1098
1100
  }
1099
1101
  function parseProperty(data) {
1100
- // Map XML valueType string to DataTypeDefXsd enum
1101
- let valueType = data.valueType || undefined;
1102
- if (valueType && typeof valueType === 'string') {
1103
- // Convert string to enum value using jsonization (expects xs: prefix)
1104
- const result = jsonization.dataTypeDefXsdFromJsonable(valueType);
1105
- if (result.error === null && result.value !== null) {
1106
- valueType = result.value;
1107
- }
1108
- }
1102
+ const valueType = parseDataTypeDefXsd(data.valueType);
1109
1103
  return new Property(valueType, data.extensions?.extension ? ensureArray(data.extensions.extension).map(parseExtension) : undefined, data.category || undefined, data.idShort || undefined, data.displayName?.langStringNameType
1110
1104
  ? ensureArray(data.displayName.langStringNameType).map(parseLangStringNameType)
1111
1105
  : undefined, data.description?.langStringTextType
@@ -1128,15 +1122,7 @@ function parseMultiLanguageProperty(data) {
1128
1122
  : undefined, data.value?.langStringTextType ? data.value.langStringTextType.map(parseLangStringTextType) : undefined, data.valueId ? parseReference(data.valueId) : undefined);
1129
1123
  }
1130
1124
  function parseRange(data) {
1131
- // Map XML valueType string to DataTypeDefXsd enum
1132
- let valueType = data.valueType || undefined;
1133
- if (valueType && typeof valueType === 'string') {
1134
- // Convert string to enum value using jsonization (expects xs: prefix)
1135
- const result = jsonization.dataTypeDefXsdFromJsonable(valueType);
1136
- if (result.error === null && result.value !== null) {
1137
- valueType = result.value;
1138
- }
1139
- }
1125
+ const valueType = parseDataTypeDefXsd(data.valueType);
1140
1126
  return new Range(valueType, data.extensions?.extension ? data.extensions.extension.map(parseExtension) : undefined, data.category || undefined, data.idShort || undefined, data.displayName?.langStringNameType
1141
1127
  ? data.displayName.langStringNameType.map(parseLangStringNameType)
1142
1128
  : undefined, data.description?.langStringTextType
@@ -1242,7 +1228,7 @@ function parseSubmodelElementList(data) {
1242
1228
  ? data.supplementalSemanticIds.reference.map(parseReference)
1243
1229
  : undefined, data.qualifiers?.qualifier ? data.qualifiers.qualifier.map(parseQualifier) : undefined, data.embeddedDataSpecifications?.embeddedDataSpecification
1244
1230
  ? data.embeddedDataSpecifications.embeddedDataSpecification.map(parseEmbeddedDataSpecification)
1245
- : undefined, data.orderRelevant !== undefined ? data.orderRelevant === 'true' || data.orderRelevant === true : undefined, data.semanticIdListElement ? parseReference(data.semanticIdListElement) : undefined, data.valueTypeListElement || undefined, data.value ? parseSubmodelElements(data.value) : undefined);
1231
+ : undefined, data.orderRelevant !== undefined ? data.orderRelevant === 'true' || data.orderRelevant === true : undefined, data.semanticIdListElement ? parseReference(data.semanticIdListElement) : undefined, parseDataTypeDefXsd(data.valueTypeListElement), data.value ? parseSubmodelElements(data.value) : undefined);
1246
1232
  }
1247
1233
  function parseOperation(data) {
1248
1234
  const ensureArray = (val) => (Array.isArray(val) ? val : val ? [val] : []);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "basyx-typescript-sdk",
3
- "version": "2.1.0",
3
+ "version": "2.1.1",
4
4
  "description": "BaSyx TypeScript SDK for developing applications and components for the Asset Administration Shell (AAS)",
5
5
  "main": "bundle/index.cjs",
6
6
  "module": "bundle/index.mjs",