@mchp-mcc/scf-pic8-osc-v1 4.3.1 → 4.3.2

package/src/DerivedData.ts

@@ -12,7 +12,7 @@ import {
 } from "../generated_module/src/types/AutoModuleTypes";
 import * as InterfaceTypes from "@microchip/scf-interface";
 
-export const getDerivedData = (dataModel: AppModel): DerivedData => {
+export const getDerivedData = (dataModel: AppModel | undefined): DerivedData => {
     if (dataModel) {
         return new MyDerivedData(dataModel);
     }
@@ -20,7 +20,7 @@ export const getDerivedData = (dataModel: AppModel): DerivedData => {
 };
 
 //This data will be used at the creator stage and relies on only the state
-class EmptyDerivedData implements DerivedData {
+export class EmptyDerivedData implements DerivedData {
     getMyFunctions = (): DerivedFunctions => {
         return {};
     };
@@ -30,7 +30,7 @@ class EmptyDerivedData implements DerivedData {
 }
 
 //This data will be used at the processor stage
-class MyDerivedData implements DerivedData {
+export class MyDerivedData implements DerivedData {
     private dataModel: AppModel;
     private clockCalculator: ClockCalculator;
 
@@ -57,9 +57,9 @@ class MyDerivedData implements DerivedData {
             isEnabled: this.isEnabled,
             isVisible: this.isVisible,
             currentSystemClk: (): number =>
-                this.getClockCalculator()?.getCurrentSystemClk(),
+                this.getClockCalculator().getCurrentSystemClk(),
             "fosc-hz_payload": (): string =>
-                this.getClockCalculator()?.getCurrentSystemClk()?.toString() ?? "1000000",
+                this.getClockCalculator().getCurrentSystemClk().toString(),
             initializer_system_results: this.initializer_system_results,
             config_device_results: this.config_device_results,
             templateData: this.getTemplateData,
@@ -112,14 +112,13 @@ class MyDerivedData implements DerivedData {
             compiler: "XC8 v2.20",
             tool: "MPLAB X 5.40",
 
-            deviceFrequency:
-                this.getClockCalculator()?.getCurrentSystemClk()?.toString() ?? "1000000",
+            deviceFrequency: this.getClockCalculator().getCurrentSystemClk().toString(),
 
             initRegisters: initRegisters,
             header: headers,
 
-            moduleNameUpperCase: this.getModuleName()?.toUpperCase() ?? "",
-            moduleNameLowerCase: this.getModuleName()?.toLowerCase() ?? "",
+            moduleNameUpperCase: this.getModuleName().toUpperCase(),
+            moduleNameLowerCase: this.getModuleName().toLowerCase(),
         };
     };
     private initializer_system_results = (): initializer_system.Results => {
@@ -201,7 +200,7 @@ class MyDerivedData implements DerivedData {
         )?.[componentName];
         let selectedOptionVal: string | undefined;
         if (externalClkSelectedOptions) {
-            selectedOptionVal = externalClkSelectedOptions["defaultValue"]?.["value"];
+            selectedOptionVal = externalClkSelectedOptions["defaultValue"]["value"];
         }
         return selectedOptionVal ?? undefined;
     };