semanticdb-core 1.0.8 → 1.0.9

package/dist/index.d.ts

@@ -5,7 +5,3 @@ export * from './schema/schema.utils';
 export { getDrilldownDimensions } from './schema/schema.utils/getDrilldownDimensions';
 export * from './logicform/logicform';
 export * from './logicform/logicform.utils';
-export * from './logicform/types/query';
-export * from './logicform/types/date';
-export * from './logicform/types/compare-operator';
-export * from './logicform/types/complex-operator';

package/dist/index.js

@@ -23,7 +23,3 @@ var getDrilldownDimensions_1 = require("./schema/schema.utils/getDrilldownDimens
 Object.defineProperty(exports, "getDrilldownDimensions", { enumerable: true, get: function () { return getDrilldownDimensions_1.getDrilldownDimensions; } });
 __exportStar(require("./logicform/logicform"), exports);
 __exportStar(require("./logicform/logicform.utils"), exports);
-__exportStar(require("./logicform/types/query"), exports);
-__exportStar(require("./logicform/types/date"), exports);
-__exportStar(require("./logicform/types/compare-operator"), exports);
-__exportStar(require("./logicform/types/complex-operator"), exports);

package/dist/logicform/logicform.utils.d.ts

@@ -33,4 +33,4 @@ export declare const isDimensionInLogicform: (logicform: LogicformType, dimensio
  * }
  * ```
  */
-export declare const getFlattenQuery: (query: QueryType) => import("./types/query").QueryTypeBase;
+export declare const getFlattenQuery: (query: QueryType) => QueryType;

package/dist/logicform/logicform.utils.js

@@ -13,56 +13,8 @@ exports.getFlattenQuery = exports.isDimensionInLogicform = exports.isDimensionIn
  * ```
  */
 const isDimensionInQuery = (query, dimension) => {
-    var _a, _b, _c, _d;
-    const chain = dimension.split('_');
-    let chainedQuery = query;
-    for (let i = 0; i < chain.length; i++) {
-        const item = chain[i];
-        // TBD: 如果是$or, $and怎么办呢？
-        if (item === '$or' || item === '$and')
-            return false;
-        if (typeof chainedQuery !== 'object')
-            return false;
-        if (!(chainedQuery && item in chainedQuery)) {
-            return false;
-        }
-        // last one
-        if (i === chain.length - 1) {
-            if (typeof chainedQuery[item] !== 'object' ||
-                !(chainedQuery[item] && 'schema' in chainedQuery[item])) {
-                if (typeof chainedQuery[item] === 'object' &&
-                    chainedQuery[item] &&
-                    '$exists' in chainedQuery[item]) {
-                    return false;
-                }
-                return true;
-            }
-            // 接下去chainedQuery[item]都是LogicformType
-            if (chainedQuery[item].entity_id) {
-                return true;
-            }
-            // TBD: 如果是$or, $and怎么办呢？
-            if (((_b = (_a = chainedQuery[item]) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b.$or) || ((_d = (_c = chainedQuery[item]) === null || _c === void 0 ? void 0 : _c.query) === null || _d === void 0 ? void 0 : _d.$and))
-                return false;
-            // TODO: 如果是name property，也行的，现在先简单搞一个
-            if (chainedQuery[item].query &&
-                !('$or' in chainedQuery[item].query) &&
-                !('$and' in chainedQuery[item].query) &&
-                '别名' in chainedQuery[item].query // TODO: 这里是一个临时的方案，后面需要改成动态获取property
-            ) {
-                return true;
-            }
-            return false;
-        }
-        if (typeof chainedQuery[item] !== 'object' ||
-            !(chainedQuery[item] && 'schema' in chainedQuery[item])) {
-            return false;
-        }
-        if (chainedQuery[item].query) {
-            chainedQuery = chainedQuery[item].query;
-        }
-    }
-    return false;
+    const flattenQuery = (0, exports.getFlattenQuery)(query);
+    return dimension in flattenQuery;
 };
 exports.isDimensionInQuery = isDimensionInQuery;
 const isDimensionInGroupby = (groupby, dimension) => {
@@ -106,11 +58,16 @@ exports.isDimensionInLogicform = isDimensionInLogicform;
  * ```
  */
 const getFlattenQuery = (query) => {
-    const flattenQuery = {};
+    let flattenQuery = {};
     for (const [k, v] of Object.entries(query)) {
-        if (k === '$and' || k === '$or') {
-            // complex的暂时先不管
-            flattenQuery[k] = v;
+        if (Array.isArray(v) && (k === '$and' || k === '$or')) {
+            const tmp = [];
+            v.forEach((item) => {
+                if (typeof item === 'object' && item) {
+                    tmp.push((0, exports.getFlattenQuery)(item));
+                }
+            });
+            flattenQuery[k] = tmp;
         }
         else if (typeof v === 'object' &&
             v &&
@@ -122,7 +79,18 @@ const getFlattenQuery = (query) => {
             // 这里是一个logicform
             const flattenSubQuery = (0, exports.getFlattenQuery)(v.query || {});
             for (const [sk, sv] of Object.entries(flattenSubQuery)) {
-                flattenQuery[`${k}_${sk}`] = sv;
+                if (Array.isArray(sv) &&
+                    sv.length &&
+                    (sk === '$or' || sk === '$and') &&
+                    sv.every((item) => typeof item === 'object' && item)) {
+                    const obj = Object.assign({}, ...sv);
+                    for (let i in obj) {
+                        flattenQuery[`${k}_${i}`] = obj[i];
+                    }
+                }
+                else {
+                    flattenQuery[`${k}_${sk}`] = sv;
+                }
             }
         }
         else {

package/dist/logicform/types/date.d.ts

@@ -0,0 +1,15 @@
+declare type timewindow = 'year' | 'quarter' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second';
+declare type DateValueOffset = {
+    $offset: Partial<{
+        [K in timewindow]: number;
+    }>;
+};
+declare type DateValueBasic = Partial<{
+    [K in timewindow]: number;
+}>;
+declare type DateValuePartial = Partial<{
+    [K in timewindow as `$${K}`]: number;
+}>;
+declare type DateValueToDate = 'MTD' | 'YTD' | 'QTD' | 'WTD';
+export declare type DateValue = `${number}-${number}-${number} ${number}:${number}:${number}` | DateValueOffset | DateValueBasic | DateValuePartial | DateValueToDate;
+export {};

package/dist/logicform/types/date.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/logicform/types/query.d.ts

@@ -0,0 +1,10 @@
+import { LogicformType } from '../logicform';
+import { DateValue } from './date';
+export declare type CompareOperator = '$eq' | '$gt' | '$gte' | '$lt' | '$lte' | '$ne' | '$in' | '$nin' | '$exists' | '$regex' | '$options' | '$and' | '$or';
+export declare type QueryValueType = null | string | number | boolean | DateValue | LogicformType | string[] | number[] | boolean[] | DateValue[] | LogicformType[];
+export declare type QueryValueTypeWithCompareOperator = Partial<{
+    [K in CompareOperator]: QueryValueType;
+}> & {
+    schema?: never;
+};
+export declare type QueryType = Record<string, QueryValueType | QueryValueTypeWithCompareOperator | QueryType[] | undefined>;

package/dist/logicform/types/query.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/schema/schema.d.ts

@@ -19,7 +19,6 @@ export interface SchemaTypeDraft {
         drilldown_blacklist?: string[];
     };
     drilldown?: GroupbyItemType[];
-    projections?: string[];
 }
 export interface SchemaType extends SchemaTypeDraft {
     properties: PropertyType[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semanticdb-core",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [