[pull] master from DefinitelyTyped:master

types/bun/package.json

@@ -6,7 +6,7 @@
         "https://bun.sh"
     ],
     "dependencies": {
-        "bun-types": "1.2.10"
+        "bun-types": "1.2.11"
     },
     "devDependencies": {
         "@types/bun": "workspace:."

types/nginstack__datasource/lib/ClassDerivation.d.ts

@@ -1,3 +1 @@
-export type exports = string;
-declare let PATH: string;
-export {};
+export const PATH = "PATH";

types/nginstack__datasource/lib/DBKeyDerivation.d.ts

@@ -1,3 +1 @@
-export type exports = string;
-declare let IMAGE: string;
-export {};
+export const IMAGE = "IMAGE";

types/nginstack__datasource/lib/DataSource.d.ts

@@ -33,8 +33,8 @@ declare class DataSource {
     private processAggregate_;
     private convertFilters_;
     private convertColumns_;
-    getKey(): number;
-    getUrl(): string;
+    key: number;
+    url: string;
     purgeUnsolicitedColumns(ds: DataSet, columns: DataSourceColumns): DataSet;
     getResult(
         filters: DataSourceFilterDef[] | any[],
@@ -44,7 +44,6 @@ declare class DataSource {
 declare namespace DataSource {
     export { ColumnOps, DataSourceColumnDef, DataSourceDef, DataSourceFilterDef, list, loadDefinitionFile };
 }
-type DataSourceDef = import("./DataSourceDef");
 import DataSourceFilters = require("./DataSourceFilters.js");
 import DataSourceColumns = require("./DataSourceColumns.js");
 import DataSet = require("@nginstack/engine/lib/dataset/DataSet.js");
@@ -56,5 +55,6 @@ declare namespace ColumnOps {
 type ColumnOps = string;
 declare function loadDefinitionFile(fileId: number | string): any;
 declare function list(): DataSet;
+type DataSourceDef = import("./DataSourceDef");
 type DataSourceColumnDef = import("./DataSourceColumnDef");
 type DataSourceFilterDef = import("./DataSourceFilterDef");

types/nginstack__datasource/lib/DataSourceColumn.d.ts

@@ -8,8 +8,6 @@ declare class DataSourceColumn {
     coalesceValue: any;
     pivot: boolean;
     pathRoot: number | null;
-    private dimensionDataType_;
-    private dimensionDataSize_;
     pathDepth: number | null;
     pathHeight: number | null;
     private format_;
@@ -22,14 +20,10 @@ declare class DataSourceColumn {
     private updateLevel_;
     private level_;
     onBeforeAliasChange: (arg0: DataSourceColumn, arg1: string) => any;
-    getLevel(): string;
+    level: string;
     private format;
-    getDimensionDataType(): string;
-    getDimensionDataSize(): string;
-    private getDepth;
-    private setDepth;
-    private getBackDepth;
-    private setBackDepth;
+    dimensionDataType: string;
+    dimensionDataSize: number;
     private getSource_;
     formatDimension(value: any): string;
     private updateDimensionDataType_;
@@ -74,5 +68,5 @@ declare let SORT_DESC: string;
 declare let DIMENSION_SEP: string;
 declare function colNameFromField(fld: Field, prefix: string): string;
 declare function fromField(fld: Field, prefix: string): DataSourceColumn;
-declare function getRootFromLeafNode(leafNode: number, opt_suggestedRoot: number): number;
+declare function getRootFromLeafNode(leafNode: number, suggestedRoot: number): number;
 type Field = import("@nginstack/engine/lib/classdef/Field");

types/nginstack__datasource/lib/DataSourceColumns.d.ts

@@ -12,20 +12,20 @@ declare class DataSourceColumns {
     private postProcessingInfo_;
     private newDynColumn_;
     private unshare_;
-    getLength(): number;
+    length: number;
     private importAndMixin_;
     importFields(
         classKey: number,
         prefix: string,
         opt_options?:
-            | Record<any, any>
             | {
                 includeFieldNames: string;
                 excludeFieldNames: string;
                 children: boolean;
                 onlyVisible: boolean;
                 onlyIncludedFieldNames: boolean;
-            },
+            }
+            | Record<any, any>,
     ): void;
     importVisibleFields(
         classKey: number,
@@ -53,7 +53,7 @@ declare class DataSourceColumns {
 declare namespace DataSourceColumns {
     export { DataSource, DataSourceColumnDef, IQuery };
 }
-type DataSource = import("./DataSource");
-type DataSourceColumnDef = import("./DataSourceColumnDef");
 import DataSourceColumn = require("./DataSourceColumn.js");
+type DataSourceColumnDef = import("./DataSourceColumnDef");
+type DataSource = import("./DataSource");
 type IQuery = import("@nginstack/iquery/lib/IQuery");

types/nginstack__datasource/lib/DataSourceDataType.d.ts

@@ -1,24 +1,46 @@
-export type exports = string;
-declare let STRING: string;
-declare let CHAR: string;
-declare let DATE: string;
-declare let INT32: string;
-declare let INT64: string;
-declare let NUMBER: string;
-declare let ARRAY: string;
-declare let MEMO: string;
-declare let COMBO: string;
-declare let MASTER_DETAIL: string;
-declare let BOOLEAN: string;
-declare let PHONE: string;
-declare let FILE: string;
-declare let PASSWORD: string;
-declare let TIME: string;
-declare let DATETIME: string;
-declare let CEP: string;
-declare let LATITUDE: string;
-declare let LONGITUDE: string;
-declare let ANGLE: string;
-declare let GRID: string;
-declare let INTEGER: string;
-export {};
+export const STRING = "string";
+export const CHAR = "char";
+export const DATE = "date";
+export const INT32 = "int32";
+export const INT64 = "int64";
+export const NUMBER = "number";
+export const ARRAY = "array";
+export const MEMO = "memo";
+export const COMBO = "combo";
+export const MASTER_DETAIL = "masterdetail";
+export const BOOLEAN = "boolean";
+export const PHONE = "phone";
+export const FILE = "file";
+export const PASSWORD = "password";
+export const TIME = "time";
+export const DATETIME = "datetime";
+export const CEP = "cep";
+export const LATITUDE = "latitude";
+export const LONGITUDE = "longitude";
+export const ANGLE = "angle";
+export const GRID = "grid";
+export const INTEGER = "integer";
+
+export type DataSourceDataType =
+    | typeof STRING
+    | typeof CHAR
+    | typeof DATE
+    | typeof INT32
+    | typeof INT64
+    | typeof NUMBER
+    | typeof ARRAY
+    | typeof MEMO
+    | typeof COMBO
+    | typeof MASTER_DETAIL
+    | typeof BOOLEAN
+    | typeof PHONE
+    | typeof FILE
+    | typeof PASSWORD
+    | typeof TIME
+    | typeof DATETIME
+    | typeof CEP
+    | typeof LATITUDE
+    | typeof LONGITUDE
+    | typeof ANGLE
+    | typeof GRID
+    | typeof INTEGER;

types/nginstack__datasource/lib/DataSourceDef.d.ts

@@ -17,8 +17,8 @@ declare class DataSourceDef {
 declare namespace DataSourceDef {
     export { DataSet, DataSource, DataSourceColumns, DataSourceFilters, DataSourceSecurityMode };
 }
-type DataSourceSecurityMode = any;
+type DataSet = import("@nginstack/engine/lib/dataset/DataSet");
 type DataSource = import("./DataSource");
 type DataSourceFilters = import("./DataSourceFilters");
 type DataSourceColumns = import("./DataSourceColumns");
-type DataSet = import("@nginstack/engine/lib/dataset/DataSet");
+type DataSourceSecurityMode = any;

types/nginstack__datasource/lib/DataSourceField.d.ts

@@ -2,30 +2,7 @@ export = DataSourceField;
 declare function DataSourceField(name: string, type: string): void;
 declare class DataSourceField {
     constructor(name: string, type: string);
-    type: {
-        STRING: string;
-        CHAR: string;
-        DATE: string;
-        INT32: string;
-        INT64: string;
-        NUMBER: string;
-        ARRAY: string;
-        MEMO: string;
-        COMBO: string;
-        MASTER_DETAIL: string;
-        BOOLEAN: string;
-        PHONE: string;
-        FILE: string;
-        PASSWORD: string;
-        TIME: string;
-        DATETIME: string;
-        CEP: string;
-        LATITUDE: string;
-        LONGITUDE: string;
-        ANGLE: string;
-        GRID: string;
-        INTEGER: string;
-    };
+    type: DataSourceDataType.DataSourceDataType;
     name: string;
     protected propertiesToAssign_: string[];
     protected base_: DataSourceField;
@@ -43,17 +20,12 @@ declare class DataSourceField {
     isDate(): boolean;
     isInteger(): boolean;
     isCombo(): boolean;
-    assignFrom(
-        src:
-            | DataSourceField
-            | {
-                [x: string]: any;
-            },
-    ): void;
+    assignFrom(src: DataSourceField | Record<string, any>): void;
     toString(): string;
     clone(): DataSourceField;
     unshare(): DataSourceField;
 }
 declare namespace DataSourceField {
     let PREFIX_SEPARATOR: string;
 }
+import DataSourceDataType = require("./DataSourceDataType.js");

types/nginstack__datasource/lib/DataSourceFilter.d.ts

@@ -2,7 +2,7 @@ export = DataSourceFilter;
 declare function DataSourceFilter(name: string, type: string): void;
 declare class DataSourceFilter {
     constructor(name: string, type: string);
-    onAfterLoadDefaultValue: Event;
+    onAfterLoadDefaultValue: import("@nginstack/engine/lib/event/Event");
     private propertiesToAssign_;
     group: string;
     size: number;
@@ -15,25 +15,11 @@ declare class DataSourceFilter {
     private notifyNameChange_;
     private fieldName_;
     private prefix_;
-    private getNameSegments;
-    getFieldName(): string;
-    getCanonicalName(): string;
-    private defaultValue_;
-    setDefaultValue(value: number | string | Date): void;
-    getDefaultValue(): number | string | Date;
-    operator:
-        | {
-            EQUALITY: string;
-            INEQUALITY: string;
-            GREATER_THAN: string;
-            LESS_THAN: string;
-            GREATER_THAN_OR_EQUAL: string;
-            LESS_THAN_OR_EQUAL: string;
-            LIKE: string;
-            EXISTS: string;
-            NOT_EXISTS: string;
-        }
-        | string;
+    fieldName: string;
+    canonicalName: string;
+    defaultValue: number | string | Date;
+    private setDefaultValue;
+    operator: typeof FilterOperator | string;
     fromField(field: Field): void;
     type: string;
     label: string;
@@ -42,35 +28,16 @@ declare class DataSourceFilter {
     classKey: number;
     lookupType: number;
     displayFormat:
-        | {
-            DDMMYYYY: number;
-            DDMM: number;
-            MMYYYY: number;
-            WWYYYY: number;
-            YYYYWW: number;
-            MMMYYYY: number;
-        }
-        | {
-            DDD_DDDDD: number;
-            DDD_MM_MMM_DIR: number;
-            DDD_MM_SS_S_DIR: number;
-        }
-        | {
-            DDD_DDDDD: number;
-            DDD_MM_MMM_DIR: number;
-            DDD_MM_SS_S_DIR: number;
-        }
-        | {
-            DDD: number;
-            DDD_DD: number;
-        };
+        | typeof import("@nginstack/engine/lib/date/DateFormat.js")
+        | typeof import("@nginstack/engine/lib/geo/LatitudeFormat.js")
+        | typeof import("@nginstack/engine/lib/geo/LongitudeFormat.js")
+        | typeof import("@nginstack/engine/lib/geo/AngleFormat.js");
     stringIfTrue: string;
 }
 declare namespace DataSourceFilter {
     export { DATE_KEYWORDS, Event, Field, LimitType, removeRangeSuffix, shouldCreateAuxiliaryRangeFilters };
 }
-type Event = import("@nginstack/engine/lib/event/Event");
-type LimitType = 1 | 2;
+import FilterOperator = require("./FilterOperator.js");
 declare namespace DATE_KEYWORDS {
     let IM: boolean;
     let FM: boolean;
@@ -87,4 +54,6 @@ declare namespace DATE_KEYWORDS {
 }
 declare function removeRangeSuffix(name: string): string;
 declare function shouldCreateAuxiliaryRangeFilters(filter: DataSourceFilter | Field): boolean;
+type Event = import("@nginstack/engine/lib/event/Event");
 type Field = import("@nginstack/engine/lib/classdef/Field");
+type LimitType = 1 | 2;

types/nginstack__datasource/lib/DataSourceFilters.d.ts

@@ -7,20 +7,20 @@ declare class DataSourceFilters {
     private indexByName_;
     private newDynFilter_;
     private unshare_;
-    getLength(): number;
+    length: number;
     importFields(
         classKey: number,
         prefix: string,
         opt_options?:
-            | Record<any, any>
             | {
                 includeFieldNames: string;
                 excludeFieldNames: string;
                 children: boolean;
                 onlyVisible: boolean;
                 onlyIncludedFieldNames: boolean;
                 classDef: ModelDef;
-            },
+            }
+            | Record<any, any>,
     ): void;
     importVisibleFields(
         classKey: number,
@@ -47,7 +47,7 @@ declare class DataSourceFilters {
 declare namespace DataSourceFilters {
     export { DataSource, IQuery, ModelDef };
 }
-type DataSource = import("./DataSource");
 import DataSourceFilter = require("./DataSourceFilter.js");
 type ModelDef = import("@nginstack/engine/lib/classdef/ModelDef");
 type IQuery = import("@nginstack/iquery/lib/IQuery");
+type DataSource = import("./DataSource");

types/nginstack__datasource/lib/DataSourceQuery.d.ts

@@ -3,12 +3,12 @@ declare function DataSourceQuery(definition: Record<any, any> | number): void;
 declare class DataSourceQuery {
     constructor(definition: Record<any, any> | number);
     definition: any;
-    dataSource: Record<any, any> | number;
+    dataSource: number | Record<any, any>;
     dataSourceKey: number;
     filters: any;
     columns: any;
-    orderBy: string | null;
-    help: string | null;
+    orderBy: string;
+    help: string;
     includes: any;
     private dataSourceInstance_;
     dataSourceInstance: any;

types/nginstack__datasource/lib/DataSourceResult.d.ts

@@ -21,9 +21,9 @@ declare class DataSourceResult {
 declare namespace DataSourceResult {
     export { DataSet, DataSource, DataSourceColumnDef, DataSourceFilterDef };
 }
-type DataSource = import("./DataSource");
-type DataSourceFilterDef = import("./DataSourceFilterDef");
 import DataSourceFilters = require("./DataSourceFilters.js");
-type DataSourceColumnDef = import("./DataSourceColumnDef");
 import DataSourceColumns = require("./DataSourceColumns.js");
 type DataSet = import("@nginstack/engine/lib/dataset/DataSet");
+type DataSource = import("./DataSource");
+type DataSourceFilterDef = import("./DataSourceFilterDef");
+type DataSourceColumnDef = import("./DataSourceColumnDef");