@cloudbase/cli 2.5.1-alpha.0 → 2.5.1-alpha.2

package/lib/commands/lowcode/app.js

@@ -59,6 +59,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelTypeSync = exports.LowCodeDeployApp = exports.LowCodeBuildAppConfig = exports.LowCodePreviewApp = exports.LowCodeBuildApp = exports.LowCodeWatch = void 0;
+const lodash_1 = require("lodash");
 const common_1 = require("../common");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("./utils");
@@ -344,6 +345,18 @@ let ModelTypeSync = class ModelTypeSync extends common_1.Command {
                     envId: ctx.envId
                 }, null, 2), 'utf8');
             }
+            if (!(yield fs_extra_1.default.pathExists('tsconfig.json'))) {
+                yield fs_extra_1.default.writeFile('tsconfig.json', JSON.stringify({
+                    compilerOptions: {
+                        allowJs: true
+                    }
+                }, null, 2), 'utf8');
+            }
+            else {
+                const config = yield fs_extra_1.default.readJson('tsconfig.json', 'utf8');
+                (0, lodash_1.set)(config, 'compilerOptions.allowJs', true);
+                yield fs_extra_1.default.writeFile('tsconfig.json', JSON.stringify(config, null, 2), 'utf8');
+            }
             const cloudService = yield getCloudServiceInstance(ctx);
             const datasourceList = yield cloudService.lowcode.request('DescribeDataSourceList', {
                 EnvId: ctx.envId,

package/lib/utils/dts.js

@@ -24,19 +24,28 @@ function generateDataModelDTS(dataModelList) {
             };
         })));
         const result = `
-import { type DataModelMethods } from "@cloudbase/wx-cloud-client-sdk";
+import { DataModelMethods } from "@cloudbase/wx-cloud-client-sdk";
 ${dtsList.map((item) => item.dts).join('\n')}
-declare module "@cloudbase/wx-cloud-client-sdk" {
-    interface OrmClient {
-    ${dtsList
+
+interface IModels {
+${dtsList
             .map((item) => {
             return `
-        /**
-        * 数据模型：${item.title}
-        */ 
-        ${item.name}: DataModelMethods<${getModelInterfaceName(item.name)}>;`;
+    /**
+    * 数据模型：${item.title}
+    */ 
+    ${item.name}: DataModelMethods<${getModelInterfaceName(item.name)}>;`;
         })
-            .join('\n')}
+            .join('\n')}    
+}
+
+declare module "@cloudbase/wx-cloud-client-sdk" {
+    interface OrmClient extends IModels {}
+}
+
+declare global {
+    interface WxCloud {
+        models: IModels;
     }
 }`;
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.5.1-alpha.0",
+    "version": "2.5.1-alpha.2",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {