@cloudbase/cals 1.0.79 → 1.0.80-alpha.0

package/lib/parser/cals/index.js

@@ -591,6 +591,7 @@ function serializeListener(ctx, listener) {
             [':code']: listener.handler.code,
         },
         isCapturePhase: listener.isCapturePhase,
+        noPropagation: !!listener.noPropagation,
     };
     if (!listener.args && data) {
         platfromListener.handler.params = data;
@@ -637,7 +638,6 @@ function deserializeListener(ctx, listener) {
         data: deserializeDynamicMap(ctx, ((_j = paramsDynamicMap.params) === null || _j === void 0 ? void 0 : _j[0]) || {}, ((_k = listener === null || listener === void 0 ? void 0 : listener.extra) === null || _k === void 0 ? void 0 : _k.handlerParamExtraData) || {}),
         args: deserializeDynamicMap(ctx, paramsDynamicMap, argsExtra),
         isCapturePhase: !!listener.isCapturePhase,
-        // TODO
         noPropagation: !!listener.noPropagation,
     };
     return processed;

package/lib/types/basic/common.d.ts

@@ -21,6 +21,10 @@ export interface IListener {
      * @default false
      */
     isCapturePhase?: boolean;
+    /**
+     * 可选，是否附上事件传播
+     */
+    noPropagation?: boolean;
     /**
      * 可选, 监听器类型
      */

package/lib/types/basic/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/types/basic/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAU,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACpD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;CACzB;AAED,SAAS;AACT,MAAM,WAAW,QAAQ;IACvB,SAAS;IACT,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,CAAC,CAAC;IAC7C,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW;IACX,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU;IACV,YAAY,EAAE,GAAG,CAAC;CACnB;AAED,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,UAAU;IACV,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,4BAA4B;IAE5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/types/basic/common.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAU,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACpD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;CACzB;AAED,SAAS;AACT,MAAM,WAAW,QAAQ;IACvB,SAAS;IACT,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,CAAC,CAAC;IAC7C,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW;IACX,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU;IACV,YAAY,EAAE,GAAG,CAAC;CACnB;AAED,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,UAAU;IACV,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,4BAA4B;IAE5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB"}

package/lib/utils/version-migrations/common.d.ts

@@ -0,0 +1,5 @@
+export declare function semverComp(a: string, b: string): number;
+export declare function toFixed(num: number, precision: number): number;
+export declare const OFFICIAL_COMPONENT_LIB_NAME = "CLOUDBASE_STANDARD";
+export declare const OFFICIAL_MATERIAL_LIB_NAME = "gsd-h5-react";
+//# sourceMappingURL=common.d.ts.map

package/lib/utils/version-migrations/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/version-migrations/common.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAYvD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAChE,eAAO,MAAM,0BAA0B,iBAAiB,CAAC"}

package/lib/utils/version-migrations/common.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OFFICIAL_MATERIAL_LIB_NAME = exports.OFFICIAL_COMPONENT_LIB_NAME = exports.toFixed = exports.semverComp = void 0;
+function semverComp(a, b) {
+    const pa = a.split('.');
+    const pb = b.split('.');
+    for (let i = 0; i < 3; i++) {
+        const na = Number(pa[i]);
+        const nb = Number(pb[i]);
+        if (na > nb)
+            return 1;
+        if (nb > na)
+            return -1;
+        if (!isNaN(na) && isNaN(nb))
+            return 1;
+        if (isNaN(na) && !isNaN(nb))
+            return -1;
+    }
+    return 0;
+}
+exports.semverComp = semverComp;
+function toFixed(num, precision) {
+    const multiplier = Math.pow(10, (precision + 1));
+    const wholeNumber = Math.floor(num * multiplier);
+    return (Math.round(wholeNumber / 10) * 10) / multiplier;
+}
+exports.toFixed = toFixed;
+exports.OFFICIAL_COMPONENT_LIB_NAME = 'CLOUDBASE_STANDARD';
+exports.OFFICIAL_MATERIAL_LIB_NAME = 'gsd-h5-react';

package/lib/utils/version-migrations/version4.d.ts

@@ -0,0 +1,3 @@
+import type { IPlatformApp } from '../../types';
+export declare function version4(cals: IPlatformApp, isUpgrade: boolean, setSchemaVersionCallback?: (version: string | undefined) => void): IPlatformApp;
+//# sourceMappingURL=version4.d.ts.map

package/lib/utils/version-migrations/version4.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version4.d.ts","sourceRoot":"","sources":["../../../src/utils/version-migrations/version4.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,aAAa,CAAC;AAGhE,wBAAgB,QAAQ,CACtB,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,OAAO,EAClB,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAC/D,YAAY,CAEd"}

package/lib/utils/version-migrations/version4.js

@@ -0,0 +1,199 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.version4 = void 0;
+const postcss_1 = __importDefault(require("postcss"));
+const postcss_less_1 = __importDefault(require("postcss-less"));
+const __1 = require("..");
+const common_1 = require("./common");
+function version4(cals, isUpgrade, setSchemaVersionCallback) {
+    return transformPxLowcodeCompAndSourceComp(cals, isUpgrade, setSchemaVersionCallback);
+}
+exports.version4 = version4;
+const transformPxLowcodeCompAndSourceComp = (cals, isUpgrade, setSchemaVersionCallback) => {
+    var _a, _b, _c, _d;
+    {
+        function transformCals(items, isUpgradeToPx) {
+            return items.map((item) => {
+                var _a;
+                // 对于表单操作区的按钮组件的父容器添加.wd-form__action, 兼容组件规范化按钮升级样式
+                if ((item === null || item === void 0 ? void 0 : item.module) === common_1.OFFICIAL_COMPONENT_LIB_NAME && (item === null || item === void 0 ? void 0 : item.component) === 'Form') {
+                    item = addClassToButtonContainer(item);
+                }
+                if ((_a = item === null || item === void 0 ? void 0 : item.extra) === null || _a === void 0 ? void 0 : _a.commonStyle) {
+                    item.extra.commonStyle = convertCommonStyle(item.extra.commonStyle, isUpgradeToPx);
+                    if (item.extra.commonStyle.self) {
+                        // 处理 margin padding shorthand 同步
+                        const newSelf = (0, __1.processCommonStyle2CSSProperties)(item.extra.commonStyle, {
+                            toRem: false,
+                            ignoreSelf: true,
+                            addPXUnit: true,
+                        });
+                        ['margin', 'padding', 'border'].forEach((k) => {
+                            if (item.extra.commonStyle.self[k]) {
+                                item.extra.commonStyle.self[k] = newSelf[k];
+                            }
+                        });
+                    }
+                }
+                if (item === null || item === void 0 ? void 0 : item.resources) {
+                    item.resources = item.resources.map((n) => {
+                        if (n.codeType === 'style') {
+                            n = convertLowCodesStyle(n, isUpgradeToPx);
+                            return n;
+                        }
+                        return n;
+                    });
+                }
+                if (item.items) {
+                    item.items = transformCals(item.items, isUpgradeToPx);
+                }
+                return item;
+            });
+        }
+        let pages = cals['items'];
+        let isDivision;
+        if (isUpgrade && (0, common_1.semverComp)((_a = cals['schemaVersion']) !== null && _a !== void 0 ? _a : '3.0.0', '4.0.0') < 0) {
+            // 组件库版本高于目标版本，且schemaVersion小于4, 将应用 CALS 数据中的 CSS 和 style 中的无单位和有单位的小写 px统一改写为 1/2 px
+            isDivision = true;
+            pages = transformCals(pages, isDivision);
+            cals.resources = (_b = cals.resources) === null || _b === void 0 ? void 0 : _b.map((n) => {
+                if (n.codeType === 'style') {
+                    n = convertLowCodesStyle(n, isDivision);
+                    return n;
+                }
+                return n;
+            });
+            cals['schemaVersion'] = '4.0.0';
+            setSchemaVersionCallback === null || setSchemaVersionCallback === void 0 ? void 0 : setSchemaVersionCallback('4.0.0');
+        }
+        else if (!isUpgrade && (0, common_1.semverComp)((_c = cals['schemaVersion']) !== null && _c !== void 0 ? _c : '3.0.0', '4.0.0') >= 0) {
+            // 组件库低于目标版本,并且schemaVersion大于4 将应用 CALS 数据中的 CSS 和 style 中的无单位和有单位的小写 px统一改写为 2倍 px
+            isDivision = false;
+            pages = transformCals(pages, isDivision);
+            cals.resources = (_d = cals.resources) === null || _d === void 0 ? void 0 : _d.map((n) => {
+                if (n.codeType === 'style') {
+                    n = convertLowCodesStyle(n, isDivision);
+                    return n;
+                }
+                return n;
+            });
+            delete cals['schemaVersion'];
+            setSchemaVersionCallback === null || setSchemaVersionCallback === void 0 ? void 0 : setSchemaVersionCallback(undefined);
+        }
+        cals['items'] = pages;
+        return cals;
+    }
+};
+function hasSubmitButton(item) {
+    var _a;
+    if ((_a = item === null || item === void 0 ? void 0 : item.items) === null || _a === void 0 ? void 0 : _a.length) {
+        const children = item.items;
+        return children.some((i) => { var _a; return (i === null || i === void 0 ? void 0 : i.module) === common_1.OFFICIAL_COMPONENT_LIB_NAME && i.component === 'Button' && ((_a = i === null || i === void 0 ? void 0 : i.attributes) === null || _a === void 0 ? void 0 : _a.formType) === 'submit'; });
+    }
+    return false;
+}
+function addClassToButtonContainer(item) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    if ((item === null || item === void 0 ? void 0 : item.module) === common_1.OFFICIAL_MATERIAL_LIB_NAME && item.component === 'Container') {
+        if (hasSubmitButton(item)) {
+            if (((_a = item.attributes) === null || _a === void 0 ? void 0 : _a.class) && !((_b = item.attributes) === null || _b === void 0 ? void 0 : _b.class.includes('wd-form__action'))) {
+                if (typeof ((_c = item.attributes) === null || _c === void 0 ? void 0 : _c.class) === 'string') {
+                    item.attributes = Object.assign(Object.assign({}, item.attributes), { class: `${(_d = item.attributes) === null || _d === void 0 ? void 0 : _d.class} wd-form__action` });
+                }
+                else if (Array.isArray((_e = item.attributes) === null || _e === void 0 ? void 0 : _e.class)) {
+                    item.attributes = Object.assign(Object.assign({}, item.attributes), { class: [...(_f = item.attributes) === null || _f === void 0 ? void 0 : _f.class, 'wd-form__action'] });
+                }
+            }
+            else if (!((_g = item.attributes) === null || _g === void 0 ? void 0 : _g.class)) {
+                item.attributes = Object.assign(Object.assign({}, item.attributes), { class: 'wd-form__action' });
+            }
+            // 移除旧的padding配置
+            if ((_j = (_h = item === null || item === void 0 ? void 0 : item.extra) === null || _h === void 0 ? void 0 : _h.commonStyle) === null || _j === void 0 ? void 0 : _j.padding) {
+                delete item.extra.commonStyle.padding;
+            }
+        }
+    }
+    if ((_k = item === null || item === void 0 ? void 0 : item.items) === null || _k === void 0 ? void 0 : _k.length) {
+        item.items = item.items.map((i) => addClassToButtonContainer(i));
+    }
+    return item;
+}
+function jsonTranverse(json, reviver) {
+    return JSON.parse(JSON.stringify(json, reviver, 2));
+}
+function convertCommonStyle(value, isUpgrade) {
+    return jsonTranverse(value, (key, value) => {
+        if (__1.isUnitlessNumber[key]) {
+            return value;
+        }
+        if (typeof value === 'number') {
+            if (isUpgrade) {
+                value = value / 2;
+            }
+            else {
+                value = value * 2;
+            }
+        }
+        else if (/^((\d+\.)?\d+)(px)?$/.test(value)) {
+            value = !value ? value : value === null || value === void 0 ? void 0 : value.replace('px', '');
+            if (isUpgrade) {
+                // console.log(key, value, Number(value) / 2);
+                value = !value ? value : `${(0, common_1.toFixed)(Number(value) / 2, 3)}px`;
+            }
+            else {
+                value = !value ? value : `${Number(value) * 2}px`;
+            }
+        }
+        return value;
+    });
+}
+const rem2PxPlugin = (opts) => {
+    const rem2pxSym = Symbol('rem2pxSym');
+    const { isUpgrade } = opts;
+    return {
+        postcssPlugin: 'postcss-rem2px',
+        Declaration(decl, rule) {
+            // Modified From https://github.com/cuth/postcss-pxtorem/blob/122649015322214f8e9d1ac852eb11c0791b634b/lib/pixel-unit-regex.js#L9
+            // eslint-disable-next-line no-useless-escape
+            const pxRegex = /"[^"]+"|'[^']+'|(\d*\.?\d+)px/gm;
+            if (decl.value.indexOf('px') < 0) {
+                return;
+            }
+            if (decl[rem2pxSym]) {
+                return;
+            }
+            if (isUpgrade) {
+                const value = decl.value.replace(pxRegex, (match, p1) => {
+                    if (p1 !== null && p1 !== undefined) {
+                        const r = (0, common_1.toFixed)(Number(p1) / 2, 3);
+                        const rs = r.toString();
+                        return `${rs}px`;
+                    }
+                    return match;
+                });
+                decl.value = value;
+            }
+            else {
+                const value = decl.value.replace(pxRegex, (match, p1) => {
+                    if (p1 !== null && p1 !== undefined) {
+                        return `${Number(p1) * 2}px`;
+                    }
+                    return match;
+                });
+                decl.value = value;
+            }
+            decl[rem2pxSym] = true;
+        },
+    };
+};
+rem2PxPlugin.postcss = true;
+function convertLowCodesStyle(value, isUpgrade) {
+    const result = (0, postcss_1.default)([rem2PxPlugin({ isUpgrade })]).process(value.code, {
+        syntax: postcss_less_1.default,
+    });
+    value.code = result.css;
+    return value;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "1.0.79",
+  "version": "1.0.80-alpha.0",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",