Skip to content

Commit 5723ebc

Browse files
HenatoHenato
Henato
and
Henato
authored
🤖 Merge PR #75256 feat: update @nginstack/datasource definitions by @Henato
Co-authored-by: Henato <renato@innovaro.com.br>
1 parent 74717a0 commit 5723ebc

18 files changed

Lines changed: 137 additions & 123 deletions

‎types/nginstack__datasource/lib/ClassDerivation.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const PATH = "PATH";
1+
export const PATH = 'PATH';

‎types/nginstack__datasource/lib/DBKeyDerivation.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const IMAGE = "IMAGE";
1+
export const IMAGE = 'IMAGE';

‎types/nginstack__datasource/lib/DataSource.d.ts‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
export = DataSource;
22
declare function DataSource(
33
definition: DataSourceDef | Record<any, any> | number,
4-
opt_options?: Record<any, any>,
4+
opt_options?: Record<any, any>
55
): void;
66
declare class DataSource {
77
constructor(
88
definition: DataSourceDef | Record<any, any> | number,
9-
opt_options?: Record<any, any>,
9+
opt_options?: Record<any, any>
1010
);
1111
private iKey_;
1212
private iUrl_;
@@ -38,23 +38,30 @@ declare class DataSource {
3838
purgeUnsolicitedColumns(ds: DataSet, columns: DataSourceColumns): DataSet;
3939
getResult(
4040
filters: DataSourceFilterDef[] | any[],
41-
columns: DataSourceColumnDef[] | any[],
41+
columns: DataSourceColumnDef[] | any[]
4242
): DataSourceResult;
4343
}
4444
declare namespace DataSource {
45-
export { ColumnOps, DataSourceColumnDef, DataSourceDef, DataSourceFilterDef, list, loadDefinitionFile };
45+
export {
46+
ColumnOps,
47+
loadDefinitionFile,
48+
list,
49+
DataSourceDef,
50+
DataSourceColumnDef,
51+
DataSourceFilterDef,
52+
};
4653
}
47-
import DataSourceFilters = require("./DataSourceFilters.js");
48-
import DataSourceColumns = require("./DataSourceColumns.js");
49-
import DataSet = require("@nginstack/engine/lib/dataset/DataSet.js");
50-
import DataSourceResult = require("./DataSourceResult.js");
54+
import DataSourceFilters = require('./DataSourceFilters.js');
55+
import DataSourceColumns = require('./DataSourceColumns.js');
56+
import DataSet = require('@nginstack/engine/lib/dataset/DataSet.js');
57+
import DataSourceResult = require('./DataSourceResult.js');
5158
declare namespace ColumnOps {
5259
let DIMENSION: string;
5360
let DERIVATION: string;
5461
}
5562
type ColumnOps = string;
5663
declare function loadDefinitionFile(fileId: number | string): any;
5764
declare function list(): DataSet;
58-
type DataSourceDef = import("./DataSourceDef");
59-
type DataSourceColumnDef = import("./DataSourceColumnDef");
60-
type DataSourceFilterDef = import("./DataSourceFilterDef");
65+
type DataSourceDef = import('./DataSourceDef');
66+
type DataSourceColumnDef = import('./DataSourceColumnDef');
67+
type DataSourceFilterDef = import('./DataSourceFilterDef');

‎types/nginstack__datasource/lib/DataSourceColumn.d.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ declare class DataSourceColumn {
4040
}
4141
declare namespace DataSourceColumn {
4242
export {
43-
AGGREGATE_AVG,
43+
AGGREGATE_NONE,
44+
AGGREGATE_SUM,
4445
AGGREGATE_COUNT,
46+
AGGREGATE_AVG,
4547
AGGREGATE_MAX,
4648
AGGREGATE_MIN,
47-
AGGREGATE_NONE,
48-
AGGREGATE_SUM,
49-
colNameFromField,
49+
SORT_NONE,
50+
SORT_ASC,
51+
SORT_DESC,
5052
DIMENSION_SEP,
51-
Field,
53+
colNameFromField,
5254
fromField,
5355
getRootFromLeafNode,
54-
SORT_ASC,
55-
SORT_DESC,
56-
SORT_NONE,
56+
Field,
5757
};
5858
}
5959
declare let AGGREGATE_NONE: string;
@@ -69,4 +69,4 @@ declare let DIMENSION_SEP: string;
6969
declare function colNameFromField(fld: Field, prefix: string): string;
7070
declare function fromField(fld: Field, prefix: string): DataSourceColumn;
7171
declare function getRootFromLeafNode(leafNode: number, suggestedRoot: number): number;
72-
type Field = import("@nginstack/engine/lib/classdef/Field");
72+
type Field = import('@nginstack/engine/lib/classdef/Field');

‎types/nginstack__datasource/lib/DataSourceColumns.d.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export = DataSourceColumns;
22
declare function DataSourceColumns(
33
opt_dataSource?: DataSource,
4-
opt_colsDefs?: DataSourceColumnDef[],
4+
opt_colsDefs?: DataSourceColumnDef[]
55
): void;
66
declare class DataSourceColumns {
77
constructor(opt_dataSource?: DataSource, opt_colsDefs?: DataSourceColumnDef[]);
@@ -19,19 +19,19 @@ declare class DataSourceColumns {
1919
prefix: string,
2020
opt_options?:
2121
| {
22-
includeFieldNames: string;
23-
excludeFieldNames: string;
24-
children: boolean;
25-
onlyVisible: boolean;
26-
onlyIncludedFieldNames: boolean;
27-
}
28-
| Record<any, any>,
22+
includeFieldNames: string;
23+
excludeFieldNames: string;
24+
children: boolean;
25+
onlyVisible: boolean;
26+
onlyIncludedFieldNames: boolean;
27+
}
28+
| Record<any, any>
2929
): void;
3030
importVisibleFields(
3131
classKey: number,
3232
fieldNamesPrefix?: string,
3333
includeFieldNames?: string,
34-
excludeFieldNames?: string,
34+
excludeFieldNames?: string
3535
): void;
3636
parseDynColumnExpr(columnName: any): {
3737
derivedFrom: any;
@@ -51,9 +51,9 @@ declare class DataSourceColumns {
5151
getPostProcessingInfo(): any;
5252
}
5353
declare namespace DataSourceColumns {
54-
export { DataSource, DataSourceColumnDef, IQuery };
54+
export { DataSourceColumnDef, DataSource, IQuery };
5555
}
56-
import DataSourceColumn = require("./DataSourceColumn.js");
57-
type DataSourceColumnDef = import("./DataSourceColumnDef");
58-
type DataSource = import("./DataSource");
59-
type IQuery = import("@nginstack/iquery/lib/IQuery");
56+
import DataSourceColumn = require('./DataSourceColumn.js');
57+
type DataSourceColumnDef = import('./DataSourceColumnDef');
58+
type DataSource = import('./DataSource');
59+
type IQuery = import('@nginstack/iquery/lib/IQuery');

‎types/nginstack__datasource/lib/DataSourceDataType.d.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
export const STRING = "string";
2-
export const CHAR = "char";
3-
export const DATE = "date";
4-
export const INT32 = "int32";
5-
export const INT64 = "int64";
6-
export const NUMBER = "number";
7-
export const ARRAY = "array";
8-
export const MEMO = "memo";
9-
export const COMBO = "combo";
10-
export const MASTER_DETAIL = "masterdetail";
11-
export const BOOLEAN = "boolean";
12-
export const PHONE = "phone";
13-
export const FILE = "file";
14-
export const PASSWORD = "password";
15-
export const TIME = "time";
16-
export const DATETIME = "datetime";
17-
export const CEP = "cep";
18-
export const LATITUDE = "latitude";
19-
export const LONGITUDE = "longitude";
20-
export const ANGLE = "angle";
21-
export const GRID = "grid";
22-
export const INTEGER = "integer";
1+
export const STRING = 'string';
2+
export const CHAR = 'char';
3+
export const DATE = 'date';
4+
export const INT32 = 'int32';
5+
export const INT64 = 'int64';
6+
export const NUMBER = 'number';
7+
export const ARRAY = 'array';
8+
export const MEMO = 'memo';
9+
export const COMBO = 'combo';
10+
export const MASTER_DETAIL = 'masterdetail';
11+
export const BOOLEAN = 'boolean';
12+
export const PHONE = 'phone';
13+
export const FILE = 'file';
14+
export const PASSWORD = 'password';
15+
export const TIME = 'time';
16+
export const DATETIME = 'datetime';
17+
export const CEP = 'cep';
18+
export const LATITUDE = 'latitude';
19+
export const LONGITUDE = 'longitude';
20+
export const ANGLE = 'angle';
21+
export const GRID = 'grid';
22+
export const INTEGER = 'integer';
2323

2424
export type DataSourceDataType =
2525
| typeof STRING

‎types/nginstack__datasource/lib/DataSourceDef.d.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ declare class DataSourceDef {
1515
private autoPurgeUnsolicitedColumns;
1616
}
1717
declare namespace DataSourceDef {
18-
export { DataSet, DataSource, DataSourceColumns, DataSourceFilters, DataSourceSecurityMode };
18+
export { DataSet, DataSource, DataSourceFilters, DataSourceColumns, DataSourceSecurityMode };
1919
}
20-
type DataSet = import("@nginstack/engine/lib/dataset/DataSet");
21-
type DataSource = import("./DataSource");
22-
type DataSourceFilters = import("./DataSourceFilters");
23-
type DataSourceColumns = import("./DataSourceColumns");
20+
type DataSet = import('@nginstack/engine/lib/dataset/DataSet');
21+
type DataSource = import('./DataSource');
22+
type DataSourceFilters = import('./DataSourceFilters');
23+
type DataSourceColumns = import('./DataSourceColumns');
2424
type DataSourceSecurityMode = any;

‎types/nginstack__datasource/lib/DataSourceExecutor.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ declare class DataSourceExecutor {
99
declare namespace DataSourceExecutor {
1010
export { DataSet };
1111
}
12-
type DataSet = import("@nginstack/engine/lib/dataset/DataSet");
12+
type DataSet = import('@nginstack/engine/lib/dataset/DataSet');

‎types/nginstack__datasource/lib/DataSourceField.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ declare class DataSourceField {
2828
declare namespace DataSourceField {
2929
let PREFIX_SEPARATOR: string;
3030
}
31-
import DataSourceDataType = require("./DataSourceDataType.js");
31+
import DataSourceDataType = require('./DataSourceDataType.js');

‎types/nginstack__datasource/lib/DataSourceFieldDef.d.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ declare class DataSourceFieldDef {
1515
displayFormat: DateFormat | LatitudeFormat | LongitudeFormat | AngleFormat | NumberFormat;
1616
}
1717
declare namespace DataSourceFieldDef {
18-
export { AngleFormat, DateFormat, LatitudeFormat, LongitudeFormat, NumberFormat };
18+
export { DateFormat, LatitudeFormat, LongitudeFormat, AngleFormat, NumberFormat };
1919
}
20-
type DateFormat = typeof import("@nginstack/engine/lib/date/DateFormat");
21-
type LatitudeFormat = typeof import("@nginstack/engine/lib/geo/LatitudeFormat");
22-
type LongitudeFormat = typeof import("@nginstack/engine/lib/geo/LongitudeFormat");
23-
type AngleFormat = typeof import("@nginstack/engine/lib/geo/AngleFormat");
24-
type NumberFormat = typeof import("@nginstack/engine/lib/number/NumberFormat");
20+
type DateFormat = typeof import('@nginstack/engine/lib/date/DateFormat');
21+
type LatitudeFormat = typeof import('@nginstack/engine/lib/geo/LatitudeFormat');
22+
type LongitudeFormat = typeof import('@nginstack/engine/lib/geo/LongitudeFormat');
23+
type AngleFormat = typeof import('@nginstack/engine/lib/geo/AngleFormat');
24+
type NumberFormat = typeof import('@nginstack/engine/lib/number/NumberFormat');

0 commit comments

Comments
 (0)