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

package/lib/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];
@@ -547,7 +551,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
         });
     }
     deploy() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this._time("DEPLOY");
@@ -575,7 +578,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
                     }
                     catch (e) {
                         this.api.logger.error(`${this.api.emoji('🚀')} custom publish fail: ${JSON.stringify(e)}`);
-                        if (((_a = e) === null || _a === void 0 ? void 0 : _a.code) !== 'ResourceNotFound') {
+                        if ((e === null || e === void 0 ? void 0 : e.code) !== 'ResourceNotFound') {
                             throw e;
                         }
                     }

package/lib/utils/dataSource.d.ts

@@ -1,24 +1 @@
-export declare const CLOUD_FUNCTION_TYPE = "cloud-function";
-export declare const EXTERNAL_FUNCTION_TYPE = "http";
-export declare const DATABASE_TYPE = "database";
-export declare function getDatasourceResourceName(datasrouce: any, mode: any): string;
-export declare function getAppDatasourceResourceName(appId: any, datasrouce: any, mode: any): string;
-export declare function getDatasourceDatabaseName(dsConfig: any, mode: any): string | null;
-export declare function mergeDependencies(...pkgs: any[]): {};
-export declare function lowercaseKey(obj: any, deep?: boolean): any;
-export declare function standardizeDataSource(ds: any): any;
-export declare function getDatasourceProfiles(datasources: any): any;
-export declare function getDatasetProfiles(mainAppData: {
-    dataset?: any;
-    rootPath?: string;
-    pageInstanceList?: {
-        dataset?: any;
-    }[];
-}, apps?: {
-    dataset?: any;
-    rootPath?: string;
-    pageInstanceList?: {
-        dataset?: any;
-    }[];
-}[]): {};
 //# sourceMappingURL=dataSource.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../src/utils/dataSource.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AACpD,eAAO,MAAM,sBAAsB,SAAS,CAAC;AAC7C,eAAO,MAAM,aAAa,aAAa,CAAC;AAMxC,wBAAgB,yBAAyB,CAAC,UAAU,KAAA,EAAE,IAAI,KAAA,UAGzD;AAED,wBAAgB,4BAA4B,CAAC,KAAK,KAAA,EAAE,UAAU,KAAA,EAAE,IAAI,KAAA,UAGnE;AAMD,wBAAgB,yBAAyB,CAAC,QAAQ,KAAA,EAAE,IAAI,KAAA,iBAEvD;AAMD,wBAAgB,iBAAiB,CAAC,GAAG,IAAI,OAAA,MAaxC;AAmBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,GAAG,CAU1D;AAOD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,GAAG,OA6C5C;AAOD,wBAAgB,qBAAqB,CAAC,WAAW,KAAA,OAehD;AA+BD,wBAAgB,kBAAkB,CAChC,WAAW,EAAE;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACxC,EACD,IAAI,CAAC,EAAE;IACL,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;CACxC,EAAE,MAeJ"}
+{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../src/utils/dataSource.ts"],"names":[],"mappings":""}

package/lib/utils/dataSource.js

@@ -1,156 +1 @@
 "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.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 lowcode_builder_1 = require("@cloudbase/lowcode-builder");
-const cals_1 = require("@cloudbase/cals");
-const util_1 = require("@cloudbase/lowcode-builder/lib/builder/mp/util");
-const index_1 = require("@cloudbase/lowcode-builder/lib/builder/config/index");
-exports.CLOUD_FUNCTION_TYPE = 'cloud-function';
-exports.EXTERNAL_FUNCTION_TYPE = 'http';
-exports.DATABASE_TYPE = 'database';
-function getDatasourceResourceName(datasrouce, mode) {
-    let suffix = mode === lowcode_builder_1.DEPLOY_MODE.PREVIEW ? `-preview` : '';
-    return `lcap-${datasrouce.id}-${datasrouce.name}${suffix}`;
-}
-exports.getDatasourceResourceName = getDatasourceResourceName;
-function getAppDatasourceResourceName(appId, datasrouce, mode) {
-    let suffix = mode === lowcode_builder_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 _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 === cals_1.PropBindType.static) {
-                            let value = bind.value;
-                            processed[paramKey] = `${index_1.REPLACE_SIGN}(app, $page) => (${typeof value === 'string' ? `'${value}'` : JSON.stringify(value)})${index_1.REPLACE_SIGN}`;
-                        }
-                        else {
-                            let jsExp = (0, util_1.generateDataBind)(bind);
-                            processed[paramKey] = `${index_1.REPLACE_SIGN}(app, $page) =>  (\n${jsExp || 'undefined'}\n)${index_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/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/lib/utils/postProcess.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-alpha.9",
+  "version": "1.0.3-beta.10",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -31,18 +31,18 @@
     "build": "tsc",
     "test": "jest",
     "link": "node scripts/link-packages.js",
-    "preinstall": "node scripts/preinstall.js"
+    "postinstall": "node scripts/postinstall.js"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.3.35",
+    "@cloudbase/cals": "^0.4.1",
     "@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.12",
+    "@cloudbase/lowcode-builder": "^1.0.20",
     "@formily/react-schema-renderer": "1.1.7",
     "archiver": "^4.0.1",
     "compressing": "^1.4.0",
@@ -65,6 +65,6 @@
     "@types/weixin-app": "^2.9.0",
     "csstype": "^2.6.10",
     "jest": "^26.0.1",
-    "typescript": "^3.8.3"
+    "typescript": "^4.7.4"
   }
 }

package/scripts/postinstall.js

@@ -2,13 +2,12 @@ const spawn = require('cross-spawn');
 const fs = require('fs-extra');
 const path = require('path');
 
-const packageName = '';
+const packageName = 'postcss@^8';
 function installDependencies(targetDir) {
   if (!process.env.CLOUDBASE_CIID) {
     return;
   }
 
-  let yarnExists = false;
   // try {
   //   let { stdout } = spawn.sync('yarn', ['-v']);
   //   let str = stdout.toString();
@@ -16,28 +15,33 @@ function installDependencies(targetDir) {
   //     yarnExists = true;
   //   }
   // } catch (e) {}
+  try {
+    let yarnExists = false;
 
-  const npmOptions = ['--prefer-offline', '--no-audit', '--progress=false', '--production', '--no-package-lock'];
+    const npmOptions = ['--prefer-offline', '--no-audit', '--progress=false', '--production', '--no-package-lock'];
 
-  let installProcess;
-  // 云端构建, 选用 npm
-  const installlProcessOptions = {
-    cwd: targetDir,
-    env: { ...process.env, NODE_ENV: '' },
-    stdio: 'inherit',
-  };
+    let installProcess;
+    // 云端构建, 选用 npm
+    const installlProcessOptions = {
+      cwd: targetDir,
+      env: { ...process.env, NODE_ENV: '' },
+      stdio: 'inherit',
+    };
 
-  if (yarnExists && !process.env.CLOUDBASE_CIID) {
-    const addPackage = packageName ? ['add', packageName] : [];
+    console.log('post install postcss in ' + targetDir);
 
-    installProcess = spawn.sync('yarn', [...addPackage], installlProcessOptions);
-  } else {
-    installProcess = spawn.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
-  }
+    if (yarnExists && !process.env.CLOUDBASE_CIID) {
+      const addPackage = packageName ? ['add', packageName] : [];
 
-  try {
+      installProcess = spawn.sync('yarn', [...addPackage], installlProcessOptions);
+    } else {
+      installProcess = spawn.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
+    }
     fs.removeSync(path.join(path.join(targetDir, 'yarn.lock')));
-  } catch (e) {}
+  } catch (e) {
+    console.log(e.message);
+  }
 }
 
-installDependencies(path.join(__dirname, '../'));
+// installDependencies(path.join(__dirname, '../'));
+installDependencies('/root/cloudbase-framework/registry');

package/scripts/preinstall.js

@@ -13,4 +13,4 @@ function installDependencies(targetDir) {
   } catch (e) {}
 }
 
-installDependencies(process.cwd());
+installDependencies(path.resolve('~/test/aaa/ttt/registry'));

package/template/src/handlers/utils/common.js

@@ -218,6 +218,7 @@ export async function checkAnonymous() {
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
+  return true
   <% if (isAdminPortal || isXPage) { %>return true;<% } %>
     app.showNavigationBarLoading();
   const { loginConfigVersion } = app.__internal__.getConfig();