@cloudbase/lowcode-builder 0.0.1 → 0.0.5

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

@@ -12,7 +12,6 @@ export interface IBaseAppProps {
     devTool?: string;
     watch?: boolean;
     generateMpType?: GenerateMpType;
-    generateMpPath?: string;
     plugins?: IPlugin[];
     domain: string;
     extraData?: IExtraData;
@@ -20,8 +19,9 @@ export interface IBaseAppProps {
 export interface BuildAppProps extends IBaseAppProps {
     mainAppSerializeData?: IWeAppData;
     subAppSerializeDataList?: IWeAppData[];
+    generateMpPath?: string;
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, generateMpPath, plugins, extraData, resourceAppId, domain, output, }: IBaseAppProps & {
+export interface IBuildWedaApp extends IBaseAppProps {
     cals: IPlatformApp;
     subAppCalsList?: IPlatformApp[];
     deployOptions?: {
@@ -35,7 +35,8 @@ export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKe
     output?: {
         path?: string;
     };
-}, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+}
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function installDep(dir: any, opts?: IInstallOpts): Promise<void>;
 export declare const version: any;
 export default buildWedaApp;

package/lib/builder/core/index.js

@@ -17,7 +17,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
 const pkg = require('../../../package.json');
-async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, generateMpPath = '', plugins = [], extraData = {
+async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
 }, resourceAppId = undefined, domain = '', output, }, cb) {
@@ -33,16 +33,13 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     console.log('domain', domain);
     console.log('应用名', appKey);
     console.log('生成模式', generateMpType);
-    if (generateMpType === common_1.GenerateMpType.SUBPACKAGE) {
-        console.log('主包项目路径', generateMpPath);
-    }
     let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) ||
         (runtime === types_1.RUNTIME.CI
             ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir
             : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
     const startTime = Date.now();
     if (buildTypeList.includes(common_1.BuildType.MP)) {
-        appBuildDir = path_1.default.join(appBuildDir, 'mp');
+        appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp');
         const isMixMode = generateMpType === common_1.GenerateMpType.SUBPACKAGE;
         const apps = [mainAppSerializeData, ...subAppSerializeDataList];
         try {
@@ -66,16 +63,15 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
             if (isMixMode) {
-                generateMpPath = appBuildDir;
-                console.log(chalk_1.default.green('【混合模式】'), generateMpPath);
+                console.log(chalk_1.default.green('【混合模式】'), appBuildDir);
                 await (0, mixMode_1.handleMixMode)({
                     apps,
-                    generateMpPath,
+                    generateMpPath: appBuildDir,
                     miniprogramRoot: result.miniprogramRoot,
                     plugins,
                 });
             }
-            const outDir = isMixMode && generateMpPath ? generateMpPath : appBuildDir;
+            const outDir = appBuildDir;
             let projectJsonPath = path_1.default.resolve(outDir, 'project.config.json');
             await (0, postProcess_1.postprocessProjectConfig)(projectJsonPath, {
                 appid: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mpAppId,

package/lib/builder/mp/index.js

@@ -303,6 +303,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
             const wxml = (0, wxml_1.generateWxml)(page.componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, { ...ctx, rootPath, isPage: true }, usingComponents, componentGenerics);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
             const pageFileData = {
+                [`api.js|api.js`]: {},
                 [`index.js|${pageFileName}.js`]: {
                     widgetProps: (0, util_2.createWidgetProps)(page.componentInstances, ctx),
                     pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,

package/lib/builder/mp/lowcode.js

@@ -22,12 +22,18 @@ async function writeCode2file(mod, lowcodeRootDir, opts = {}, themeCode, ctx) {
             const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath
                 ? path_1.default.relative(ctx.rootPath, '') + '/'
                 : '';
-            let weappsApiPrefix = `import { app, process } from '${relativeRoot}${baseDir}/app/weapps-api'`; // windows compatibility
-            code = weappsApiPrefix + '\n' + code;
+            let weappsApiPrefix = [
+                `import { app, process } from '${relativeRoot}${baseDir}/app/weapps-api';`,
+                'const $app = app;',
+            ]; // windows compatibility
+            if (pageId !== 'global') {
+                weappsApiPrefix.push(`import { $page } from '${relativeRoot}${baseDir}/pages/${pageId}/api.js'`);
+            }
+            code = `${weappsApiPrefix.join('\n')}\n${code}`;
         }
         else {
             // Generate component lowcode
-            code = `import process from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/process'\nimport app from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/weapp-sdk'\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)}`;
+            code = `import process from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/process'\nimport app from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/weapp-sdk'\nconst $app = app;\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)};`;
         }
     }
     else {
@@ -44,7 +50,7 @@ async function writeCode2file(mod, lowcodeRootDir, opts = {}, themeCode, ctx) {
         }
     }
     if (pageId) {
-        code = handle$page(code);
+        // code = handle$page(code);
     }
     await (0, generateFiles_1.writeFile)(file, code);
 }

package/lib/builder/mp/materials.js

@@ -159,19 +159,17 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
         });
     });
     // #2 Generate composited libs
-    compositedLibs.map(async (lib) => {
+    await Promise.all(compositedLibs.map(async (lib) => {
         console.log('Generate composited library ' + lib.name);
         await (0, util_4.writeLibCommonRes2file)(lib, path.join(ctx.projDir, config_1.materialsDirName, lib.name, 'libCommonRes'));
-        return lib.components.map((cmp) => {
-            weappsList.forEach((app) => {
-                generateCompositeComponent(cmp, {
-                    ...ctx,
-                    // 只生成在主目录中，减少冗余
-                    // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
-                }, lib.compLibCommonResource);
-            });
-        });
-    });
+        await Promise.all(lib.components.map(async (cmp) => {
+            return generateCompositeComponent(cmp, {
+                ...ctx,
+                // 只生成在主目录中，减少冗余
+                // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
+            }, lib.compLibCommonResource);
+        }));
+    }));
 }
 exports.installMaterials = installMaterials;
 // 递归查询复合组件所使用的组件

package/lib/builder/util/generateFiles.js

@@ -62,7 +62,7 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
 exports.default = generateFiles;
 async function writeFile(outFile, content) {
     const generated = generatedFileContents[outFile];
-    if (generated === content) {
+    if (generated === content && fs_extra_1.default.existsSync(outFile)) {
         return false;
     }
     // console.log(outFile);

package/lib/tests/build.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tests/build.js

@@ -0,0 +1,17 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("../index");
+const data_1 = __importDefault(require("./data"));
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const outPath = path_1.default.resolve(__dirname, '.temp');
+fs_extra_1.default.emptyDirSync(outPath);
+(0, index_1.buildWedaApp)({
+    ...data_1.default,
+    output: { path: outPath },
+}).then((dir) => {
+    console.log(dir);
+});

package/lib/tests/build.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tests/build.test.js

@@ -0,0 +1,20 @@
+'use strict';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("../index");
+const data_1 = __importDefault(require("./data"));
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+describe('build', () => {
+    it('needs tests', async () => {
+        const outPath = path_1.default.resolve(__dirname, './temp');
+        fs_extra_1.default.emptyDir(outPath);
+        let dir = await (0, index_1.buildWedaApp)({
+            ...data_1.default,
+            output: { path: outPath },
+        });
+        console.log(dir);
+    });
+});

package/lib/tests/data.d.ts

@@ -0,0 +1,18 @@
+import { BuildType } from '../builder/types/common';
+import { DEPLOY_MODE } from '../types';
+export declare const test: {
+    appKey: string;
+    cals: any;
+    subAppCalsList: never[];
+    dependencies: any[];
+    buildTypeList: BuildType[];
+    deployOptions: {
+        mode: DEPLOY_MODE;
+        mpAppId: string;
+        targetMpAppId: string;
+    };
+    domain: string;
+    resourceAppId: string;
+};
+declare const _default: any;
+export default _default;