refactor: Use generic type for meta field

Signed-off-by: Pranav C <pranavxc@gmail.com>
2 years ago · 4e084ed8ea
7 changed files with 211 additions and 198 deletions
--- a/packages/nocodb-sdk/src/lib/Api.ts
+++ b/packages/nocodb-sdk/src/lib/Api.ts
@ -56,12 +56,12 @@ export interface ProjectType {
  title?: string;
  status?: string;
  description?: string;
-  meta?: string | object;
+  meta?: MetaType;
  color?: string;
-  deleted?: NcBoolType;
+  deleted?: BoolType;
  order?: number;
  bases?: BaseType[];
-  is_meta?: NcBoolType;
+  is_meta?: BoolType;
  prefix?: string;
  created_at?: any;
  updated_at?: any;
@ -78,14 +78,14 @@ export interface BaseType {
  project_id?: string;
  alias?: string;
  type?: string;
-  is_meta?: NcBoolType;
+  is_meta?: BoolType;
  config?: any;
  created_at?: any;
  updated_at?: any;
  inflection_column?: string;
  inflection_table?: string;
  order?: number;
-  enabled?: NcBoolType;
+  enabled?: BoolType;
 }

 export interface BaseReqType {
@ -113,30 +113,30 @@ export interface TableType {
  table_name: string;
  title: string;
  type?: string;
-  enabled?: NcBoolType;
+  enabled?: BoolType;
  parent_id?: string;
  show_as?: string;
  tags?: string;
-  pinned?: NcBoolType;
-  deleted?: NcBoolType;
+  pinned?: BoolType;
+  deleted?: BoolType;
  order?: number;
  columns?: ColumnType[];
  columnsById?: object;
  slug?: string;
-  mm?: NcBoolType;
-  meta?: any;
+  mm?: BoolType;
+  meta?: MetaType;
 }

 export interface ViewType {
  id?: string;
  title: string;
-  deleted?: NcBoolType;
+  deleted?: BoolType;
  order?: number;
  fk_model_id?: string;
  slug?: string;
  uuid?: string;
-  meta?: any;
-  show_system_fields?: NcBoolType;
+  meta?: MetaType;
+  show_system_fields?: BoolType;
  lock_type?: 'collaborative' | 'locked' | 'personal';
  type?: number;
  view?:
@ -159,8 +159,8 @@ export interface TableInfoType {
  parent_id?: string;
  show_as?: string;
  tags?: string;
-  pinned?: NcBoolType;
-  deleted?: NcBoolType;
+  pinned?: BoolType;
+  deleted?: BoolType;
  order?: number;
  column?: ColumnType[];
  filters?: FilterType[];
@ -178,12 +178,12 @@ export interface TableReqType {
  parent_id?: string;
  show_as?: string;
  tags?: string;
-  pinned?: NcBoolType;
-  deleted?: NcBoolType;
+  pinned?: BoolType;
+  deleted?: BoolType;
  order?: number;
-  mm?: NcBoolType;
+  mm?: BoolType;
  columns: NormalColumnRequestType[];
-  meta?: any;
+  meta?: MetaType;
 }

 export interface TableListType {
@ -261,26 +261,26 @@ export interface ColumnType {
  ns?: string | number | null;
  clen?: string | number | null;
  cop?: string;
-  pk?: NcBoolType;
-  pv?: NcBoolType;
-  rqd?: NcBoolType;
+  pk?: BoolType;
+  pv?: BoolType;
+  rqd?: BoolType;
  column_name?: string;
-  un?: NcBoolType;
+  un?: BoolType;
  ct?: string;
-  ai?: NcBoolType;
-  unique?: NcBoolType;
+  ai?: BoolType;
+  unique?: BoolType;
  cdf?: string;
  cc?: string;
  csn?: string;
  dtx?: string;
  dtxp?: string | number | null;
  dtxs?: string | number | null;
-  au?: NcBoolType;
-  deleted?: NcBoolType;
-  visible?: NcBoolType;
+  au?: BoolType;
+  deleted?: BoolType;
+  visible?: BoolType;
  order?: number;
-  system?: NcBoolType;
-  meta?: any;
+  system?: BoolType;
+  meta?: MetaType;
  colOptions?:
    | LinkToAnotherRecordType
    | FormulaType
@ -305,7 +305,7 @@ export interface ColumnListType {
 export interface LinkToAnotherRecordType {
  id?: string;
  type?: string;
-  virtual?: NcBoolType;
+  virtual?: BoolType;
  fk_column_id?: string;
  fk_child_column_id?: string;
  fk_parent_column_id?: string;
@ -323,7 +323,7 @@ export interface LinkToAnotherRecordType {
 export interface LookupType {
  id?: string;
  type?: string;
-  virtual?: NcBoolType;
+  virtual?: BoolType;
  fk_column_id?: string;
  fk_relation_column_id?: string;
  fk_lookup_column_id?: string;
@ -334,7 +334,7 @@ export interface LookupType {
 export interface RollupType {
  id?: string;
  type?: string;
-  virtual?: NcBoolType;
+  virtual?: BoolType;
  fk_column_id?: string;
  fk_relation_column_id?: string;
  fk_rollup_column_id?: string;
@ -346,7 +346,7 @@ export interface RollupType {
 export interface FormulaType {
  id?: string;
  type?: string;
-  virtual?: NcBoolType;
+  virtual?: BoolType;
  fk_column_id?: string;
  formula?: string;
  formula_raw?: string;
@ -370,7 +370,7 @@ export interface GridType {
  id?: string;
  title?: string;
  alias?: string;
-  deleted?: NcBoolType;
+  deleted?: BoolType;
  order?: number;
  lock_type?: 'collaborative' | 'locked' | 'personal';
  row_height?: number;
@ -387,10 +387,10 @@ export interface GalleryType {
  fk_view_id?: string;
  title?: string;
  alias?: string;
-  deleted?: NcBoolType;
+  deleted?: BoolType;
  order?: number;
-  next_enabled?: NcBoolType;
-  prev_enabled?: NcBoolType;
+  next_enabled?: BoolType;
+  prev_enabled?: BoolType;
  cover_image_idx?: number;
  cover_image?: string;
  restrict_types?: string;
@ -404,8 +404,8 @@ export interface GalleryType {

 export interface GalleryReqType {
  title: string;
-  next_enabled?: NcBoolType;
-  prev_enabled?: NcBoolType;
+  next_enabled?: BoolType;
+  prev_enabled?: BoolType;
  cover_image_idx?: number;
  cover_image?: string;
  restrict_types?: string;
@ -456,7 +456,7 @@ export interface KanbanType {
  fk_model_id?: string;
  fk_grp_col_id?: string | null;
  fk_cover_image_col_id?: string;
-  meta?: object | null | string;
+  meta?: MetaType;
 }

 export interface GeoLocationType {
@ -475,7 +475,7 @@ export interface MapType {
  fk_view_id?: string;
  fk_geo_data_col_id?: string | null;
  columns?: MapColumnType[];
-  meta?: string | object;
+  meta?: MetaType;
 }

 export interface MapColumnType {
@ -510,12 +510,12 @@ export interface FormType {
  email?: string;
  banner_image_url?: string;
  logo_url?: string;
-  submit_another_form?: NcBoolType;
-  show_blank_form?: NcBoolType;
+  submit_another_form?: BoolType;
+  show_blank_form?: BoolType;
  columns?: FormColumnType[];
  fk_model_id?: string;
  lock_type?: 'collaborative' | 'locked' | 'personal';
-  meta?: any;
+  meta?: MetaType;
 }

 export interface FormReqType {
@ -528,11 +528,11 @@ export interface FormReqType {
  email?: string;
  banner_image_url?: string;
  logo_url?: string;
-  submit_another_form?: NcBoolType;
-  show_blank_form?: NcBoolType;
+  submit_another_form?: BoolType;
+  show_blank_form?: BoolType;
  fk_model_id?: string;
  lock_type?: 'collaborative' | 'locked' | 'personal';
-  meta?: any;
+  meta?: MetaType;
 }

 export interface FormColumnType {
@ -542,24 +542,24 @@ export interface FormColumnType {
  uuid?: any;
  label?: string;
  help?: any;
-  required?: NcBoolType;
-  show?: NcBoolType;
+  required?: BoolType;
+  show?: BoolType;
  order?: number;
  created_at?: string;
  updated_at?: string;
  description?: string;
-  meta?: any;
+  meta?: MetaType;
 }

 export interface FormColumnReqType {
  uuid?: any;
  label?: string;
  help?: any;
-  required?: NcBoolType;
-  show?: NcBoolType;
+  required?: BoolType;
+  show?: BoolType;
  order?: number;
  description?: string;
-  meta?: any;
+  meta?: MetaType;
 }

 export interface PaginatedType {
@ -633,12 +633,12 @@ export interface HookType {
  type?: string;
  event?: 'after' | 'before';
  operation?: 'insert' | 'delete' | 'update';
-  async?: NcBoolType;
+  async?: BoolType;
  notification?: string;
  retries?: number;
  retry_interval?: number;
  timeout?: number;
-  active?: NcBoolType;
+  active?: BoolType;
 }

 export interface HookReqType {
@ -654,7 +654,7 @@ export interface HookReqType {
  retries?: number;
  retry_interval?: number;
  timeout?: number;
-  active?: NcBoolType;
+  active?: BoolType;
 }

 export interface HookTestReqType {
@ -693,7 +693,7 @@ export interface PluginType {
  id?: string;
  title?: string;
  description?: string;
-  active?: NcBoolType;
+  active?: BoolType;
  rating?: number;
  version?: string;
  docs?: string;
@ -717,7 +717,7 @@ export interface ModelRoleVisibilityType {
  fk_model_id?: string;
  fk_view_id?: string;
  role?: string;
-  disabled?: NcBoolType;
+  disabled?: BoolType;
 }

 export interface ApiTokenType {
@ -737,7 +737,7 @@ export interface HookLogType {
  type?: string;
  event?: string;
  operation?: string;
-  test_call?: NcBoolType;
+  test_call?: BoolType;
  payload?: any;
  conditions?: string;
  notifications?: string;
@ -791,27 +791,27 @@ export interface NormalColumnRequestType {
  dt?: string;
  np?: string | number | null;
  ns?: string | number | null;
-  pk?: NcBoolType;
-  pv?: NcBoolType;
-  rqd?: number | null | NcBoolType;
+  pk?: BoolType;
+  pv?: BoolType;
+  rqd?: number | null | BoolType;
  column_name?: string;
-  un?: NcBoolType;
+  un?: BoolType;
  ct?: string;
-  ai?: NcBoolType;
-  unique?: NcBoolType;
+  ai?: BoolType;
+  unique?: BoolType;
  cdf?: string | null;
  cc?: string;
  csn?: string;
  dtx?: string;
  dtxp?: string | number | null;
  dtxs?: string | number | null;
-  au?: NcBoolType;
+  au?: BoolType;
 }

 export interface LinkToAnotherColumnReqType {
  uidt: 'LinkToAnotherRecord';
  title: string;
-  virtual?: NcBoolType;
+  virtual?: BoolType;
  parentId: string;
  childId: string;
  type: 'hm' | 'bt' | 'mm';
@ -870,16 +870,18 @@ export interface UserInfoType {

 export type VisibilityRuleReqType = {
  disabled?: {
-    commenter?: NcBoolType;
-    creator?: NcBoolType;
-    editor?: NcBoolType;
-    guest?: NcBoolType;
-    owner?: NcBoolType;
-    viewer?: NcBoolType;
+    commenter?: BoolType;
+    creator?: BoolType;
+    editor?: BoolType;
+    guest?: BoolType;
+    owner?: BoolType;
+    viewer?: BoolType;
  };
 }[];

-export type NcBoolType = boolean | number | null;
+export type BoolType = boolean | number | null;
+
+export type MetaType = object | string | null;

 export interface CommentReqType {
  row_id: string;
@ -916,7 +918,7 @@ export interface PluginTestReqType {
 }

 export interface PluginReqType {
-  active?: NcBoolType;
+  active?: BoolType;
  input?: any;
 }

@ -2372,7 +2374,7 @@ export class Api<
        table_name?: string;
        title?: string;
        project_id?: string;
-        meta?: any;
+        meta?: MetaType;
      },
      params: RequestParams = {}
    ) =>
@ -2544,7 +2546,7 @@ export class Api<
      viewId: string,
      data: {
        order?: number;
-        meta?: any;
+        meta?: MetaType;
        title?: string;
        show_system_fields?: boolean;
        lock_type?: 'collaborative' | 'locked' | 'personal';
@ -2996,7 +2998,7 @@ export class Api<
      viewId: string,
      data: {
        password?: string;
-        meta?: any;
+        meta?: MetaType;
      },
      params: RequestParams = {}
    ) =>
--- a/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts
+++ b/packages/nocodb/src/lib/meta/api/helpers/columnHelpers.ts
@ -3,7 +3,7 @@ import {
  ColumnReqType,
  LinkToAnotherRecordType,
  LookupColumnReqType,
-  NcBoolType,
+  BoolType,
  RelationTypes,
  RollupColumnReqType,
  TableType,
@ -28,7 +28,7 @@ export async function createHmAndBtColumn(
  type?: RelationTypes,
  alias?: string,
  fkColName?: string,
-  virtual: NcBoolType = false,
+  virtual: BoolType = false,
  isSystemCol = false
 ) {
  // save bt column
--- a/packages/nocodb/src/lib/models/Base.ts
+++ b/packages/nocodb/src/lib/models/Base.ts
@ -7,7 +7,7 @@ import {
  MetaTable,
 } from '../utils/globals';
 import Model from './Model';
-import { BaseType, NcBoolType, UITypes } from 'nocodb-sdk';
+import { BaseType, BoolType, UITypes } from 'nocodb-sdk';
 import NocoCache from '../cache/NocoCache';
 import CryptoJS from 'crypto-js';
 import { extractProps } from '../meta/helpers/extractProps';
@ -20,14 +20,14 @@ export default class Base implements BaseType {
  project_id?: string;
  alias?: string;
  type?: string;
-  is_meta?: NcBoolType;
+  is_meta?: BoolType;
  config?: any;
  created_at?: any;
  updated_at?: any;
  inflection_column?: string;
  inflection_table?: string;
  order?: number;
-  enabled?: NcBoolType;
+  enabled?: BoolType;

  constructor(base: Partial<Base>) {
    Object.assign(this, base);
--- a/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts
+++ b/packages/nocodb/src/lib/models/LinkToAnotherRecordColumn.ts
@ -1,4 +1,4 @@
-import { NcBoolType } from 'nocodb-sdk';
+import { BoolType } from 'nocodb-sdk';
 import Noco from '../Noco';
 import Column from './Column';
 import Model from './Model';
@ -20,7 +20,7 @@ export default class LinkToAnotherRecordColumn {
  fk_index_name?: string;

  type: 'hm' | 'bt' | 'mm';
-  virtual: NcBoolType = false;
+  virtual: BoolType = false;

  mmModel?: Model;
  relatedTable?: Model;
--- a/packages/nocodb/src/lib/models/Model.ts
+++ b/packages/nocodb/src/lib/models/Model.ts
@ -7,7 +7,7 @@ import { BaseModelSqlv2 } from '../db/sql-data-mapper/lib/sql/BaseModelSqlv2';
 import {
  isVirtualCol,
  ModelTypes,
-  NcBoolType,
+  BoolType,
  TableReqType,
  TableType,
  UITypes,
@ -26,17 +26,17 @@ import { sanitize } from '../db/sql-data-mapper/lib/sql/helpers/sanitize';
 import { extractProps } from '../meta/helpers/extractProps';

 export default class Model implements TableType {
-  copy_enabled: NcBoolType;
+  copy_enabled: BoolType;
  created_at: Date | number | string;
  base_id: 'db' | string;
-  deleted: NcBoolType;
-  enabled: NcBoolType;
-  export_enabled: NcBoolType;
+  deleted: BoolType;
+  enabled: BoolType;
+  export_enabled: BoolType;
  id: string;
  order: number;
  parent_id: string;
  password: string;
-  pin: NcBoolType;
+  pin: BoolType;
  project_id: string;
  schema: any;
  show_all_fields: boolean;
@ -47,7 +47,7 @@ export default class Model implements TableType {
  table_name: string;
  title: string;

-  mm: NcBoolType;
+  mm: BoolType;

  uuid: string;

@ -99,7 +99,7 @@ export default class Model implements TableType {
    projectId,
    baseId,
    model: Partial<TableReqType> & {
-      mm?: NcBoolType;
+      mm?: BoolType;
      created_at?: any;
      updated_at?: any;
    },
--- a/packages/nocodb/src/lib/models/Project.ts
+++ b/packages/nocodb/src/lib/models/Project.ts
@ -1,6 +1,6 @@
 import Base from './/Base';
 import Noco from '../Noco';
-import { NcBoolType, ProjectType } from 'nocodb-sdk';
+import { BoolType, ProjectType } from 'nocodb-sdk';
 import {
  CacheDelDirection,
  CacheGetType,
@ -18,7 +18,7 @@ export default class Project implements ProjectType {
  public description: string;
  public meta: string;
  public color: string;
-  public deleted: NcBoolType;
+  public deleted: BoolType;
  public order: number;
  public is_meta = false;
  public bases?: Base[];
--- a/scripts/sdk/swagger.json
+++ b/scripts/sdk/swagger.json
@ -1933,7 +1933,9 @@
                  "project_id": {
                    "type": "string"
                  },
-                  "meta": {}
+                  "meta": {
+                    "$ref": "#/components/schemas/Meta"
+                  }
                }
              }
            }
@ -2166,7 +2168,9 @@
                  "order": {
                    "type": "number"
                  },
-                  "meta": {},
+                  "meta": {
+                    "$ref": "#/components/schemas/Meta"
+                  },
                  "title": {
                    "type": "string"
                  },
@ -2363,7 +2367,9 @@
                  "password": {
                    "type": "string"
                  },
-                  "meta": {}
+                  "meta": {
+                    "$ref": "#/components/schemas/Meta"
+                  }
                }
              }
            }
@ -7244,16 +7250,13 @@
            "type": "string"
          },
          "meta": {
-            "type": [
-              "string",
-              "object"
-            ]
+            "$ref": "#/components/schemas/Meta"
          },
          "color": {
            "type": "string"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -7265,7 +7268,7 @@
            }
          },
          "is_meta": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "prefix": {
            "type": "string"
@ -7340,7 +7343,7 @@
            "type": "string"
          },
          "is_meta": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "config": {},
          "created_at": {},
@ -7355,7 +7358,7 @@
            "type": "number"
          },
          "enabled": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          }
        }
      },
@ -7535,7 +7538,7 @@
            "type": "string"
          },
          "enabled": {
-            "$ref" : "#/components/schemas/NcBool"
+            "$ref" : "#/components/schemas/Bool"
          },
          "parent_id": {
            "type": "string"
@ -7547,10 +7550,10 @@
            "type": "string"
          },
          "pinned": {
-            "$ref" : "#/components/schemas/NcBool"
+            "$ref" : "#/components/schemas/Bool"
          },
          "deleted": {
-            "$ref" : "#/components/schemas/NcBool"
+            "$ref" : "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -7568,9 +7571,11 @@
            "type": "string"
          },
          "mm": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
-          "meta": {}
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          }
        },
        "required": [
          "table_name",
@ -7654,7 +7659,7 @@
            "type": "string"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -7668,9 +7673,11 @@
          "uuid": {
            "type": "string"
          },
-          "meta": {},
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          },
          "show_system_fields": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "lock_type": {
            "type": "string",
@ -7830,10 +7837,10 @@
            "type": "string"
          },
          "pinned": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -7897,16 +7904,16 @@
            "type": "string"
          },
          "pinned": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
          },
          "mm": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "columns": {
            "type": "array",
@ -7914,7 +7921,9 @@
              "$ref": "#/components/schemas/NormalColumnRequest"
            }
          },
-          "meta": {}
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          }
        },
        "required": [
          "table_name",
@ -8332,28 +8341,28 @@
            "type": "string"
          },
          "pk": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "pv": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "rqd": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "column_name": {
            "type": "string"
          },
          "un": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "ct": {
            "type": "string"
          },
          "ai": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "unique": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "cdf": {
            "type": "string"
@ -8394,21 +8403,23 @@
            ]
          },
          "au": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "visible": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
          },
          "system": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
+          },
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
          },
-          "meta": {},
          "colOptions": {
            "anyOf": [
              {
@ -8498,7 +8509,7 @@
            "type": "string"
          },
          "virtual": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "fk_column_id": {
            "type": "string"
@ -8549,7 +8560,7 @@
            "type": "string"
          },
          "virtual": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "fk_column_id": {
            "type": "string"
@ -8579,7 +8590,7 @@
            "type": "string"
          },
          "virtual": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "fk_column_id": {
            "type": "string"
@ -8612,7 +8623,7 @@
            "type": "string"
          },
          "virtual": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "fk_column_id": {
            "type": "string"
@ -8703,7 +8714,7 @@
            "type": "string"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -8764,16 +8775,16 @@
            "type": "string"
          },
          "deleted": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
          },
          "next_enabled": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "prev_enabled": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "cover_image_idx": {
            "type": "integer"
@ -8821,10 +8832,10 @@
            "type": "string"
          },
          "next_enabled": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "prev_enabled": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "cover_image_idx": {
            "type": "integer"
@ -8985,17 +8996,7 @@
            "type": "string"
          },
          "meta": {
-            "oneOf": [
-              {
-                "type": "object"
-              },
-              {
-                "type": "null"
-              },
-              {
-                "type": "string"
-              }
-            ]
+            "$ref": "#/components/schemas/Meta"
          }
        }
      },
@ -9054,15 +9055,8 @@
              "$ref": "#/components/schemas/MapColumn"
            }
          },
-          "meta": {
-            "oneOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "object"
-              }
-            ]
+          "meta":{
+            "$ref": "#/components/schemas/Meta"
          }
        }
      },
@ -9174,10 +9168,10 @@
            "type": "string"
          },
          "submit_another_form": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "show_blank_form": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "columns": {
            "type": "array",
@ -9196,7 +9190,9 @@
              "personal"
            ]
          },
-          "meta": {}
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          }
        }
      },
      "FormReq": {
@ -9232,10 +9228,10 @@
            "type": "string"
          },
          "submit_another_form": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "show_blank_form": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "fk_model_id": {
            "type": "string"
@ -9248,7 +9244,9 @@
              "personal"
            ]
          },
-          "meta": {}
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          }
        },
        "required": [
          "title"
@ -9295,10 +9293,10 @@
          },
          "help": {},
          "required": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "show": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -9315,7 +9313,9 @@
            "type": "string",
            "minLength": 1
          },
-          "meta": {}
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          }
        }
      },
      "FormColumnReq": {
@ -9347,10 +9347,10 @@
          },
          "help": {},
          "required": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "show": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "order": {
            "type": "number"
@ -9359,7 +9359,9 @@
            "type": "string",
            "minLength": 1
          },
-          "meta": {}
+          "meta": {
+            "$ref": "#/components/schemas/Meta"
+          }
        }
      },
      "Paginated": {
@ -9674,7 +9676,7 @@
            ]
          },
          "async": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "notification": {
            "type": "string"
@ -9689,7 +9691,7 @@
            "type": "number"
          },
          "active": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          }
        }
      },
@ -9760,7 +9762,7 @@
            "type": "number"
          },
          "active": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          }
        },
        "required": [
@ -9874,7 +9876,7 @@
            "type": "string"
          },
          "active": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "rating": {
            "type": "number"
@ -9953,7 +9955,7 @@
            "type": "string"
          },
          "disabled": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          }
        }
      },
@ -10026,7 +10028,7 @@
            "type": "string"
          },
          "test_call": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "payload": {},
          "conditions": {
@ -10141,10 +10143,10 @@
            ]
          },
          "pk": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "pv": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "rqd": {
            "oneOf": [
@ -10155,7 +10157,7 @@
                "type": "null"
              },
              {
-                "$ref": "#/components/schemas/NcBool"
+                "$ref": "#/components/schemas/Bool"
              }
            ]
          },
@ -10163,16 +10165,16 @@
            "type": "string"
          },
          "un": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "ct": {
            "type": "string"
          },
          "ai": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "unique": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "cdf": {
            "oneOf": [
@ -10220,7 +10222,7 @@
            ]
          },
          "au": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          }
        }
      },
@ -10237,7 +10239,7 @@
            "type": "string"
          },
          "virtual": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "parentId": {
            "type": "string"
@ -10399,40 +10401,49 @@
              "type": "object",
              "properties": {
                "commenter": {
-                  "$ref": "#/components/schemas/NcBool"
+                  "$ref": "#/components/schemas/Bool"
                },
                "creator": {
-                  "$ref": "#/components/schemas/NcBool"
+                  "$ref": "#/components/schemas/Bool"
                },
                "editor": {
-                  "$ref": "#/components/schemas/NcBool"
+                  "$ref": "#/components/schemas/Bool"
                },
                "guest": {
-                  "$ref": "#/components/schemas/NcBool"
+                  "$ref": "#/components/schemas/Bool"
                },
                "owner": {
-                  "$ref": "#/components/schemas/NcBool"
+                  "$ref": "#/components/schemas/Bool"
                },
                "viewer": {
-                  "$ref": "#/components/schemas/NcBool"
+                  "$ref": "#/components/schemas/Bool"
                }
              }
            }
          }
        }
      },
-      "NcBool": {
+      "Bool": {
        "oneOf": [
          {
            "type": "boolean"
          },
          {
            "type": "integer"
+          }
+        ],
+        "nullable": true
+      },
+      "Meta": {
+        "oneOf": [
+          {
+            "type": "object"
          },
          {
-            "type": "null"
+            "type": "string"
          }
-        ]
+        ],
+        "nullable": true
      },
      "CommentReq": {
        "type": "object",
@ -10529,7 +10540,7 @@
        "type": "object",
        "properties": {
          "active": {
-            "$ref": "#/components/schemas/NcBool"
+            "$ref": "#/components/schemas/Bool"
          },
          "input": {}
        }