@oslo-flanders/swagger-generator 1.3.0 → 1.4.0

package/lib/SwaggerGenerationService.js

@@ -385,16 +385,19 @@ let SwaggerGenerationService = class SwaggerGenerationService {
                 const requiredProperties = properties
                     ? Object.keys(properties)
                     : undefined;
-                /* Primitive datatypes are objects with properties */
-                let item = {};
-                if ([...core_1.DataTypes.values()].includes(attributeDatatypeId)) {
-                    item = {
+                const isPrimitive = [...core_1.DataTypes.values()].includes(attributeDatatypeId);
+                let item;
+                if (isPrimitive) {
+                    /* Wrap primitive property in its own named schema to avoid naming collisions */
+                    const schemaName = `${label}.${attributeLabel}`;
+                    schemas[schemaName] = {
+                        title: schemaName,
                         type: 'object',
                         description: description,
                         properties: properties,
                         required: requiredProperties,
                     };
-                    /* Schema references are $ref, not objects */
+                    item = { $ref: `#/components/schemas/${schemaName}` };
                 }
                 else {
                     item = properties;
@@ -403,7 +406,7 @@ let SwaggerGenerationService = class SwaggerGenerationService {
                     /* minItems must be 1, empty arrays are removed by not including the attribute, even if minCount == 0 */
                     attributes[label][attributeLabel] = {
                         type: 'array',
-                        description: `Lijst van ${attributeDatatypeLabel} items.`,
+                        description: `${description} Lijst van ${attributeDatatypeLabel} items.`,
                         items: item,
                         minItems: Math.max(parseInt(attributeMinCount), 1),
                         maxItems: attributeMaxCount == '*'

package/lib/enums/Properties.js

@@ -6,9 +6,9 @@ const core_1 = require("@oslo-flanders/core");
 /* eslint-disable max-len */
 const Properties = new Map([
     [core_1.ns.rdf('langString').value, { '@value': { type: 'string' }, '@language': { type: 'string', pattern: '^nl$' } }],
-    [core_1.ns.rdfs('Literal').value, { '@value': { type: 'string' } }],
+    [core_1.ns.rdfs('Literal').value, { '@value': { type: 'string' }, '@type': { type: 'string' } }],
     [core_1.ns.xsd('string').value, { '@value': { type: 'string' } }],
-    [core_1.ns.xsd('anyURI').value, { '@id': { type: 'string', format: 'uri' } }],
+    [core_1.ns.xsd('anyURI').value, { '@id': { type: 'string', format: 'uri' }, '@type': { type: 'string', pattern: '^AnyURI$' } }],
     [core_1.ns.xsd('dateTime').value, { '@value': { type: 'string', format: 'date-time' }, '@type': { type: 'string', pattern: '^DateTime$' } }],
     [core_1.ns.xsd('date').value, { '@value': { type: 'string', format: 'date' }, '@type': { type: 'string', pattern: '^Date$' } }],
     [core_1.ns.xsd('boolean').value, { '@value': { type: 'boolean' }, '@type': { type: 'string', pattern: '^Boolean$' } }],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslo-flanders/swagger-generator",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Generate OpenAPI Swagger YAML documentation.",
   "author": "Digitaal Vlaanderen <https://data.vlaanderen.be/id/organisatie/OVO002949>",
   "homepage": "https://github.com/informatievlaanderen/OSLO-UML-Transformer/tree/main/packages/oslo-generator-swagger#readme",