@cloudbase/cals 0.4.11-alpha.7 → 0.4.11-beta.0

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,CAqT7B;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,19 @@ function processCommonStyle2CSSProperties(commonStyle = {}, options = { toRem: t
                     setStyleValue(style, 'borderColor', color);
             }
         }
+        else if (Object.prototype.toString.call(width) === '[object Object]' && Object.keys(width).length !== 0) {
+            // https://developer.mozilla.org/zh-CN/docs/Web/CSS/border
+            // 虽然border-width,、border-style和 border-color 简写属性接受最多 4 个参数来为不同的边设置宽度、风格和颜色，但 boder 属性只接受三个参数，分别是宽度、风格和颜色，所以这样会使得四条边的边框相同。
+            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)}`);
+            if (type) {
+                setStyleValue(style, 'borderStyle', type);
+            }
+            if (color) {
+                setStyleValue(style, 'borderColor', color);
+            }
+        }
+        // border radius
         if (radius !== undefined) {
             setStyleValue(style, 'borderRadius', _handleStyleNumValue(radius, !!options.addPXUnit));
         }
@@ -292,6 +306,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/utils/index.d.ts

@@ -1,6 +1,5 @@
 export * from '../parser';
 export * from '../types/index';
 export * from './constant';
-export * from './dts/index';
 export { isUnitlessNumber } from './CSSProperty';
 //# sourceMappingURL=index.d.ts.map

package/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}

package/lib/utils/index.js

@@ -18,6 +18,5 @@ exports.isUnitlessNumber = void 0;
 __exportStar(require("../parser"), exports);
 __exportStar(require("../types/index"), exports);
 __exportStar(require("./constant"), exports);
-__exportStar(require("./dts/index"), exports);
 var CSSProperty_1 = require("./CSSProperty");
 Object.defineProperty(exports, "isUnitlessNumber", { enumerable: true, get: function () { return CSSProperty_1.isUnitlessNumber; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.4.11-alpha.7",
+  "version": "0.4.11-beta.0",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -11,8 +11,6 @@
   "scripts": {
     "build": "tsc",
     "build:schema": "ts-node src/utils/build.ts",
-    "build:dts": "ts-node src/utils/dts/build.ts",
-    "build:dts:watch": "ts-node src/utils/dts/build.ts --watch",
     "develop": "tsc --watch",
     "docs": "typedoc --options typedoc.json types",
     "test": "jest",
@@ -27,8 +25,6 @@
   "license": "MIT",
   "dependencies": {
     "acorn": "^8.0.4",
-    "json-schema-to-typescript": "^11.0.2",
-    "json-schema-to-typescript-for-browser": "^11.0.3",
     "lodash": "^4.17.20"
   },
   "devDependencies": {
@@ -37,13 +33,9 @@
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.14.6",
     "@types/react": "^18.0.17",
-    "@types/web": "^0.0.78",
     "ajv": "^8.8.2",
     "csstype": "^3.0.11",
     "jest": "^27.1.0",
-    "jest-fetch-mock": "^3.0.3",
-    "jsdom-worker": "^0.3.0",
-    "node-watch": "^0.7.3",
     "ts-jest": "^27.0.5",
     "ts-node": "^10.4.0",
     "typescript": "^4.7.4",

package/lib/utils/dts/auto-generated.d.ts

@@ -1,2 +0,0 @@
-export declare const wedaDTS = "declare namespace $app {\n  namespace dataset {\n\n    const state: {\n      // Global State Inner Begin\n      // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n      // Global State Inner End\n    }\n\n  }\n\n  namespace utils {\n     function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n  }\n\n  namespace common {\n    // Global Common Inner Begin\n    // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n    // Global Common Inner End\n  }\n\n  \n\ninterface navigatorOptions {\n  packageName: string;\n  pageId: string;\n  data?: Record<string, any>;\n  params?: Record<string, any>;\n  events?: Record<string, (data: any) => void>;\n  success(res: any);\n  fail(res: any);\n  complete(res: any);\n}\n\ninterface navigateBackOptions {\n  delta: number;\n}\n\n// \u8BBE\u7F6E\u72B6\u6001\nfunction setState(userSetState: Record<string, any>): void\n\n// \u7279\u5236\u8DEF\u7531\nfunction navigateTo(options: navigatorOptions)\nfunction redirectTo(options: navigatorOptions)\nfunction reLaunch(options: navigatorOptions)\nfunction navigateBack(options: navigateBackOptions)\n\n// \u663E\u793A\u63D0\u793A\nfunction showToast(options);\n\n// \u663E\u793A\u6A21\u6001\u63D0\u793A\nfunction showModal(options);\n\n// \u663E\u793A loading \u63D0\u793A\nfunction showLoading(options);\n\n// \u9690\u85CF loading \u63D0\u793A\nfunction hideLoading(options);\n\n// \u9690\u85CF\u63D0\u793A\nfunction hideToast(options);\n\n// sacnCode\nfunction scanCode(options: {\n  onlyFromCamera?: boolean;\n  enableDefaultBehavior?: boolean;\n  scanType?: ('barCode' | 'qrCode')[];\n  success?: (res: { result: string; scanType: string }) => void;\n  fail?: (err: Error) => void;\n  complete?: () => void;\n}): Promise<ScanCodeResult> | ScanCodeResult;\n\n\n}\n\ndeclare const app = $app\n\n// Global For Begin\ndeclare const $for: {\n  // Global For Inner Begin\n  // For \u5FAA\u73AF\u53D8\u91CF - Don't touch me\n  // Global For Inner End\n}\ndeclare const forItems = $for\n// Global For End\n\n// $page Begin\ndeclare namespace $page {\n  namespace dataset {\n\n    const state: {\n      // Page State Inner Begin\n      // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n      // Page State Inner End\n    }\n\n    const params: {\n      // Page Param Inner Begin\n      // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n      // Page Param Inner End\n    }\n\n  }\n\n  namespace handler {\n    // Page Handler Inner Begin\n    // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n    // Page Handler Inner End\n  }\n\n  \n\n// \u8BBE\u7F6E\u72B6\u6001\nfunction setState(userSetState: Record<string, any>): void\n\n\n}\n// $page End\n\n// $comp Begin\ndeclare namespace $comp {\n\n  namespace props {\n\n    const data: {\n      // Comp Prop Data Inner Begin\n      // Comp Prop Data \u7EC4\u4EF6\u5C5E\u6027 - Don't touch me\n      // Comp Prop Data Inner End\n    }\n\n    namespace events {\n      // Comp Prop Events Inner Begin\n      // Comp Prop Events \u7EC4\u4EF6\u4E8B\u4EF6 - Don't touch me\n      // Comp Prop Events Inner End\n    }\n\n  }\n\n  namespace dataset {\n\n    const state: {\n      // Comp State Inner Begin\n      // Comp State \u7EC4\u4EF6\u53D8\u91CF - Don't touch me\n      // Comp State Inner End\n    }\n\n  }\n\n  namespace handler {\n    // Comp Handler Inner Begin\n    // Comp Handler \u7EC4\u4EF6\u65B9\u6CD5 - Don't touch me\n    // Comp Handler Inner End\n  }\n\n}\n// $comp End\n\n// Global Formula Begin\n\ndeclare function ABS(num: number): number;\ndeclare function Min(...args: number[]): number;\ndeclare function Max(...args: number[]): number;\ndeclare function Average(...args: number[]): number;\ndeclare function Floor(num: number): number;\ndeclare function Ceiling(num: number): number;\ndeclare function Round(num: number): number;\ndeclare function Sum(...args: number[]): number;\ndeclare function Rand(num: number): number;\n\ndeclare function If(condition: boolean, val1: any, val2: any): any;\ndeclare function IsEmpty(text: string | string[]): boolean;\ndeclare function NotNull(val: any): boolean;\ndeclare function And(...args: boolean[]): boolean;\ndeclare function Or(...args: boolean[]): boolean;\n\ndeclare function Len(text: string): number;\ndeclare function Contains(text1: string, text2: string): boolean;\ndeclare function Split(text1: string, text2: string): string[];\ndeclare function Trim(text: string): string;\ndeclare function Upper(text: string): string;\ndeclare function Lower(text: string): string;\ndeclare function Concat(...text: string[]): string;\n\ndeclare function Now(): number;\ndeclare function Timestamp(arg: number | string | Date): number;\ndeclare function Second(arg: number | string | Date): number;\ndeclare function Minute(arg: number | string | Date): number;\ndeclare function Hour(arg: number | string | Date): number;\ndeclare function Day(arg: number | string | Date): number;\ndeclare function DayOfWeek(arg: number | string | Date): number;\ndeclare function Month(arg: number | string | Date): number;\ndeclare function Year(arg: number | string | Date): number;\ndeclare function GetDate(year: number, month: number, day: number): number;\ndeclare function DateTimeValue(arg: string, val: string): number;\ndeclare function Age(arg: number | string | Date, val: number | string | Date): number;\ndeclare function AgeOfNow(arg: number | string | Date): number;\ndeclare function DateAdd(arg: number | string | Date, day: number): number;\ndeclare function MonthAdd(arg: number | string | Date, month: number): number;\ndeclare function YearAdd(arg: number | string | Date, year: number): number;\ndeclare function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function DateText(createdTime: number | string | Date, text: string): string;\ndeclare function IsToday(date: number | string | Date): boolean;\n\n\n// Global Formula End\n";
-//# sourceMappingURL=auto-generated.d.ts.map

package/lib/utils/dts/auto-generated.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auto-generated.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/auto-generated.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,gyRAkQnB,CAAA"}