[Chore]: Technical: add types for processors #1798

dariaterekhova-actionengine · 2022-04-21T13:20:49Z

Signed-off-by: Daria Terekhova daria.terekhova@actionengine.com

Signed-off-by: Daria Terekhova <daria.terekhova@actionengine.com>

heshan0131 · 2022-04-29T06:59:50Z

src/processors/data-processor.ts

@@ -58,20 +63,20 @@ const IGNORE_DATA_TYPES = Object.keys(AnalyzerDATA_TYPES).filter(

 export const PARSE_FIELD_VALUE_FROM_STRING = {
  [ALL_FIELD_TYPES.boolean]: {
-    valid: d => typeof d === 'boolean',
-    parse: d => d === 'true' || d === 'True' || d === 'TRUE' || d === '1'
+    valid: (d: any) => typeof d === 'boolean',


(d: unknown): boolean => typeof d === 'boolean'

heshan0131 · 2022-04-29T07:00:34Z

src/processors/data-processor.ts

-    valid: d => typeof d === 'boolean',
-    parse: d => d === 'true' || d === 'True' || d === 'TRUE' || d === '1'
+    valid: (d: any) => typeof d === 'boolean',
+    parse: (d: any) => d === 'true' || d === 'True' || d === 'TRUE' || d === '1'


(d: unknown): boolean

heshan0131 · 2022-04-29T07:01:16Z

src/processors/data-processor.ts

  },
  [ALL_FIELD_TYPES.integer]: {
-    valid: d => parseInt(d, 10) === d,
-    parse: d => parseInt(d, 10)
+    valid: (d: any) => parseInt(d, 10) === d,


same below, use (d: unknown): boolean for validate

heshan0131 · 2022-04-29T07:01:28Z

src/processors/data-processor.ts

-    valid: d => parseInt(d, 10) === d,
-    parse: d => parseInt(d, 10)
+    valid: (d: any) => parseInt(d, 10) === d,
+    parse: (d: any) => parseInt(d, 10)


(value: unknown): number

heshan0131 · 2022-04-29T07:10:35Z

src/processors/data-processor.ts

+  sampleCount = 50
+}: {
+  fields: string[];
+  rows: any[][];


rows: unknown[][]

heshan0131 · 2022-04-29T07:10:51Z

src/processors/data-processor.ts

 */
-function cleanUpFalsyCsvValue(rows) {
+function cleanUpFalsyCsvValue(rows: any[][]): void {


rows: unknown[][]

heshan0131 · 2022-04-29T07:10:58Z

src/processors/data-processor.ts

 */
-export function parseCsvRowsByFieldType(rows, geoFieldIdx, field, i) {
+export function parseCsvRowsByFieldType(
+  rows: any[][],


rows: unknown[][]

heshan0131 · 2022-04-29T07:24:58Z

src/processors/data-processor.ts

-function findNonEmptyRowsAtField(rows, fieldIdx, total) {
-  const sample = [];
+function findNonEmptyRowsAtField(
+  rows: Record<number, unknown>[],


rows: unknown[][]

heshan0131 · 2022-04-29T07:27:24Z

src/processors/file-handler.ts

@@ -47,25 +50,25 @@ const JSON_LOADER_OPTIONS = {
  ]
 };

-export function isGeoJson(json) {
+export function isGeoJson(json: any): boolean {


you can use type guard here
isGeoJson(json: unknown): json is Feature | FeatureCollection

heshan0131 · 2022-04-29T07:27:37Z

src/processors/file-handler.ts

  // json can be feature collection
  // or single feature
  return isPlainObject(json) && (isFeature(json) || isFeatureCollection(json));
 }

-export function isFeature(json) {
+export function isFeature(json: any): boolean {


isFeature(json: unknown): json is Feature

heshan0131 · 2022-04-29T07:27:48Z

src/processors/file-handler.ts

  return json.type === 'Feature' && json.geometry;
 }

-export function isFeatureCollection(json) {
+export function isFeatureCollection(json: any): boolean {


isFeatureCollection(json: unknown): json is FeatureCollection

heshan0131 · 2022-04-29T07:28:31Z

src/processors/file-handler.ts

@@ -47,25 +50,25 @@ const JSON_LOADER_OPTIONS = {
  ]
 };

-export function isGeoJson(json) {
+export function isGeoJson(json: any): boolean {
  // json can be feature collection
  // or single feature
  return isPlainObject(json) && (isFeature(json) || isFeatureCollection(json));


add type isPlainObject(obj: unknown): obj is Record<string, unknown>

heshan0131 · 2022-04-29T07:32:31Z

src/processors/file-handler.ts

  return Array.isArray(json) && isPlainObject(json[0]);
 }

-export function isKeplerGlMap(json) {
+export function isKeplerGlMap(json: any): Boolean {


type ValidKeplerGlMap = { datasets: unknown config: unknown info: Record<string, string> }

isKeplerGlMap(json: unknown): json is ValidKeplerGlMap

Signed-off-by: Evgeny Zhgulev <evgeny.zhgulev@actionengine.com>

heshan0131 · 2022-05-16T17:52:40Z

src/processors/data-processor.ts

  },
  [ALL_FIELD_TYPES.timestamp]: {
-    valid: (d, field) =>
+    valid: (d: any, field: Field) =>


valid: (d: unknown, field: Field): boolean;

heshan0131 · 2022-05-16T17:53:18Z

src/processors/data-processor.ts

  },
  [ALL_FIELD_TYPES.real]: {
-    valid: d => parseFloat(d) === d,
+    valid: (d: any) => parseFloat(d) === d,


(d: unknown): boolean

heshan0131

Please address the last 2 comments and merge

Signed-off-by: Evgeny Zhgulev <evgeny.zhgulev@actionengine.com>

add types for processors

e38cf98

Signed-off-by: Daria Terekhova <daria.terekhova@actionengine.com>

dariaterekhova-actionengine force-pushed the dt/add-types-processors branch from 325706a to e38cf98 Compare April 21, 2022 13:25

heshan0131 reviewed Apr 29, 2022

View reviewed changes

add changes due to review

affe8ed

Signed-off-by: Evgeny Zhgulev <evgeny.zhgulev@actionengine.com>

heshan0131 reviewed May 16, 2022

View reviewed changes

heshan0131 approved these changes May 16, 2022

View reviewed changes

jagerts added 2 commits May 17, 2022 12:54

add fixes after code review

9585411

Signed-off-by: Evgeny Zhgulev <evgeny.zhgulev@actionengine.com>

Merge branch master into dt/add-types-processors

0e3c1bc

Signed-off-by: Evgeny Zhgulev <evgeny.zhgulev@actionengine.com>

jagerts merged commit 4e8197d into master May 17, 2022

delete-merged-branch bot deleted the dt/add-types-processors branch May 17, 2022 10:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Chore]: Technical: add types for processors #1798

[Chore]: Technical: add types for processors #1798

dariaterekhova-actionengine commented Apr 21, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 Apr 29, 2022

jagerts May 17, 2022

heshan0131 May 16, 2022 •

edited

jagerts May 17, 2022

heshan0131 May 16, 2022

jagerts May 17, 2022

heshan0131 left a comment

[Chore]: Technical: add types for processors #1798

[Chore]: Technical: add types for processors #1798

Conversation

dariaterekhova-actionengine commented Apr 21, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heshan0131 May 16, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heshan0131 left a comment

Choose a reason for hiding this comment

heshan0131 May 16, 2022 •

edited