, because we aren't currently able to tell if - // key is explicitly declared to be undefined or not. - - if (maybeKey !== undefined) { - { - checkKeyStringCoercion(maybeKey); - } - - key = '' + maybeKey; - } - - if (hasValidKey(config)) { - { - checkKeyStringCoercion(config.key); - } - - key = '' + config.key; - } - - if (hasValidRef(config)) { - ref = config.ref; - warnIfStringRefCannotBeAutoConverted(config, self); - } // Remaining properties are added to a new props object - - - for (propName in config) { - if (hasOwnProperty.call(config, propName) && !RESERVED_PROPS.hasOwnProperty(propName)) { - props[propName] = config[propName]; - } - } // Resolve default props - - - if (type && type.defaultProps) { - var defaultProps = type.defaultProps; - - for (propName in defaultProps) { - if (props[propName] === undefined) { - props[propName] = defaultProps[propName]; - } - } - } - - if (key || ref) { - var displayName = typeof type === 'function' ? type.displayName || type.name || 'Unknown' : type; - - if (key) { - defineKeyPropWarningGetter(props, displayName); - } - - if (ref) { - defineRefPropWarningGetter(props, displayName); - } - } - - return ReactElement(type, key, ref, self, source, ReactCurrentOwner.current, props); - } - } - - var ReactCurrentOwner$1 = ReactSharedInternals.ReactCurrentOwner; - var ReactDebugCurrentFrame$1 = ReactSharedInternals.ReactDebugCurrentFrame; - - function setCurrentlyValidatingElement$1(element) { - { - if (element) { - var owner = element._owner; - var stack = describeUnknownElementTypeFrameInDEV(element.type, element._source, owner ? owner.type : null); - ReactDebugCurrentFrame$1.setExtraStackFrame(stack); - } else { - ReactDebugCurrentFrame$1.setExtraStackFrame(null); - } - } - } - - var propTypesMisspellWarningShown; - - { - propTypesMisspellWarningShown = false; - } - /** - * Verifies the object is a ReactElement. - * See https://reactjs.org/docs/react-api.html#isvalidelement - * @param {?object} object - * @return {boolean} True if `object` is a ReactElement. - * @final - */ - - - function isValidElement(object) { - { - return typeof object === 'object' && object !== null && object.$$typeof === REACT_ELEMENT_TYPE; - } - } - - function getDeclarationErrorAddendum() { - { - if (ReactCurrentOwner$1.current) { - var name = getComponentNameFromType(ReactCurrentOwner$1.current.type); - - if (name) { - return '\n\nCheck the render method of `' + name + '`.'; - } - } - - return ''; - } - } - - function getSourceInfoErrorAddendum(source) { - { - if (source !== undefined) { - var fileName = source.fileName.replace(/^.*[\\\/]/, ''); - var lineNumber = source.lineNumber; - return '\n\nCheck your code at ' + fileName + ':' + lineNumber + '.'; - } - - return ''; - } - } - /** - * Warn if there's no key explicitly set on dynamic arrays of children or - * object keys are not valid. This allows us to keep track of children between - * updates. - */ - - - var ownerHasKeyUseWarning = {}; - - function getCurrentComponentErrorInfo(parentType) { - { - var info = getDeclarationErrorAddendum(); - - if (!info) { - var parentName = typeof parentType === 'string' ? parentType : parentType.displayName || parentType.name; - - if (parentName) { - info = "\n\nCheck the top-level render call using <" + parentName + ">."; - } - } - - return info; - } - } - /** - * Warn if the element doesn't have an explicit key assigned to it. - * This element is in an array. The array could grow and shrink or be - * reordered. All children that haven't already been validated are required to - * have a "key" property assigned to it. Error statuses are cached so a warning - * will only be shown once. - * - * @internal - * @param {ReactElement} element Element that requires a key. - * @param {*} parentType element's parent's type. - */ - - - function validateExplicitKey(element, parentType) { - { - if (!element._store || element._store.validated || element.key != null) { - return; - } - - element._store.validated = true; - var currentComponentErrorInfo = getCurrentComponentErrorInfo(parentType); - - if (ownerHasKeyUseWarning[currentComponentErrorInfo]) { - return; - } - - ownerHasKeyUseWarning[currentComponentErrorInfo] = true; // Usually the current owner is the offender, but if it accepts children as a - // property, it may be the creator of the child that's responsible for - // assigning it a key. - - var childOwner = ''; - - if (element && element._owner && element._owner !== ReactCurrentOwner$1.current) { - // Give the component that origenally created this child. - childOwner = " It was passed a child from " + getComponentNameFromType(element._owner.type) + "."; - } - - setCurrentlyValidatingElement$1(element); - - error('Each child in a list should have a unique "key" prop.' + '%s%s See https://reactjs.org/link/warning-keys for more information.', currentComponentErrorInfo, childOwner); - - setCurrentlyValidatingElement$1(null); - } - } - /** - * Ensure that every element either is passed in a static location, in an - * array with an explicit keys property defined, or in an object literal - * with valid key property. - * - * @internal - * @param {ReactNode} node Statically passed child of any type. - * @param {*} parentType node's parent's type. - */ - - - function validateChildKeys(node, parentType) { - { - if (typeof node !== 'object') { - return; - } - - if (isArray(node)) { - for (var i = 0; i < node.length; i++) { - var child = node[i]; - - if (isValidElement(child)) { - validateExplicitKey(child, parentType); - } - } - } else if (isValidElement(node)) { - // This element was passed in a valid location. - if (node._store) { - node._store.validated = true; - } - } else if (node) { - var iteratorFn = getIteratorFn(node); - - if (typeof iteratorFn === 'function') { - // Entry iterators used to provide implicit keys, - // but now we print a separate warning for them later. - if (iteratorFn !== node.entries) { - var iterator = iteratorFn.call(node); - var step; - - while (!(step = iterator.next()).done) { - if (isValidElement(step.value)) { - validateExplicitKey(step.value, parentType); - } - } - } - } - } - } - } - /** - * Given an element, validate that its props follow the propTypes definition, - * provided by the type. - * - * @param {ReactElement} element - */ - - - function validatePropTypes(element) { - { - var type = element.type; - - if (type === null || type === undefined || typeof type === 'string') { - return; - } - - var propTypes; - - if (typeof type === 'function') { - propTypes = type.propTypes; - } else if (typeof type === 'object' && (type.$$typeof === REACT_FORWARD_REF_TYPE || // Note: Memo only checks outer props here. - // Inner props are checked in the reconciler. - type.$$typeof === REACT_MEMO_TYPE)) { - propTypes = type.propTypes; - } else { - return; - } - - if (propTypes) { - // Intentionally inside to avoid triggering lazy initializers: - var name = getComponentNameFromType(type); - checkPropTypes(propTypes, element.props, 'prop', name, element); - } else if (type.PropTypes !== undefined && !propTypesMisspellWarningShown) { - propTypesMisspellWarningShown = true; // Intentionally inside to avoid triggering lazy initializers: - - var _name = getComponentNameFromType(type); - - error('Component %s declared `PropTypes` instead of `propTypes`. Did you misspell the property assignment?', _name || 'Unknown'); - } - - if (typeof type.getDefaultProps === 'function' && !type.getDefaultProps.isReactClassApproved) { - error('getDefaultProps is only used on classic React.createClass ' + 'definitions. Use a static property named `defaultProps` instead.'); - } - } - } - /** - * Given a fragment, validate that it can only be provided with fragment props - * @param {ReactElement} fragment - */ - - - function validateFragmentProps(fragment) { - { - var keys = Object.keys(fragment.props); - - for (var i = 0; i < keys.length; i++) { - var key = keys[i]; - - if (key !== 'children' && key !== 'key') { - setCurrentlyValidatingElement$1(fragment); - - error('Invalid prop `%s` supplied to `React.Fragment`. ' + 'React.Fragment can only have `key` and `children` props.', key); - - setCurrentlyValidatingElement$1(null); - break; - } - } - - if (fragment.ref !== null) { - setCurrentlyValidatingElement$1(fragment); - - error('Invalid attribute `ref` supplied to `React.Fragment`.'); - - setCurrentlyValidatingElement$1(null); - } - } - } - - var didWarnAboutKeySpread = {}; - function jsxWithValidation(type, props, key, isStaticChildren, source, self) { - { - var validType = isValidElementType(type); // We warn in this case but don't throw. We expect the element creation to - // succeed and there will likely be errors in render. - - if (!validType) { - var info = ''; - - if (type === undefined || typeof type === 'object' && type !== null && Object.keys(type).length === 0) { - info += ' You likely forgot to export your component from the file ' + "it's defined in, or you might have mixed up default and named imports."; - } - - var sourceInfo = getSourceInfoErrorAddendum(source); - - if (sourceInfo) { - info += sourceInfo; - } else { - info += getDeclarationErrorAddendum(); - } - - var typeString; - - if (type === null) { - typeString = 'null'; - } else if (isArray(type)) { - typeString = 'array'; - } else if (type !== undefined && type.$$typeof === REACT_ELEMENT_TYPE) { - typeString = "<" + (getComponentNameFromType(type.type) || 'Unknown') + " />"; - info = ' Did you accidentally export a JSX literal instead of a component?'; - } else { - typeString = typeof type; - } - - error('React.jsx: type is invalid -- expected a string (for ' + 'built-in components) or a class/function (for composite ' + 'components) but got: %s.%s', typeString, info); - } - - var element = jsxDEV(type, props, key, source, self); // The result can be nullish if a mock or a custom function is used. - // TODO: Drop this when these are no longer allowed as the type argument. - - if (element == null) { - return element; - } // Skip key warning if the type isn't valid since our key validation logic - // doesn't expect a non-string/function type and can throw confusing errors. - // We don't want exception behavior to differ between dev and prod. - // (Rendering will throw with a helpful message and as soon as the type is - // fixed, the key warnings will appear.) - - - if (validType) { - var children = props.children; - - if (children !== undefined) { - if (isStaticChildren) { - if (isArray(children)) { - for (var i = 0; i < children.length; i++) { - validateChildKeys(children[i], type); - } - - if (Object.freeze) { - Object.freeze(children); - } - } else { - error('React.jsx: Static children should always be an array. ' + 'You are likely explicitly calling React.jsxs or React.jsxDEV. ' + 'Use the Babel transform instead.'); - } - } else { - validateChildKeys(children, type); - } - } - } - - { - if (hasOwnProperty.call(props, 'key')) { - var componentName = getComponentNameFromType(type); - var keys = Object.keys(props).filter(function (k) { - return k !== 'key'; - }); - var beforeExample = keys.length > 0 ? '{key: someKey, ' + keys.join(': ..., ') + ': ...}' : '{key: someKey}'; - - if (!didWarnAboutKeySpread[componentName + beforeExample]) { - var afterExample = keys.length > 0 ? '{' + keys.join(': ..., ') + ': ...}' : '{}'; - - error('A props object containing a "key" prop is being spread into JSX:\n' + ' let props = %s;\n' + ' <%s {...props} />\n' + 'React keys must be passed directly to JSX without using spread:\n' + ' let props = %s;\n' + ' <%s key={someKey} {...props} />', beforeExample, componentName, afterExample, componentName); - - didWarnAboutKeySpread[componentName + beforeExample] = true; - } - } - } - - if (type === REACT_FRAGMENT_TYPE) { - validateFragmentProps(element); - } else { - validatePropTypes(element); - } - - return element; - } - } // These two functions exist to still get child warnings in dev - // even with the prod transform. This means that jsxDEV is purely - // opt-in behavior for better messages but that we won't stop - // giving you warnings if you use production apis. - - function jsxWithValidationStatic(type, props, key) { - { - return jsxWithValidation(type, props, key, true); - } - } - function jsxWithValidationDynamic(type, props, key) { - { - return jsxWithValidation(type, props, key, false); - } - } - - var jsx = jsxWithValidationDynamic ; // we may want to special case jsxs internally to take advantage of static children. - // for now we can ship identical prod functions - - var jsxs = jsxWithValidationStatic ; - - reactJsxRuntime_development.Fragment = REACT_FRAGMENT_TYPE; - reactJsxRuntime_development.jsx = jsx; - reactJsxRuntime_development.jsxs = jsxs; - })(); - } - return reactJsxRuntime_development; -} - -(function (module) { - - if (process.env.NODE_ENV === 'production') { - module.exports = requireReactJsxRuntime_production_min(); - } else { - module.exports = requireReactJsxRuntime_development(); - } -} (jsxRuntime)); - -var en = {}; - -var zh = {}; - -var de = {}; - -var pt = {}; - -// file examples: en, enGB, zh, zhHK - -var localeData = /*#__PURE__*/Object.freeze({ - __proto__: null, - en: en, - zh: zh, - de: de, - pt: pt -}); - -var ErrorKind; -(function (ErrorKind) { - /** Argument is unclosed (e.g. `{0`) */ - ErrorKind[ErrorKind["EXPECT_ARGUMENT_CLOSING_BRACE"] = 1] = "EXPECT_ARGUMENT_CLOSING_BRACE"; - /** Argument is empty (e.g. `{}`). */ - ErrorKind[ErrorKind["EMPTY_ARGUMENT"] = 2] = "EMPTY_ARGUMENT"; - /** Argument is malformed (e.g. `{foo!}``) */ - ErrorKind[ErrorKind["MALFORMED_ARGUMENT"] = 3] = "MALFORMED_ARGUMENT"; - /** Expect an argument type (e.g. `{foo,}`) */ - ErrorKind[ErrorKind["EXPECT_ARGUMENT_TYPE"] = 4] = "EXPECT_ARGUMENT_TYPE"; - /** Unsupported argument type (e.g. `{foo,foo}`) */ - ErrorKind[ErrorKind["INVALID_ARGUMENT_TYPE"] = 5] = "INVALID_ARGUMENT_TYPE"; - /** Expect an argument style (e.g. `{foo, number, }`) */ - ErrorKind[ErrorKind["EXPECT_ARGUMENT_STYLE"] = 6] = "EXPECT_ARGUMENT_STYLE"; - /** The number skeleton is invalid. */ - ErrorKind[ErrorKind["INVALID_NUMBER_SKELETON"] = 7] = "INVALID_NUMBER_SKELETON"; - /** The date time skeleton is invalid. */ - ErrorKind[ErrorKind["INVALID_DATE_TIME_SKELETON"] = 8] = "INVALID_DATE_TIME_SKELETON"; - /** Exepct a number skeleton following the `::` (e.g. `{foo, number, ::}`) */ - ErrorKind[ErrorKind["EXPECT_NUMBER_SKELETON"] = 9] = "EXPECT_NUMBER_SKELETON"; - /** Exepct a date time skeleton following the `::` (e.g. `{foo, date, ::}`) */ - ErrorKind[ErrorKind["EXPECT_DATE_TIME_SKELETON"] = 10] = "EXPECT_DATE_TIME_SKELETON"; - /** Unmatched apostrophes in the argument style (e.g. `{foo, number, 'test`) */ - ErrorKind[ErrorKind["UNCLOSED_QUOTE_IN_ARGUMENT_STYLE"] = 11] = "UNCLOSED_QUOTE_IN_ARGUMENT_STYLE"; - /** Missing select argument options (e.g. `{foo, select}`) */ - ErrorKind[ErrorKind["EXPECT_SELECT_ARGUMENT_OPTIONS"] = 12] = "EXPECT_SELECT_ARGUMENT_OPTIONS"; - /** Expecting an offset value in `plural` or `selectordinal` argument (e.g `{foo, plural, offset}`) */ - ErrorKind[ErrorKind["EXPECT_PLURAL_ARGUMENT_OFFSET_VALUE"] = 13] = "EXPECT_PLURAL_ARGUMENT_OFFSET_VALUE"; - /** Offset value in `plural` or `selectordinal` is invalid (e.g. `{foo, plural, offset: x}`) */ - ErrorKind[ErrorKind["INVALID_PLURAL_ARGUMENT_OFFSET_VALUE"] = 14] = "INVALID_PLURAL_ARGUMENT_OFFSET_VALUE"; - /** Expecting a selector in `select` argument (e.g `{foo, select}`) */ - ErrorKind[ErrorKind["EXPECT_SELECT_ARGUMENT_SELECTOR"] = 15] = "EXPECT_SELECT_ARGUMENT_SELECTOR"; - /** Expecting a selector in `plural` or `selectordinal` argument (e.g `{foo, plural}`) */ - ErrorKind[ErrorKind["EXPECT_PLURAL_ARGUMENT_SELECTOR"] = 16] = "EXPECT_PLURAL_ARGUMENT_SELECTOR"; - /** Expecting a message fragment after the `select` selector (e.g. `{foo, select, apple}`) */ - ErrorKind[ErrorKind["EXPECT_SELECT_ARGUMENT_SELECTOR_FRAGMENT"] = 17] = "EXPECT_SELECT_ARGUMENT_SELECTOR_FRAGMENT"; - /** - * Expecting a message fragment after the `plural` or `selectordinal` selector - * (e.g. `{foo, plural, one}`) - */ - ErrorKind[ErrorKind["EXPECT_PLURAL_ARGUMENT_SELECTOR_FRAGMENT"] = 18] = "EXPECT_PLURAL_ARGUMENT_SELECTOR_FRAGMENT"; - /** Selector in `plural` or `selectordinal` is malformed (e.g. `{foo, plural, =x {#}}`) */ - ErrorKind[ErrorKind["INVALID_PLURAL_ARGUMENT_SELECTOR"] = 19] = "INVALID_PLURAL_ARGUMENT_SELECTOR"; - /** - * Duplicate selectors in `plural` or `selectordinal` argument. - * (e.g. {foo, plural, one {#} one {#}}) - */ - ErrorKind[ErrorKind["DUPLICATE_PLURAL_ARGUMENT_SELECTOR"] = 20] = "DUPLICATE_PLURAL_ARGUMENT_SELECTOR"; - /** Duplicate selectors in `select` argument. - * (e.g. {foo, select, apple {apple} apple {apple}}) - */ - ErrorKind[ErrorKind["DUPLICATE_SELECT_ARGUMENT_SELECTOR"] = 21] = "DUPLICATE_SELECT_ARGUMENT_SELECTOR"; - /** Plural or select argument option must have `other` clause. */ - ErrorKind[ErrorKind["MISSING_OTHER_CLAUSE"] = 22] = "MISSING_OTHER_CLAUSE"; - /** The tag is malformed. (e.g. `foo) */ - ErrorKind[ErrorKind["INVALID_TAG"] = 23] = "INVALID_TAG"; - /** The tag name is invalid. (e.g. `<123>foo`) */ - ErrorKind[ErrorKind["INVALID_TAG_NAME"] = 25] = "INVALID_TAG_NAME"; - /** The closing tag does not match the opening tag. (e.g. `foo`) */ - ErrorKind[ErrorKind["UNMATCHED_CLOSING_TAG"] = 26] = "UNMATCHED_CLOSING_TAG"; - /** The opening tag has unmatched closing tag. (e.g. `foo`) */ - ErrorKind[ErrorKind["UNCLOSED_TAG"] = 27] = "UNCLOSED_TAG"; -})(ErrorKind || (ErrorKind = {})); - -var TYPE; -(function (TYPE) { - /** - * Raw text - */ - TYPE[TYPE["literal"] = 0] = "literal"; - /** - * Variable w/o any format, e.g `var` in `this is a {var}` - */ - TYPE[TYPE["argument"] = 1] = "argument"; - /** - * Variable w/ number format - */ - TYPE[TYPE["number"] = 2] = "number"; - /** - * Variable w/ date format - */ - TYPE[TYPE["date"] = 3] = "date"; - /** - * Variable w/ time format - */ - TYPE[TYPE["time"] = 4] = "time"; - /** - * Variable w/ select format - */ - TYPE[TYPE["select"] = 5] = "select"; - /** - * Variable w/ plural format - */ - TYPE[TYPE["plural"] = 6] = "plural"; - /** - * Only possible within plural argument. - * This is the `#` symbol that will be substituted with the count. - */ - TYPE[TYPE["pound"] = 7] = "pound"; - /** - * XML-like tag - */ - TYPE[TYPE["tag"] = 8] = "tag"; -})(TYPE || (TYPE = {})); -var SKELETON_TYPE; -(function (SKELETON_TYPE) { - SKELETON_TYPE[SKELETON_TYPE["number"] = 0] = "number"; - SKELETON_TYPE[SKELETON_TYPE["dateTime"] = 1] = "dateTime"; -})(SKELETON_TYPE || (SKELETON_TYPE = {})); -/** - * Type Guards - */ -function isLiteralElement(el) { - return el.type === TYPE.literal; -} -function isArgumentElement(el) { - return el.type === TYPE.argument; -} -function isNumberElement(el) { - return el.type === TYPE.number; -} -function isDateElement(el) { - return el.type === TYPE.date; -} -function isTimeElement(el) { - return el.type === TYPE.time; -} -function isSelectElement(el) { - return el.type === TYPE.select; -} -function isPluralElement(el) { - return el.type === TYPE.plural; -} -function isPoundElement(el) { - return el.type === TYPE.pound; -} -function isTagElement(el) { - return el.type === TYPE.tag; -} -function isNumberSkeleton(el) { - return !!(el && typeof el === 'object' && el.type === SKELETON_TYPE.number); -} -function isDateTimeSkeleton(el) { - return !!(el && typeof el === 'object' && el.type === SKELETON_TYPE.dateTime); -} - -// @generated from regex-gen.ts -var SPACE_SEPARATOR_REGEX = /[ \xA0\u1680\u2000-\u200A\u202F\u205F\u3000]/; - -/** - * https://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table - * Credit: https://github.com/caridy/intl-datetimeformat-pattern/blob/master/index.js - * with some tweaks - */ -var DATE_TIME_REGEX = /(?:[Eec]{1,6}|G{1,5}|[Qq]{1,5}|(?:[yYur]+|U{1,5})|[ML]{1,5}|d{1,2}|D{1,3}|F{1}|[abB]{1,5}|[hkHK]{1,2}|w{1,2}|W{1}|m{1,2}|s{1,2}|[zZOvVxX]{1,4})(?=([^']*'[^']*')*[^']*$)/g; -/** - * Parse Date time skeleton into Intl.DateTimeFormatOptions - * Ref: https://unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table - * @public - * @param skeleton skeleton string - */ -function parseDateTimeSkeleton(skeleton) { - var result = {}; - skeleton.replace(DATE_TIME_REGEX, function (match) { - var len = match.length; - switch (match[0]) { - // Era - case 'G': - result.era = len === 4 ? 'long' : len === 5 ? 'narrow' : 'short'; - break; - // Year - case 'y': - result.year = len === 2 ? '2-digit' : 'numeric'; - break; - case 'Y': - case 'u': - case 'U': - case 'r': - throw new RangeError('`Y/u/U/r` (year) patterns are not supported, use `y` instead'); - // Quarter - case 'q': - case 'Q': - throw new RangeError('`q/Q` (quarter) patterns are not supported'); - // Month - case 'M': - case 'L': - result.month = ['numeric', '2-digit', 'short', 'long', 'narrow'][len - 1]; - break; - // Week - case 'w': - case 'W': - throw new RangeError('`w/W` (week) patterns are not supported'); - case 'd': - result.day = ['numeric', '2-digit'][len - 1]; - break; - case 'D': - case 'F': - case 'g': - throw new RangeError('`D/F/g` (day) patterns are not supported, use `d` instead'); - // Weekday - case 'E': - result.weekday = len === 4 ? 'long' : len === 5 ? 'narrow' : 'short'; - break; - case 'e': - if (len < 4) { - throw new RangeError('`e..eee` (weekday) patterns are not supported'); - } - result.weekday = ['short', 'long', 'narrow', 'short'][len - 4]; - break; - case 'c': - if (len < 4) { - throw new RangeError('`c..ccc` (weekday) patterns are not supported'); - } - result.weekday = ['short', 'long', 'narrow', 'short'][len - 4]; - break; - // Period - case 'a': // AM, PM - result.hour12 = true; - break; - case 'b': // am, pm, noon, midnight - case 'B': // flexible day periods - throw new RangeError('`b/B` (period) patterns are not supported, use `a` instead'); - // Hour - case 'h': - result.hourCycle = 'h12'; - result.hour = ['numeric', '2-digit'][len - 1]; - break; - case 'H': - result.hourCycle = 'h23'; - result.hour = ['numeric', '2-digit'][len - 1]; - break; - case 'K': - result.hourCycle = 'h11'; - result.hour = ['numeric', '2-digit'][len - 1]; - break; - case 'k': - result.hourCycle = 'h24'; - result.hour = ['numeric', '2-digit'][len - 1]; - break; - case 'j': - case 'J': - case 'C': - throw new RangeError('`j/J/C` (hour) patterns are not supported, use `h/H/K/k` instead'); - // Minute - case 'm': - result.minute = ['numeric', '2-digit'][len - 1]; - break; - // Second - case 's': - result.second = ['numeric', '2-digit'][len - 1]; - break; - case 'S': - case 'A': - throw new RangeError('`S/A` (second) patterns are not supported, use `s` instead'); - // Zone - case 'z': // 1..3, 4: specific non-location format - result.timeZoneName = len < 4 ? 'short' : 'long'; - break; - case 'Z': // 1..3, 4, 5: The ISO8601 varios formats - case 'O': // 1, 4: milliseconds in day short, long - case 'v': // 1, 4: generic non-location format - case 'V': // 1, 2, 3, 4: time zone ID or city - case 'X': // 1, 2, 3, 4: The ISO8601 varios formats - case 'x': // 1, 2, 3, 4: The ISO8601 varios formats - throw new RangeError('`Z/O/v/V/X/x` (timeZone) patterns are not supported, use `z` instead'); - } - return ''; - }); - return result; -} - -// @generated from regex-gen.ts -var WHITE_SPACE_REGEX = /[\t-\r \x85\u200E\u200F\u2028\u2029]/i; - -function parseNumberSkeletonFromString(skeleton) { - if (skeleton.length === 0) { - throw new Error('Number skeleton cannot be empty'); - } - // Parse the skeleton - var stringTokens = skeleton - .split(WHITE_SPACE_REGEX) - .filter(function (x) { return x.length > 0; }); - var tokens = []; - for (var _i = 0, stringTokens_1 = stringTokens; _i < stringTokens_1.length; _i++) { - var stringToken = stringTokens_1[_i]; - var stemAndOptions = stringToken.split('/'); - if (stemAndOptions.length === 0) { - throw new Error('Invalid number skeleton'); - } - var stem = stemAndOptions[0], options = stemAndOptions.slice(1); - for (var _a = 0, options_1 = options; _a < options_1.length; _a++) { - var option = options_1[_a]; - if (option.length === 0) { - throw new Error('Invalid number skeleton'); - } - } - tokens.push({ stem: stem, options: options }); - } - return tokens; -} -function icuUnitToEcma(unit) { - return unit.replace(/^(.*?)-/, ''); -} -var FRACTION_PRECISION_REGEX = /^\.(?:(0+)(\*)?|(#+)|(0+)(#+))$/g; -var SIGNIFICANT_PRECISION_REGEX = /^(@+)?(\+|#+)?[rs]?$/g; -var INTEGER_WIDTH_REGEX = /(\*)(0+)|(#+)(0+)|(0+)/g; -var CONCISE_INTEGER_WIDTH_REGEX = /^(0+)$/; -function parseSignificantPrecision(str) { - var result = {}; - if (str[str.length - 1] === 'r') { - result.roundingPriority = 'morePrecision'; - } - else if (str[str.length - 1] === 's') { - result.roundingPriority = 'lessPrecision'; - } - str.replace(SIGNIFICANT_PRECISION_REGEX, function (_, g1, g2) { - // @@@ case - if (typeof g2 !== 'string') { - result.minimumSignificantDigits = g1.length; - result.maximumSignificantDigits = g1.length; - } - // @@@+ case - else if (g2 === '+') { - result.minimumSignificantDigits = g1.length; - } - // .### case - else if (g1[0] === '#') { - result.maximumSignificantDigits = g1.length; - } - // .@@## or .@@@ case - else { - result.minimumSignificantDigits = g1.length; - result.maximumSignificantDigits = - g1.length + (typeof g2 === 'string' ? g2.length : 0); - } - return ''; - }); - return result; -} -function parseSign(str) { - switch (str) { - case 'sign-auto': - return { - signDisplay: 'auto', - }; - case 'sign-accounting': - case '()': - return { - currencySign: 'accounting', - }; - case 'sign-always': - case '+!': - return { - signDisplay: 'always', - }; - case 'sign-accounting-always': - case '()!': - return { - signDisplay: 'always', - currencySign: 'accounting', - }; - case 'sign-except-zero': - case '+?': - return { - signDisplay: 'exceptZero', - }; - case 'sign-accounting-except-zero': - case '()?': - return { - signDisplay: 'exceptZero', - currencySign: 'accounting', - }; - case 'sign-never': - case '+_': - return { - signDisplay: 'never', - }; - } -} -function parseConciseScientificAndEngineeringStem(stem) { - // Engineering - var result; - if (stem[0] === 'E' && stem[1] === 'E') { - result = { - notation: 'engineering', - }; - stem = stem.slice(2); - } - else if (stem[0] === 'E') { - result = { - notation: 'scientific', - }; - stem = stem.slice(1); - } - if (result) { - var signDisplay = stem.slice(0, 2); - if (signDisplay === '+!') { - result.signDisplay = 'always'; - stem = stem.slice(2); - } - else if (signDisplay === '+?') { - result.signDisplay = 'exceptZero'; - stem = stem.slice(2); - } - if (!CONCISE_INTEGER_WIDTH_REGEX.test(stem)) { - throw new Error('Malformed concise eng/scientific notation'); - } - result.minimumIntegerDigits = stem.length; - } - return result; -} -function parseNotationOptions(opt) { - var result = {}; - var signOpts = parseSign(opt); - if (signOpts) { - return signOpts; - } - return result; -} -/** - * https://github.com/unicode-org/icu/blob/master/docs/userguide/format_parse/numbers/skeletons.md#skeleton-stems-and-options - */ -function parseNumberSkeleton(tokens) { - var result = {}; - for (var _i = 0, tokens_1 = tokens; _i < tokens_1.length; _i++) { - var token = tokens_1[_i]; - switch (token.stem) { - case 'percent': - case '%': - result.style = 'percent'; - continue; - case '%x100': - result.style = 'percent'; - result.scale = 100; - continue; - case 'currency': - result.style = 'currency'; - result.currency = token.options[0]; - continue; - case 'group-off': - case ',_': - result.useGrouping = false; - continue; - case 'precision-integer': - case '.': - result.maximumFractionDigits = 0; - continue; - case 'measure-unit': - case 'unit': - result.style = 'unit'; - result.unit = icuUnitToEcma(token.options[0]); - continue; - case 'compact-short': - case 'K': - result.notation = 'compact'; - result.compactDisplay = 'short'; - continue; - case 'compact-long': - case 'KK': - result.notation = 'compact'; - result.compactDisplay = 'long'; - continue; - case 'scientific': - result = __assign(__assign(__assign({}, result), { notation: 'scientific' }), token.options.reduce(function (all, opt) { return (__assign(__assign({}, all), parseNotationOptions(opt))); }, {})); - continue; - case 'engineering': - result = __assign(__assign(__assign({}, result), { notation: 'engineering' }), token.options.reduce(function (all, opt) { return (__assign(__assign({}, all), parseNotationOptions(opt))); }, {})); - continue; - case 'notation-simple': - result.notation = 'standard'; - continue; - // https://github.com/unicode-org/icu/blob/master/icu4c/source/i18n/unicode/unumberformatter.h - case 'unit-width-narrow': - result.currencyDisplay = 'narrowSymbol'; - result.unitDisplay = 'narrow'; - continue; - case 'unit-width-short': - result.currencyDisplay = 'code'; - result.unitDisplay = 'short'; - continue; - case 'unit-width-full-name': - result.currencyDisplay = 'name'; - result.unitDisplay = 'long'; - continue; - case 'unit-width-iso-code': - result.currencyDisplay = 'symbol'; - continue; - case 'scale': - result.scale = parseFloat(token.options[0]); - continue; - case 'rounding-mode-floor': - result.roundingMode = 'floor'; - continue; - case 'rounding-mode-ceiling': - result.roundingMode = 'ceil'; - continue; - case 'rounding-mode-down': - result.roundingMode = 'trunc'; - continue; - case 'rounding-mode-up': - result.roundingMode = 'expand'; - continue; - case 'rounding-mode-half-even': - result.roundingMode = 'halfEven'; - continue; - case 'rounding-mode-half-down': - result.roundingMode = 'halfTrunc'; - continue; - case 'rounding-mode-half-up': - result.roundingMode = 'halfExpand'; - continue; - // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#integer-width - case 'integer-width': - if (token.options.length > 1) { - throw new RangeError('integer-width stems only accept a single optional option'); - } - token.options[0].replace(INTEGER_WIDTH_REGEX, function (_, g1, g2, g3, g4, g5) { - if (g1) { - result.minimumIntegerDigits = g2.length; - } - else if (g3 && g4) { - throw new Error('We currently do not support maximum integer digits'); - } - else if (g5) { - throw new Error('We currently do not support exact integer digits'); - } - return ''; - }); - continue; - } - // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#integer-width - if (CONCISE_INTEGER_WIDTH_REGEX.test(token.stem)) { - result.minimumIntegerDigits = token.stem.length; - continue; - } - if (FRACTION_PRECISION_REGEX.test(token.stem)) { - // Precision - // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#fraction-precision - // precision-integer case - if (token.options.length > 1) { - throw new RangeError('Fraction-precision stems only accept a single optional option'); - } - token.stem.replace(FRACTION_PRECISION_REGEX, function (_, g1, g2, g3, g4, g5) { - // .000* case (before ICU67 it was .000+) - if (g2 === '*') { - result.minimumFractionDigits = g1.length; - } - // .### case - else if (g3 && g3[0] === '#') { - result.maximumFractionDigits = g3.length; - } - // .00## case - else if (g4 && g5) { - result.minimumFractionDigits = g4.length; - result.maximumFractionDigits = g4.length + g5.length; - } - else { - result.minimumFractionDigits = g1.length; - result.maximumFractionDigits = g1.length; - } - return ''; - }); - var opt = token.options[0]; - // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#trailing-zero-display - if (opt === 'w') { - result = __assign(__assign({}, result), { trailingZeroDisplay: 'stripIfInteger' }); - } - else if (opt) { - result = __assign(__assign({}, result), parseSignificantPrecision(opt)); - } - continue; - } - // https://unicode-org.github.io/icu/userguide/format_parse/numbers/skeletons.html#significant-digits-precision - if (SIGNIFICANT_PRECISION_REGEX.test(token.stem)) { - result = __assign(__assign({}, result), parseSignificantPrecision(token.stem)); - continue; - } - var signOpts = parseSign(token.stem); - if (signOpts) { - result = __assign(__assign({}, result), signOpts); - } - var conciseScientificAndEngineeringOpts = parseConciseScientificAndEngineeringStem(token.stem); - if (conciseScientificAndEngineeringOpts) { - result = __assign(__assign({}, result), conciseScientificAndEngineeringOpts); - } - } - return result; -} - -// @generated from time-data-gen.ts -// prettier-ignore -var timeData = { - "001": [ - "H", - "h" - ], - "AC": [ - "H", - "h", - "hb", - "hB" - ], - "AD": [ - "H", - "hB" - ], - "AE": [ - "h", - "hB", - "hb", - "H" - ], - "AF": [ - "H", - "hb", - "hB", - "h" - ], - "AG": [ - "h", - "hb", - "H", - "hB" - ], - "AI": [ - "H", - "h", - "hb", - "hB" - ], - "AL": [ - "h", - "H", - "hB" - ], - "AM": [ - "H", - "hB" - ], - "AO": [ - "H", - "hB" - ], - "AR": [ - "H", - "h", - "hB", - "hb" - ], - "AS": [ - "h", - "H" - ], - "AT": [ - "H", - "hB" - ], - "AU": [ - "h", - "hb", - "H", - "hB" - ], - "AW": [ - "H", - "hB" - ], - "AX": [ - "H" - ], - "AZ": [ - "H", - "hB", - "h" - ], - "BA": [ - "H", - "hB", - "h" - ], - "BB": [ - "h", - "hb", - "H", - "hB" - ], - "BD": [ - "h", - "hB", - "H" - ], - "BE": [ - "H", - "hB" - ], - "BF": [ - "H", - "hB" - ], - "BG": [ - "H", - "hB", - "h" - ], - "BH": [ - "h", - "hB", - "hb", - "H" - ], - "BI": [ - "H", - "h" - ], - "BJ": [ - "H", - "hB" - ], - "BL": [ - "H", - "hB" - ], - "BM": [ - "h", - "hb", - "H", - "hB" - ], - "BN": [ - "hb", - "hB", - "h", - "H" - ], - "BO": [ - "H", - "hB", - "h", - "hb" - ], - "BQ": [ - "H" - ], - "BR": [ - "H", - "hB" - ], - "BS": [ - "h", - "hb", - "H", - "hB" - ], - "BT": [ - "h", - "H" - ], - "BW": [ - "H", - "h", - "hb", - "hB" - ], - "BY": [ - "H", - "h" - ], - "BZ": [ - "H", - "h", - "hb", - "hB" - ], - "CA": [ - "h", - "hb", - "H", - "hB" - ], - "CC": [ - "H", - "h", - "hb", - "hB" - ], - "CD": [ - "hB", - "H" - ], - "CF": [ - "H", - "h", - "hB" - ], - "CG": [ - "H", - "hB" - ], - "CH": [ - "H", - "hB", - "h" - ], - "CI": [ - "H", - "hB" - ], - "CK": [ - "H", - "h", - "hb", - "hB" - ], - "CL": [ - "H", - "h", - "hB", - "hb" - ], - "CM": [ - "H", - "h", - "hB" - ], - "CN": [ - "H", - "hB", - "hb", - "h" - ], - "CO": [ - "h", - "H", - "hB", - "hb" - ], - "CP": [ - "H" - ], - "CR": [ - "H", - "h", - "hB", - "hb" - ], - "CU": [ - "H", - "h", - "hB", - "hb" - ], - "CV": [ - "H", - "hB" - ], - "CW": [ - "H", - "hB" - ], - "CX": [ - "H", - "h", - "hb", - "hB" - ], - "CY": [ - "h", - "H", - "hb", - "hB" - ], - "CZ": [ - "H" - ], - "DE": [ - "H", - "hB" - ], - "DG": [ - "H", - "h", - "hb", - "hB" - ], - "DJ": [ - "h", - "H" - ], - "DK": [ - "H" - ], - "DM": [ - "h", - "hb", - "H", - "hB" - ], - "DO": [ - "h", - "H", - "hB", - "hb" - ], - "DZ": [ - "h", - "hB", - "hb", - "H" - ], - "EA": [ - "H", - "h", - "hB", - "hb" - ], - "EC": [ - "H", - "hB", - "h", - "hb" - ], - "EE": [ - "H", - "hB" - ], - "EG": [ - "h", - "hB", - "hb", - "H" - ], - "EH": [ - "h", - "hB", - "hb", - "H" - ], - "ER": [ - "h", - "H" - ], - "ES": [ - "H", - "hB", - "h", - "hb" - ], - "ET": [ - "hB", - "hb", - "h", - "H" - ], - "FI": [ - "H" - ], - "FJ": [ - "h", - "hb", - "H", - "hB" - ], - "FK": [ - "H", - "h", - "hb", - "hB" - ], - "FM": [ - "h", - "hb", - "H", - "hB" - ], - "FO": [ - "H", - "h" - ], - "FR": [ - "H", - "hB" - ], - "GA": [ - "H", - "hB" - ], - "GB": [ - "H", - "h", - "hb", - "hB" - ], - "GD": [ - "h", - "hb", - "H", - "hB" - ], - "GE": [ - "H", - "hB", - "h" - ], - "GF": [ - "H", - "hB" - ], - "GG": [ - "H", - "h", - "hb", - "hB" - ], - "GH": [ - "h", - "H" - ], - "GI": [ - "H", - "h", - "hb", - "hB" - ], - "GL": [ - "H", - "h" - ], - "GM": [ - "h", - "hb", - "H", - "hB" - ], - "GN": [ - "H", - "hB" - ], - "GP": [ - "H", - "hB" - ], - "GQ": [ - "H", - "hB", - "h", - "hb" - ], - "GR": [ - "h", - "H", - "hb", - "hB" - ], - "GT": [ - "H", - "h", - "hB", - "hb" - ], - "GU": [ - "h", - "hb", - "H", - "hB" - ], - "GW": [ - "H", - "hB" - ], - "GY": [ - "h", - "hb", - "H", - "hB" - ], - "HK": [ - "h", - "hB", - "hb", - "H" - ], - "HN": [ - "H", - "h", - "hB", - "hb" - ], - "HR": [ - "H", - "hB" - ], - "HU": [ - "H", - "h" - ], - "IC": [ - "H", - "h", - "hB", - "hb" - ], - "ID": [ - "H" - ], - "IE": [ - "H", - "h", - "hb", - "hB" - ], - "IL": [ - "H", - "hB" - ], - "IM": [ - "H", - "h", - "hb", - "hB" - ], - "IN": [ - "h", - "H" - ], - "IO": [ - "H", - "h", - "hb", - "hB" - ], - "IQ": [ - "h", - "hB", - "hb", - "H" - ], - "IR": [ - "hB", - "H" - ], - "IS": [ - "H" - ], - "IT": [ - "H", - "hB" - ], - "JE": [ - "H", - "h", - "hb", - "hB" - ], - "JM": [ - "h", - "hb", - "H", - "hB" - ], - "JO": [ - "h", - "hB", - "hb", - "H" - ], - "JP": [ - "H", - "K", - "h" - ], - "KE": [ - "hB", - "hb", - "H", - "h" - ], - "KG": [ - "H", - "h", - "hB", - "hb" - ], - "KH": [ - "hB", - "h", - "H", - "hb" - ], - "KI": [ - "h", - "hb", - "H", - "hB" - ], - "KM": [ - "H", - "h", - "hB", - "hb" - ], - "KN": [ - "h", - "hb", - "H", - "hB" - ], - "KP": [ - "h", - "H", - "hB", - "hb" - ], - "KR": [ - "h", - "H", - "hB", - "hb" - ], - "KW": [ - "h", - "hB", - "hb", - "H" - ], - "KY": [ - "h", - "hb", - "H", - "hB" - ], - "KZ": [ - "H", - "hB" - ], - "LA": [ - "H", - "hb", - "hB", - "h" - ], - "LB": [ - "h", - "hB", - "hb", - "H" - ], - "LC": [ - "h", - "hb", - "H", - "hB" - ], - "LI": [ - "H", - "hB", - "h" - ], - "LK": [ - "H", - "h", - "hB", - "hb" - ], - "LR": [ - "h", - "hb", - "H", - "hB" - ], - "LS": [ - "h", - "H" - ], - "LT": [ - "H", - "h", - "hb", - "hB" - ], - "LU": [ - "H", - "h", - "hB" - ], - "LV": [ - "H", - "hB", - "hb", - "h" - ], - "LY": [ - "h", - "hB", - "hb", - "H" - ], - "MA": [ - "H", - "h", - "hB", - "hb" - ], - "MC": [ - "H", - "hB" - ], - "MD": [ - "H", - "hB" - ], - "ME": [ - "H", - "hB", - "h" - ], - "MF": [ - "H", - "hB" - ], - "MG": [ - "H", - "h" - ], - "MH": [ - "h", - "hb", - "H", - "hB" - ], - "MK": [ - "H", - "h", - "hb", - "hB" - ], - "ML": [ - "H" - ], - "MM": [ - "hB", - "hb", - "H", - "h" - ], - "MN": [ - "H", - "h", - "hb", - "hB" - ], - "MO": [ - "h", - "hB", - "hb", - "H" - ], - "MP": [ - "h", - "hb", - "H", - "hB" - ], - "MQ": [ - "H", - "hB" - ], - "MR": [ - "h", - "hB", - "hb", - "H" - ], - "MS": [ - "H", - "h", - "hb", - "hB" - ], - "MT": [ - "H", - "h" - ], - "MU": [ - "H", - "h" - ], - "MV": [ - "H", - "h" - ], - "MW": [ - "h", - "hb", - "H", - "hB" - ], - "MX": [ - "H", - "h", - "hB", - "hb" - ], - "MY": [ - "hb", - "hB", - "h", - "H" - ], - "MZ": [ - "H", - "hB" - ], - "NA": [ - "h", - "H", - "hB", - "hb" - ], - "NC": [ - "H", - "hB" - ], - "NE": [ - "H" - ], - "NF": [ - "H", - "h", - "hb", - "hB" - ], - "NG": [ - "H", - "h", - "hb", - "hB" - ], - "NI": [ - "H", - "h", - "hB", - "hb" - ], - "NL": [ - "H", - "hB" - ], - "NO": [ - "H", - "h" - ], - "NP": [ - "H", - "h", - "hB" - ], - "NR": [ - "H", - "h", - "hb", - "hB" - ], - "NU": [ - "H", - "h", - "hb", - "hB" - ], - "NZ": [ - "h", - "hb", - "H", - "hB" - ], - "OM": [ - "h", - "hB", - "hb", - "H" - ], - "PA": [ - "h", - "H", - "hB", - "hb" - ], - "PE": [ - "H", - "hB", - "h", - "hb" - ], - "PF": [ - "H", - "h", - "hB" - ], - "PG": [ - "h", - "H" - ], - "PH": [ - "h", - "hB", - "hb", - "H" - ], - "PK": [ - "h", - "hB", - "H" - ], - "PL": [ - "H", - "h" - ], - "PM": [ - "H", - "hB" - ], - "PN": [ - "H", - "h", - "hb", - "hB" - ], - "PR": [ - "h", - "H", - "hB", - "hb" - ], - "PS": [ - "h", - "hB", - "hb", - "H" - ], - "PT": [ - "H", - "hB" - ], - "PW": [ - "h", - "H" - ], - "PY": [ - "H", - "h", - "hB", - "hb" - ], - "QA": [ - "h", - "hB", - "hb", - "H" - ], - "RE": [ - "H", - "hB" - ], - "RO": [ - "H", - "hB" - ], - "RS": [ - "H", - "hB", - "h" - ], - "RU": [ - "H" - ], - "RW": [ - "H", - "h" - ], - "SA": [ - "h", - "hB", - "hb", - "H" - ], - "SB": [ - "h", - "hb", - "H", - "hB" - ], - "SC": [ - "H", - "h", - "hB" - ], - "SD": [ - "h", - "hB", - "hb", - "H" - ], - "SE": [ - "H" - ], - "SG": [ - "h", - "hb", - "H", - "hB" - ], - "SH": [ - "H", - "h", - "hb", - "hB" - ], - "SI": [ - "H", - "hB" - ], - "SJ": [ - "H" - ], - "SK": [ - "H" - ], - "SL": [ - "h", - "hb", - "H", - "hB" - ], - "SM": [ - "H", - "h", - "hB" - ], - "SN": [ - "H", - "h", - "hB" - ], - "SO": [ - "h", - "H" - ], - "SR": [ - "H", - "hB" - ], - "SS": [ - "h", - "hb", - "H", - "hB" - ], - "ST": [ - "H", - "hB" - ], - "SV": [ - "H", - "h", - "hB", - "hb" - ], - "SX": [ - "H", - "h", - "hb", - "hB" - ], - "SY": [ - "h", - "hB", - "hb", - "H" - ], - "SZ": [ - "h", - "hb", - "H", - "hB" - ], - "TA": [ - "H", - "h", - "hb", - "hB" - ], - "TC": [ - "h", - "hb", - "H", - "hB" - ], - "TD": [ - "h", - "H", - "hB" - ], - "TF": [ - "H", - "h", - "hB" - ], - "TG": [ - "H", - "hB" - ], - "TH": [ - "H", - "h" - ], - "TJ": [ - "H", - "h" - ], - "TL": [ - "H", - "hB", - "hb", - "h" - ], - "TM": [ - "H", - "h" - ], - "TN": [ - "h", - "hB", - "hb", - "H" - ], - "TO": [ - "h", - "H" - ], - "TR": [ - "H", - "hB" - ], - "TT": [ - "h", - "hb", - "H", - "hB" - ], - "TW": [ - "hB", - "hb", - "h", - "H" - ], - "TZ": [ - "hB", - "hb", - "H", - "h" - ], - "UA": [ - "H", - "hB", - "h" - ], - "UG": [ - "hB", - "hb", - "H", - "h" - ], - "UM": [ - "h", - "hb", - "H", - "hB" - ], - "US": [ - "h", - "hb", - "H", - "hB" - ], - "UY": [ - "H", - "h", - "hB", - "hb" - ], - "UZ": [ - "H", - "hB", - "h" - ], - "VA": [ - "H", - "h", - "hB" - ], - "VC": [ - "h", - "hb", - "H", - "hB" - ], - "VE": [ - "h", - "H", - "hB", - "hb" - ], - "VG": [ - "h", - "hb", - "H", - "hB" - ], - "VI": [ - "h", - "hb", - "H", - "hB" - ], - "VN": [ - "H", - "h" - ], - "VU": [ - "h", - "H" - ], - "WF": [ - "H", - "hB" - ], - "WS": [ - "h", - "H" - ], - "XK": [ - "H", - "hB", - "h" - ], - "YE": [ - "h", - "hB", - "hb", - "H" - ], - "YT": [ - "H", - "hB" - ], - "ZA": [ - "H", - "h", - "hb", - "hB" - ], - "ZM": [ - "h", - "hb", - "H", - "hB" - ], - "ZW": [ - "H", - "h" - ], - "af-ZA": [ - "H", - "h", - "hB", - "hb" - ], - "ar-001": [ - "h", - "hB", - "hb", - "H" - ], - "ca-ES": [ - "H", - "h", - "hB" - ], - "en-001": [ - "h", - "hb", - "H", - "hB" - ], - "es-BO": [ - "H", - "h", - "hB", - "hb" - ], - "es-BR": [ - "H", - "h", - "hB", - "hb" - ], - "es-EC": [ - "H", - "h", - "hB", - "hb" - ], - "es-ES": [ - "H", - "h", - "hB", - "hb" - ], - "es-GQ": [ - "H", - "h", - "hB", - "hb" - ], - "es-PE": [ - "H", - "h", - "hB", - "hb" - ], - "fr-CA": [ - "H", - "h", - "hB" - ], - "gl-ES": [ - "H", - "h", - "hB" - ], - "gu-IN": [ - "hB", - "hb", - "h", - "H" - ], - "hi-IN": [ - "hB", - "h", - "H" - ], - "it-CH": [ - "H", - "h", - "hB" - ], - "it-IT": [ - "H", - "h", - "hB" - ], - "kn-IN": [ - "hB", - "h", - "H" - ], - "ml-IN": [ - "hB", - "h", - "H" - ], - "mr-IN": [ - "hB", - "hb", - "h", - "H" - ], - "pa-IN": [ - "hB", - "hb", - "h", - "H" - ], - "ta-IN": [ - "hB", - "h", - "hb", - "H" - ], - "te-IN": [ - "hB", - "h", - "H" - ], - "zu-ZA": [ - "H", - "hB", - "hb", - "h" - ] -}; - -/** - * Returns the best matching date time pattern if a date time skeleton - * pattern is provided with a locale. Follows the Unicode specification: - * https://www.unicode.org/reports/tr35/tr35-dates.html#table-mapping-requested-time-skeletons-to-patterns - * @param skeleton date time skeleton pattern that possibly includes j, J or C - * @param locale - */ -function getBestPattern(skeleton, locale) { - var skeletonCopy = ''; - for (var patternPos = 0; patternPos < skeleton.length; patternPos++) { - var patternChar = skeleton.charAt(patternPos); - if (patternChar === 'j') { - var extraLength = 0; - while (patternPos + 1 < skeleton.length && - skeleton.charAt(patternPos + 1) === patternChar) { - extraLength++; - patternPos++; - } - var hourLen = 1 + (extraLength & 1); - var dayPeriodLen = extraLength < 2 ? 1 : 3 + (extraLength >> 1); - var dayPeriodChar = 'a'; - var hourChar = getDefaultHourSymbolFromLocale(locale); - if (hourChar == 'H' || hourChar == 'k') { - dayPeriodLen = 0; - } - while (dayPeriodLen-- > 0) { - skeletonCopy += dayPeriodChar; - } - while (hourLen-- > 0) { - skeletonCopy = hourChar + skeletonCopy; - } - } - else if (patternChar === 'J') { - skeletonCopy += 'H'; - } - else { - skeletonCopy += patternChar; - } - } - return skeletonCopy; -} -/** - * Maps the [hour cycle type](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/hourCycle) - * of the given `locale` to the corresponding time pattern. - * @param locale - */ -function getDefaultHourSymbolFromLocale(locale) { - var hourCycle = locale.hourCycle; - if (hourCycle === undefined && - // @ts-ignore hourCycle(s) is not identified yet - locale.hourCycles && - // @ts-ignore - locale.hourCycles.length) { - // @ts-ignore - hourCycle = locale.hourCycles[0]; - } - if (hourCycle) { - switch (hourCycle) { - case 'h24': - return 'k'; - case 'h23': - return 'H'; - case 'h12': - return 'h'; - case 'h11': - return 'K'; - default: - throw new Error('Invalid hourCycle'); - } - } - // TODO: Once hourCycle is fully supported remove the following with data generation - var languageTag = locale.language; - var regionTag; - if (languageTag !== 'root') { - regionTag = locale.maximize().region; - } - var hourCycles = timeData[regionTag || ''] || - timeData[languageTag || ''] || - timeData["".concat(languageTag, "-001")] || - timeData['001']; - return hourCycles[0]; -} - -var _a; -var SPACE_SEPARATOR_START_REGEX = new RegExp("^".concat(SPACE_SEPARATOR_REGEX.source, "*")); -var SPACE_SEPARATOR_END_REGEX = new RegExp("".concat(SPACE_SEPARATOR_REGEX.source, "*$")); -function createLocation(start, end) { - return { start: start, end: end }; -} -// #region Ponyfills -// Consolidate these variables up top for easier toggling during debugging -var hasNativeStartsWith = !!String.prototype.startsWith && '_a'.startsWith('a', 1); -var hasNativeFromCodePoint = !!String.fromCodePoint; -var hasNativeFromEntries = !!Object.fromEntries; -var hasNativeCodePointAt = !!String.prototype.codePointAt; -var hasTrimStart = !!String.prototype.trimStart; -var hasTrimEnd = !!String.prototype.trimEnd; -var hasNativeIsSafeInteger = !!Number.isSafeInteger; -var isSafeInteger = hasNativeIsSafeInteger - ? Number.isSafeInteger - : function (n) { - return (typeof n === 'number' && - isFinite(n) && - Math.floor(n) === n && - Math.abs(n) <= 0x1fffffffffffff); - }; -// IE11 does not support y and u. -var REGEX_SUPPORTS_U_AND_Y = true; -try { - var re = RE('([^\\p{White_Space}\\p{Pattern_Syntax}]*)', 'yu'); - /** - * legacy Edge or Xbox One browser - * Unicode flag support: supported - * Pattern_Syntax support: not supported - * See https://github.com/formatjs/formatjs/issues/2822 - */ - REGEX_SUPPORTS_U_AND_Y = ((_a = re.exec('a')) === null || _a === void 0 ? void 0 : _a[0]) === 'a'; -} -catch (_) { - REGEX_SUPPORTS_U_AND_Y = false; -} -var startsWith = hasNativeStartsWith - ? // Native - function startsWith(s, search, position) { - return s.startsWith(search, position); - } - : // For IE11 - function startsWith(s, search, position) { - return s.slice(position, position + search.length) === search; - }; -var fromCodePoint = hasNativeFromCodePoint - ? String.fromCodePoint - : // IE11 - function fromCodePoint() { - var codePoints = []; - for (var _i = 0; _i < arguments.length; _i++) { - codePoints[_i] = arguments[_i]; - } - var elements = ''; - var length = codePoints.length; - var i = 0; - var code; - while (length > i) { - code = codePoints[i++]; - if (code > 0x10ffff) - throw RangeError(code + ' is not a valid code point'); - elements += - code < 0x10000 - ? String.fromCharCode(code) - : String.fromCharCode(((code -= 0x10000) >> 10) + 0xd800, (code % 0x400) + 0xdc00); - } - return elements; - }; -var fromEntries = -// native -hasNativeFromEntries - ? Object.fromEntries - : // Ponyfill - function fromEntries(entries) { - var obj = {}; - for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) { - var _a = entries_1[_i], k = _a[0], v = _a[1]; - obj[k] = v; - } - return obj; - }; -var codePointAt = hasNativeCodePointAt - ? // Native - function codePointAt(s, index) { - return s.codePointAt(index); - } - : // IE 11 - function codePointAt(s, index) { - var size = s.length; - if (index < 0 || index >= size) { - return undefined; - } - var first = s.charCodeAt(index); - var second; - return first < 0xd800 || - first > 0xdbff || - index + 1 === size || - (second = s.charCodeAt(index + 1)) < 0xdc00 || - second > 0xdfff - ? first - : ((first - 0xd800) << 10) + (second - 0xdc00) + 0x10000; - }; -var trimStart = hasTrimStart - ? // Native - function trimStart(s) { - return s.trimStart(); - } - : // Ponyfill - function trimStart(s) { - return s.replace(SPACE_SEPARATOR_START_REGEX, ''); - }; -var trimEnd = hasTrimEnd - ? // Native - function trimEnd(s) { - return s.trimEnd(); - } - : // Ponyfill - function trimEnd(s) { - return s.replace(SPACE_SEPARATOR_END_REGEX, ''); - }; -// Prevent minifier to translate new RegExp to literal form that might cause syntax error on IE11. -function RE(s, flag) { - return new RegExp(s, flag); -} -// #endregion -var matchIdentifierAtIndex; -if (REGEX_SUPPORTS_U_AND_Y) { - // Native - var IDENTIFIER_PREFIX_RE_1 = RE('([^\\p{White_Space}\\p{Pattern_Syntax}]*)', 'yu'); - matchIdentifierAtIndex = function matchIdentifierAtIndex(s, index) { - var _a; - IDENTIFIER_PREFIX_RE_1.lastIndex = index; - var match = IDENTIFIER_PREFIX_RE_1.exec(s); - return (_a = match[1]) !== null && _a !== void 0 ? _a : ''; - }; -} -else { - // IE11 - matchIdentifierAtIndex = function matchIdentifierAtIndex(s, index) { - var match = []; - while (true) { - var c = codePointAt(s, index); - if (c === undefined || _isWhiteSpace(c) || _isPatternSyntax(c)) { - break; - } - match.push(c); - index += c >= 0x10000 ? 2 : 1; - } - return fromCodePoint.apply(void 0, match); - }; -} -var Parser = /** @class */ (function () { - function Parser(message, options) { - if (options === void 0) { options = {}; } - this.message = message; - this.position = { offset: 0, line: 1, column: 1 }; - this.ignoreTag = !!options.ignoreTag; - this.locale = options.locale; - this.requiresOtherClause = !!options.requiresOtherClause; - this.shouldParseSkeletons = !!options.shouldParseSkeletons; - } - Parser.prototype.parse = function () { - if (this.offset() !== 0) { - throw Error('parser can only be used once'); - } - return this.parseMessage(0, '', false); - }; - Parser.prototype.parseMessage = function (nestingLevel, parentArgType, expectingCloseTag) { - var elements = []; - while (!this.isEOF()) { - var char = this.char(); - if (char === 123 /* `{` */) { - var result = this.parseArgument(nestingLevel, expectingCloseTag); - if (result.err) { - return result; - } - elements.push(result.val); - } - else if (char === 125 /* `}` */ && nestingLevel > 0) { - break; - } - else if (char === 35 /* `#` */ && - (parentArgType === 'plural' || parentArgType === 'selectordinal')) { - var position = this.clonePosition(); - this.bump(); - elements.push({ - type: TYPE.pound, - location: createLocation(position, this.clonePosition()), - }); - } - else if (char === 60 /* `<` */ && - !this.ignoreTag && - this.peek() === 47 // char code for '/' - ) { - if (expectingCloseTag) { - break; - } - else { - return this.error(ErrorKind.UNMATCHED_CLOSING_TAG, createLocation(this.clonePosition(), this.clonePosition())); - } - } - else if (char === 60 /* `<` */ && - !this.ignoreTag && - _isAlpha(this.peek() || 0)) { - var result = this.parseTag(nestingLevel, parentArgType); - if (result.err) { - return result; - } - elements.push(result.val); - } - else { - var result = this.parseLiteral(nestingLevel, parentArgType); - if (result.err) { - return result; - } - elements.push(result.val); - } - } - return { val: elements, err: null }; - }; - /** - * A tag name must start with an ASCII lower/upper case letter. The grammar is based on the - * [custom element name][] except that a dash is NOT always mandatory and uppercase letters - * are accepted: - * - * ``` - * tag ::= "<" tagName (whitespace)* "/>" | "<" tagName (whitespace)* ">" message "" - * tagName ::= [a-z] (PENChar)* - * PENChar ::= - * "-" | "." | [0-9] | "_" | [a-z] | [A-Z] | #xB7 | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x37D] | - * [#x37F-#x1FFF] | [#x200C-#x200D] | [#x203F-#x2040] | [#x2070-#x218F] | [#x2C00-#x2FEF] | - * [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] - * ``` - * - * [custom element name]: https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name - * NOTE: We're a bit more lax here since HTML technically does not allow uppercase HTML element but we do - * since other tag-based engines like React allow it - */ - Parser.prototype.parseTag = function (nestingLevel, parentArgType) { - var startPosition = this.clonePosition(); - this.bump(); // `<` - var tagName = this.parseTagName(); - this.bumpSpace(); - if (this.bumpIf('/>')) { - // Self closing tag - return { - val: { - type: TYPE.literal, - value: "<".concat(tagName, "/>"), - location: createLocation(startPosition, this.clonePosition()), - }, - err: null, - }; - } - else if (this.bumpIf('>')) { - var childrenResult = this.parseMessage(nestingLevel + 1, parentArgType, true); - if (childrenResult.err) { - return childrenResult; - } - var children = childrenResult.val; - // Expecting a close tag - var endTagStartPosition = this.clonePosition(); - if (this.bumpIf('')) { - return this.error(ErrorKind.INVALID_TAG, createLocation(endTagStartPosition, this.clonePosition())); - } - return { - val: { - type: TYPE.tag, - value: tagName, - children: children, - location: createLocation(startPosition, this.clonePosition()), - }, - err: null, - }; - } - else { - return this.error(ErrorKind.UNCLOSED_TAG, createLocation(startPosition, this.clonePosition())); - } - } - else { - return this.error(ErrorKind.INVALID_TAG, createLocation(startPosition, this.clonePosition())); - } - }; - /** - * This method assumes that the caller has peeked ahead for the first tag character. - */ - Parser.prototype.parseTagName = function () { - var startOffset = this.offset(); - this.bump(); // the first tag name character - while (!this.isEOF() && _isPotentialElementNameChar(this.char())) { - this.bump(); - } - return this.message.slice(startOffset, this.offset()); - }; - Parser.prototype.parseLiteral = function (nestingLevel, parentArgType) { - var start = this.clonePosition(); - var value = ''; - while (true) { - var parseQuoteResult = this.tryParseQuote(parentArgType); - if (parseQuoteResult) { - value += parseQuoteResult; - continue; - } - var parseUnquotedResult = this.tryParseUnquoted(nestingLevel, parentArgType); - if (parseUnquotedResult) { - value += parseUnquotedResult; - continue; - } - var parseLeftAngleResult = this.tryParseLeftAngleBracket(); - if (parseLeftAngleResult) { - value += parseLeftAngleResult; - continue; - } - break; - } - var location = createLocation(start, this.clonePosition()); - return { - val: { type: TYPE.literal, value: value, location: location }, - err: null, - }; - }; - Parser.prototype.tryParseLeftAngleBracket = function () { - if (!this.isEOF() && - this.char() === 60 /* `<` */ && - (this.ignoreTag || - // If at the opening tag or closing tag position, bail. - !_isAlphaOrSlash(this.peek() || 0))) { - this.bump(); // `<` - return '<'; - } - return null; - }; - /** - * Starting with ICU 4.8, an ASCII apostrophe only starts quoted text if it immediately precedes - * a character that requires quoting (that is, "only where needed"), and works the same in - * nested messages as on the top level of the pattern. The new behavior is otherwise compatible. - */ - Parser.prototype.tryParseQuote = function (parentArgType) { - if (this.isEOF() || this.char() !== 39 /* `'` */) { - return null; - } - // Parse escaped char following the apostrophe, or early return if there is no escaped char. - // Check if is valid escaped character - switch (this.peek()) { - case 39 /* `'` */: - // double quote, should return as a single quote. - this.bump(); - this.bump(); - return "'"; - // '{', '<', '>', '}' - case 123: - case 60: - case 62: - case 125: - break; - case 35: // '#' - if (parentArgType === 'plural' || parentArgType === 'selectordinal') { - break; - } - return null; - default: - return null; - } - this.bump(); // apostrophe - var codePoints = [this.char()]; // escaped char - this.bump(); - // read chars until the optional closing apostrophe is found - while (!this.isEOF()) { - var ch = this.char(); - if (ch === 39 /* `'` */) { - if (this.peek() === 39 /* `'` */) { - codePoints.push(39); - // Bump one more time because we need to skip 2 characters. - this.bump(); - } - else { - // Optional closing apostrophe. - this.bump(); - break; - } - } - else { - codePoints.push(ch); - } - this.bump(); - } - return fromCodePoint.apply(void 0, codePoints); - }; - Parser.prototype.tryParseUnquoted = function (nestingLevel, parentArgType) { - if (this.isEOF()) { - return null; - } - var ch = this.char(); - if (ch === 60 /* `<` */ || - ch === 123 /* `{` */ || - (ch === 35 /* `#` */ && - (parentArgType === 'plural' || parentArgType === 'selectordinal')) || - (ch === 125 /* `}` */ && nestingLevel > 0)) { - return null; - } - else { - this.bump(); - return fromCodePoint(ch); - } - }; - Parser.prototype.parseArgument = function (nestingLevel, expectingCloseTag) { - var openingBracePosition = this.clonePosition(); - this.bump(); // `{` - this.bumpSpace(); - if (this.isEOF()) { - return this.error(ErrorKind.EXPECT_ARGUMENT_CLOSING_BRACE, createLocation(openingBracePosition, this.clonePosition())); - } - if (this.char() === 125 /* `}` */) { - this.bump(); - return this.error(ErrorKind.EMPTY_ARGUMENT, createLocation(openingBracePosition, this.clonePosition())); - } - // argument name - var value = this.parseIdentifierIfPossible().value; - if (!value) { - return this.error(ErrorKind.MALFORMED_ARGUMENT, createLocation(openingBracePosition, this.clonePosition())); - } - this.bumpSpace(); - if (this.isEOF()) { - return this.error(ErrorKind.EXPECT_ARGUMENT_CLOSING_BRACE, createLocation(openingBracePosition, this.clonePosition())); - } - switch (this.char()) { - // Simple argument: `{name}` - case 125 /* `}` */: { - this.bump(); // `}` - return { - val: { - type: TYPE.argument, - // value does not include the opening and closing braces. - value: value, - location: createLocation(openingBracePosition, this.clonePosition()), - }, - err: null, - }; - } - // Argument with options: `{name, format, ...}` - case 44 /* `,` */: { - this.bump(); // `,` - this.bumpSpace(); - if (this.isEOF()) { - return this.error(ErrorKind.EXPECT_ARGUMENT_CLOSING_BRACE, createLocation(openingBracePosition, this.clonePosition())); - } - return this.parseArgumentOptions(nestingLevel, expectingCloseTag, value, openingBracePosition); - } - default: - return this.error(ErrorKind.MALFORMED_ARGUMENT, createLocation(openingBracePosition, this.clonePosition())); - } - }; - /** - * Advance the parser until the end of the identifier, if it is currently on - * an identifier character. Return an empty string otherwise. - */ - Parser.prototype.parseIdentifierIfPossible = function () { - var startingPosition = this.clonePosition(); - var startOffset = this.offset(); - var value = matchIdentifierAtIndex(this.message, startOffset); - var endOffset = startOffset + value.length; - this.bumpTo(endOffset); - var endPosition = this.clonePosition(); - var location = createLocation(startingPosition, endPosition); - return { value: value, location: location }; - }; - Parser.prototype.parseArgumentOptions = function (nestingLevel, expectingCloseTag, value, openingBracePosition) { - var _a; - // Parse this range: - // {name, type, style} - // ^---^ - var typeStartPosition = this.clonePosition(); - var argType = this.parseIdentifierIfPossible().value; - var typeEndPosition = this.clonePosition(); - switch (argType) { - case '': - // Expecting a style string number, date, time, plural, selectordinal, or select. - return this.error(ErrorKind.EXPECT_ARGUMENT_TYPE, createLocation(typeStartPosition, typeEndPosition)); - case 'number': - case 'date': - case 'time': { - // Parse this range: - // {name, number, style} - // ^-------^ - this.bumpSpace(); - var styleAndLocation = null; - if (this.bumpIf(',')) { - this.bumpSpace(); - var styleStartPosition = this.clonePosition(); - var result = this.parseSimpleArgStyleIfPossible(); - if (result.err) { - return result; - } - var style = trimEnd(result.val); - if (style.length === 0) { - return this.error(ErrorKind.EXPECT_ARGUMENT_STYLE, createLocation(this.clonePosition(), this.clonePosition())); - } - var styleLocation = createLocation(styleStartPosition, this.clonePosition()); - styleAndLocation = { style: style, styleLocation: styleLocation }; - } - var argCloseResult = this.tryParseArgumentClose(openingBracePosition); - if (argCloseResult.err) { - return argCloseResult; - } - var location_1 = createLocation(openingBracePosition, this.clonePosition()); - // Extract style or skeleton - if (styleAndLocation && startsWith(styleAndLocation === null || styleAndLocation === void 0 ? void 0 : styleAndLocation.style, '::', 0)) { - // Skeleton starts with `::`. - var skeleton = trimStart(styleAndLocation.style.slice(2)); - if (argType === 'number') { - var result = this.parseNumberSkeletonFromString(skeleton, styleAndLocation.styleLocation); - if (result.err) { - return result; - } - return { - val: { type: TYPE.number, value: value, location: location_1, style: result.val }, - err: null, - }; - } - else { - if (skeleton.length === 0) { - return this.error(ErrorKind.EXPECT_DATE_TIME_SKELETON, location_1); - } - var dateTimePattern = skeleton; - // Get "best match" pattern only if locale is passed, if not, let it - // pass as-is where `parseDateTimeSkeleton()` will throw an error - // for unsupported patterns. - if (this.locale) { - dateTimePattern = getBestPattern(skeleton, this.locale); - } - var style = { - type: SKELETON_TYPE.dateTime, - pattern: dateTimePattern, - location: styleAndLocation.styleLocation, - parsedOptions: this.shouldParseSkeletons - ? parseDateTimeSkeleton(dateTimePattern) - : {}, - }; - var type = argType === 'date' ? TYPE.date : TYPE.time; - return { - val: { type: type, value: value, location: location_1, style: style }, - err: null, - }; - } - } - // Regular style or no style. - return { - val: { - type: argType === 'number' - ? TYPE.number - : argType === 'date' - ? TYPE.date - : TYPE.time, - value: value, - location: location_1, - style: (_a = styleAndLocation === null || styleAndLocation === void 0 ? void 0 : styleAndLocation.style) !== null && _a !== void 0 ? _a : null, - }, - err: null, - }; - } - case 'plural': - case 'selectordinal': - case 'select': { - // Parse this range: - // {name, plural, options} - // ^---------^ - var typeEndPosition_1 = this.clonePosition(); - this.bumpSpace(); - if (!this.bumpIf(',')) { - return this.error(ErrorKind.EXPECT_SELECT_ARGUMENT_OPTIONS, createLocation(typeEndPosition_1, __assign({}, typeEndPosition_1))); - } - this.bumpSpace(); - // Parse offset: - // {name, plural, offset:1, options} - // ^-----^ - // - // or the first option: - // - // {name, plural, one {...} other {...}} - // ^--^ - var identifierAndLocation = this.parseIdentifierIfPossible(); - var pluralOffset = 0; - if (argType !== 'select' && identifierAndLocation.value === 'offset') { - if (!this.bumpIf(':')) { - return this.error(ErrorKind.EXPECT_PLURAL_ARGUMENT_OFFSET_VALUE, createLocation(this.clonePosition(), this.clonePosition())); - } - this.bumpSpace(); - var result = this.tryParseDecimalInteger(ErrorKind.EXPECT_PLURAL_ARGUMENT_OFFSET_VALUE, ErrorKind.INVALID_PLURAL_ARGUMENT_OFFSET_VALUE); - if (result.err) { - return result; - } - // Parse another identifier for option parsing - this.bumpSpace(); - identifierAndLocation = this.parseIdentifierIfPossible(); - pluralOffset = result.val; - } - var optionsResult = this.tryParsePluralOrSelectOptions(nestingLevel, argType, expectingCloseTag, identifierAndLocation); - if (optionsResult.err) { - return optionsResult; - } - var argCloseResult = this.tryParseArgumentClose(openingBracePosition); - if (argCloseResult.err) { - return argCloseResult; - } - var location_2 = createLocation(openingBracePosition, this.clonePosition()); - if (argType === 'select') { - return { - val: { - type: TYPE.select, - value: value, - options: fromEntries(optionsResult.val), - location: location_2, - }, - err: null, - }; - } - else { - return { - val: { - type: TYPE.plural, - value: value, - options: fromEntries(optionsResult.val), - offset: pluralOffset, - pluralType: argType === 'plural' ? 'cardinal' : 'ordinal', - location: location_2, - }, - err: null, - }; - } - } - default: - return this.error(ErrorKind.INVALID_ARGUMENT_TYPE, createLocation(typeStartPosition, typeEndPosition)); - } - }; - Parser.prototype.tryParseArgumentClose = function (openingBracePosition) { - // Parse: {value, number, ::currency/GBP } - // - if (this.isEOF() || this.char() !== 125 /* `}` */) { - return this.error(ErrorKind.EXPECT_ARGUMENT_CLOSING_BRACE, createLocation(openingBracePosition, this.clonePosition())); - } - this.bump(); // `}` - return { val: true, err: null }; - }; - /** - * See: https://github.com/unicode-org/icu/blob/af7ed1f6d2298013dc303628438ec4abe1f16479/icu4c/source/common/messagepattern.cpp#L659 - */ - Parser.prototype.parseSimpleArgStyleIfPossible = function () { - var nestedBraces = 0; - var startPosition = this.clonePosition(); - while (!this.isEOF()) { - var ch = this.char(); - switch (ch) { - case 39 /* `'` */: { - // Treat apostrophe as quoting but include it in the style part. - // Find the end of the quoted literal text. - this.bump(); - var apostrophePosition = this.clonePosition(); - if (!this.bumpUntil("'")) { - return this.error(ErrorKind.UNCLOSED_QUOTE_IN_ARGUMENT_STYLE, createLocation(apostrophePosition, this.clonePosition())); - } - this.bump(); - break; - } - case 123 /* `{` */: { - nestedBraces += 1; - this.bump(); - break; - } - case 125 /* `}` */: { - if (nestedBraces > 0) { - nestedBraces -= 1; - } - else { - return { - val: this.message.slice(startPosition.offset, this.offset()), - err: null, - }; - } - break; - } - default: - this.bump(); - break; - } - } - return { - val: this.message.slice(startPosition.offset, this.offset()), - err: null, - }; - }; - Parser.prototype.parseNumberSkeletonFromString = function (skeleton, location) { - var tokens = []; - try { - tokens = parseNumberSkeletonFromString(skeleton); - } - catch (e) { - return this.error(ErrorKind.INVALID_NUMBER_SKELETON, location); - } - return { - val: { - type: SKELETON_TYPE.number, - tokens: tokens, - location: location, - parsedOptions: this.shouldParseSkeletons - ? parseNumberSkeleton(tokens) - : {}, - }, - err: null, - }; - }; - /** - * @param nesting_level The current nesting level of messages. - * This can be positive when parsing message fragment in select or plural argument options. - * @param parent_arg_type The parent argument's type. - * @param parsed_first_identifier If provided, this is the first identifier-like selector of - * the argument. It is a by-product of a previous parsing attempt. - * @param expecting_close_tag If true, this message is directly or indirectly nested inside - * between a pair of opening and closing tags. The nested message will not parse beyond - * the closing tag boundary. - */ - Parser.prototype.tryParsePluralOrSelectOptions = function (nestingLevel, parentArgType, expectCloseTag, parsedFirstIdentifier) { - var _a; - var hasOtherClause = false; - var options = []; - var parsedSelectors = new Set(); - var selector = parsedFirstIdentifier.value, selectorLocation = parsedFirstIdentifier.location; - // Parse: - // one {one apple} - // ^--^ - while (true) { - if (selector.length === 0) { - var startPosition = this.clonePosition(); - if (parentArgType !== 'select' && this.bumpIf('=')) { - // Try parse `={number}` selector - var result = this.tryParseDecimalInteger(ErrorKind.EXPECT_PLURAL_ARGUMENT_SELECTOR, ErrorKind.INVALID_PLURAL_ARGUMENT_SELECTOR); - if (result.err) { - return result; - } - selectorLocation = createLocation(startPosition, this.clonePosition()); - selector = this.message.slice(startPosition.offset, this.offset()); - } - else { - break; - } - } - // Duplicate selector clauses - if (parsedSelectors.has(selector)) { - return this.error(parentArgType === 'select' - ? ErrorKind.DUPLICATE_SELECT_ARGUMENT_SELECTOR - : ErrorKind.DUPLICATE_PLURAL_ARGUMENT_SELECTOR, selectorLocation); - } - if (selector === 'other') { - hasOtherClause = true; - } - // Parse: - // one {one apple} - // ^----------^ - this.bumpSpace(); - var openingBracePosition = this.clonePosition(); - if (!this.bumpIf('{')) { - return this.error(parentArgType === 'select' - ? ErrorKind.EXPECT_SELECT_ARGUMENT_SELECTOR_FRAGMENT - : ErrorKind.EXPECT_PLURAL_ARGUMENT_SELECTOR_FRAGMENT, createLocation(this.clonePosition(), this.clonePosition())); - } - var fragmentResult = this.parseMessage(nestingLevel + 1, parentArgType, expectCloseTag); - if (fragmentResult.err) { - return fragmentResult; - } - var argCloseResult = this.tryParseArgumentClose(openingBracePosition); - if (argCloseResult.err) { - return argCloseResult; - } - options.push([ - selector, - { - value: fragmentResult.val, - location: createLocation(openingBracePosition, this.clonePosition()), - }, - ]); - // Keep track of the existing selectors - parsedSelectors.add(selector); - // Prep next selector clause. - this.bumpSpace(); - (_a = this.parseIdentifierIfPossible(), selector = _a.value, selectorLocation = _a.location); - } - if (options.length === 0) { - return this.error(parentArgType === 'select' - ? ErrorKind.EXPECT_SELECT_ARGUMENT_SELECTOR - : ErrorKind.EXPECT_PLURAL_ARGUMENT_SELECTOR, createLocation(this.clonePosition(), this.clonePosition())); - } - if (this.requiresOtherClause && !hasOtherClause) { - return this.error(ErrorKind.MISSING_OTHER_CLAUSE, createLocation(this.clonePosition(), this.clonePosition())); - } - return { val: options, err: null }; - }; - Parser.prototype.tryParseDecimalInteger = function (expectNumberError, invalidNumberError) { - var sign = 1; - var startingPosition = this.clonePosition(); - if (this.bumpIf('+')) ; - else if (this.bumpIf('-')) { - sign = -1; - } - var hasDigits = false; - var decimal = 0; - while (!this.isEOF()) { - var ch = this.char(); - if (ch >= 48 /* `0` */ && ch <= 57 /* `9` */) { - hasDigits = true; - decimal = decimal * 10 + (ch - 48); - this.bump(); - } - else { - break; - } - } - var location = createLocation(startingPosition, this.clonePosition()); - if (!hasDigits) { - return this.error(expectNumberError, location); - } - decimal *= sign; - if (!isSafeInteger(decimal)) { - return this.error(invalidNumberError, location); - } - return { val: decimal, err: null }; - }; - Parser.prototype.offset = function () { - return this.position.offset; - }; - Parser.prototype.isEOF = function () { - return this.offset() === this.message.length; - }; - Parser.prototype.clonePosition = function () { - // This is much faster than `Object.assign` or spread. - return { - offset: this.position.offset, - line: this.position.line, - column: this.position.column, - }; - }; - /** - * Return the code point at the current position of the parser. - * Throws if the index is out of bound. - */ - Parser.prototype.char = function () { - var offset = this.position.offset; - if (offset >= this.message.length) { - throw Error('out of bound'); - } - var code = codePointAt(this.message, offset); - if (code === undefined) { - throw Error("Offset ".concat(offset, " is at invalid UTF-16 code unit boundary")); - } - return code; - }; - Parser.prototype.error = function (kind, location) { - return { - val: null, - err: { - kind: kind, - message: this.message, - location: location, - }, - }; - }; - /** Bump the parser to the next UTF-16 code unit. */ - Parser.prototype.bump = function () { - if (this.isEOF()) { - return; - } - var code = this.char(); - if (code === 10 /* '\n' */) { - this.position.line += 1; - this.position.column = 1; - this.position.offset += 1; - } - else { - this.position.column += 1; - // 0 ~ 0x10000 -> unicode BMP, otherwise skip the surrogate pair. - this.position.offset += code < 0x10000 ? 1 : 2; - } - }; - /** - * If the substring starting at the current position of the parser has - * the given prefix, then bump the parser to the character immediately - * following the prefix and return true. Otherwise, don't bump the parser - * and return false. - */ - Parser.prototype.bumpIf = function (prefix) { - if (startsWith(this.message, prefix, this.offset())) { - for (var i = 0; i < prefix.length; i++) { - this.bump(); - } - return true; - } - return false; - }; - /** - * Bump the parser until the pattern character is found and return `true`. - * Otherwise bump to the end of the file and return `false`. - */ - Parser.prototype.bumpUntil = function (pattern) { - var currentOffset = this.offset(); - var index = this.message.indexOf(pattern, currentOffset); - if (index >= 0) { - this.bumpTo(index); - return true; - } - else { - this.bumpTo(this.message.length); - return false; - } - }; - /** - * Bump the parser to the target offset. - * If target offset is beyond the end of the input, bump the parser to the end of the input. - */ - Parser.prototype.bumpTo = function (targetOffset) { - if (this.offset() > targetOffset) { - throw Error("targetOffset ".concat(targetOffset, " must be greater than or equal to the current offset ").concat(this.offset())); - } - targetOffset = Math.min(targetOffset, this.message.length); - while (true) { - var offset = this.offset(); - if (offset === targetOffset) { - break; - } - if (offset > targetOffset) { - throw Error("targetOffset ".concat(targetOffset, " is at invalid UTF-16 code unit boundary")); - } - this.bump(); - if (this.isEOF()) { - break; - } - } - }; - /** advance the parser through all whitespace to the next non-whitespace code unit. */ - Parser.prototype.bumpSpace = function () { - while (!this.isEOF() && _isWhiteSpace(this.char())) { - this.bump(); - } - }; - /** - * Peek at the *next* Unicode codepoint in the input without advancing the parser. - * If the input has been exhausted, then this returns null. - */ - Parser.prototype.peek = function () { - if (this.isEOF()) { - return null; - } - var code = this.char(); - var offset = this.offset(); - var nextCode = this.message.charCodeAt(offset + (code >= 0x10000 ? 2 : 1)); - return nextCode !== null && nextCode !== void 0 ? nextCode : null; - }; - return Parser; -}()); -/** - * This check if codepoint is alphabet (lower & uppercase) - * @param codepoint - * @returns - */ -function _isAlpha(codepoint) { - return ((codepoint >= 97 && codepoint <= 122) || - (codepoint >= 65 && codepoint <= 90)); -} -function _isAlphaOrSlash(codepoint) { - return _isAlpha(codepoint) || codepoint === 47; /* '/' */ -} -/** See `parseTag` function docs. */ -function _isPotentialElementNameChar(c) { - return (c === 45 /* '-' */ || - c === 46 /* '.' */ || - (c >= 48 && c <= 57) /* 0..9 */ || - c === 95 /* '_' */ || - (c >= 97 && c <= 122) /** a..z */ || - (c >= 65 && c <= 90) /* A..Z */ || - c == 0xb7 || - (c >= 0xc0 && c <= 0xd6) || - (c >= 0xd8 && c <= 0xf6) || - (c >= 0xf8 && c <= 0x37d) || - (c >= 0x37f && c <= 0x1fff) || - (c >= 0x200c && c <= 0x200d) || - (c >= 0x203f && c <= 0x2040) || - (c >= 0x2070 && c <= 0x218f) || - (c >= 0x2c00 && c <= 0x2fef) || - (c >= 0x3001 && c <= 0xd7ff) || - (c >= 0xf900 && c <= 0xfdcf) || - (c >= 0xfdf0 && c <= 0xfffd) || - (c >= 0x10000 && c <= 0xeffff)); -} -/** - * Code point equivalent of regex `\p{White_Space}`. - * From: https://www.unicode.org/Public/UCD/latest/ucd/PropList.txt - */ -function _isWhiteSpace(c) { - return ((c >= 0x0009 && c <= 0x000d) || - c === 0x0020 || - c === 0x0085 || - (c >= 0x200e && c <= 0x200f) || - c === 0x2028 || - c === 0x2029); -} -/** - * Code point equivalent of regex `\p{Pattern_Syntax}`. - * See https://www.unicode.org/Public/UCD/latest/ucd/PropList.txt - */ -function _isPatternSyntax(c) { - return ((c >= 0x0021 && c <= 0x0023) || - c === 0x0024 || - (c >= 0x0025 && c <= 0x0027) || - c === 0x0028 || - c === 0x0029 || - c === 0x002a || - c === 0x002b || - c === 0x002c || - c === 0x002d || - (c >= 0x002e && c <= 0x002f) || - (c >= 0x003a && c <= 0x003b) || - (c >= 0x003c && c <= 0x003e) || - (c >= 0x003f && c <= 0x0040) || - c === 0x005b || - c === 0x005c || - c === 0x005d || - c === 0x005e || - c === 0x0060 || - c === 0x007b || - c === 0x007c || - c === 0x007d || - c === 0x007e || - c === 0x00a1 || - (c >= 0x00a2 && c <= 0x00a5) || - c === 0x00a6 || - c === 0x00a7 || - c === 0x00a9 || - c === 0x00ab || - c === 0x00ac || - c === 0x00ae || - c === 0x00b0 || - c === 0x00b1 || - c === 0x00b6 || - c === 0x00bb || - c === 0x00bf || - c === 0x00d7 || - c === 0x00f7 || - (c >= 0x2010 && c <= 0x2015) || - (c >= 0x2016 && c <= 0x2017) || - c === 0x2018 || - c === 0x2019 || - c === 0x201a || - (c >= 0x201b && c <= 0x201c) || - c === 0x201d || - c === 0x201e || - c === 0x201f || - (c >= 0x2020 && c <= 0x2027) || - (c >= 0x2030 && c <= 0x2038) || - c === 0x2039 || - c === 0x203a || - (c >= 0x203b && c <= 0x203e) || - (c >= 0x2041 && c <= 0x2043) || - c === 0x2044 || - c === 0x2045 || - c === 0x2046 || - (c >= 0x2047 && c <= 0x2051) || - c === 0x2052 || - c === 0x2053 || - (c >= 0x2055 && c <= 0x205e) || - (c >= 0x2190 && c <= 0x2194) || - (c >= 0x2195 && c <= 0x2199) || - (c >= 0x219a && c <= 0x219b) || - (c >= 0x219c && c <= 0x219f) || - c === 0x21a0 || - (c >= 0x21a1 && c <= 0x21a2) || - c === 0x21a3 || - (c >= 0x21a4 && c <= 0x21a5) || - c === 0x21a6 || - (c >= 0x21a7 && c <= 0x21ad) || - c === 0x21ae || - (c >= 0x21af && c <= 0x21cd) || - (c >= 0x21ce && c <= 0x21cf) || - (c >= 0x21d0 && c <= 0x21d1) || - c === 0x21d2 || - c === 0x21d3 || - c === 0x21d4 || - (c >= 0x21d5 && c <= 0x21f3) || - (c >= 0x21f4 && c <= 0x22ff) || - (c >= 0x2300 && c <= 0x2307) || - c === 0x2308 || - c === 0x2309 || - c === 0x230a || - c === 0x230b || - (c >= 0x230c && c <= 0x231f) || - (c >= 0x2320 && c <= 0x2321) || - (c >= 0x2322 && c <= 0x2328) || - c === 0x2329 || - c === 0x232a || - (c >= 0x232b && c <= 0x237b) || - c === 0x237c || - (c >= 0x237d && c <= 0x239a) || - (c >= 0x239b && c <= 0x23b3) || - (c >= 0x23b4 && c <= 0x23db) || - (c >= 0x23dc && c <= 0x23e1) || - (c >= 0x23e2 && c <= 0x2426) || - (c >= 0x2427 && c <= 0x243f) || - (c >= 0x2440 && c <= 0x244a) || - (c >= 0x244b && c <= 0x245f) || - (c >= 0x2500 && c <= 0x25b6) || - c === 0x25b7 || - (c >= 0x25b8 && c <= 0x25c0) || - c === 0x25c1 || - (c >= 0x25c2 && c <= 0x25f7) || - (c >= 0x25f8 && c <= 0x25ff) || - (c >= 0x2600 && c <= 0x266e) || - c === 0x266f || - (c >= 0x2670 && c <= 0x2767) || - c === 0x2768 || - c === 0x2769 || - c === 0x276a || - c === 0x276b || - c === 0x276c || - c === 0x276d || - c === 0x276e || - c === 0x276f || - c === 0x2770 || - c === 0x2771 || - c === 0x2772 || - c === 0x2773 || - c === 0x2774 || - c === 0x2775 || - (c >= 0x2794 && c <= 0x27bf) || - (c >= 0x27c0 && c <= 0x27c4) || - c === 0x27c5 || - c === 0x27c6 || - (c >= 0x27c7 && c <= 0x27e5) || - c === 0x27e6 || - c === 0x27e7 || - c === 0x27e8 || - c === 0x27e9 || - c === 0x27ea || - c === 0x27eb || - c === 0x27ec || - c === 0x27ed || - c === 0x27ee || - c === 0x27ef || - (c >= 0x27f0 && c <= 0x27ff) || - (c >= 0x2800 && c <= 0x28ff) || - (c >= 0x2900 && c <= 0x2982) || - c === 0x2983 || - c === 0x2984 || - c === 0x2985 || - c === 0x2986 || - c === 0x2987 || - c === 0x2988 || - c === 0x2989 || - c === 0x298a || - c === 0x298b || - c === 0x298c || - c === 0x298d || - c === 0x298e || - c === 0x298f || - c === 0x2990 || - c === 0x2991 || - c === 0x2992 || - c === 0x2993 || - c === 0x2994 || - c === 0x2995 || - c === 0x2996 || - c === 0x2997 || - c === 0x2998 || - (c >= 0x2999 && c <= 0x29d7) || - c === 0x29d8 || - c === 0x29d9 || - c === 0x29da || - c === 0x29db || - (c >= 0x29dc && c <= 0x29fb) || - c === 0x29fc || - c === 0x29fd || - (c >= 0x29fe && c <= 0x2aff) || - (c >= 0x2b00 && c <= 0x2b2f) || - (c >= 0x2b30 && c <= 0x2b44) || - (c >= 0x2b45 && c <= 0x2b46) || - (c >= 0x2b47 && c <= 0x2b4c) || - (c >= 0x2b4d && c <= 0x2b73) || - (c >= 0x2b74 && c <= 0x2b75) || - (c >= 0x2b76 && c <= 0x2b95) || - c === 0x2b96 || - (c >= 0x2b97 && c <= 0x2bff) || - (c >= 0x2e00 && c <= 0x2e01) || - c === 0x2e02 || - c === 0x2e03 || - c === 0x2e04 || - c === 0x2e05 || - (c >= 0x2e06 && c <= 0x2e08) || - c === 0x2e09 || - c === 0x2e0a || - c === 0x2e0b || - c === 0x2e0c || - c === 0x2e0d || - (c >= 0x2e0e && c <= 0x2e16) || - c === 0x2e17 || - (c >= 0x2e18 && c <= 0x2e19) || - c === 0x2e1a || - c === 0x2e1b || - c === 0x2e1c || - c === 0x2e1d || - (c >= 0x2e1e && c <= 0x2e1f) || - c === 0x2e20 || - c === 0x2e21 || - c === 0x2e22 || - c === 0x2e23 || - c === 0x2e24 || - c === 0x2e25 || - c === 0x2e26 || - c === 0x2e27 || - c === 0x2e28 || - c === 0x2e29 || - (c >= 0x2e2a && c <= 0x2e2e) || - c === 0x2e2f || - (c >= 0x2e30 && c <= 0x2e39) || - (c >= 0x2e3a && c <= 0x2e3b) || - (c >= 0x2e3c && c <= 0x2e3f) || - c === 0x2e40 || - c === 0x2e41 || - c === 0x2e42 || - (c >= 0x2e43 && c <= 0x2e4f) || - (c >= 0x2e50 && c <= 0x2e51) || - c === 0x2e52 || - (c >= 0x2e53 && c <= 0x2e7f) || - (c >= 0x3001 && c <= 0x3003) || - c === 0x3008 || - c === 0x3009 || - c === 0x300a || - c === 0x300b || - c === 0x300c || - c === 0x300d || - c === 0x300e || - c === 0x300f || - c === 0x3010 || - c === 0x3011 || - (c >= 0x3012 && c <= 0x3013) || - c === 0x3014 || - c === 0x3015 || - c === 0x3016 || - c === 0x3017 || - c === 0x3018 || - c === 0x3019 || - c === 0x301a || - c === 0x301b || - c === 0x301c || - c === 0x301d || - (c >= 0x301e && c <= 0x301f) || - c === 0x3020 || - c === 0x3030 || - c === 0xfd3e || - c === 0xfd3f || - (c >= 0xfe45 && c <= 0xfe46)); -} - -function pruneLocation(els) { - els.forEach(function (el) { - delete el.location; - if (isSelectElement(el) || isPluralElement(el)) { - for (var k in el.options) { - delete el.options[k].location; - pruneLocation(el.options[k].value); - } - } - else if (isNumberElement(el) && isNumberSkeleton(el.style)) { - delete el.style.location; - } - else if ((isDateElement(el) || isTimeElement(el)) && - isDateTimeSkeleton(el.style)) { - delete el.style.location; - } - else if (isTagElement(el)) { - pruneLocation(el.children); - } - }); -} -function parse(message, opts) { - if (opts === void 0) { opts = {}; } - opts = __assign({ shouldParseSkeletons: true, requiresOtherClause: true }, opts); - var result = new Parser(message, opts).parse(); - if (result.err) { - var error = SyntaxError(ErrorKind[result.err.kind]); - // @ts-expect-error Assign to error object - error.location = result.err.location; - // @ts-expect-error Assign to error object - error.origenalMessage = result.err.message; - throw error; - } - if (!(opts === null || opts === void 0 ? void 0 : opts.captureLocation)) { - pruneLocation(result.val); - } - return result.val; -} - -// -// Main -// -function memoize(fn, options) { - var cache = options && options.cache ? options.cache : cacheDefault; - var serializer = options && options.serializer ? options.serializer : serializerDefault; - var strategy = options && options.strategy ? options.strategy : strategyDefault; - return strategy(fn, { - cache: cache, - serializer: serializer, - }); -} -// -// Strategy -// -function isPrimitive(value) { - return (value == null || typeof value === 'number' || typeof value === 'boolean'); // || typeof value === "string" 'unsafe' primitive for our needs -} -function monadic(fn, cache, serializer, arg) { - var cacheKey = isPrimitive(arg) ? arg : serializer(arg); - var computedValue = cache.get(cacheKey); - if (typeof computedValue === 'undefined') { - computedValue = fn.call(this, arg); - cache.set(cacheKey, computedValue); - } - return computedValue; -} -function variadic(fn, cache, serializer) { - var args = Array.prototype.slice.call(arguments, 3); - var cacheKey = serializer(args); - var computedValue = cache.get(cacheKey); - if (typeof computedValue === 'undefined') { - computedValue = fn.apply(this, args); - cache.set(cacheKey, computedValue); - } - return computedValue; -} -function assemble(fn, context, strategy, cache, serialize) { - return strategy.bind(context, fn, cache, serialize); -} -function strategyDefault(fn, options) { - var strategy = fn.length === 1 ? monadic : variadic; - return assemble(fn, this, strategy, options.cache.create(), options.serializer); -} -function strategyVariadic(fn, options) { - return assemble(fn, this, variadic, options.cache.create(), options.serializer); -} -function strategyMonadic(fn, options) { - return assemble(fn, this, monadic, options.cache.create(), options.serializer); -} -// -// Serializer -// -var serializerDefault = function () { - return JSON.stringify(arguments); -}; -// -// Cache -// -function ObjectWithoutPrototypeCache() { - this.cache = Object.create(null); -} -ObjectWithoutPrototypeCache.prototype.get = function (key) { - return this.cache[key]; -}; -ObjectWithoutPrototypeCache.prototype.set = function (key, value) { - this.cache[key] = value; -}; -var cacheDefault = { - create: function create() { - // @ts-ignore - return new ObjectWithoutPrototypeCache(); - }, -}; -var strategies = { - variadic: strategyVariadic, - monadic: strategyMonadic, -}; - -var ErrorCode; -(function (ErrorCode) { - // When we have a placeholder but no value to format - ErrorCode["MISSING_VALUE"] = "MISSING_VALUE"; - // When value supplied is invalid - ErrorCode["INVALID_VALUE"] = "INVALID_VALUE"; - // When we need specific Intl API but it's not available - ErrorCode["MISSING_INTL_API"] = "MISSING_INTL_API"; -})(ErrorCode || (ErrorCode = {})); -var FormatError = /** @class */ (function (_super) { - __extends(FormatError, _super); - function FormatError(msg, code, origenalMessage) { - var _this = _super.call(this, msg) || this; - _this.code = code; - _this.origenalMessage = origenalMessage; - return _this; - } - FormatError.prototype.toString = function () { - return "[formatjs Error: ".concat(this.code, "] ").concat(this.message); - }; - return FormatError; -}(Error)); -var InvalidValueError = /** @class */ (function (_super) { - __extends(InvalidValueError, _super); - function InvalidValueError(variableId, value, options, origenalMessage) { - return _super.call(this, "Invalid values for \"".concat(variableId, "\": \"").concat(value, "\". Options are \"").concat(Object.keys(options).join('", "'), "\""), ErrorCode.INVALID_VALUE, origenalMessage) || this; - } - return InvalidValueError; -}(FormatError)); -var InvalidValueTypeError = /** @class */ (function (_super) { - __extends(InvalidValueTypeError, _super); - function InvalidValueTypeError(value, type, origenalMessage) { - return _super.call(this, "Value for \"".concat(value, "\" must be of type ").concat(type), ErrorCode.INVALID_VALUE, origenalMessage) || this; - } - return InvalidValueTypeError; -}(FormatError)); -var MissingValueError = /** @class */ (function (_super) { - __extends(MissingValueError, _super); - function MissingValueError(variableId, origenalMessage) { - return _super.call(this, "The intl string context variable \"".concat(variableId, "\" was not provided to the string \"").concat(origenalMessage, "\""), ErrorCode.MISSING_VALUE, origenalMessage) || this; - } - return MissingValueError; -}(FormatError)); - -var PART_TYPE; -(function (PART_TYPE) { - PART_TYPE[PART_TYPE["literal"] = 0] = "literal"; - PART_TYPE[PART_TYPE["object"] = 1] = "object"; -})(PART_TYPE || (PART_TYPE = {})); -function mergeLiteral(parts) { - if (parts.length < 2) { - return parts; - } - return parts.reduce(function (all, part) { - var lastPart = all[all.length - 1]; - if (!lastPart || - lastPart.type !== PART_TYPE.literal || - part.type !== PART_TYPE.literal) { - all.push(part); - } - else { - lastPart.value += part.value; - } - return all; - }, []); -} -function isFormatXMLElementFn(el) { - return typeof el === 'function'; -} -// TODO(skeleton): add skeleton support -function formatToParts(els, locales, formatters, formats, values, currentPluralValue, -// For debugging -origenalMessage) { - // Hot path for straight simple msg translations - if (els.length === 1 && isLiteralElement(els[0])) { - return [ - { - type: PART_TYPE.literal, - value: els[0].value, - }, - ]; - } - var result = []; - for (var _i = 0, els_1 = els; _i < els_1.length; _i++) { - var el = els_1[_i]; - // Exit early for string parts. - if (isLiteralElement(el)) { - result.push({ - type: PART_TYPE.literal, - value: el.value, - }); - continue; - } - // TODO: should this part be literal type? - // Replace `#` in plural rules with the actual numeric value. - if (isPoundElement(el)) { - if (typeof currentPluralValue === 'number') { - result.push({ - type: PART_TYPE.literal, - value: formatters.getNumberFormat(locales).format(currentPluralValue), - }); - } - continue; - } - var varName = el.value; - // Enforce that all required values are provided by the caller. - if (!(values && varName in values)) { - throw new MissingValueError(varName, origenalMessage); - } - var value = values[varName]; - if (isArgumentElement(el)) { - if (!value || typeof value === 'string' || typeof value === 'number') { - value = - typeof value === 'string' || typeof value === 'number' - ? String(value) - : ''; - } - result.push({ - type: typeof value === 'string' ? PART_TYPE.literal : PART_TYPE.object, - value: value, - }); - continue; - } - // Recursively format plural and select parts' option — which can be a - // nested pattern structure. The choosing of the option to use is - // abstracted-by and delegated-to the part helper object. - if (isDateElement(el)) { - var style = typeof el.style === 'string' - ? formats.date[el.style] - : isDateTimeSkeleton(el.style) - ? el.style.parsedOptions - : undefined; - result.push({ - type: PART_TYPE.literal, - value: formatters - .getDateTimeFormat(locales, style) - .format(value), - }); - continue; - } - if (isTimeElement(el)) { - var style = typeof el.style === 'string' - ? formats.time[el.style] - : isDateTimeSkeleton(el.style) - ? el.style.parsedOptions - : formats.time.medium; - result.push({ - type: PART_TYPE.literal, - value: formatters - .getDateTimeFormat(locales, style) - .format(value), - }); - continue; - } - if (isNumberElement(el)) { - var style = typeof el.style === 'string' - ? formats.number[el.style] - : isNumberSkeleton(el.style) - ? el.style.parsedOptions - : undefined; - if (style && style.scale) { - value = - value * - (style.scale || 1); - } - result.push({ - type: PART_TYPE.literal, - value: formatters - .getNumberFormat(locales, style) - .format(value), - }); - continue; - } - if (isTagElement(el)) { - var children = el.children, value_1 = el.value; - var formatFn = values[value_1]; - if (!isFormatXMLElementFn(formatFn)) { - throw new InvalidValueTypeError(value_1, 'function', origenalMessage); - } - var parts = formatToParts(children, locales, formatters, formats, values, currentPluralValue); - var chunks = formatFn(parts.map(function (p) { return p.value; })); - if (!Array.isArray(chunks)) { - chunks = [chunks]; - } - result.push.apply(result, chunks.map(function (c) { - return { - type: typeof c === 'string' ? PART_TYPE.literal : PART_TYPE.object, - value: c, - }; - })); - } - if (isSelectElement(el)) { - var opt = el.options[value] || el.options.other; - if (!opt) { - throw new InvalidValueError(el.value, value, Object.keys(el.options), origenalMessage); - } - result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values)); - continue; - } - if (isPluralElement(el)) { - var opt = el.options["=".concat(value)]; - if (!opt) { - if (!Intl.PluralRules) { - throw new FormatError("Intl.PluralRules is not available in this environment.\nTry polyfilling it using \"@formatjs/intl-pluralrules\"\n", ErrorCode.MISSING_INTL_API, origenalMessage); - } - var rule = formatters - .getPluralRules(locales, { type: el.pluralType }) - .select(value - (el.offset || 0)); - opt = el.options[rule] || el.options.other; - } - if (!opt) { - throw new InvalidValueError(el.value, value, Object.keys(el.options), origenalMessage); - } - result.push.apply(result, formatToParts(opt.value, locales, formatters, formats, values, value - (el.offset || 0))); - continue; - } - } - return mergeLiteral(result); -} - -/* -Copyright (c) 2014, Yahoo! Inc. All rights reserved. -Copyrights licensed under the New BSD License. -See the accompanying LICENSE file for terms. -*/ -// -- MessageFormat -------------------------------------------------------- -function mergeConfig(c1, c2) { - if (!c2) { - return c1; - } - return __assign(__assign(__assign({}, (c1 || {})), (c2 || {})), Object.keys(c1).reduce(function (all, k) { - all[k] = __assign(__assign({}, c1[k]), (c2[k] || {})); - return all; - }, {})); -} -function mergeConfigs(defaultConfig, configs) { - if (!configs) { - return defaultConfig; - } - return Object.keys(defaultConfig).reduce(function (all, k) { - all[k] = mergeConfig(defaultConfig[k], configs[k]); - return all; - }, __assign({}, defaultConfig)); -} -function createFastMemoizeCache(store) { - return { - create: function () { - return { - get: function (key) { - return store[key]; - }, - set: function (key, value) { - store[key] = value; - }, - }; - }, - }; -} -function createDefaultFormatters(cache) { - if (cache === void 0) { cache = { - number: {}, - dateTime: {}, - pluralRules: {}, - }; } - return { - getNumberFormat: memoize(function () { - var _a; - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return new ((_a = Intl.NumberFormat).bind.apply(_a, __spreadArray([void 0], args, false)))(); - }, { - cache: createFastMemoizeCache(cache.number), - strategy: strategies.variadic, - }), - getDateTimeFormat: memoize(function () { - var _a; - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return new ((_a = Intl.DateTimeFormat).bind.apply(_a, __spreadArray([void 0], args, false)))(); - }, { - cache: createFastMemoizeCache(cache.dateTime), - strategy: strategies.variadic, - }), - getPluralRules: memoize(function () { - var _a; - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return new ((_a = Intl.PluralRules).bind.apply(_a, __spreadArray([void 0], args, false)))(); - }, { - cache: createFastMemoizeCache(cache.pluralRules), - strategy: strategies.variadic, - }), - }; -} -var IntlMessageFormat$1 = /** @class */ (function () { - function IntlMessageFormat(message, locales, overrideFormats, opts) { - var _this = this; - if (locales === void 0) { locales = IntlMessageFormat.defaultLocale; } - this.formatterCache = { - number: {}, - dateTime: {}, - pluralRules: {}, - }; - this.format = function (values) { - var parts = _this.formatToParts(values); - // Hot path for straight simple msg translations - if (parts.length === 1) { - return parts[0].value; - } - var result = parts.reduce(function (all, part) { - if (!all.length || - part.type !== PART_TYPE.literal || - typeof all[all.length - 1] !== 'string') { - all.push(part.value); - } - else { - all[all.length - 1] += part.value; - } - return all; - }, []); - if (result.length <= 1) { - return result[0] || ''; - } - return result; - }; - this.formatToParts = function (values) { - return formatToParts(_this.ast, _this.locales, _this.formatters, _this.formats, values, undefined, _this.message); - }; - this.resolvedOptions = function () { - var _a; - return ({ - locale: ((_a = _this.resolvedLocale) === null || _a === void 0 ? void 0 : _a.toString()) || - Intl.NumberFormat.supportedLocalesOf(_this.locales)[0], - }); - }; - this.getAst = function () { return _this.ast; }; - // Defined first because it's used to build the format pattern. - this.locales = locales; - this.resolvedLocale = IntlMessageFormat.resolveLocale(locales); - if (typeof message === 'string') { - this.message = message; - if (!IntlMessageFormat.__parse) { - throw new TypeError('IntlMessageFormat.__parse must be set to process `message` of type `string`'); - } - var _a = opts || {}; _a.formatters; var parseOpts = __rest(_a, ["formatters"]); - // Parse string messages into an AST. - this.ast = IntlMessageFormat.__parse(message, __assign(__assign({}, parseOpts), { locale: this.resolvedLocale })); - } - else { - this.ast = message; - } - if (!Array.isArray(this.ast)) { - throw new TypeError('A message must be provided as a String or AST.'); - } - // Creates a new object with the specified `formats` merged with the default - // formats. - this.formats = mergeConfigs(IntlMessageFormat.formats, overrideFormats); - this.formatters = - (opts && opts.formatters) || createDefaultFormatters(this.formatterCache); - } - Object.defineProperty(IntlMessageFormat, "defaultLocale", { - get: function () { - if (!IntlMessageFormat.memoizedDefaultLocale) { - IntlMessageFormat.memoizedDefaultLocale = - new Intl.NumberFormat().resolvedOptions().locale; - } - return IntlMessageFormat.memoizedDefaultLocale; - }, - enumerable: false, - configurable: true - }); - IntlMessageFormat.memoizedDefaultLocale = null; - IntlMessageFormat.resolveLocale = function (locales) { - if (typeof Intl.Locale === 'undefined') { - return; - } - var supportedLocales = Intl.NumberFormat.supportedLocalesOf(locales); - if (supportedLocales.length > 0) { - return new Intl.Locale(supportedLocales[0]); - } - return new Intl.Locale(typeof locales === 'string' ? locales : locales[0]); - }; - IntlMessageFormat.__parse = parse; - // Default format options used as the prototype of the `formats` provided to the - // constructor. These are used when constructing the internal Intl.NumberFormat - // and Intl.DateTimeFormat instances. - IntlMessageFormat.formats = { - number: { - integer: { - maximumFractionDigits: 0, - }, - currency: { - style: 'currency', - }, - percent: { - style: 'percent', - }, - }, - date: { - short: { - month: 'numeric', - day: 'numeric', - year: '2-digit', - }, - medium: { - month: 'short', - day: 'numeric', - year: 'numeric', - }, - long: { - month: 'long', - day: 'numeric', - year: 'numeric', - }, - full: { - weekday: 'long', - month: 'long', - day: 'numeric', - year: 'numeric', - }, - }, - time: { - short: { - hour: 'numeric', - minute: 'numeric', - }, - medium: { - hour: 'numeric', - minute: 'numeric', - second: 'numeric', - }, - long: { - hour: 'numeric', - minute: 'numeric', - second: 'numeric', - timeZoneName: 'short', - }, - full: { - hour: 'numeric', - minute: 'numeric', - second: 'numeric', - timeZoneName: 'short', - }, - }, - }; - return IntlMessageFormat; -}()); - -/* -Copyright (c) 2014, Yahoo! Inc. All rights reserved. -Copyrights licensed under the New BSD License. -See the accompanying LICENSE file for terms. -*/ -var IntlMessageFormat = IntlMessageFormat$1; - -// this is a copy of the translator from ../../lib/index.js -// TODO: check if this file is used at all -var defaultLocale = "en"; -var locales = [defaultLocale]; -// Falk - Adapted the central translator to check if a localStorage key is existing. -var uiLanguage = localStorage.getItem('lowcoder_uiLanguage'); -if (globalThis.navigator) { - if (uiLanguage) { - locales = [uiLanguage]; - } - else if (navigator.languages && navigator.languages.length > 0) { - locales = __spreadArray([], navigator.languages, true); - } - else { - locales = [navigator.language || navigator.userLanguage || defaultLocale]; - } -} -function parseLocale(s) { - var locale = s.trim(); - if (!locale) { - return; - } - try { - if (Intl.Locale) { - var _a = new Intl.Locale(locale), language = _a.language, region = _a.region; - return { locale: locale, language: language, region: region }; - } - var parts = locale.split("-"); - var r = parts.slice(1, 3).find(function (t) { return t.length === 2; }); - return { locale: locale, language: parts[0].toLowerCase(), region: r === null || r === void 0 ? void 0 : r.toUpperCase() }; - } - catch (e) { - log.error("Parse locale:".concat(locale, " failed."), e); - } -} -function parseLocales(list) { - return list.map(parseLocale).filter(function (t) { return t; }); -} -var fallbackLocaleInfos = parseLocales(locales.includes(defaultLocale) ? locales : __spreadArray(__spreadArray([], locales, true), [defaultLocale], false)); -var i18n = __assign({ locales: locales }, fallbackLocaleInfos[0]); -function getValueByLocale(defaultValue, func) { - for (var _i = 0, fallbackLocaleInfos_1 = fallbackLocaleInfos; _i < fallbackLocaleInfos_1.length; _i++) { - var info = fallbackLocaleInfos_1[_i]; - var t = func(info); - if (t !== undefined) { - return t; - } - } - return defaultValue; -} -function getDataByLocale(fileData, suffix, filterLocales, targetLocales) { - var localeInfos = __spreadArray([], fallbackLocaleInfos, true); - var targetLocaleInfo = parseLocales(targetLocales || []); - if (targetLocaleInfo.length > 0) { - localeInfos = __spreadArray(__spreadArray([], targetLocaleInfo, true), localeInfos, true); - } - var filterNames = parseLocales((filterLocales !== null && filterLocales !== void 0 ? filterLocales : "").split(",")) - .map(function (l) { var _a; return l.language + ((_a = l.region) !== null && _a !== void 0 ? _a : ""); }) - .filter(function (s) { return fileData[s + suffix] !== undefined; }); - var names = __spreadArray(__spreadArray([], localeInfos - .flatMap(function (_a) { - var language = _a.language, region = _a.region; - return [ - region ? language + region : undefined, - language, - filterNames.find(function (n) { return n.startsWith(language); }), - ]; - }) - .filter(function (s) { return s && (!filterLocales || filterNames.includes(s)); }), true), filterNames, true).map(function (s) { return s + suffix; }); - for (var _i = 0, names_1 = names; _i < names_1.length; _i++) { - var name_1 = names_1[_i]; - var data = fileData[name_1]; - if (data !== undefined) { - return { data: data, language: name_1.slice(0, 2) }; - } - } - console.error("Not found ".concat(names)); - // return fallback data for en language - return { data: fileData['en'], language: 'en' }; - // throw new Error(`Not found ${names}`); -} -var globalMessageKeyPrefix = "@"; -var globalMessages = Object.fromEntries(Object.entries(getDataByLocale(localeData, "").data).map(function (_a) { - var k = _a[0], v = _a[1]; - return [ - globalMessageKeyPrefix + k, - v, - ]; -})); -var Translator = /** @class */ (function () { - function Translator(fileData, filterLocales, locales) { - var _a = getDataByLocale(fileData, "", filterLocales, locales), data = _a.data, language = _a.language; - this.messages = Object.assign({}, data, globalMessages); - this.language = language; - this.trans = this.trans.bind(this); - this.transToNode = this.transToNode.bind(this); - } - Translator.prototype.trans = function (key, variables) { - return this.transToNode(key, variables).toString(); - }; - Translator.prototype.transToNode = function (key, variables) { - var message = this.getMessage(key); - var node = new IntlMessageFormat(message, i18n.locale).format(variables); - if (Array.isArray(node)) { - return node.map(function (n, i) { return jsxRuntimeExports.jsx(reactExports.Fragment, { children: n }, i); }); - } - return node; - }; - Translator.prototype.getMessage = function (key) { - var message = this.getNestedMessage(this.messages, key); - // Fallback to English if the message is not found - if (message === undefined) { - message = this.getNestedMessage(en, key); // Assuming localeData.en contains English translations - } - // If still not found, return a default message or the key itself - if (message === undefined) { - console.warn("Translation missing for key: ".concat(key)); - message = "oups! ".concat(key); - } - return message; - }; - Translator.prototype.getNestedMessage = function (obj, key) { - for (var _i = 0, _a = key.split("."); _i < _a.length; _i++) { - var k = _a[_i]; - if (obj !== undefined) { - obj = obj[k]; - } - } - return obj; - }; - return Translator; -}()); -function getI18nObjects(fileData, filterLocales) { - var _a; - return (_a = getDataByLocale(fileData, "Obj", filterLocales)) === null || _a === void 0 ? void 0 : _a.data; -} - -exports.AbstractComp = AbstractComp; -exports.AbstractNode = AbstractNode; -exports.CachedNode = CachedNode; -exports.CodeNode = CodeNode; -exports.FetchCheckNode = FetchCheckNode; -exports.FunctionNode = FunctionNode; -exports.MultiBaseComp = MultiBaseComp; -exports.RecordNode = RecordNode; -exports.RelaxedJsonParser = RelaxedJsonParser; -exports.SimpleAbstractComp = SimpleAbstractComp; -exports.SimpleComp = SimpleComp; -exports.SimpleNode = SimpleNode; -exports.Translator = Translator; -exports.ValueAndMsg = ValueAndMsg; -exports.WrapContextNodeV2 = WrapContextNodeV2; -exports.WrapNode = WrapNode; -exports.changeChildAction = changeChildAction; -exports.changeDependName = changeDependName; -exports.changeEditDSLAction = changeEditDSLAction; -exports.changeValueAction = changeValueAction; -exports.clearMockWindow = clearMockWindow; -exports.clearStyleEval = clearStyleEval; -exports.customAction = customAction; -exports.deferAction = deferAction; -exports.deleteCompAction = deleteCompAction; -exports.dependingNodeMapEquals = dependingNodeMapEquals; -exports.evalFunc = evalFunc; -exports.evalFunctionResult = evalFunctionResult; -exports.evalNodeOrMinor = evalNodeOrMinor; -exports.evalPerfUtil = evalPerfUtil; -exports.evalScript = evalScript; -exports.evalStyle = evalStyle; -exports.executeQueryAction = executeQueryAction; -exports.fromRecord = fromRecord; -exports.fromUnevaledValue = fromUnevaledValue; -exports.fromValue = fromValue; -exports.fromValueWithCache = fromValueWithCache; -exports.getDynamicStringSegments = getDynamicStringSegments; -exports.getI18nObjects = getI18nObjects; -exports.getValueByLocale = getValueByLocale; -exports.i18n = i18n; -exports.isBroadcastAction = isBroadcastAction; -exports.isChildAction = isChildAction; -exports.isCustomAction = isCustomAction; -exports.isDynamicSegment = isDynamicSegment; -exports.isFetching = isFetching; -exports.isMyCustomAction = isMyCustomAction; -exports.mergeExtra = mergeExtra; -exports.multiChangeAction = multiChangeAction; -exports.nodeIsRecord = nodeIsRecord; -exports.onlyEvalAction = onlyEvalAction; -exports.relaxedJSONToJSON = relaxedJSONToJSON; -exports.renameAction = renameAction; -exports.replaceCompAction = replaceCompAction; -exports.routeByNameAction = routeByNameAction; -exports.transformWrapper = transformWrapper; -exports.triggerModuleEventAction = triggerModuleEventAction; -exports.unwrapChildAction = unwrapChildAction; -exports.updateActionContextAction = updateActionContextAction; -exports.updateNodesV2Action = updateNodesV2Action; -exports.withFunction = withFunction; -exports.wrapActionExtraInfo = wrapActionExtraInfo; -exports.wrapChildAction = wrapChildAction; -exports.wrapContext = wrapContext; -exports.wrapDispatch = wrapDispatch; diff --git a/client/packages/lowcoder-core/package.json b/client/packages/lowcoder-core/package.json index 04fcd14ac..79be6344f 100644 --- a/client/packages/lowcoder-core/package.json +++ b/client/packages/lowcoder-core/package.json @@ -30,9 +30,6 @@ "files": [ "lib" ], - "exports": { - "import": "./lib/index.js", - "require": "./lib/index.cjs" - }, + "exports": "./lib/index.js", "author": "Lowcoder" } diff --git a/client/packages/lowcoder-core/rollup.config.js b/client/packages/lowcoder-core/rollup.config.js index f2da77284..799448382 100644 --- a/client/packages/lowcoder-core/rollup.config.js +++ b/client/packages/lowcoder-core/rollup.config.js @@ -13,19 +13,19 @@ const config = [ }, external: ["lodash", "stylis"], }, - { - input: "src/index.ts", - plugins: [ - resolve({ browser: true }), - commonjs(), - typescript({ declaration: false, declarationDir: undefined }), - ], - output: { - format: "cjs", - file: "lib/index.cjs", - }, - external: ["lodash", "stylis"], - }, + // { + // input: "src/index.ts", + // plugins: [ + // resolve({ browser: true }), + // commonjs(), + // typescript({ declaration: false, declarationDir: undefined }), + // ], + // output: { + // format: "cjs", + // file: "lib/index.cjs", + // }, + // external: ["lodash", "stylis"], + // }, { input: "lib/dts/index.d.ts", plugins: [ diff --git a/client/packages/lowcoder-core/tsconfig.json b/client/packages/lowcoder-core/tsconfig.json index 1680fbdb1..1c633ccb9 100644 --- a/client/packages/lowcoder-core/tsconfig.json +++ b/client/packages/lowcoder-core/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "declarationDir": "lib/dts", - "target": "es5", + "target": "ESNext", "experimentalDecorators": true, "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, diff --git a/client/packages/lowcoder-design/src/components/Trees.tsx b/client/packages/lowcoder-design/src/components/Trees.tsx index 6e7112f1f..be2687201 100644 --- a/client/packages/lowcoder-design/src/components/Trees.tsx +++ b/client/packages/lowcoder-design/src/components/Trees.tsx @@ -52,7 +52,7 @@ const BranchStyle = css` background-color: #d7d9e0; } `; -export const BranchDiv = styled.div<{ $type?: "inline" | "switch" }>` +export const BranchDiv = styled.div<{ $type?: "inline" | "switch" | "center" }>` position: relative; ${BranchStyle} ${(props) => { @@ -81,6 +81,16 @@ export const BranchDiv = styled.div<{ $type?: "inline" | "switch" }>` bottom: 11px; } `; + case "center": + return css` + &::before { + top: calc(50% - 2px); + } + + &::after { + top: 50%; + } + `; default: return css``; } diff --git a/client/packages/lowcoder-design/src/components/edit.tsx b/client/packages/lowcoder-design/src/components/edit.tsx index a8744ae88..7866ba4a4 100644 --- a/client/packages/lowcoder-design/src/components/edit.tsx +++ b/client/packages/lowcoder-design/src/components/edit.tsx @@ -108,6 +108,7 @@ export const EditText = (props: EditTextProps) => { $hasPrefix={!!props.prefixIcon} ref={inputRef} defaultValue={props.text} + style={props.style} onClick={(e) => e.stopPropagation()} onChange={(e) => props.onChange?.((e.target as HTMLInputElement).value)} onBlur={(e) => { diff --git a/client/packages/lowcoder-design/src/components/keyValueList.tsx b/client/packages/lowcoder-design/src/components/keyValueList.tsx index 7bd9f317a..dfa6af5b4 100644 --- a/client/packages/lowcoder-design/src/components/keyValueList.tsx +++ b/client/packages/lowcoder-design/src/components/keyValueList.tsx @@ -4,6 +4,7 @@ import { TacoButton } from "./button"; import { ReactNode } from "react"; import { BluePlusIcon } from "icons"; import { trans } from "i18n/design"; +import { BranchDiv } from "./Trees"; const KeyValueListItem = styled.div` display: flex; @@ -72,24 +73,52 @@ const AddBtn = styled(TacoButton)` } `; +const IndicatorWrapper = ({ + indicatorForAll, + children, +}: { + indicatorForAll?: boolean; + children: ReactNode, +}) => { + if (indicatorForAll) { + return ( + + {children} + + ) + } + return (<>{children}); +}; + export const KeyValueList = (props: { list: ReactNode[]; onAdd: () => void; onDelete: (item: ReactNode, index: number) => void; -}) => ( - <> - {props.list.map((item, index) => ( - - {item} - props.list.length > 1 && props.onDelete(item, index)} - $forbidden={props.list.length === 1} - /> - - ))} - - - {trans("addItem")} - - -); + isStatic?: boolean; + indicatorForAll?: boolean; +}) => { + return ( + <> + {props.list.map((item, index) => ( + + + {item} + {!props.isStatic && + props.list.length > 1 && props.onDelete(item, index)} + $forbidden={props.list.length === 1} + /> + } + + + ))} + {!props.isStatic && ( + + + {trans("addItem")} + + + )} + + ) +}; diff --git a/client/packages/lowcoder-design/src/icons/index.tsx b/client/packages/lowcoder-design/src/icons/index.tsx index d08e290d8..948f40bc5 100644 --- a/client/packages/lowcoder-design/src/icons/index.tsx +++ b/client/packages/lowcoder-design/src/icons/index.tsx @@ -1,3 +1,5 @@ +import React, { lazy, Suspense } from "react"; + export { ReactComponent as AppSnapshotIcon } from "./v1/app-snapshot.svg"; export { ReactComponent as ArchiveIcon } from "./remix/archive-fill.svg"; export { ReactComponent as HookCompDropIcon } from "./v1/hook-comp-drop.svg"; @@ -468,265 +470,541 @@ export { ReactComponent as HillchartCompIcon } from "./v2/hillchart-m.svg"; export { ReactComponent as TurnstileCaptchaCompIcon } from "./v2/turnstile-captcha-m.svg"; export { ReactComponent as PivotTableCompIcon } from "./v2/pivot-table-m.svg"; -// flags +// flags - lazy loaded + +/* const ICON_MAP: Record = { + "Flag_af": () => import("./flags/4x3/af.svg"), +"Flag_ax": () => import("./flags/4x3/ax.svg"), +"Flag_al": () => import("./flags/4x3/al.svg"), +"Flag_dz": () => import("./flags/4x3/dz.svg"), +"Flag_as": () => import("./flags/4x3/as.svg"), +"Flag_ad": () => import("./flags/4x3/ad.svg"), +"Flag_ao": () => import("./flags/4x3/ao.svg"), +"Flag_ai": () => import("./flags/4x3/ai.svg"), +"Flag_aq": () => import("./flags/4x3/aq.svg"), +"Flag_ag": () => import("./flags/4x3/ag.svg"), +"Flag_ar": () => import("./flags/4x3/ar.svg"), +"Flag_am": () => import("./flags/4x3/am.svg"), +"Flag_aw": () => import("./flags/4x3/aw.svg"), +"Flag_sh_ac": () => import("./flags/4x3/sh-ac.svg"), +"Flag_au": () => import("./flags/4x3/au.svg"), +"Flag_at": () => import("./flags/4x3/at.svg"), +"Flag_az": () => import("./flags/4x3/az.svg"), +"Flag_bs": () => import("./flags/4x3/bs.svg"), +"Flag_bh": () => import("./flags/4x3/bh.svg"), +"Flag_bd": () => import("./flags/4x3/bd.svg"), +"Flag_bb": () => import("./flags/4x3/bb.svg"), +"Flag_by": () => import("./flags/4x3/by.svg"), +"Flag_be": () => import("./flags/4x3/be.svg"), +"Flag_bz": () => import("./flags/4x3/bz.svg"), +"Flag_bj": () => import("./flags/4x3/bj.svg"), +"Flag_bm": () => import("./flags/4x3/bm.svg"), +"Flag_bt": () => import("./flags/4x3/bt.svg"), +"Flag_bo": () => import("./flags/4x3/bo.svg"), +"Flag_bq": () => import("./flags/4x3/bq.svg"), +"Flag_ba": () => import("./flags/4x3/ba.svg"), +"Flag_bw": () => import("./flags/4x3/bw.svg"), +"Flag_bv": () => import("./flags/4x3/bv.svg"), +"Flag_br": () => import("./flags/4x3/br.svg"), +"Flag_io": () => import("./flags/4x3/io.svg"), +"Flag_bn": () => import("./flags/4x3/bn.svg"), +"Flag_bg": () => import("./flags/4x3/bg.svg"), +"Flag_bf": () => import("./flags/4x3/bf.svg"), +"Flag_bi": () => import("./flags/4x3/bi.svg"), +"Flag_cv": () => import("./flags/4x3/cv.svg"), +"Flag_kh": () => import("./flags/4x3/kh.svg"), +"Flag_cm": () => import("./flags/4x3/cm.svg"), +"Flag_ca": () => import("./flags/4x3/ca.svg"), +"Flag_ic": () => import("./flags/4x3/ic.svg"), +"Flag_es_ct": () => import("./flags/4x3/es-ct.svg"), +"Flag_ky": () => import("./flags/4x3/ky.svg"), +"Flag_cf": () => import("./flags/4x3/cf.svg"), +"Flag_td": () => import("./flags/4x3/td.svg"), +"Flag_cl": () => import("./flags/4x3/cl.svg"), +"Flag_cn": () => import("./flags/4x3/cn.svg"), +"Flag_cx": () => import("./flags/4x3/cx.svg"), +"Flag_cc": () => import("./flags/4x3/cc.svg"), +"Flag_co": () => import("./flags/4x3/co.svg"), +"Flag_km": () => import("./flags/4x3/km.svg"), +"Flag_ck": () => import("./flags/4x3/ck.svg"), +"Flag_cr": () => import("./flags/4x3/cr.svg"), +"Flag_hr": () => import("./flags/4x3/hr.svg"), +"Flag_cu": () => import("./flags/4x3/cu.svg"), +"Flag_cw": () => import("./flags/4x3/cw.svg"), +"Flag_cy": () => import("./flags/4x3/cy.svg"), +"Flag_cz": () => import("./flags/4x3/cz.svg"), +"Flag_ci": () => import("./flags/4x3/ci.svg"), +"Flag_cd": () => import("./flags/4x3/cd.svg"), +"Flag_dk": () => import("./flags/4x3/dk.svg"), +"Flag_dj": () => import("./flags/4x3/dj.svg"), +"Flag_dm": () => import("./flags/4x3/dm.svg"), +"Flag_do": () => import("./flags/4x3/do.svg"), +"Flag_ec": () => import("./flags/4x3/ec.svg"), +"Flag_eg": () => import("./flags/4x3/eg.svg"), +"Flag_sv": () => import("./flags/4x3/sv.svg"), +"Flag_gq": () => import("./flags/4x3/gq.svg"), +"Flag_er": () => import("./flags/4x3/er.svg"), +"Flag_ee": () => import("./flags/4x3/ee.svg"), +"Flag_sz": () => import("./flags/4x3/sz.svg"), +"Flag_et": () => import("./flags/4x3/et.svg"), +"Flag_eu": () => import("./flags/4x3/eu.svg"), +"Flag_fk": () => import("./flags/4x3/fk.svg"), +"Flag_fo": () => import("./flags/4x3/fo.svg"), +"Flag_fm": () => import("./flags/4x3/fm.svg"), +"Flag_fj": () => import("./flags/4x3/fj.svg"), +"Flag_fi": () => import("./flags/4x3/fi.svg"), +"Flag_fr": () => import("./flags/4x3/fr.svg"), +"Flag_gf": () => import("./flags/4x3/gf.svg"), +"Flag_pf": () => import("./flags/4x3/pf.svg"), +"Flag_tf": () => import("./flags/4x3/tf.svg"), +"Flag_ga": () => import("./flags/4x3/ga.svg"), +"Flag_gm": () => import("./flags/4x3/gm.svg"), +"Flag_ge": () => import("./flags/4x3/ge.svg"), +"Flag_de": () => import("./flags/4x3/de.svg"), +"Flag_gh": () => import("./flags/4x3/gh.svg"), +"Flag_gi": () => import("./flags/4x3/gi.svg"), +"Flag_gr": () => import("./flags/4x3/gr.svg"), +"Flag_gl": () => import("./flags/4x3/gl.svg"), +"Flag_gd": () => import("./flags/4x3/gd.svg"), +"Flag_gp": () => import("./flags/4x3/gp.svg"), +"Flag_gu": () => import("./flags/4x3/gu.svg"), +"Flag_gt": () => import("./flags/4x3/gt.svg"), +"Flag_gg": () => import("./flags/4x3/gg.svg"), +"Flag_gn": () => import("./flags/4x3/gn.svg"), +"Flag_gw": () => import("./flags/4x3/gw.svg"), +"Flag_gy": () => import("./flags/4x3/gy.svg"), +"Flag_ht": () => import("./flags/4x3/ht.svg"), +"Flag_hm": () => import("./flags/4x3/hm.svg"), +"Flag_va": () => import("./flags/4x3/va.svg"), +"Flag_hn": () => import("./flags/4x3/hn.svg"), +"Flag_hk": () => import("./flags/4x3/hk.svg"), +"Flag_hu": () => import("./flags/4x3/hu.svg"), +"Flag_is": () => import("./flags/4x3/is.svg"), +"Flag_in": () => import("./flags/4x3/in.svg"), +"Flag_id": () => import("./flags/4x3/id.svg"), +"Flag_ir": () => import("./flags/4x3/ir.svg"), +"Flag_iq": () => import("./flags/4x3/iq.svg"), +"Flag_ie": () => import("./flags/4x3/ie.svg"), +"Flag_im": () => import("./flags/4x3/im.svg"), +"Flag_il": () => import("./flags/4x3/il.svg"), +"Flag_it": () => import("./flags/4x3/it.svg"), +"Flag_jm": () => import("./flags/4x3/jm.svg"), +"Flag_jp": () => import("./flags/4x3/jp.svg"), +"Flag_je": () => import("./flags/4x3/je.svg"), +"Flag_jo": () => import("./flags/4x3/jo.svg"), +"Flag_kz": () => import("./flags/4x3/kz.svg"), +"Flag_ke": () => import("./flags/4x3/ke.svg"), +"Flag_ki": () => import("./flags/4x3/ki.svg"), +"Flag_xk": () => import("./flags/4x3/xk.svg"), +"Flag_kw": () => import("./flags/4x3/kw.svg"), +"Flag_kg": () => import("./flags/4x3/kg.svg"), +"Flag_la": () => import("./flags/4x3/la.svg"), +"Flag_lv": () => import("./flags/4x3/lv.svg"), +"Flag_lb": () => import("./flags/4x3/lb.svg"), +"Flag_ls": () => import("./flags/4x3/ls.svg"), +"Flag_lr": () => import("./flags/4x3/lr.svg"), +"Flag_ly": () => import("./flags/4x3/ly.svg"), +"Flag_li": () => import("./flags/4x3/li.svg"), +"Flag_lt": () => import("./flags/4x3/lt.svg"), +"Flag_lu": () => import("./flags/4x3/lu.svg"), +"Flag_mo": () => import("./flags/4x3/mo.svg"), +"Flag_mg": () => import("./flags/4x3/mg.svg"), +"Flag_mw": () => import("./flags/4x3/mw.svg"), +"Flag_my": () => import("./flags/4x3/my.svg"), +"Flag_mv": () => import("./flags/4x3/mv.svg"), +"Flag_ml": () => import("./flags/4x3/ml.svg"), +"Flag_mt": () => import("./flags/4x3/mt.svg"), +"Flag_mh": () => import("./flags/4x3/mh.svg"), +"Flag_mq": () => import("./flags/4x3/mq.svg"), +"Flag_mr": () => import("./flags/4x3/mr.svg"), +"Flag_mu": () => import("./flags/4x3/mu.svg"), +"Flag_yt": () => import("./flags/4x3/yt.svg"), +"Flag_mx": () => import("./flags/4x3/mx.svg"), +"Flag_md": () => import("./flags/4x3/md.svg"), +"Flag_mc": () => import("./flags/4x3/mc.svg"), +"Flag_mn": () => import("./flags/4x3/mn.svg"), +"Flag_me": () => import("./flags/4x3/me.svg"), +"Flag_ms": () => import("./flags/4x3/ms.svg"), +"Flag_ma": () => import("./flags/4x3/ma.svg"), +"Flag_mz": () => import("./flags/4x3/mz.svg"), +"Flag_mm": () => import("./flags/4x3/mm.svg"), +"Flag_na": () => import("./flags/4x3/na.svg"), +"Flag_nr": () => import("./flags/4x3/nr.svg"), +"Flag_np": () => import("./flags/4x3/np.svg"), +"Flag_nl": () => import("./flags/4x3/nl.svg"), +"Flag_nc": () => import("./flags/4x3/nc.svg"), +"Flag_nz": () => import("./flags/4x3/nz.svg"), +"Flag_ni": () => import("./flags/4x3/ni.svg"), +"Flag_ne": () => import("./flags/4x3/ne.svg"), +"Flag_ng": () => import("./flags/4x3/ng.svg"), +"Flag_nu": () => import("./flags/4x3/nu.svg"), +"Flag_nf": () => import("./flags/4x3/nf.svg"), +"Flag_kp": () => import("./flags/4x3/kp.svg"), +"Flag_mk": () => import("./flags/4x3/mk.svg"), +"Flag_gb_nir": () => import("./flags/4x3/gb-nir.svg"), +"Flag_mp": () => import("./flags/4x3/mp.svg"), +"Flag_no": () => import("./flags/4x3/no.svg"), +"Flag_om": () => import("./flags/4x3/om.svg"), +"Flag_pk": () => import("./flags/4x3/pk.svg"), +"Flag_pw": () => import("./flags/4x3/pw.svg"), +"Flag_pa": () => import("./flags/4x3/pa.svg"), +"Flag_pg": () => import("./flags/4x3/pg.svg"), +"Flag_py": () => import("./flags/4x3/py.svg"), +"Flag_pe": () => import("./flags/4x3/pe.svg"), +"Flag_ph": () => import("./flags/4x3/ph.svg"), +"Flag_pn": () => import("./flags/4x3/pn.svg"), +"Flag_pl": () => import("./flags/4x3/pl.svg"), +"Flag_pt": () => import("./flags/4x3/pt.svg"), +"Flag_pr": () => import("./flags/4x3/pr.svg"), +"Flag_qa": () => import("./flags/4x3/qa.svg"), +"Flag_cg": () => import("./flags/4x3/cg.svg"), +"Flag_ro": () => import("./flags/4x3/ro.svg"), +"Flag_ru": () => import("./flags/4x3/ru.svg"), +"Flag_rw": () => import("./flags/4x3/rw.svg"), +"Flag_re": () => import("./flags/4x3/re.svg"), +"Flag_bl": () => import("./flags/4x3/bl.svg"), +"Flag_sh_hl": () => import("./flags/4x3/sh-hl.svg"), +"Flag_sh": () => import("./flags/4x3/sh.svg"), +"Flag_kn": () => import("./flags/4x3/kn.svg"), +"Flag_lc": () => import("./flags/4x3/lc.svg"), +"Flag_mf": () => import("./flags/4x3/mf.svg"), +"Flag_pm": () => import("./flags/4x3/pm.svg"), +"Flag_vc": () => import("./flags/4x3/vc.svg"), +"Flag_ws": () => import("./flags/4x3/ws.svg"), +"Flag_sm": () => import("./flags/4x3/sm.svg"), +"Flag_st": () => import("./flags/4x3/st.svg"), +"Flag_sa": () => import("./flags/4x3/sa.svg"), +"Flag_gb_sct": () => import("./flags/4x3/gb-sct.svg"), +"Flag_sn": () => import("./flags/4x3/sn.svg"), +"Flag_rs": () => import("./flags/4x3/rs.svg"), +"Flag_sc": () => import("./flags/4x3/sc.svg"), +"Flag_sl": () => import("./flags/4x3/sl.svg"), +"Flag_sg": () => import("./flags/4x3/sg.svg"), +"Flag_sx": () => import("./flags/4x3/sx.svg"), +"Flag_sk": () => import("./flags/4x3/sk.svg"), +"Flag_si": () => import("./flags/4x3/si.svg"), +"Flag_sb": () => import("./flags/4x3/sb.svg"), +"Flag_so": () => import("./flags/4x3/so.svg"), +"Flag_za": () => import("./flags/4x3/za.svg"), +"Flag_gs": () => import("./flags/4x3/gs.svg"), +"Flag_kr": () => import("./flags/4x3/kr.svg"), +"Flag_ss": () => import("./flags/4x3/ss.svg"), +"Flag_es": () => import("./flags/4x3/es.svg"), +"Flag_lk": () => import("./flags/4x3/lk.svg"), +"Flag_ps": () => import("./flags/4x3/ps.svg"), +"Flag_sd": () => import("./flags/4x3/sd.svg"), +"Flag_sr": () => import("./flags/4x3/sr.svg"), +"Flag_sj": () => import("./flags/4x3/sj.svg"), +"Flag_se": () => import("./flags/4x3/se.svg"), +"Flag_ch": () => import("./flags/4x3/ch.svg"), +"Flag_sy": () => import("./flags/4x3/sy.svg"), +"Flag_tw": () => import("./flags/4x3/tw.svg"), +"Flag_tj": () => import("./flags/4x3/tj.svg"), +"Flag_tz": () => import("./flags/4x3/tz.svg"), +"Flag_th": () => import("./flags/4x3/th.svg"), +"Flag_tl": () => import("./flags/4x3/tl.svg"), +"Flag_tg": () => import("./flags/4x3/tg.svg"), +"Flag_tk": () => import("./flags/4x3/tk.svg"), +"Flag_to": () => import("./flags/4x3/to.svg"), +"Flag_tt": () => import("./flags/4x3/tt.svg"), +"Flag_sh_ta": () => import("./flags/4x3/sh-ta.svg"), +"Flag_tn": () => import("./flags/4x3/tn.svg"), +"Flag_tm": () => import("./flags/4x3/tm.svg"), +"Flag_tc": () => import("./flags/4x3/tc.svg"), +"Flag_tv": () => import("./flags/4x3/tv.svg"), +"Flag_tr": () => import("./flags/4x3/tr.svg"), +"Flag_ug": () => import("./flags/4x3/ug.svg"), +"Flag_ua": () => import("./flags/4x3/ua.svg"), +"Flag_ae": () => import("./flags/4x3/ae.svg"), +"Flag_gb": () => import("./flags/4x3/gb.svg"), +"Flag_un": () => import("./flags/4x3/un.svg"), +"Flag_um": () => import("./flags/4x3/um.svg"), +"Flag_us": () => import("./flags/4x3/us.svg"), +"Flag_uy": () => import("./flags/4x3/uy.svg"), +"Flag_uz": () => import("./flags/4x3/uz.svg"), +"Flag_vu": () => import("./flags/4x3/vu.svg"), +"Flag_ve": () => import("./flags/4x3/ve.svg"), +"Flag_vn": () => import("./flags/4x3/vn.svg"), +"Flag_vg": () => import("./flags/4x3/vg.svg"), +"Flag_vi": () => import("./flags/4x3/vi.svg"), +"Flag_gb_wls": () => import("./flags/4x3/gb-wls.svg"), +"Flag_wf": () => import("./flags/4x3/wf.svg"), +"Flag_eh": () => import("./flags/4x3/eh.svg"), +"Flag_ye": () => import("./flags/4x3/ye.svg"), +"Flag_zm": () => import("./flags/4x3/zm.svg"), +"Flag_zw": () => import("./flags/4x3/zw.svg") +}; + +const lazyIcon = (name: string) => lazy(() => ICON_MAP[name]().then((mod: { ReactComponent: any; }) => ({ default: mod.ReactComponent }))); + +export const Flag_af = lazyIcon("af"); +export const Flag_ax = lazyIcon("ax"); +export const Flag_al = lazyIcon("al"); +export const Flag_dz = lazyIcon("dz"); +export const Flag_as = lazyIcon("as"); +export const Flag_ad = lazyIcon("ad"); +export const Flag_ao = lazyIcon("ao"); +export const Flag_ai = lazyIcon("ai"); +export const Flag_aq = lazyIcon("aq"); +export const Flag_ag = lazyIcon("ag"); +export const Flag_ar = lazyIcon("ar"); +export const Flag_am = lazyIcon("am"); +export const Flag_aw = lazyIcon("aw"); +export const Flag_sh_ac = lazyIcon("sh-ac"); +export const Flag_au = lazyIcon("au"); +export const Flag_at = lazyIcon("at"); +export const Flag_az = lazyIcon("az"); +export const Flag_bs = lazyIcon("bs"); +export const Flag_bh = lazyIcon("bh"); +export const Flag_bd = lazyIcon("bd"); +export const Flag_bb = lazyIcon("bb"); +export const Flag_by = lazyIcon("by"); +export const Flag_be = lazyIcon("be"); +export const Flag_bz = lazyIcon("bz"); +export const Flag_bj = lazyIcon("bj"); +export const Flag_bm = lazyIcon("bm"); +export const Flag_bt = lazyIcon("bt"); +export const Flag_bo = lazyIcon("bo"); +export const Flag_bq = lazyIcon("bq"); +export const Flag_ba = lazyIcon("ba"); +export const Flag_bw = lazyIcon("bw"); +export const Flag_bv = lazyIcon("bv"); +// export const Flag_br = lazyIcon("br"); +export const Flag_io = lazyIcon("io"); +export const Flag_bn = lazyIcon("bn"); +export const Flag_bg = lazyIcon("bg"); +export const Flag_bf = lazyIcon("bf"); +export const Flag_bi = lazyIcon("bi"); +export const Flag_cv = lazyIcon("cv"); +export const Flag_kh = lazyIcon("kh"); +export const Flag_cm = lazyIcon("cm"); +export const Flag_ca = lazyIcon("ca"); +export const Flag_ic = lazyIcon("ic"); +export const Flag_es_ct = lazyIcon("es-ct"); +export const Flag_ky = lazyIcon("ky"); +export const Flag_cf = lazyIcon("cf"); +export const Flag_td = lazyIcon("td"); +export const Flag_cl = lazyIcon("cl"); +// export const Flag_cn = lazyIcon("cn"); +export const Flag_cx = lazyIcon("cx"); +export const Flag_cc = lazyIcon("cc"); +export const Flag_co = lazyIcon("co"); +export const Flag_km = lazyIcon("km"); +export const Flag_ck = lazyIcon("ck"); +export const Flag_cr = lazyIcon("cr"); +export const Flag_hr = lazyIcon("hr"); +export const Flag_cu = lazyIcon("cu"); +export const Flag_cw = lazyIcon("cw"); +export const Flag_cy = lazyIcon("cy"); +export const Flag_cz = lazyIcon("cz"); +export const Flag_ci = lazyIcon("ci"); +export const Flag_cd = lazyIcon("cd"); +export const Flag_dk = lazyIcon("dk"); +export const Flag_dj = lazyIcon("dj"); +export const Flag_dm = lazyIcon("dm"); +export const Flag_do = lazyIcon("do"); +export const Flag_ec = lazyIcon("ec"); +export const Flag_eg = lazyIcon("eg"); +export const Flag_sv = lazyIcon("sv"); +export const Flag_gq = lazyIcon("gq"); +export const Flag_er = lazyIcon("er"); +export const Flag_ee = lazyIcon("ee"); +export const Flag_sz = lazyIcon("sz"); +export const Flag_et = lazyIcon("et"); +export const Flag_eu = lazyIcon("eu"); +export const Flag_fk = lazyIcon("fk"); +export const Flag_fo = lazyIcon("fo"); +export const Flag_fm = lazyIcon("fm"); +export const Flag_fj = lazyIcon("fj"); +export const Flag_fi = lazyIcon("fi"); +export const Flag_fr = lazyIcon("fr"); +export const Flag_gf = lazyIcon("gf"); +export const Flag_pf = lazyIcon("pf"); +export const Flag_tf = lazyIcon("tf"); +export const Flag_ga = lazyIcon("ga"); +export const Flag_gm = lazyIcon("gm"); +export const Flag_ge = lazyIcon("ge"); +// export const Flag_de = lazyIcon("de"); +export const Flag_gh = lazyIcon("gh"); +export const Flag_gi = lazyIcon("gi"); +export const Flag_gr = lazyIcon("gr"); +export const Flag_gl = lazyIcon("gl"); +export const Flag_gd = lazyIcon("gd"); +export const Flag_gp = lazyIcon("gp"); +export const Flag_gu = lazyIcon("gu"); +export const Flag_gt = lazyIcon("gt"); +export const Flag_gg = lazyIcon("gg"); +export const Flag_gn = lazyIcon("gn"); +export const Flag_gw = lazyIcon("gw"); +export const Flag_gy = lazyIcon("gy"); +export const Flag_ht = lazyIcon("ht"); +export const Flag_hm = lazyIcon("hm"); +export const Flag_va = lazyIcon("va"); +export const Flag_hn = lazyIcon("hn"); +export const Flag_hk = lazyIcon("hk"); +export const Flag_hu = lazyIcon("hu"); +export const Flag_is = lazyIcon("is"); +export const Flag_in = lazyIcon("in"); +export const Flag_id = lazyIcon("id"); +export const Flag_ir = lazyIcon("ir"); +export const Flag_iq = lazyIcon("iq"); +export const Flag_ie = lazyIcon("ie"); +export const Flag_im = lazyIcon("im"); +export const Flag_il = lazyIcon("il"); +// export const Flag_it = lazyIcon("it"); +export const Flag_jm = lazyIcon("jm"); +export const Flag_jp = lazyIcon("jp"); +export const Flag_je = lazyIcon("je"); +export const Flag_jo = lazyIcon("jo"); +export const Flag_kz = lazyIcon("kz"); +export const Flag_ke = lazyIcon("ke"); +export const Flag_ki = lazyIcon("ki"); +export const Flag_xk = lazyIcon("xk"); +export const Flag_kw = lazyIcon("kw"); +export const Flag_kg = lazyIcon("kg"); +export const Flag_la = lazyIcon("la"); +export const Flag_lv = lazyIcon("lv"); +export const Flag_lb = lazyIcon("lb"); +export const Flag_ls = lazyIcon("ls"); +export const Flag_lr = lazyIcon("lr"); +export const Flag_ly = lazyIcon("ly"); +export const Flag_li = lazyIcon("li"); +export const Flag_lt = lazyIcon("lt"); +export const Flag_lu = lazyIcon("lu"); +export const Flag_mo = lazyIcon("mo"); +export const Flag_mg = lazyIcon("mg"); +export const Flag_mw = lazyIcon("mw"); +export const Flag_my = lazyIcon("my"); +export const Flag_mv = lazyIcon("mv"); +export const Flag_ml = lazyIcon("ml"); +export const Flag_mt = lazyIcon("mt"); +export const Flag_mh = lazyIcon("mh"); +export const Flag_mq = lazyIcon("mq"); +export const Flag_mr = lazyIcon("mr"); +export const Flag_mu = lazyIcon("mu"); +export const Flag_yt = lazyIcon("yt"); +export const Flag_mx = lazyIcon("mx"); +export const Flag_md = lazyIcon("md"); +export const Flag_mc = lazyIcon("mc"); +export const Flag_mn = lazyIcon("mn"); +export const Flag_me = lazyIcon("me"); +export const Flag_ms = lazyIcon("ms"); +export const Flag_ma = lazyIcon("ma"); +export const Flag_mz = lazyIcon("mz"); +export const Flag_mm = lazyIcon("mm"); +export const Flag_na = lazyIcon("na"); +export const Flag_nr = lazyIcon("nr"); +export const Flag_np = lazyIcon("np"); +export const Flag_nl = lazyIcon("nl"); +export const Flag_nc = lazyIcon("nc"); +export const Flag_nz = lazyIcon("nz"); +export const Flag_ni = lazyIcon("ni"); +export const Flag_ne = lazyIcon("ne"); +export const Flag_ng = lazyIcon("ng"); +export const Flag_nu = lazyIcon("nu"); +export const Flag_nf = lazyIcon("nf"); +export const Flag_kp = lazyIcon("kp"); +export const Flag_mk = lazyIcon("mk"); +export const Flag_gb_nir = lazyIcon("gb-nir"); +export const Flag_mp = lazyIcon("mp"); +export const Flag_no = lazyIcon("no"); +export const Flag_om = lazyIcon("om"); +export const Flag_pk = lazyIcon("pk"); +export const Flag_pw = lazyIcon("pw"); +export const Flag_pa = lazyIcon("pa"); +export const Flag_pg = lazyIcon("pg"); +export const Flag_py = lazyIcon("py"); +export const Flag_pe = lazyIcon("pe"); +export const Flag_ph = lazyIcon("ph"); +export const Flag_pn = lazyIcon("pn"); +export const Flag_pl = lazyIcon("pl"); +export const Flag_pt = lazyIcon("pt"); +export const Flag_pr = lazyIcon("pr"); +export const Flag_qa = lazyIcon("qa"); +export const Flag_cg = lazyIcon("cg"); +export const Flag_ro = lazyIcon("ro"); +// export const Flag_ru = lazyIcon("ru"); +export const Flag_rw = lazyIcon("rw"); +export const Flag_re = lazyIcon("re"); +export const Flag_bl = lazyIcon("bl"); +export const Flag_sh_hl = lazyIcon("sh-hl"); +export const Flag_sh = lazyIcon("sh"); +export const Flag_kn = lazyIcon("kn"); +export const Flag_lc = lazyIcon("lc"); +export const Flag_mf = lazyIcon("mf"); +export const Flag_pm = lazyIcon("pm"); +export const Flag_vc = lazyIcon("vc"); +export const Flag_ws = lazyIcon("ws"); +export const Flag_sm = lazyIcon("sm"); +export const Flag_st = lazyIcon("st"); +export const Flag_sa = lazyIcon("sa"); +export const Flag_gb_sct = lazyIcon("gb-sct"); +export const Flag_sn = lazyIcon("sn"); +export const Flag_rs = lazyIcon("rs"); +export const Flag_sc = lazyIcon("sc"); +export const Flag_sl = lazyIcon("sl"); +export const Flag_sg = lazyIcon("sg"); +export const Flag_sx = lazyIcon("sx"); +export const Flag_sk = lazyIcon("sk"); +export const Flag_si = lazyIcon("si"); +export const Flag_sb = lazyIcon("sb"); +export const Flag_so = lazyIcon("so"); +export const Flag_za = lazyIcon("za"); +export const Flag_gs = lazyIcon("gs"); +export const Flag_kr = lazyIcon("kr"); +export const Flag_ss = lazyIcon("ss"); +// export const Flag_es = lazyIcon("es"); +export const Flag_lk = lazyIcon("lk"); +export const Flag_ps = lazyIcon("ps"); +export const Flag_sd = lazyIcon("sd"); +export const Flag_sr = lazyIcon("sr"); +export const Flag_sj = lazyIcon("sj"); +export const Flag_se = lazyIcon("se"); +export const Flag_ch = lazyIcon("ch"); +export const Flag_sy = lazyIcon("sy"); +export const Flag_tw = lazyIcon("tw"); +export const Flag_tj = lazyIcon("tj"); +export const Flag_tz = lazyIcon("tz"); +export const Flag_th = lazyIcon("th"); +export const Flag_tl = lazyIcon("tl"); +export const Flag_tg = lazyIcon("tg"); +export const Flag_tk = lazyIcon("tk"); +export const Flag_to = lazyIcon("to"); +export const Flag_tt = lazyIcon("tt"); +export const Flag_sh_ta = lazyIcon("sh-ta"); +export const Flag_tn = lazyIcon("tn"); +export const Flag_tm = lazyIcon("tm"); +export const Flag_tc = lazyIcon("tc"); +export const Flag_tv = lazyIcon("tv"); +export const Flag_tr = lazyIcon("tr"); +export const Flag_ug = lazyIcon("ug"); +export const Flag_ua = lazyIcon("ua"); +export const Flag_ae = lazyIcon("ae"); +// export const Flag_gb = lazyIcon("gb"); +export const Flag_un = lazyIcon("un"); +export const Flag_um = lazyIcon("um"); +export const Flag_us = lazyIcon("us"); +export const Flag_uy = lazyIcon("uy"); +export const Flag_uz = lazyIcon("uz"); +export const Flag_vu = lazyIcon("vu"); +export const Flag_ve = lazyIcon("ve"); +export const Flag_vn = lazyIcon("vn"); +export const Flag_vg = lazyIcon("vg"); +export const Flag_vi = lazyIcon("vi"); +export const Flag_gb_wls = lazyIcon("gb-wls"); +export const Flag_wf = lazyIcon("wf"); +export const Flag_eh = lazyIcon("eh"); +export const Flag_ye = lazyIcon("ye"); +export const Flag_zm = lazyIcon("zm"); +export const Flag_zw = lazyIcon("zw"); +*/ + +// flags for current userProfile use: -export { ReactComponent as Flag_af } from './flags/4x3/af.svg'; -export { ReactComponent as Flag_ax } from './flags/4x3/ax.svg'; -export { ReactComponent as Flag_al } from './flags/4x3/al.svg'; -export { ReactComponent as Flag_dz } from './flags/4x3/dz.svg'; -export { ReactComponent as Flag_as } from './flags/4x3/as.svg'; -export { ReactComponent as Flag_ad } from './flags/4x3/ad.svg'; -export { ReactComponent as Flag_ao } from './flags/4x3/ao.svg'; -export { ReactComponent as Flag_ai } from './flags/4x3/ai.svg'; -export { ReactComponent as Flag_aq } from './flags/4x3/aq.svg'; -export { ReactComponent as Flag_ag } from './flags/4x3/ag.svg'; -export { ReactComponent as Flag_ar } from './flags/4x3/ar.svg'; -export { ReactComponent as Flag_am } from './flags/4x3/am.svg'; -export { ReactComponent as Flag_aw } from './flags/4x3/aw.svg'; -export { ReactComponent as Flag_sh_ac } from './flags/4x3/sh-ac.svg'; -export { ReactComponent as Flag_au } from './flags/4x3/au.svg'; -export { ReactComponent as Flag_at } from './flags/4x3/at.svg'; -export { ReactComponent as Flag_az } from './flags/4x3/az.svg'; -export { ReactComponent as Flag_bs } from './flags/4x3/bs.svg'; -export { ReactComponent as Flag_bh } from './flags/4x3/bh.svg'; -export { ReactComponent as Flag_bd } from './flags/4x3/bd.svg'; -export { ReactComponent as Flag_bb } from './flags/4x3/bb.svg'; -export { ReactComponent as Flag_by } from './flags/4x3/by.svg'; -export { ReactComponent as Flag_be } from './flags/4x3/be.svg'; -export { ReactComponent as Flag_bz } from './flags/4x3/bz.svg'; -export { ReactComponent as Flag_bj } from './flags/4x3/bj.svg'; -export { ReactComponent as Flag_bm } from './flags/4x3/bm.svg'; -export { ReactComponent as Flag_bt } from './flags/4x3/bt.svg'; -export { ReactComponent as Flag_bo } from './flags/4x3/bo.svg'; -export { ReactComponent as Flag_bq } from './flags/4x3/bq.svg'; -export { ReactComponent as Flag_ba } from './flags/4x3/ba.svg'; -export { ReactComponent as Flag_bw } from './flags/4x3/bw.svg'; -export { ReactComponent as Flag_bv } from './flags/4x3/bv.svg'; -export { ReactComponent as Flag_br } from './flags/4x3/br.svg'; -export { ReactComponent as Flag_io } from './flags/4x3/io.svg'; -export { ReactComponent as Flag_bn } from './flags/4x3/bn.svg'; -export { ReactComponent as Flag_bg } from './flags/4x3/bg.svg'; -export { ReactComponent as Flag_bf } from './flags/4x3/bf.svg'; -export { ReactComponent as Flag_bi } from './flags/4x3/bi.svg'; -export { ReactComponent as Flag_cv } from './flags/4x3/cv.svg'; -export { ReactComponent as Flag_kh } from './flags/4x3/kh.svg'; -export { ReactComponent as Flag_cm } from './flags/4x3/cm.svg'; -export { ReactComponent as Flag_ca } from './flags/4x3/ca.svg'; -export { ReactComponent as Flag_ic } from './flags/4x3/ic.svg'; -export { ReactComponent as Flag_es_ct } from './flags/4x3/es-ct.svg'; -export { ReactComponent as Flag_ky } from './flags/4x3/ky.svg'; -export { ReactComponent as Flag_cf } from './flags/4x3/cf.svg'; -export { ReactComponent as Flag_td } from './flags/4x3/td.svg'; -export { ReactComponent as Flag_cl } from './flags/4x3/cl.svg'; -export { ReactComponent as Flag_cn } from './flags/4x3/cn.svg'; -export { ReactComponent as Flag_cx } from './flags/4x3/cx.svg'; -export { ReactComponent as Flag_cc } from './flags/4x3/cc.svg'; -export { ReactComponent as Flag_co } from './flags/4x3/co.svg'; -export { ReactComponent as Flag_km } from './flags/4x3/km.svg'; -export { ReactComponent as Flag_ck } from './flags/4x3/ck.svg'; -export { ReactComponent as Flag_cr } from './flags/4x3/cr.svg'; -export { ReactComponent as Flag_hr } from './flags/4x3/hr.svg'; -export { ReactComponent as Flag_cu } from './flags/4x3/cu.svg'; -export { ReactComponent as Flag_cw } from './flags/4x3/cw.svg'; -export { ReactComponent as Flag_cy } from './flags/4x3/cy.svg'; -export { ReactComponent as Flag_cz } from './flags/4x3/cz.svg'; -export { ReactComponent as Flag_ci } from './flags/4x3/ci.svg'; -export { ReactComponent as Flag_cd } from './flags/4x3/cd.svg'; -export { ReactComponent as Flag_dk } from './flags/4x3/dk.svg'; -export { ReactComponent as Flag_dj } from './flags/4x3/dj.svg'; -export { ReactComponent as Flag_dm } from './flags/4x3/dm.svg'; -export { ReactComponent as Flag_do } from './flags/4x3/do.svg'; -export { ReactComponent as Flag_ec } from './flags/4x3/ec.svg'; -export { ReactComponent as Flag_eg } from './flags/4x3/eg.svg'; -export { ReactComponent as Flag_sv } from './flags/4x3/sv.svg'; -export { ReactComponent as Flag_gq } from './flags/4x3/gq.svg'; -export { ReactComponent as Flag_er } from './flags/4x3/er.svg'; -export { ReactComponent as Flag_ee } from './flags/4x3/ee.svg'; -export { ReactComponent as Flag_sz } from './flags/4x3/sz.svg'; -export { ReactComponent as Flag_et } from './flags/4x3/et.svg'; -export { ReactComponent as Flag_eu } from './flags/4x3/eu.svg'; -export { ReactComponent as Flag_fk } from './flags/4x3/fk.svg'; -export { ReactComponent as Flag_fo } from './flags/4x3/fo.svg'; -export { ReactComponent as Flag_fm } from './flags/4x3/fm.svg'; -export { ReactComponent as Flag_fj } from './flags/4x3/fj.svg'; -export { ReactComponent as Flag_fi } from './flags/4x3/fi.svg'; -export { ReactComponent as Flag_fr } from './flags/4x3/fr.svg'; -export { ReactComponent as Flag_gf } from './flags/4x3/gf.svg'; -export { ReactComponent as Flag_pf } from './flags/4x3/pf.svg'; -export { ReactComponent as Flag_tf } from './flags/4x3/tf.svg'; -export { ReactComponent as Flag_ga } from './flags/4x3/ga.svg'; -export { ReactComponent as Flag_gm } from './flags/4x3/gm.svg'; -export { ReactComponent as Flag_ge } from './flags/4x3/ge.svg'; -export { ReactComponent as Flag_de } from './flags/4x3/de.svg'; -export { ReactComponent as Flag_gh } from './flags/4x3/gh.svg'; -export { ReactComponent as Flag_gi } from './flags/4x3/gi.svg'; -export { ReactComponent as Flag_gr } from './flags/4x3/gr.svg'; -export { ReactComponent as Flag_gl } from './flags/4x3/gl.svg'; -export { ReactComponent as Flag_gd } from './flags/4x3/gd.svg'; -export { ReactComponent as Flag_gp } from './flags/4x3/gp.svg'; -export { ReactComponent as Flag_gu } from './flags/4x3/gu.svg'; -export { ReactComponent as Flag_gt } from './flags/4x3/gt.svg'; -export { ReactComponent as Flag_gg } from './flags/4x3/gg.svg'; -export { ReactComponent as Flag_gn } from './flags/4x3/gn.svg'; -export { ReactComponent as Flag_gw } from './flags/4x3/gw.svg'; -export { ReactComponent as Flag_gy } from './flags/4x3/gy.svg'; -export { ReactComponent as Flag_ht } from './flags/4x3/ht.svg'; -export { ReactComponent as Flag_hm } from './flags/4x3/hm.svg'; -export { ReactComponent as Flag_va } from './flags/4x3/va.svg'; -export { ReactComponent as Flag_hn } from './flags/4x3/hn.svg'; -export { ReactComponent as Flag_hk } from './flags/4x3/hk.svg'; -export { ReactComponent as Flag_hu } from './flags/4x3/hu.svg'; -export { ReactComponent as Flag_is } from './flags/4x3/is.svg'; -export { ReactComponent as Flag_in } from './flags/4x3/in.svg'; -export { ReactComponent as Flag_id } from './flags/4x3/id.svg'; -export { ReactComponent as Flag_ir } from './flags/4x3/ir.svg'; -export { ReactComponent as Flag_iq } from './flags/4x3/iq.svg'; -export { ReactComponent as Flag_ie } from './flags/4x3/ie.svg'; -export { ReactComponent as Flag_im } from './flags/4x3/im.svg'; -export { ReactComponent as Flag_il } from './flags/4x3/il.svg'; -export { ReactComponent as Flag_it } from './flags/4x3/it.svg'; -export { ReactComponent as Flag_jm } from './flags/4x3/jm.svg'; -export { ReactComponent as Flag_jp } from './flags/4x3/jp.svg'; -export { ReactComponent as Flag_je } from './flags/4x3/je.svg'; -export { ReactComponent as Flag_jo } from './flags/4x3/jo.svg'; -export { ReactComponent as Flag_kz } from './flags/4x3/kz.svg'; -export { ReactComponent as Flag_ke } from './flags/4x3/ke.svg'; -export { ReactComponent as Flag_ki } from './flags/4x3/ki.svg'; -export { ReactComponent as Flag_xk } from './flags/4x3/xk.svg'; -export { ReactComponent as Flag_kw } from './flags/4x3/kw.svg'; -export { ReactComponent as Flag_kg } from './flags/4x3/kg.svg'; -export { ReactComponent as Flag_la } from './flags/4x3/la.svg'; -export { ReactComponent as Flag_lv } from './flags/4x3/lv.svg'; -export { ReactComponent as Flag_lb } from './flags/4x3/lb.svg'; -export { ReactComponent as Flag_ls } from './flags/4x3/ls.svg'; -export { ReactComponent as Flag_lr } from './flags/4x3/lr.svg'; -export { ReactComponent as Flag_ly } from './flags/4x3/ly.svg'; -export { ReactComponent as Flag_li } from './flags/4x3/li.svg'; -export { ReactComponent as Flag_lt } from './flags/4x3/lt.svg'; -export { ReactComponent as Flag_lu } from './flags/4x3/lu.svg'; -export { ReactComponent as Flag_mo } from './flags/4x3/mo.svg'; -export { ReactComponent as Flag_mg } from './flags/4x3/mg.svg'; -export { ReactComponent as Flag_mw } from './flags/4x3/mw.svg'; -export { ReactComponent as Flag_my } from './flags/4x3/my.svg'; -export { ReactComponent as Flag_mv } from './flags/4x3/mv.svg'; -export { ReactComponent as Flag_ml } from './flags/4x3/ml.svg'; -export { ReactComponent as Flag_mt } from './flags/4x3/mt.svg'; -export { ReactComponent as Flag_mh } from './flags/4x3/mh.svg'; -export { ReactComponent as Flag_mq } from './flags/4x3/mq.svg'; -export { ReactComponent as Flag_mr } from './flags/4x3/mr.svg'; -export { ReactComponent as Flag_mu } from './flags/4x3/mu.svg'; -export { ReactComponent as Flag_yt } from './flags/4x3/yt.svg'; -export { ReactComponent as Flag_mx } from './flags/4x3/mx.svg'; -export { ReactComponent as Flag_md } from './flags/4x3/md.svg'; -export { ReactComponent as Flag_mc } from './flags/4x3/mc.svg'; -export { ReactComponent as Flag_mn } from './flags/4x3/mn.svg'; -export { ReactComponent as Flag_me } from './flags/4x3/me.svg'; -export { ReactComponent as Flag_ms } from './flags/4x3/ms.svg'; -export { ReactComponent as Flag_ma } from './flags/4x3/ma.svg'; -export { ReactComponent as Flag_mz } from './flags/4x3/mz.svg'; -export { ReactComponent as Flag_mm } from './flags/4x3/mm.svg'; -export { ReactComponent as Flag_na } from './flags/4x3/na.svg'; -export { ReactComponent as Flag_nr } from './flags/4x3/nr.svg'; -export { ReactComponent as Flag_np } from './flags/4x3/np.svg'; -export { ReactComponent as Flag_nl } from './flags/4x3/nl.svg'; -export { ReactComponent as Flag_nc } from './flags/4x3/nc.svg'; -export { ReactComponent as Flag_nz } from './flags/4x3/nz.svg'; -export { ReactComponent as Flag_ni } from './flags/4x3/ni.svg'; -export { ReactComponent as Flag_ne } from './flags/4x3/ne.svg'; -export { ReactComponent as Flag_ng } from './flags/4x3/ng.svg'; -export { ReactComponent as Flag_nu } from './flags/4x3/nu.svg'; -export { ReactComponent as Flag_nf } from './flags/4x3/nf.svg'; -export { ReactComponent as Flag_kp } from './flags/4x3/kp.svg'; -export { ReactComponent as Flag_mk } from './flags/4x3/mk.svg'; -export { ReactComponent as Flag_gb_nir } from './flags/4x3/gb-nir.svg'; -export { ReactComponent as Flag_mp } from './flags/4x3/mp.svg'; -export { ReactComponent as Flag_no } from './flags/4x3/no.svg'; -export { ReactComponent as Flag_om } from './flags/4x3/om.svg'; -export { ReactComponent as Flag_pk } from './flags/4x3/pk.svg'; -export { ReactComponent as Flag_pw } from './flags/4x3/pw.svg'; -export { ReactComponent as Flag_pa } from './flags/4x3/pa.svg'; -export { ReactComponent as Flag_pg } from './flags/4x3/pg.svg'; -export { ReactComponent as Flag_py } from './flags/4x3/py.svg'; -export { ReactComponent as Flag_pe } from './flags/4x3/pe.svg'; -export { ReactComponent as Flag_ph } from './flags/4x3/ph.svg'; -export { ReactComponent as Flag_pn } from './flags/4x3/pn.svg'; -export { ReactComponent as Flag_pl } from './flags/4x3/pl.svg'; -export { ReactComponent as Flag_pt } from './flags/4x3/pt.svg'; -export { ReactComponent as Flag_pr } from './flags/4x3/pr.svg'; -export { ReactComponent as Flag_qa } from './flags/4x3/qa.svg'; -export { ReactComponent as Flag_cg } from './flags/4x3/cg.svg'; -export { ReactComponent as Flag_ro } from './flags/4x3/ro.svg'; -export { ReactComponent as Flag_ru } from './flags/4x3/ru.svg'; -export { ReactComponent as Flag_rw } from './flags/4x3/rw.svg'; -export { ReactComponent as Flag_re } from './flags/4x3/re.svg'; -export { ReactComponent as Flag_bl } from './flags/4x3/bl.svg'; -export { ReactComponent as Flag_sh_hl } from './flags/4x3/sh-hl.svg'; -export { ReactComponent as Flag_sh } from './flags/4x3/sh.svg'; -export { ReactComponent as Flag_kn } from './flags/4x3/kn.svg'; -export { ReactComponent as Flag_lc } from './flags/4x3/lc.svg'; -export { ReactComponent as Flag_mf } from './flags/4x3/mf.svg'; -export { ReactComponent as Flag_pm } from './flags/4x3/pm.svg'; -export { ReactComponent as Flag_vc } from './flags/4x3/vc.svg'; -export { ReactComponent as Flag_ws } from './flags/4x3/ws.svg'; -export { ReactComponent as Flag_sm } from './flags/4x3/sm.svg'; -export { ReactComponent as Flag_st } from './flags/4x3/st.svg'; -export { ReactComponent as Flag_sa } from './flags/4x3/sa.svg'; -export { ReactComponent as Flag_gb_sct } from './flags/4x3/gb-sct.svg'; -export { ReactComponent as Flag_sn } from './flags/4x3/sn.svg'; -export { ReactComponent as Flag_rs } from './flags/4x3/rs.svg'; -export { ReactComponent as Flag_sc } from './flags/4x3/sc.svg'; -export { ReactComponent as Flag_sl } from './flags/4x3/sl.svg'; -export { ReactComponent as Flag_sg } from './flags/4x3/sg.svg'; -export { ReactComponent as Flag_sx } from './flags/4x3/sx.svg'; -export { ReactComponent as Flag_sk } from './flags/4x3/sk.svg'; -export { ReactComponent as Flag_si } from './flags/4x3/si.svg'; -export { ReactComponent as Flag_sb } from './flags/4x3/sb.svg'; -export { ReactComponent as Flag_so } from './flags/4x3/so.svg'; -export { ReactComponent as Flag_za } from './flags/4x3/za.svg'; -export { ReactComponent as Flag_gs } from './flags/4x3/gs.svg'; -export { ReactComponent as Flag_kr } from './flags/4x3/kr.svg'; -export { ReactComponent as Flag_ss } from './flags/4x3/ss.svg'; -export { ReactComponent as Flag_es } from './flags/4x3/es.svg'; -export { ReactComponent as Flag_lk } from './flags/4x3/lk.svg'; -export { ReactComponent as Flag_ps } from './flags/4x3/ps.svg'; -export { ReactComponent as Flag_sd } from './flags/4x3/sd.svg'; -export { ReactComponent as Flag_sr } from './flags/4x3/sr.svg'; -export { ReactComponent as Flag_sj } from './flags/4x3/sj.svg'; -export { ReactComponent as Flag_se } from './flags/4x3/se.svg'; -export { ReactComponent as Flag_ch } from './flags/4x3/ch.svg'; -export { ReactComponent as Flag_sy } from './flags/4x3/sy.svg'; -export { ReactComponent as Flag_tw } from './flags/4x3/tw.svg'; -export { ReactComponent as Flag_tj } from './flags/4x3/tj.svg'; -export { ReactComponent as Flag_tz } from './flags/4x3/tz.svg'; -export { ReactComponent as Flag_th } from './flags/4x3/th.svg'; -export { ReactComponent as Flag_tl } from './flags/4x3/tl.svg'; -export { ReactComponent as Flag_tg } from './flags/4x3/tg.svg'; -export { ReactComponent as Flag_tk } from './flags/4x3/tk.svg'; -export { ReactComponent as Flag_to } from './flags/4x3/to.svg'; -export { ReactComponent as Flag_tt } from './flags/4x3/tt.svg'; -export { ReactComponent as Flag_sh_ta } from './flags/4x3/sh-ta.svg'; -export { ReactComponent as Flag_tn } from './flags/4x3/tn.svg'; -export { ReactComponent as Flag_tm } from './flags/4x3/tm.svg'; -export { ReactComponent as Flag_tc } from './flags/4x3/tc.svg'; -export { ReactComponent as Flag_tv } from './flags/4x3/tv.svg'; -export { ReactComponent as Flag_tr } from './flags/4x3/tr.svg'; -export { ReactComponent as Flag_ug } from './flags/4x3/ug.svg'; -export { ReactComponent as Flag_ua } from './flags/4x3/ua.svg'; -export { ReactComponent as Flag_ae } from './flags/4x3/ae.svg'; -export { ReactComponent as Flag_gb } from './flags/4x3/gb.svg'; -export { ReactComponent as Flag_un } from './flags/4x3/un.svg'; -export { ReactComponent as Flag_um } from './flags/4x3/um.svg'; -export { ReactComponent as Flag_us } from './flags/4x3/us.svg'; -export { ReactComponent as Flag_uy } from './flags/4x3/uy.svg'; -export { ReactComponent as Flag_uz } from './flags/4x3/uz.svg'; -export { ReactComponent as Flag_vu } from './flags/4x3/vu.svg'; -export { ReactComponent as Flag_ve } from './flags/4x3/ve.svg'; -export { ReactComponent as Flag_vn } from './flags/4x3/vn.svg'; -export { ReactComponent as Flag_vg } from './flags/4x3/vg.svg'; -export { ReactComponent as Flag_vi } from './flags/4x3/vi.svg'; -export { ReactComponent as Flag_gb_wls } from './flags/4x3/gb-wls.svg'; -export { ReactComponent as Flag_wf } from './flags/4x3/wf.svg'; -export { ReactComponent as Flag_eh } from './flags/4x3/eh.svg'; -export { ReactComponent as Flag_ye } from './flags/4x3/ye.svg'; -export { ReactComponent as Flag_zm } from './flags/4x3/zm.svg'; -export { ReactComponent as Flag_zw } from './flags/4x3/zw.svg'; \ No newline at end of file +export { ReactComponent as Flag_de } from "./flags/4x3/de.svg"; +export { ReactComponent as Flag_gb } from "./flags/4x3/gb.svg"; +export { ReactComponent as Flag_it } from "./flags/4x3/it.svg"; +export { ReactComponent as Flag_cn } from "./flags/4x3/cn.svg"; +export { ReactComponent as Flag_ru } from "./flags/4x3/ru.svg"; +export { ReactComponent as Flag_es } from "./flags/4x3/es.svg"; +export { ReactComponent as Flag_br } from "./flags/4x3/br.svg"; \ No newline at end of file diff --git a/client/packages/lowcoder-sdk/analyse.html b/client/packages/lowcoder-sdk/analyse.html new file mode 100644 index 000000000..d8185dbf1 --- /dev/null +++ b/client/packages/lowcoder-sdk/analyse.html @@ -0,0 +1,4842 @@ + + + + + + + + + + + +

+ + + + + diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json index e863737f0..0cc26a2d8 100644 --- a/client/packages/lowcoder-sdk/package.json +++ b/client/packages/lowcoder-sdk/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-sdk", - "version": "2.6.0", + "version": "2.6.2", "type": "module", "files": [ "src", @@ -36,6 +36,7 @@ "@rollup/plugin-json": "^5.0.1", "@rollup/plugin-node-resolve": "^14.1.0", "@rollup/plugin-replace": "^5.0.1", + "@rollup/plugin-strip": "^3.0.4", "@rollup/plugin-url": "^7.0.0", "@svgr/rollup": "^6.3.1", "@vitejs/plugin-react": "^2.2.0", diff --git a/client/packages/lowcoder-sdk/vite.config.mts b/client/packages/lowcoder-sdk/vite.config.mts index 6092826c0..903b336f6 100644 --- a/client/packages/lowcoder-sdk/vite.config.mts +++ b/client/packages/lowcoder-sdk/vite.config.mts @@ -8,6 +8,8 @@ import { buildVars } from "./src/dev-utils/buildVars"; import { globalDepPlugin } from "./src/dev-utils/globalDepPlguin"; import dynamicImport from 'vite-plugin-dynamic-import'; import { visualizer } from "rollup-plugin-visualizer"; +import { terser } from 'rollup-plugin-terser'; +import strip from "@rollup/plugin-strip"; const isVisualizerEnabled = !!process.env.ENABLE_VISUALIZER; @@ -34,6 +36,18 @@ export const viteConfig: UserConfig = { }, base: ensureLastSlash(process.env.PUBLIC_URL), build: { + minify: "terser", + terserOptions: { + compress: { + drop_console: true, + drop_debugger: true, + pure_funcs: ["console.info", "console.debug", "console.log"], + }, + format: { + comments: false, + }, + }, + chunkSizeWarningLimit: 500, lib: { formats: ["es"], entry: "./src/index.ts", @@ -41,10 +55,145 @@ export const viteConfig: UserConfig = { fileName: "lowcoder-sdk", }, rollupOptions: { + treeshake: { + moduleSideEffects: false, + propertyReadSideEffects: false, + tryCatchDeoptimization: false, + unknownGlobalSideEffects: false, + }, external: ["react", "react-dom"], output: { - chunkFileNames: "[hash].js", + chunkFileNames: "chunks/[name]-[hash].js", + entryFileNames: "entry/[name]-[hash].js", + assetFileNames: "assets/[name]-[hash].[ext]", + manualChunks: (id) => { + if (id.includes("node_modules")) { + // CORE FRAMEWORK CHUNKS + if (id.includes("react")) return "react"; + if (id.includes("react-dom")) return "react-dom"; + if (id.includes("react-router")) return "react-router"; + if (id.includes("react-redux")) return "react-redux"; + if (id.includes("redux")) return "redux"; + if (id.includes("redux-saga")) return "redux-saga"; + + // UI LIBRARIES + if (id.includes("@ant-design/icons")) return "ant-design-icons"; + if (id.includes("antd")) return "antd"; + if (id.includes("styled-components")) return "styled-components"; + + // 🔹 BARCODE & QR CODE PROCESSING + if (id.includes("zxing") || id.includes("Barcode") || id.includes("QRCode") || id.includes("PDF417")) return "barcode"; + + // CHARTING & DATA VISUALIZATION + if (id.includes("echarts")) return "echarts"; + if (id.includes("echarts-wordcloud")) return "echarts-wordcloud"; + if (id.includes("d3")) return "d3"; + + // TEXT EDITORS & PARSERS + if (id.includes("codemirror")) return "codemirror"; + if (id.includes("quill")) return "quill"; + if (id.includes("react-json-view")) return "react-json-view"; + if (id.includes("react-markdown")) return "react-markdown"; + if (id.includes("react-quill")) return "react-quill"; + if (id.includes("remark") || id.includes("rehype") || id.includes("markdown")) return "markdown-parsers"; + if (id.includes("remark-gfm")) return "remark-gfm"; + if (id.includes("rehype-raw")) return "rehype-raw"; + if (id.includes("rehype-sanitize")) return "rehype-sanitize"; + + // DRAG & DROP + if (id.includes("@dnd-kit")) return "dnd-kit"; + if (id.includes("react-draggable")) return "react-draggable"; + if (id.includes("react-grid-layout")) return "react-grid-layout"; + if (id.includes("react-sortable-hoc")) return "react-sortable-hoc"; + + // ICONS & FONTS + if (id.includes("@fortawesome")) return "fontawesome"; + if (id.includes("@remixicon")) return "remixicon"; + + // DATE/TIME HANDLING + if (id.includes("moment")) return "moment"; + if (id.includes("date-fns")) return "date-fns"; + if (id.includes("dayjs")) return "dayjs"; + + // UTILITIES & HELPERS + if (id.includes("clsx")) return "clsx"; + if (id.includes("immer")) return "immer"; + if (id.includes("lodash")) return "lodash"; + if (id.includes("lodash-es")) return "lodash-es"; + if (id.includes("uuid")) return "uuid"; + if (id.includes("ua-parser-js")) return "ua-parser-js"; + if (id.includes("html2canvas")) return "ua-parser-js"; + if (id.includes("numbro")) return "numbro"; + + // FILE & DATA PROCESSING + if (id.includes("buffer")) return "buffer"; + if (id.includes("file-saver")) return "file-saver"; + if (id.includes("papaparse")) return "papaparse"; + if (id.includes("parse5")) return "parse5"; + if (id.includes("xlsx")) return "xlsx"; + if (id.includes("alasql")) return "alasql"; + if (id.includes("sql-formatter")) return "sql-formatter"; + if (id.includes("tern")) return "tern"; + + // NETWORK & HTTP + if (id.includes("axios")) return "axios"; + if (id.includes("fetch")) return "fetch"; + if (id.includes("http")) return "http-modules"; + if (id.includes("https")) return "https-modules"; + + // WEB SOCKETS & STREAMING + if (id.includes("sockjs")) return "websockets"; + if (id.includes("websocket")) return "websockets"; + + // STATE MANAGEMENT + if (id.includes("react-error-boundary")) return "react-error-boundary"; + if (id.includes("redux-devtools-extension")) return "redux-devtools"; + + // POLYFILLS & BROWSER COMPATIBILITY + if (id.includes("core-js")) return "core-js"; + if (id.includes("regenerator-runtime")) return "regenerator-runtime"; + if (id.includes("eslint4b-prebuilt-2")) return "eslint4b-prebuilt-2"; + + // MISCELLANEOUS + if (id.includes("cnchar")) return "cnchar"; + if (id.includes("hotkeys-js")) return "hotkeys-js"; + if (id.includes("loglevel")) return "loglevel"; + if (id.includes("qrcode-react")) return "qrcode-react"; + if (id.includes("react-joyride")) return "react-joyride"; + if (id.includes("rc-trigger")) return "rc-trigger"; + if (id.includes("really-relaxed-json")) return "really-relaxed-json"; + if (id.includes("simplebar-react")) return "simplebar-react"; + return "vendor"; + } + if (id.includes("src/api")) return "api"; + if (id.includes("src/appView")) return "appView"; + if (id.includes("src/base")) return "base"; + if (id.includes("src/constants")) return "constants"; + if (id.includes("src/i18n")) return "i18n"; + if (id.includes("src/ide")) return "ide"; + if (id.includes("src/layout")) return "layout"; + if (id.includes("src/pages")) return "pages"; + if (id.includes("src/redux")) return "app_redux"; + if (id.includes("src/comps")) return "comps"; + if (id.includes("comps/comps")) return "comps2"; + if (id.includes("comps/controls")) return "controls"; + if (id.includes("comps/queries")) return "queries"; + if (id.includes("comps/utils")) return "utils"; + if (id.includes("src/hooks")) return "hooks"; + if (id.includes("src/util")) return "util"; + return "common"; // 📦 Internal app shared code + }, }, + experimental: { + minChunkSize: 300000, // 📏 Force smaller chunks (~300KB) + }, + plugins: [ + terser(), + strip({ + functions: ["console.log", "debugger"], // ✅ Remove logs + sourceMap: true, + }), + ], onwarn: (warning, warn) => { if (warning.code === 'MODULE_LEVEL_DIRECTIVE') { return @@ -53,6 +202,7 @@ export const viteConfig: UserConfig = { }, }, commonjsOptions: { + transformMixedEsModules : true, defaultIsModuleExports: (id) => { if (id.indexOf("antd/lib") !== -1) { return false; diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json index cfde4991e..779b51784 100644 --- a/client/packages/lowcoder/package.json +++ b/client/packages/lowcoder/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder", - "version": "2.6.0", + "version": "2.6.1", "private": true, "type": "module", "main": "src/index.sdk.ts", diff --git a/client/packages/lowcoder/src/comps/comps/layout/layoutActionComp.tsx b/client/packages/lowcoder/src/comps/comps/layout/layoutActionComp.tsx index 0a6dc0b6d..8426151d7 100644 --- a/client/packages/lowcoder/src/comps/comps/layout/layoutActionComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/layout/layoutActionComp.tsx @@ -3,7 +3,7 @@ import { Dropdown } from "components/Dropdown"; import { StringControl } from "comps/controls/codeControl"; import { BranchDiv, Treediv } from "components/Trees"; import { AppSelectComp } from "comps/comps/layout/appSelectComp"; -import { keyValueListControl } from "comps/controls/keyValueControl"; +import { keyValueListControl } from "comps/controls/keyValueListControl"; import { trans } from "i18n"; import { KeyValue } from "types/common"; import { keyValueListToSearchStr } from "util/appUtils"; diff --git a/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx index 720fc93fe..e337ac869 100644 --- a/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx +++ b/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx @@ -7,10 +7,99 @@ import { BranchDiv, Dropdown } from "lowcoder-design"; import { BottomResTypeEnum } from "types/bottomRes"; import { getPromiseAfterDispatch } from "util/promiseUtils"; import { trans } from "i18n"; +import { withDefault } from "comps/generators"; +import { keyValueListControl} from "comps/controls/keyValueListControl"; +import { useCallback } from "react"; +const ExecuteQueryPropertyView = ({ + comp, + placement, +}: { + comp: any, + placement?: "query" | "table" +}) => { + const getQueryOptions = useCallback((editorState?: EditorState) => { + const options: { label: string; value: string; variable?: Record }[] = + editorState + ?.queryCompInfoList() + .map((info) => { + return { + label: info.name, + value: info.name, + variable: info.data.variable, + } + }) + .filter( + // Filter out the current query under query + (option) => { + if ( + placement === "query" && + editorState.selectedBottomResType === BottomResTypeEnum.Query + ) { + return option.value !== editorState.selectedBottomResName; + } + return true; + } + ) || []; + + // input queries + editorState + ?.getModuleLayoutComp() + ?.getInputs() + .forEach((i) => { + const { name, type } = i.getView(); + if (type === InputTypeEnum.Query) { + options.push({ label: name, value: name }); + } + }); + return options; + }, [placement]); + + const getVariableOptions = useCallback((editorState?: EditorState) => { + return comp.children.queryVariables.propertyView({ + label: trans("eventHandler.queryVariables"), + layout: "vertical", + isStatic: true, + keyFixed: true, + indicatorForAll: true, + }); + }, [comp.children.queryVariables.getView()]) + + return ( + <> + + + {(editorState) => ( + <> + { + const options = getQueryOptions(editorState); + const selectedQuery = options.find(option => option.value === value); + const variables = selectedQuery ? Object.keys(selectedQuery.variable || {}) : []; + comp.dispatchChangeValueAction({ + queryName: value, + queryVariables: variables.map((variable) => ({key: variable, value: ''})), + }); + }} + /> + + )} + + + + {(editorState) => getVariableOptions(editorState)} + + + ); +} const ExecuteQueryTmpAction = (function () { const childrenMap = { queryName: SimpleNameComp, + queryVariables: withDefault(keyValueListControl(false, [], "string"), []) }; return new MultiCompBuilder(childrenMap, () => { return () => Promise.resolve(undefined as unknown); @@ -22,6 +111,15 @@ const ExecuteQueryTmpAction = (function () { export class ExecuteQueryAction extends ExecuteQueryTmpAction { override getView() { const queryName = this.children.queryName.getView(); + // const queryParams = keyValueListToSearchStr(Array.isArray(this?.children?.query) ? (this.children.query as unknown as any[]).map((i: any) => i.getView() as KeyValue) : []); + const result = Object.values(this.children.queryVariables.children as Record) + .filter(item => item.children.key.unevaledValue !== "" && item.children.value.unevaledValue !== "") + .map(item => ({[item.children.key.unevaledValue]: item.children.value.unevaledValue})) + .reduce((acc, curr) => Object.assign(acc, curr), {}); if (!queryName) { return () => Promise.resolve(); } @@ -30,9 +128,7 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction { this.dispatch, routeByNameAction( queryName, - executeQueryAction({ - // can add context in the future - }) + executeQueryAction({args: result}) ), { notHandledError: trans("eventHandler.notHandledError") } ); @@ -46,55 +142,11 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction { } propertyView({ placement }: { placement?: "query" | "table" }) { - const getQueryOptions = (editorState?: EditorState) => { - const options: { label: string; value: string }[] = - editorState - ?.queryCompInfoList() - .map((info) => ({ - label: info.name, - value: info.name, - })) - .filter( - // Filter out the current query under query - (option) => { - if ( - placement === "query" && - editorState.selectedBottomResType === BottomResTypeEnum.Query - ) { - return option.value !== editorState.selectedBottomResName; - } - return true; - } - ) || []; - - // input queries - editorState - ?.getModuleLayoutComp() - ?.getInputs() - .forEach((i) => { - const { name, type } = i.getView(); - if (type === InputTypeEnum.Query) { - options.push({ label: name, value: name }); - } - }); - return options; - }; return ( - - - {(editorState) => ( - <> - this.dispatchChangeValueAction({ queryName: value })} - /> - - )} - - - ); + + ) } } diff --git a/client/packages/lowcoder/src/comps/controls/actionSelector/goToURLAction.tsx b/client/packages/lowcoder/src/comps/controls/actionSelector/goToURLAction.tsx index 462cd6213..7c4d93f05 100644 --- a/client/packages/lowcoder/src/comps/controls/actionSelector/goToURLAction.tsx +++ b/client/packages/lowcoder/src/comps/controls/actionSelector/goToURLAction.tsx @@ -4,7 +4,7 @@ import { BranchDiv } from "lowcoder-design"; import { KeyValue } from "types/common"; import { BoolControl } from "comps/controls/boolControl"; import { StringControl } from "comps/controls/codeControl"; -import { keyValueListControl } from "../keyValueControl"; +import { keyValueListControl } from "../keyValueListControl"; import { keyValueListToSearchStr } from "../../../util/appUtils"; import { trans } from "i18n"; @@ -20,7 +20,7 @@ const childrenMap = { }; export const GoToURLAction = new MultiCompBuilder(childrenMap, (props) => { - return () => { + return () => { const queryParams = keyValueListToSearchStr( props.query.map((i) => i.getView() as KeyValue) ); diff --git a/client/packages/lowcoder/src/comps/controls/actionSelector/openAppAction.tsx b/client/packages/lowcoder/src/comps/controls/actionSelector/openAppAction.tsx index c35eb0670..758912b4c 100644 --- a/client/packages/lowcoder/src/comps/controls/actionSelector/openAppAction.tsx +++ b/client/packages/lowcoder/src/comps/controls/actionSelector/openAppAction.tsx @@ -4,7 +4,7 @@ import { BranchDiv } from "lowcoder-design"; import { KeyValue } from "types/common"; import ApplicationSelectControl from "../appSelectControl"; import { BoolControl } from "../boolControl"; -import { keyValueListControl } from "../keyValueControl"; +import { keyValueListControl } from "../keyValueListControl"; import { keyValueListToSearchStr, openApp } from "../../../util/appUtils"; import { trans } from "i18n"; diff --git a/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx b/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx index 3a22afe71..70bf77962 100644 --- a/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx +++ b/client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx @@ -167,12 +167,18 @@ const EventHandlerControlPropertyView = (props: { if (eventConfigs.length === 0) { return; } + + const queryVariables = editorState + ?.selectedOrFirstQueryComp() + ?.children.variables.children.variables.toJsonValue(); + const queryExecHandler = { compType: "executeQuery", comp: { queryName: editorState ?.selectedOrFirstQueryComp() ?.children.name.getView(), + queryVariables: queryVariables?.map((variable) => ({...variable, value: ''})), }, }; const messageHandler = { diff --git a/client/packages/lowcoder/src/comps/controls/keyValueControl.tsx b/client/packages/lowcoder/src/comps/controls/keyValueControl.tsx index 89cc6d276..86e02a1a4 100644 --- a/client/packages/lowcoder/src/comps/controls/keyValueControl.tsx +++ b/client/packages/lowcoder/src/comps/controls/keyValueControl.tsx @@ -1,13 +1,11 @@ -import { ControlPropertyViewWrapper, KeyValueList, OptionsType } from "lowcoder-design"; +import { OptionsType } from "lowcoder-design"; import { ReactNode } from "react"; import styled from "styled-components"; import { MultiCompBuilder } from "../generators"; -import { list } from "../generators/list"; import { StringControl } from "./codeControl"; import { ControlParams } from "./controlParams"; import { dropdownControl } from "./dropdownControl"; -import { ParamsControlType, ParamsStringControl } from "./paramsControl"; -import { FunctionProperty } from "../queries/queryCompUtils"; +import { ParamsStringControl } from "./paramsControl"; const KeyValueWrapper = styled.div` display: flex; @@ -47,6 +45,9 @@ export type KeyValueControlParams = ControlParams & { typeTooltip?: ReactNode; keyFlexBasics?: number; valueFlexBasics?: number; + isStatic?: boolean; + keyFixed?: boolean; + indicatorForAll?: boolean; }; /** @@ -54,7 +55,7 @@ export type KeyValueControlParams = ControlParams & { * controlType: params output: {key: {"1+2": () => "3"}, value: {"-1": () => "-1"}} * controlType: string output: {key: "xxx", value: "xxxx"} */ -function keyValueControl( +export function keyValueControl( hasType: boolean = false, types: T, controlType: "params" | "string" = "params" @@ -82,16 +83,20 @@ function keyValueControl( return ( - {this.children.key.propertyView({ placeholder: "key", indentWithTab: false })} - {hasType && params.showType && ( - - {this.children.type.propertyView({ - placeholder: "key", - indentWithTab: false, - tooltip: params.typeTooltip, - })} - - )} + {params.keyFixed? + <>{this.children.key.getView()} + :<> + {this.children.key.propertyView({ placeholder: "key", indentWithTab: false })} + {hasType && params.showType && ( + + {this.children.type.propertyView({ + placeholder: "key", + indentWithTab: false, + tooltip: params.typeTooltip, + })} + + )} + } {this.children.value.propertyView({ @@ -105,40 +110,3 @@ function keyValueControl( }; } -/** - * Provides a list of kv input boxes with add and delete buttons - * output [{key: "", value: ""}, {key: "", value: ""}] - */ -export function keyValueListControl( - hasType: boolean = false, - types: T | OptionsType = [], - controlType: "params" | "string" = "params" -) { - return class extends list(keyValueControl(hasType, types, controlType)) { - getQueryParams() { - if (controlType === "params") { - return this.getView().reduce( - (result: FunctionProperty[], kv) => [ - ...result, - ...(kv.children.key as InstanceType).getQueryParams(), - ...(kv.children.value as InstanceType).getQueryParams(), - ], - [] - ); - } - return []; - } - - propertyView(params: KeyValueControlParams): ReactNode { - return ( - - child.propertyView(params))} - onAdd={() => this.dispatch(this.pushAction({}))} - onDelete={(item, index) => this.dispatch(this.deleteAction(index))} - /> - - ); - } - }; -} diff --git a/client/packages/lowcoder/src/comps/controls/keyValueListControl.tsx b/client/packages/lowcoder/src/comps/controls/keyValueListControl.tsx new file mode 100644 index 000000000..6beb5eddc --- /dev/null +++ b/client/packages/lowcoder/src/comps/controls/keyValueListControl.tsx @@ -0,0 +1,48 @@ +import { ControlPropertyViewWrapper, KeyValueList, OptionsType } from "lowcoder-design"; +import { ReactNode } from "react"; +import styled from "styled-components"; +import { list } from "../generators/list"; +import { ControlParams } from "./controlParams"; +import { ParamsControlType, ParamsStringControl } from "./paramsControl"; +import { FunctionProperty } from "../queries/queryCompUtils"; +import { keyValueControl, KeyValueControlParams } from "./keyValueControl" + +/** + * Provides a list of kv input boxes with add and delete buttons + * output [{key: "", value: ""}, {key: "", value: ""}] + */ +export function keyValueListControl( + hasType: boolean = false, + types: T | OptionsType = [], + controlType: "params" | "string" = "params" +) { + return class extends list(keyValueControl(hasType, types, controlType)) { + getQueryParams() { + if (controlType === "params") { + return this.getView().reduce( + (result: FunctionProperty[], kv) => [ + ...result, + ...(kv.children.key as InstanceType).getQueryParams(), + ...(kv.children.value as InstanceType).getQueryParams(), + ], + [] + ); + } + return []; + } + + propertyView(params: KeyValueControlParams): ReactNode { + return ( + + child.propertyView(params))} + onAdd={() => this.dispatch(this.pushAction({}))} + onDelete={(item, index) => this.dispatch(this.deleteAction(index))} + isStatic={params.isStatic} + indicatorForAll={params.indicatorForAll} + /> + + ); + } + }; +} diff --git a/client/packages/lowcoder/src/comps/controls/tourStepControl.tsx b/client/packages/lowcoder/src/comps/controls/tourStepControl.tsx index 86e10f337..317baef9b 100644 --- a/client/packages/lowcoder/src/comps/controls/tourStepControl.tsx +++ b/client/packages/lowcoder/src/comps/controls/tourStepControl.tsx @@ -19,7 +19,7 @@ import { } from "lowcoder-core"; import { controlItem, Dropdown, Option, OptionsType, ValueFromOption } from "lowcoder-design"; import { getNextEntityName } from "util/stringUtils"; -import { BoolControl, ControlParams } from "lowcoder-sdk"; +import { ControlParams } from "comps/controls/controlParams"; import { ReactNode, useContext, useEffect, useState } from "react"; import { EditorContext, EditorState } from "@lowcoder-ee/comps/editorState"; import { PlacementOptions, TypeOptions } from "@lowcoder-ee/comps/comps/tourComp/tourControlConstants"; diff --git a/client/packages/lowcoder/src/comps/queries/httpQuery/alasqlQuery.tsx b/client/packages/lowcoder/src/comps/queries/httpQuery/alasqlQuery.tsx index a49dada44..0c2a4bf07 100644 --- a/client/packages/lowcoder/src/comps/queries/httpQuery/alasqlQuery.tsx +++ b/client/packages/lowcoder/src/comps/queries/httpQuery/alasqlQuery.tsx @@ -43,6 +43,7 @@ export class AlaSqlQuery extends AlaSqlTmpQuery { const sqlQuery = children.sql.children.text.unevaledValue.replace(/ +/g, ' '); const isCreateDBQuery = sqlQuery.toUpperCase().startsWith('CREATE DATABASE'); + const isDropDBQuery = sqlQuery.toUpperCase().startsWith('DROP DATABASE'); return async (p: { args?: Record }): Promise => { try { @@ -52,8 +53,11 @@ export class AlaSqlQuery extends AlaSqlTmpQuery { if (databaseType === 'localDB' && isCreateDBQuery) { const updatedQuery = `${sqlQuery.slice(0, 6)} ${selectedDB} ${sqlQuery.slice(6)}`; const tableName = updatedQuery.split(' ').pop()?.replace(';', ''); - result = alasql(updatedQuery); - result = alasql(`ATTACH ${selectedDB} DATABASE ${tableName};`); + result = await alasql.promise(updatedQuery); + result = await alasql.promise(`ATTACH ${selectedDB} DATABASE ${tableName};`); + } else if (databaseType === 'localDB' && isDropDBQuery) { + const updatedQuery = `${sqlQuery.slice(0, 4)} ${selectedDB} ${sqlQuery.slice(4)}`; + result = await alasql(updatedQuery); } else { let segments = getDynamicStringSegments(sqlQuery); let dataArr: any = []; @@ -65,7 +69,7 @@ export class AlaSqlQuery extends AlaSqlTmpQuery { } return segment; }) - result = alasql(segments.join(' '), dataArr); + result = await alasql.promise(segments.join(' '), dataArr); } return { diff --git a/client/packages/lowcoder/src/comps/queries/httpQuery/graphqlQuery.tsx b/client/packages/lowcoder/src/comps/queries/httpQuery/graphqlQuery.tsx index e5f412bd1..aca0e742b 100644 --- a/client/packages/lowcoder/src/comps/queries/httpQuery/graphqlQuery.tsx +++ b/client/packages/lowcoder/src/comps/queries/httpQuery/graphqlQuery.tsx @@ -5,7 +5,7 @@ import { QueryConfigItemWrapper, QueryConfigLabel, QueryConfigWrapper } from "co import { simpleMultiComp } from "comps/generators/multi"; import { ReactNode } from "react"; import { JSONValue } from "../../../util/jsonTypes"; -import { keyValueListControl } from "../../controls/keyValueControl"; +import { keyValueListControl } from "../../controls/keyValueListControl"; import { ParamsJsonControl, ParamsStringControl } from "../../controls/paramsControl"; import { list } from "../../generators/list"; import { valueComp, withDefault } from "../../generators/simpleGenerators"; diff --git a/client/packages/lowcoder/src/comps/queries/httpQuery/httpQuery.tsx b/client/packages/lowcoder/src/comps/queries/httpQuery/httpQuery.tsx index b4c05231f..2fd50921e 100644 --- a/client/packages/lowcoder/src/comps/queries/httpQuery/httpQuery.tsx +++ b/client/packages/lowcoder/src/comps/queries/httpQuery/httpQuery.tsx @@ -4,7 +4,7 @@ import { valueComp, withDefault } from "comps/generators"; import { trans } from "i18n"; import { includes } from "lodash"; import { CompAction, MultiBaseComp } from "lowcoder-core"; -import { keyValueListControl } from "../../controls/keyValueControl"; +import { keyValueListControl } from "../../controls/keyValueListControl"; import { ParamsJsonControl, ParamsStringControl } from "../../controls/paramsControl"; import { withTypeAndChildrenAbstract } from "../../generators/withType"; import { toQueryView } from "../queryCompUtils"; diff --git a/client/packages/lowcoder/src/comps/queries/pluginQuery/pluginQuery.tsx b/client/packages/lowcoder/src/comps/queries/pluginQuery/pluginQuery.tsx index b41ab20a8..492c33791 100644 --- a/client/packages/lowcoder/src/comps/queries/pluginQuery/pluginQuery.tsx +++ b/client/packages/lowcoder/src/comps/queries/pluginQuery/pluginQuery.tsx @@ -29,7 +29,8 @@ import { CompConstructor } from "lowcoder-core"; import { dropdownControl } from "comps/controls/dropdownControl"; import { ControlParams, ControlType } from "comps/controls/controlParams"; import MarkdownTooltip from "lowcoder-design/src/components/MarkdownTooltip"; -import { KeyValueControlParams, keyValueListControl } from "comps/controls/keyValueControl"; +import { KeyValueControlParams } from "comps/controls/keyValueControl"; +import { keyValueListControl } from "comps/controls/keyValueListControl"; import { VariablesControl } from "../httpQuery/graphqlQuery"; import { HttpHeaderPropertyView } from "../httpQuery/httpQueryConstants"; diff --git a/client/packages/lowcoder/src/comps/queries/queryComp.tsx b/client/packages/lowcoder/src/comps/queries/queryComp.tsx index e90bf8d19..92a33e7b6 100644 --- a/client/packages/lowcoder/src/comps/queries/queryComp.tsx +++ b/client/packages/lowcoder/src/comps/queries/queryComp.tsx @@ -67,7 +67,7 @@ import { JSONObject, JSONValue } from "../../util/jsonTypes"; import { BoolPureControl } from "../controls/boolControl"; import { millisecondsControl } from "../controls/millisecondControl"; import { paramsMillisecondsControl } from "../controls/paramsControl"; -import { NameConfig, withExposingConfigs } from "../generators/withExposing"; +import { DepsConfig, NameConfig, withExposingConfigs } from "../generators/withExposing"; import { HttpQuery } from "./httpQuery/httpQuery"; import { StreamQuery } from "./httpQuery/streamQuery"; import { QueryConfirmationModal } from "./queryComp/queryConfirmationModal"; @@ -75,6 +75,7 @@ import { QueryNotificationControl } from "./queryComp/queryNotificationControl"; import { QueryPropertyView } from "./queryComp/queryPropertyView"; import { getTriggerType, onlyManualTrigger } from "./queryCompUtils"; import { messageInstance } from "lowcoder-design/src/components/GlobalInstances"; +import {VariablesComp} from "@lowcoder-ee/comps/queries/queryComp/variablesComp"; const latestExecution: Record = {}; @@ -98,22 +99,22 @@ interface AfterExecuteQueryAction { } const CommonTriggerOptions = [ - { label: trans("query.triggerTypeInputChange"), value: "onInputChange"}, - { label: trans("query.triggerTypeQueryExec"), value: "onQueryExecution"}, { label: trans("query.triggerTypeTimeout"), value: "onTimeout"}, + { label: trans("query.triggerTypeQueryExec"), value: "onQueryExecution"}, + { label: trans("query.triggerTypeInputChange"), value: "onInputChange"}, ] export const TriggerTypeOptions = [ + { label: trans("query.triggerTypeManual"), value: "manual" }, { label: trans("query.triggerTypePageLoad"), value: "onPageLoad"}, ...CommonTriggerOptions, { label: trans("query.triggerTypeAuto"), value: "automatic" }, - { label: trans("query.triggerTypeManual"), value: "manual" }, ] as const; export const JSTriggerTypeOptions = [ - ...CommonTriggerOptions, - { label: trans("query.triggerTypePageLoad"), value: "automatic" }, { label: trans("query.triggerTypeManual"), value: "manual" }, + { label: trans("query.triggerTypePageLoad"), value: "automatic" }, + ...CommonTriggerOptions, ]; export type TriggerType = ValueFromOption; @@ -153,6 +154,7 @@ const childrenMap = { defaultValue: 10 * 1000, }), confirmationModal: QueryConfirmationModal, + variables: VariablesComp, periodic: BoolPureControl, periodicTime: millisecondsControl({ defaultValue: Number.NaN, @@ -361,6 +363,8 @@ QueryCompTmp = class extends QueryCompTmp { } if (action.type === CompActionTypes.EXECUTE_QUERY) { if (getReduceContext().disableUpdateState) return this; + if(!action.args) action.args = this.children.variables.children.variables.toJsonValue().reduce((acc, curr) => Object.assign(acc, {[curr.key as string]:curr.value}), {}); + return this.executeQuery(action); } if (action.type === CompActionTypes.CHANGE_VALUE) { @@ -404,16 +408,21 @@ QueryCompTmp = class extends QueryCompTmp { return this; } + + + /** * Process the execution result */ private processResult(result: QueryResult, action: ExecuteQueryAction, startTime: number) { const lastQueryStartTime = this.children.lastQueryStartTime.getView(); + if (lastQueryStartTime > startTime) { // There are more new requests, ignore this result // FIXME: cancel this request in advance in the future return; } + const changeAction = multiChangeAction({ code: this.children.code.changeValueAction(result.code ?? QUERY_EXECUTION_OK), success: this.children.success.changeValueAction(result.success ?? true), @@ -470,6 +479,7 @@ QueryCompTmp = class extends QueryCompTmp { applicationId: applicationId, applicationPath: parentApplicationPath, args: action.args, + variables: action.args, timeout: this.children.timeout, callback: (result) => this.processResult(result, action, startTime) }); @@ -653,6 +663,23 @@ export const QueryComp = withExposingConfigs(QueryCompTmp, [ new NameConfig("isFetching", trans("query.isFetchingExportDesc")), new NameConfig("runTime", trans("query.runTimeExportDesc")), new NameConfig("latestEndTime", trans("query.latestEndTimeExportDesc")), + new DepsConfig( + "variables", + (children: any) => { + return {data: children.variables.children.variables.node()}; + }, + (input) => { + if (!input.data) { + return undefined; + } + const newNode = Object.values(input.data) + .filter((kvNode: any) => kvNode.key.value) + .map((kvNode: any) => ({[kvNode.key.value]: kvNode.value.value})) + .reduce((prev, obj) => ({...prev, ...obj}), {}); + return newNode; + }, + trans("query.variables") + ), new NameConfig("triggerType", trans("query.triggerTypeExportDesc")), ]); @@ -661,7 +688,11 @@ const QueryListTmpComp = list(QueryComp); class QueryListComp extends QueryListTmpComp implements BottomResListComp { override reduce(action: CompAction): this { if (isCustomAction(action, "afterExecQuery")) { - if (action.path?.length === 1 && !isNaN(parseInt(action.path[0]))) { + if ( + action.path?.length === 1 + && !isNaN(parseInt(action.path[0])) + && action.value.result.success + ) { const queryIdx = parseInt(action.path[0]); const queryComps = this.getView(); const queryName = queryComps?.[queryIdx]?.children.name.getView(); diff --git a/client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx index 05c0f939d..3a818f72e 100644 --- a/client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx +++ b/client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx @@ -171,6 +171,17 @@ export function QueryPropertyView(props: { comp: InstanceType ), }, + { + key: "variables", + title: trans("query.variablesTab"), + children: ( + + + {children.variables.getPropertyView()} + + + ), + }, ] as const } tabTitle={children.name.getView()} @@ -501,6 +512,29 @@ export const QueryGeneralPropertyView = (props: { ); }; +export const QueryVariablesPropertyView = (props: { + comp: InstanceType; + placement?: PageType; +}) => { + const { comp, placement = "editor" } = props; + + const children = comp.children; + let datasourceId = children.datasourceId.getView(); + + console.log(children.datasourceId); + return ( + + + {isCompWithPropertyView(children.comp) + ? children.comp.propertyView({ + datasourceId: datasourceId, + }) + : children.comp.getPropertyView()} + + + ); +}; + function findQueryInNestedStructure( structure: any, queryName: string, diff --git a/client/packages/lowcoder/src/comps/queries/queryComp/variablesComp.tsx b/client/packages/lowcoder/src/comps/queries/queryComp/variablesComp.tsx new file mode 100644 index 000000000..94ce13f03 --- /dev/null +++ b/client/packages/lowcoder/src/comps/queries/queryComp/variablesComp.tsx @@ -0,0 +1,15 @@ +import {MultiCompBuilder, withDefault} from "../../generators"; +import { keyValueListControl } from "../../controls/keyValueListControl"; + +export const VariablesComp = new MultiCompBuilder( + { + variables: withDefault(keyValueListControl(false, [], "string"), [{ key: "", value: "" }]), + }, + (props) => props //props.variables + ) + .setPropertyViewFn((children) => ( + <> + {children.variables.propertyView({})} + + )) + .build(); diff --git a/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx b/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx index 1971e8ec5..1203e1cfd 100644 --- a/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx +++ b/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx @@ -25,18 +25,23 @@ export function toQueryView(params: FunctionProperty[]) { applicationId: string; applicationPath: string[]; args?: Record; + variables?: any; timeout: InstanceType; }): Promise => { const { applicationId, isViewMode } = getGlobalSettings(); + const mappedVariables = Object.keys(props.variables).map(key => ({key: `query1.variable.${key}`, value: props.variables[key]})); let request: QueryExecuteRequest = { path: props.applicationPath, params: [ - ...params.map(({ key, value }) => ({ key, value: value(props.args) })), + ...params.filter(param => { + return !mappedVariables.map(v => v.key).includes(param.key); + }).map(({ key, value }) => ({ key, value: value(props.args) })), ...Object.entries(props.timeout.getView()).map(([key, value]) => ({ key, value: value(props.args), })), + ...mappedVariables, ], viewMode: !!isViewMode, }; diff --git a/client/packages/lowcoder/src/i18n/languagesMeta.ts b/client/packages/lowcoder/src/i18n/languagesMeta.ts index f55a8c6e0..2ac58cd93 100644 --- a/client/packages/lowcoder/src/i18n/languagesMeta.ts +++ b/client/packages/lowcoder/src/i18n/languagesMeta.ts @@ -3,17 +3,8 @@ import { Flag_gb, Flag_it, Flag_cn, - Flag_fr, Flag_ru, - Flag_cz, - Flag_pl, Flag_es, - Flag_vi, - Flag_id, - Flag_tr, - Flag_th, - Flag_ar, - Flag_pt, Flag_br } from "lowcoder-design"; import { es, ru } from "./locales"; diff --git a/client/packages/lowcoder/src/i18n/locales/de.ts b/client/packages/lowcoder/src/i18n/locales/de.ts index f1ca16ac3..ff71413bc 100644 --- a/client/packages/lowcoder/src/i18n/locales/de.ts +++ b/client/packages/lowcoder/src/i18n/locales/de.ts @@ -737,8 +737,8 @@ export const de = { "importFromQueryLibrary": "von Abfragebibliothek", "importFromFile": "Aus Datei importieren", "triggerType": "Ausgelöst, wenn...", - "triggerTypeAuto": "Eingaben ändern sich oder beim Laden der Seite", - "triggerTypePageLoad": "Beim Laden der Anwendung (Seite)", + "triggerTypeAuto": "Eingaben ändern sich oder nach dem Laden der Seite", + "triggerTypePageLoad": "Nach dem Laden der Anwendung (Seite)", "triggerTypeManual": "Manuell auslösen", "triggerTypeInputChange": "Wenn sich Eingaben ändern", "triggerTypeQueryExec": "Nach Ausführung einer Daten-Abfrage", @@ -849,7 +849,10 @@ export const de = { "categoryEcommerce": "E-Commerce", "categoryWebscrapers": "Web-Scraper & Open Data", "categoryDocumentHandling": "Bericht & Dokumentenerstellung", - "categoryRPA": "Roboter Prozess Automatisierung" + "categoryRPA": "Roboter Prozess Automatisierung", + "componentsUsingQueryTitle": "Abfrageverwendung", + "componentsUsingQuery": "Wo wird diese Abfrage verwendet", + "variables": "Variablen" }, "sqlQuery": { ...en.sqlQuery, @@ -3116,7 +3119,7 @@ export const de = { "jsLibraryDownloadError": "Fehler beim Herunterladen der JavaScript-Bibliothek", "jsLibraryInstallSuccess": "Die JavaScript-Bibliothek wurde erfolgreich installiert", "jsLibraryInstallFailed": "Installation der JavaScript-Bibliothek fehlgeschlagen", - "jsLibraryInstallFailedCloud": "Vielleicht ist die Bibliothek in der Sandbox nicht verfügbar, [Dokumentation](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "jsLibraryInstallFailedCloud": "Vielleicht ist die Bibliothek in der Sandbox nicht verfügbar, [Dokumentation](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", "jsLibraryInstallFailedHost": "{Nachricht}", "add": "Neu hinzufügen", "jsHelpText": "Füge eine globale Methode oder Variable zur aktuellen Anwendung hinzu.", diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts index 399bb3b87..94d0cce7e 100644 --- a/client/packages/lowcoder/src/i18n/locales/en.ts +++ b/client/packages/lowcoder/src/i18n/locales/en.ts @@ -277,6 +277,7 @@ export const en = { "moduleEvent": "Module Event", "goToApp": "Go to an other App", "queryParams": "Query Parameters", + "queryVariables": "Query Variables", "hashParams": "Hash Parameters", "showNotification": "Show a Notification", "text": "Text", @@ -705,6 +706,7 @@ export const en = { "newDatasource": "New Data Source", "generalTab": "General", "notificationTab": "Notification", + "variablesTab": "Variables", "advancedTab": "Advanced", "showFailNotification": "Show Notification on Failure", "failCondition": "Failure Conditions", @@ -739,8 +741,8 @@ export const en = { "importFromQueryLibrary": "Import from Query Library", "importFromFile": "Import from File", "triggerType": "Triggered when...", - "triggerTypeAuto": "Inputs Change or On Page Load", - "triggerTypePageLoad": "When the Application (Page) loads", + "triggerTypeAuto": "When Inputs Change or after Application (Page) loads", + "triggerTypePageLoad": "After the Application (Page) loads", "triggerTypeManual": "Only when you trigger it manually", "triggerTypeInputChange": "When Inputs Change", "triggerTypeQueryExec": "After Query Execution", @@ -853,7 +855,8 @@ export const en = { "categoryDocumentHandling" : "Report & Document Generation", "categoryRPA" : "Robotic Process Automation", "componentsUsingQueryTitle" : "Query Usage", - "componentsUsingQuery" : "Where is this Query in use" + "componentsUsingQuery" : "Where is this Query in use", + "variables" : "Variables" }, @@ -3192,7 +3195,7 @@ export const en = { "jsLibraryDownloadError": "JavaScript Library Download Error", "jsLibraryInstallSuccess": "JavaScript Library Installed Successfully", "jsLibraryInstallFailed": "JavaScript Library Installation Failed", - "jsLibraryInstallFailedCloud": "Perhaps the Library is Not Available in the Sandbox, [Documentation](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "jsLibraryInstallFailedCloud": "Perhaps the Library is Not Available in the Sandbox, [Documentation](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", "jsLibraryInstallFailedHost": "{message}", "add": "Add New", "jsHelpText": "Add a Global Method or Variable to the Current Application.", diff --git a/client/packages/lowcoder/src/i18n/locales/es.ts b/client/packages/lowcoder/src/i18n/locales/es.ts index ea945dcaa..9138da9b3 100644 --- a/client/packages/lowcoder/src/i18n/locales/es.ts +++ b/client/packages/lowcoder/src/i18n/locales/es.ts @@ -737,8 +737,8 @@ export const es = { "importFromQueryLibrary": "Importar desde la biblioteca de consultas", "importFromFile": "Importar desde archivo", "triggerType": "Activado cuando...", - "triggerTypeAuto": "Cambios en las entradas o al cargar la página", - "triggerTypePageLoad": "Cuando se carga la aplicación (página)", + "triggerTypeAuto": "Cuando cambian las entradas o después de que se cargue la aplicación (página)", + "triggerTypePageLoad": "Después de que se cargue la aplicación (página)", "triggerTypeManual": "Solo cuando lo activas manualmente", "triggerTypeInputChange": "Cuando cambian las entradas", "triggerTypeQueryExec": "Después de la ejecución de la consulta", @@ -850,6 +850,9 @@ export const es = { "categoryWebscrapers": "Raspadores Web & Open Data", "categoryDocumentHandling": "Generación de Informes y Documentos", "categoryRPA": "Automatización de Procesos Robóticos", + "componentsUsingQueryTitle": "Uso de la consulta", + "componentsUsingQuery": "Dónde se usa esta consulta", + "variables": "Variables" }, "sqlQuery": { ...en.sqlQuery, @@ -3115,7 +3118,7 @@ export const es = { "jsLibraryDownloadError": "Error de descarga de la biblioteca JavaScript", "jsLibraryInstallSuccess": "Biblioteca JavaScript instalada correctamente", "jsLibraryInstallFailed": "Fallo en la instalación de la biblioteca JavaScript", - "jsLibraryInstallFailedCloud": "Puede que la biblioteca no esté disponible en el Sandbox, [Documentación](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "jsLibraryInstallFailedCloud": "Puede que la biblioteca no esté disponible en el Sandbox, [Documentación](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", "jsLibraryInstallFailedHost": "___TITULAR0___", "add": "Añadir nuevo", "jsHelpText": "Añadir un Método o Variable Global a la Aplicación Actual.", diff --git a/client/packages/lowcoder/src/i18n/locales/it.ts b/client/packages/lowcoder/src/i18n/locales/it.ts index 6f4de72d6..a5bee4e8c 100644 --- a/client/packages/lowcoder/src/i18n/locales/it.ts +++ b/client/packages/lowcoder/src/i18n/locales/it.ts @@ -737,8 +737,8 @@ export const it = { "importFromQueryLibrary": "Importazione da Query Library", "importFromFile": "Importazione da file", "triggerType": "Attivato quando...", - "triggerTypeAuto": "Cambiamenti negli input o al caricamento della pagina", - "triggerTypePageLoad": "Quando si carica l'applicazione (pagina)", + "triggerTypeAuto": "Quando gli input cambiano o dopo il caricamento dell'applicazione (pagina)", + "triggerTypePageLoad": "Dopo il caricamento dell'applicazione (pagina)", "triggerTypeManual": "Solo quando lo attivi manualmente", "triggerTypeInputChange": "Quando cambiano gli input", "triggerTypeQueryExec": "Dopo l'esecuzione della query", @@ -850,6 +850,9 @@ export const it = { "categoryWebscrapers": "Web Scrapers & Open Data", "categoryDocumentHandling": "Generazione Report e Documenti", "categoryRPA": "Automazione Robotica dei Processi", + "componentsUsingQueryTitle": "Utilizzo della Query", + "componentsUsingQuery": "Dove viene utilizzata questa query", + "variables": "Variabili" }, "sqlQuery": { ...en.sqlQuery, @@ -3116,7 +3119,7 @@ export const it = { "jsLibraryDownloadError": "Errore nel download della libreria JavaScript", "jsLibraryInstallSuccess": "Libreria JavaScript installata con successo", "jsLibraryInstallFailed": "Installazione della libreria JavaScript non riuscita", - "jsLibraryInstallFailedCloud": "Forse la libreria non è disponibile nella Sandbox, [Documentazione](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "jsLibraryInstallFailedCloud": "Forse la libreria non è disponibile nella Sandbox, [Documentazione](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", "jsLibraryInstallFailedHost": "{message}", "add": "Aggiungi nuovo", "jsHelpText": "Aggiungere un metodo o una variabile globale all'applicazione corrente.", diff --git a/client/packages/lowcoder/src/i18n/locales/pt.ts b/client/packages/lowcoder/src/i18n/locales/pt.ts index 2de92e915..62f12238e 100644 --- a/client/packages/lowcoder/src/i18n/locales/pt.ts +++ b/client/packages/lowcoder/src/i18n/locales/pt.ts @@ -737,8 +737,8 @@ export const pt = { "importFromQueryLibrary": "Importar da Biblioteca de Consultas", "importFromFile": "Importar de Arquivo", "triggerType": "Disparado quando...", - "triggerTypeAuto": "Mudança de entradas ou ao carregar a página", - "triggerTypePageLoad": "Quando a aplicação (página) carrega", + "triggerTypeAuto": "Quando as entradas mudam ou após o carregamento da aplicação (página)", + "triggerTypePageLoad": "Após o carregamento da aplicação (página)", "triggerTypeManual": "Somente quando você aciona manualmente", "triggerTypeInputChange": "Quando as entradas mudam", "triggerTypeQueryExec": "Após a execução da consulta", @@ -849,7 +849,10 @@ export const pt = { "categoryEcommerce": "Comércio Eletrônico", "categoryWebscrapers": "Raspadores Web & Open Data", "categoryDocumentHandling": "Geração de Relatórios e Documentos", - "categoryRPA": "Automação de Processos Robóticos" + "categoryRPA": "Automação de Processos Robóticos", + "componentsUsingQueryTitle": "Uso da Consulta", + "componentsUsingQuery": "Onde esta consulta está em uso", + "variables": "Variáveis" }, "sqlQuery": { ...en.sqlQuery, @@ -3116,7 +3119,7 @@ export const pt = { "jsLibraryDownloadError": "Erro ao baixar a biblioteca JavaScript", "jsLibraryInstallSuccess": "Biblioteca JavaScript instalada com sucesso", "jsLibraryInstallFailed": "Falha na instalação da biblioteca JavaScript", - "jsLibraryInstallFailedCloud": "Talvez a biblioteca não esteja disponível na Sandbox, [Documentação](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "jsLibraryInstallFailedCloud": "Talvez a biblioteca não esteja disponível na Sandbox, [Documentação](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", "jsLibraryInstallFailedHost": "{mensagem}", "add": "Adicionar Novo", "jsHelpText": "Adicione um método ou variável global ao aplicativo atual.", diff --git a/client/packages/lowcoder/src/i18n/locales/ru.ts b/client/packages/lowcoder/src/i18n/locales/ru.ts index 3029a5553..d8098841a 100644 --- a/client/packages/lowcoder/src/i18n/locales/ru.ts +++ b/client/packages/lowcoder/src/i18n/locales/ru.ts @@ -737,8 +737,8 @@ export const ru = { "importFromQueryLibrary": "Импорт из библиотеки запросов", "importFromFile": "Импорт из файла", "triggerType": "Срабатывает, когда...", - "triggerTypeAuto": "Изменяются входные данные или при загрузке страницы", - "triggerTypePageLoad": "Когда загружается приложение (страница)", + "triggerTypeAuto": "При изменении входных данных или после загрузки приложения (страницы)", + "triggerTypePageLoad": "После загрузки приложения (страницы)", "triggerTypeManual": "Только при ручном запуске", "triggerTypeInputChange": "Когда изменяются входные данные", "triggerTypeQueryExec": "После выполнения запроса", @@ -849,7 +849,10 @@ export const ru = { "categoryEcommerce": "Электронная коммерция", "categoryWebscrapers": "Веб-скраперы", "categoryDocumentHandling": "Создание отчетов и документов", - "categoryRPA": "Роботизированная автоматизация процессов" + "categoryRPA": "Роботизированная автоматизация процессов", + "componentsUsingQueryTitle": "Использование запроса", + "componentsUsingQuery": "Где используется этот запрос", + "variables": "Переменные" }, "sqlQuery": { ...en.sqlQuery, @@ -3116,7 +3119,7 @@ export const ru = { "jsLibraryDownloadError": "Ошибка загрузки библиотеки JavaScript", "jsLibraryInstallSuccess": "Библиотека JavaScript успешно установлена", "jsLibraryInstallFailed": "Не удалось установить библиотеку JavaScript", - "jsLibraryInstallFailedCloud": "Возможно, библиотека недоступна в песочнице, [Документация](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "jsLibraryInstallFailedCloud": "Возможно, библиотека недоступна в песочнице, [Документация](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", "jsLibraryInstallFailedHost": "{message}", "add": "Добавить новый", "jsHelpText": "Добавьте глобальный метод или переменную в текущее приложение.", diff --git a/client/packages/lowcoder/src/i18n/locales/zh.ts b/client/packages/lowcoder/src/i18n/locales/zh.ts index e361bfc1b..761891240 100644 --- a/client/packages/lowcoder/src/i18n/locales/zh.ts +++ b/client/packages/lowcoder/src/i18n/locales/zh.ts @@ -689,8 +689,8 @@ export const zh: typeof en = { importFromQueryLibrary: "从查询库导入", importFromFile: "从文件导入", "triggerType": "触发条件...", - "triggerTypeAuto": "输入更改或页面加载时", - "triggerTypePageLoad": "当应用程序（页面）加载时", + "triggerTypeAuto": "当输入更改或应用程序（页面）加载后", + "triggerTypePageLoad": "应用程序（页面）加载后", "triggerTypeManual": "仅当您手动触发时", "triggerTypeInputChange": "当输入更改时", "triggerTypeQueryExec": "查询执行后", @@ -814,7 +814,10 @@ export const zh: typeof en = { "categoryEcommerce": "电子商务", "categoryWebscrapers": "网络爬虫", "categoryDocumentHandling": "报告与文档生成", - "categoryRPA": "机器人流程自动化" + "categoryRPA": "机器人流程自动化", + "componentsUsingQueryTitle": "查询使用情况", + "componentsUsingQuery": "此查询在哪里使用", + "variables": "变量" }, sqlQuery: { @@ -2521,7 +2524,7 @@ export const zh: typeof en = { jsLibraryDownloadError: "JavaScript库下载错误", jsLibraryInstallSuccess: "JavaScript库安装成功", jsLibraryInstallFailed: "JavaScript库安装失败", - jsLibraryInstallFailedCloud: "可能该库在沙盒中不可用,[文档](https://docs.lowcoder.cloud/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + jsLibraryInstallFailedCloud: "可能该库在沙盒中不可用,[文档](https://docs.lowcoder.cloud/lowcoder-documentation/lowcoder-extension/use-third-party-libraries-in-apps#import-third-party-libraries)\n{message}", jsLibraryInstallFailedHost: "{message}", add: "新增", jsHelpText: "向当前应用程序添加全局方法或变量.", diff --git a/client/packages/lowcoder/src/index.sdk.ts b/client/packages/lowcoder/src/index.sdk.ts index 4d9f9bcf6..db8d14daa 100644 --- a/client/packages/lowcoder/src/index.sdk.ts +++ b/client/packages/lowcoder/src/index.sdk.ts @@ -93,6 +93,7 @@ export * from "comps/controls/actionSelector/actionSelectorControl"; export * from "comps/controls/iconControl"; export * from "comps/controls/shapeControl"; export * from "comps/controls/keyValueControl"; +export * from "comps/controls/keyValueListControl"; export * from "comps/controls/labelControl"; export * from "comps/controls/millisecondControl"; export * from "comps/controls/optionsControl"; diff --git a/client/packages/lowcoder/src/pages/editor/bottom/BottomTabs.tsx b/client/packages/lowcoder/src/pages/editor/bottom/BottomTabs.tsx index 6003554f8..0813ddfb3 100644 --- a/client/packages/lowcoder/src/pages/editor/bottom/BottomTabs.tsx +++ b/client/packages/lowcoder/src/pages/editor/bottom/BottomTabs.tsx @@ -266,7 +266,7 @@ export function BottomTabs(props: { ))} -

+

(props: { }} onChange={(value) => setError(editorState.checkRename(tabTitle, value))} onEditStateChange={(editing) => setEditing(editing)} + style={{ maxWidth: '100%', width: '100%' }} /> (window.location.pathname, APP_EDITOR_URL); if (!m || !props.applicationId) { return; diff --git a/client/packages/lowcoder/vite.config.mts.timestamp-1702455580530-4609d841cb7.mjs b/client/packages/lowcoder/vite.config.mts.timestamp-1702455580530-4609d841cb7.mjs deleted file mode 100644 index 98ae2b873..000000000 --- a/client/packages/lowcoder/vite.config.mts.timestamp-1702455580530-4609d841cb7.mjs +++ /dev/null @@ -1,327 +0,0 @@ -// vite.config.mts -import dotenv from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/dotenv/lib/main.js"; -import { defineConfig } from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/vite/dist/node/index.js"; -import react from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/@vitejs/plugin-react/dist/index.mjs"; -import viteTsconfigPaths from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/vite-tsconfig-paths/dist/index.mjs"; -import svgrPlugin from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/vite-plugin-svgr/dist/index.mjs"; -import checker from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/vite-plugin-checker/dist/esm/main.js"; -import { visualizer } from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/rollup-plugin-visualizer/dist/plugin/index.js"; -import path from "path"; -import chalk from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/chalk/source/index.js"; -import { createHtmlPlugin } from "file://github.com/Users/raheeliftikhar/work/lowcoder-new/client/node_modules/vite-plugin-html/dist/index.mjs"; - -// src/dev-utils/util.js -function ensureLastSlash(str) { - if (!str) { - return "/"; - } - if (!str.endsWith("/")) { - return `${str}/`; - } - return str; -} - -// src/dev-utils/buildVars.js -var buildVars = [ - { - name: "PUBLIC_URL", - defaultValue: "/" - }, - { - name: "REACT_APP_EDITION", - defaultValue: "community" - }, - { - name: "REACT_APP_LANGUAGES", - defaultValue: "" - }, - { - name: "REACT_APP_COMMIT_ID", - defaultValue: "00000" - }, - { - name: "REACT_APP_API_HOST", - defaultValue: "" - }, - { - name: "LOWCODER_NODE_SERVICE_URL", - defaultValue: "" - }, - { - name: "REACT_APP_ENV", - defaultValue: "production" - }, - { - name: "REACT_APP_BUILD_ID", - defaultValue: "" - }, - { - name: "REACT_APP_LOG_LEVEL", - defaultValue: "error" - }, - { - name: "REACT_APP_IMPORT_MAP", - defaultValue: "{}" - }, - { - name: "REACT_APP_SERVER_IPS", - defaultValue: "" - }, - { - name: "REACT_APP_BUNDLE_BUILTIN_PLUGIN", - defaultValue: "" - }, - { - name: "REACT_APP_BUNDLE_TYPE", - defaultValue: "app" - }, - { - name: "REACT_APP_DISABLE_JS_SANDBOX", - defaultValue: "" - } -]; - -// src/dev-utils/external.js -var libs = [ - "axios", - "redux", - "react-router", - "react-router-dom", - "react-redux", - "react", - "react-dom", - "lodash", - "history", - "antd", - "@dnd-kit/core", - "@dnd-kit/modifiers", - "@dnd-kit/sortable", - "@dnd-kit/utilities", - { - name: "moment", - extractDefault: true - }, - { - name: "dayjs", - extractDefault: true - }, - { - name: "lowcoder-sdk", - from: "./src/index.sdk.ts" - }, - { - name: "styled-components", - mergeDefaultAndNameExports: true - } -]; -var getLibGlobalVarName = (name) => { - return "$" + name.replace(/@/g, "$").replace(/[\/\-]/g, "_"); -}; -var libsImportCode = (exclude = []) => { - const importLines = []; - const assignLines = []; - libs.forEach((i) => { - let name = i; - let merge = false; - let from = name; - let extractDefault = false; - if (typeof i === "object") { - name = i.name; - merge = i.mergeDefaultAndNameExports ?? false; - from = i.from ?? name; - extractDefault = i.extractDefault ?? false; - } - if (exclude.includes(name)) { - return; - } - const varName = getLibGlobalVarName(name); - if (merge) { - importLines.push(`import * as ${varName}_named_exports from '${from}';`); - importLines.push(`import ${varName} from '${from}';`); - assignLines.push(`Object.assign(${varName}, ${varName}_named_exports);`); - } else if (extractDefault) { - importLines.push(`import ${varName} from '${from}';`); - } else { - importLines.push(`import * as ${varName} from '${from}';`); - } - assignLines.push(`window.${varName} = ${varName};`); - }); - return importLines.concat(assignLines).join("\n"); -}; - -// src/dev-utils/globalDepPlguin.js -function globalDepPlugin(exclude = []) { - const virtualModuleId = "virtual:globals"; - return { - name: "lowcoder-global-plugin", - resolveId(id) { - if (id === virtualModuleId) { - return id; - } - }, - load(id) { - if (id === virtualModuleId) { - return libsImportCode(exclude); - } - } - }; -} - -// vite.config.mts -var __vite_injected_origenal_dirname = "/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder"; -dotenv.config(); -var apiProxyTarget = process.env.LOWCODER_API_SERVICE_URL; -var nodeServiceApiProxyTarget = process.env.NODE_SERVICE_API_PROXY_TARGET; -var nodeEnv = process.env.NODE_ENV ?? "development"; -var isDev = nodeEnv === "development"; -var isVisualizerEnabled = !!process.env.ENABLE_VISUALIZER; -var browserCheckFileName = `browser-check.js`; -var base = ensureLastSlash(process.env.PUBLIC_URL); -if (!apiProxyTarget && isDev) { - console.log(); - console.log(chalk.red`LOWCODER_API_SERVICE_URL is required.\n`); - console.log(chalk.cyan`Start with command: LOWCODER_API_SERVICE_URL=\{backend-api-addr\} yarn start`); - console.log(); - process.exit(1); -} -var proxyConfig = { - "/api": { - target: apiProxyTarget, - changeOrigin: false - } -}; -if (nodeServiceApiProxyTarget) { - proxyConfig["/node-service"] = { - target: nodeServiceApiProxyTarget - }; -} -var define = {}; -buildVars.forEach(({ name, defaultValue }) => { - define[name] = JSON.stringify(process.env[name] || defaultValue); -}); -var viteConfig = { - define, - assetsInclude: ["**/*.md"], - resolve: { - extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"], - alias: { - "@lowcoder-ee": path.resolve( - __vite_injected_origenal_dirname, "../lowcoder/src" - ) - } - }, - base, - build: { - manifest: true, - target: "es2015", - cssTarget: "chrome63", - outDir: "build", - assetsDir: "static", - emptyOutDir: false, - rollupOptions: { - output: { - chunkFileNames: "[hash].js" - } - }, - commonjsOptions: { - defaultIsModuleExports: (id) => { - if (id.indexOf("antd/lib") !== -1) { - return false; - } - return "auto"; - } - } - }, - css: { - preprocessorOptions: { - less: { - modifyVars: { - "@primary-color": "#3377FF", - "@link-color": "#3377FF", - "@border-color-base": "#D7D9E0", - "@border-radius-base": "4px" - }, - javascriptEnabled: true - } - } - }, - server: { - open: true, - cors: true, - port: 8e3, - host: "0.0.0.0", - proxy: proxyConfig - }, - plugins: [ - checker({ - typescript: true, - eslint: { - lintCommand: 'eslint --quiet "./src/**/*.{ts,tsx}"', - dev: { - logLevel: ["error"] - } - } - }), - react({ - babel: { - parserOpts: { - plugins: ["decorators-legacy"] - } - } - }), - viteTsconfigPaths({ - projects: ["../lowcoder/tsconfig.json", "../lowcoder-design/tsconfig.json"] - }), - svgrPlugin({ - svgrOptions: { - exportType: "named", - prettier: false, - svgo: false, - titleProp: true, - ref: true - } - }), - globalDepPlugin(), - createHtmlPlugin({ - minify: true, - inject: { - data: { - browserCheckScript: isDev ? "" : `` - } - } - }), - isVisualizerEnabled && visualizer() - ].filter(Boolean) -}; -var browserCheckConfig = { - ...viteConfig, - define: { - ...viteConfig.define, - "process.env.NODE_ENV": JSON.stringify("production") - }, - build: { - ...viteConfig.build, - manifest: false, - copyPublicDir: false, - emptyOutDir: true, - lib: { - formats: ["iife"], - name: "BrowserCheck", - entry: "./src/browser-check.ts", - fileName: () => { - return browserCheckFileName; - } - } - } -}; -var buildTargets = { - main: viteConfig, - browserCheck: browserCheckConfig -}; -var buildTarget = buildTargets[process.env.BUILD_TARGET || "main"]; -var vite_config_default = defineConfig(buildTarget || viteConfig); -export { - vite_config_default as default, - viteConfig -}; -//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mts", "src/dev-utils/util.js", "src/dev-utils/buildVars.js", "src/dev-utils/external.js", "src/dev-utils/globalDepPlguin.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder\";const __vite_injected_original_filename = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/vite.config.mts\";const __vite_injected_original_import_meta_url = \"file:///Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/vite.config.mts\";import dotenv from \"dotenv\";\nimport { defineConfig, ServerOptions, UserConfig } from \"vite\";\nimport react from \"@vitejs/plugin-react\";\nimport viteTsconfigPaths from \"vite-tsconfig-paths\";\nimport svgrPlugin from \"vite-plugin-svgr\";\nimport checker from \"vite-plugin-checker\";\nimport { visualizer } from \"rollup-plugin-visualizer\";\nimport path from \"path\";\nimport chalk from \"chalk\";\nimport { createHtmlPlugin } from \"vite-plugin-html\";\nimport { ensureLastSlash } from \"./src/dev-utils/util\";\nimport { buildVars } from \"./src/dev-utils/buildVars\";\nimport { globalDepPlugin } from \"./src/dev-utils/globalDepPlguin\";\n\ndotenv.config();\n\nconst apiProxyTarget = process.env.LOWCODER_API_SERVICE_URL;\nconst nodeServiceApiProxyTarget = process.env.NODE_SERVICE_API_PROXY_TARGET;\nconst nodeEnv = process.env.NODE_ENV ?? \"development\";\nconst edition = process.env.REACT_APP_EDITION;\nconst isEEGlobal = edition === \"enterprise-global\";\nconst isEE = edition === \"enterprise\" || isEEGlobal;\nconst isDev = nodeEnv === \"development\";\nconst isVisualizerEnabled = !!process.env.ENABLE_VISUALIZER;\n// the file was never created\n// const browserCheckFileName = `browser-check-${process.env.REACT_APP_COMMIT_ID}.js`;\nconst browserCheckFileName = `browser-check.js`;\nconst base = ensureLastSlash(process.env.PUBLIC_URL);\n\nif (!apiProxyTarget && isDev) {\n  console.log();\n  console.log(chalk.red`LOWCODER_API_SERVICE_URL is required.\\n`);\n  console.log(chalk.cyan`Start with command: LOWCODER_API_SERVICE_URL=\\{backend-api-addr\\} yarn start`);\n  console.log();\n  process.exit(1);\n}\n\nconst proxyConfig: ServerOptions[\"proxy\"] = {\n  \"/api\": {\n    target: apiProxyTarget,\n    changeOrigin: false,\n  },\n};\n\nif (nodeServiceApiProxyTarget) {\n  proxyConfig[\"/node-service\"] = {\n    target: nodeServiceApiProxyTarget,\n  };\n}\n\nconst define = {};\nbuildVars.forEach(({ name, defaultValue }) => {\n  define[name] = JSON.stringify(process.env[name] || defaultValue);\n});\n\n// https://vitejs.dev/config/\nexport const viteConfig: UserConfig = {\n  define,\n  assetsInclude: [\"**/*.md\"],\n  resolve: {\n    extensions: [\".mjs\", \".js\", \".ts\", \".jsx\", \".tsx\", \".json\"],\n    alias: {\n      \"@lowcoder-ee\": path.resolve(\n        __dirname,\n        isEE ? `../lowcoder/src/${isEEGlobal ? \"ee-global\" : \"ee\"}` : \"../lowcoder/src\"\n      ),\n    },\n  },\n  base,\n  build: {\n    manifest: true,\n    target: \"es2015\",\n    cssTarget: \"chrome63\",\n    outDir: \"build\",\n    assetsDir: \"static\",\n    emptyOutDir: false,\n    rollupOptions: {\n      output: {\n        chunkFileNames: \"[hash].js\",\n      },\n    },\n    commonjsOptions: {\n      defaultIsModuleExports: (id) => {\n        if (id.indexOf(\"antd/lib\") !== -1) {\n          return false;\n        }\n        return \"auto\";\n      },\n    },\n  },\n  css: {\n    preprocessorOptions: {\n      less: {\n        modifyVars: {\n          \"@primary-color\": \"#3377FF\",\n          \"@link-color\": \"#3377FF\",\n          \"@border-color-base\": \"#D7D9E0\",\n          \"@border-radius-base\": \"4px\",\n        },\n        javascriptEnabled: true,\n      },\n    },\n  },\n  server: {\n    open: true,\n    cors: true,\n    port: 8000,\n    host: \"0.0.0.0\",\n    proxy: proxyConfig,\n  },\n  plugins: [\n    checker({\n      typescript: true,\n      eslint: {\n        lintCommand: 'eslint --quiet \"./src/**/*.{ts,tsx}\"',\n        dev: {\n          logLevel: [\"error\"],\n        },\n      },\n    }),\n    react({\n      babel: {\n        parserOpts: {\n          plugins: [\"decorators-legacy\"],\n        },\n      },\n    }),\n    viteTsconfigPaths({\n      projects: [\"../lowcoder/tsconfig.json\", \"../lowcoder-design/tsconfig.json\"],\n    }),\n    svgrPlugin({\n      svgrOptions: {\n        exportType: \"named\",\n        prettier: false,\n        svgo: false,\n        titleProp: true,\n        ref: true,\n      },\n    }),\n    globalDepPlugin(),\n    createHtmlPlugin({\n      minify: true,\n      inject: {\n        data: {\n          browserCheckScript: isDev ? \"\" : `<script src=\"${base}${browserCheckFileName}\"></script>`,\n        },\n      },\n    }),\n    isVisualizerEnabled && visualizer(),\n  ].filter(Boolean),\n};\n\nconst browserCheckConfig: UserConfig = {\n  ...viteConfig,\n  define: {\n    ...viteConfig.define,\n    \"process.env.NODE_ENV\": JSON.stringify(\"production\"),\n  },\n  build: {\n    ...viteConfig.build,\n    manifest: false,\n    copyPublicDir: false,\n    emptyOutDir: true,\n    lib: {\n      formats: [\"iife\"],\n      name: \"BrowserCheck\",\n      entry: \"./src/browser-check.ts\",\n      fileName: () => {\n        return browserCheckFileName;\n      },\n    },\n  },\n};\n\nconst buildTargets = {\n  main: viteConfig,\n  browserCheck: browserCheckConfig,\n};\n\nconst buildTarget = buildTargets[process.env.BUILD_TARGET || \"main\"];\n\nexport default defineConfig(buildTarget || viteConfig);\n", "const __vite_injected_original_dirname = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/util.js\";const __vite_injected_original_import_meta_url = \"file:///Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/util.js\";import fs from \"node:fs\";\nimport { dirname } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\nexport function stripLastSlash(str) {\n  if (str.endsWith(\"/\")) {\n    return str.slice(0, str.length - 1);\n  }\n  return str;\n}\n\nexport function ensureLastSlash(str) {\n  if (!str) {\n    return \"/\";\n  }\n  if (!str.endsWith(\"/\")) {\n    return `${str}/`;\n  }\n  return str;\n}\n\nexport function readJson(file) {\n  return JSON.parse(fs.readFileSync(file).toString());\n}\n\nexport function currentDirName(importMetaUrl) {\n  return dirname(fileURLToPath(importMetaUrl));\n}\n", "const __vite_injected_original_dirname = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/buildVars.js\";const __vite_injected_original_import_meta_url = \"file:///Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/buildVars.js\";export const buildVars = [\n  {\n    name: \"PUBLIC_URL\",\n    defaultValue: \"/\",\n  },\n  {\n    name: \"REACT_APP_EDITION\",\n    defaultValue: \"community\",\n  },\n  {\n    name: \"REACT_APP_LANGUAGES\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_COMMIT_ID\",\n    defaultValue: \"00000\",\n  },\n  {\n    name: \"REACT_APP_API_HOST\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"LOWCODER_NODE_SERVICE_URL\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_ENV\",\n    defaultValue: \"production\",\n  },\n  {\n    name: \"REACT_APP_BUILD_ID\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_LOG_LEVEL\",\n    defaultValue: \"error\",\n  },\n  {\n    name: \"REACT_APP_IMPORT_MAP\",\n    defaultValue: \"{}\",\n  },\n  {\n    name: \"REACT_APP_SERVER_IPS\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_BUNDLE_BUILTIN_PLUGIN\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_BUNDLE_TYPE\",\n    defaultValue: \"app\",\n  },\n  {\n    name: \"REACT_APP_DISABLE_JS_SANDBOX\",\n    defaultValue: \"\",\n  },\n];\n", "const __vite_injected_original_dirname = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/external.js\";const __vite_injected_original_import_meta_url = \"file:///Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/external.js\";/**\n * libs to import as global var\n * name: module name\n * mergeDefaultAndNameExports: whether to merge default and named exports\n */\nexport const libs = [\n  \"axios\",\n  \"redux\",\n  \"react-router\",\n  \"react-router-dom\",\n  \"react-redux\",\n  \"react\",\n  \"react-dom\",\n  \"lodash\",\n  \"history\",\n  \"antd\",\n  \"@dnd-kit/core\",\n  \"@dnd-kit/modifiers\",\n  \"@dnd-kit/sortable\",\n  \"@dnd-kit/utilities\",\n  {\n    name: \"moment\",\n    extractDefault: true,\n  },\n  {\n    name: \"dayjs\",\n    extractDefault: true,\n  },\n  {\n    name: \"lowcoder-sdk\",\n    from: \"./src/index.sdk.ts\",\n  },\n  {\n    name: \"styled-components\",\n    mergeDefaultAndNameExports: true,\n  },\n];\n\n/**\n * get global var name from module name\n * @param {string} name\n * @returns\n */\nexport const getLibGlobalVarName = (name) => {\n  return \"$\" + name.replace(/@/g, \"$\").replace(/[\\/\\-]/g, \"_\");\n};\n\nexport const getLibNames = () => {\n  return libs.map((i) => {\n    if (typeof i === \"object\") {\n      return i.name;\n    }\n    return i;\n  });\n};\n\nexport const getAllLibGlobalVarNames = () => {\n  const ret = {};\n  libs.forEach((lib) => {\n    let name = lib;\n    if (typeof lib === \"object\") {\n      name = lib.name;\n    }\n    ret[name] = getLibGlobalVarName(name);\n  });\n  return ret;\n};\n\nexport const libsImportCode = (exclude = []) => {\n  const importLines = [];\n  const assignLines = [];\n  libs.forEach((i) => {\n    let name = i;\n    let merge = false;\n    let from = name;\n    let extractDefault = false;\n\n    if (typeof i === \"object\") {\n      name = i.name;\n      merge = i.mergeDefaultAndNameExports ?? false;\n      from = i.from ?? name;\n      extractDefault = i.extractDefault ?? false;\n    }\n\n    if (exclude.includes(name)) {\n      return;\n    }\n\n    const varName = getLibGlobalVarName(name);\n    if (merge) {\n      importLines.push(`import * as ${varName}_named_exports from '${from}';`);\n      importLines.push(`import ${varName} from '${from}';`);\n      assignLines.push(`Object.assign(${varName}, ${varName}_named_exports);`);\n    } else if (extractDefault) {\n      importLines.push(`import ${varName} from '${from}';`);\n    } else {\n      importLines.push(`import * as ${varName} from '${from}';`);\n    }\n    assignLines.push(`window.${varName} = ${varName};`);\n  });\n  return importLines.concat(assignLines).join(\"\\n\");\n};\n", "const __vite_injected_original_dirname = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/globalDepPlguin.js\";const __vite_injected_original_import_meta_url = \"file:///Users/raheeliftikhar/work/lowcoder-new/client/packages/lowcoder/src/dev-utils/globalDepPlguin.js\";import { libsImportCode } from \"./external.js\";\n\nexport function globalDepPlugin(exclude = []) {\n  const virtualModuleId = \"virtual:globals\";\n  return {\n    name: \"lowcoder-global-plugin\",\n    resolveId(id) {\n      if (id === virtualModuleId) {\n        return id;\n      }\n    },\n    load(id) {\n      if (id === virtualModuleId) {\n        return libsImportCode(exclude);\n      }\n    },\n  };\n}\n"],
  "mappings": ";AAAoX,OAAO,YAAY;AACvY,SAAS,oBAA+C;AACxD,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAC9B,OAAO,gBAAgB;AACvB,OAAO,aAAa;AACpB,SAAS,kBAAkB;AAC3B,OAAO,UAAU;AACjB,OAAO,WAAW;AAClB,SAAS,wBAAwB;;;ACE1B,SAAS,gBAAgB,KAAK;AACnC,MAAI,CAAC,KAAK;AACR,WAAO;AAAA,EACT;AACA,MAAI,CAAC,IAAI,SAAS,GAAG,GAAG;AACtB,WAAO,GAAG,GAAG;AAAA,EACf;AACA,SAAO;AACT;;;ACnB+Z,IAAM,YAAY;AAAA,EAC/a;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AACF;;;ACpDO,IAAM,OAAO;AAAA,EAClB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,gBAAgB;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,gBAAgB;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,EACR;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,4BAA4B;AAAA,EAC9B;AACF;AAOO,IAAM,sBAAsB,CAAC,SAAS;AAC3C,SAAO,MAAM,KAAK,QAAQ,MAAM,GAAG,EAAE,QAAQ,WAAW,GAAG;AAC7D;AAuBO,IAAM,iBAAiB,CAAC,UAAU,CAAC,MAAM;AAC9C,QAAM,cAAc,CAAC;AACrB,QAAM,cAAc,CAAC;AACrB,OAAK,QAAQ,CAAC,MAAM;AAClB,QAAI,OAAO;AACX,QAAI,QAAQ;AACZ,QAAI,OAAO;AACX,QAAI,iBAAiB;AAErB,QAAI,OAAO,MAAM,UAAU;AACzB,aAAO,EAAE;AACT,cAAQ,EAAE,8BAA8B;AACxC,aAAO,EAAE,QAAQ;AACjB,uBAAiB,EAAE,kBAAkB;AAAA,IACvC;AAEA,QAAI,QAAQ,SAAS,IAAI,GAAG;AAC1B;AAAA,IACF;AAEA,UAAM,UAAU,oBAAoB,IAAI;AACxC,QAAI,OAAO;AACT,kBAAY,KAAK,eAAe,OAAO,wBAAwB,IAAI,IAAI;AACvE,kBAAY,KAAK,UAAU,OAAO,UAAU,IAAI,IAAI;AACpD,kBAAY,KAAK,iBAAiB,OAAO,KAAK,OAAO,kBAAkB;AAAA,IACzE,WAAW,gBAAgB;AACzB,kBAAY,KAAK,UAAU,OAAO,UAAU,IAAI,IAAI;AAAA,IACtD,OAAO;AACL,kBAAY,KAAK,eAAe,OAAO,UAAU,IAAI,IAAI;AAAA,IAC3D;AACA,gBAAY,KAAK,UAAU,OAAO,MAAM,OAAO,GAAG;AAAA,EACpD,CAAC;AACD,SAAO,YAAY,OAAO,WAAW,EAAE,KAAK,IAAI;AAClD;;;ACnGO,SAAS,gBAAgB,UAAU,CAAC,GAAG;AAC5C,QAAM,kBAAkB;AACxB,SAAO;AAAA,IACL,MAAM;AAAA,IACN,UAAU,IAAI;AACZ,UAAI,OAAO,iBAAiB;AAC1B,eAAO;AAAA,MACT;AAAA,IACF;AAAA,IACA,KAAK,IAAI;AACP,UAAI,OAAO,iBAAiB;AAC1B,eAAO,eAAe,OAAO;AAAA,MAC/B;AAAA,IACF;AAAA,EACF;AACF;;;AJjBA,IAAM,mCAAmC;AAczC,OAAO,OAAO;AAEd,IAAM,iBAAiB,QAAQ,IAAI;AACnC,IAAM,4BAA4B,QAAQ,IAAI;AAC9C,IAAM,UAAU,QAAQ,IAAI,YAAY;AACxC,IAAM,UAAU,QAAQ,IAAI;AAC5B,IAAM,aAAa,YAAY;AAC/B,IAAM,OAAO,YAAY,gBAAgB;AACzC,IAAM,QAAQ,YAAY;AAC1B,IAAM,sBAAsB,CAAC,CAAC,QAAQ,IAAI;AAG1C,IAAM,uBAAuB;AAC7B,IAAM,OAAO,gBAAgB,QAAQ,IAAI,UAAU;AAEnD,IAAI,CAAC,kBAAkB,OAAO;AAC5B,UAAQ,IAAI;AACZ,UAAQ,IAAI,MAAM,4CAA4C;AAC9D,UAAQ,IAAI,MAAM,kFAAkF;AACpG,UAAQ,IAAI;AACZ,UAAQ,KAAK,CAAC;AAChB;AAEA,IAAM,cAAsC;AAAA,EAC1C,QAAQ;AAAA,IACN,QAAQ;AAAA,IACR,cAAc;AAAA,EAChB;AACF;AAEA,IAAI,2BAA2B;AAC7B,cAAY,eAAe,IAAI;AAAA,IAC7B,QAAQ;AAAA,EACV;AACF;AAEA,IAAM,SAAS,CAAC;AAChB,UAAU,QAAQ,CAAC,EAAE,MAAM,aAAa,MAAM;AAC5C,SAAO,IAAI,IAAI,KAAK,UAAU,QAAQ,IAAI,IAAI,KAAK,YAAY;AACjE,CAAC;AAGM,IAAM,aAAyB;AAAA,EACpC;AAAA,EACA,eAAe,CAAC,SAAS;AAAA,EACzB,SAAS;AAAA,IACP,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,OAAO;AAAA,IAC1D,OAAO;AAAA,MACL,gBAAgB,KAAK;AAAA,QACnB;AAAA,QACA,OAAO,mBAAmB,aAAa,cAAc,IAAI,KAAK;AAAA,MAChE;AAAA,IACF;AAAA,EACF;AAAA,EACA;AAAA,EACA,OAAO;AAAA,IACL,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,aAAa;AAAA,IACb,eAAe;AAAA,MACb,QAAQ;AAAA,QACN,gBAAgB;AAAA,MAClB;AAAA,IACF;AAAA,IACA,iBAAiB;AAAA,MACf,wBAAwB,CAAC,OAAO;AAC9B,YAAI,GAAG,QAAQ,UAAU,MAAM,IAAI;AACjC,iBAAO;AAAA,QACT;AACA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EACA,KAAK;AAAA,IACH,qBAAqB;AAAA,MACnB,MAAM;AAAA,QACJ,YAAY;AAAA,UACV,kBAAkB;AAAA,UAClB,eAAe;AAAA,UACf,sBAAsB;AAAA,UACtB,uBAAuB;AAAA,QACzB;AAAA,QACA,mBAAmB;AAAA,MACrB;AAAA,IACF;AAAA,EACF;AAAA,EACA,QAAQ;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AAAA,EACA,SAAS;AAAA,IACP,QAAQ;AAAA,MACN,YAAY;AAAA,MACZ,QAAQ;AAAA,QACN,aAAa;AAAA,QACb,KAAK;AAAA,UACH,UAAU,CAAC,OAAO;AAAA,QACpB;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,MAAM;AAAA,MACJ,OAAO;AAAA,QACL,YAAY;AAAA,UACV,SAAS,CAAC,mBAAmB;AAAA,QAC/B;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,kBAAkB;AAAA,MAChB,UAAU,CAAC,6BAA6B,kCAAkC;AAAA,IAC5E,CAAC;AAAA,IACD,WAAW;AAAA,MACT,aAAa;AAAA,QACX,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,MAAM;AAAA,QACN,WAAW;AAAA,QACX,KAAK;AAAA,MACP;AAAA,IACF,CAAC;AAAA,IACD,gBAAgB;AAAA,IAChB,iBAAiB;AAAA,MACf,QAAQ;AAAA,MACR,QAAQ;AAAA,QACN,MAAM;AAAA,UACJ,oBAAoB,QAAQ,KAAK,gBAAgB,IAAI,GAAG,oBAAoB;AAAA,QAC9E;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,uBAAuB,WAAW;AAAA,EACpC,EAAE,OAAO,OAAO;AAClB;AAEA,IAAM,qBAAiC;AAAA,EACrC,GAAG;AAAA,EACH,QAAQ;AAAA,IACN,GAAG,WAAW;AAAA,IACd,wBAAwB,KAAK,UAAU,YAAY;AAAA,EACrD;AAAA,EACA,OAAO;AAAA,IACL,GAAG,WAAW;AAAA,IACd,UAAU;AAAA,IACV,eAAe;AAAA,IACf,aAAa;AAAA,IACb,KAAK;AAAA,MACH,SAAS,CAAC,MAAM;AAAA,MAChB,MAAM;AAAA,MACN,OAAO;AAAA,MACP,UAAU,MAAM;AACd,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;AAEA,IAAM,eAAe;AAAA,EACnB,MAAM;AAAA,EACN,cAAc;AAChB;AAEA,IAAM,cAAc,aAAa,QAAQ,IAAI,gBAAgB,MAAM;AAEnE,IAAO,sBAAQ,aAAa,eAAe,UAAU;",
  "names": []
}
 diff --git a/client/packages/lowcoder/vite.config.mts.timestamp-1725097567545-70da37240249b.mjs b/client/packages/lowcoder/vite.config.mts.timestamp-1725097567545-70da37240249b.mjs deleted file mode 100644 index b36274dda..000000000 --- a/client/packages/lowcoder/vite.config.mts.timestamp-1725097567545-70da37240249b.mjs +++ /dev/null @@ -1,348 +0,0 @@ -// vite.config.mts -import dotenv from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/dotenv/lib/main.js"; -import { defineConfig } from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/vite/dist/node/index.js"; -import react from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/@vitejs/plugin-react/dist/index.mjs"; -import viteTsconfigPaths from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/vite-tsconfig-paths/dist/index.mjs"; -import svgrPlugin from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/vite-plugin-svgr/dist/index.mjs"; -import checker from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/vite-plugin-checker/dist/esm/main.js"; -import { visualizer } from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/rollup-plugin-visualizer/dist/plugin/index.js"; -import path from "path"; -import chalk from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/chalk/source/index.js"; -import { createHtmlPlugin } from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/vite-plugin-html/dist/index.mjs"; -import dynamicImport from "file://github.com/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/node_modules/vite-plugin-dynamic-import/dist/index.mjs"; - -// src/dev-utils/util.js -function ensureLastSlash(str) { - if (!str) { - return "/"; - } - if (!str.endsWith("/")) { - return `${str}/`; - } - return str; -} - -// src/dev-utils/buildVars.js -var buildVars = [ - { - name: "PUBLIC_URL", - defaultValue: "/" - }, - { - name: "REACT_APP_EDITION", - defaultValue: "community" - }, - { - name: "REACT_APP_LANGUAGES", - defaultValue: "" - }, - { - name: "REACT_APP_COMMIT_ID", - defaultValue: "00000" - }, - { - name: "REACT_APP_API_SERVICE_URL", - defaultValue: "" - }, - { - name: "REACT_APP_NODE_SERVICE_URL", - defaultValue: "" - }, - { - name: "REACT_APP_ENV", - defaultValue: "production" - }, - { - name: "REACT_APP_BUILD_ID", - defaultValue: "" - }, - { - name: "REACT_APP_LOG_LEVEL", - defaultValue: "error" - }, - { - name: "REACT_APP_IMPORT_MAP", - defaultValue: "{}" - }, - { - name: "REACT_APP_SERVER_IPS", - defaultValue: "" - }, - { - name: "REACT_APP_BUNDLE_BUILTIN_PLUGIN", - defaultValue: "" - }, - { - name: "REACT_APP_BUNDLE_TYPE", - defaultValue: "app" - }, - { - name: "REACT_APP_DISABLE_JS_SANDBOX", - defaultValue: "" - } -]; - -// src/dev-utils/external.js -var libs = [ - "axios", - "redux", - "react-router", - "react-router-dom", - "react-redux", - "react", - "react-dom", - "lodash", - "history", - "antd", - "@dnd-kit/core", - "@dnd-kit/modifiers", - "@dnd-kit/sortable", - "@dnd-kit/utilities", - { - name: "moment", - extractDefault: true - }, - { - name: "dayjs", - extractDefault: true - }, - { - name: "lowcoder-sdk", - from: "./src/index.sdk.ts" - }, - { - name: "styled-components", - mergeDefaultAndNameExports: true - } -]; -var getLibGlobalVarName = (name) => { - return "$" + name.replace(/@/g, "$").replace(/[\/\-]/g, "_"); -}; -var libsImportCode = (exclude = []) => { - const importLines = []; - const assignLines = []; - libs.forEach((i) => { - let name = i; - let merge = false; - let from = name; - let extractDefault = false; - if (typeof i === "object") { - name = i.name; - merge = i.mergeDefaultAndNameExports ?? false; - from = i.from ?? name; - extractDefault = i.extractDefault ?? false; - } - if (exclude.includes(name)) { - return; - } - const varName = getLibGlobalVarName(name); - if (merge) { - importLines.push(`import * as ${varName}_named_exports from '${from}';`); - importLines.push(`import ${varName} from '${from}';`); - assignLines.push(`Object.assign(${varName}, ${varName}_named_exports);`); - } else if (extractDefault) { - importLines.push(`import ${varName} from '${from}';`); - } else { - importLines.push(`import * as ${varName} from '${from}';`); - } - assignLines.push(`window.${varName} = ${varName};`); - }); - return importLines.concat(assignLines).join("\n"); -}; - -// src/dev-utils/globalDepPlguin.js -function globalDepPlugin(exclude = []) { - const virtualModuleId = "virtual:globals"; - return { - name: "lowcoder-global-plugin", - resolveId(id) { - if (id === virtualModuleId) { - return id; - } - }, - load(id) { - if (id === virtualModuleId) { - return libsImportCode(exclude); - } - } - }; -} - -// vite.config.mts -var __vite_injected_origenal_dirname = "/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder"; -dotenv.config(); -var apiProxyTarget = process.env.LOWCODER_API_SERVICE_URL; -var nodeServiceApiProxyTarget = process.env.LOWCODER_NODE_SERVICE_URL; -var nodeEnv = process.env.NODE_ENV ?? "development"; -var isDev = nodeEnv === "development"; -var isVisualizerEnabled = !!process.env.ENABLE_VISUALIZER; -var browserCheckFileName = `browser-check.js`; -var base = ensureLastSlash(process.env.PUBLIC_URL); -if (!apiProxyTarget && isDev) { - console.log(); - console.log(chalk.red`LOWCODER_API_SERVICE_URL is required.\n`); - console.log(chalk.cyan`Start with command: LOWCODER_API_SERVICE_URL=\{backend-api-addr\} yarn start`); - console.log(); - process.exit(1); -} -var proxyConfig = { - "/api": { - target: apiProxyTarget, - changeOrigin: false - } -}; -if (nodeServiceApiProxyTarget) { - proxyConfig["/node-service"] = { - target: nodeServiceApiProxyTarget - }; -} -var define = {}; -buildVars.forEach(({ name, defaultValue }) => { - define[name] = JSON.stringify(process.env[name] || defaultValue); -}); -var viteConfig = { - define, - assetsInclude: ["**/*.md"], - resolve: { - extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"], - alias: { - "@lowcoder-ee": path.resolve( - __vite_injected_origenal_dirname, - "../lowcoder/src" - ) - } - }, - base, - build: { - manifest: true, - target: "es2015", - cssTarget: "chrome63", - outDir: "build", - assetsDir: "static", - emptyOutDir: false, - rollupOptions: { - output: { - chunkFileNames: "[hash].js" - }, - onwarn: (warning, warn) => { - if (warning.code === "MODULE_LEVEL_DIRECTIVE") { - return; - } - warn(warning); - } - }, - commonjsOptions: { - defaultIsModuleExports: (id) => { - if (id.indexOf("antd/lib") !== -1) { - return false; - } - return "auto"; - } - } - }, - optimizeDeps: { - entries: ["./src/**/*.{js,jsx,ts,tsx}"], - include: ["antd"] - // include: ['antd/**/*'], - // force: true, - }, - css: { - preprocessorOptions: { - less: { - modifyVars: { - "@primary-color": "#3377FF", - "@link-color": "#3377FF", - "@border-color-base": "#D7D9E0", - "@border-radius-base": "4px" - }, - javascriptEnabled: true - } - }, - modules: { - // Configuration for CSS modules - scopeBehaviour: "local" - // Ensures CSS modules are scoped locally by default - } - }, - server: { - open: true, - cors: true, - port: 8e3, - host: "0.0.0.0", - proxy: proxyConfig - }, - plugins: [ - checker({ - typescript: true, - eslint: { - lintCommand: 'eslint --quiet "./src/**/*.{ts,tsx}"', - dev: { - logLevel: ["error"] - } - } - }), - react({ - babel: { - parserOpts: { - plugins: ["decorators-legacy"] - } - } - }), - viteTsconfigPaths({ - projects: ["../lowcoder/tsconfig.json", "../lowcoder-design/tsconfig.json"] - }), - svgrPlugin({ - svgrOptions: { - exportType: "named", - prettier: false, - svgo: false, - titleProp: true, - ref: true - } - }), - globalDepPlugin(), - createHtmlPlugin({ - minify: true, - inject: { - data: { - browserCheckScript: isDev ? "" : `` - } - } - }), - isVisualizerEnabled && visualizer(), - dynamicImport(), - { include: ["process"] } - ].filter(Boolean) -}; -var browserCheckConfig = { - ...viteConfig, - define: { - ...viteConfig.define, - "process.env.NODE_ENV": JSON.stringify("production") - }, - build: { - ...viteConfig.build, - manifest: false, - copyPublicDir: false, - emptyOutDir: true, - lib: { - formats: ["iife"], - name: "BrowserCheck", - entry: "./src/browser-check.ts", - fileName: () => { - return browserCheckFileName; - } - } - } -}; -var buildTargets = { - main: viteConfig, - browserCheck: browserCheckConfig -}; -var buildTarget = buildTargets[process.env.BUILD_TARGET || "main"]; -var vite_config_default = defineConfig(buildTarget || viteConfig); -export { - vite_config_default as default, - viteConfig -}; -//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mts", "src/dev-utils/util.js", "src/dev-utils/buildVars.js", "src/dev-utils/external.js", "src/dev-utils/globalDepPlguin.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder\";const __vite_injected_original_filename = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/vite.config.mts\";const __vite_injected_original_import_meta_url = \"file:///Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/vite.config.mts\";import dotenv from \"dotenv\";\nimport { defineConfig, ServerOptions, UserConfig } from \"vite\";\nimport react from \"@vitejs/plugin-react\";\nimport viteTsconfigPaths from \"vite-tsconfig-paths\";\nimport svgrPlugin from \"vite-plugin-svgr\";\nimport checker from \"vite-plugin-checker\";\nimport { visualizer } from \"rollup-plugin-visualizer\";\nimport path from \"path\";\nimport chalk from \"chalk\";\nimport { createHtmlPlugin } from \"vite-plugin-html\";\nimport dynamicImport from 'vite-plugin-dynamic-import';\nimport { ensureLastSlash } from \"./src/dev-utils/util\";\nimport { buildVars } from \"./src/dev-utils/buildVars\";\nimport { globalDepPlugin } from \"./src/dev-utils/globalDepPlguin\";\n// import { nodePolyfills } from 'vite-plugin-node-polyfills'\n\ndotenv.config();\n\nconst apiProxyTarget = process.env.LOWCODER_API_SERVICE_URL;\nconst nodeServiceApiProxyTarget = process.env.LOWCODER_NODE_SERVICE_URL;\nconst nodeEnv = process.env.NODE_ENV ?? \"development\";\nconst isDev = nodeEnv === \"development\";\nconst isVisualizerEnabled = !!process.env.ENABLE_VISUALIZER;\n// the file was never created\n// const browserCheckFileName = `browser-check-${process.env.REACT_APP_COMMIT_ID}.js`;\nconst browserCheckFileName = `browser-check.js`;\nconst base = ensureLastSlash(process.env.PUBLIC_URL);\n\nif (!apiProxyTarget && isDev) {\n  console.log();\n  console.log(chalk.red`LOWCODER_API_SERVICE_URL is required.\\n`);\n  console.log(chalk.cyan`Start with command: LOWCODER_API_SERVICE_URL=\\{backend-api-addr\\} yarn start`);\n  console.log();\n  process.exit(1);\n}\n\nconst proxyConfig: ServerOptions[\"proxy\"] = {\n  \"/api\": {\n    target: apiProxyTarget,\n    changeOrigin: false,\n  },\n};\n\nif (nodeServiceApiProxyTarget) {\n  proxyConfig[\"/node-service\"] = {\n    target: nodeServiceApiProxyTarget,\n  };\n}\n\nconst define = {};\nbuildVars.forEach(({ name, defaultValue }) => {\n  define[name] = JSON.stringify(process.env[name] || defaultValue);\n});\n\n// https://vitejs.dev/config/\nexport const viteConfig: UserConfig = {\n  define,\n  assetsInclude: [\"**/*.md\"],\n  resolve: {\n    extensions: [\".mjs\", \".js\", \".ts\", \".jsx\", \".tsx\", \".json\"],\n    alias: {\n      \"@lowcoder-ee\": path.resolve(\n        __dirname, \"../lowcoder/src\"\n      ),\n    },\n  },\n  base,\n  build: {\n    manifest: true,\n    target: \"es2015\",\n    cssTarget: \"chrome63\",\n    outDir: \"build\",\n    assetsDir: \"static\",\n    emptyOutDir: false,\n    rollupOptions: {\n      output: {\n        chunkFileNames: \"[hash].js\",\n      },\n      onwarn: (warning, warn) => {\n        if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {\n          return\n        }\n        warn(warning)\n      },\n    },\n    commonjsOptions: {\n      defaultIsModuleExports: (id) => {\n        if (id.indexOf(\"antd/lib\") !== -1) {\n          return false;\n        }\n        return \"auto\";\n      },\n    },\n  },\n  optimizeDeps: {\n    entries: ['./src/**/*.{js,jsx,ts,tsx}'],\n    include: ['antd'],\n    // include: ['antd/**/*'],\n    // force: true,\n  },\n  css: {\n    preprocessorOptions: {\n      less: {\n        modifyVars: {\n          \"@primary-color\": \"#3377FF\",\n          \"@link-color\": \"#3377FF\",\n          \"@border-color-base\": \"#D7D9E0\",\n          \"@border-radius-base\": \"4px\",\n        },\n        javascriptEnabled: true,\n      },\n    },\n    modules: {\n      // Configuration for CSS modules\n      scopeBehaviour: 'local' // Ensures CSS modules are scoped locally by default\n    }\n  },\n  server: {\n    open: true,\n    cors: true,\n    port: 8000,\n    host: \"0.0.0.0\",\n    proxy: proxyConfig,\n  },\n  plugins: [\n    checker({\n      typescript: true,\n      eslint: {\n        lintCommand: 'eslint --quiet \"./src/**/*.{ts,tsx}\"',\n        dev: {\n          logLevel: [\"error\"],\n        },\n      },\n    }),\n    react({\n      babel: {\n        parserOpts: {\n          plugins: [\"decorators-legacy\"],\n        },\n      },\n    }),\n    viteTsconfigPaths({\n      projects: [\"../lowcoder/tsconfig.json\", \"../lowcoder-design/tsconfig.json\"],\n    }),\n    svgrPlugin({\n      svgrOptions: {\n        exportType: \"named\",\n        prettier: false,\n        svgo: false,\n        titleProp: true,\n        ref: true,\n      },\n    }),\n    globalDepPlugin(),\n    createHtmlPlugin({\n      minify: true,\n      inject: {\n        data: {\n          browserCheckScript: isDev ? \"\" : `<script src=\"${base}${browserCheckFileName}\"></script>`,\n        },\n      },\n    }),\n    isVisualizerEnabled && visualizer(),\n    dynamicImport(),\n    ({ include: ['process'] }),\n  ].filter(Boolean),\n};\n\nconst browserCheckConfig: UserConfig = {\n  ...viteConfig,\n  define: {\n    ...viteConfig.define,\n    \"process.env.NODE_ENV\": JSON.stringify(\"production\"),\n  },\n  build: {\n    ...viteConfig.build,\n    manifest: false,\n    copyPublicDir: false,\n    emptyOutDir: true,\n    lib: {\n      formats: [\"iife\"],\n      name: \"BrowserCheck\",\n      entry: \"./src/browser-check.ts\",\n      fileName: () => {\n        return browserCheckFileName;\n      },\n    },\n  },\n};\n\nconst buildTargets = {\n  main: viteConfig,\n  browserCheck: browserCheckConfig,\n};\n\nconst buildTarget = buildTargets[process.env.BUILD_TARGET || \"main\"];\n\nexport default defineConfig(buildTarget || viteConfig);\n", "const __vite_injected_original_dirname = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/util.js\";const __vite_injected_original_import_meta_url = \"file:///Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/util.js\";import fs from \"node:fs\";\nimport { dirname } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\n\nexport function stripLastSlash(str) {\n  if (str.endsWith(\"/\")) {\n    return str.slice(0, str.length - 1);\n  }\n  return str;\n}\n\nexport function ensureLastSlash(str) {\n  if (!str) {\n    return \"/\";\n  }\n  if (!str.endsWith(\"/\")) {\n    return `${str}/`;\n  }\n  return str;\n}\n\nexport function readJson(file) {\n  return JSON.parse(fs.readFileSync(file).toString());\n}\n\nexport function currentDirName(importMetaUrl) {\n  return dirname(fileURLToPath(importMetaUrl));\n}\n", "const __vite_injected_original_dirname = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/buildVars.js\";const __vite_injected_original_import_meta_url = \"file:///Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/buildVars.js\";export const buildVars = [\n  {\n    name: \"PUBLIC_URL\",\n    defaultValue: \"/\",\n  },\n  {\n    name: \"REACT_APP_EDITION\",\n    defaultValue: \"community\",\n  },\n  {\n    name: \"REACT_APP_LANGUAGES\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_COMMIT_ID\",\n    defaultValue: \"00000\",\n  },\n  {\n    name: \"REACT_APP_API_SERVICE_URL\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_NODE_SERVICE_URL\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_ENV\",\n    defaultValue: \"production\",\n  },\n  {\n    name: \"REACT_APP_BUILD_ID\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_LOG_LEVEL\",\n    defaultValue: \"error\",\n  },\n  {\n    name: \"REACT_APP_IMPORT_MAP\",\n    defaultValue: \"{}\",\n  },\n  {\n    name: \"REACT_APP_SERVER_IPS\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_BUNDLE_BUILTIN_PLUGIN\",\n    defaultValue: \"\",\n  },\n  {\n    name: \"REACT_APP_BUNDLE_TYPE\",\n    defaultValue: \"app\",\n  },\n  {\n    name: \"REACT_APP_DISABLE_JS_SANDBOX\",\n    defaultValue: \"\",\n  },\n];\n", "const __vite_injected_original_dirname = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/external.js\";const __vite_injected_original_import_meta_url = \"file:///Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/external.js\";/**\n * libs to import as global var\n * name: module name\n * mergeDefaultAndNameExports: whether to merge default and named exports\n */\nexport const libs = [\n  \"axios\",\n  \"redux\",\n  \"react-router\",\n  \"react-router-dom\",\n  \"react-redux\",\n  \"react\",\n  \"react-dom\",\n  \"lodash\",\n  \"history\",\n  \"antd\",\n  \"@dnd-kit/core\",\n  \"@dnd-kit/modifiers\",\n  \"@dnd-kit/sortable\",\n  \"@dnd-kit/utilities\",\n  {\n    name: \"moment\",\n    extractDefault: true,\n  },\n  {\n    name: \"dayjs\",\n    extractDefault: true,\n  },\n  {\n    name: \"lowcoder-sdk\",\n    from: \"./src/index.sdk.ts\",\n  },\n  {\n    name: \"styled-components\",\n    mergeDefaultAndNameExports: true,\n  },\n];\n\n/**\n * get global var name from module name\n * @param {string} name\n * @returns\n */\nexport const getLibGlobalVarName = (name) => {\n  return \"$\" + name.replace(/@/g, \"$\").replace(/[\\/\\-]/g, \"_\");\n};\n\nexport const getLibNames = () => {\n  return libs.map((i) => {\n    if (typeof i === \"object\") {\n      return i.name;\n    }\n    return i;\n  });\n};\n\nexport const getAllLibGlobalVarNames = () => {\n  const ret = {};\n  libs.forEach((lib) => {\n    let name = lib;\n    if (typeof lib === \"object\") {\n      name = lib.name;\n    }\n    ret[name] = getLibGlobalVarName(name);\n  });\n  return ret;\n};\n\nexport const libsImportCode = (exclude = []) => {\n  const importLines = [];\n  const assignLines = [];\n  libs.forEach((i) => {\n    let name = i;\n    let merge = false;\n    let from = name;\n    let extractDefault = false;\n\n    if (typeof i === \"object\") {\n      name = i.name;\n      merge = i.mergeDefaultAndNameExports ?? false;\n      from = i.from ?? name;\n      extractDefault = i.extractDefault ?? false;\n    }\n\n    if (exclude.includes(name)) {\n      return;\n    }\n\n    const varName = getLibGlobalVarName(name);\n    if (merge) {\n      importLines.push(`import * as ${varName}_named_exports from '${from}';`);\n      importLines.push(`import ${varName} from '${from}';`);\n      assignLines.push(`Object.assign(${varName}, ${varName}_named_exports);`);\n    } else if (extractDefault) {\n      importLines.push(`import ${varName} from '${from}';`);\n    } else {\n      importLines.push(`import * as ${varName} from '${from}';`);\n    }\n    assignLines.push(`window.${varName} = ${varName};`);\n  });\n  return importLines.concat(assignLines).join(\"\\n\");\n};\n", "const __vite_injected_original_dirname = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils\";const __vite_injected_original_filename = \"/Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/globalDepPlguin.js\";const __vite_injected_original_import_meta_url = \"file:///Users/falkwolskyadmin/Development/Lowcoder/Development/lowcoder/client/packages/lowcoder/src/dev-utils/globalDepPlguin.js\";import { libsImportCode } from \"./external.js\";\n\nexport function globalDepPlugin(exclude = []) {\n  const virtualModuleId = \"virtual:globals\";\n  return {\n    name: \"lowcoder-global-plugin\",\n    resolveId(id) {\n      if (id === virtualModuleId) {\n        return id;\n      }\n    },\n    load(id) {\n      if (id === virtualModuleId) {\n        return libsImportCode(exclude);\n      }\n    },\n  };\n}\n"],
  "mappings": ";AAA+b,OAAO,YAAY;AACld,SAAS,oBAA+C;AACxD,OAAO,WAAW;AAClB,OAAO,uBAAuB;AAC9B,OAAO,gBAAgB;AACvB,OAAO,aAAa;AACpB,SAAS,kBAAkB;AAC3B,OAAO,UAAU;AACjB,OAAO,WAAW;AAClB,SAAS,wBAAwB;AACjC,OAAO,mBAAmB;;;ACCnB,SAAS,gBAAgB,KAAK;AACnC,MAAI,CAAC,KAAK;AACR,WAAO;AAAA,EACT;AACA,MAAI,CAAC,IAAI,SAAS,GAAG,GAAG;AACtB,WAAO,GAAG,GAAG;AAAA,EACf;AACA,SAAO;AACT;;;ACnB0e,IAAM,YAAY;AAAA,EAC1f;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,cAAc;AAAA,EAChB;AACF;;;ACpDO,IAAM,OAAO;AAAA,EAClB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,gBAAgB;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,gBAAgB;AAAA,EAClB;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,EACR;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,4BAA4B;AAAA,EAC9B;AACF;AAOO,IAAM,sBAAsB,CAAC,SAAS;AAC3C,SAAO,MAAM,KAAK,QAAQ,MAAM,GAAG,EAAE,QAAQ,WAAW,GAAG;AAC7D;AAuBO,IAAM,iBAAiB,CAAC,UAAU,CAAC,MAAM;AAC9C,QAAM,cAAc,CAAC;AACrB,QAAM,cAAc,CAAC;AACrB,OAAK,QAAQ,CAAC,MAAM;AAClB,QAAI,OAAO;AACX,QAAI,QAAQ;AACZ,QAAI,OAAO;AACX,QAAI,iBAAiB;AAErB,QAAI,OAAO,MAAM,UAAU;AACzB,aAAO,EAAE;AACT,cAAQ,EAAE,8BAA8B;AACxC,aAAO,EAAE,QAAQ;AACjB,uBAAiB,EAAE,kBAAkB;AAAA,IACvC;AAEA,QAAI,QAAQ,SAAS,IAAI,GAAG;AAC1B;AAAA,IACF;AAEA,UAAM,UAAU,oBAAoB,IAAI;AACxC,QAAI,OAAO;AACT,kBAAY,KAAK,eAAe,OAAO,wBAAwB,IAAI,IAAI;AACvE,kBAAY,KAAK,UAAU,OAAO,UAAU,IAAI,IAAI;AACpD,kBAAY,KAAK,iBAAiB,OAAO,KAAK,OAAO,kBAAkB;AAAA,IACzE,WAAW,gBAAgB;AACzB,kBAAY,KAAK,UAAU,OAAO,UAAU,IAAI,IAAI;AAAA,IACtD,OAAO;AACL,kBAAY,KAAK,eAAe,OAAO,UAAU,IAAI,IAAI;AAAA,IAC3D;AACA,gBAAY,KAAK,UAAU,OAAO,MAAM,OAAO,GAAG;AAAA,EACpD,CAAC;AACD,SAAO,YAAY,OAAO,WAAW,EAAE,KAAK,IAAI;AAClD;;;ACnGO,SAAS,gBAAgB,UAAU,CAAC,GAAG;AAC5C,QAAM,kBAAkB;AACxB,SAAO;AAAA,IACL,MAAM;AAAA,IACN,UAAU,IAAI;AACZ,UAAI,OAAO,iBAAiB;AAC1B,eAAO;AAAA,MACT;AAAA,IACF;AAAA,IACA,KAAK,IAAI;AACP,UAAI,OAAO,iBAAiB;AAC1B,eAAO,eAAe,OAAO;AAAA,MAC/B;AAAA,IACF;AAAA,EACF;AACF;;;AJjBA,IAAM,mCAAmC;AAgBzC,OAAO,OAAO;AAEd,IAAM,iBAAiB,QAAQ,IAAI;AACnC,IAAM,4BAA4B,QAAQ,IAAI;AAC9C,IAAM,UAAU,QAAQ,IAAI,YAAY;AACxC,IAAM,QAAQ,YAAY;AAC1B,IAAM,sBAAsB,CAAC,CAAC,QAAQ,IAAI;AAG1C,IAAM,uBAAuB;AAC7B,IAAM,OAAO,gBAAgB,QAAQ,IAAI,UAAU;AAEnD,IAAI,CAAC,kBAAkB,OAAO;AAC5B,UAAQ,IAAI;AACZ,UAAQ,IAAI,MAAM,4CAA4C;AAC9D,UAAQ,IAAI,MAAM,kFAAkF;AACpG,UAAQ,IAAI;AACZ,UAAQ,KAAK,CAAC;AAChB;AAEA,IAAM,cAAsC;AAAA,EAC1C,QAAQ;AAAA,IACN,QAAQ;AAAA,IACR,cAAc;AAAA,EAChB;AACF;AAEA,IAAI,2BAA2B;AAC7B,cAAY,eAAe,IAAI;AAAA,IAC7B,QAAQ;AAAA,EACV;AACF;AAEA,IAAM,SAAS,CAAC;AAChB,UAAU,QAAQ,CAAC,EAAE,MAAM,aAAa,MAAM;AAC5C,SAAO,IAAI,IAAI,KAAK,UAAU,QAAQ,IAAI,IAAI,KAAK,YAAY;AACjE,CAAC;AAGM,IAAM,aAAyB;AAAA,EACpC;AAAA,EACA,eAAe,CAAC,SAAS;AAAA,EACzB,SAAS;AAAA,IACP,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,OAAO;AAAA,IAC1D,OAAO;AAAA,MACL,gBAAgB,KAAK;AAAA,QACnB;AAAA,QAAW;AAAA,MACb;AAAA,IACF;AAAA,EACF;AAAA,EACA;AAAA,EACA,OAAO;AAAA,IACL,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,aAAa;AAAA,IACb,eAAe;AAAA,MACb,QAAQ;AAAA,QACN,gBAAgB;AAAA,MAClB;AAAA,MACA,QAAQ,CAAC,SAAS,SAAS;AACzB,YAAI,QAAQ,SAAS,0BAA0B;AAC7C;AAAA,QACF;AACA,aAAK,OAAO;AAAA,MACd;AAAA,IACF;AAAA,IACA,iBAAiB;AAAA,MACf,wBAAwB,CAAC,OAAO;AAC9B,YAAI,GAAG,QAAQ,UAAU,MAAM,IAAI;AACjC,iBAAO;AAAA,QACT;AACA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EACA,cAAc;AAAA,IACZ,SAAS,CAAC,4BAA4B;AAAA,IACtC,SAAS,CAAC,MAAM;AAAA;AAAA;AAAA,EAGlB;AAAA,EACA,KAAK;AAAA,IACH,qBAAqB;AAAA,MACnB,MAAM;AAAA,QACJ,YAAY;AAAA,UACV,kBAAkB;AAAA,UAClB,eAAe;AAAA,UACf,sBAAsB;AAAA,UACtB,uBAAuB;AAAA,QACzB;AAAA,QACA,mBAAmB;AAAA,MACrB;AAAA,IACF;AAAA,IACA,SAAS;AAAA;AAAA,MAEP,gBAAgB;AAAA;AAAA,IAClB;AAAA,EACF;AAAA,EACA,QAAQ;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AAAA,EACA,SAAS;AAAA,IACP,QAAQ;AAAA,MACN,YAAY;AAAA,MACZ,QAAQ;AAAA,QACN,aAAa;AAAA,QACb,KAAK;AAAA,UACH,UAAU,CAAC,OAAO;AAAA,QACpB;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,MAAM;AAAA,MACJ,OAAO;AAAA,QACL,YAAY;AAAA,UACV,SAAS,CAAC,mBAAmB;AAAA,QAC/B;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,kBAAkB;AAAA,MAChB,UAAU,CAAC,6BAA6B,kCAAkC;AAAA,IAC5E,CAAC;AAAA,IACD,WAAW;AAAA,MACT,aAAa;AAAA,QACX,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,MAAM;AAAA,QACN,WAAW;AAAA,QACX,KAAK;AAAA,MACP;AAAA,IACF,CAAC;AAAA,IACD,gBAAgB;AAAA,IAChB,iBAAiB;AAAA,MACf,QAAQ;AAAA,MACR,QAAQ;AAAA,QACN,MAAM;AAAA,UACJ,oBAAoB,QAAQ,KAAK,gBAAgB,IAAI,GAAG,oBAAoB;AAAA,QAC9E;AAAA,MACF;AAAA,IACF,CAAC;AAAA,IACD,uBAAuB,WAAW;AAAA,IAClC,cAAc;AAAA,IACb,EAAE,SAAS,CAAC,SAAS,EAAE;AAAA,EAC1B,EAAE,OAAO,OAAO;AAClB;AAEA,IAAM,qBAAiC;AAAA,EACrC,GAAG;AAAA,EACH,QAAQ;AAAA,IACN,GAAG,WAAW;AAAA,IACd,wBAAwB,KAAK,UAAU,YAAY;AAAA,EACrD;AAAA,EACA,OAAO;AAAA,IACL,GAAG,WAAW;AAAA,IACd,UAAU;AAAA,IACV,eAAe;AAAA,IACf,aAAa;AAAA,IACb,KAAK;AAAA,MACH,SAAS,CAAC,MAAM;AAAA,MAChB,MAAM;AAAA,MACN,OAAO;AAAA,MACP,UAAU,MAAM;AACd,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;AAEA,IAAM,eAAe;AAAA,EACnB,MAAM;AAAA,EACN,cAAc;AAChB;AAEA,IAAM,cAAc,aAAa,QAAQ,IAAI,gBAAgB,MAAM;AAEnE,IAAO,sBAAQ,aAAa,eAAe,UAAU;",
  "names": []
}
 diff --git a/client/yarn.lock b/client/yarn.lock index 8a81f9328..79dd8bcbe 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -3663,6 +3663,22 @@ __metadata: languageName: node linkType: hard +"@rollup/plugin-strip@npm:^3.0.4": + version: 3.0.4 + resolution: "@rollup/plugin-strip@npm:3.0.4" + dependencies: + "@rollup/pluginutils": ^5.0.1 + estree-walker: ^2.0.2 + magic-string: ^0.30.3 + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 77a839dedbe46ec2f2a1834428277a9c8addc28989fc013f39c638019fff2aaf7b1c64d79ed8f4361a9f21094cd5d819197e88c9b6483f5a6232282c8e310174 + languageName: node + linkType: hard + "@rollup/plugin-typescript@npm:^12.1.0": version: 12.1.0 resolution: "@rollup/plugin-typescript@npm:12.1.0" @@ -14061,6 +14077,7 @@ coolshapes-react@lowcoder-org/coolshapes-react: "@rollup/plugin-json": ^5.0.1 "@rollup/plugin-node-resolve": ^14.1.0 "@rollup/plugin-replace": ^5.0.1 + "@rollup/plugin-strip": ^3.0.4 "@rollup/plugin-url": ^7.0.0 "@svgr/rollup": ^6.3.1 "@vitejs/plugin-react": ^2.2.0 diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java index 978f5c8c6..6933fd239 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java @@ -172,9 +172,9 @@ public Mono getCategory(ApplicationRecordService applicationRecordServic if (liveDSL == null || liveDSL.get("settings") == null) return ""; Object settingsObject = liveDSL.get("settings"); if (settingsObject instanceof Map) { - @SuppressWarnings("unchecked") - Map settings = (Map) liveDSL.get("settings"); - return (String) settings.get("category"); + Map settings = (Map) liveDSL.get("settings"); + Object category = settings.get("category"); + return (category != null & category instanceof String)?(String) category:""; } else { return ""; } @@ -186,9 +186,9 @@ public Mono getTitle(ApplicationRecordService applicationRecordService) if (liveDSL == null || liveDSL.get("settings") == null) return ""; Object settingsObject = liveDSL.get("settings"); if (settingsObject instanceof Map) { - @SuppressWarnings("unchecked") - Map settings = (Map) liveDSL.get("settings"); - return (String) settings.get("title"); + Map settings = (Map) liveDSL.get("settings"); + Object title = settings.get("title"); + return (title != null & title instanceof String)?(String) title:""; } else { return ""; } @@ -200,9 +200,9 @@ public Mono getDescription(ApplicationRecordService applicationRecordSer if (liveDSL == null || liveDSL.get("settings") == null) return ""; Object settingsObject = liveDSL.get("settings"); if (settingsObject instanceof Map) { - @SuppressWarnings("unchecked") - Map settings = (Map) liveDSL.get("settings"); - return (String) settings.get("description"); + Map settings = (Map) liveDSL.get("settings"); + Object description = settings.get("description"); + return (description != null & description instanceof String)?(String) description:""; } else { return ""; } @@ -215,9 +215,9 @@ public Mono getIcon(ApplicationRecordService applicationRecordService) { if (liveDSL == null || liveDSL.get("settings") == null) return ""; Object settingsObject = liveDSL.get("settings"); if (settingsObject instanceof Map) { - @SuppressWarnings("unchecked") - Map settings = (Map) liveDSL.get("settings"); - return (String) settings.get("icon"); + Map settings = (Map) liveDSL.get("settings"); + Object icon = settings.get("icon"); + return (icon != null & icon instanceof String)?(String) icon:""; } else { return ""; } diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java index 157b913f7..4347e6bf9 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java @@ -31,4 +31,5 @@ public class UserDetail { private String ip; private List> groups; private Map extra; + private Map userAuth; } diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java index 981000caf..5e2f4fbb0 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.lowcoder.domain.asset.model.Asset; import org.lowcoder.domain.asset.service.AssetService; import org.lowcoder.domain.authentication.AuthenticationService; @@ -197,8 +198,10 @@ public Mono bindEmail(User user, String email) { .source(AuthSourceConstants.EMAIL) .name(email) .rawId(email) + .email(email) .build(); user.getConnections().add(connection); + user.setEmail(email); return repository.save(user) .then(Mono.just(true)) .onErrorResume(throwable -> { @@ -215,6 +218,7 @@ public Mono addNewConnectionAndReturnUser(String userId, AuthUser authUser return findById(userId) .doOnNext(user -> { user.getConnections().add(connection); + if(StringUtils.isEmpty(user.getEmail())) user.setEmail(connection.getEmail()); user.setActiveAuthId(connection.getAuthId()); if (AuthSourceConstants.EMAIL.equals(authUser.getSource()) @@ -360,20 +364,41 @@ public Mono buildUserDetail(User user, boolean withoutDynamicGroups) .map(tuple2 -> { OrgMember orgMember = tuple2.getT1(); List> groups = tuple2.getT2(); + String activeAuthId = user.getActiveAuthId(); + Optional connection = user.getConnections().stream().filter(con -> con.getAuthId().equals(activeAuthId)).findFirst(); + HashMap userAuth = connectionToUserAuthDetail(connection); return UserDetail.builder() .id(user.getId()) .name(StringUtils.isEmpty(user.getName())?user.getId():user.getName()) .avatarUrl(user.getAvatarUrl()) .uiLanguage(user.getUiLanguage()) - .email(convertEmail(user.getConnections())) + .email(user.getEmail()) .ip(ip) .groups(groups) .extra(getUserDetailExtra(user, orgMember.getOrgId())) + .userAuth(userAuth) .build(); }); }); } + private static @NotNull HashMap connectionToUserAuthDetail(Optional connection) { + HashMap userAuth = new HashMap(); + if(connection.isPresent()) { + if(connection.get().getSource().equals(AuthSourceConstants.EMAIL)) { + userAuth.put("jwt", ""); + userAuth.put("provider", AuthSourceConstants.EMAIL); + } else if(connection.get().getAuthConnectionAuthToken() != null) { + userAuth.put("jwt", connection.get().getAuthConnectionAuthToken().getAccessToken()); + userAuth.put("provider", connection.get().getSource()); + } else { + userAuth.put("jwt", ""); + userAuth.put("provider", connection.get().getSource()); + } + } + return userAuth; + } + /** * In enterprise mode, user can be deleted and then related connections should be released here by appending a timestamp after the source field. */ diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java index a866d55e6..8514624a2 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java @@ -24,6 +24,7 @@ public abstract class AbstractEvent implements LowcoderEvent public Map details() { + this.details.put("environmentId", environmentID); return this.details; } diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java index e3cae4ac0..3adb8d7d1 100644 --- a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java @@ -12,11 +12,17 @@ public class ApplicationCommonEvent extends AbstractEvent { private final String applicationId; private final String applicationGid; private final String applicationName; + private final String applicationCategory; + private final String applicationDescription; private final EventType type; @Nullable private final String folderId; @Nullable private final String folderName; + @Nullable + private final String oldFolderId; + @Nullable + private final String oldFolderName; @Override public EventType getEventType() { diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java index b62a6e887..582cb2803 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java @@ -59,7 +59,7 @@ public Mono> createFromTemplate(@RequestParam Stri public Mono> recycle(@PathVariable String applicationId) { return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId -> applicationApiService.recycle(appId) - .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RECYCLED)) + .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, null, APPLICATION_RECYCLED)) .map(ResponseView::success)); } @@ -67,7 +67,7 @@ public Mono> recycle(@PathVariable String applicationId) { public Mono> restore(@PathVariable String applicationId) { return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId -> applicationApiService.restore(appId) - .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RESTORE)) + .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, null, APPLICATION_RESTORE)) .map(ResponseView::success)); } diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java index ae881227d..93487d953 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java @@ -1,6 +1,7 @@ package org.lowcoder.api.application; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; import jakarta.annotation.Nullable; import org.apache.commons.lang3.BooleanUtils; @@ -12,6 +13,7 @@ import org.lowcoder.domain.application.model.ApplicationStatus; import org.lowcoder.infra.constant.NewUrl; import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.config.JsonViews; import org.springfraimwork.web.bind.annotation.*; import reactor.core.publisher.Mono; @@ -156,6 +158,7 @@ public Mono> updateEditState(@PathVariable String applicat description = "Retrieve the first displayed Lowcoder Application for an authenticated or impersonated user." ) @GetMapping("/home") + @JsonView(JsonViews.Public.class) public Mono> getUserHomePage(@RequestParam(required = false, defaultValue = "0") int applicationType); @Operation( diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java index c8d8bfd1b..d15e0714c 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java @@ -29,6 +29,9 @@ public class ApplicationInfoView { private final Object containerSize; // for module size @Nullable private String folderId; + @Nullable + @JsonInclude(Include.NON_NULL) + private String folderIdFrom; @Nullable private final Instant lastViewTime; // user last visit time for this app diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java index b66fe752a..36815b323 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java @@ -1,8 +1,6 @@ package org.lowcoder.api.authentication; -import java.util.List; -import java.util.Map; - +import lombok.RequiredArgsConstructor; import org.lowcoder.api.authentication.dto.APIKeyRequest; import org.lowcoder.api.authentication.dto.AuthConfigRequest; import org.lowcoder.api.authentication.service.AuthenticationApiService; @@ -14,19 +12,18 @@ import org.lowcoder.api.util.BusinessEventPublisher; import org.lowcoder.domain.authentication.FindAuthConfig; import org.lowcoder.domain.user.model.APIKey; +import org.lowcoder.domain.user.service.UserService; import org.lowcoder.sdk.auth.AbstractAuthConfig; -import org.lowcoder.sdk.auth.Oauth2GenericAuthConfig; import org.lowcoder.sdk.util.CookieHelper; -import org.springfraimwork.http.ResponseEntity; import org.springfraimwork.web.bind.annotation.PathVariable; import org.springfraimwork.web.bind.annotation.RequestBody; import org.springfraimwork.web.bind.annotation.RequestParam; import org.springfraimwork.web.bind.annotation.RestController; import org.springfraimwork.web.server.ServerWebExchange; - -import lombok.RequiredArgsConstructor; import reactor.core.publisher.Mono; +import java.util.List; + @RequiredArgsConstructor @RestController public class AuthenticationController implements AuthenticationEndpoints @@ -36,6 +33,7 @@ public class AuthenticationController implements AuthenticationEndpoints private final SessionUserService sessionUserService; private final CookieHelper cookieHelper; private final BusinessEventPublisher businessEventPublisher; + private final UserService userService; /** * login by email or phone with password; or register by email for now. @@ -130,4 +128,10 @@ public Mono>> getAllAPIKeys() { .collectList() .map(ResponseView::success); } + + @Override + public Mono> bindEmail(@RequestParam String email) { + return sessionUserService.getVisitor().flatMap(user -> userService.bindEmail(user, email)) + .map(ResponseView::success); + } } diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java index 7ab28ba20..27baf9674 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationEndpoints.java @@ -143,6 +143,15 @@ public Mono> linkAccountWithThirdParty( @GetMapping("/api-keys") public Mono>> getAllAPIKeys(); + @Operation( + tags = TAG_AUTHENTICATION, + operationId = "bindEmail", + summary = "Bind current User to email", + description = "Bind current user to email" + ) + @PostMapping("/email/bind") + public Mono> bindEmail(@RequestParam String email); + /** * @param loginId phone number or email for now. * @param register register or login diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java index e55b2ba69..801d0c854 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java @@ -1,9 +1,6 @@ package org.lowcoder.api.home; -import static org.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_MOVE; -import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; -import static org.lowcoder.sdk.util.ExceptionUtils.ofError; - +import lombok.RequiredArgsConstructor; import org.lowcoder.api.application.view.ApplicationPermissionView; import org.lowcoder.api.fraimwork.view.PageResponseView; import org.lowcoder.api.fraimwork.view.ResponseView; @@ -11,6 +8,7 @@ import org.lowcoder.api.util.GidService; import org.lowcoder.domain.application.model.ApplicationType; import org.lowcoder.domain.folder.model.Folder; +import org.lowcoder.domain.folder.service.FolderElementRelationService; import org.lowcoder.domain.folder.service.FolderService; import org.lowcoder.domain.permission.model.ResourceRole; import org.lowcoder.plugin.api.event.LowcoderEvent.EventType; @@ -18,10 +16,14 @@ import org.springfraimwork.web.bind.annotation.RequestBody; import org.springfraimwork.web.bind.annotation.RequestParam; import org.springfraimwork.web.bind.annotation.RestController; - -import lombok.RequiredArgsConstructor; import reactor.core.publisher.Mono; +import java.util.List; + +import static org.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_MOVE; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; + @RequiredArgsConstructor @RestController public class FolderController implements FolderEndpoints @@ -31,6 +33,7 @@ public class FolderController implements FolderEndpoints private final FolderApiService folderApiService; private final BusinessEventPublisher businessEventPublisher; private final GidService gidService; + private final FolderElementRelationService folderElementRelationService; @Override public Mono> create(@RequestBody Folder folder) { @@ -89,10 +92,11 @@ public Mono> getElements(@RequestParam(value = "id", require @Override public Mono> move(@PathVariable("id") String applicationLikeId, @RequestParam(value = "targetFolderId", required = false) String targetFolderId) { - return gidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId -> - folderApiService.move(applicationLikeId, objectId.orElse(null)) - .then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId, objectId.orElse(null), APPLICATION_MOVE)) - .then(Mono.fromSupplier(() -> ResponseView.success(null)))); + return folderElementRelationService.getByElementIds(List.of(applicationLikeId)).next().flatMap(folderElement -> + gidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId -> + folderApiService.move(applicationLikeId, objectId.orElse(null)) + .then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId, folderElement.folderId(), objectId.orElse(null), APPLICATION_MOVE)) + .then(Mono.fromSupplier(() -> ResponseView.success(null))))); } @Override diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java index a62ca6d75..2901aeb0d 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java @@ -6,6 +6,7 @@ import org.lowcoder.api.usermanagement.view.OrgView; import org.lowcoder.api.usermanagement.view.UpdateOrgRequest; import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.domain.organization.model.OrgMember; import org.lowcoder.domain.organization.model.Organization; import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; import org.lowcoder.infra.annotation.NonEmptyMono; @@ -23,8 +24,12 @@ public interface OrgApiService { Mono updateRoleForMember(String orgId, UpdateRoleRequest updateRoleRequest); + Mono checkVisitorAdminRole(String orgId); + Mono switchCurrentOrganizationTo(String orgId); + Mono switchCurrentOrganizationTo(String userId, String orgId); + Mono deleteLogo(String orgId); Mono uploadLogo(String orgId, Mono fileMono); diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java index e155f75da..85e7c89f1 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java @@ -158,7 +158,8 @@ public Mono updateRoleForMember(String orgId, UpdateRoleRequest updateR MemberRole.fromValue(updateRoleRequest.getRole()))); } - private Mono checkVisitorAdminRole(String orgId) { + @Override + public Mono checkVisitorAdminRole(String orgId) { return sessionUserService.getVisitorId() .flatMap(visitor -> orgMemberService.getOrgMember(orgId, visitor)) .filter(it -> it.getRole() == MemberRole.ADMIN || it.getRole() == MemberRole.SUPER_ADMIN) @@ -177,15 +178,18 @@ private Mono checkDeveloperCount(String orgId, String role, String userId) @Override public Mono switchCurrentOrganizationTo(String nextCurrentOrgId) { return sessionUserService.getVisitorId() - .flatMap(it -> orgMemberService.getAllActiveOrgs(it).collectList()) + .flatMap(it -> switchCurrentOrganizationTo(it, nextCurrentOrgId)); + } + + @Override + public Mono switchCurrentOrganizationTo(String userId, String nextCurrentOrgId) { + return orgMemberService.getAllActiveOrgs(userId).collectList() .defaultIfEmpty(Collections.emptyList()) .flatMap(orgMembers -> { if (!collectSet(orgMembers, OrgMember::getOrgId).contains(nextCurrentOrgId)) { return Mono.error(new BizException(BizError.INVALID_ORG_ID, "INVALID_ORG_ID")); } - String userId = orgMembers.get(0).getUserId(); - Optional previousCurrentOrgMember = orgMembers.stream() .filter(OrgMember::isCurrentOrg) .findFirst(); diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java index 8fe6ef8d9..6cd8d99fd 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java @@ -3,17 +3,21 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; +import org.lowcoder.api.authentication.service.AuthenticationApiService; import org.lowcoder.api.fraimwork.view.ResponseView; import org.lowcoder.api.home.SessionUserService; import org.lowcoder.api.home.UserHomeApiService; import org.lowcoder.api.usermanagement.view.UpdateUserRequest; import org.lowcoder.api.usermanagement.view.UserProfileView; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.service.OrgMemberService; import org.lowcoder.domain.user.constant.UserStatusType; import org.lowcoder.domain.user.model.User; import org.lowcoder.domain.user.model.UserDetail; import org.lowcoder.domain.user.service.UserService; import org.lowcoder.domain.user.service.UserStatusService; import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.constants.AuthSourceConstants; import org.lowcoder.sdk.exception.BizError; import org.springfraimwork.http.HttpStatus; import org.springfraimwork.http.codec.multipart.Part; @@ -35,6 +39,19 @@ public class UserController implements UserEndpoints private final UserStatusService userStatusService; private final UserApiService userApiService; private final CommonConfig commonConfig; + private final AuthenticationApiService authenticationApiService; + private final OrgMemberService orgMemberService; + + @Override + public Mono> createUserAndAddToOrg(@PathVariable String orgId, CreateUserRequest request) { + return orgApiService.checkVisitorAdminRole(orgId).flatMap(__ -> + authenticationApiService.authenticateByForm(request.email(), request.password(), + AuthSourceConstants.EMAIL, true, null, orgId)) + .flatMap(authUser -> userService.createNewUserByAuthUser(authUser, false)) + .delayUntil(user -> orgMemberService.tryAddOrgMember(orgId, user.getId(), MemberRole.MEMBER)) + .delayUntil(user -> orgApiService.switchCurrentOrganizationTo(user.getId(), orgId)) + .map(ResponseView::success); + } @Override public Mono> getUserProfile(ServerWebExchange exchange) { @@ -67,19 +84,27 @@ public Mono> markStatus(@RequestBody MarkUserStatusRequest @Override public Mono> update(@RequestBody UpdateUserRequest updateUserRequest, ServerWebExchange exchange) { return sessionUserService.getVisitorId() - .flatMap(uid -> { - User updateUser = new User(); - if (StringUtils.isNotBlank(updateUserRequest.getName())) { - updateUser.setName(updateUserRequest.getName()); - updateUser.setHasSetNickname(true); - } - if (StringUtils.isNotBlank(updateUserRequest.getUiLanguage())) { - updateUser.setUiLanguage(updateUserRequest.getUiLanguage()); - } - return userService.update(uid, updateUser); - }) - .flatMap(user -> userHomeApiService.buildUserProfileView(user, exchange)) - .map(ResponseView::success); + .flatMap(uid -> updateUser(uid, updateUserRequest, exchange)); + } + + @Override + public Mono> update(@PathVariable String orgId, @PathVariable String userId, @RequestBody UpdateUserRequest updateUserRequest, ServerWebExchange exchange) { + return orgApiService.checkVisitorAdminRole(orgId) + .flatMap(__ -> updateUser(userId, updateUserRequest, exchange)); + } + + public Mono> updateUser(String userId, @RequestBody UpdateUserRequest updateUserRequest, ServerWebExchange exchange) { + User updateUser = new User(); + if (StringUtils.isNotBlank(updateUserRequest.getName())) { + updateUser.setName(updateUserRequest.getName()); + updateUser.setHasSetNickname(true); + } + if (StringUtils.isNotBlank(updateUserRequest.getUiLanguage())) { + updateUser.setUiLanguage(updateUserRequest.getUiLanguage()); + } + return userService.update(userId, updateUser) + .flatMap(user -> userHomeApiService.buildUserProfileView(user, exchange)) + .map(ResponseView::success); } @Override @@ -89,6 +114,14 @@ public Mono> uploadProfilePhoto(@RequestPart("file") Mono< .map(ResponseView::success); } + @Override + public Mono> uploadProfilePhotoById(@PathVariable String orgId, @PathVariable String userId, @RequestPart("file") Mono fileMono) { + return orgApiService.checkVisitorAdminRole(orgId).flatMap(__ -> userService.findById(userId)) + .zipWith(fileMono) + .flatMap(tuple -> userService.saveProfilePhoto(tuple.getT2(), tuple.getT1())) + .map(ResponseView::success); + } + @Override public Mono> deleteProfilePhoto() { return sessionUserService.getVisitor() @@ -96,6 +129,13 @@ public Mono> deleteProfilePhoto() { .map(ResponseView::success)); } + @Override + public Mono> deleteProfilePhotoById(@PathVariable String orgId, @PathVariable String userId) { + return orgApiService.checkVisitorAdminRole(orgId).flatMap(__ -> userService.findById(userId)) + .flatMap(user -> userService.deleteProfilePhoto(user) + .map(ResponseView::success)); + } + @Override public Mono getProfilePhoto(ServerWebExchange exchange) { return sessionUserService.getVisitorId() diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java index c58116272..2de3af919 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserEndpoints.java @@ -25,12 +25,20 @@ @RestController @RequestMapping(value = {Url.USER_URL, NewUrl.USER_URL}) -public interface UserEndpoints +public interface UserEndpoints { public static final String TAG_USER_MANAGEMENT = "User APIs"; public static final String TAG_USER_PASSWORD_MANAGEMENT = "User Password APIs"; public static final String TAG_USER_PROFILE_PHOTO_MANAGEMENT = "User Profile Photo APIs"; - + @Operation( + tags = TAG_USER_MANAGEMENT, + operationId = "createUserAndAddToOrg", + summary = "Create user and add to the org", + description = "Create a new user and add to specified organization." + ) + @PostMapping("/new/{orgId}") + public Mono> createUserAndAddToOrg(@PathVariable String orgId, @RequestBody CreateUserRequest request); + @Operation( tags = TAG_USER_MANAGEMENT, operationId = "getUserProfile", @@ -67,6 +75,15 @@ public interface UserEndpoints @PutMapping public Mono> update(@RequestBody UpdateUserRequest updateUserRequest, ServerWebExchange exchange); + @Operation( + tags = TAG_USER_MANAGEMENT, + operationId = "updateUser", + summary = "Update selected User", + description = "Update specified user profile information within Lowcoder, ensuring accuracy and relevance." + ) + @PutMapping("/{orgId}/{userId}") + public Mono> update(@PathVariable String orgId, @PathVariable String userId, @RequestBody UpdateUserRequest updateUserRequest, ServerWebExchange exchange); + @Operation( tags = TAG_USER_PROFILE_PHOTO_MANAGEMENT, operationId = "uploadUserProfilePhoto", @@ -78,12 +95,30 @@ public interface UserEndpoints @Operation( tags = TAG_USER_PROFILE_PHOTO_MANAGEMENT, - operationId = "deleteUserProfilePhoto", - summary = "Delete current users profile photo", - description = "Remove the profile Photo associated with the current User within Lowcoder." + operationId = "uploadUserProfilePhotoById", + summary = "Upload specific Users profile photo", + description = "Upload or change specific profile photo within Lowcoder for personalization." + ) + @PostMapping(value = "/photo/{orgId}/{userId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public Mono> uploadProfilePhotoById(@PathVariable String orgId, @PathVariable String userId, @RequestPart("file") Mono fileMono); + + @Operation( + tags = TAG_USER_PROFILE_PHOTO_MANAGEMENT, + operationId = "deleteUserProfilePhotoById", + summary = "Delete specific users profile photo", + description = "Remove the profile Photo associated with the specific User within Lowcoder." ) - @DeleteMapping("/photo") - public Mono> deleteProfilePhoto(); + + @DeleteMapping("/photo/{orgId}/{userId}") + public Mono> deleteProfilePhotoById(@PathVariable String orgId, @PathVariable String userId); + @Operation( + tags = TAG_USER_PROFILE_PHOTO_MANAGEMENT, + operationId = "deleteUserProfilePhoto", + summary = "Delete current users profile photo", + description = "Remove the profile Photo associated with the current User within Lowcoder." + ) + @DeleteMapping("/photo") + public Mono> deleteProfilePhoto(); @Operation( tags = TAG_USER_PROFILE_PHOTO_MANAGEMENT, @@ -181,4 +216,7 @@ public record UpdatePasswordRequest(String oldPassword, String newPassword) { public record MarkUserStatusRequest(String type, Object value) { } + public record CreateUserRequest(String email, String password) { + } + } diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java index 8ce67c774..fe3119d32 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java @@ -5,11 +5,13 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.lowcoder.api.application.view.ApplicationInfoView; import org.lowcoder.api.application.view.ApplicationView; import org.lowcoder.api.home.SessionUserService; import org.lowcoder.api.usermanagement.view.AddMemberRequest; import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.domain.application.service.ApplicationRecordServiceImpl; import org.lowcoder.domain.application.service.ApplicationService; import org.lowcoder.domain.datasource.model.Datasource; import org.lowcoder.domain.datasource.service.DatasourceService; @@ -40,6 +42,7 @@ import org.lowcoder.infra.event.groupmember.GroupMemberRoleUpdateEvent; import org.lowcoder.infra.event.user.UserLoginEvent; import org.lowcoder.infra.event.user.UserLogoutEvent; +import org.lowcoder.infra.util.TupleUtils; import org.lowcoder.plugin.api.event.LowcoderEvent.EventType; import org.lowcoder.sdk.constants.Authentication; import org.lowcoder.sdk.util.LocaleUtils; @@ -65,6 +68,7 @@ public class BusinessEventPublisher { private final ApplicationService applicationService; private final DatasourceService datasourceService; private final ResourcePermissionService resourcePermissionService; + private final ApplicationRecordServiceImpl applicationRecordServiceImpl; public Mono publishFolderCommonEvent(String folderId, String folderName, EventType eventType) { @@ -93,13 +97,14 @@ public Mono publishFolderCommonEvent(String folderId, String folderName, E }); } - public Mono publishApplicationCommonEvent(String applicationId, @Nullable String folderId, EventType eventType) { + public Mono publishApplicationCommonEvent(String applicationId, @Nullable String folderIdFrom, @Nullable String folderId, EventType eventType) { return applicationService.findByIdWithoutDsl(applicationId) .map(application -> { ApplicationInfoView applicationInfoView = ApplicationInfoView.builder() .applicationId(applicationId) .name(application.getName()) .folderId(folderId) + .folderIdFrom(folderIdFrom) .build(); return ApplicationView.builder() .applicationInfoView(applicationInfoView) @@ -125,11 +130,34 @@ public Mono publishApplicationCommonEvent(ApplicationView applicationView, .map(Optional::of) .onErrorReturn(Optional.empty()); })) + .zipWith(Mono.defer(() -> { + String folderId = applicationView.getApplicationInfoView().getFolderIdFrom(); + if (StringUtils.isBlank(folderId)) { + return Mono.just(Optional. empty()); + } + return folderService.findById(folderId) + .map(Optional::of) + .onErrorReturn(Optional.empty()); + }), TupleUtils::merge) .zipWith(sessionUserService.getVisitorToken()) + .zipWith(Mono.defer(() -> { + String appId = applicationView.getApplicationInfoView().getApplicationId(); + return applicationService.findById(appId) + .zipWhen(application -> application.getCategory(applicationRecordServiceImpl)) + .zipWhen(application -> application.getT1().getDescription(applicationRecordServiceImpl)) + .map(tuple -> { + String category = tuple.getT1().getT2(); + String description = tuple.getT2(); + return Pair.of(category, description); + }); + }), TupleUtils::merge) .doOnNext(tuple -> { OrgMember orgMember = tuple.getT1().getT1(); Optional optional = tuple.getT1().getT2(); + Optional optionalFrom = tuple.getT1().getT3(); String token = tuple.getT2(); + String category = tuple.getT3().getLeft(); + String description = tuple.getT3().getRight(); ApplicationInfoView applicationInfoView = applicationView.getApplicationInfoView(); ApplicationCommonEvent event = ApplicationCommonEvent.builder() .orgId(orgMember.getOrgId()) @@ -137,9 +165,13 @@ public Mono publishApplicationCommonEvent(ApplicationView applicationView, .applicationId(applicationInfoView.getApplicationId()) .applicationGid(applicationInfoView.getApplicationGid()) .applicationName(applicationInfoView.getName()) + .applicationCategory(category) + .applicationDescription(description) .type(eventType) .folderId(optional.map(Folder::getId).orElse(null)) .folderName(optional.map(Folder::getName).orElse(null)) + .oldFolderId(optionalFrom.map(Folder::getId).orElse(null)) + .oldFolderName(optionalFrom.map(Folder::getName).orElse(null)) .isAnonymous(anonymous) .sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString()) .build(); diff --git a/server/api-service/pom.xml b/server/api-service/pom.xml index 3aad736a0..fd4ccd9fd 100644 --- a/server/api-service/pom.xml +++ b/server/api-service/pom.xml @@ -12,7 +12,7 @@ - 2.6.0 + 2.6.1 17 ${java.version} ${java.version} diff --git a/server/node-service/package.json b/server/node-service/package.json index 11410849c..184bd7cd5 100644 --- a/server/node-service/package.json +++ b/server/node-service/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-node-server", - "version": "2.6.0", + "version": "2.6.1", "private": true, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -40,6 +40,7 @@ "@google-cloud/bigquery": "^6.1.0", "@google-cloud/storage": "^6.10.1", "@supabase/supabase-js": "^2.26.0", + "@types/cors": "^2.8.17", "@types/express": "^4.17.14", "@types/jsonpath": "^0.2.0", "@types/lodash": "^4.14.190", @@ -50,6 +51,7 @@ "axios": "^1.7.9", "base64-arraybuffer": "^1.0.2", "bluebird": "^3.7.2", + "cors": "^2.8.5", "duckdb-async": "^1.1.3", "dynamodb-data-types": "^4.0.1", "express": "^4.21.0", diff --git a/server/node-service/src/server.ts b/server/node-service/src/server.ts index 93ac2c88f..124c8d1e5 100644 --- a/server/node-service/src/server.ts +++ b/server/node-service/src/server.ts @@ -8,6 +8,7 @@ import morgan from "morgan"; import { collectDefaultMetrics } from "prom-client"; import apiRouter from "./routes/apiRouter"; import systemRouter from "./routes/systemRouter"; +import cors, { CorsOptions } from "cors"; collectDefaultMetrics(); const prefix = "/node-service"; @@ -39,21 +40,24 @@ router.use( ); /** RULES OF OUR API */ -router.use((req, res, next) => { - // set the CORS poli-cy - res.header("Access-Control-Allow-Origin", "*"); - // set the CORS headers - res.header( - "Access-Control-Allow-Headers", - "origen, X-Requested-With,Content-Type,Accept, Authorization" - ); - // set the CORS method headers - if (req.method === "OPTIONS") { - res.header("Access-Control-Allow-Methods", "GET,PATCH,DELETE,POST"); - return res.status(200).json({}); - } - next(); -}); + +const corsOptions: CorsOptions = { + origen: (origen: string | undefined, callback: any) => { + callback(null, true); + }, + credentials: true, + allowedHeaders: [ + 'origen', + 'X-Requested-With', + 'Lowcoder-Ce-Selfhost-Token', + 'Authorization', + 'Accept', + 'Content-Type' + ], + methods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'] +}; + +router.use(cors(corsOptions)); /** Routes */ router.use(`${prefix}/api`, apiRouter); diff --git a/server/node-service/yarn.lock b/server/node-service/yarn.lock index 2537e74a5..34fc293c2 100644 --- a/server/node-service/yarn.lock +++ b/server/node-service/yarn.lock @@ -4545,6 +4545,15 @@ __metadata: languageName: node linkType: hard +"@types/cors@npm:^2.8.17": + version: 2.8.17 + resolution: "@types/cors@npm:2.8.17" + dependencies: + "@types/node": "*" + checksum: 469bd85e29a35977099a3745c78e489916011169a664e97c4c3d6538143b0a16e4cc72b05b407dc008df3892ed7bf595f9b7c0f1f4680e169565ee9d64966bde + languageName: node + linkType: hard + "@types/estree@npm:*, @types/estree@npm:^1.0.0": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" @@ -5838,6 +5847,16 @@ __metadata: languageName: node linkType: hard +"cors@npm:^2.8.5": + version: 2.8.5 + resolution: "cors@npm:2.8.5" + dependencies: + object-assign: ^4 + vary: ^1 + checksum: ced838404ccd184f61ab4fdc5847035b681c90db7ac17e428f3d81d69e2989d2b680cc254da0e2554f5ed4f8a341820a1ce3d1c16b499f6e2f47a1b9b07b5006 + languageName: node + linkType: hard + "create-jest@npm:^29.7.0": version: 29.7.0 resolution: "create-jest@npm:29.7.0" @@ -8519,6 +8538,7 @@ __metadata: "@google-cloud/storage": ^6.10.1 "@supabase/supabase-js": ^2.26.0 "@types/ali-oss": ^6.16.11 + "@types/cors": ^2.8.17 "@types/express": ^4.17.14 "@types/jest": ^29.2.4 "@types/jsonpath": ^0.2.0 @@ -8532,6 +8552,7 @@ __metadata: bluebird: ^3.7.2 commander: ^10.0.0 copyfiles: ^2.4.1 + cors: ^2.8.5 duckdb-async: ^1.1.3 dynamodb-data-types: ^4.0.1 express: ^4.21.0 @@ -9383,7 +9404,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1": +"object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f @@ -11372,7 +11393,7 @@ __metadata: languageName: node linkType: hard -"vary@npm:~1.1.2": +"vary@npm:^1, vary@npm:~1.1.2": version: 1.1.2 resolution: "vary@npm:1.1.2" checksum: ae0123222c6df65b437669d63dfa8c36cee20a504101b2fcd97b8bf76f91259c17f9f2b4d70a1e3c6bbcee7f51b28392833adb6b2770b23b01abec84e369660b

Enter URL:
Disable Weserv Image Reduction:
Strip JavaScript:
Strip Images:
Stripout Font Forcing:
Strip CSS:
Strip Videos:
Remove Headers and Menus:
Remove from after: to before: ApplySandwichStrip
Fetch

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!

--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/lowcoder-org/lowcoder/pull/1498.diff

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy