@cloudbase/framework-plugin-low-code 0.7.22 → 1.0.0

package/lib/builder/mp/index.d.ts

@@ -1,7 +1,7 @@
-import { IMaterialItem, IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IMaterialItem, IWeAppData, IPlugin } from '../../weapps-core';
 import { IBuildContext } from './BuildContext';
 import { DEPLOY_MODE } from '../../types';
-import { BuildType, IAppUsedComp, IUsedComps } from '@cloudbase/lowcode-builder';
+import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
 export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, }: {
     weapps: IWeAppData[];
     projDir: string;

package/lib/builder/mp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,8CAA8C,CAAC;AAMtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAiC,YAAY,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAQhH,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CA+OvC;AAsJD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,iBAuB9F;AAiBD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA6BA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAiC,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQrG,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CA+OvC;AAsJD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,iBAuB9F;AAiBD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA6BA"}

package/lib/builder/mp/index.js

@@ -36,7 +36,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
 const fs = __importStar(require("fs-extra"));
-const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
+const weapps_core_1 = require("../../weapps-core");
 const config_1 = require("../config");
 const mp_1 = require("../config/mp");
 const generateFiles_1 = __importStar(require("../util/generateFiles"));
@@ -52,7 +52,7 @@ const util_3 = require("../util");
 const style_1 = require("../util/style");
 const dataSource_1 = require("../../utils/dataSource");
 const types_1 = require("../../types");
-const lowcode_builder_1 = require("@cloudbase/lowcode-builder");
+const common_1 = require("../types/common");
 const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
 const net_1 = require("../util/net");
@@ -107,7 +107,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
                     domain,
                 }, 'common/util.js': {
-                    isAdminPortal: (0, lowcode_builder_1.buildAsAdminPortalByBuildType)(buildTypeList),
+                    isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
                 }, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
                     dataPropNames: wxmlDataPrefix,
                     debug: !buildContext.isProduction,

package/lib/generate.d.ts

@@ -1,3 +1,2 @@
-import { IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export declare function handleMpPlugins(plugins: IPlugin[] | undefined, appBuildDir: string): Promise<void>;
+export declare function handleMpPlugins(plugins: any[] | undefined, appBuildDir: string): Promise<void>;
 //# sourceMappingURL=generate.d.ts.map

package/lib/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAIvE,wBAAsB,eAAe,CAAC,OAAO,uBAAgB,EAAE,WAAW,EAAE,MAAM,iBAuBjF"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,wBAAsB,eAAe,CAAC,OAAO,mBAAwB,EAAE,WAAW,EAAE,MAAM,iBAuBzF"}

package/lib/index.d.ts

@@ -2,7 +2,6 @@
 import { PathLike } from 'fs-extra';
 import { Plugin, PluginServiceApi } from '@cloudbase/framework-core';
 import { BuildType, GenerateMpType, DEPLOY_MODE, RUNTIME } from '@cloudbase/lowcode-builder';
-import { IMaterialItem, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export declare const DIST_PATH = "./dist";
 declare const DEFAULT_INPUTS: {
     _inputFile: string;
@@ -35,12 +34,12 @@ export interface IFrameworkPluginLowCodeInputs {
     appId: string;
     mainAppSerializeData: any;
     subAppSerializeDataList?: any[];
-    dependencies?: IMaterialItem[];
+    dependencies?: any[];
     buildTypeList?: BuildType[];
     generateMpType?: GenerateMpType;
     mpAppId?: string;
     generateMpPath?: string;
-    plugins?: IPlugin[];
+    plugins?: any[];
     mpDeployPrivateKey?: string;
     deployOptions: {
         mode: DEPLOY_MODE;

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAOA,OAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIrE,OAAO,EAEL,SAAS,EAET,cAAc,EACd,WAAW,EACX,OAAO,EAMR,MAAM,4BAA4B,CAAC;AAgBpC,eAAO,MAAM,SAAS,WAAW,CAAC;AAiBlC,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;CAoBnB,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAM5C,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAMhB,OAAO,CAAC,EAAE,OAAO,CAAC;IAIlB,KAAK,EAAE,MAAM,CAAC;IAId,oBAAoB,EAAE,GAAG,CAAC;IAI1B,uBAAuB,CAAC,EAAE,GAAG,EAAE,CAAC;IAIhC,YAAY,CAAC,EAAoB,GAAG,EAAE,CAAC;IAKvC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC;IAK5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAIhC,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,cAAc,CAAC,EAAE,MAAM,CAAC;IAIxB,OAAO,CAAC,EAAc,GAAG,EAAE,CAAC;IAI5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAK5B,aAAa,EAAE;QAIb,IAAI,EAAE,WAAW,CAAC;QAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;QAIjB,WAAW,CAAC,EAAE,MAAM,CAAC;QAIrB,OAAO,CAAC,EAAE,MAAM,CAAC;QAIjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAI5B,aAAa,CAAC,EAAE,MAAM,CAAC;QAIvB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IAKF,UAAU,CAAC,EAAE;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAIlB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IAKF,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAIF,SAAS,CAAC,EAAE;QACV,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,EAAE,GAAG,CAAC;KAChB,CAAC;IAIF,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,oBAAY,cAAc,GAAG,6BAA6B,GAAG,OAAO,cAAc,CAAC;AAEnF,cAAM,aAAc,SAAQ,MAAM;IAkBb,IAAI,EAAE,MAAM;IAAS,GAAG,EAAE,gBAAgB;IAAS,MAAM,EAAE,6BAA6B;IAjB3G,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;IAC1C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,WAAW,MAAC;IACtB,SAAS,CAAC,mBAAmB,MAAC;IAC9B,SAAS,CAAC,UAAU,MAAC;IACrB,SAAS,CAAC,eAAe,MAAC;IAC1B,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,QAAQ,KAAM;IACxB,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,CAAM;IAC9B,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC;IACxB,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC;IACtB,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;IAC/B,SAAS,CAAC,cAAc,CAAC,EAAE;QACzB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;gBACiB,IAAI,EAAE,MAAM,EAAS,GAAG,EAAE,gBAAgB,EAAS,MAAM,EAAE,6BAA6B;IAuF3G,QAAQ;IAMR,qBAAqB,CAAC,aAAa,EAAE,cAAc;IA0EnD,eAAe;IAQf,KAAK,CAAC,KAAK,KAAA;IASX,QAAQ,CAAC,KAAK,KAAA;IAWR,IAAI;IAKJ,GAAG;IAKH,MAAM;IAKN,OAAO;IAKP,KAAK;IA6PL,OAAO;IAkGP,MAAM;IAkGN,qBAAqB,CAAC,OAAO,EAAE,MAAM;IA+BrC,mBAAmB,CAAC,KAAK,KAAA,EAAE,KAAK,UAAQ;IAgBxC,eAAe,CAAC,KAAK,KAAA,EAAE,KAAK,UAAQ;IAqB1C,eAAe,CAAC,OAAO,KAAA;IAIjB,gBAAgB;IA8GhB,2BAA2B;IA6D3B,UAAU;IAoBV,OAAO,CAAC,GAAG,KAAA,EAAE,IAAI,KAAA;IAejB,uBAAuB;IAoBvB,yBAAyB;IA0F/B,oBAAoB;CAKrB;AA4BD,eAAO,MAAM,MAAM,sBAAgB,CAAC"}

package/lib/index.js

@@ -510,19 +510,24 @@ class LowCodePlugin extends framework_core_1.Plugin {
                         this.api.logger.error('创建私有化JS文件失败:', e);
                         throw e;
                     }
-                    const deployContent = [
-                        ...(this._webPlugin.buildOutput.static || []),
-                        ...(this._webPlugin.buildOutput.staticConfig || []),
-                        {
-                            src: privateJsPath,
-                            cloudPath: `/weda-config/${private_1.PRIVATE_JS_NAME}`,
-                        },
-                    ];
-                    yield Promise.all(deployContent.map((options) => this.api.cloudbaseManager.hosting.uploadFiles({
-                        localPath: options.src,
-                        cloudPath: options.cloudPath,
-                        ignore: this._webPlugin.resolvedInputs.ignore,
-                    })));
+                    if (!(0, lowcode_builder_1.buildAsXPageByBuildType)(this._resolvedInputs.buildTypeList)) {
+                        const deployContent = [
+                            ...(this._webPlugin.buildOutput.static || []),
+                            ...(this._webPlugin.buildOutput.staticConfig || []),
+                            {
+                                src: privateJsPath,
+                                cloudPath: `/weda-config/${private_1.PRIVATE_JS_NAME}`,
+                            },
+                        ];
+                        yield Promise.all(deployContent.map((options) => this.api.cloudbaseManager.hosting.uploadFiles({
+                            localPath: options.src,
+                            cloudPath: options.cloudPath,
+                            ignore: this._webPlugin.resolvedInputs.ignore,
+                        })));
+                    }
+                    else {
+                        this.api.logger.info('xpage 跳过部署流程');
+                    }
                 }
                 if (!Object.keys(res.Resources || {}).length && !Object.keys(res.Config || {}).length) {
                     this._skipInstallExt = true;

package/lib/utils/dataSource.d.ts

@@ -1,4 +1,3 @@
-import { IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export declare const CLOUD_FUNCTION_TYPE = "cloud-function";
 export declare const EXTERNAL_FUNCTION_TYPE = "http";
 export declare const DATABASE_TYPE = "database";
@@ -9,9 +8,6 @@ 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 getDataVarProfiles(appData: IWebRuntimeAppData): {
-    $global: any[];
-};
 export declare function getDatasetProfiles(mainAppData: {
     dataset?: any;
     rootPath?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"dataSource.d.ts","sourceRoot":"","sources":["../../src/utils/dataSource.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAEnB,MAAM,8CAA8C,CAAC;AAMtD,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,iBAIvD;AAMD,wBAAgB,iBAAiB,CAAC,GAAG,IAAI,OAAA,MAexC;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;AAOD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;EAU7D;AAiCD,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,MAgBJ"}
+{"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"}

package/lib/utils/dataSource.js

@@ -3,7 +3,7 @@ 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;
+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");
@@ -23,9 +23,7 @@ function getAppDatasourceResourceName(appId, datasrouce, mode) {
 }
 exports.getAppDatasourceResourceName = getAppDatasourceResourceName;
 function getDatasourceDatabaseName(dsConfig, mode) {
-    return dsConfig.type === exports.DATABASE_TYPE
-        ? getDatasourceResourceName(dsConfig, mode)
-        : null;
+    return dsConfig.type === exports.DATABASE_TYPE ? getDatasourceResourceName(dsConfig, mode) : null;
 }
 exports.getDatasourceDatabaseName = getDatasourceDatabaseName;
 function mergeDependencies(...pkgs) {
@@ -35,9 +33,7 @@ function mergeDependencies(...pkgs) {
         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];
+                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);
@@ -113,17 +109,6 @@ function getDatasourceProfiles(datasources) {
     })) || []);
 }
 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;
@@ -162,8 +147,7 @@ function getDatasetProfiles(mainAppData, apps) {
         (_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);
+                result[app.rootPath ? `${app.rootPath}/${p.id}` : p.id] = _generateDynamicDataset(p.dataset);
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.7.22",
+  "version": "1.0.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -35,11 +35,12 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "0.3.17",
+    "@cloudbase/cals": "^0.3.31",
     "@cloudbase/framework-core": "^1.8.16",
     "@cloudbase/framework-plugin-auth": "^1.8.16",
     "@cloudbase/framework-plugin-mp": "v1.3.6-beta.8",
     "@cloudbase/framework-plugin-website": "^1.8.17",
+    "@cloudbase/lowcode-builder": "^1.0.1",
     "@formily/react-schema-renderer": "1.1.7",
     "archiver": "^4.0.1",
     "axios": "^0.21.0",

package/template/html/index.html.ejs

@@ -450,7 +450,7 @@
     ></script>
     <script
       crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.13/dist/web.browser.js"
+      src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.15/dist/web.browser.js"
     ></script>
   </body>
 </html>

package/template/mp/app/app-global.js

@@ -1,4 +0,0 @@
-// 空对象，用于存储全局数据
-export default {
-
-}

package/template/mp/app/common.js

@@ -1,26 +0,0 @@
-<% mods.forEach((mod) => {%>
-import * as <%= mod %> from '../lowcode/common/<%= mod %>'<%}) %>
-
-const _weapps_app_common = {}
-
-function getDefaultModule(targetModule) {
-  if (!targetModule) {
-    return
-  }
-  const keys = Object.keys(targetModule)
-  if (keys.length === 1 && keys[0] === 'default') {
-    return targetModule.default
-  }
-  return targetModule
-}
-
-Object.defineProperties(_weapps_app_common, {
-  <% mods.forEach((mod) => {%>
-  <%= mod %>: {
-      get() {
-        return getDefaultModule(<%= mod %>)
-      }
-    },<%}) %>
-})
-
-export default _weapps_app_common

package/template/mp/app/handlers.js

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

package/template/mp/app/weapps-api.js

@@ -1,89 +0,0 @@
-import { observable } from 'mobx'
-import { createMpApp } from '@cloudbase/weda-client';
-import { createComputed, formatEnum, enumOptions} from '<%= subLevelPath %>../common/util'
-import process from '<%= subLevelPath %>../common/process'
-import appGlobal from '<%= subLevelPath %>../app/app-global'
-import { CLOUD_SDK, createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
-
-
-<% if (!isBare) {%>
-import state from '../lowcode/state'
-import computed from '../lowcode/computed'
-import common from './common'
-<%} else {%>
-const state = {}
-const computed ={}
-const common = {}
-<%}%>
-
-const mainAppKey = '__weappsMainApp'
-
-export const app = createGlboalApi()
-export { process }
-
-function createGlboalApi() {
-  const mpApp = createMpApp({
-    appConfig: <%= appConfig %>
-  })
-  const globalAPI = {
-    id: '<%= appId %>',
-    domain: '<%= domain %>',
-    platform: 'MINIPROGRAME',
-    pages: {},
-    session: {
-      //configure: sdk.configure,
-      //request: sdk.request,
-      //getSessionId: sdk.getSessionId,
-    },
-    state: observable(state),
-    computed: createComputed(computed),
-    common,
-    invoke(params) {
-      return app.__internal__.activePage.invokeComponentMethod(params)
-    },
-    ...mpApp,
-  } // The global api exposed to lowcode
-
-
-  globalAPI.__internal__.enumOptions = enumOptions
-  globalAPI.utils.formatEnum = formatEnum
-  /**
-   * @deprecated utils._getConfig
-   */
-  globalAPI.utils._getConfig = () => {
-    return globalAPI.__internal__.getConfig()
-  }
-  globalAPI.utils.getWXContext = async function() {
-    const { Data } = await globalAPI.cloud.callWedaApi({
-      action: 'InvokeComponentWxModule',
-      data: {
-        Method: 'GetWxContext',
-      },
-    });
-    return typeof Data === 'string' ? JSON.parse(Data) : Data
-  }
-
-  let 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]);
-    });
-  };
-
-  const subPackageName = '<%= subPackageName %>'
-  if (subPackageName) {
-    // is sub app
-    globalAPI.mainApp = appGlobal[mainAppKey]
-    const mpApp = getApp()
-    mpApp && (mpApp.subApp = globalAPI)
-  } else {
-    // is mainApp
-    appGlobal[mainAppKey] = globalAPI
-  }
-  // 避免被wx.cloud 覆盖
-  globalAPI.cloud = CLOUD_SDK
-
-  return globalAPI
-}

package/template/mp/app.js

@@ -1,114 +0,0 @@
-import lifeCycle from './lowcode/lifecycle'
-import { app } from './app/weapps-api'
-// 引入数据源管理器并进行初始化
-import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index';
-import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
-
-// 设置数据源请求的 loading 及 toast 处理
-setConfig({
-  beforeDSRequest: (cfg) => {
-    if (!cfg.options || !cfg.options.showLoading) return
-    app.showLoading()
-  },
-  beforeCallFunction: async (params) => {
-    try {
-      const loginPage = findLoginPage();
-
-      let skip = false;
-      switch (params?.data?.methodName) {
-        case 'callWedaApi': {
-          if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
-            skip = true;
-          }
-          break;
-        }
-      }
-
-      // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
-        return params;
-      }
-      // await initTcb();
-      const { accessToken } = await getAccessToken();
-      if (accessToken) {
-        params.data.accessToken = accessToken;
-      }
-    } catch (e) {
-      if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
-        app.showToast({
-          title: '登录态失效',
-          icon: 'error',
-        });
-      }
-      console.error('beforeCallFunction error', e);
-    }
-    return params;
-  },
-  afterDSRequest: (cfg, error, result) => {
-    if (!cfg.options) return
-    if (cfg.options.showLoading) app.hideLoading()
-    if (!cfg.options.showToast) return
-    const isSuccess = !error && result && !result.code
-    app.showToast({ icon: isSuccess ? 'success' : 'error' })
-  },
-  async afterCallFunction(params, error, res) {
-    if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
-      const loginPage = findLoginPage();
-      if (loginPage) {
-        const authConfig = await getAuthConfig();
-        let isAnonymous = true;
-        try {
-          const { accessToken } = await getAccessToken();
-          isAnonymous = !accessToken;
-        } catch (e) { }
-        if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
-          redirectToLogin();
-        } else if (authConfig.RejectStrategy == 'show_warning') {
-          app.showToast({
-            title: '接口无访问权限',
-            icon: 'error',
-          });
-        }
-      }
-    }
-  }
-})
-
-App({
-  onLaunch(options) {
-    this.app = app
-    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
-    let { query = {} } = options
-    EXTRA_API.setParams('$global', query)
-    createStateDataSourceVar('$global', generateParamsParser({ app }))
-
-    onLaunch && onLaunch.call(this, options)
-      <% if (yyptConfig.yyptAppKey) { %>
-        // 挂运营平台上报对象到app里
-        app.yyptReport = wxReport
-          <% }%>
-  },
-  onShow(options) {
-    const fn = lifeCycle.onShow || lifeCycle.onAppShow
-    fn && fn.call(this, options)
-      <% if (yyptConfig.yyptAppKey) { %>
-        wxReport.startReport()
-        <% }%>
-  },
-  onHide() {
-    const fn = lifeCycle.onHide || lifeCycle.onAppHide
-    fn && fn.call(this)
-  },
-  onError(msg) {
-    const fn = lifeCycle.onError || lifeCycle.onAppError
-    fn && fn.call(this, msg)
-  },
-  onPageNotFound() {
-    const fn = lifeCycle.onPageNotFound
-    fn && fn.call(this)
-  },
-  onUnhandledRejection() {
-    const fn = lifeCycle.onUnhandledRejection
-    fn && fn.call(this)
-  },
-})

package/template/mp/app.json

@@ -1 +0,0 @@
-<%= JSON.stringify(content, ' ', 2) %>

package/template/mp/app.wxss

@@ -1,15 +0,0 @@
-/** common.wxss **/
-page {
-  /* 修复小程序 Picker 组件滑动体验问题 */
-  touch-action: pan-y;
-}
-
-page view, page element, page text, page image {
-  box-sizing: border-box;
-}
-
-/** import styles specified by material libs*/<% importStyles.map(style => {%>
-@import  '<%= style %>';<%})%>
-
-/** import lowcode styles */
-@import  'lowcode/style.wxss';

package/template/mp/common/data-patch-test.js

@@ -1,60 +0,0 @@
-import assert from 'assert'
-import { getDatapatch } from './data-patch.js'
-
-const cases = [
-    {
-        desc: 'New component',
-        base: {},
-        data: { id1: { a: 1 } },
-        patch: { id1: { a: 1 } }
-    }, {
-        desc: 'Component prop update',
-        base: { id1: { a: 1, b: 2 } },
-        data: { id1: { a: 1, b: 3 } },
-        patch: { 'id1.b': 3 }
-    }, {
-        desc: 'More than 1/3 of props changed',
-        base: { id1: { a: 1, b: 2, c: 3 } },
-        data: { id1: { a: 1, b: 4, c: 5 } },
-        patch: { id1: { a: 1, b: 4, c: 5 } }
-    }, {
-        desc: 'New multiple components',
-        base: {},
-        data: { id1: { a: 1 }, id2: { c: 2 }, id3: [{ c: 1 }] },
-        patch: { id1: { a: 1 }, id2: { c: 2 }, id3: [{ c: 1 }] }
-    },
-    {
-        desc: 'Update component prop in array',
-        base: { id1: [{ a: 1 }, { a: 2 }, { a: 8 }] },
-        data: { id1: [{ a: 1 }, { a: 3 }, { a: 8 }] },
-        patch: { 'id1[1].a': 3 }
-    },
-    {
-        desc: 'Update component prop in 2d array',
-        base: { id1: [[{ a: 1 }, { a: 2 }], [{ a: 1 }]] },
-        data: { id1: [[{ a: 1 }, { a: 3 }], [{ a: 1 }]] },
-        patch: { 'id1[0][1].a': 3 }
-    },
-    {
-        desc: 'Add component in array',
-        base: { id1: [{ a: 1 }, { a: 2 }] },
-        data: { id1: [{ a: 1 }, { a: 2 }, { a: 9 }] },
-        patch: { 'id1[2]': { a: 9 } }
-    },
-    {
-        desc: 'Add 2 components in array',
-        base: { id1: [{ a: 1 }, { a: 2 }] },
-        data: { id1: [{ a: 1 }, { a: 2 }, { a: 9 }, { a: 8 }] },
-        patch: { 'id1[2]': { a: 9 }, 'id1[3]': { a: 8 } }
-    },
-    {
-        desc: 'array: delete component',
-        base: { id1: [{ a: 1 }, { a: 2 }, { a: 2 }] },
-        data: { id1: [{ a: 1 }, { a: 2 }] },
-        patch: { id1: [{ a: 1 }, { a: 2 }] }
-    }
-]
-
-for (const c of cases) {
-    assert.deepStrictEqual(getDatapatch(c.base, c.data), c.patch, c.desc)
-}

package/template/mp/common/data-patch.js

@@ -1,44 +0,0 @@
-
-export function getDatapatch(base, pendingData) {
-  const patch = {}
-  for (const widgetId in pendingData) {
-    const baseWidget = base[widgetId]
-    const pendingWidget = pendingData[widgetId]
-    if (!baseWidget) {
-      patch[widgetId] = pendingWidget
-    } else {
-      patchProp(baseWidget, pendingWidget, patch, widgetId)
-    }
-  }
-  return patch
-}
-
-function patchProp(baseWidget, pendingWidget, patch, prefixes) {
-  if (Array.isArray(pendingWidget)) {
-    if (pendingWidget.length < baseWidget.length) { // array element deleted
-      patch[prefixes] = pendingWidget
-      return
-    }
-    for (let i = 0; i < pendingWidget.length; i++) {
-      if (!baseWidget[i]) { // new array element
-        patch[prefixes + '[' + i + ']'] = pendingWidget[i]
-      } else {
-        patchProp(baseWidget[i], pendingWidget[i], patch, prefixes + '[' + i + ']')
-      }
-    }
-  } else {
-    if (pendingWidget._waIf === false && baseWidget._waIf === false) {
-      return
-    }
-    const allProps = Object.keys(pendingWidget)
-    // Attention: since setData will copy data deeply, if property is object, it should be treated as different
-    const differentProps = allProps.filter(prop => typeof pendingWidget[prop] === 'object' || pendingWidget[prop] !== baseWidget[prop])
-    if (differentProps.length === 1 || differentProps.length <= allProps.length / 3) {
-      differentProps.map(patchProp => {
-        patch[prefixes + '.' + patchProp] = pendingWidget[patchProp]
-      })
-    } else {
-      patch[prefixes] = pendingWidget
-    }
-  }
-}