chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { AppState } from "@appsmith/reducers";
|
|
|
|
|
import type { WidgetType } from "constants/WidgetConstants";
|
|
|
|
|
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
|
2021-04-23 05:43:13 +00:00
|
|
|
import { get, set } from "lodash";
|
|
|
|
|
import { useSelector } from "react-redux";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
|
2023-10-04 08:54:16 +00:00
|
|
|
import { LayoutSystemTypes } from "layoutSystems/types";
|
2021-04-23 05:43:13 +00:00
|
|
|
import { select } from "redux-saga/effects";
|
2023-09-06 12:15:04 +00:00
|
|
|
import WidgetFactory from "WidgetProvider/factory";
|
2021-04-23 05:43:13 +00:00
|
|
|
import { getWidgets } from "./selectors";
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
TODO(abhinav/pawan): Write unit tests for the following functions
|
|
|
|
|
Note:
|
|
|
|
|
Signature for enhancements in WidgetConfigResponse is as follows:
|
|
|
|
|
enhancements: {
|
|
|
|
|
child: {
|
|
|
|
|
autocomplete: (parentProps: any) => Record<string, Record<string, unknown>>,
|
|
|
|
|
customJSControl: (parentProps: any) => string,
|
|
|
|
|
propertyUpdateHook: (parentProps: any, widgetName: string, propertyPath: string, propertyValue: string),
|
|
|
|
|
action: (parentProps: any, dynamicString: string, responseData?: any[]) => { actionString: string, dataToApply?: any[]},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// Enum which identifies the path in the enhancements for the
|
|
|
|
|
export enum WidgetEnhancementType {
|
|
|
|
|
WIDGET_ACTION = "child.action",
|
|
|
|
|
PROPERTY_UPDATE = "child.propertyUpdateHook",
|
|
|
|
|
CUSTOM_CONTROL = "child.customJSControl",
|
|
|
|
|
AUTOCOMPLETE = "child.autocomplete",
|
|
|
|
|
HIDE_EVALUATED_VALUE = "child.hideEvaluatedValue",
|
2021-05-26 12:32:43 +00:00
|
|
|
UPDATE_DATA_TREE_PATH = "child.updateDataTreePath",
|
2022-12-17 20:03:35 +00:00
|
|
|
SHOULD_HIDE_PROPERTY = "child.shouldHideProperty",
|
2021-04-23 05:43:13 +00:00
|
|
|
}
|
|
|
|
|
|
2021-05-03 05:01:47 +00:00
|
|
|
export function getParentWithEnhancementFn(
|
2022-12-17 20:03:35 +00:00
|
|
|
widgetId: string | undefined,
|
2021-04-23 05:43:13 +00:00
|
|
|
widgets: CanvasWidgetsReduxState,
|
|
|
|
|
) {
|
2022-12-17 20:03:35 +00:00
|
|
|
let widget = get(widgets, widgetId || "", undefined);
|
2021-05-03 05:01:47 +00:00
|
|
|
|
2021-04-23 05:43:13 +00:00
|
|
|
// While this widget has a parent
|
|
|
|
|
while (widget?.parentId) {
|
|
|
|
|
// Get parent widget props
|
|
|
|
|
const parent = get(widgets, widget.parentId, undefined);
|
2021-05-03 05:01:47 +00:00
|
|
|
|
2021-04-23 05:43:13 +00:00
|
|
|
// If parent has enhancements property
|
|
|
|
|
// enhancements property is a new widget property which tells us that
|
|
|
|
|
// the property pane, properties or actions of this widget or its children
|
|
|
|
|
// can be enhanced
|
|
|
|
|
|
|
|
|
|
if (parent && parent.enhancements) {
|
|
|
|
|
return parent;
|
|
|
|
|
}
|
|
|
|
|
// If we didn't find any enhancements
|
|
|
|
|
// keep walking up the tree to find the parent which does
|
|
|
|
|
// if the parent doesn't have a parent stop walking the tree.
|
|
|
|
|
// also stop if the parent is the main container (Main container doesn't have enhancements)
|
|
|
|
|
if (parent?.parentId && parent.parentId !== MAIN_CONTAINER_WIDGET_ID) {
|
|
|
|
|
widget = get(widgets, widget.parentId, undefined);
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-10-26 04:37:06 +00:00
|
|
|
const fixedLayoutOnlyProperties = ["dynamicHeight"];
|
2023-03-04 07:25:54 +00:00
|
|
|
|
2023-10-04 08:54:16 +00:00
|
|
|
export function layoutSystemBasedPropertyFilter(
|
2023-03-04 07:25:54 +00:00
|
|
|
parentProps: any,
|
|
|
|
|
propertyName: string,
|
|
|
|
|
) {
|
|
|
|
|
return (
|
2023-10-26 04:37:06 +00:00
|
|
|
parentProps.layoutSystemType !== LayoutSystemTypes.FIXED &&
|
|
|
|
|
fixedLayoutOnlyProperties.includes(propertyName)
|
2023-03-04 07:25:54 +00:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-23 05:43:13 +00:00
|
|
|
export function getWidgetEnhancementFn(
|
|
|
|
|
type: WidgetType,
|
|
|
|
|
enhancementType: WidgetEnhancementType,
|
|
|
|
|
) {
|
|
|
|
|
// Get enhancements for the widget type from the config response
|
|
|
|
|
// Spread the config response so that we don't pollute the original
|
|
|
|
|
// configs
|
2021-09-09 15:10:22 +00:00
|
|
|
|
|
|
|
|
const config = { ...WidgetFactory.widgetConfigMap.get(type) };
|
|
|
|
|
if (config?.enhancements)
|
|
|
|
|
return get(config.enhancements, enhancementType, undefined);
|
2021-04-23 05:43:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO(abhinav): Getting data from the tree may not be needed
|
|
|
|
|
// confirm this.
|
|
|
|
|
export const getPropsFromTree = (
|
|
|
|
|
state: AppState,
|
|
|
|
|
widgetName?: string,
|
|
|
|
|
): unknown => {
|
|
|
|
|
// Get the evaluated data of this widget from the evaluations tree.
|
|
|
|
|
if (!widgetName) return;
|
|
|
|
|
|
|
|
|
|
return get(state.evaluations.tree, widgetName, undefined);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export function* getChildWidgetEnhancementFn(
|
|
|
|
|
widgetId: string,
|
|
|
|
|
enhancementType: WidgetEnhancementType,
|
|
|
|
|
) {
|
|
|
|
|
// Get all widgets from the canvas
|
|
|
|
|
const widgets: CanvasWidgetsReduxState = yield select(getWidgets);
|
|
|
|
|
// Get the parent which wants to enhance this widget
|
|
|
|
|
const parentWithEnhancementFn = getParentWithEnhancementFn(widgetId, widgets);
|
|
|
|
|
// If such a parent is found
|
|
|
|
|
if (parentWithEnhancementFn) {
|
|
|
|
|
// Get the enhancement function based on the enhancementType
|
|
|
|
|
// from the configs
|
|
|
|
|
const enhancementFn = getWidgetEnhancementFn(
|
|
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
enhancementType,
|
|
|
|
|
);
|
|
|
|
|
// Get the parent's evaluated data from the evaluatedTree
|
|
|
|
|
const parentDataFromDataTree: unknown = yield select(
|
|
|
|
|
getPropsFromTree,
|
|
|
|
|
parentWithEnhancementFn.widgetName,
|
|
|
|
|
);
|
|
|
|
|
if (parentDataFromDataTree) {
|
|
|
|
|
// Update the enhancement function by passing the widget data as the first parameter
|
|
|
|
|
return (...args: unknown[]) =>
|
2021-09-09 15:10:22 +00:00
|
|
|
(enhancementFn as EnhancementFn)(parentDataFromDataTree, ...args);
|
2021-04-23 05:43:13 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* hook that returns parent with enhancments
|
|
|
|
|
*
|
|
|
|
|
* @param widgetId
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
export function useParentWithEnhancementFn(widgetId: string) {
|
|
|
|
|
const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
|
|
|
|
|
return getParentWithEnhancementFn(widgetId, widgets);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function useChildWidgetEnhancementFn(
|
|
|
|
|
widgetId: string,
|
|
|
|
|
enhancementType: WidgetEnhancementType,
|
|
|
|
|
) {
|
|
|
|
|
// Get all widgets from the canvas
|
|
|
|
|
const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
|
|
|
|
|
// Get the parent which wants to enhance this widget
|
|
|
|
|
const parentWithEnhancementFn = getParentWithEnhancementFn(widgetId, widgets);
|
|
|
|
|
// If such a parent is found
|
|
|
|
|
// Get the parent's evaluated data from the evaluatedTree
|
|
|
|
|
const parentDataFromDataTree: unknown = useSelector((state: AppState) =>
|
|
|
|
|
getPropsFromTree(state, parentWithEnhancementFn?.widgetName),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (parentWithEnhancementFn) {
|
|
|
|
|
// Get the enhancement function based on the enhancementType
|
|
|
|
|
// from the configs
|
|
|
|
|
const enhancementFn = getWidgetEnhancementFn(
|
|
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
enhancementType,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (parentDataFromDataTree && enhancementFn) {
|
|
|
|
|
// Update the enhancement function by passing the widget data as the first parameter
|
|
|
|
|
return (...args: unknown[]) =>
|
2021-09-09 15:10:22 +00:00
|
|
|
(enhancementFn as EnhancementFn)(parentDataFromDataTree, ...args);
|
2021-04-23 05:43:13 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-09 15:10:22 +00:00
|
|
|
// Todo (abhinav): Specify styles here
|
|
|
|
|
type EnhancementFn = (parentProps: any, ...rest: any) => unknown;
|
|
|
|
|
type BoundEnhancementFn = (...rest: any) => unknown;
|
|
|
|
|
|
2023-10-11 07:35:24 +00:00
|
|
|
interface EnhancementFns {
|
2021-09-09 15:10:22 +00:00
|
|
|
updateDataTreePathFn?: BoundEnhancementFn;
|
|
|
|
|
propertyPaneEnhancementFn?: BoundEnhancementFn;
|
|
|
|
|
autoCompleteEnhancementFn?: BoundEnhancementFn;
|
|
|
|
|
customJSControlEnhancementFn?: BoundEnhancementFn;
|
|
|
|
|
hideEvaluatedValueEnhancementFn?: BoundEnhancementFn;
|
2023-10-11 07:35:24 +00:00
|
|
|
}
|
2021-04-23 05:43:13 +00:00
|
|
|
|
2021-05-26 12:32:43 +00:00
|
|
|
export function useChildWidgetEnhancementFns(widgetId: string): EnhancementFns {
|
|
|
|
|
const enhancementFns = {
|
|
|
|
|
updateDataTreePathFn: undefined,
|
|
|
|
|
propertyPaneEnhancementFn: undefined,
|
2021-04-23 05:43:13 +00:00
|
|
|
autoCompleteEnhancementFn: undefined,
|
|
|
|
|
customJSControlEnhancementFn: undefined,
|
|
|
|
|
hideEvaluatedValueEnhancementFn: undefined,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Get all widgets from the canvas
|
|
|
|
|
const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
|
|
|
|
|
// Get the parent which wants to enhance this widget
|
|
|
|
|
const parentWithEnhancementFn = getParentWithEnhancementFn(widgetId, widgets);
|
|
|
|
|
// If such a parent is found
|
|
|
|
|
// Get the parent's evaluated data from the evaluatedTree
|
|
|
|
|
const parentDataFromDataTree: unknown = useSelector((state: AppState) =>
|
|
|
|
|
getPropsFromTree(state, parentWithEnhancementFn?.widgetName),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (parentWithEnhancementFn) {
|
|
|
|
|
// Get the enhancement function based on the enhancementType
|
|
|
|
|
// from the configs
|
2021-05-26 12:32:43 +00:00
|
|
|
const widgetEnhancementFns = {
|
|
|
|
|
updateDataTreePathFn: getWidgetEnhancementFn(
|
|
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
WidgetEnhancementType.UPDATE_DATA_TREE_PATH,
|
|
|
|
|
),
|
|
|
|
|
propertyPaneEnhancementFn: getWidgetEnhancementFn(
|
2021-04-23 05:43:13 +00:00
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
WidgetEnhancementType.PROPERTY_UPDATE,
|
|
|
|
|
),
|
|
|
|
|
autoCompleteEnhancementFn: getWidgetEnhancementFn(
|
|
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
WidgetEnhancementType.AUTOCOMPLETE,
|
|
|
|
|
),
|
|
|
|
|
customJSControlEnhancementFn: getWidgetEnhancementFn(
|
|
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
WidgetEnhancementType.CUSTOM_CONTROL,
|
|
|
|
|
),
|
|
|
|
|
hideEvaluatedValueEnhancementFn: getWidgetEnhancementFn(
|
|
|
|
|
parentWithEnhancementFn.type,
|
|
|
|
|
WidgetEnhancementType.HIDE_EVALUATED_VALUE,
|
|
|
|
|
),
|
|
|
|
|
};
|
|
|
|
|
|
2021-05-26 12:32:43 +00:00
|
|
|
Object.keys(widgetEnhancementFns).map((key: string) => {
|
|
|
|
|
const enhancementFn = get(widgetEnhancementFns, `${key}`);
|
2021-04-23 05:43:13 +00:00
|
|
|
|
|
|
|
|
if (parentDataFromDataTree && enhancementFn) {
|
2021-05-26 12:32:43 +00:00
|
|
|
set(enhancementFns, `${key}`, (...args: unknown[]) =>
|
2021-04-23 05:43:13 +00:00
|
|
|
enhancementFn(parentDataFromDataTree, ...args),
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-26 12:32:43 +00:00
|
|
|
return enhancementFns;
|
2021-04-23 05:43:13 +00:00
|
|
|
}
|