@mchp-mcc/scf-pic8-pwm-v2 4.2.7 → 4.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mchp-mcc/scf-pic8-pwm-v2",
-    "version": "4.2.7",
+    "version": "4.2.9",
     "scf": {
         "reducer": "auto",
         "creator": "output/creator.js",
@@ -105,8 +105,8 @@
         "profile": "jest profile",
         "build-run-dir-future": "node config/extract-run-directory-future.js",
         "release": "yarn build && yarn test && node -e 'require(\"./config/scf-project-scripts\").releaseProject()'",
-        "test:itf:all": "node ./node_modules/@microchip/ccl-itf/lib/index.js --sp=./tests/itf --rd=./run --sf=pwmV2.major.test.ts  --df=\"PIC16F18076|PIC16F18877|PIC18F47Q10\"",
-        "test:itf:dev": "node ./node_modules/@microchip/ccl-itf/lib/index.js --sp=./tests/itf --rd=./run --sf=pwmV2.major.test.ts --df=\"PIC16F18076\"",
+        "test:itf:all": "node ./node_modules/@microchip/ccl-itf/lib/index.js --sp=./tests/itf --rd=./run --sf=pwmV2.major.test.ts --df=\"PIC16LF1566|PIC16LF1567\"",
+        "test:itf:dev": "node ./node_modules/@microchip/ccl-itf/lib/index.js --sp=./tests/itf --rd=./run --sf=pwmV2.major.test.ts --df=\"PIC16LF1566\"",
         "postprocess": "node config/appendPrototype.js"
     },
     "husky": {
@@ -151,9 +151,9 @@
         "@microchip/basic_pin": "^1.0.2",
         "@microchip/fosc-hz": "^0.1.2",
         "@microchip/osc-clocks": "^0.2.0",
-        "@microchip/pin-standard": "^0.2.14",
-        "@microchip/scf-common": "^3.17.0",
-        "@microchip/scf-device": "^8.5.0",
+        "@microchip/pin-standard": "^0.6.0",
+        "@microchip/scf-common": "^3.21.0",
+        "@microchip/scf-device": "^8.9.0",
         "@microchip/scf-integration-test": "^1.0.0",
         "@microchip/scf-interface": "^1.4.0",
         "@microchip/scf-register-view-helper": "^2.5.0",
@@ -169,16 +169,16 @@
         "@babel/preset-env": "^7.9.6",
         "@babel/preset-react": "^7.9.4",
         "@babel/preset-typescript": "^7.9.0",
-        "@mchp-mcc/pic-8bit": "^5.9.0-dev.5",
-        "@mchp-mcc/pic-8bit-types": "^5.9.0-dev.5",
-        "@microchip/ccl-itf": "^1.5.0",
-        "@microchip/initializer-system": "^0.5.3",
-        "@microchip/melody-automodule-interface": "^1.5.1",
+        "@mchp-mcc/pic-8bit": "^5.19.1-dev.2",
+        "@mchp-mcc/pic-8bit-types": "^5.19.1-dev.2",
+        "@microchip/ccl-itf": "^1.6.0",
+        "@microchip/initializer-system": "^0.5.5",
+        "@microchip/melody-automodule-interface": "^1.10.3",
         "@microchip/pic-8bit-types": "^5.0.1",
         "@microchip/run-directory": "^4.2.3",
-        "@microchip/scf-automodule": "^5.5.1",
-        "@microchip/scf-automodule-impl": "^1.7.1",
-        "@microchip/scf-autoview": "^3.26.1",
+        "@microchip/scf-automodule": "^5.10.4",
+        "@microchip/scf-automodule-impl": "^1.12.3",
+        "@microchip/scf-autoview": "^3.32.4",
         "@microchip/scf-project-scripts": "^1.0.0",
         "@types/core-js": "^2.5.1",
         "@types/enzyme": "^3.9.3",
@@ -220,7 +220,7 @@
         "prettier": "^2.0.5",
         "ts-jest": "^24.0.2",
         "ts-pnp": "^1.1.2",
-        "typescript": "^4.0.5",
+        "typescript": "~4.5.5",
         "webpack": "^4.34.0",
         "webpack-cli": "^3.3.4",
         "webpack-merge": "^4.2.2",

package/src/DerivedData.test.ts

@@ -44,7 +44,7 @@ describe("Empty Derived Data Test ", () => {
 describe("C custom name validator", () => {
     it("invalid Custom name", () => {
         const mockModule = mockAssignedModule(mockState());
-        const model = getModel(mockModule, getDerivedData);
+        const model = getModel(mockModule, getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         const cName = new RegExp(derivedFunctions.componentNameValidator().pattern);
@@ -54,7 +54,7 @@ describe("C custom name validator", () => {
 
 describe("Import Interface test Cases ", () => {
     const mockMod = mockAssignedModule(mockState());
-    const model = getModel(mockMod, MyDerivedData.getDerivedData);
+    const model = getModel(mockMod, MyDerivedData.getDerivedData as any);
     const derivedData = model?.getDerivedData() as DerivedData;
     const derivedFunctions = derivedData?.getMyFunctions();
 
@@ -114,7 +114,7 @@ describe("Alert test Cases ", () => {
     describe("Default: Timer 2 Dependency Selector ", () => {
         const model = getModel(
             mockAssignedModule(getMockState(true, "TMR2", "None")),
-            MyDerivedData.getDerivedData,
+            MyDerivedData.getDerivedData as any,
         );
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
@@ -129,7 +129,7 @@ describe("Alert test Cases ", () => {
     describe("Default:  Timer 4 Dependency Selector", () => {
         const model = getModel(
             mockAssignedModule(getMockState(true, "TMR4", "None")),
-            MyDerivedData.getDerivedData,
+            MyDerivedData.getDerivedData as any,
         );
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
@@ -144,7 +144,7 @@ describe("Alert test Cases ", () => {
     describe("Default:  Timer 6 Dependency Selector", () => {
         const model = getModel(
             mockAssignedModule(getMockState(true, "TMR6", "None")),
-            MyDerivedData.getDerivedData,
+            MyDerivedData.getDerivedData as any,
         );
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
@@ -178,12 +178,12 @@ describe("Alert test Cases ", () => {
                 },
             },
         };
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         const alert1 = {
             type: "hint",
-            text: "PWM4 uses TMR2.",
+            text: "PWM7 uses TMR2.",
         };
         const alert2 = {
             type: "hint",
@@ -226,7 +226,7 @@ describe("DerivedData for APIs: FilterImports -- >", () => {
             };
             const model = getModel(
                 mockAssignedModule(mockState),
-                getDerivedData,
+                getDerivedData as any,
             ) as AppModel;
 
             const derivedData = model?.getDerivedData() as DerivedData;
@@ -253,7 +253,7 @@ describe("DerivedData for APIs: FilterImports -- >", () => {
 describe("DerivedData for APIs: Processed payload -- >", () => {
     describe("Timer 2 -->", () => {
         const mockModule = mockAssignedModule(getMockState(true, "TMR2", "TMR2"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Selected Tmr", () => {
@@ -265,43 +265,43 @@ describe("DerivedData for APIs: Processed payload -- >", () => {
 describe("DerivedData for APIs: Timer selection -- >", () => {
     describe("Timer 2 -->", () => {
         const mockModule = mockAssignedModule(getMockState(true, "TMR2", "TMR2"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Selected Tmr", () => {
-            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM4timer2");
+            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM7timer2");
         });
     });
     describe("Timer 4 -->", () => {
         const mockModule = mockAssignedModule(getMockState(true, "TMR4", "TMR4"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Selected Tmr", () => {
-            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM4timer4");
+            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM7timer4");
         });
     });
     describe("No-->", () => {
         const mockModule = mockAssignedModule(getMockState(true, "TMR6", "TMR6"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Selected Tmr", () => {
-            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM4timer6");
+            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM7timer6");
         });
     });
     describe("No PWM Timer -->", () => {
         const mockModule = mockAssignedModule(getMockState(true, undefined, "None"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Selected Tmr", () => {
-            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM4timer2");
+            expect(derivedFunctions?.ctselPwmtmrs?.()).toEqual("PWM7timer2");
         });
     });
     describe("Invalid Timer -->", () => {
         const mockModule = mockAssignedModule(getMockState(true, "TMR", "TMR"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Selected Tmr", () => {
@@ -313,14 +313,14 @@ describe("DerivedData for APIs: Timer selection -- >", () => {
 describe("DerivedData for APIs: sdl help override -- >", () => {
     describe("DerivedData for APIs -- >", () => {
         const mockModule = mockAssignedModule(getMockState(true, "TMR2", "TMR2"));
-        const model = getModel(mockModule, MyDerivedData.getDerivedData);
+        const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
         const derivedData = model?.getDerivedData() as DerivedData;
         const derivedFunctions = derivedData?.getMyFunctions();
         it("Test for Pin Data value", () => {
             expect(derivedFunctions?.pinData()).toEqual({});
         });
         it("Test for Module Name value", () => {
-            expect(derivedFunctions?.moduleName?.()).toEqual("PWM4");
+            expect(derivedFunctions?.moduleName?.()).toEqual("PWM7");
         });
         // it("Test for Custom Name value", () => {
         //     expect(derivedFunctions?.componentName?.()).toEqual(undefined);
@@ -361,7 +361,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             // expect(mockDerivedFunctions?.overrideOptions?.("ccpTimer")).toEqual([]);
@@ -393,7 +396,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             // expect(mockDerivedFunctions?.overrideOptions?.("ccpTimer")).toEqual([]);
@@ -421,7 +427,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             // expect(mockDerivedFunctions?.overrideOptions?.("ccpTimer")).toEqual([]);
@@ -460,7 +469,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             expect(
@@ -492,7 +504,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             expect(
@@ -524,7 +539,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             expect(
@@ -557,7 +575,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             expect(
@@ -586,7 +607,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             expect(
@@ -605,7 +629,10 @@ describe("DerivedData for APIs: sdl help override -- >", () => {
                     },
                 },
             };
-            const mockModel = getModel(mockAssignedMod, MyDerivedData.getDerivedData);
+            const mockModel = getModel(
+                mockAssignedMod,
+                MyDerivedData.getDerivedData as any,
+            );
             const mockDerivedData = mockModel?.getDerivedData() as DerivedData;
             const mockDerivedFunctions = mockDerivedData?.getMyFunctions();
             expect(

package/src/DerivedData.ts

@@ -14,6 +14,7 @@ import { getAutoSdlHelp } from "@microchip/scf-automodule-impl/lib/autoModule/Co
 import { getPinsLogic } from "../generated_module/src/pins/PCPHelper";
 import { MyImports } from "../generated_module/src/types";
 import { getCFunctionValidator, PatternValidator } from "@microchip/scf-validators/lib";
+import { QueryAdapterKey, intf_args } from "@microchip/pin-standard/lib/pin-standard";
 
 export const getDerivedData = (dataModel: AppModel): DerivedData => {
     if (dataModel) {
@@ -88,6 +89,7 @@ class MyDerivedData implements DerivedData {
             importName: this.friendlyImportName,
             componentNameValidator: this.componentNameValidator,
             getCustomUiErrors: this.getCustomUiErrors,
+            pin_standard_args: this.getPinstandardArgs,
         };
     };
 
@@ -128,6 +130,17 @@ class MyDerivedData implements DerivedData {
         }
     };
 
+    private readonly getPinstandardArgs = (): intf_args => {
+        const args: intf_args = {
+            queryAdapters: ["pps", "apfcon"],
+            queryAdapterMap: {
+                [QueryAdapterKey.ALLPINS]: "^PWM[0-9]{0,1}$",
+            },
+        };
+
+        return args;
+    };
+
     private overrideDefaultOptions = (componentName: string): any[] => {
         switch (componentName) {
             case "timerSelection": {
@@ -140,7 +153,7 @@ class MyDerivedData implements DerivedData {
                 if (CCPTMRSREG) {
                     const CTSELSETT = CCPTMRSREG.settings?.CTSEL;
                     for (const eachoptn of CTSELSETT?.options ?? []) {
-                        const timeroptnregex = /^pwm[0-9]timer([0-9])$/i;
+                        const timeroptnregex = /^pwm\d+timer(\d)$/i;
                         const optnmatch = eachoptn.alias.match(timeroptnregex);
                         const correctOptnName =
                             (optnmatch?.length ?? 0) > 1 ? "TMR" + optnmatch?.[1] : "";
@@ -150,7 +163,7 @@ class MyDerivedData implements DerivedData {
                 if (PWMTMRSREG) {
                     const CTSELSETT = PWMTMRSREG.settings?.CTSEL;
                     for (const eachoptn of CTSELSETT?.options ?? []) {
-                        const timeroptnregex = /^pwm[0-9]timer([0-9])$/i;
+                        const timeroptnregex = /^pwm\d+timer(\d)$/i;
                         const optnmatch = eachoptn.alias.match(timeroptnregex);
                         const correctOptnName =
                             (optnmatch?.length ?? 0) > 1 ? "TMR" + optnmatch?.[1] : "";
@@ -258,7 +271,7 @@ class MyDerivedData implements DerivedData {
             );
         }
 
-        return getAutoSdlHelp(this.getModel(), componentName, helpUrl);
+        return getAutoSdlHelp(this.getModel() as any, componentName, helpUrl);
     };
 
     private pwm_general_parameters_payload = (): pwm_general.ProcessedPayload => {

package/src/GeneratorModel.test.tsx

@@ -9,7 +9,7 @@ describe("GeneratorModel", () => {
     describe("getGeneratorModel", () => {
         test("componentName is undefined", () => {
             const mockModule = mockAssignedModule(mockState());
-            const model = getModel(mockModule, MyDerivedData.getDerivedData);
+            const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
             if (model) {
                 model.getComponentValue = (comp_name: string): any => {
                     const compData = {
@@ -25,7 +25,7 @@ describe("GeneratorModel", () => {
 
         test("PeripheralDescription is undefined", () => {
             const mockModule = mockAssignedModule(mockState());
-            const model = getModel(mockModule, MyDerivedData.getDerivedData);
+            const model = getModel(mockModule, MyDerivedData.getDerivedData as any);
             if (model) {
                 model.getPeripheralDescription = (): any => {
                     return undefined;
@@ -36,34 +36,4 @@ describe("GeneratorModel", () => {
             }
         });
     });
-    // describe("convertToTemplate", () => {
-    //     test("Hardware is undefined", () => {
-    //         const mockModule = mockAssignedModule(mockState());
-    //         const model = getModel(mockModule, MyDerivedData.getDerivedData);
-
-    //         if (model) {
-    //             model.getHardware = (): any => {
-    //                 return undefined;
-    //             };
-    //             const result1 = GenertorModel.convertToTemplate(
-    //                 model as AppModel,
-    //                 "positive",
-    //                 [],
-    //             );
-    //             expect(result1.length).toBe(0);
-    //             const result2 = GenertorModel.convertToTemplate(
-    //                 model as AppModel,
-    //                 "negative",
-    //                 [],
-    //             );
-    //             expect(result2.length).toBe(0);
-    //             const result3 = GenertorModel.convertToTemplate(
-    //                 model as AppModel,
-    //                 "none",
-    //                 [],
-    //             );
-    //             expect(result3.length).toBe(0);
-    //         }
-    //     });
-    // });
 });