ondc-code-generator 0.6.20 → 0.6.22

package/dist/generator/generators/python/py-generator.js

@@ -194,7 +194,7 @@ export class PythonGenerator extends CodeGenerator {
         for (const name of varNames) {
             const value = testObject[name];
             const final = typeof value === "string"
-                ? `payload_utils["get_json_path"](${testObject[TestObjectSyntax.Name]}_obj, "${value}")`
+                ? `payload_utils["get_json_path"](${testObject[TestObjectSyntax.Name]}_obj, "${value}", True)`
                 : this.convertArrayToStringPython(value);
             variables.push({
                 name: name,

package/dist/generator/generators/python/templates/json-path-utils.mustache

@@ -8,13 +8,24 @@ def is_list_of_strings_or_none(value: Any) -> bool:
         and all((v is None) or isinstance(v, str) for v in value)
     )
 
-def get_json_path(payload: Any, path: str) -> List[Any]:
+def flatten_list(lst: List[Any]) -> List[Any]:
+    """Recursively flatten a nested list"""
+    result = []
+    for item in lst:
+        if isinstance(item, list):
+            result.extend(flatten_list(item))
+        else:
+            result.append(item)
+    return result
+
+def get_json_path(payload: Any, path: str, flatten_result: bool = False) -> List[Any]:
     """
     Evaluate a JSONPath against `payload`.
 
     - If the result is a list that contains only strings and/or None,
       convert None -> "null".
     - Return [] when there are no matches.
+    - If flatten_result is True, flatten nested arrays completely.
     """
     expr = parse(path)
     matches = [m.value for m in expr.find(payload)]  # extract raw values
@@ -22,6 +33,10 @@ def get_json_path(payload: Any, path: str) -> List[Any]:
     if is_list_of_strings_or_none(matches):
         matches = ["null" if v is None else v for v in matches]
 
+    # Flatten only if flag is true
+    if flatten_result:
+        matches = flatten_list(matches)
+
     # Explicitly mirror the TS return of [] for no matches
     return matches if len(matches) > 0 else []
 

package/dist/generator/generators/python/templates/storage-templates/api-save.mustache

@@ -21,7 +21,7 @@ async def save_function(payload: dict, unique_prefix: str, key: str, path: str,
     if path == "" or key == "_SELF":
         return
     
-    value = get_json_path(payload, path)
+    value = get_json_path(payload, path, True)
     data = {
         "stored_from": "{{action}}_action",
         "key_path": path,

package/dist/generator/generators/typescript/templates/json-path-utils.mustache

@@ -1,17 +1,35 @@
 import jsonpath from "jsonpath";
-function getJsonPath(payload: any, path: string) {
-	let output = jsonpath.query(payload, path);
-	if (isListOfStringsOrNull(output)) {
-		output = output.map((o) => (o === null ? "null" : o));
-	}
-	return output.length === 0 ? [] : output;
-}
+
 function isListOfStringsOrNull(variable: any): boolean {
 	return (
 		Array.isArray(variable) &&
 		variable.every((item) => item === null || typeof item === "string")
 	);
 }
+
+function getJsonPath(
+	payload: any,
+	path: string,
+	flattenResult: boolean = false
+) {
+	let output = jsonpath.query(payload, path);
+
+	if (isListOfStringsOrNull(output)) {
+		output = output.map((o) => {
+			if (o === null) return "null";
+			if (o === null) return "null";
+			return o;
+		});
+	}
+
+	// flatten only if flag is true
+	if (flattenResult) {
+		output = output.flat(Infinity);
+	}
+
+	return output.length === 0 ? [] : output;
+}
+
 export default {
 	getJsonPath,
 };

package/dist/generator/generators/typescript/templates/storage-templates/api-save.mustache

@@ -30,7 +30,7 @@ config: StorageConfig): Promise<void> {
     if(path === "" || key === "_SELF"){
         return;
     }
-    const value = payloadUtils.getJsonPath(payload, path);
+    const value = payloadUtils.getJsonPath(payload, path,true);
     const data = {
         stored_from: "{{action}}_action",
         key_path: path,

package/dist/generator/generators/typescript/templates/test-object.mustache

@@ -3,6 +3,7 @@ function {{name}}(input: validationInput): validationOutput {
     let subResults: validationOutput = [];
     let valid = true;
     for(const testObj of scope){
+        if(!testObj || typeof testObj !== 'object') continue;
         testObj._EXTERNAL = input.externalData;
         {{#variables}}
         const {{name}} = {{{value}}}

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

@@ -182,7 +182,7 @@ export class TypescriptGenerator extends CodeGenerator {
         for (const name of varNames) {
             const value = testObject[name];
             const final = typeof value === "string"
-                ? `payloadUtils.getJsonPath(testObj, "${value}")`
+                ? `payloadUtils.getJsonPath(testObj, "${value}",true)`
                 : ConvertArrayToString(value);
             variables.push({
                 name: name,

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "ondc-code-generator",
-	"version": "0.6.20",
+	"version": "0.6.22",
 	"description": "generate code from build.yaml ",
 	"main": "dist/index.js",
 	"type": "module",
 	"scripts": {
 		"build": "tsc && copyfiles -u 1 \"src/**/*.{yaml,html,css,mustache}\" dist/",
 		"start": "node ./dist/index.js",
-		"test": "npm run build && node ./dist/test.js",
+		"test": "npm run build && node ./dist/index.test.js",
 		"dev": "nodemon",
 		"clean": "rm -rf dist",
 		"prepare": "npm run clean && npm run build"