@plasmicpkgs/plasmic-rich-components 1.0.97 → 1.0.99

package/dist/field-mappings.d.ts

@@ -1,6 +1,5 @@
-import { TableFieldSchema, TableSchema } from "@plasmicapp/data-sources";
+import { TableSchema, QueryResult } from "@plasmicapp/data-sources";
 import { PropType } from "@plasmicapp/host/registerComponent";
-import { QueryResult } from "./queries";
 import { ContextDependentConfig } from "@plasmicapp/host";
 export interface AutoSettings {
     dataType: "auto";
@@ -67,10 +66,6 @@ interface _BaseColumnConfig {
     expr?: CellFunc<any>;
 }
 export type BaseColumnConfig = _BaseColumnConfig & (AutoSettings | NumberSettings | StringSettings | BooleanSettings | DateTimeSettings | RelativeDateTimeSettings);
-export declare function deriveFieldConfigs<ColumnConfig extends BaseColumnConfig>(specifiedFieldsPartial: Partial<ColumnConfig>[], schema: TableSchema | undefined, makeDefaultConfig: (field: TableFieldSchema | undefined) => ColumnConfig): {
-    mergedFields: ColumnConfig[];
-    minimalFullLengthFields: Partial<ColumnConfig>[];
-};
 export declare function deriveValueType(cconfig: BaseColumnConfig): "text" | "switch" | "digit" | undefined;
 export interface ControlContextData<ColumnConfig extends BaseColumnConfig> {
     data: unknown[];

package/dist/field-react-utils.d.ts

@@ -1,4 +1,4 @@
-import { NormalizedData, QueryResult } from "./queries";
+import { NormalizedData, QueryResult } from "@plasmicapp/data-sources";
 import { BaseColumnConfig } from "./field-mappings";
 import React, { Key } from "react";
 import type { GetRowKey, SorterResult } from "antd/es/table/interface";

package/dist/index.js

@@ -4,6 +4,7 @@ var registerComponent = require('@plasmicapp/host/registerComponent');
 require('@plasmicapp/host/registerGlobalContext');
 require('lodash/get');
 var React = require('react');
+var dataSources = require('@plasmicapp/data-sources');
 var antd = require('antd');
 var tinycolor = require('@ctrl/tinycolor');
 var icons = require('@ant-design/icons');
@@ -151,20 +152,7 @@ function isInteractable(target) {
 function ensureArray(xs) {
     return Array.isArray(xs) ? xs : [xs];
 }
-var tuple = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    return args;
-};
-function mkIdMap(xs) {
-    return new Map(xs.map(function (x) { return tuple(x.id, x); }));
-}
 var mkShortId = function () { return "".concat(Math.random()); };
-function withoutNils(xs) {
-    return xs.filter(function (x) { return x != null; });
-}
 function withoutFalsey(xs) {
     return xs.filter(function (x) { return !!x; });
 }
@@ -194,34 +182,6 @@ var DEFAULT_BOOLEAN_SETTINGS = {
     dataType: "boolean",
     showAs: "checkbox",
 };
-function deriveFieldConfigs(specifiedFieldsPartial, schema, makeDefaultConfig) {
-    var _a;
-    var schemaFields = (_a = schema === null || schema === void 0 ? void 0 : schema.fields) !== null && _a !== void 0 ? _a : [];
-    var fieldById = mkIdMap(schemaFields);
-    var specifiedFieldIds = new Set(withoutNils(specifiedFieldsPartial.map(function (f) { return f.fieldId; })));
-    var keptSpecifiedFields = specifiedFieldsPartial.flatMap(function (f, index) {
-        var fieldId = f.fieldId;
-        if (!fieldId) {
-            return [
-                __assign(__assign(__assign({}, makeDefaultConfig(undefined)), { key: index }), f),
-            ];
-        }
-        var field = fieldById.get(fieldId);
-        // Drop configs with fieldIds no longer in the data.
-        if (!field) {
-            return [];
-        }
-        return [
-            __assign(__assign({}, makeDefaultConfig(field)), f),
-        ];
-    });
-    var newVirtualFields = schemaFields
-        .filter(function (f) { return !specifiedFieldIds.has(f.id); })
-        .map(function (f) { return (__assign({}, makeDefaultConfig(f))); });
-    var mergedFields = __spreadArray(__spreadArray([], keptSpecifiedFields, true), newVirtualFields, true);
-    var minimalFullLengthFields = __spreadArray(__spreadArray([], specifiedFieldsPartial, true), newVirtualFields.map(function (f) { return ({ key: f.key, fieldId: f.fieldId }); }), true);
-    return { mergedFields: mergedFields, minimalFullLengthFields: minimalFullLengthFields };
-}
 function deriveValueType(cconfig) {
     return cconfig.dataType === "auto"
         ? undefined
@@ -617,86 +577,6 @@ function buildFieldsPropType(_a) {
     };
 }
 
-function normalizeData(rawData) {
-    var _a;
-    if (!rawData) {
-        return undefined;
-    }
-    var dataArray = tryGetDataArray(rawData);
-    if (!dataArray) {
-        return undefined;
-    }
-    var schema = (_a = rawData.schema) !== null && _a !== void 0 ? _a : tryGetSchema(dataArray);
-    if (!schema) {
-        return undefined;
-    }
-    return { data: dataArray, schema: schema };
-}
-function tryGetDataArray(rawData) {
-    if (!rawData || typeof rawData !== "object") {
-        return undefined;
-    }
-    if (Array.isArray(rawData)) {
-        if (isArrayOfObjects(rawData)) {
-            return rawData;
-        }
-        else {
-            // TODO: array of primitives? Maybe we can wrap this?
-            return undefined;
-        }
-    }
-    if ("data" in rawData && Array.isArray(rawData.data)) {
-        if (isArrayOfObjects(rawData.data)) {
-            return rawData.data;
-        }
-        else {
-            return undefined;
-        }
-    }
-    if ("isLoading" in rawData || "error" in rawData) {
-        return undefined;
-    }
-    // Maybe a singleton record?
-    return [rawData];
-}
-function isArrayOfObjects(arr) {
-    return arr.every(function (x) { return typeof x === "object" && !Array.isArray(x); });
-}
-function tryGetSchema(data) {
-    var fieldMap = {};
-    data.forEach(function (entry) {
-        if (entry && typeof entry === "object") {
-            Array.from(Object.entries(entry)).forEach(function (_a) {
-                var k = _a[0], v = _a[1];
-                var inferredType = typeof v === "string"
-                    ? "string"
-                    : typeof v === "boolean"
-                        ? "boolean"
-                        : typeof v === "number"
-                            ? "number"
-                            : "unknown";
-                if (fieldMap[k] && fieldMap[k] !== inferredType) {
-                    fieldMap[k] = "unknown";
-                }
-                else {
-                    fieldMap[k] = inferredType;
-                }
-            });
-        }
-    });
-    return {
-        id: "inferred",
-        fields: Object.entries(fieldMap).map(function (_a) {
-            var f = _a[0], t = _a[1];
-            return ({
-                id: f,
-                type: t,
-                readOnly: false,
-            });
-        }),
-    };
-}
-
 function multiRenderValue(record, cconfigs) {
     return cconfigs === null || cconfigs === void 0 ? void 0 : cconfigs.flatMap(function (cc) {
         return cc.isHidden ? [] : [" \u2022 ", React__default.default.createElement(React__default.default.Fragment, null, renderValue(record, cc))];
@@ -928,7 +808,7 @@ function asString(value) {
 function RichDetails(props) {
     var _a;
     var className = props.className, rawData = props.data, size = props.size, bordered = props.bordered, layout = props.layout, _b = props.column, column = _b === void 0 ? 2 : _b;
-    var data = normalizeData(rawData);
+    var data = dataSources.normalizeData(rawData);
     var columnDefinitions = useColumnDefinitions$1(data, props).columnDefinitions;
     if (!data || !((_a = data.data) === null || _a === void 0 ? void 0 : _a[0])) {
         return React__default.default.createElement(antd.Empty, { className: className, image: antd.Empty.PRESENTED_IMAGE_SIMPLE });
@@ -947,7 +827,7 @@ function useColumnDefinitions$1(data, props) {
         if (!data || !schema) {
             return { normalized: [], columnDefinitions: [] };
         }
-        var _a = deriveFieldConfigs(fields !== null && fields !== void 0 ? fields : [], schema, function (field) { return (__assign({ key: mkShortId(), isHidden: false, dataType: "auto" }, (field && {
+        var _a = dataSources.deriveFieldConfigs(fields !== null && fields !== void 0 ? fields : [], schema, function (field) { return (__assign({ key: mkShortId(), isHidden: false, dataType: "auto" }, (field && {
             key: field.id,
             fieldId: field.id,
             title: field.label || field.id,
@@ -1484,7 +1364,7 @@ function RichTable(props) {
     _b = props.pagination, 
     // children,
     pagination = _b === void 0 ? true : _b, defaultSize = props.defaultSize, title = props.title, addHref = props.addHref, _c = props.pageSize, pageSize = _c === void 0 ? 10 : _c, hideSearch = props.hideSearch, _d = props.hideDensity, hideDensity = _d === void 0 ? true : _d, hideColumnPicker = props.hideColumnPicker, hideExports = props.hideExports, _e = props.hideSelectionBar, hideSelectionBar = _e === void 0 ? true : _e, rowKey = props.rowKey, scopeClassName = props.scopeClassName;
-    var data = normalizeData(rawData);
+    var data = dataSources.normalizeData(rawData);
     var _f = useColumnDefinitions(data, props), columnDefinitions = _f.columnDefinitions, normalized = _f.normalized;
     var actionRef = React.useRef();
     var _g = useSortedFilteredData(data, normalized), finalData = _g.finalData, search = _g.search, setSearch = _g.setSearch, setSortState = _g.setSortState;
@@ -1561,7 +1441,7 @@ function useColumnDefinitions(data, props) {
         if (!data || !schema) {
             return { normalized: [], columnDefinitions: [] };
         }
-        var _a = deriveFieldConfigs(fields !== null && fields !== void 0 ? fields : [], schema, function (field) { return (__assign(__assign({}, defaultColumnConfig$1()), (field && {
+        var _a = dataSources.deriveFieldConfigs(fields !== null && fields !== void 0 ? fields : [], schema, function (field) { return (__assign(__assign({}, defaultColumnConfig$1()), (field && {
             key: field.id,
             fieldId: field.id,
             title: field.label || field.id,
@@ -1964,7 +1844,7 @@ function RichList(props) {
             ],
         },
     } : _a, _b = props.type, type = _b === void 0 ? "list" : _b, _c = props.bordered, bordered = _c === void 0 ? true : _c, className = props.className, size = props.size, header = props.header, footer = props.footer, _d = props.rowActions, rowActions = _d === void 0 ? [] : _d; props.title; var _e = props.pageSize, pageSize = _e === void 0 ? 10 : _e, hideSearch = props.hideSearch, rowKey = props.rowKey, pagination = props.pagination, onRowClick = props.onRowClick; __rest(props, ["data", "type", "bordered", "className", "size", "header", "footer", "rowActions", "title", "pageSize", "hideSearch", "rowKey", "pagination", "onRowClick"]);
-    var data = normalizeData(rawData);
+    var data = dataSources.normalizeData(rawData);
     var _f = useRoleDefinitions(data, props), normalized = _f.normalized, roleConfigs = _f.finalRoles;
     React.useRef();
     // Simply ignore the linkTo if it's not a function.
@@ -2097,7 +1977,7 @@ function useRoleDefinitions(data, props) {
             }
         }
         // This is only being computed to get the default role choices.
-        var _e = deriveFieldConfigs(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], tagFieldConfigs("image"), true), tagFieldConfigs("content"), true), tagFieldConfigs("title"), true), tagFieldConfigs("beforeTitle"), true), tagFieldConfigs("afterTitle"), true), tagFieldConfigs("subtitle"), true), schema, function (field) { return (__assign(__assign({}, defaultColumnConfig()), (field && {
+        var _e = dataSources.deriveFieldConfigs(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], tagFieldConfigs("image"), true), tagFieldConfigs("content"), true), tagFieldConfigs("title"), true), tagFieldConfigs("beforeTitle"), true), tagFieldConfigs("afterTitle"), true), tagFieldConfigs("subtitle"), true), schema, function (field) { return (__assign(__assign({}, defaultColumnConfig()), (field && {
             key: field.id,
             fieldId: field.id,
             title: field.label || field.id,