ondc-code-generator 0.2.5 → 0.2.8

package/dist/generator/config-compiler.js

@@ -15,7 +15,7 @@ const __dirname = path.dirname(__filename);
 const defaultConfig = {
     removeRequiredFromSchema: true,
     removeEnumsFromSchema: true,
-    duplicateVariablesInChildren: false,
+    duplicateVariablesInChildren: true,
 };
 export class ConfigCompiler {
     constructor(language) {

package/dist/generator/generators/typescript/templates/validation-utils.mustache

@@ -4,8 +4,7 @@ function areUnique(operand: string[]) {
 }
 
 function arePresent(operand: string[]) {
-
-	return noneIn(operand, ["", "null", "undefined"]) && operand.length > 0;
+	return noneIn(operand, ["null", "undefined"]) && operand.length > 0;
 }
 
 

package/dist/generator/generators/typescript/ts-generator.js

@@ -162,8 +162,9 @@ export class TypescriptGenerator extends CodeGenerator {
             .map((api) => `import ${api} from "./api-tests/${api}";`)
             .join("\n");
         const masterFunction = `
-				export function perform${functionName}(action: string, payload: any,allErrors = false, externalData = {}) {
+				export function perform${functionName}(action: string, payload: any,allErrors = false, externalData : any = {}) {
 				const normalizedPayload = normalizeKeys(payload);
+				externalData._SELF = normalizedPayload;
 					switch (action) {
 						${apis
             .map((api) => `case "${api}": return ${api}({

package/dist/utils/config-utils/duplicateVariables.js

@@ -10,11 +10,19 @@ export function duplicateVariablesInChildren(valConfig) {
         }
     }
     // console.log(JSON.stringify(valConfig, null, 2));
+    if (valConfig[ConfigSyntax.SessionData]["search"]) {
+        valConfig[ConfigSyntax.SessionData]["search"]._SELF = null;
+    }
+    else {
+        valConfig[ConfigSyntax.SessionData]["search"] = {
+            _SELF: null,
+        };
+    }
     return valConfig;
 }
 function duplicateVariables(test, parentVariables) {
     const variables = getVariablesFromTest(test);
-    const extractedVariables = {};
+    let extractedVariables = {};
     for (const v of variables) {
         const value = test[v];
         if (typeof value === "string") {
@@ -25,6 +33,7 @@ function duplicateVariables(test, parentVariables) {
             extractedVariables[v] = value;
         }
     }
+    extractedVariables = convertToDuplicatePaths(extractedVariables);
     if (Array.isArray(test[TestObjectSyntax.Return])) {
         const returnArray = test[TestObjectSyntax.Return];
         for (const returnTest of returnArray) {
@@ -40,3 +49,12 @@ function duplicateVariables(test, parentVariables) {
         // console.log(test);
     }
 }
+function convertToDuplicatePaths(current) {
+    for (const key in current) {
+        if (typeof current[key] === "string") {
+            const value = current[key].slice(2);
+            current[key] = `$._EXTERNAL._SELF.${value}`;
+        }
+    }
+    return current;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ondc-code-generator",
-	"version": "0.2.5",
+	"version": "0.2.8",
 	"description": "generate code from build.yaml ",
 	"main": "dist/index.js",
 	"type": "module",