chore(build): Merge xml-schema-ts package into kaoto

.github/workflows/build-lint-test.yml

@@ -38,7 +38,7 @@ jobs:
 
       # Build packages excluding @kaoto/camel-catalog since it was build during installing dependencies
       - name: Build packages
-        run: yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog --exclude @kaoto/xml-schema-ts run build
+        run: yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog run build
 
       # Run tests
       - name: 🧪 Run tests

.github/workflows/deploy-main.yml

@@ -44,7 +44,7 @@ jobs:
       # Build packages excluding @kaoto/camel-catalog since it was build during installing dependencies
       - name: '🔧 Build packages'
         run: |
-          yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog --exclude @kaoto/xml-schema-ts run build
+          yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog run build
 
       - name: '🔧 Tar UI Dist'
         shell: bash

.github/workflows/e2e-tests.yml

@@ -45,7 +45,7 @@ jobs:
 
       # Build packages excluding @kaoto/camel-catalog since it was build during installing dependencies
       - name: Build packages
-        run: yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog --exclude @kaoto/xml-schema-ts run build
+        run: yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog run build
 
       # Build lib
       - name: Build @kaoto/kaoto package in lib mode

.github/workflows/release-pipeline.yml

@@ -105,7 +105,7 @@ jobs:
 
       - name: '🔧 Build packages'
         run: |
-          yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog --exclude @kaoto/xml-schema-ts run build
+          yarn workspaces foreach --verbose --all --topological-dev --exclude @kaoto/camel-catalog run build
 
       - name: '🛰️ Login to Container Registry'
         uses: docker/login-action@v3

package.json

@@ -26,7 +26,7 @@
     "typescript": "5.5.4"
   },
   "scripts": {
-    "postinstall": "yarn workspace @kaoto/camel-catalog run build && yarn workspace @kaoto/xml-schema-ts run build",
+    "postinstall": "yarn workspace @kaoto/camel-catalog run build",
     "version": "lerna version",
     "publish": "lerna publish from-package"
   },

packages/ui/package.json

@@ -53,7 +53,6 @@
   "dependencies": {
     "@dnd-kit/core": "^6.1.0",
     "@kaoto-next/uniforms-patternfly": "^0.7.14",
-    "@kaoto/xml-schema-ts": "workspace:*",
     "@kie-tools-core/editor": "0.32.0",
     "@kie-tools-core/notifications": "0.32.0",
     "@types/uuid": "^10.0.0",

packages/ui/src/services/xml-schema-document.service.ts

@@ -28,7 +28,7 @@ import {
   XmlSchemaSimpleType,
   XmlSchemaType,
   XmlSchemaUse,
-} from '@kaoto/xml-schema-ts';
+} from '../xml-schema-ts';
 import { BaseDocument, BaseField, ITypeFragment } from '../models/datamapper/document';
 import { Types } from '../models/datamapper/types';
 import { DocumentType } from '../models/datamapper/path';

packages/ui/src/stubs/data-mapper.ts

@@ -1,9 +1,10 @@
-import { parse } from 'yaml';
-import { DATAMAPPER_ID_PREFIX, XSLT_COMPONENT_NAME } from '../utils';
 import fs from 'fs';
-import { XmlSchemaDocumentService } from '../services/xml-schema-document.service';
-import { DocumentType } from '../models/datamapper/path';
+import path from 'path';
+import { parse } from 'yaml';
 import { IDocument, PrimitiveDocument } from '../models/datamapper/document';
+import { DocumentType } from '../models/datamapper/path';
+import { XmlSchemaDocumentService } from '../services/xml-schema-document.service';
+import { DATAMAPPER_ID_PREFIX, XSLT_COMPONENT_NAME } from '../utils';
 
 export const datamapperRouteDefinitionStub = parse(`
   from:
@@ -18,25 +19,25 @@ export const datamapperRouteDefinitionStub = parse(`
                 uri: ${XSLT_COMPONENT_NAME}:transform.xsl`);
 
 export const shipOrderXsd = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/ShipOrder.xsd')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/ShipOrder.xsd'))
   .toString();
 export const testDocumentXsd = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/TestDocument.xsd')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/TestDocument.xsd'))
   .toString();
 export const noTopElementXsd = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/NoTopElement.xsd')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/NoTopElement.xsd'))
   .toString();
 export const camelSpringXsd = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/camel-spring.xsd')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/camel-spring.xsd'))
   .toString();
 export const shipOrderToShipOrderXslt = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/ShipOrderToShipOrder.xsl')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/ShipOrderToShipOrder.xsl'))
   .toString();
 export const shipOrderToShipOrderInvalidForEachXslt = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/ShipOrderToShipOrderInvalidForEach.xsl')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/ShipOrderToShipOrderInvalidForEach.xsl'))
   .toString();
 export const shipOrderEmptyFirstLineXsd = fs
-  .readFileSync(__dirname + '/../../../xml-schema-ts/test-resources/ShipOrderEmptyFirstLine.xsd')
+  .readFileSync(path.resolve(__dirname, '../xml-schema-ts/test-resources/ShipOrderEmptyFirstLine.xsd'))
   .toString();
 
 export class TestUtil {

packages/xml-schema-ts/src/XmlSchemaCollection.test.ts → packages/ui/src/xml-schema-ts/XmlSchemaCollection.test.ts

@@ -1,23 +1,23 @@
-import { XmlSchemaCollection } from './XmlSchemaCollection';
 import fs from 'fs';
+import path from 'path';
 import { QName } from './QName';
-import { XmlSchemaComplexType } from './complex/XmlSchemaComplexType';
-import { XmlSchemaAttribute } from './attribute/XmlSchemaAttribute';
+import { XmlSchemaCollection } from './XmlSchemaCollection';
 import { XmlSchemaUse } from './XmlSchemaUse';
-import { XmlSchemaSequence } from './particle/XmlSchemaSequence';
-import { XmlSchemaElement } from './particle/XmlSchemaElement';
+import { XmlSchemaAttribute } from './attribute/XmlSchemaAttribute';
 import { XmlSchemaAttributeGroupRef } from './attribute/XmlSchemaAttributeGroupRef';
-import { XmlSchemaSimpleType } from './simple/XmlSchemaSimpleType';
-import { screen } from '@testing-library/react';
 import { XmlSchemaComplexContentExtension } from './complex/XmlSchemaComplexContentExtension';
+import { XmlSchemaComplexType } from './complex/XmlSchemaComplexType';
+import { XmlSchemaElement } from './particle/XmlSchemaElement';
+import { XmlSchemaSequence } from './particle/XmlSchemaSequence';
+import { XmlSchemaSimpleType } from './simple/XmlSchemaSimpleType';
 
 describe('XmlSchemaCollection', () => {
-  const orderXsd = fs.readFileSync(__dirname + '/../test-resources/ShipOrder.xsd').toString();
-  const testXsd = fs.readFileSync(__dirname + '/../test-resources/TestDocument.xsd').toString();
-  const namedTypesXsd = fs.readFileSync(__dirname + '/../test-resources/NamedTypes.xsd').toString();
-  const camelSpringXsd = fs.readFileSync(__dirname + '/../test-resources/camel-spring.xsd').toString();
+  const orderXsd = fs.readFileSync(path.resolve(__dirname, 'test-resources/ShipOrder.xsd')).toString();
+  const testXsd = fs.readFileSync(path.resolve(__dirname, 'test-resources/TestDocument.xsd')).toString();
+  const namedTypesXsd = fs.readFileSync(path.resolve(__dirname, 'test-resources/NamedTypes.xsd')).toString();
+  const camelSpringXsd = fs.readFileSync(path.resolve(__dirname, 'test-resources/camel-spring.xsd')).toString();
   const orderXsdEmptyFirstLine = fs
-    .readFileSync(__dirname + '/../test-resources/ShipOrderEmptyFirstLine.xsd')
+    .readFileSync(path.resolve(__dirname, 'test-resources/ShipOrderEmptyFirstLine.xsd'))
     .toString();
 
   it('should parse ShipOrder XML schema', () => {
@@ -111,7 +111,6 @@ describe('XmlSchemaCollection', () => {
     const element1SequenceMembers = element1Sequence.getItems();
     expect(element1SequenceMembers.length).toEqual(1);
     const element1Simple1 = element1SequenceMembers[0] as XmlSchemaElement;
-    const element1Simple1SchemaType = element1Simple1.getSchemaType();
     expect(element1Simple1.getWireName()?.getNamespaceURI()).toEqual('');
     expect(element1Simple1.getWireName()?.getLocalPart()).toEqual('Element1Simple1');
   });
@@ -136,7 +135,8 @@ describe('XmlSchemaCollection', () => {
     try {
       collection.read(orderXsdEmptyFirstLine, () => {});
     } catch (error) {
-      expect(error.message).toContain('an XML declaration must be at the start of the document');
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      expect((error as any).message).toContain('an XML declaration must be at the start of the document');
       return;
     }
     fail('No error was thrown');

packages/xml-schema-ts/src/XmlSchemaCollection.ts → packages/ui/src/xml-schema-ts/XmlSchemaCollection.ts

@@ -556,7 +556,6 @@ export class XmlSchemaCollection {
       return null;
     }
     const uri = name.getNamespaceURI();
-    const entries = this.schemas.entries();
     for (const entry of Array.from(this.schemas.entries())) {
       if (entry[0].getNamespace() === uri) {
         const group = entry[1].getAttributeGroupByQName(name);

packages/xml-schema-ts/src/index.ts → packages/ui/src/xml-schema-ts/index.ts

@@ -1,31 +1,32 @@
-export { QNameMap } from './utils/ObjectMap';
-export { XmlSchema } from './XmlSchema';
-export { XmlSchemaAll } from './particle/XmlSchemaAll';
-export { XmlSchemaAny } from './particle/XmlSchemaAny';
-export { XmlSchemaAllMember } from './particle/XmlSchemaAllMember';
 export { XmlSchemaAttribute } from './attribute/XmlSchemaAttribute';
 export { XmlSchemaAttributeGroup } from './attribute/XmlSchemaAttributeGroup';
-export { XmlSchemaAttributeGroupMember } from './attribute/XmlSchemaAttributeGroupMember';
 export { XmlSchemaAttributeGroupRef } from './attribute/XmlSchemaAttributeGroupRef';
 export { XmlSchemaAttributeOrGroupRef } from './attribute/XmlSchemaAttributeOrGroupRef';
-export { XmlSchemaChoice } from './particle/XmlSchemaChoice';
-export { XmlSchemaChoiceMember } from './particle/XmlSchemaChoiceMember';
-export { XmlSchemaCollection } from './XmlSchemaCollection';
 export { XmlSchemaComplexContentExtension } from './complex/XmlSchemaComplexContentExtension';
 export { XmlSchemaComplexContentRestriction } from './complex/XmlSchemaComplexContentRestriction';
 export { XmlSchemaComplexType } from './complex/XmlSchemaComplexType';
-export { XmlSchemaContentModel } from './XmlSchemaContentModel';
+export { XmlSchemaAll } from './particle/XmlSchemaAll';
+export { XmlSchemaAny } from './particle/XmlSchemaAny';
+export { XmlSchemaChoice } from './particle/XmlSchemaChoice';
 export { XmlSchemaElement } from './particle/XmlSchemaElement';
-export { XmlSchemaGroup } from './XmlSchemaGroup';
 export { XmlSchemaGroupParticle } from './particle/XmlSchemaGroupParticle';
 export { XmlSchemaGroupRef } from './particle/XmlSchemaGroupRef';
-export { XmlSchemaObjectBase } from './utils/XmlSchemaObjectBase';
 export { XmlSchemaParticle } from './particle/XmlSchemaParticle';
-export { XmlSchemaRef } from './utils/XmlSchemaRef';
 export { XmlSchemaSequence } from './particle/XmlSchemaSequence';
-export { XmlSchemaSequenceMember } from './particle/XmlSchemaSequenceMember';
 export { XmlSchemaSimpleContentExtension } from './simple/XmlSchemaSimpleContentExtension';
 export { XmlSchemaSimpleContentRestriction } from './simple/XmlSchemaSimpleContentRestriction';
 export { XmlSchemaSimpleType } from './simple/XmlSchemaSimpleType';
+export { QNameMap } from './utils/ObjectMap';
+export { XmlSchemaRef } from './utils/XmlSchemaRef';
+export { XmlSchema } from './XmlSchema';
+export { XmlSchemaCollection } from './XmlSchemaCollection';
+export { XmlSchemaContentModel } from './XmlSchemaContentModel';
+export { XmlSchemaGroup } from './XmlSchemaGroup';
 export { XmlSchemaType } from './XmlSchemaType';
 export { XmlSchemaUse } from './XmlSchemaUse';
+
+export type { XmlSchemaAttributeGroupMember } from './attribute/XmlSchemaAttributeGroupMember';
+export type { XmlSchemaAllMember } from './particle/XmlSchemaAllMember';
+export type { XmlSchemaChoiceMember } from './particle/XmlSchemaChoiceMember';
+export type { XmlSchemaSequenceMember } from './particle/XmlSchemaSequenceMember';
+export type { XmlSchemaObjectBase } from './utils/XmlSchemaObjectBase';

packages/xml-schema-ts/src/xml-parser.test.ts → packages/ui/src/xml-schema-ts/xml-parser.test.ts

@@ -1,11 +1,12 @@
-import * as fs from 'fs';
+import fs from 'fs';
+import path from 'path';
 
 describe.skip('XML parser', () => {
   describe('DOMParser', () => {
     const parser = new DOMParser();
 
     it('should parse XML schema', () => {
-      const orderXsd = fs.readFileSync(__dirname + '/../../../../test-resources/ShipOrder.xsd').toString();
+      const orderXsd = fs.readFileSync(path.resolve(__dirname, 'test-resources/ShipOrder.xsd')).toString();
       const xmlDoc = parser.parseFromString(orderXsd, 'text/xml');
       expect(xmlDoc).toBeDefined();
       const schema = xmlDoc.getElementsByTagName('xs:schema')[0];
@@ -22,7 +23,7 @@ describe.skip('XML parser', () => {
     });
 
     it('should parse XML document', () => {
-      const orderXml = fs.readFileSync(__dirname + '/../../../../test-resources/ExampleOrder.xml').toString();
+      const orderXml = fs.readFileSync(path.resolve(__dirname, 'test-resources/ExampleOrder.xml')).toString();
       const xmlDoc = parser.parseFromString(orderXml, 'text/xml');
       expect(xmlDoc).toBeDefined();
     });

packages/ui/tsconfig.cjs.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
-    "target": "ES5",
+    "target": "ES2020",
     "outDir": "lib/cjs",
   },
 }