UPDATE post processing

Author: ttristan

dist/index.js

@@ -2464,31 +2464,34 @@ const flatMap = (array, callback) => {
 };
 
 const postProcessServiceOperationsJsonld = (operation) => {
-    const { service: serviceName } = operation;
     operation.parameters.forEach(parameter => {
         parameter.mediaType = 'application/ld+json';
         parameter.imports = [];
     });
     if (operation.parametersBody) {
-        operation.parametersBody.base = replaceServiceName(serviceName, operation.parametersBody.base);
-        operation.parametersBody.type = replaceServiceName(serviceName, operation.parametersBody.base);
+        operation.parametersBody.base = replaceServiceName(operation.parametersBody.base);
+        operation.parametersBody.type = replaceServiceName(operation.parametersBody.base);
         operation.parametersBody.imports = [];
     }
-    operation.imports = operation.imports.map(importString => replaceServiceName(serviceName, importString));
+    operation.imports = operation.imports.map(importString => replaceServiceName(importString));
     operation.results.forEach(result => {
-        result.base = replaceServiceName(serviceName, result.base);
-        result.type = replaceServiceName(serviceName, result.base);
-        result.imports = result.imports.map(importString => replaceServiceName(serviceName, importString));
+        processResult(result);
+        if (result.export === 'one-of' || result.export === 'any-of' || result.export === 'all-of') {
+            result.properties.forEach(processResult);
+        }
     });
 };
-const replaceServiceName = (serviceName, replaceString) => {
+const processResult = (result) => {
+    result.base = replaceServiceName(result.base);
+    result.type = replaceServiceName(result.base);
+    result.imports = result.imports.map(importString => replaceServiceName(importString));
+    return result;
+};
+const replaceServiceName = (replaceString) => {
     if (replaceString === 'void' || replaceString.includes('jsonld')) {
         return replaceString;
     }
-    const version = replaceString.match(/_v\d+_/);
-    const versionString = version ? `_${version[0].split('_')[1]}` : '';
-    const versionedServiceName = `${serviceName}${versionString}`;
-    return replaceString.replace(versionedServiceName, `${versionedServiceName}_jsonld`);
+    return replaceString.replace('_', '_jsonld_');
 };
 
 const postProcessServiceOperations = (service, options) => {
@@ -2527,6 +2530,9 @@ const postProcessService = (service, options) => {
  * @param options
  */
 const postProcessClient = (client, options) => {
+    if (options?.useJsonld) {
+        client.models = client.models.filter(model => model.name.includes('jsonld'));
+    }
     return {
         ...client,
         models: client.models.map(model => postProcessModel(model)),

src/utils/postProcessClient.ts

@@ -7,7 +7,11 @@ import { postProcessService } from './postProcessService';
  * @param client Client object with all the models, services, etc.
  * @param options
  */
-export const postProcessClient = (client: Client, options?: { useJsonld: boolean }): Client => {
+export const postProcessClient = (client: Client, options?: { useJsonld?: boolean }): Client => {
+    if (options?.useJsonld) {
+        client.models = client.models.filter(model => model.name.includes('jsonld'));
+    }
+
     return {
         ...client,
         models: client.models.map(model => postProcessModel(model)),

src/utils/postProcessService.ts

@@ -2,7 +2,7 @@ import type { Service } from '../client/interfaces/Service';
 import { postProcessServiceImports } from './postProcessServiceImports';
 import { postProcessServiceOperations } from './postProcessServiceOperations';
 
-export const postProcessService = (service: Service, options?: { useJsonld: boolean }): Service => {
+export const postProcessService = (service: Service, options?: { useJsonld?: boolean }): Service => {
     const clone = { ...service };
     clone.operations = postProcessServiceOperations(clone, options);
     clone.imports = clone.operations.flatMap(operation => operation.imports);

src/utils/postProcessServiceOperations.ts

@@ -3,7 +3,7 @@ import type { Service } from '../client/interfaces/Service';
 import { flatMap } from './flatMap';
 import { postProcessServiceOperationsJsonld } from './postProcessServiceOperationsJsonld';
 
-export const postProcessServiceOperations = (service: Service, options?: { useJsonld: boolean }): Operation[] => {
+export const postProcessServiceOperations = (service: Service, options?: { useJsonld?: boolean }): Operation[] => {
     const names = new Map<string, number>();
 
     return service.operations.map(operation => {

src/utils/postProcessServiceOperationsJsonld.ts

@@ -1,36 +1,39 @@
 import type { Operation } from '../client/interfaces/Operation';
 
 export const postProcessServiceOperationsJsonld = (operation: Operation) => {
-    const { service: serviceName } = operation;
-
     operation.parameters.forEach(parameter => {
         parameter.mediaType = 'application/ld+json';
         parameter.imports = [];
     });
 
     if (operation.parametersBody) {
-        operation.parametersBody.base = replaceServiceName(serviceName, operation.parametersBody.base);
-        operation.parametersBody.type = replaceServiceName(serviceName, operation.parametersBody.base);
+        operation.parametersBody.base = replaceServiceName(operation.parametersBody.base);
+        operation.parametersBody.type = replaceServiceName(operation.parametersBody.base);
         operation.parametersBody.imports = [];
     }
 
-    operation.imports = operation.imports.map(importString => replaceServiceName(serviceName, importString));
+    operation.imports = operation.imports.map(importString => replaceServiceName(importString));
 
     operation.results.forEach(result => {
-        result.base = replaceServiceName(serviceName, result.base);
-        result.type = replaceServiceName(serviceName, result.base);
-        result.imports = result.imports.map(importString => replaceServiceName(serviceName, importString));
+        processResult(result);
+
+        if (result.export === 'one-of' || result.export === 'any-of' || result.export === 'all-of') {
+            result.properties.forEach(processResult);
+        }
     });
 };
 
-const replaceServiceName = (serviceName: string, replaceString: string) => {
+const processResult = (result: { base: string; type: string; imports: string[] }) => {
+    result.base = replaceServiceName(result.base);
+    result.type = replaceServiceName(result.base);
+    result.imports = result.imports.map(importString => replaceServiceName(importString));
+    return result;
+};
+
+const replaceServiceName = (replaceString: string) => {
     if (replaceString === 'void' || replaceString.includes('jsonld')) {
         return replaceString;
     }
-    const version = replaceString.match(/_v\d+_/);
-    const versionString = version ? `_${version[0].split('_')[1]}` : '';
-
-    const versionedServiceName = `${serviceName}${versionString}`;
 
-    return replaceString.replace(versionedServiceName, `${versionedServiceName}_jsonld`);
+    return replaceString.replace('_', '_jsonld_');
 };