@cloudbase/cals 0.3.7 → 0.3.10-alpha.1

package/lib/types/platform/app.d.ts

@@ -1,5 +1,5 @@
 import * as Basic from '../basic/app';
-import { ICodeResource, IDataset, ILibraryResource } from './common';
+import { ICodeResource, IDataset } from './common';
 import { IPageComponent } from './component';
 import { IDataSourceVariable, IPlatformDataSource } from './datasource';
 import { IEvents } from '../basic/component';
@@ -32,9 +32,30 @@ export interface IPlatformApp extends Omit<Basic.IApp, 'attributes' | 'events' |
     /**
      * 可选, 应用的资源集合
      *
-     * 应用级别挂载了 code 和 library 资源
+     * 应用级别挂载了 code 资源
      */
-    resources?: (ICodeResource | ILibraryResource)[];
+    resources?: ICodeResource[];
+    /**
+     * 应用依赖和依赖对应版本信息，包含组件库，数据源sdk，应用运行时
+     * IDependencies
+     */
+    dependencies: IDependencies;
+}
+/**
+ * 格式和npm一样
+ * 格式：{ '依赖名称': <protocal>://<hostname><path>#semver:<版本号> } 遵循semver规范
+ * 区分组件库、数据源、应用运行时，用hostname区分。hostname分别如下：
+ * 组件库 -> components
+ * 数据源 -> datasources 预留
+ * 应用 -> app 预留
+ * 例子
+ * {
+ *    "gsd-h5-react": "weda://weda/components/#semver:1.0.0", //组件库
+ *    "@cloudbase/weda-cloud-sdk: : "1.2.1", //数据源是一个常规npm包
+ * }
+ */
+export interface IDependencies {
+    [key: string]: string;
 }
 export interface IPlatformAppExtra {
     historyType?: 'HASH' | 'BROWSER';

package/lib/types/platform/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../types/platform/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EACL,aAAa,EACb,QAAQ,EACR,gBAAgB,EAEjB,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C;;GAEG;AACH,MAAM,WAAW,YACf,SAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC/D;;OAEG;IACH,KAAK,EAAE,cAAc,EAAE,CAAA;IAEvB;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAA;IAEnC;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB;;;;OAIG;IACH,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAA;IAErC;;OAEG;IACH,KAAK,CAAC,EAAE,iBAAiB,CAAA;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,CAAC,aAAa,GAAG,gBAAgB,CAAC,EAAE,CAAA;CAcjD;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAC3C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;QACrB,OAAO,EAAE,MAAM,CAAA;KAChB,EAAE,CAAA;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACrC,SAAS,CAAC,EAAE,EAAE,CAAA;IACd;;OAEG;IACH,kBAAkB,CAAC,EAAE;QACnB,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,WAAW,EAAE,MAAM,CAAA;QACnB,gBAAgB,EAAE,CAAC,MAAM,GAAG;YAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;SAC/B,CAAC,EAAE,CAAA;KACL,EAAE,CAAA;CACJ;AAED,MAAM,WAAW,qBAAsB,SAAQ,OAAO;IACpD;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC;;OAEG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAA;CACpC"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../types/platform/app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EACL,aAAa,EACb,QAAQ,EAGT,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C;;GAEG;AACH,MAAM,WAAW,YACf,SAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC/D;;OAEG;IACH,KAAK,EAAE,cAAc,EAAE,CAAA;IAEvB;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAA;IAEnC;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB;;;;OAIG;IACH,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAA;IAErC;;OAEG;IACH,KAAK,CAAC,EAAE,iBAAiB,CAAA;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,aAAa,EAAE,CAAA;IAE3B;;;OAGG;IACF,YAAY,EAAE,aAAa,CAAA;CAc7B;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,eAAe,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAC3C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAA;QACb,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;QACrB,OAAO,EAAE,MAAM,CAAA;KAChB,EAAE,CAAA;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACrC,SAAS,CAAC,EAAE,EAAE,CAAA;IACd;;OAEG;IACH,kBAAkB,CAAC,EAAE;QACnB,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,WAAW,EAAE,MAAM,CAAA;QACnB,gBAAgB,EAAE,CAAC,MAAM,GAAG;YAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;SAC/B,CAAC,EAAE,CAAA;KACL,EAAE,CAAA;CACJ;AAED,MAAM,WAAW,qBAAsB,SAAQ,OAAO;IACpD;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC;;OAEG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAA;CACpC"}

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

@@ -37,6 +37,46 @@ export declare enum EResourceType {
     CODE = "CODE",
     LIBRARY = "LIBRARY"
 }
+export declare enum ECodeType {
+    /**
+     * 生命周期
+     */
+    LIFECYCLE = "lifecycle",
+    /**
+     * 配置
+     */
+    CONFIG = "config",
+    /**
+     * 状态
+     */
+    STATE = "state",
+    /**
+     * 计算状态
+     */
+    COMPUTEDN = "computed",
+    /**
+     * 处理方法，用于处理页面级别的逻辑
+     * 拥有页面实例上下文，如可取得 state 状态 page/hanlder
+     */
+    HANDLER_FN = "handler-fn",
+    /**
+     * 一般的模块
+     * 可以是任意JS模块，但不具有页面实例上下文。一般用于写通用方法等 global/common
+     */
+    NORMAL_MODULE = "normal-module",
+    /**
+     * less 文件
+     */
+    STYLE = "style",
+    /**
+     * theme less
+     */
+    THEME = "theme",
+    /**
+     * 小程序全局配置
+     */
+    MPCONFIG = "mp_config"
+}
 export interface ICodeResource extends Basic.IResource {
     /**
      * 资源类型

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../types/platform/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,SAAS;AACT,MAAM,WAAW,QAAQ;IACvB,SAAS;IACT,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,mBAAmB,CAAC,CAAA;IAC5D,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CACzC;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,KAAK,EAAE,MAAM,CAAA;IACb,WAAW;IACX,OAAO,EAAE,OAAO,CAAA;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU;IACV,YAAY,EAAE,GAAG,CAAA;CAClB;AAED,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,UAAU;IACV,KAAK,EAAE,MAAM,CAAA;IACb,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,4BAA4B;IAE5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;GAEG;AACH,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,aAAc,SAAQ,KAAK,CAAC,SAAS;IACpD;;OAEG;IACH,IAAI,EAAE,aAAa,CAAC,IAAI,CAAA;IAExB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,KAAK,CAAC,SAAS;IACvD,IAAI,EAAE,aAAa,CAAC,OAAO,CAAA;IAE3B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,KAAK,CAAC,SAAS;IACxD;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IAExB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;CACX"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../types/platform/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,SAAS;AACT,MAAM,WAAW,QAAQ;IACvB,SAAS;IACT,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,mBAAmB,CAAC,CAAA;IAC5D,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CACzC;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU;IACV,KAAK,EAAE,MAAM,CAAA;IACb,WAAW;IACX,OAAO,EAAE,OAAO,CAAA;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU;IACV,YAAY,EAAE,GAAG,CAAA;CAClB;AAED,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B,UAAU;IACV,KAAK,EAAE,MAAM,CAAA;IACb,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,4BAA4B;IAE5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;GAEG;AACH,oBAAY,aAAa;IACvB,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,oBAAY,SAAS;IACnB;;OAEG;IACH,SAAS,cAAc;IACvB;;OAEG;IACH,MAAM,WAAW;IACjB;;OAEG;IACH,KAAK,UAAU;IACf;;OAEG;IACH,SAAS,aAAa;IACtB;;;OAGG;IACH,UAAU,eAAe;IACzB;;;OAGG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,KAAK,UAAU;IACf;;OAEG;IACH,KAAK,UAAU;IACf;;OAEG;IACH,QAAQ,cAAc;CACvB;AAED,MAAM,WAAW,aAAc,SAAQ,KAAK,CAAC,SAAS;IACpD;;OAEG;IACH,IAAI,EAAE,aAAa,CAAC,IAAI,CAAA;IAExB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,gBAAiB,SAAQ,KAAK,CAAC,SAAS;IACvD,IAAI,EAAE,aAAa,CAAC,OAAO,CAAA;IAE3B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,KAAK,CAAC,SAAS;IACxD;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IAExB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;CACX"}

package/lib/types/platform/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EResourceType = void 0;
+exports.ECodeType = exports.EResourceType = void 0;
 /**
  * 资源类型
  */
@@ -9,3 +9,44 @@ var EResourceType;
     EResourceType["CODE"] = "CODE";
     EResourceType["LIBRARY"] = "LIBRARY";
 })(EResourceType = exports.EResourceType || (exports.EResourceType = {}));
+var ECodeType;
+(function (ECodeType) {
+    /**
+     * 生命周期
+     */
+    ECodeType["LIFECYCLE"] = "lifecycle";
+    /**
+     * 配置
+     */
+    ECodeType["CONFIG"] = "config";
+    /**
+     * 状态
+     */
+    ECodeType["STATE"] = "state";
+    /**
+     * 计算状态
+     */
+    ECodeType["COMPUTEDN"] = "computed";
+    /**
+     * 处理方法，用于处理页面级别的逻辑
+     * 拥有页面实例上下文，如可取得 state 状态 page/hanlder
+     */
+    ECodeType["HANDLER_FN"] = "handler-fn";
+    /**
+     * 一般的模块
+     * 可以是任意JS模块，但不具有页面实例上下文。一般用于写通用方法等 global/common
+     */
+    ECodeType["NORMAL_MODULE"] = "normal-module";
+    /**
+     * less 文件
+     */
+    ECodeType["STYLE"] = "style";
+    /**
+     * theme less
+     */
+    ECodeType["THEME"] = "theme";
+    /**
+     * 小程序全局配置
+     */
+    ECodeType["MPCONFIG"] = "mp_config";
+})(ECodeType = exports.ECodeType || (exports.ECodeType = {}));

package/lib/utils/build.js

@@ -37,9 +37,9 @@ const compilerOptions = {
 };
 // optionally pass a base path
 const basePath = '.';
-const calsProgram = TJS.getProgramFromFiles([path_1.resolve(process.cwd(), 'types/basic/app.ts')], compilerOptions, basePath);
-const platformCalsProgram = TJS.getProgramFromFiles([path_1.resolve(process.cwd(), 'types/platform/app.ts')], compilerOptions, basePath);
-const lcdsProgram = TJS.getProgramFromFiles([path_1.resolve(process.cwd(), 'types/lcds.ts')], compilerOptions, basePath);
+const calsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'types/basic/app.ts')], compilerOptions, basePath);
+const platformCalsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'types/platform/app.ts')], compilerOptions, basePath);
+const lcdsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'types/lcds.ts')], compilerOptions, basePath);
 // ... or a generator that lets us incrementally get more schemas
 const calsGenerator = TJS.buildGenerator(calsProgram, settings);
 const platformCalsGenerator = TJS.buildGenerator(platformCalsProgram, settings);
@@ -65,7 +65,7 @@ const resolveLcdsAction = lodash_1.default.merge({}, lcdsAction, {
         }
     }
 });
-fs_1.writeFileSync(path_1.resolve(process.cwd(), 'schema/basic_application.json'), JSON.stringify(basicApp, null, 2));
-fs_1.writeFileSync(path_1.resolve(process.cwd(), 'schema/platform_application.json'), JSON.stringify(platformApp, null, 2));
-fs_1.writeFileSync(path_1.resolve(process.cwd(), 'schema/lcds_component.json'), JSON.stringify(resolveLcdsComponent, null, 2));
-fs_1.writeFileSync(path_1.resolve(process.cwd(), 'schema/lcds_action.json'), JSON.stringify(resolveLcdsAction, null, 2));
+(0, fs_1.writeFileSync)((0, path_1.resolve)(process.cwd(), 'schema/basic_application.json'), JSON.stringify(basicApp, null, 2));
+(0, fs_1.writeFileSync)((0, path_1.resolve)(process.cwd(), 'schema/platform_application.json'), JSON.stringify(platformApp, null, 2));
+(0, fs_1.writeFileSync)((0, path_1.resolve)(process.cwd(), 'schema/lcds_component.json'), JSON.stringify(resolveLcdsComponent, null, 2));
+(0, fs_1.writeFileSync)((0, path_1.resolve)(process.cwd(), 'schema/lcds_action.json'), JSON.stringify(resolveLcdsAction, null, 2));

package/lib/utils/constant.d.ts

@@ -0,0 +1,11 @@
+/**
+ * cals->dependencies协议：
+ * 格式：{ 组件库: <protocal>://<hostname><path>#<版本号> } 遵循semver规范
+ * 例子：
+ * {
+ *    "gsd-h5-react": "weda://weda/components/#1.0.0", //组件库
+ *    "@cloudbase/weda-cloud-sdk: : "1.2.1", //数据源是一个常规npm包
+ * }
+ */
+export declare const WEDA_COMP_DEPENDENCIES_PREFIX = "weda://weda/components/#";
+//# sourceMappingURL=constant.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../utils/constant.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACF,eAAO,MAAM,6BAA6B,6BAA6B,CAAC"}

package/lib/utils/constant.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WEDA_COMP_DEPENDENCIES_PREFIX = void 0;
+/**
+ * cals->dependencies协议：
+ * 格式：{ 组件库: <protocal>://<hostname><path>#<版本号> } 遵循semver规范
+ * 例子：
+ * {
+ *    "gsd-h5-react": "weda://weda/components/#1.0.0", //组件库
+ *    "@cloudbase/weda-cloud-sdk: : "1.2.1", //数据源是一个常规npm包
+ * }
+ */
+exports.WEDA_COMP_DEPENDENCIES_PREFIX = 'weda://weda/components/#';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.3.7",
+  "version": "0.3.10-alpha.1",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "files": [
@@ -20,14 +20,14 @@
   "license": "MIT",
   "dependencies": {
     "acorn": "^8.0.4",
-    "lodash": "^4.17.20",
-    "typescript-json-schema": "^0.43.0"
+    "lodash": "^4.17.20"
   },
   "devDependencies": {
     "@types/acorn": "^4.0.5",
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.14.6",
     "typedoc-neo-theme": "^1.0.10",
-    "typescript": "^4.1.2"
+    "typescript": "^4.1.2",
+    "typescript-json-schema": "^0.43.0"
   }
 }