- Add another templates json file into the package tables when any json files within it are updated. The newly added templates json file is in sync and the older ones will be out of sync in the package table when a nested json file is changed (#1577)

- Removing the zcl extensions check because that is now covered by the newly added code. Not adding further tests for this because it is already covered in zcl-loader.test.js. See: test changing the zcl extension file in a top level templates json file and make sure it is re-loaded again
- JIRA: ZAPP-1297

Author: brdandu

docs/api.md

@@ -8099,6 +8099,7 @@ Get endpoint type events from the given endpoint type ID.
 ## JS API: generator logic
 
 * [JS API: generator logic](#module_JS API_ generator logic)
+    * [~findAndReadJsonFiles(obj, basePath)](#module_JS API_ generator logic..findAndReadJsonFiles) ⇒ <code>Promise.&lt;string&gt;</code>
     * [~loadGenTemplateFromFile(templatePath)](#module_JS API_ generator logic..loadGenTemplateFromFile) ⇒
     * [~recordPackageIfNonexistent(db, packagePath, parentId, packageType, version, category, description)](#module_JS API_ generator logic..recordPackageIfNonexistent) ⇒
     * [~loadTemplateOptionsFromJsonFile(db, packageId, category, externalPath)](#module_JS API_ generator logic..loadTemplateOptionsFromJsonFile) ⇒
@@ -8146,6 +8147,19 @@ Get endpoint type events from the given endpoint type ID.
     * [~templatePromise(global, promise)](#module_JS API_ generator logic..templatePromise)
     * [~deprecatedHelper(fn, explanation)](#module_JS API_ generator logic..deprecatedHelper) ⇒
 
+<a name="module_JS API_ generator logic..findAndReadJsonFiles"></a>
+
+### JS API: generator logic~findAndReadJsonFiles(obj, basePath) ⇒ <code>Promise.&lt;string&gt;</code>
+Finds and reads JSON files referenced in a nested object.
+
+**Kind**: inner method of [<code>JS API: generator logic</code>](#module_JS API_ generator logic)  
+**Returns**: <code>Promise.&lt;string&gt;</code> - - A promise that resolves to the concatenated content of all JSON files.  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| obj | <code>Object</code> | The object to search for JSON file references. |
+| basePath | <code>string</code> | The base directory to resolve relative paths. |
+
 <a name="module_JS API_ generator logic..loadGenTemplateFromFile"></a>
 
 ### JS API: generator logic~loadGenTemplateFromFile(templatePath) ⇒
@@ -13437,6 +13451,7 @@ This module contains the API for templating. For more detailed instructions, rea
 ## JS API: generator logic
 
 * [JS API: generator logic](#module_JS API_ generator logic)
+    * [~findAndReadJsonFiles(obj, basePath)](#module_JS API_ generator logic..findAndReadJsonFiles) ⇒ <code>Promise.&lt;string&gt;</code>
     * [~loadGenTemplateFromFile(templatePath)](#module_JS API_ generator logic..loadGenTemplateFromFile) ⇒
     * [~recordPackageIfNonexistent(db, packagePath, parentId, packageType, version, category, description)](#module_JS API_ generator logic..recordPackageIfNonexistent) ⇒
     * [~loadTemplateOptionsFromJsonFile(db, packageId, category, externalPath)](#module_JS API_ generator logic..loadTemplateOptionsFromJsonFile) ⇒
@@ -13484,6 +13499,19 @@ This module contains the API for templating. For more detailed instructions, rea
     * [~templatePromise(global, promise)](#module_JS API_ generator logic..templatePromise)
     * [~deprecatedHelper(fn, explanation)](#module_JS API_ generator logic..deprecatedHelper) ⇒
 
+<a name="module_JS API_ generator logic..findAndReadJsonFiles"></a>
+
+### JS API: generator logic~findAndReadJsonFiles(obj, basePath) ⇒ <code>Promise.&lt;string&gt;</code>
+Finds and reads JSON files referenced in a nested object.
+
+**Kind**: inner method of [<code>JS API: generator logic</code>](#module_JS API_ generator logic)  
+**Returns**: <code>Promise.&lt;string&gt;</code> - - A promise that resolves to the concatenated content of all JSON files.  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| obj | <code>Object</code> | The object to search for JSON file references. |
+| basePath | <code>string</code> | The base directory to resolve relative paths. |
+
 <a name="module_JS API_ generator logic..loadGenTemplateFromFile"></a>
 
 ### JS API: generator logic~loadGenTemplateFromFile(templatePath) ⇒
@@ -14099,6 +14127,7 @@ Function wrapper that can be used when a helper is deprecated.
 ## JS API: generator logic
 
 * [JS API: generator logic](#module_JS API_ generator logic)
+    * [~findAndReadJsonFiles(obj, basePath)](#module_JS API_ generator logic..findAndReadJsonFiles) ⇒ <code>Promise.&lt;string&gt;</code>
     * [~loadGenTemplateFromFile(templatePath)](#module_JS API_ generator logic..loadGenTemplateFromFile) ⇒
     * [~recordPackageIfNonexistent(db, packagePath, parentId, packageType, version, category, description)](#module_JS API_ generator logic..recordPackageIfNonexistent) ⇒
     * [~loadTemplateOptionsFromJsonFile(db, packageId, category, externalPath)](#module_JS API_ generator logic..loadTemplateOptionsFromJsonFile) ⇒
@@ -14146,6 +14175,19 @@ Function wrapper that can be used when a helper is deprecated.
     * [~templatePromise(global, promise)](#module_JS API_ generator logic..templatePromise)
     * [~deprecatedHelper(fn, explanation)](#module_JS API_ generator logic..deprecatedHelper) ⇒
 
+<a name="module_JS API_ generator logic..findAndReadJsonFiles"></a>
+
+### JS API: generator logic~findAndReadJsonFiles(obj, basePath) ⇒ <code>Promise.&lt;string&gt;</code>
+Finds and reads JSON files referenced in a nested object.
+
+**Kind**: inner method of [<code>JS API: generator logic</code>](#module_JS API_ generator logic)  
+**Returns**: <code>Promise.&lt;string&gt;</code> - - A promise that resolves to the concatenated content of all JSON files.  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| obj | <code>Object</code> | The object to search for JSON file references. |
+| basePath | <code>string</code> | The base directory to resolve relative paths. |
+
 <a name="module_JS API_ generator logic..loadGenTemplateFromFile"></a>
 
 ### JS API: generator logic~loadGenTemplateFromFile(templatePath) ⇒

src-electron/generator/generation-engine.js

@@ -33,6 +33,30 @@ const dbApi = require('../db/db-api.js')
 const dbCache = require('../db/db-cache.js')
 const queryNotification = require('../db/query-package-notification.js')
 
+/**
+ * Finds and reads JSON files referenced in a nested object.
+ *
+ * @param {Object} obj - The object to search for JSON file references.
+ * @param {string} basePath - The base directory to resolve relative paths.
+ * @returns {Promise<string>} - A promise that resolves to the concatenated content of all JSON files.
+ */
+async function findAndReadJsonFiles(obj, basePath) {
+  let additionalJsonContent = ''
+  for (const key in obj) {
+    if (typeof obj[key] === 'string' && obj[key].endsWith('.json')) {
+      // If the value is a JSON file reference, read its content
+      let jsonFilePath = path.resolve(path.join(basePath, obj[key]))
+      if (fs.existsSync(jsonFilePath)) {
+        additionalJsonContent += await fsPromise.readFile(jsonFilePath, 'utf8')
+      }
+    } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+      // If the value is an object, recursively search for JSON file references
+      additionalJsonContent += await findAndReadJsonFiles(obj[key], basePath)
+    }
+  }
+  return additionalJsonContent
+}
+
 /**
  * Given a path, it will read generation template object into memory.
  *
@@ -42,34 +66,15 @@ const queryNotification = require('../db/query-package-notification.js')
 async function loadGenTemplateFromFile(templatePath) {
   let ret = {}
   ret.data = await fsPromise.readFile(templatePath, 'utf8')
-  ret.crc = util.checksum(ret.data)
   ret.templateData = JSON.parse(ret.data)
-  let zclExtension = ret.templateData.zcl
-  let zclExtensionFileContent = ''
-  // Adding zcl extension files to the template json crc
-  if (zclExtension && typeof zclExtension === 'object') {
-    for (const key of Object.keys(zclExtension)) {
-      let extension = zclExtension[key]
-      for (const key2 of Object.keys(extension)) {
-        let defaultExtensionValue = extension[key2].defaults
-        if (
-          typeof defaultExtensionValue === 'string' ||
-          defaultExtensionValue instanceof String
-        ) {
-          // Data is a string, so we will treat it as a relative path to the JSON file.
-          let externalPath = path.resolve(
-            path.join(path.dirname(templatePath), defaultExtensionValue)
-          )
-          zclExtensionFileContent += await fsPromise.readFile(
-            externalPath,
-            'utf8'
-          )
-        }
-      }
-    }
-    ret.crc = util.checksum(ret.data + zclExtensionFileContent)
-  }
-
+  // Find the json files within the gen template json files and add them to the
+  // crc as well.
+  let allJsonContentInTemplatePath = await findAndReadJsonFiles(
+    ret.templateData,
+    path.dirname(templatePath)
+  )
+  let checksumData = ret.data + allJsonContentInTemplatePath
+  ret.crc = util.checksum(checksumData)
   let requiredFeatureLevel = 0
   if ('requiredFeatureLevel' in ret.templateData) {
     requiredFeatureLevel = ret.templateData.requiredFeatureLevel