@cloudbase/cals 0.4.9 → 0.4.10-beta.0

package/lib/parser/cals/utils/code/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAA2D,MAAM,mBAAmB,CAAC;AAG1G,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAiL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA4J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAsE,MAAM,mBAAmB,CAAC;AAGrH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAsL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA+J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}

package/lib/parser/cals/utils/code/index.js

@@ -112,6 +112,7 @@ function calsToCode(calsJSON, version = 'v1') {
         });
     }
     function genConfig(itemJSON, configFields, configPath, otherConfigFields) {
+        var _a;
         const config = (0, lodash_1.pick)(itemJSON, configFields);
         if (otherConfigFields) {
             Object.keys(otherConfigFields).forEach((key) => {
@@ -119,7 +120,9 @@ function calsToCode(calsJSON, version = 'v1') {
             });
         }
         // state, computed 类型以及名称为 ____index____ 的都不生成代码
-        config._ignoreResources = itemJSON.resources.filter((item) => [types_1.ECodeType.STATE, types_1.ECodeType.COMPUTEDN].includes(item.codeType) || item.name === '____index____');
+        config._ignoreResources =
+            ((_a = itemJSON.resources) === null || _a === void 0 ? void 0 : _a.filter((item) => [types_1.ECodeType.STATE, types_1.ECodeType.COMPUTEDN].includes(item.codeType) ||
+                item.name === types_1.ECodeName.PLACEHOLDER)) || [];
         // 按 key 排序，这样确保每次生成都一样的顺序，减少冲突
         const newConfig = {};
         Object.keys(config)
@@ -128,19 +131,19 @@ function calsToCode(calsJSON, version = 'v1') {
         addCodeItem(configPath, JSON.stringify(config, null, 2));
     }
     function genCode(resources, basePath = '') {
-        const codeResources = (resources || []).filter((item) => item.type === types_1.EResourceType.CODE && item.name !== '____index____');
+        const codeResources = (resources || []).filter((item) => item.type === types_1.EResourceType.CODE && item.name !== types_1.ECodeName.PLACEHOLDER);
         codeResources.forEach((codeItem) => {
             let codePath = '';
             let realBasePath = basePath ? `${basePath}/` : basePath;
             switch (codeItem.codeType) {
                 case types_1.ECodeType.THEME:
-                    codePath = `${realBasePath}theme.less`;
+                    codePath = `${realBasePath}${types_1.ECodeName.THEME}.less`;
                     break;
                 case types_1.ECodeType.STYLE:
-                    codePath = `${realBasePath}style.less`;
+                    codePath = `${realBasePath}${types_1.ECodeName.STYLE}.less`;
                     break;
                 case types_1.ECodeType.LIFECYCLE:
-                    codePath = `${realBasePath}lifecycle.js`;
+                    codePath = `${realBasePath}${types_1.ECodeName.LIFECYCLE}.js`;
                     break;
                 // 这两种类型的文件现在不生成文件，需要存放在 config 中
                 case types_1.ECodeType.STATE:
@@ -150,10 +153,10 @@ function calsToCode(calsJSON, version = 'v1') {
                     // codePath = `${realBasePath}computed.js`;
                     break;
                 case types_1.ECodeType.NORMAL_MODULE:
-                    codePath = `common/${codeItem.name}.js`;
+                    codePath = `${types_1.ECodeName.NORMAL_MODULE}/${codeItem.name}.js`;
                     break;
                 case types_1.ECodeType.HANDLER_FN:
-                    codePath = `${realBasePath}handler/${codeItem.name}.js`;
+                    codePath = `${realBasePath}${types_1.ECodeName.HANDLER_FN}/${codeItem.name}.js`;
                     break;
             }
             if (codePath) {
@@ -220,6 +223,9 @@ function codeToCals(codeList, version = 'v1') {
                 };
                 calsJSON.items.push(pageItem);
             }
+            if (!pageItem.resources) {
+                pageItem.resources = [];
+            }
             if (versionConfig.pageConfigRegExp.test(codeItem.path)) {
                 /**
                  * page-config.json

package/lib/parser/cals/utils/style.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/style.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAKrC,wBAAgB,2BAA2B,CAAC,SAAS,GAAE,GAA2B,GAAG,GAAG,CAUvF;AA0ID,wBAAgB,gCAAgC,CAC9C,WAAW,GAAE,GAA2B,EACxC,OAAO,GAAE;IACP,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACoD,GACrE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,CA0N7B;AASD,wBAAgB,wBAAwB,CACtC,KAAK,GAAE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAM,EACvC,OAAO;;CAAwB,GAC9B,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,CAE7B"}
+{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/style.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrC,wBAAgB,2BAA2B,CAAC,SAAS,GAAE,GAA2B,GAAG,GAAG,CAUvF;AA0ID,wBAAgB,gCAAgC,CAC9C,WAAW,GAAE,GAAQ,EACrB,OAAO,GAAE;IACP,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACoD,GACrE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,CA6S7B;AASD,wBAAgB,wBAAwB,CACtC,KAAK,GAAE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAM,EACvC,OAAO;;CAAwB,GAC9B,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,CAE7B"}

package/lib/parser/cals/utils/style.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.removeInvalidStyleFormValue = void 0;
 const common_1 = require("./common");
 const lodash_1 = require("lodash");
-const CSSProperty_1 = require("../../../utils/CSSProperty");
+const utils_1 = require("../../../utils");
 const DISTANCE_KEY_LIST = ['top', 'right', 'bottom', 'left'];
 function removeInvalidStyleFormValue(styleForm = {}) {
     return Object.keys(styleForm).reduce((result, key) => {
@@ -81,7 +81,7 @@ function setDistanceStyle(style, distance, attr, addPXUnit) {
 function translateStyleByHandler(style = {}, handler, options = { looseError: false }) {
     return Object.keys(style).reduce((result, key) => {
         const value = style[key];
-        if (CSSProperty_1.isUnitlessNumber[key]) {
+        if (utils_1.isUnitlessNumber[key]) {
             setStyleValue(result, key, value);
         }
         else if (value !== undefined && value !== null) {
@@ -147,7 +147,7 @@ function toRPX(cssLen) {
 function processCommonStyle2CSSProperties(commonStyle = {}, options = { toRem: true, ignoreSelf: false, addPXUnit: false, toRpx: false }) {
     const { size, 
     // transform,
-    text, border, background, margin, padding, zIndex, position, display, flexConfig, custom, self, } = commonStyle;
+    text, border, background, margin, padding, zIndex, position, display, flexConfig, custom, self, boxShadow, } = commonStyle;
     const style = {};
     if (size) {
         setStyleValue(style, 'width', _handleStyleNumValue(size.width, !!options.addPXUnit));
@@ -200,7 +200,8 @@ function processCommonStyle2CSSProperties(commonStyle = {}, options = { toRem: t
     }
     if (border) {
         const { type, color, width, radius, radiusInfo } = border;
-        if (width !== undefined) {
+        // width
+        if (typeof width === 'string') {
             if (type && type !== 'none') {
                 setStyleValue(style, 'border', `${_handleStyleNumValue(width, !!options.addPXUnit)} ${type} ${color || ''}`);
             }
@@ -210,6 +211,11 @@ function processCommonStyle2CSSProperties(commonStyle = {}, options = { toRem: t
                     setStyleValue(style, 'borderColor', color);
             }
         }
+        else if (Object.prototype.toString.call(width) === '[object Object]' && Object.keys(width).length !== 0) {
+            const { top = '0', right = '0', bottom = '0', left = '0' } = width;
+            setStyleValue(style, 'borderWidth', `${_handleStyleNumValue(top, !!options.addPXUnit)} ${_handleStyleNumValue(right, !!options.addPXUnit)} ${_handleStyleNumValue(bottom, !!options.addPXUnit)} ${_handleStyleNumValue(left, !!options.addPXUnit)}`);
+        }
+        // border radius
         if (radius !== undefined) {
             setStyleValue(style, 'borderRadius', _handleStyleNumValue(radius, !!options.addPXUnit));
         }
@@ -292,6 +298,76 @@ function processCommonStyle2CSSProperties(commonStyle = {}, options = { toRem: t
             setStyleValue(style, 'bottom', _handleStyleNumValue(position.bottom, !!options.addPXUnit));
         }
     }
+    if (boxShadow) {
+        let processedBoxShadow = boxShadow;
+        if (Object.prototype.toString.call(boxShadow) === '[object Object]') {
+            processedBoxShadow = [boxShadow];
+        }
+        let boxShadowStyleString = '';
+        if (Array.isArray(processedBoxShadow)) {
+            processedBoxShadow.forEach((boxShadowItem, index) => {
+                let currentBoxShadowStyleString = '';
+                const { keyWord, offsetX, offsetY, blurRadius, spreadRadius, color, global, inset } = boxShadowItem;
+                // Keyword values
+                if (keyWord === 'none') {
+                    currentBoxShadowStyleString = 'none';
+                }
+                else if (!!global) {
+                    currentBoxShadowStyleString = global;
+                }
+                else if (!!offsetX || !!offsetY) {
+                    // inset
+                    if (!!inset) {
+                        currentBoxShadowStyleString = 'inset ';
+                    }
+                    // offsetX
+                    if (!!offsetX) {
+                        currentBoxShadowStyleString += _handleStyleNumValue(offsetX, !!options.addPXUnit);
+                    }
+                    else {
+                        currentBoxShadowStyleString += '0';
+                    }
+                    // offsetY
+                    if (!!offsetY) {
+                        currentBoxShadowStyleString += ' ' + _handleStyleNumValue(offsetY, !!options.addPXUnit);
+                    }
+                    else {
+                        currentBoxShadowStyleString += ' 0';
+                    }
+                    // blur-radius 当 spread-radius 存在时，即使不存在 blur-radius，blur-radius 也要为 0
+                    if (!!blurRadius || !!spreadRadius) {
+                        if (!!blurRadius) {
+                            currentBoxShadowStyleString += ' ' + _handleStyleNumValue(blurRadius, !!options.addPXUnit);
+                        }
+                        else {
+                            currentBoxShadowStyleString += ' 0';
+                        }
+                    }
+                    // spread-radius
+                    if (!!spreadRadius) {
+                        currentBoxShadowStyleString += ' ' + _handleStyleNumValue(spreadRadius, !!options.addPXUnit);
+                    }
+                    // color
+                    if (!!color) {
+                        currentBoxShadowStyleString += ' ' + color;
+                    }
+                }
+                if (!!currentBoxShadowStyleString) {
+                    let splitLabel;
+                    if (!!boxShadowStyleString) {
+                        splitLabel = ' , ';
+                    }
+                    else {
+                        splitLabel = '';
+                    }
+                    boxShadowStyleString += splitLabel + currentBoxShadowStyleString;
+                }
+            });
+        }
+        if (!!boxShadowStyleString) {
+            setStyleValue(style, 'boxShadow', boxShadowStyleString);
+        }
+    }
     if (custom && custom.length > 0) {
         custom.map((item) => {
             setStyleValue(style, item.key, item.value);

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

@@ -12,6 +12,10 @@ export interface IResource extends Record<string, any> {
  * 应用/组件 绑定的监听器
  */
 export interface IListener {
+    /**
+     * 可选，listener id
+     */
+    id?: string;
     /**
      * 可选，是否在捕获阶段响应
      * @default false
@@ -53,6 +57,10 @@ export interface IDataset {
     state?: Record<string, IStateVariable | any>;
     /** 页面/应用 参数 */
     params?: Record<string, IParamsVariable>;
+    /**
+     * 可选，页面配置名称
+     */
+    pageName?: string;
 }
 export interface IStateVariable {
     /** 中文名 */

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;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;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;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;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;CAC1C;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;IACzB;;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;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;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;;OAEG;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.4.9",
+  "version": "0.4.10-beta.0",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -13,7 +13,8 @@
     "build:schema": "ts-node src/utils/build.ts",
     "develop": "tsc --watch",
     "docs": "typedoc --options typedoc.json types",
-    "test": "jest"
+    "test": "jest",
+    "test:coverage": "jest --coverage"
   },
   "keywords": [
     "lowcode",