dbgate-tools 6.5.5 → 6.6.0

package/lib/DatabaseAnalyser.d.ts

@@ -1,7 +1,7 @@
 import { DatabaseHandle, DatabaseInfo, DatabaseModification, EngineDriver, SqlDialect } from 'dbgate-types';
 import { type Logger } from 'pinomin';
-export declare class DatabaseAnalyser {
-    dbhan: DatabaseHandle;
+export declare class DatabaseAnalyser<TClient = any> {
+    dbhan: DatabaseHandle<TClient>;
     driver: EngineDriver;
     structure: DatabaseInfo;
     modifications: DatabaseModification[];
@@ -9,7 +9,7 @@ export declare class DatabaseAnalyser {
     singleObjectId: string;
     dialect: SqlDialect;
     logger: Logger;
-    constructor(dbhan: DatabaseHandle, driver: EngineDriver, version: any);
+    constructor(dbhan: DatabaseHandle<TClient>, driver: EngineDriver, version: any);
     _runAnalysis(): Promise<DatabaseInfo>;
     _getFastSnapshot(): Promise<DatabaseInfo>;
     _computeSingleObjectId(): Promise<void>;

package/lib/filterBehaviours.d.ts

@@ -5,6 +5,7 @@ export declare const logicalFilterBehaviour: FilterBehaviour;
 export declare const datetimeFilterBehaviour: FilterBehaviour;
 export declare const mongoFilterBehaviour: FilterBehaviour;
 export declare const evalFilterBehaviour: FilterBehaviour;
+export declare const firestoreFilterBehaviours: FilterBehaviour;
 export declare const standardFilterBehaviours: {
     [id: string]: FilterBehaviour;
 };

package/lib/filterBehaviours.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.standardFilterBehaviours = exports.evalFilterBehaviour = exports.mongoFilterBehaviour = exports.datetimeFilterBehaviour = exports.logicalFilterBehaviour = exports.stringFilterBehaviour = exports.numberFilterBehaviour = void 0;
+exports.standardFilterBehaviours = exports.firestoreFilterBehaviours = exports.evalFilterBehaviour = exports.mongoFilterBehaviour = exports.datetimeFilterBehaviour = exports.logicalFilterBehaviour = exports.stringFilterBehaviour = exports.numberFilterBehaviour = void 0;
 exports.numberFilterBehaviour = {
     supportEquals: true,
     supportNumberLikeComparison: true,
@@ -21,6 +21,7 @@ exports.stringFilterBehaviour = {
 exports.logicalFilterBehaviour = {
     supportBooleanValues: true,
     supportNullTesting: true,
+    supportBooleanOrNull: true,
     supportSqlCondition: true,
 };
 exports.datetimeFilterBehaviour = {
@@ -31,7 +32,8 @@ exports.datetimeFilterBehaviour = {
 };
 exports.mongoFilterBehaviour = {
     supportEquals: true,
-    supportArrayTesting: true,
+    supportEmptyArrayTesting: true,
+    supportNotEmptyArrayTesting: true,
     supportNumberLikeComparison: true,
     supportStringInclusion: true,
     supportBooleanValues: true,
@@ -48,11 +50,33 @@ exports.evalFilterBehaviour = {
     supportNullTesting: true,
     allowStringToken: true,
 };
+exports.firestoreFilterBehaviours = {
+    supportEquals: true,
+    supportEmpty: false,
+    supportNumberLikeComparison: true,
+    supportDatetimeComparison: false,
+    supportNullTesting: true,
+    supportBooleanValues: true,
+    supportEmptyArrayTesting: true,
+    supportStringInclusion: false,
+    supportDatetimeSymbols: false,
+    supportExistsTesting: false,
+    supportSqlCondition: false,
+    allowStringToken: true,
+    allowNumberToken: true,
+    allowHexString: true,
+    allowNumberDualTesting: false,
+    allowObjectIdTesting: false,
+    passBooleans: true,
+    passNumbers: true,
+    disableOr: true,
+};
 exports.standardFilterBehaviours = {
     numberFilterBehaviour: exports.numberFilterBehaviour,
     stringFilterBehaviour: exports.stringFilterBehaviour,
     logicalFilterBehaviour: exports.logicalFilterBehaviour,
     datetimeFilterBehaviour: exports.datetimeFilterBehaviour,
     mongoFilterBehaviour: exports.mongoFilterBehaviour,
+    firestoreFilterBehaviours: exports.firestoreFilterBehaviours,
     evalFilterBehaviour: exports.evalFilterBehaviour,
 };

package/lib/stringTools.js

@@ -60,6 +60,35 @@ function parseCellValue(value, editorTypes) {
             };
         }
     }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseGeopointAsDollar) {
+        const m = value.match(/^([\d\.]+)\s*°\s*([NS]),\s*([\d\.]+)\s*°\s*([EW])$/i);
+        if (m) {
+            let latitude = parseFloat(m[1]);
+            const latDir = m[2].toUpperCase();
+            let longitude = parseFloat(m[3]);
+            const lonDir = m[4].toUpperCase();
+            if (latDir === 'S')
+                latitude = -latitude;
+            if (lonDir === 'W')
+                longitude = -longitude;
+            return {
+                $geoPoint: {
+                    latitude,
+                    longitude,
+                },
+            };
+        }
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseFsDocumentRefAsDollar) {
+        const trimmedValue = value.replace(/\s/g, '');
+        if (trimmedValue.startsWith('$ref:')) {
+            return {
+                $fsDocumentRef: {
+                    documentPath: trimmedValue.slice(5),
+                },
+            };
+        }
+    }
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseJsonNull) {
         if (value == 'null')
             return null;
@@ -140,6 +169,7 @@ function stringifyJsonToGrid(value) {
     return { value: '(JSON)', gridStyle: 'nullCellStyle' };
 }
 function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, jsonParsedValue) {
+    var _a;
     if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseSqlNull) {
         if (value === null) {
             switch (intent) {
@@ -214,6 +244,29 @@ function stringifyCellValue(value, intent, editorTypes, gridFormattingOptions, j
             }
         }
     }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseGeopointAsDollar) {
+        if (value === null || value === void 0 ? void 0 : value.$geoPoint) {
+            const { latitude, longitude } = value.$geoPoint;
+            if ((0, isNumber_1.default)(latitude) && (0, isNumber_1.default)(longitude)) {
+                const latAbs = Math.abs(latitude);
+                const lonAbs = Math.abs(longitude);
+                const latDir = latitude >= 0 ? 'N' : 'S';
+                const lonDir = longitude >= 0 ? 'E' : 'W';
+                return {
+                    value: `${latAbs}° ${latDir}, ${lonAbs}° ${lonDir}`,
+                    gridStyle: 'valueCellStyle',
+                };
+            }
+        }
+    }
+    if (editorTypes === null || editorTypes === void 0 ? void 0 : editorTypes.parseFsDocumentRefAsDollar) {
+        if (value === null || value === void 0 ? void 0 : value.$fsDocumentRef) {
+            return {
+                value: `$ref: ${(_a = value.$fsDocumentRef.documentPath) !== null && _a !== void 0 ? _a : ''}`,
+                gridStyle: 'valueCellStyle',
+            };
+        }
+    }
     if ((0, isArray_1.default)(value)) {
         switch (intent) {
             case 'gridCellIntent':

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.5.5",
+  "version": "6.6.0",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,14 +26,14 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.5.5",
+    "dbgate-types": "^6.6.0",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"
   },
   "dependencies": {
     "dbgate-query-splitter": "^4.11.5",
-    "dbgate-sqltree": "^6.5.5",
+    "dbgate-sqltree": "^6.6.0",
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",