@cloudbase/framework-plugin-low-code 1.0.3-beta.10 → 1.0.3-beta.13

package/lib/utils/dataSource.js

@@ -1 +1,171 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDatasetProfiles = exports.getDataVarProfiles = exports.getDatasourceProfiles = exports.standardizeDataSource = exports.lowercaseKey = exports.mergeDependencies = exports.getDatasourceDatabaseName = exports.getAppDatasourceResourceName = exports.getDatasourceResourceName = exports.DATABASE_TYPE = exports.EXTERNAL_FUNCTION_TYPE = exports.CLOUD_FUNCTION_TYPE = void 0;
+const merge_package_json_1 = __importDefault(require("merge-package-json"));
+const types_1 = require("../types");
+const expression_1 = require("@cloudbase/cals/lib/parser/expression");
+const util_1 = require("../builder/mp/util");
+const config_1 = require("../builder/config");
+exports.CLOUD_FUNCTION_TYPE = 'cloud-function';
+exports.EXTERNAL_FUNCTION_TYPE = 'http';
+exports.DATABASE_TYPE = 'database';
+function getDatasourceResourceName(datasrouce, mode) {
+    let suffix = mode === types_1.DEPLOY_MODE.PREVIEW ? `-preview` : '';
+    return `lcap-${datasrouce.id}-${datasrouce.name}${suffix}`;
+}
+exports.getDatasourceResourceName = getDatasourceResourceName;
+function getAppDatasourceResourceName(appId, datasrouce, mode) {
+    let suffix = mode === types_1.DEPLOY_MODE.PREVIEW ? `-preview` : '';
+    return `lcap-${datasrouce.id}-${datasrouce.name}-${appId}${suffix}`;
+}
+exports.getAppDatasourceResourceName = getAppDatasourceResourceName;
+function getDatasourceDatabaseName(dsConfig, mode) {
+    return dsConfig.type === exports.DATABASE_TYPE
+        ? getDatasourceResourceName(dsConfig, mode)
+        : null;
+}
+exports.getDatasourceDatabaseName = getDatasourceDatabaseName;
+function mergeDependencies(...pkgs) {
+    let result = { dependencies: {} };
+    result = pkgs.reduce((acc, pkg) => {
+        var _a;
+        const formated = getDependencies(pkg);
+        for (let key in formated.dependencies) {
+            formated.dependencies[key] =
+                formated.dependencies[key] === '*' && ((_a = acc === null || acc === void 0 ? void 0 : acc.dependencies) === null || _a === void 0 ? void 0 : _a[key]) === '*'
+                    ? 'latest'
+                    : formated.dependencies[key];
+        }
+        const merged = (0, merge_package_json_1.default)(formated, acc);
+        return JSON.parse(merged);
+    }, result);
+    return result.dependencies;
+}
+exports.mergeDependencies = mergeDependencies;
+function getDependencies(pkg) {
+    if (pkg.dependencies && typeof pkg.dependencies === 'object') {
+        return {
+            dependencies: pkg.dependencies,
+        };
+    }
+    return {
+        dependencies: pkg,
+    };
+}
+function lowercaseKey(obj, deep) {
+    if (!obj || typeof obj !== 'object')
+        return obj;
+    if (Array.isArray(obj))
+        return obj.map((item) => lowercaseKey(item, deep));
+    const result = {};
+    return Object.keys(obj).reduce((acc, key) => {
+        const smallCase = key.charAt(0).toLowerCase() + key.slice(1);
+        const val = obj[key];
+        acc[smallCase] = deep ? lowercaseKey(val, deep) : val;
+        return acc;
+    }, result);
+}
+exports.lowercaseKey = lowercaseKey;
+function standardizeDataSource(ds) {
+    const transformed = lowercaseKey(ds, true);
+    try {
+        const { schema } = ds;
+        if (typeof transformed.schema === 'string') {
+            transformed.schema = JSON.parse(transformed.schema);
+        }
+        if (!transformed.schema || typeof transformed.schema !== 'object') {
+            transformed.schema = {};
+        }
+    }
+    catch (error) {
+        transformed.schema = {};
+    }
+    try {
+        const { methods } = ds;
+        if (typeof transformed.methods === 'string') {
+            transformed.methods = JSON.parse(transformed.methods);
+        }
+        if (!Array.isArray(transformed.methods)) {
+            transformed.methods = [];
+        }
+    }
+    catch (error) {
+        transformed.methods = [];
+    }
+    return transformed;
+}
+exports.standardizeDataSource = standardizeDataSource;
+function getDatasourceProfiles(datasources) {
+    return ((datasources === null || datasources === void 0 ? void 0 : datasources.map((item) => {
+        const ds = standardizeDataSource(item);
+        return {
+            id: ds.id,
+            title: ds.title,
+            name: ds.name,
+            type: ds.type,
+            childDataSourceNames: ds.childDataSourceNames,
+            schema: ds.schema,
+            methods: ds.methods,
+        };
+    })) || []);
+}
+exports.getDatasourceProfiles = getDatasourceProfiles;
+function getDataVarProfiles(appData) {
+    const result = {
+        $global: (appData.vars && appData.vars.data) || [],
+    };
+    appData.pageInstanceList.forEach((pageInstance) => {
+        let p = pageInstance;
+        result[p.id] = (p.vars && p.vars.data) || [];
+    });
+    return result;
+}
+exports.getDataVarProfiles = getDataVarProfiles;
+function _generateDynamicDataset(dataset) {
+    var _a;
+    let { state } = dataset;
+    if (state) {
+        for (let key in state) {
+            let config = state[key];
+            if (config.varType === 'datasource' && ((_a = config.initMethod) === null || _a === void 0 ? void 0 : _a.params)) {
+                let params = config.initMethod.params;
+                if (params) {
+                    let processed = {};
+                    for (let paramKey in params) {
+                        let bind = params[paramKey];
+                        if (!bind.type || bind.type === expression_1.PropBindType.static) {
+                            let value = bind.value;
+                            processed[paramKey] = `${config_1.REPLACE_SIGN}(app, $page) => (${typeof value === 'string' ? `'${value}'` : JSON.stringify(value)})${config_1.REPLACE_SIGN}`;
+                        }
+                        else {
+                            let jsExp = (0, util_1.generateDataBind)(bind);
+                            processed[paramKey] = `${config_1.REPLACE_SIGN}(app, $page) =>  (\n${jsExp || 'undefined'}\n)${config_1.REPLACE_SIGN}`;
+                        }
+                    }
+                    config.initMethod.params = processed;
+                }
+            }
+        }
+    }
+    return dataset;
+}
+function getDatasetProfiles(mainAppData, apps) {
+    const result = {};
+    if (mainAppData.dataset) {
+        result['$global'] = _generateDynamicDataset(mainAppData.dataset);
+    }
+    (apps || []).forEach((app) => {
+        var _a;
+        (_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((pageInstance) => {
+            let p = pageInstance;
+            if (p.dataset) {
+                result[app.rootPath ? `${app.rootPath}/${p.id}` : p.id] = _generateDynamicDataset(p.dataset);
+            }
+        });
+    });
+    return result;
+}
+exports.getDatasetProfiles = getDatasetProfiles;

package/lib/weapps-core/config/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/weapps-core/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/weapps-core/types/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/weapps-core/utils/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "1.0.3-beta.10",
+  "version": "1.0.3-beta.13",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -37,12 +37,12 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.4.1",
+    "@cloudbase/cals": "^0.4.7",
     "@cloudbase/framework-core": "^1.8.16",
     "@cloudbase/framework-plugin-auth": "^1.8.16",
     "@cloudbase/framework-plugin-mp": "1.9.5-beta.0",
     "@cloudbase/framework-plugin-website": "^1.8.17",
-    "@cloudbase/lowcode-builder": "^1.0.20",
+    "@cloudbase/lowcode-builder": "^1.0.27",
     "@formily/react-schema-renderer": "1.1.7",
     "archiver": "^4.0.1",
     "compressing": "^1.4.0",

package/template/src/app/common.js

@@ -1,13 +0,0 @@
-<% mods.forEach((mod) => {%>
-  import * as <%= mod %> from '../lowcode/common/<%= mod %>'<%}) %>
-
-  function getModule(targetModule) {
-    if(targetModule.__esModule) {
-      return targetModule.default ? targetModule.default : targetModule
-    }
-  }
-
-  export default {
-  <% mods.forEach((mod) => {%>
-    <%= mod %>: getModule(<%= mod %>),<%}) %>
-  }

package/template/src/app/global-api.js

@@ -1,132 +0,0 @@
-import * as sdk from '@tcwd/weapps-sdk';
-import {
-  createWebApp,
-  _ACTIONS_KEY as ACTIONS_KEY,
-  _ROUTER_KEY as ROUTER_KEY,
-} from '@cloudbase/weda-client';
-import { createComputed } from 'utils';
-import { createDataset } from '../datasources';
-import store, { subPackageName } from '../store';
-import computed from '../store/computed';
-import common from './common';
-import { formatEnum, enumOptions } from '../utils/formatEnum';
-import { _isMobile } from '../utils';
-import actionMap from './material-actions';
-import { get as lodashGet } from 'lodash';
-
-const mainAppKey = '__weappsMainApp';
-const appGlobal = process.env.isMiniprogram ? getApp() : window;
-
-export const app = createGlboalApi();
-export const $page = createPageApi();
-
-function createGlboalApi() {
-  const webApp = createWebApp({
-    id: '<%= appId %>',
-    domain: '<%= domain %>',
-    appConfig: <%= appConfig %>,
-  });
-  const globalAPI = {
-    id: '<%= appId %>',
-    domain: '<%= domain %>',
-    formActions: {},
-    pages: {},
-    session: {
-      // configure: sdk.configure,
-      // request: sdk.request,
-      // getSessionId: sdk.getSessionId,
-    },
-    state: store,
-    computed: createComputed(computed.global),
-    common,
-    invoke(params) {
-      return $page.invokeComponentMethod(params);
-    },
-    ...webApp,
-  };
-
-  globalAPI.__internal__.enumOptions = enumOptions;
-  globalAPI.utils.formatEnum = formatEnum;
-  globalAPI.utils._getConfig = () => {
-    console.warn('deprecated app.utils._getConfig');
-    return globalAPI.__internal__.getConfig();
-  }
-
-  const dataset = createDataset('$global');
-  globalAPI.dataset = dataset;
-  globalAPI.state.dataset = dataset;
-  globalAPI.setState = (userSetState) => {
-    Object.keys(userSetState).forEach((keyPath) => {
-      globalAPI.utils.set(globalAPI.dataset.state, keyPath, userSetState[keyPath]);
-    });
-  };
-  if (subPackageName) {
-    // is sub app
-    globalAPI.mainApp = appGlobal[mainAppKey];
-  } else {
-    // is mainApp
-    appGlobal.app = globalAPI;
-    appGlobal[mainAppKey] = globalAPI;
-  }
-
-  // 挂运营平台上报对象到app里
-  globalAPI.yyptReport = appGlobal.yyptReport;
-
-  // # expose some sdk modules
-  const sdkModsIncluded = ['flow', 'getPageOptions', 'getLaunchOptions'];
-  sdkModsIncluded.forEach((key) => {
-    globalAPI[key] = sdk[key];
-  });
-  return globalAPI;
-}
-function createPageApi() {
-  const $page = {
-    state: {},
-    computed: {},
-    handler: {},
-    props: {},
-    widgets: {},
-    // 页面数据源变量存储位置
-    dataVar: {},
-  };
-  $page.invokeComponentMethod = ({ component, method, params }) => {
-    const widgetData = lodashGet($page.widgets, component);
-    if (Array.isArray(widgetData)) {
-      throw new Error('调用方法失败：id为' + component + '的组件拥有多个实例');
-      // widgetData.forEach(widget => {
-      //   if(!widget._methods[method]) {
-      //     throw new Error('NOT_FOUND')
-      //   } else {
-      //     actions.push(widget._methods[method])
-      //   }
-      // })
-    } else {
-      if (!widgetData._methods[method] || typeof widgetData._methods[method] != 'function') {
-        throw new Error('调用方法失败：未找到id为' + component + '下的方法' + method);
-      }
-      return widgetData._methods[method](params);
-    }
-  };
-  return $page;
-}
-
-// 分app 和 wx 挂载app
-export const mountAPIs = (sdks) => {
-  Object.keys(sdks).forEach((item) => {
-    let action = sdks[item];
-    if(item === 'showModal') {
-      const OFFICIAL_COMPONENT_LIB = 'gsd-h5-react';
-      const showModal = actionMap[OFFICIAL_COMPONENT_LIB]?.showModal;
-      if (!_isMobile() && showModal) {
-        action = function (params) {
-          return showModal({ data: params });
-        };
-      }
-      app[item] = action;
-    }
-    else if (!(item in ACTIONS_KEY) && !(item in ROUTER_KEY)) {
-      app[item] = action;
-    }
-  });
-  return app;
-};

package/template/src/app/handlers.js

@@ -1,13 +0,0 @@
-<%for(const pageId in pageModules) {
-    pageModules[pageId].filter(mod => mod.type === 'handler-fn' && mod.name !== '____index____').forEach(mod => {%>
-      import <%= pageId%>_<%= mod.name%> from '../lowcode/<%= pageId%>/handler/<%= mod.name%>'<%
-  })
-}%>
-
-<% for(const pageId in pageModules) {%>
-export const $$_<%=pageId %> = {<%
-    pageModules[pageId].filter(mod => mod.type === 'handler-fn' && mod.name !== '____index____').forEach(mod => {%>
-  ['<%= mod.name%>']: <%= pageId%>_<%= mod.name%>,<%
-  }) %>
-}
-<%}%>

package/template/src/app/material-actions.js

@@ -1,16 +0,0 @@
-// Imports all material actions
-<% materials.map((material,index) => { if(material.entries && material.entries.actions){ %>
-import * as <%= _.camelCase(material.name)%>Actions_<%= index%> from 'libraries/<%=material.name%>@<%= material.version %>/<%=material.entries.actions%>';
-<% } else if(material.entries && material.entries.entry) {%>
-import <%= _.camelCase(material.name)%>_<%= index%> from 'libraries/<%=material.name%>@<%= material.version %>/<%=material.entries.entry%>';
-const <%= _.camelCase(material.name)%>Actions_<%= index%> = <%= _.camelCase(material.name)%>_<%= index%>.actions
-<% } else { (material.actions || []).map(act => {%>
-import <%= _.camelCase(material.name)%>_<%=act.name%> from 'libraries/<%=material.name%>@<%= material.version %>/actions/<%= act.name %>'
-<% }) }}) %>
-export default {
-  <% materials.map((material, index) => {
-  %>  ['<%= material.name%>']:<% if(material.entries && (material.entries.entry || material.entries.actions)){ %> <%=_.camelCase(material.name)%>Actions_<%= index%>,
-  <% }else{ %> {<% (material.actions || []).map(act => { %>
-      ['<%= act.name%>']: <%= _.camelCase(material.name)%>_<%=act.name%>,<%})%>
-    },
-  <%}}) %>}

package/template/src/app/mountAppApis.js

@@ -1,25 +0,0 @@
-import { mountAPIs } from './global-api';
-import sdk from '@tcwd/weapps-sdk/lib/app-h5-sdk';
-
-mountAPIs(sdk);
-
-/**
- * 适配 wx.navigateTo 用法
- */
-function navigateTo({ url }) {
-  let paths = url.split('?');
-  let result = /pages\/([0-9a-zA-z_]+)\/index/.exec(paths[0]);
-  let hash = '';
-  if (result.length > 1) {
-    hash = `/${result[0]}`;
-  }
-  let path = `/${hash}`;
-  location.hash = `${path}${paths[1] ? `?${paths[1]}` : ''}`;
-}
-if (process.env.isApp) {
-  window.wx = {
-    ...(window.wx || {}),
-    ...sdk,
-    navigateTo,
-  };
-}

package/template/src/app/mountMpApis.js

@@ -1,4 +0,0 @@
-import { mountAPIs } from './global-api'
-import sdk from 'libraries/compatible-sdk/wx-sdk'
-
-mountAPIs(sdk)

package/template/src/datasources/config.js.tpl

@@ -1,27 +0,0 @@
-import dataSourceProfiles from './datasource-profiles'
-import datasetProfiles from './dataset-profiles'
-
-/**
- * 数据源基本配置
- */
-export default {
-  /** 当前是否处于正式发布模式 */
-  isProd: <%= isProd %>,
-  /** 低码应用ID */
-  appID: '<%= appID %>',
-  /** 云开发环境ID */
-  envID: '<%= envID %>',
-  /** 应用端ID */
-  tcbClientId: '<%= clientID %>',
-  /** 数据源描述对象数组 */
-  dataSourceProfiles: dataSourceProfiles,
-  /**
-   * 新的dataset变量配置对象
-   *  key 为页面ID(全局为$global), val 为变量配置数组
-   */
-  datasetProfiles: datasetProfiles,
-  /**
-   * 是否开启私有化
-   */
-  isPrivate: window._isPrivate || false
-}

package/template/src/datasources/dataset-profiles.js.tpl

@@ -1,5 +0,0 @@
-/**
- * 全局及页面的数据源变量定义文件
- */
-
-export default <%= datasetProfiles %>

package/template/src/datasources/datasource-profiles.js.tpl

@@ -1,4 +0,0 @@
-/**
- * 数据源摘要描述数组
- */
-export default <%= datasourceProfiles %>

package/template/src/datasources/index.js.tpl

@@ -1,27 +0,0 @@
-import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
-import config from './config';
-
-const {
-  setConfig,
-  initTcb,
-  createDataset,
-  createStateDataSourceVar,
-  generateParamsParser,
-  EXTRA_API,
-  CLOUD_SDK,
-  DS_SDK
-} = WEDA_CLOUD_SDK
-
-export {
-  createDataset,
-  createStateDataSourceVar,
-  generateParamsParser,
-  EXTRA_API,
-  CLOUD_SDK,
-  DS_SDK,
-}
-
-setConfig(config);
-<% if(!isXPage){ %>
-initTcb();
-<%}%>