Update transaction handling during loading. (#791)

* Update transaction handling during loading.
* Update typo.
* Fix the dotdot loader in the same way as silabs loader.

Author: tecimovic

src-electron/generator/generation-engine.js

@@ -524,12 +524,11 @@ async function loadSingleTemplate(db, genTemplatesJson) {
   if (!fs.existsSync(file)) {
     context.error = `Can't locate templates file: ${file}`
     env.logWarning(context.error)
-    return Promise.resolve(context)
+    return context
   }
   context.path = file
+  await dbApi.dbBeginTransaction(db)
   try {
-    await dbApi.dbBeginTransaction(db)
-    await fsPromise.access(file, fs.constants.R_OK)
     context = await loadGenTemplate(context)
     context = await recordTemplatesPackage(context)
     return context

src-electron/main-process/startup.js

@@ -458,9 +458,7 @@ async function startSelfCheck(
       failOnLoadingError: !argv.noLoadingFailure,
     }
   )
-  options.logger(
-    `    👉 zcl metadata packlages loaded: ${zclPackageIds.length}`
-  )
+  options.logger(`    👉 zcl metadata packages loaded: ${zclPackageIds.length}`)
   let ctx = await generatorEngine.loadTemplates(
     mainDb,
     argv.generationTemplate,

src-electron/zcl/zcl-loader-dotdot.js

@@ -1257,8 +1257,11 @@ async function loadDotdotZcl(db, metafile) {
     db: db,
   }
   env.logDebug(`Loading Dotdot zcl file: ${metafile}`)
+  if (!fs.existsSync(metafile)) {
+    throw new Error(`Can't locate: ${metafile}`)
+  }
+  await dbApi.dbBeginTransaction(db)
   try {
-    await dbApi.dbBeginTransaction(db)
     Object.assign(ctx, await util.readFileContentAndCrc(ctx.metadataFile))
     ctx.packageId = await zclLoader.recordToplevelPackage(
       db,

src-electron/zcl/zcl-loader-silabs.js

@@ -2257,7 +2257,10 @@ async function loadSilabsZcl(db, metafile, isJson = false) {
     metadataFile: metafile,
     db: db,
   }
-  env.logDebug(`Loading Silabs zcl file: ${ctx.metadataFile}`)
+  env.logDebug(`Loading Silabs zcl file: ${metafile}`)
+  if (!fs.existsSync(metafile)) {
+    throw new Error(`Can't locate: ${metafile}`)
+  }
   await dbApi.dbBeginTransaction(db)
   try {
     Object.assign(ctx, await util.readFileContentAndCrc(ctx.metadataFile))