@ohos-ports/superset-ui-core 0.20.4-beta.1

package/lib/query/buildQueryObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildQueryObject.d.ts","sourceRoot":"","sources":["../../src/query/buildQueryObject.ts"],"names":[],"mappings":"AAoBA,OAAO,EAEL,WAAW,EAGZ,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,iBAAiB,EAEjB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAO/B;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,CAAC,SAAS,aAAa,EAC9D,QAAQ,EAAE,CAAC,EACX,WAAW,CAAC,EAAE,iBAAiB,GAC9B,WAAW,CA4Fb"}

package/lib/query/buildQueryObject.js

@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/* eslint-disable camelcase */
+import { isQueryFormMetric, } from './types/index.js';
+import processFilters from './processFilters.js';
+import extractExtras from './extractExtras.js';
+import extractQueryFields from './extractQueryFields.js';
+import { overrideExtraFormData } from './processExtraFormData.js';
+import { isDefined } from '../utils/index.js';
+/**
+ * Build the common segments of all query objects (e.g. the granularity field derived from
+ * SQLAlchemy). The segments specific to each viz type is constructed in the
+ * buildQuery method for each viz type (see `wordcloud/buildQuery.ts` for an example).
+ * Note the type of the formData argument passed in here is the type of the formData for a
+ * specific viz, which is a subtype of the generic formData shared among all viz types.
+ */
+export default function buildQueryObject(formData, queryFields) {
+    const { annotation_layers = [], extra_form_data, time_range, since, until, row_limit, row_offset, order_desc, limit, timeseries_limit_metric, granularity, url_params = {}, custom_params = {}, series_columns, series_limit, series_limit_metric, ...residualFormData } = formData;
+    const { adhoc_filters: appendAdhocFilters = [], filters: appendFilters = [], custom_form_data = {}, ...overrides } = extra_form_data || {};
+    const numericRowLimit = Number(row_limit);
+    const numericRowOffset = Number(row_offset);
+    const { metrics, columns, orderby } = extractQueryFields(residualFormData, queryFields);
+    // collect all filters for conversion to simple filters/freeform clauses
+    const extras = extractExtras(formData);
+    const { filters: extraFilters } = extras;
+    const filterFormData = {
+        filters: [...extraFilters, ...appendFilters],
+        adhoc_filters: [...(formData.adhoc_filters || []), ...appendAdhocFilters],
+    };
+    const extrasAndfilters = processFilters({
+        ...formData,
+        ...extras,
+        ...filterFormData,
+    });
+    const normalizeSeriesLimitMetric = (metric) => {
+        if (isQueryFormMetric(metric)) {
+            return metric;
+        }
+        return undefined;
+    };
+    let queryObject = {
+        // fallback `null` to `undefined` so they won't be sent to the backend
+        // (JSON.stringify will ignore `undefined`.)
+        time_range: time_range || undefined,
+        since: since || undefined,
+        until: until || undefined,
+        granularity: granularity || undefined,
+        ...extras,
+        ...extrasAndfilters,
+        columns,
+        metrics,
+        orderby,
+        annotation_layers,
+        row_limit: row_limit == null || Number.isNaN(numericRowLimit)
+            ? undefined
+            : numericRowLimit,
+        row_offset: row_offset == null || Number.isNaN(numericRowOffset)
+            ? undefined
+            : numericRowOffset,
+        series_columns,
+        series_limit: series_limit ?? (isDefined(limit) ? Number(limit) : 0),
+        series_limit_metric: normalizeSeriesLimitMetric(series_limit_metric) ??
+            timeseries_limit_metric ??
+            undefined,
+        order_desc: typeof order_desc === 'undefined' ? true : order_desc,
+        url_params: url_params || undefined,
+        custom_params,
+    };
+    // override extra form data used by native and cross filters
+    queryObject = overrideExtraFormData(queryObject, overrides);
+    return { ...queryObject, custom_form_data };
+}
+//# sourceMappingURL=buildQueryObject.js.map

package/lib/query/buildQueryObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildQueryObject.js","sourceRoot":"","sources":["../../src/query/buildQueryObject.ts"],"names":[],"mappings":"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"}

package/lib/query/constants.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { ExtraFormDataAppend, ExtraFormDataOverrideExtras, ExtraFormDataOverrideRegular, ExtraFormDataOverride, QueryObject } from './types';
+export declare const DTTM_ALIAS = "__timestamp";
+export declare const NO_TIME_RANGE = "No filter";
+export declare const EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS: (keyof ExtraFormDataOverrideExtras)[];
+export declare const EXTRA_FORM_DATA_APPEND_KEYS: (keyof ExtraFormDataAppend)[];
+export declare const EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS: Record<keyof ExtraFormDataOverrideRegular, keyof QueryObject>;
+export declare const EXTRA_FORM_DATA_OVERRIDE_REGULAR_KEYS: ("granularity_sqla" | "granularity" | "time_range" | "time_column" | "time_grain")[];
+export declare const EXTRA_FORM_DATA_OVERRIDE_KEYS: (keyof ExtraFormDataOverride)[];
+//# sourceMappingURL=constants.d.ts.map

package/lib/query/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/query/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,4BAA4B,EAC5B,qBAAqB,EACrB,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,UAAU,gBAAgB,CAAC;AACxC,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC,eAAO,MAAM,mCAAmC,EAAE,CAAC,MAAM,2BAA2B,CAAC,EAC9B,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,CAAC,MAAM,mBAAmB,CAAC,EAOpE,CAAC;AAEF,eAAO,MAAM,yCAAyC,EAAE,MAAM,CAC5D,MAAM,4BAA4B,EAClC,MAAM,WAAW,CAOlB,CAAC;AAEF,eAAO,MAAM,qCAAqC,sFAEP,CAAC;AAE5C,eAAO,MAAM,6BAA6B,EAAE,CAAC,MAAM,qBAAqB,CAAC,EAGxE,CAAC"}

package/lib/query/constants.js

@@ -0,0 +1,24 @@
+export const DTTM_ALIAS = '__timestamp';
+export const NO_TIME_RANGE = 'No filter';
+export const EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS = ['relative_start', 'relative_end', 'time_grain_sqla'];
+export const EXTRA_FORM_DATA_APPEND_KEYS = [
+    'adhoc_filters',
+    'filters',
+    'interactive_groupby',
+    'interactive_highlight',
+    'interactive_drilldown',
+    'custom_form_data',
+];
+export const EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS = {
+    granularity: 'granularity',
+    granularity_sqla: 'granularity',
+    time_column: 'time_column',
+    time_grain: 'time_grain',
+    time_range: 'time_range',
+};
+export const EXTRA_FORM_DATA_OVERRIDE_REGULAR_KEYS = Object.keys(EXTRA_FORM_DATA_OVERRIDE_REGULAR_MAPPINGS);
+export const EXTRA_FORM_DATA_OVERRIDE_KEYS = [
+    ...EXTRA_FORM_DATA_OVERRIDE_REGULAR_KEYS,
+    ...EXTRA_FORM_DATA_OVERRIDE_EXTRA_KEYS,
+];
+//# sourceMappingURL=constants.js.map

package/lib/query/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/query/constants.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC;AACxC,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC;AAEzC,MAAM,CAAC,MAAM,mCAAmC,GAC9C,CAAC,gBAAgB,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;AAExD,MAAM,CAAC,MAAM,2BAA2B,GAAkC;IACxE,eAAe;IACf,SAAS;IACT,qBAAqB;IACrB,uBAAuB;IACvB,uBAAuB;IACvB,kBAAkB;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,yCAAyC,GAGlD;IACF,WAAW,EAAE,aAAa;IAC1B,gBAAgB,EAAE,aAAa;IAC/B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;IACxB,UAAU,EAAE,YAAY;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,IAAI,CAC9D,yCAAyC,CACA,CAAC;AAE5C,MAAM,CAAC,MAAM,6BAA6B,GAAoC;IAC5E,GAAG,qCAAqC;IACxC,GAAG,mCAAmC;CACvC,CAAC"}

package/lib/query/convertFilter.d.ts

@@ -0,0 +1,4 @@
+import { SimpleAdhocFilter } from './types/Filter';
+import { QueryObjectFilterClause } from './types/Query';
+export default function convertFilter(filter: SimpleAdhocFilter): QueryObjectFilterClause;
+//# sourceMappingURL=convertFilter.d.ts.map

package/lib/query/convertFilter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertFilter.d.ts","sourceRoot":"","sources":["../../src/query/convertFilter.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,iBAAiB,EAGlB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,MAAM,EAAE,iBAAiB,GACxB,uBAAuB,CA2BzB"}

package/lib/query/convertFilter.js

@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { isBinaryAdhocFilter, isUnaryAdhocFilter, } from './types/Filter.js';
+export default function convertFilter(filter) {
+    const { subject } = filter;
+    if (isUnaryAdhocFilter(filter)) {
+        const { operator } = filter;
+        return {
+            col: subject,
+            op: operator,
+        };
+    }
+    if (isBinaryAdhocFilter(filter)) {
+        const { operator } = filter;
+        return {
+            col: subject,
+            op: operator,
+            val: filter.comparator,
+        };
+    }
+    const { operator } = filter;
+    return {
+        col: subject,
+        op: operator,
+        val: filter.comparator,
+    };
+}
+//# sourceMappingURL=convertFilter.js.map

package/lib/query/convertFilter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertFilter.js","sourceRoot":"","sources":["../../src/query/convertFilter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAEL,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,MAAyB;IAEzB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC3B,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE;QAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAE5B,OAAO;YACL,GAAG,EAAE,OAAO;YACZ,EAAE,EAAE,QAAQ;SACb,CAAC;KACH;IACD,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE;QAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAE5B,OAAO;YACL,GAAG,EAAE,OAAO;YACZ,EAAE,EAAE,QAAQ;YACZ,GAAG,EAAE,MAAM,CAAC,UAAU;SACvB,CAAC;KACH;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,OAAO;QACL,GAAG,EAAE,OAAO;QACZ,EAAE,EAAE,QAAQ;QACZ,GAAG,EAAE,MAAM,CAAC,UAAU;KACvB,CAAC;AACJ,CAAC"}

package/lib/query/extractExtras.d.ts

@@ -0,0 +1,16 @@
+import { TimeGranularity, QueryFormData } from '@ohos-ports/superset-ui-core';
+import { AppliedTimeExtras, QueryObjectExtras, QueryObjectFilterClause } from './types';
+type ExtraFilterQueryField = {
+    time_range?: string;
+    granularity_sqla?: string;
+    time_grain_sqla?: TimeGranularity;
+    granularity?: string;
+};
+type ExtractedExtra = ExtraFilterQueryField & {
+    filters: QueryObjectFilterClause[];
+    extras: QueryObjectExtras;
+    applied_time_extras: AppliedTimeExtras;
+};
+export default function extractExtras(formData: QueryFormData): ExtractedExtra;
+export {};
+//# sourceMappingURL=extractExtras.d.ts.map

package/lib/query/extractExtras.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractExtras.d.ts","sourceRoot":"","sources":["../../src/query/extractExtras.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EAExB,MAAM,SAAS,CAAC;AAEjB,KAAK,qBAAqB,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,cAAc,GAAG,qBAAqB,GAAG;IAC5C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,mBAAmB,EAAE,iBAAiB,CAAC;CACxC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,QAAQ,EAAE,aAAa,GAAG,cAAc,CAyC7E"}

package/lib/query/extractExtras.js

@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export default function extractExtras(formData) {
+    const applied_time_extras = {};
+    const filters = [];
+    const extras = {};
+    const extract = {
+        filters,
+        extras,
+        applied_time_extras,
+    };
+    const reservedColumnsToQueryField = {
+        __time_range: 'time_range',
+        __time_col: 'granularity_sqla',
+        __time_grain: 'time_grain_sqla',
+        __granularity: 'granularity',
+    };
+    (formData.extra_filters || []).forEach(filter => {
+        if (filter.col in reservedColumnsToQueryField) {
+            const key = filter.col;
+            const queryField = reservedColumnsToQueryField[key];
+            extract[queryField] = filter.val;
+            applied_time_extras[key] = filter.val;
+        }
+        else {
+            filters.push(filter);
+        }
+    });
+    // SQL
+    extras.time_grain_sqla = extract.time_grain_sqla || formData.time_grain_sqla;
+    extract.granularity =
+        extract.granularity_sqla ||
+            formData.granularity ||
+            formData.granularity_sqla;
+    delete extract.granularity_sqla;
+    delete extract.time_grain_sqla;
+    return extract;
+}
+//# sourceMappingURL=extractExtras.js.map

package/lib/query/extractExtras.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractExtras.js","sourceRoot":"","sources":["../../src/query/extractExtras.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAwBH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,QAAuB;IAC3D,MAAM,mBAAmB,GAAsB,EAAE,CAAC;IAClD,MAAM,OAAO,GAA8B,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,MAAM,OAAO,GAAmB;QAC9B,OAAO;QACP,MAAM;QACN,mBAAmB;KACpB,CAAC;IAEF,MAAM,2BAA2B,GAG7B;QACF,YAAY,EAAE,YAAY;QAC1B,UAAU,EAAE,kBAAkB;QAC9B,YAAY,EAAE,iBAAiB;QAC/B,aAAa,EAAE,aAAa;KAC7B,CAAC;IAEF,CAAC,QAAQ,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAC9C,IAAI,MAAM,CAAC,GAAG,IAAI,2BAA2B,EAAE;YAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,GAA0B,CAAC;YAC9C,MAAM,UAAU,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;YACpD,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,GAAsB,CAAC;YACpD,mBAAmB,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAa,CAAC;SACjD;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IAEH,MAAM;IACN,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAC;IAC7E,OAAO,CAAC,WAAW;QACjB,OAAO,CAAC,gBAAgB;YACxB,QAAQ,CAAC,WAAW;YACpB,QAAQ,CAAC,gBAAgB,CAAC;IAC5B,OAAO,OAAO,CAAC,gBAAgB,CAAC;IAChC,OAAO,OAAO,CAAC,eAAe,CAAC;IAE/B,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/lib/query/extractQueryFields.d.ts

@@ -0,0 +1,11 @@
+import { QueryFields, QueryFieldAliases, FormDataResidual } from './types/QueryFormData';
+/**
+ * Extra SQL query related fields from chart form data.
+ * Consolidate field values into arrays.
+ *
+ * @param formData - the (partial) form data obtained from chart controls.
+ * @param aliases - additional field aliases that maps arbitrary field names to
+ *                  query field names.
+ */
+export default function extractQueryFields(formData: FormDataResidual, aliases?: QueryFieldAliases): QueryFields;
+//# sourceMappingURL=extractQueryFields.d.ts.map

package/lib/query/extractQueryFields.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractQueryFields.d.ts","sourceRoot":"","sources":["../../src/query/extractQueryFields.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,WAAW,EAIX,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,WAAW,CAoFb"}

package/lib/query/extractQueryFields.js

@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { t } from '../translation/index.js';
+import { removeDuplicates } from '../utils/index.js';
+import getColumnLabel from './getColumnLabel.js';
+import getMetricLabel from './getMetricLabel.js';
+import { QueryMode, } from './types/QueryFormData.js';
+/**
+ * Extra SQL query related fields from chart form data.
+ * Consolidate field values into arrays.
+ *
+ * @param formData - the (partial) form data obtained from chart controls.
+ * @param aliases - additional field aliases that maps arbitrary field names to
+ *                  query field names.
+ */
+export default function extractQueryFields(formData, aliases) {
+    const queryFieldAliases = {
+        /** These are predefined for backward compatibility */
+        metric: 'metrics',
+        metric_2: 'metrics',
+        secondary_metric: 'metrics',
+        x: 'metrics',
+        y: 'metrics',
+        size: 'metrics',
+        all_columns: 'columns',
+        series: 'groupby',
+        order_by_cols: 'orderby',
+        ...aliases,
+    };
+    const { query_mode: queryMode, ...restFormData } = formData;
+    let columns = [];
+    let metrics = [];
+    let orderby = [];
+    Object.entries(restFormData).forEach(([key, value]) => {
+        // ignore `null` or `undefined` value
+        if (value == null) {
+            return;
+        }
+        let normalizedKey = queryFieldAliases[key] || key;
+        // ignore columns when (specifically) in aggregate mode.
+        // For charts that support both aggregate and raw records mode,
+        // we store both `groupby` and `columns` in `formData`, so users can
+        // switch between modes while retaining the selected options for each.
+        if (queryMode === QueryMode.Aggregate && normalizedKey === 'columns') {
+            return;
+        }
+        // for the same reason, ignore groupby and metrics in raw records mode
+        if (queryMode === QueryMode.Raw &&
+            (normalizedKey === 'groupby' || normalizedKey === 'metrics')) {
+            return;
+        }
+        // groupby has been deprecated in QueryObject: https://github.com/apache/superset/pull/9366
+        if (normalizedKey === 'groupby') {
+            normalizedKey = 'columns';
+        }
+        if (normalizedKey === 'metrics') {
+            metrics = metrics.concat(value);
+        }
+        else if (normalizedKey === 'columns') {
+            // currently the columns field only accept pre-defined columns (string shortcut)
+            columns = columns.concat(value);
+        }
+        else if (normalizedKey === 'orderby') {
+            orderby = orderby.concat(value);
+        }
+    });
+    return {
+        columns: removeDuplicates(columns.filter(col => col !== ''), getColumnLabel),
+        metrics: queryMode === QueryMode.Raw
+            ? undefined
+            : removeDuplicates(metrics, getMetricLabel),
+        orderby: orderby.length > 0
+            ? orderby.map(item => {
+                // value can be in the format of `['["col1", true]', '["col2", false]'],
+                // where the option strings come directly from `order_by_choices`.
+                if (typeof item === 'string') {
+                    try {
+                        return JSON.parse(item);
+                    }
+                    catch (error) {
+                        throw new Error(t('Found invalid orderby options'));
+                    }
+                }
+                return item;
+            })
+            : undefined,
+    };
+}
+//# sourceMappingURL=extractQueryFields.js.map

package/lib/query/extractQueryFields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractQueryFields.js","sourceRoot":"","sources":["../../src/query/extractQueryFields.ts"],"names":[],"mappings":"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"}

package/lib/query/extractTimegrain.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { QueryFormData } from '@ohos-ports/superset-ui-core';
+import { TimeGranularity } from '../time-format';
+export default function extractTimegrain(formData: QueryFormData): TimeGranularity | undefined;
+//# sourceMappingURL=extractTimegrain.d.ts.map

package/lib/query/extractTimegrain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractTimegrain.d.ts","sourceRoot":"","sources":["../../src/query/extractTimegrain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,QAAQ,EAAE,aAAa,GACtB,eAAe,GAAG,SAAS,CAY7B"}

package/lib/query/extractTimegrain.js

@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/* eslint-disable no-underscore-dangle */
+export default function extractTimegrain(formData) {
+    const { time_grain_sqla, extra_filters, extra_form_data } = formData;
+    if (extra_form_data?.time_grain_sqla) {
+        return extra_form_data.time_grain_sqla;
+    }
+    const extra_grain = (extra_filters || []).filter(filter => filter.col === '__time_grain');
+    if (extra_grain.length) {
+        return extra_grain[0].val;
+    }
+    return time_grain_sqla;
+}
+//# sourceMappingURL=extractTimegrain.js.map

package/lib/query/extractTimegrain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractTimegrain.js","sourceRoot":"","sources":["../../src/query/extractTimegrain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,yCAAyC;AAKzC,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,QAAuB;IAEvB,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC;IACrE,IAAI,eAAe,EAAE,eAAe,EAAE;QACpC,OAAO,eAAe,CAAC,eAAe,CAAC;KACxC;IACD,MAAM,WAAW,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,MAAM,CAC9C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,cAAc,CACxC,CAAC;IACF,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,GAAsB,CAAC;KAC9C;IACD,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/lib/query/getClientErrorObject.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { JsonObject, SupersetClientResponse, SupersetError } from '@ohos-ports/superset-ui-core';
+export type ClientErrorObject = {
+    error: string;
+    errors?: SupersetError[];
+    link?: string;
+    message?: string;
+    severity?: string;
+    stacktrace?: string;
+    statusText?: string;
+} & Partial<SupersetClientResponse>;
+interface TimeoutError {
+    statusText: 'timeout';
+    timeout: number;
+}
+type ErrorType = SupersetClientResponse | TimeoutError | {
+    response: Response;
+} | string;
+type ErrorTextSource = 'dashboard' | 'chart' | 'query' | 'dataset' | 'database';
+export declare function checkForHtml(str: string): boolean;
+export declare function parseStringResponse(str: string): string;
+export declare function getErrorFromStatusCode(status: number): string | null;
+export declare function retrieveErrorMessage(str: string, errorObject: JsonObject): string;
+export declare function parseErrorJson(responseJson: JsonObject): ClientErrorObject;
+export declare function getClientErrorObject(response: SupersetClientResponse | TimeoutError | {
+    response: Response;
+} | string): Promise<ClientErrorObject>;
+export declare function getErrorText(errorObject: ErrorType, source: ErrorTextSource): Promise<string>;
+export declare function getClientErrorMessage(message: string, clientError?: ClientErrorObject): string;
+export {};
+//# sourceMappingURL=getClientErrorObject.d.ts.map

package/lib/query/getClientErrorObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getClientErrorObject.d.ts","sourceRoot":"","sources":["../../src/query/getClientErrorObject.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAEL,UAAU,EACV,sBAAsB,EAEtB,aAAa,EAId,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAGpC,UAAU,YAAY;IACpB,UAAU,EAAE,SAAS,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,SAAS,GACV,sBAAsB,GACtB,YAAY,GACZ;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,GACtB,MAAM,CAAC;AAEX,KAAK,eAAe,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;AAoChF,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWvD;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpE;AAED,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,UAAU,GACtB,MAAM,CAMR;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,UAAU,GAAG,iBAAiB,CAuC1E;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EACJ,sBAAsB,GACtB,YAAY,GACZ;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,GACtB,MAAM,GACT,OAAO,CAAC,iBAAiB,CAAC,CAmG5B;AAKD,wBAAsB,YAAY,CAChC,WAAW,EAAE,SAAS,EACtB,MAAM,EAAE,eAAe,mBAgBxB;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,iBAAiB,UAQhC"}