@rxap/schematic-angular 18.1.0-dev.3 → 18.1.0-dev.5

package/src/schematics/table/table-component/schema.json

@@ -217,6 +217,17 @@
               "type": "string",
               "const": "autocomplete-table-select"
             },
+            "dataSource": {
+              "$ref": "#/definitions/dataSource"
+            },
+            "options": {
+              "type": "object",
+              "properties": {
+                "method": {
+                  "$ref": "#/definitions/method"
+                }
+              }
+            },
             "placeholder": {
               "type": "string"
             },
@@ -275,6 +286,9 @@
               "properties": {
                 "upstream": {
                   "$ref": "#/definitions/upstream"
+                },
+                "method": {
+                  "$ref": "#/definitions/method"
                 }
               }
             }
@@ -322,6 +336,14 @@
       "description": "The backend that should be used to handel data",
       "default": "none"
     },
+    "baseDataSource": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string"
+        }
+      }
+    },
     "baseFormArray": {
       "allOf": [
         {
@@ -409,6 +431,53 @@
         }
       ]
     },
+    "baseHeaderButton": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string"
+        },
+        "permission": {
+          "type": "string"
+        },
+        "icon": {
+          "type": "string"
+        },
+        "svgIcon": {
+          "type": "string"
+        },
+        "refresh": {
+          "type": "boolean",
+          "description": "Whether the table action should refresh the table after execution",
+          "default": false
+        },
+        "confirm": {
+          "type": "boolean",
+          "description": "Whether the table action should confirm before execution",
+          "default": false
+        },
+        "tooltip": {
+          "type": "string",
+          "description": "The tooltip for the table action"
+        },
+        "errorMessage": {
+          "type": "string",
+          "description": "The error message for the table action"
+        },
+        "successMessage": {
+          "type": "string",
+          "description": "The success message for the table action"
+        }
+      }
+    },
+    "baseMethod": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string"
+        }
+      }
+    },
     "baseTableAction": {
       "type": "object",
       "properties": {
@@ -703,6 +772,30 @@
         }
       ]
     },
+    "dataSource": {
+      "oneOf": [
+        {
+          "allOf": [
+            {
+              "$ref": "#/definitions/baseDataSource"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "kind": {
+                  "type": "string",
+                  "const": "default",
+                  "default": "default"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "$ref": "#/definitions/importDataSource"
+        }
+      ]
+    },
     "dateTableColumn": {
       "allOf": [
         {
@@ -988,6 +1081,29 @@
         }
       ]
     },
+    "formHeaderButton": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseHeaderButton"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "form",
+              "default": "form"
+            },
+            "form": {
+              "$ref": "#/definitions/formComponent"
+            }
+          },
+          "required": [
+            "form"
+          ]
+        }
+      ]
+    },
     "formTableAction": {
       "allOf": [
         {
@@ -1108,44 +1224,34 @@
       }
     },
     "headerButton": {
-      "type": "object",
-      "properties": {
-        "permission": {
-          "type": "string"
-        },
-        "icon": {
-          "type": "string"
-        },
-        "svgIcon": {
-          "type": "string"
-        },
-        "refresh": {
-          "type": "boolean",
-          "description": "Whether the table action should refresh the table after execution",
-          "default": false
-        },
-        "confirm": {
-          "type": "boolean",
-          "description": "Whether the table action should confirm before execution",
-          "default": false
-        },
-        "tooltip": {
-          "type": "string",
-          "description": "The tooltip for the table action"
+      "oneOf": [
+        {
+          "allOf": [
+            {
+              "$ref": "#/definitions/baseHeaderButton"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "kind": {
+                  "type": "string",
+                  "const": "default",
+                  "default": "default"
+                }
+              }
+            }
+          ]
         },
-        "errorMessage": {
-          "type": "string",
-          "description": "The error message for the table action"
+        {
+          "$ref": "#/definitions/formHeaderButton"
         },
-        "successMessage": {
-          "type": "string",
-          "description": "The success message for the table action"
+        {
+          "$ref": "#/definitions/navigationHeaderButton"
         },
-        "options": {
-          "type": "object",
-          "additionalProperties": true
+        {
+          "$ref": "#/definitions/methodHeaderButton"
         }
-      }
+      ]
     },
     "iconTableColumn": {
       "allOf": [
@@ -1166,6 +1272,52 @@
         }
       ]
     },
+    "importDataSource": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseDataSource"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "import",
+              "default": "import"
+            },
+            "import": {
+              "$ref": "#/definitions/type"
+            }
+          },
+          "required": [
+            "import"
+          ]
+        }
+      ]
+    },
+    "importMethod": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseMethod"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "import",
+              "default": "import"
+            },
+            "import": {
+              "$ref": "#/definitions/type"
+            }
+          },
+          "required": [
+            "import"
+          ]
+        }
+      ]
+    },
     "inputFormControl": {
       "allOf": [
         {
@@ -1237,6 +1389,56 @@
         }
       ]
     },
+    "method": {
+      "oneOf": [
+        {
+          "allOf": [
+            {
+              "$ref": "#/definitions/baseMethod"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "kind": {
+                  "type": "string",
+                  "const": "default",
+                  "default": "default"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "$ref": "#/definitions/importMethod"
+        },
+        {
+          "$ref": "#/definitions/openApiMethod"
+        }
+      ]
+    },
+    "methodHeaderButton": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseHeaderButton"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "method",
+              "default": "method"
+            },
+            "method": {
+              "$ref": "#/definitions/method"
+            }
+          },
+          "required": [
+            "method"
+          ]
+        }
+      ]
+    },
     "minimumTable": {
       "type": "object",
       "properties": {
@@ -1333,6 +1535,32 @@
         }
       }
     },
+    "navigationHeaderButton": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseHeaderButton"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "navigation",
+              "default": "navigation"
+            },
+            "route": {
+              "type": "string"
+            },
+            "relativeTo": {
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "route"
+          ]
+        }
+      ]
+    },
     "navigationTableAction": {
       "allOf": [
         {
@@ -1363,6 +1591,29 @@
         }
       ]
     },
+    "openApiMethod": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseMethod"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "open-api",
+              "default": "open-api"
+            },
+            "operationId": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "operationId"
+          ]
+        }
+      ]
+    },
     "openApiTableAction": {
       "allOf": [
         {
@@ -1786,6 +2037,17 @@
               "type": "string",
               "const": "table-select"
             },
+            "dataSource": {
+              "$ref": "#/definitions/dataSource"
+            },
+            "options": {
+              "type": "object",
+              "properties": {
+                "method": {
+                  "$ref": "#/definitions/method"
+                }
+              }
+            },
             "placeholder": {
               "type": "string"
             },
@@ -1844,6 +2106,9 @@
               "properties": {
                 "upstream": {
                   "$ref": "#/definitions/upstream"
+                },
+                "method": {
+                  "$ref": "#/definitions/method"
                 }
               }
             },

package/src/schematics/table/table-header-button/index.d.ts

@@ -1,8 +1,8 @@
 import { Tree } from '@angular-devkit/schematics';
 import { Normalized } from '@rxap/utilities';
-import { NormalizedAngularOptions } from '../../../lib/angular-options';
-import { NormalizedTableHeaderButton } from '../../../lib/table-header-button';
+import { AngularOptions, NormalizedAngularOptions } from '../../../lib/angular-options';
+import { HeaderButton, NormalizedHeaderButton } from '../../../lib/table/table-header-button';
 import { TableHeaderButtonOptions } from './schema';
-export type NormalizedTableHeaderButtonOptions<Options extends Record<string, any> = Record<string, any>> = Readonly<Normalized<TableHeaderButtonOptions<Options>> & NormalizedAngularOptions & NormalizedTableHeaderButton>;
-export declare function NormalizeTableHeaderButtonOptions<Options extends Record<string, any> = Record<string, any>>(options: Readonly<TableHeaderButtonOptions<Options>>): NormalizedTableHeaderButtonOptions<Options>;
+export type NormalizedTableHeaderButtonOptions = Readonly<Normalized<Omit<TableHeaderButtonOptions, keyof AngularOptions | keyof HeaderButton>> & NormalizedAngularOptions & NormalizedHeaderButton>;
+export declare function NormalizeTableHeaderButtonOptions(options: Readonly<TableHeaderButtonOptions>): NormalizedTableHeaderButtonOptions;
 export default function (options: TableHeaderButtonOptions): (host: Tree) => import("@angular-devkit/schematics").Rule;

package/src/schematics/table/table-header-button/index.js

@@ -6,10 +6,10 @@ const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const angular_options_1 = require("../../../lib/angular-options");
 const assert_table_component_exists_1 = require("../../../lib/assert-table-component-exists");
-const table_header_button_1 = require("../../../lib/table-header-button");
+const table_header_button_1 = require("../../../lib/table/table-header-button");
 function NormalizeTableHeaderButtonOptions(options) {
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
-    const normalizedTableHeaderButton = (0, table_header_button_1.NormalizeTableHeaderButton)(options, options.tableName);
+    const normalizedTableHeaderButton = (0, table_header_button_1.NormalizeHeaderButton)(options, options.tableName);
     if (!normalizedTableHeaderButton) {
         throw new Error('FATAL: should never happen');
     }

package/src/schematics/table/table-header-button/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/table/table-header-button/index.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,mEAA8E;AAC9E,qEAGoC;AAEpC,kEAIsC;AACtC,8FAAwF;AACxF,0EAG0C;AAK1C,SAAgB,iCAAiC,CAC/C,OAAoD;IAEpD,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,MAAM,2BAA2B,GAAG,IAAA,gDAA0B,EAAU,OAAO,EAAE,OAAO,CAAC,SAAS,CAAQ,CAAC;IAC3G,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,gCAAS,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvE,OAAO,MAAM,CAAC,MAAM,+CACf,2BAA2B,GAC3B,wBAAwB,KAC3B,SAAS,IACT,CAAC;AACL,CAAC;AAdD,8EAcC;AAED,SAAS,YAAY,CAAC,OAA2C;IAC/D,IAAA,qCAAmB,EAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAED,mBAAyB,OAAiC;IACxD,MAAM,iBAAiB,GAAG,iCAAiC,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,EACJ,OAAO,EACP,OAAO,EACP,OAAO,EACP,YAAY,EACZ,cAAc,EACd,SAAS,EACT,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,EACT,SAAS,GACV,GAAG,iBAAiB,CAAC;IAEtB,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEhC,OAAO,CAAC,IAAU,EAAE,EAAE;QAEpB,IAAA,0DAA0B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAEpD,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,+DAA+D,CAAC;YACpF,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC;YAC1D,IAAA,uDAAiC,EAAC;gBAChC,OAAO;gBACP,OAAO;gBACP,MAAM;gBACN,SAAS;gBACT,SAAS;gBACT,SAAS;gBACT,OAAO;gBACP,OAAO;gBACP,OAAO;gBACP,YAAY;gBACZ,cAAc;aACf,CAAC;YACF,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAzCD,4BAyCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/table/table-header-button/index.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,mEAA8E;AAC9E,qEAGoC;AAEpC,kEAKsC;AACtC,8FAAwF;AACxF,gFAIgD;AAKhD,SAAgB,iCAAiC,CAC/C,OAA2C;IAE3C,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,MAAM,2BAA2B,GAAG,IAAA,2CAAqB,EAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACtF,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,gCAAS,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvE,OAAO,MAAM,CAAC,MAAM,+CACf,2BAA2B,GAC3B,wBAAwB,KAC3B,SAAS,IACT,CAAC;AACL,CAAC;AAdD,8EAcC;AAED,SAAS,YAAY,CAAC,OAA2C;IAC/D,IAAA,qCAAmB,EAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAED,mBAAyB,OAAiC;IACxD,MAAM,iBAAiB,GAAG,iCAAiC,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,EACJ,OAAO,EACP,OAAO,EACP,OAAO,EACP,YAAY,EACZ,cAAc,EACd,SAAS,EACT,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,EACT,SAAS,GACV,GAAG,iBAAiB,CAAC;IAEtB,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEhC,OAAO,CAAC,IAAU,EAAE,EAAE;QAEpB,IAAA,0DAA0B,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAEpD,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,+DAA+D,CAAC;YACpF,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC;YAC1D,IAAA,uDAAiC,EAAC;gBAChC,OAAO;gBACP,OAAO;gBACP,MAAM;gBACN,SAAS;gBACT,SAAS;gBACT,SAAS;gBACT,OAAO;gBACP,OAAO;gBACP,OAAO;gBACP,YAAY;gBACZ,cAAc;aACf,CAAC;YACF,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAzCD,4BAyCC"}

package/src/schematics/table/table-header-button/schema.d.ts

@@ -1,8 +1,7 @@
 import { AngularOptions } from '../../../lib/angular-options';
-import { TableHeaderButton } from '../../../lib/table-header-button';
+import { HeaderButton } from '../../../lib/table/table-header-button';
 
 
-export interface TableHeaderButtonOptions<Options extends Record<string, any> = Record<string, any>>
-  extends AngularOptions, TableHeaderButton<Options> {
+export type TableHeaderButtonOptions = AngularOptions & HeaderButton & {
   tableName: string;
 }