@rxap/schematic-angular 18.0.3-dev.1 → 18.1.0-dev.1

package/src/lib/use-pick-from-table-interface-as-form-type.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsePickFromTableInterfaceAsFormTypeRule = void 0;
 const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
+const ts_morph_2 = require("ts-morph");
 const form_table_action_1 = require("../schematics/table/action/form-table-action");
 function UsePickFromTableInterfaceAsFormTypeRule(options) {
-    const { name, columnList, formName, suffix = 'table', } = options;
+    const { name, columnList, formName, suffix = 'table', filterList, } = options;
     const className = (0, schematics_utilities_1.CoerceSuffix)((0, utilities_1.classify)(formName), 'Form');
     const interfaceName = `I${className}`;
     const tableInterfaceName = `I${(0, utilities_1.classify)(name)}${(0, utilities_1.classify)(suffix)}`;
@@ -15,14 +17,26 @@ function UsePickFromTableInterfaceAsFormTypeRule(options) {
         if (interfaceDeclaration) {
             interfaceDeclaration.remove();
         }
-        const type = `Pick<${tableInterfaceName}, ${columnList.filter(c => c.hasFilter)
-            .map(c => `'${(0, utilities_1.camelize)(c.name)}'`)
-            .join(' | ')}>`;
+        const type = w => {
+            if (columnList.some(c => c.hasFilter)) {
+                w.write(`Pick<${tableInterfaceName}, ${columnList.filter(c => c.hasFilter)
+                    .map(c => `'${(0, utilities_1.camelize)(c.name)}'`)
+                    .join(' | ')}>`);
+            }
+            if (filterList.length && columnList.some(c => c.hasFilter)) {
+                w.write(' & ');
+            }
+            if (filterList.length) {
+                ts_morph_2.Writers.objectType({
+                    properties: filterList.map(control => ({ name: (0, utilities_1.camelize)(control.name), type: control.type.name })),
+                })(w);
+            }
+        };
         (0, form_table_action_1.CoerceTypeAlias)(sourceFile, interfaceName, {
             type,
             isExported: true,
         }).set({ type });
-        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: [tableInterfaceName],
             moduleSpecifier: `./${name}-${(0, utilities_1.dasherize)(suffix)}`,
         });

package/src/lib/use-pick-from-table-interface-as-form-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-pick-from-table-interface-as-form-type.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/use-pick-from-table-interface-as-form-type.ts"],"names":[],"mappings":";;;AACA,mEAImC;AACnC,qEAA0D;AAC1D,+CAIyB;AACzB,oFAA+E;AAW/E,SAAgB,uCAAuC,CACrD,OAAuD;IAEvD,MAAM,EACJ,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,GAAG,OAAO,GACjB,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,oBAAQ,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAK,SAAU,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAK,IAAA,oBAAQ,EAAC,IAAI,CAAE,GAAG,IAAA,oBAAQ,EAAC,MAAM,CAAC,EAAE,CAAC;IAErE,OAAO,IAAA,wDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE7E,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,oBAAoB,EAAE,CAAC;YACzB,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,IAAI,GAAG,QAAS,kBAAmB,KAAM,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC/E,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAK,IAAA,oBAAQ,EAAC,CAAC,CAAC,IAAI,CAAE,GAAG,CAAC;aACnC,IAAI,CAAC,KAAK,CAAE,GAAG,CAAC;QAEnB,IAAA,mCAAe,EAAC,UAAU,EAAE,aAAa,EAAE;YACzC,IAAI;YACJ,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjB,IAAA,mCAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,kBAAkB,CAAE;YACpC,eAAe,EAAE,KAAM,IAAK,IAAI,IAAA,qBAAS,EAAC,MAAM,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC,EAAE,CAAE,GAAG,GAAG,IAAA,mCAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAE,CAAC,CAAC;AACnD,CAAC;AAnCD,0FAmCC"}
+{"version":3,"file":"use-pick-from-table-interface-as-form-type.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/use-pick-from-table-interface-as-form-type.ts"],"names":[],"mappings":";;;AACA,mEAEmC;AACnC,qEAA0D;AAC1D,6CAA+C;AAC/C,+CAIyB;AAEzB,uCAGkB;AAClB,oFAA+E;AAa/E,SAAgB,uCAAuC,CACrD,OAAuD;IAEvD,MAAM,EACJ,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,GAAG,OAAO,EAChB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,oBAAQ,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAK,SAAU,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAK,IAAA,oBAAQ,EAAC,IAAI,CAAE,GAAG,IAAA,oBAAQ,EAAC,MAAM,CAAC,EAAE,CAAC;IAErE,OAAO,IAAA,wDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE7E,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,oBAAoB,EAAE,CAAC;YACzB,oBAAoB,CAAC,MAAM,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,IAAI,GAAmB,CAAC,CAAC,EAAE;YAC/B,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtC,CAAC,CAAC,KAAK,CAAC,QAAS,kBAAmB,KAAM,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;qBAC1E,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAK,IAAA,oBAAQ,EAAC,CAAC,CAAC,IAAI,CAAE,GAAG,CAAC;qBACnC,IAAI,CAAC,KAAK,CAAE,GAAG,CAAC,CAAC;YACtB,CAAC;YACD,IAAI,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3D,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;YACD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,kBAAO,CAAC,UAAU,CAAC;oBACjB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAA,oBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;iBACnG,CAAC,CAAC,CAAC,CAAC,CAAC;YACR,CAAC;QACH,CAAC,CAAC;QAEF,IAAA,mCAAe,EAAC,UAAU,EAAE,aAAa,EAAE;YACzC,IAAI;YACJ,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjB,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,kBAAkB,CAAE;YACpC,eAAe,EAAE,KAAM,IAAK,IAAI,IAAA,qBAAS,EAAC,MAAM,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC,EAAE,CAAE,GAAG,GAAG,IAAA,mCAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAE,CAAC,CAAC;AACnD,CAAC;AAhDD,0FAgDC"}

package/src/lib/utilities/if-truthy.d.ts

@@ -0,0 +1,8 @@
+import { DataProperty, NormalizedDataProperty } from '@rxap/ts-morph';
+export interface IfTruthy {
+    property: DataProperty;
+}
+export interface NormalizedIfTruthy {
+    property: NormalizedDataProperty;
+}
+export declare function NormalizeIfTruthy(item?: IfTruthy): NormalizedIfTruthy | null;

package/src/lib/utilities/if-truthy.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NormalizeIfTruthy = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
+function NormalizeIfTruthy(item) {
+    if (!item || Object.keys(item).length === 0) {
+        return null;
+    }
+    return Object.seal({
+        property: (0, ts_morph_1.NormalizeDataProperty)(item.property),
+    });
+}
+exports.NormalizeIfTruthy = NormalizeIfTruthy;
+//# sourceMappingURL=if-truthy.js.map

package/src/lib/utilities/if-truthy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"if-truthy.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/angular/src/lib/utilities/if-truthy.ts"],"names":[],"mappings":";;;AAAA,6CAIwB;AAUxB,SAAgB,iBAAiB,CAAC,IAAe;IAC/C,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;QACjB,QAAQ,EAAE,IAAA,gCAAqB,EAAC,IAAI,CAAC,QAAQ,CAAC;KAC/C,CAAC,CAAC;AACL,CAAC;AAPD,8CAOC"}

package/src/schema.json

@@ -129,30 +129,7 @@
               "$ref": "#/definitions/accordionIdentifier"
             },
             "header": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "title": {
-                      "type": "string"
-                    }
-                  },
-                  "required": [
-                    "title"
-                  ]
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "property": {
-                      "$ref": "#/definitions/property"
-                    }
-                  },
-                  "required": [
-                    "property"
-                  ]
-                }
-              ]
+              "$ref": "#/definitions/accordionHeader"
             },
             "itemList": {
               "alias": "item",
@@ -176,6 +153,33 @@
         }
       ]
     },
+    "accordionHeader": {
+      "oneOf": [
+        {
+          "allOf": [
+            {
+              "$ref": "#/definitions/baseAccordionHeader"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "kind": {
+                  "type": "string",
+                  "const": "default",
+                  "default": "default"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "$ref": "#/definitions/staticAccordionHeader"
+        },
+        {
+          "$ref": "#/definitions/propertyAccordionHeader"
+        }
+      ]
+    },
     "accordionIdentifier": {
       "type": "object",
       "properties": {
@@ -482,6 +486,31 @@
       "description": "The backend that should be used to handel data",
       "default": "none"
     },
+    "baseAccordionHeader": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string"
+        },
+        "template": {
+          "type": "string"
+        },
+        "importList": {
+          "alias": "import",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/type"
+          }
+        },
+        "propertyList": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/property"
+          }
+        }
+      },
+      "required": []
+    },
     "baseAccordionItem": {
       "type": "object",
       "properties": {
@@ -610,6 +639,61 @@
         }
       ]
     },
+    "baseTableAction": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string"
+        },
+        "refresh": {
+          "type": "boolean"
+        },
+        "confirm": {
+          "type": "boolean"
+        },
+        "tooltip": {
+          "type": "string"
+        },
+        "errorMessage": {
+          "type": "string"
+        },
+        "successMessage": {
+          "type": "string"
+        },
+        "priority": {
+          "type": "number"
+        },
+        "checkFunction": {
+          "type": "string"
+        },
+        "inHeader": {
+          "type": "boolean"
+        },
+        "kind": {
+          "alias": "role",
+          "type": "string"
+        },
+        "icon": {
+          "type": "string"
+        },
+        "svgIcon": {
+          "type": "string"
+        },
+        "permission": {
+          "type": "string"
+        },
+        "color": {
+          "type": "string",
+          "description": "Value for the color input of the mat-button / mat-icon component"
+        },
+        "cssClass": {
+          "$ref": "#/definitions/cssClass"
+        }
+      },
+      "required": [
+        "type"
+      ]
+    },
     "baseTableColumn": {
       "type": "object",
       "properties": {
@@ -1069,14 +1153,19 @@
         }
       ]
     },
-    "dialogTableActionSchematic": {
+    "dialogTableAction": {
       "allOf": [
         {
-          "$ref": "#/definitions/tableActionSchematic"
+          "$ref": "#/definitions/baseTableAction"
         },
         {
           "type": "object",
           "properties": {
+            "kind": {
+              "type": "string",
+              "const": "dialog",
+              "default": "dialog"
+            },
             "withoutBody": {
               "type": "boolean",
               "description": "Whether the table action operation should be without body",
@@ -1116,7 +1205,21 @@
               "type": "string",
               "description": "The title for the dialog"
             }
-          }
+          },
+          "required": [
+            "kind",
+            "title"
+          ]
+        }
+      ]
+    },
+    "dialogTableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/tableActionSchematic"
+        },
+        {
+          "$ref": "#/definitions/dialogTableAction"
         }
       ]
     },
@@ -1419,17 +1522,31 @@
         }
       ]
     },
-    "formTableActionSchematic": {
+    "formTableAction": {
       "allOf": [
         {
-          "$ref": "#/definitions/tableActionSchematic"
+          "$ref": "#/definitions/baseTableAction"
         },
         {
           "type": "object",
           "properties": {
+            "kind": {
+              "type": "string",
+              "const": "form",
+              "default": "form"
+            },
             "formInitial": {
-              "type": "object",
-              "description": "The mapping from the row object to the form initial object"
+              "oneOf": [
+                {
+                  "type": "object",
+                  "description": "The mapping from the row object to the form initial object"
+                },
+                {
+                  "type": "boolean",
+                  "description": "If true the row object will be used as form initial object. If false the form initial object will be empty. Default is false.",
+                  "default": false
+                }
+              ]
             },
             "formComponent": {
               "type": "string"
@@ -1477,10 +1594,24 @@
                 }
               }
             },
-            "formOptions": {
+            "form": {
+              "alias": "formOptions",
               "$ref": "#/definitions/formComponent"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
+        }
+      ]
+    },
+    "formTableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/tableActionSchematic"
+        },
+        {
+          "$ref": "#/definitions/formTableAction"
         }
       ]
     },
@@ -1712,6 +1843,14 @@
         "rowId": {
           "$ref": "#/definitions/property"
         },
+        "filterList": {
+          "alias": "filter",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/formControl"
+          },
+          "description": "List of table filter controls"
+        },
         "columnList": {
           "alias": "column",
           "type": "array",
@@ -1784,14 +1923,19 @@
         }
       }
     },
-    "navigationTableActionSchematic": {
+    "navigationTableAction": {
       "allOf": [
         {
-          "$ref": "#/definitions/tableActionSchematic"
+          "$ref": "#/definitions/baseTableAction"
         },
         {
           "type": "object",
           "properties": {
+            "kind": {
+              "type": "string",
+              "const": "navigation",
+              "default": "navigation"
+            },
             "route": {
               "type": "string",
               "description": "The route for the table action"
@@ -1801,7 +1945,21 @@
               "description": "Use the current ActivatedRoute to resolve the route or not",
               "default": false
             }
-          }
+          },
+          "required": [
+            "kind",
+            "route"
+          ]
+        }
+      ]
+    },
+    "navigationTableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/tableActionSchematic"
+        },
+        {
+          "$ref": "#/definitions/navigationTableAction"
         }
       ]
     },
@@ -1826,14 +1984,19 @@
         }
       ]
     },
-    "openApiTableActionSchematic": {
+    "openApiTableAction": {
       "allOf": [
         {
-          "$ref": "#/definitions/tableActionSchematic"
+          "$ref": "#/definitions/baseTableAction"
         },
         {
           "type": "object",
           "properties": {
+            "kind": {
+              "type": "string",
+              "const": "open-api",
+              "default": "open-api"
+            },
             "operationId": {
               "type": "string",
               "description": "The open api operationId for the table action"
@@ -1870,15 +2033,49 @@
             }
           },
           "required": [
+            "kind",
             "operationId"
           ]
         }
       ]
     },
+    "openApiTableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/tableActionSchematic"
+        },
+        {
+          "$ref": "#/definitions/openApiTableAction"
+        }
+      ]
+    },
+    "operationTableAction": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseTableAction"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "operation",
+              "default": "operation"
+            }
+          },
+          "required": [
+            "kind"
+          ]
+        }
+      ]
+    },
     "operationTableActionSchematic": {
       "allOf": [
         {
           "$ref": "#/definitions/tableActionSchematic"
+        },
+        {
+          "$ref": "#/definitions/operationTableAction"
         }
       ]
     },
@@ -1994,6 +2191,29 @@
         }
       ]
     },
+    "propertyAccordionHeader": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseAccordionHeader"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "static",
+              "default": "static"
+            },
+            "property": {
+              "$ref": "#/definitions/property"
+            }
+          },
+          "required": [
+            "property"
+          ]
+        }
+      ]
+    },
     "routeComponent": {
       "allOf": [
         {
@@ -2624,6 +2844,30 @@
         }
       ]
     },
+    "staticAccordionHeader": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseAccordionHeader"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "static",
+              "default": "static"
+            },
+            "title": {
+              "type": "string",
+              "description": "The title of the accordion header"
+            }
+          },
+          "required": [
+            "title"
+          ]
+        }
+      ]
+    },
     "switchAccordionItem": {
       "allOf": [
         {
@@ -2787,60 +3031,39 @@
     },
     "tableAction": {
       "type": "object",
-      "properties": {
-        "type": {
-          "type": "string"
-        },
-        "refresh": {
-          "type": "boolean"
-        },
-        "confirm": {
-          "type": "boolean"
-        },
-        "tooltip": {
-          "type": "string"
-        },
-        "errorMessage": {
-          "type": "string"
-        },
-        "successMessage": {
-          "type": "string"
-        },
-        "priority": {
-          "type": "number"
-        },
-        "checkFunction": {
-          "type": "string"
-        },
-        "inHeader": {
-          "type": "boolean"
-        },
-        "role": {
-          "type": "string"
-        },
-        "icon": {
-          "type": "string"
+      "oneOf": [
+        {
+          "allOf": [
+            {
+              "$ref": "#/definitions/baseTableAction"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "kind": {
+                  "type": "string",
+                  "const": "default",
+                  "default": "default"
+                }
+              }
+            }
+          ]
         },
-        "svgIcon": {
-          "type": "string"
+        {
+          "$ref": "#/definitions/dialogTableAction"
         },
-        "permission": {
-          "type": "string"
+        {
+          "$ref": "#/definitions/formTableAction"
         },
-        "color": {
-          "type": "string",
-          "description": "Value for the color input of the mat-button / mat-icon component"
+        {
+          "$ref": "#/definitions/navigationTableAction"
         },
-        "cssClass": {
-          "$ref": "#/definitions/cssClass"
+        {
+          "$ref": "#/definitions/openApiTableAction"
         },
-        "options": {
-          "type": "object",
-          "additionalProperties": true
+        {
+          "$ref": "#/definitions/operationTableAction"
         }
-      },
-      "required": [
-        "type"
       ]
     },
     "tableActionSchematic": {

package/src/schematics/accordion/accordion-component/files/component/__componentName__.component.html.hbs

@@ -22,6 +22,9 @@
     {{/if}}
     >
     {{#each itemList}}
+    {{#if this.ifTruthy}}
+    <ng-template [ngIf]="data.{{this.ifTruthy.property.name}}">
+    {{/if}}
     {{#if this.permission}}
     <ng-template rxapIfHasPermission="{{this.permission}}">
     {{/if}}
@@ -29,6 +32,9 @@
     {{#if this.permission}}
     </ng-template>
     {{/if}}
+    {{#if this.ifTruthy}}
+    </ng-template>
+    {{/if}}
     {{/each}}
   </mat-accordion>
 </div>

package/src/schematics/accordion/accordion-component/index.d.ts

@@ -1,15 +1,15 @@
 import { Rule, Tree } from '@angular-devkit/schematics';
-import { NormalizedDataProperty, NormalizedUpstreamOptions } from '@rxap/ts-morph';
+import { NormalizedDataProperty, NormalizedTypeImport, NormalizedUpstreamOptions } from '@rxap/ts-morph';
 import { Normalized } from '@rxap/utilities';
-import { NormalizedAccordionHeader } from '../../../lib/accordion-header';
+import { NormalizedAccordionHeader } from '../../../lib/accordion/accordion-header';
 import { NormalizedAccordionIdentifier } from '../../../lib/accordion-identifier';
-import { NormalizedBaseAccordionItem } from '../../../lib/accordion-item';
+import { NormalizedAccordionItem } from '../../../lib/accordion/accordion-item';
 import { AngularOptions, NormalizedAngularOptions } from '../../../lib/angular-options';
 import { NormalizedPersistent } from '../../../lib/persistent';
 import { AccordionComponentOptions } from './schema';
 export interface NormalizedAccordionComponentOptions extends Readonly<Normalized<Omit<AccordionComponentOptions, keyof AngularOptions | 'itemList' | 'persistent' | 'identifier'>> & NormalizedAngularOptions> {
     name: string;
-    itemList: ReadonlyArray<NormalizedBaseAccordionItem>;
+    itemList: ReadonlyArray<NormalizedAccordionItem>;
     persistent: NormalizedPersistent | null;
     withPermission: boolean;
     header: NormalizedAccordionHeader | null;
@@ -17,5 +17,6 @@ export interface NormalizedAccordionComponentOptions extends Readonly<Normalized
     controllerName: string;
     propertyList: NormalizedDataProperty[];
     upstream: NormalizedUpstreamOptions | null;
+    importList: NormalizedTypeImport[];
 }
 export default function (options: AccordionComponentOptions): (host: Tree) => Rule;