More module cleanup in the main process.

src-electron/main-process/electron-main.js

@@ -17,10 +17,8 @@
 
 const { app } = require('electron')
 const dbApi = require('../db/db-api.js')
+const { runSdkGeneration } = require('../sdk-gen/sdk-gen.js')
 
-import { version } from '../../package.json'
-import { initHttpServer, httpServerPort } from '../server/http-server.js'
-import { loadZcl } from '../zcl/zcl-loader.js'
 const Args = require('./args.js')
 const {
   logError,
@@ -34,9 +32,15 @@ const {
   setProductionEnv,
   sqliteFile,
 } = require('../util/env.js')
+const { version } = require('../../package.json')
+const {
+  generateCodeViaCli,
+  setHandlebarTemplateDirForCli,
+} = require('./menu.js')
+
+import { initHttpServer, httpServerPort } from '../server/http-server.js'
+import { loadZcl } from '../zcl/zcl-loader.js'
 import { initializeElectronUi, windowCreateIfNotThere } from './window.js'
-import { generateCodeViaCli, setHandlebarTemplateDirForCli } from './menu.js'
-import { runSdkGeneration } from '../sdk-gen/sdk-gen.js'
 
 logInitLogFile()
 
@@ -139,7 +143,7 @@ function setGenerationDirAndTemplateDir(generationDir, handlebarTemplateDir) {
   }
 }
 
-export function startSdkGeneration(
+function startSdkGeneration(
   generationDir,
   handlebarTemplateDir,
   zclPropertiesFilePath
@@ -203,3 +207,5 @@ if (app != null) {
       .then(() => logInfo('Database closed, shutting down.'))
   })
 }
+
+exports.loaded = true

src-electron/main-process/menu.js

@@ -278,7 +278,7 @@ function generateInDir(browserWindow) {
  * @export
  * @param {*} generationDir
  */
-export function generateCodeViaCli(generationDir) {
+function generateCodeViaCli(generationDir) {
   generationDirectory = generationDir
   return getGenerationProperties(
     generationOptionsFile
@@ -291,6 +291,7 @@ export function generateCodeViaCli(generationDir) {
     )
   )
 }
+exports.generateCodeViaCli = generateCodeViaCli
 
 /**
  *
@@ -298,7 +299,7 @@ export function generateCodeViaCli(generationDir) {
  * @export
  * @param {*} handlebarTemplateDir
  */
-export function setHandlebarTemplateDirForCli(handlebarTemplateDir) {
+function setHandlebarTemplateDirForCli(handlebarTemplateDir) {
   return new Promise((resolve, reject) => {
     handlebarTemplateDirectory = handlebarTemplateDir
     generationOptionsFile =
@@ -306,6 +307,7 @@ export function setHandlebarTemplateDirForCli(handlebarTemplateDir) {
     resolve(handlebarTemplateDir)
   })
 }
+exports.setHandlebarTemplateDirForCli = setHandlebarTemplateDirForCli
 
 /**
  * This function gets the directory where user wants the output and calls
@@ -394,8 +396,10 @@ function readAndProcessFile(db, filePath) {
  * @export
  * @param {*} port
  */
-export function initMenu(port) {
+function initMenu(port) {
   httpPort = port
   const menu = Menu.buildFromTemplate(template)
   Menu.setApplicationMenu(menu)
 }
+
+exports.initMenu = initMenu

src-electron/main-process/window.js

@@ -21,7 +21,8 @@ const path = require('path')
 const { iconsDirectory, mainDatabase } = require('../util/env.js')
 const { getWindowDirtyFlagWithCallback } = require('../db/query-session.js')
 
-import { initMenu } from './menu.js'
+const { initMenu } = require('./menu.js')
+
 import { initTray } from './tray.js'
 
 export function initializeElectronUi(port) {

src-electron/sdk-gen/sdk-gen.js

@@ -304,7 +304,7 @@ function generateClusters(ctx) {
  *
  * @param {*} ctx Contains generationDir, templateDir, db and options dontWrite which can prevent final writing.
  */
-export function runSdkGeneration(ctx) {
+function runSdkGeneration(ctx) {
   console.log(
     `Generating SDK artifacts into ${ctx.generationDir}, using templates from ${ctx.templateDir}`
   )
@@ -323,3 +323,5 @@ export function runSdkGeneration(ctx) {
 
   return mainPromise
 }
+
+exports.runSdkGeneration = runSdkGeneration

test/electron.test.js

@@ -21,5 +21,5 @@
 const electronMain = require('../src-electron/main-process/electron-main.js')
 
 test('Make sure electron main process loads', () => {
-  expect(electronMain.startSdkGeneration).not.toBeUndefined()
+  expect(electronMain.loaded).toBeTruthy()
 })

test/generation.test.js

@@ -20,28 +20,29 @@
 
 const dbApi = require('../src-electron/db/db-api.js')
 const { selectCountFrom } = require('../src-electron/db/query-generic.js')
-
-import axios from 'axios'
-import fs from 'fs-extra'
-import { version } from '../package.json'
-import { zclPropertiesFile } from '../src-electron/main-process/args'
-import {
+const {
   logError,
   logInfo,
   schemaFile,
   setDevelopmentEnv,
   sqliteTestFile,
   setMainDatabase,
-} from '../src-electron/util/env'
+} = require('../src-electron/util/env.js')
+const {
+  setHandlebarTemplateDirForCli,
+  generateCodeViaCli,
+} = require('../src-electron/main-process/menu.js')
+
+const axios = require('axios')
+
+import fs from 'fs-extra'
+import { version } from '../package.json'
+import { zclPropertiesFile } from '../src-electron/main-process/args'
 import {
   initHttpServer,
   shutdownHttpServer,
 } from '../src-electron/server/http-server'
 import { loadZcl } from '../src-electron/zcl/zcl-loader'
-import {
-  setHandlebarTemplateDirForCli,
-  generateCodeViaCli,
-} from '../src-electron/main-process/menu'
 
 var db
 const port = 9074

test/sdk-gen.test.js

@@ -18,10 +18,13 @@
  * @jest-environment node
  */
 
+const dbApi = require('../src-electron/db/db-api.js')
+const { selectAllClusters } = require('../src-electron/db/query-zcl.js')
+const { runSdkGeneration } = require('../src-electron/sdk-gen/sdk-gen.js')
+
 import path from 'path'
 import fs from 'fs'
 import { version } from '../package.json'
-const dbApi = require('../src-electron/db/db-api.js')
 import {
   logInfo,
   schemaFile,
@@ -29,10 +32,8 @@ import {
   appDirectory,
   setDevelopmentEnv,
 } from '../src-electron/util/env'
-import { runSdkGeneration } from '../src-electron/sdk-gen/sdk-gen'
 import { loadZcl } from '../src-electron/zcl/zcl-loader'
 import { zclPropertiesFile } from '../src-electron/main-process/args'
-const { selectAllClusters } = require('../src-electron/db/query-zcl.js')
 
 describe('SDK gen tests', () => {
   var db