2023-10-10 12:32:17 +00:00
|
|
|
import type { DataTree } from "entities/DataTree/dataTreeTypes";
|
2022-03-08 13:56:03 +00:00
|
|
|
import { get, set } from "lodash";
|
2022-12-22 06:34:28 +00:00
|
|
|
import {
|
|
|
|
|
isJSObject,
|
|
|
|
|
isWidget,
|
|
|
|
|
} from "@appsmith/workers/Evaluation/evaluationUtils";
|
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 { DependencyMap } from "./DynamicBindingUtils";
|
2023-09-06 12:15:04 +00:00
|
|
|
import WidgetFactory from "../WidgetProvider/factory";
|
2022-03-08 13:56:03 +00:00
|
|
|
|
|
|
|
|
type GroupedDependencyMap = Record<string, DependencyMap>;
|
|
|
|
|
|
|
|
|
|
// group dependants by entity and filter self-dependencies
|
|
|
|
|
// because, we're only interested in entities that depend on other entitites
|
|
|
|
|
// filter exception: JS_OBJECT's, when a function depends on another function within the same object
|
|
|
|
|
export const groupAndFilterDependantsMap = (
|
|
|
|
|
inverseMap: DependencyMap,
|
|
|
|
|
dataTree: DataTree,
|
|
|
|
|
): GroupedDependencyMap => {
|
|
|
|
|
const entitiesDepMap: GroupedDependencyMap = {};
|
|
|
|
|
|
|
|
|
|
Object.entries(inverseMap).forEach(([fullDependencyPath, dependants]) => {
|
|
|
|
|
const dependencyEntityName = fullDependencyPath.split(".")[0];
|
|
|
|
|
const dataTreeEntity = dataTree[dependencyEntityName];
|
|
|
|
|
if (!dataTreeEntity) return;
|
|
|
|
|
const isJS_Object = isJSObject(dataTreeEntity);
|
|
|
|
|
|
|
|
|
|
const entityDependantsMap = entitiesDepMap[dependencyEntityName] || {};
|
|
|
|
|
let entityPathDependants = entityDependantsMap[fullDependencyPath] || [];
|
|
|
|
|
|
|
|
|
|
entityPathDependants = entityPathDependants.concat(
|
|
|
|
|
isJS_Object
|
|
|
|
|
? /* include self-dependent properties for JsObjects
|
|
|
|
|
e.g. {
|
|
|
|
|
"JsObject.internalFunc": [ "JsObject.fun1", "JsObject" ]
|
|
|
|
|
}
|
|
|
|
|
When fun1 calls internalfunc within it's body.
|
|
|
|
|
Will keep "JsObject.fun1" and filter "JsObject".
|
|
|
|
|
*/
|
|
|
|
|
dependants.filter((dep) => dep !== dependencyEntityName)
|
|
|
|
|
: /* filter self-dependent properties for everything else
|
|
|
|
|
e.g. {
|
|
|
|
|
Select1.selectedOptionValue: [
|
|
|
|
|
'Select1.isValid', 'Select1'
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
Will remove both 'Select1.isValid', 'Select1'.
|
|
|
|
|
*/
|
|
|
|
|
dependants.filter(
|
|
|
|
|
(dep) => dep.split(".")[0] !== dependencyEntityName,
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!(entityPathDependants.length > 0)) return;
|
|
|
|
|
set(
|
|
|
|
|
entitiesDepMap,
|
|
|
|
|
[dependencyEntityName, fullDependencyPath],
|
|
|
|
|
entityPathDependants,
|
|
|
|
|
);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return entitiesDepMap;
|
|
|
|
|
};
|
|
|
|
|
|
2022-09-13 05:40:08 +00:00
|
|
|
// get entity paths that depend on a given list of entites
|
|
|
|
|
// e.g. widget paths that depend on a list of actions
|
|
|
|
|
export const getEntityDependantPaths = (
|
2022-03-08 13:56:03 +00:00
|
|
|
fullEntityPaths: string[],
|
|
|
|
|
allEntitiesDependantsmap: GroupedDependencyMap,
|
|
|
|
|
visitedPaths: Set<string>,
|
2022-09-13 05:40:08 +00:00
|
|
|
): Set<string> => {
|
2022-04-07 11:01:31 +00:00
|
|
|
const dependantEntityNames = new Set<string>();
|
2022-03-08 13:56:03 +00:00
|
|
|
const dependantEntityFullPaths = new Set<string>();
|
|
|
|
|
|
|
|
|
|
fullEntityPaths.forEach((fullEntityPath) => {
|
|
|
|
|
const entityPathArray = fullEntityPath.split(".");
|
|
|
|
|
const entityName = entityPathArray[0];
|
|
|
|
|
if (!(entityName in allEntitiesDependantsmap)) return;
|
|
|
|
|
const entityDependantsMap = allEntitiesDependantsmap[entityName];
|
|
|
|
|
|
|
|
|
|
// goes through properties of an entity
|
|
|
|
|
Object.entries(entityDependantsMap).forEach(
|
|
|
|
|
([fullDependencyPath, dependants]) => {
|
|
|
|
|
// skip other properties, when searching for a specific entityPath
|
|
|
|
|
// e.g. Entity.prop1 should not go through dependants of Entity.prop2
|
|
|
|
|
if (
|
|
|
|
|
entityPathArray.length > 1 &&
|
|
|
|
|
fullDependencyPath !== fullEntityPath
|
|
|
|
|
) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// goes through dependants of a property
|
|
|
|
|
dependants.forEach((dependantPath) => {
|
2022-04-07 11:01:31 +00:00
|
|
|
const dependantEntityName = dependantPath.split(".")[0];
|
2022-03-08 13:56:03 +00:00
|
|
|
// Marking visited paths to avoid infinite recursion.
|
|
|
|
|
if (visitedPaths.has(dependantPath)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
visitedPaths.add(dependantPath);
|
|
|
|
|
|
2022-04-07 11:01:31 +00:00
|
|
|
dependantEntityNames.add(dependantEntityName);
|
2022-03-08 13:56:03 +00:00
|
|
|
dependantEntityFullPaths.add(dependantPath);
|
|
|
|
|
|
2022-09-13 05:40:08 +00:00
|
|
|
const childDependants = getEntityDependantPaths(
|
2022-03-08 13:56:03 +00:00
|
|
|
[dependantPath],
|
|
|
|
|
allEntitiesDependantsmap,
|
|
|
|
|
visitedPaths,
|
|
|
|
|
);
|
2022-09-13 05:40:08 +00:00
|
|
|
|
|
|
|
|
childDependants.forEach((childDependantPath) => {
|
2022-03-08 13:56:03 +00:00
|
|
|
dependantEntityFullPaths.add(childDependantPath);
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
});
|
|
|
|
|
|
2022-09-13 05:40:08 +00:00
|
|
|
return dependantEntityFullPaths;
|
2022-03-08 13:56:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export const findLoadingEntities = (
|
2022-09-13 05:40:08 +00:00
|
|
|
loadingActions: string[],
|
2022-03-08 13:56:03 +00:00
|
|
|
dataTree: DataTree,
|
|
|
|
|
inverseMap: DependencyMap,
|
|
|
|
|
): Set<string> => {
|
|
|
|
|
const entitiesDependantsMap = groupAndFilterDependantsMap(
|
|
|
|
|
inverseMap,
|
|
|
|
|
dataTree,
|
|
|
|
|
);
|
2022-09-13 05:40:08 +00:00
|
|
|
const loadingEntityPaths = getEntityDependantPaths(
|
|
|
|
|
loadingActions,
|
2022-03-08 13:56:03 +00:00
|
|
|
entitiesDependantsMap,
|
|
|
|
|
new Set<string>(),
|
|
|
|
|
);
|
2022-03-31 11:37:18 +00:00
|
|
|
|
2022-04-07 11:01:31 +00:00
|
|
|
// check animateLoading is active on current widgets and set
|
|
|
|
|
const filteredLoadingEntityNames = new Set<string>();
|
2022-09-13 05:40:08 +00:00
|
|
|
|
|
|
|
|
loadingEntityPaths.forEach((entityPath) => {
|
|
|
|
|
const entityPathArray = entityPath.split(".");
|
|
|
|
|
const entityName = entityPathArray[0];
|
|
|
|
|
const widget = get(dataTree, [entityName]);
|
|
|
|
|
if (isWidget(widget)) {
|
|
|
|
|
const loadingProperties = WidgetFactory.getLoadingProperties(widget.type);
|
|
|
|
|
|
|
|
|
|
// check if propertyPath is listed in widgetConfig
|
|
|
|
|
if (
|
|
|
|
|
entityPathArray.length > 1 &&
|
|
|
|
|
loadingProperties &&
|
|
|
|
|
!loadingProperties.some((propRegExp) => propRegExp.test(entityPath))
|
|
|
|
|
) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// check animateLoading is active on current widgets and set
|
2022-03-08 13:56:03 +00:00
|
|
|
get(dataTree, [entityName, "animateLoading"]) === true &&
|
|
|
|
|
filteredLoadingEntityNames.add(entityName);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return filteredLoadingEntityNames;
|
|
|
|
|
};
|