[nrf toup][nrfconnect] Add --full flag to zap-generate

Add a `--full` flag that generates full data model and puts it
it `app-common/zap-generated` subdirectory.

Additionaly fix minor bug when equal paths have been shown as non-
relative and zap file is not properly updated with zcl.json file

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>

Author: maciejbaczmanski

scripts/west/zap_common.py

@@ -95,11 +95,15 @@ def update_zcl_in_zap(zap_file: Path, zcl_json: Path, app_templates: Path) -> bo
 
         for package in packages:
             if package.get("type") == "zcl-properties":
-                if not zcl_json.parent.absolute().is_relative_to(zap_file.parent.absolute()):
+                if zcl_json.parent.absolute() == zap_file.parent.absolute() or \
+                    not zcl_json.parent.absolute().is_relative_to(zap_file.parent.absolute()):
+
                     package.update({"path": str(zcl_json.absolute().relative_to(zap_file.parent.absolute(), walk_up=True))})
                     updated = True
             if package.get("type") == "gen-templates-json":
-                if not app_templates.parent.absolute().is_relative_to(zap_file.parent.absolute()):
+                if app_templates.parent.absolute() == zap_file.parent.absolute() or \
+                    not app_templates.parent.absolute().is_relative_to(zap_file.parent.absolute()):
+
                     package.update({"path": str(app_templates.absolute().relative_to(zap_file.parent.absolute(), walk_up=True))})
                     updated = True
 

scripts/west/zap_generate.py

@@ -36,9 +36,16 @@ def do_add_parser(self, parser_adder):
                             help='Path where to store the generated files')
         parser.add_argument('-m', '--matter-path', type=existing_dir_path,
                             default=DEFAULT_MATTER_PATH, help='Path to Matter SDK')
+        parser.add_argument('-f', '--full', action='store_true', help='Generate full data model files')
         return parser
 
+    def build_command(self, zap_file_path, output_path, templates_path):
+        cmd = [sys.executable, self.zap_generate_path, zap_file_path, "-o", output_path, "-t", templates_path]
+        return [str(x) for x in cmd]
+
     def do_run(self, args, unknown_args):
+        self.zap_generate_path = args.matter_path / "scripts/tools/zap/generate.py"
+
         if args.zap_file:
             zap_file_path = args.zap_file.absolute()
         else:
@@ -52,20 +59,25 @@ def do_run(self, args, unknown_args):
         else:
             output_path = zap_file_path.parent / "zap-generated"
 
+        templates_path = args.matter_path / "src/app/common/templates/templates.json"
         app_templates_path = args.matter_path / "src/app/zap-templates/app-templates.json"
-        zap_generate_path = args.matter_path / "scripts/tools/zap/generate.py"
 
         zap_installer = ZapInstaller(args.matter_path)
         zap_installer.update_zap_if_needed()
 
         # make sure that the generate.py script uses the proper zap_cli binary (handled by west)
         os.environ["ZAP_INSTALL_PATH"] = str(zap_installer.get_zap_cli_path().parent.absolute())
 
-        cmd = [sys.executable, zap_generate_path]
-        cmd += [zap_file_path]
-        cmd += ["-t", app_templates_path]
-        cmd += ["-o", output_path]
 
-        self.check_call([str(x) for x in cmd])
+        # Make sure that output directory exists
+        output_path.mkdir(exist_ok=True)
+
+        self.check_call(self.build_command(zap_file_path, output_path, app_templates_path))
+
+        if args.full:
+            output_path = output_path / "app-common/zap-generated"
+            output_path.mkdir(parents=True, exist_ok=True)
+
+            self.check_call(self.build_command(zap_file_path, output_path, templates_path))
 
         log.inf(f"Done. Files generated in {output_path}")