cloudcc-cli 1.8.7 → 1.8.9

package/src/project/create.js

@@ -1,84 +1,84 @@
-const chalk = require("chalk")
-const inquirer = require("inquirer")
-const memFs = require("mem-fs")
-const memFsEditor = require("mem-fs-editor")
-const fs = require("fs")
-const path = require("path")
-
-class Creator {
-    constructor() {
-        this.fs = memFsEditor.create(memFs.create());
-        this.options = {
-            name: "",
-            description: ""
-        }
-
-        this.rootPath = path.resolve(__dirname, "../../");
-
-        this.tplDirPath = path.join(this.rootPath, "template");
-    }
-
-    async init(name) {
-        console.log()
-        console.log(chalk.green('Welcome CloudCC-CLI'));
-        console.log()
-        if (!name) {
-            this.ask().then(answers => {
-                this.options = Object.assign({}, this.options, answers);
-                console.log(this.options);
-                this.write();
-            })
-        } else {
-            this.options = { name }
-            this.write();
-        }
-    }
-
-    ask() {
-        const prompt = [];
-
-        prompt.push({
-            type: "input",
-            name: "name",
-            message: "Please enter the project name",
-            validate(input) {
-                if (!input) {
-                    return "Please enter the project name"
-                }
-
-                if (fs.existsSync(input)) {
-                    return "Project name already exists"
-                }
-
-                return true;
-            }
-        });
-        return inquirer.prompt(prompt)
-    }
-
-    write() {
-        console.log();
-        console.log(chalk.green("Starting construction, please wait"));
-        const tplBuilder = require("../../template/index");
-        tplBuilder(this, this.options, () => {
-            console.log();
-            console.log(chalk.green('Build completed, please install dependencies before running'))
-            console.log();
-        })
-    }
-
-    getTplPath(file) {
-        return path.join(this.tplDirPath, file);
-    }
-
-    copyTpl(file, to, data = {}) {
-        const tplPath = this.getTplPath(file);
-        this.fs.copyTpl(tplPath, to, data);
-    }
-
-    copy(file, to) {
-        const tplPath = this.getTplPath(file);
-        this.fs.copy(tplPath, to)
-    }
-}
+const chalk = require("chalk")
+const inquirer = require("inquirer")
+const memFs = require("mem-fs")
+const memFsEditor = require("mem-fs-editor")
+const fs = require("fs")
+const path = require("path")
+
+class Creator {
+    constructor() {
+        this.fs = memFsEditor.create(memFs.create());
+        this.options = {
+            name: "",
+            description: ""
+        }
+
+        this.rootPath = path.resolve(__dirname, "../../");
+
+        this.tplDirPath = path.join(this.rootPath, "template");
+    }
+
+    async init(name) {
+        console.log()
+        console.log(chalk.green('Welcome CloudCC-CLI'));
+        console.log()
+        if (!name) {
+            this.ask().then(answers => {
+                this.options = Object.assign({}, this.options, answers);
+                console.log(this.options);
+                this.write();
+            })
+        } else {
+            this.options = { name }
+            this.write();
+        }
+    }
+
+    ask() {
+        const prompt = [];
+
+        prompt.push({
+            type: "input",
+            name: "name",
+            message: "Please enter the project name",
+            validate(input) {
+                if (!input) {
+                    return "Please enter the project name"
+                }
+
+                if (fs.existsSync(input)) {
+                    return "Project name already exists"
+                }
+
+                return true;
+            }
+        });
+        return inquirer.prompt(prompt)
+    }
+
+    write() {
+        console.log();
+        console.log(chalk.green("Starting construction, please wait"));
+        const tplBuilder = require("../../template/index");
+        tplBuilder(this, this.options, () => {
+            console.log();
+            console.log(chalk.green('Build completed, please install dependencies before running'))
+            console.log();
+        })
+    }
+
+    getTplPath(file) {
+        return path.join(this.tplDirPath, file);
+    }
+
+    copyTpl(file, to, data = {}) {
+        const tplPath = this.getTplPath(file);
+        this.fs.copyTpl(tplPath, to, data);
+    }
+
+    copy(file, to) {
+        const tplPath = this.getTplPath(file);
+        this.fs.copy(tplPath, to)
+    }
+}
 module.exports = Creator;

package/src/project/create1.js

@@ -1,106 +1,106 @@
-const chalk = require("chalk")
-const inquirer = require("inquirer")
-const memFs = require("mem-fs")
-const memFsEditor = require("mem-fs-editor")
-const fs = require("fs")
-const path = require("path")
-const tplBuilder = require("../../template/index");
-const execSync = require('child_process').execSync;
-
-class Creator {
-    constructor() {
-        this.fs = memFsEditor.create(memFs.create());
-        this.options = {
-            name: "",
-            description: ""
-        }
-
-        this.rootPath = path.resolve(__dirname, "../../");
-
-        this.tplDirPath = path.join(this.rootPath, "template");
-    }
-
-    async init(name) {
-        console.log()
-        console.log(chalk.green('Welcome CloudCC-CLI'));
-        console.log()
-        if (!name) {
-            this.ask().then(answers => {
-                this.options = Object.assign({}, this.options, answers);
-                console.log(this.options);
-                this.write();
-            })
-        } else {
-            this.options = { name }
-            this.write();
-        }
-    }
-
-    ask() {
-        const prompt = [];
-
-        prompt.push({
-            type: "input",
-            name: "name",
-            message: "Please enter the project name",
-            validate(input) {
-                if (!input) {
-                    return "Please enter the project name"
-                }
-
-                if (fs.existsSync(input)) {
-                    return "Project name already exists"
-                }
-
-                return true;
-            }
-        });
-        return inquirer.prompt(prompt)
-    }
-
-    write() {
-        console.log();
-        console.log(chalk.green("Starting construction, please wait"));
-        tplBuilder(this, this.options, () => {
-            console.log();
-            this.initGit(path.join(process.cwd(), this.options.name))
-            console.log(chalk.green('Build completed, please install dependencies before running'))
-            console.log();
-        })
-    }
-
-    getTplPath(file) {
-        return path.join(this.tplDirPath, file);
-    }
-
-    copyTpl(file, to, data = {}) {
-        const tplPath = this.getTplPath(file);
-        this.fs.copyTpl(tplPath, to, data);
-    }
-
-    copy(file, to) {
-        const tplPath = this.getTplPath(file);
-        this.fs.copy(tplPath, to)
-    }
-
-    initGit(path) {
-        try {
-            execSync(`git -C ${path} init`)
-            execSync(`git -C ${path} add .`)
-            execSync(`git -C ${path} commit -m 'init'`)
-            console.log(`${chalk.grey(`Git repository initialization completed`)} ${chalk.green('✔ ')}`);
-            console.log();
-            console.log(`${chalk.yellow(`Please set the warehouse address: git remote add origin [remote repository address]`)}`);
-            console.log();
-        } catch (error) {
-            console.log();
-            console.log(chalk.red('git repository initialization exception'))
-            console.log();
-        }
-    }
-}
-function create(argvs) {
-    let c = new Creator();
-    c.init(argvs[2])
-}
+const chalk = require("chalk")
+const inquirer = require("inquirer")
+const memFs = require("mem-fs")
+const memFsEditor = require("mem-fs-editor")
+const fs = require("fs")
+const path = require("path")
+const tplBuilder = require("../../template/index");
+const execSync = require('child_process').execSync;
+
+class Creator {
+    constructor() {
+        this.fs = memFsEditor.create(memFs.create());
+        this.options = {
+            name: "",
+            description: ""
+        }
+
+        this.rootPath = path.resolve(__dirname, "../../");
+
+        this.tplDirPath = path.join(this.rootPath, "template");
+    }
+
+    async init(name) {
+        console.log()
+        console.log(chalk.green('Welcome CloudCC-CLI'));
+        console.log()
+        if (!name) {
+            this.ask().then(answers => {
+                this.options = Object.assign({}, this.options, answers);
+                console.log(this.options);
+                this.write();
+            })
+        } else {
+            this.options = { name }
+            this.write();
+        }
+    }
+
+    ask() {
+        const prompt = [];
+
+        prompt.push({
+            type: "input",
+            name: "name",
+            message: "Please enter the project name",
+            validate(input) {
+                if (!input) {
+                    return "Please enter the project name"
+                }
+
+                if (fs.existsSync(input)) {
+                    return "Project name already exists"
+                }
+
+                return true;
+            }
+        });
+        return inquirer.prompt(prompt)
+    }
+
+    write() {
+        console.log();
+        console.log(chalk.green("Starting construction, please wait"));
+        tplBuilder(this, this.options, () => {
+            console.log();
+            this.initGit(path.join(process.cwd(), this.options.name))
+            console.log(chalk.green('Build completed, please install dependencies before running'))
+            console.log();
+        })
+    }
+
+    getTplPath(file) {
+        return path.join(this.tplDirPath, file);
+    }
+
+    copyTpl(file, to, data = {}) {
+        const tplPath = this.getTplPath(file);
+        this.fs.copyTpl(tplPath, to, data);
+    }
+
+    copy(file, to) {
+        const tplPath = this.getTplPath(file);
+        this.fs.copy(tplPath, to)
+    }
+
+    initGit(path) {
+        try {
+            execSync(`git -C ${path} init`)
+            execSync(`git -C ${path} add .`)
+            execSync(`git -C ${path} commit -m 'init'`)
+            console.log(`${chalk.grey(`Git repository initialization completed`)} ${chalk.green('✔ ')}`);
+            console.log();
+            console.log(`${chalk.yellow(`Please set the warehouse address: git remote add origin [remote repository address]`)}`);
+            console.log();
+        } catch (error) {
+            console.log();
+            console.log(chalk.red('git repository initialization exception'))
+            console.log();
+        }
+    }
+}
+function create(argvs) {
+    let c = new Creator();
+    c.init(argvs[2])
+}
 module.exports = create;

package/src/project/index.js

@@ -1,7 +1,7 @@
-const cc = {}
-cc.create = require("./create1")
-function Plugin(action, argvs) {
-    cc[action](argvs)
-}
-
-module.exports = Plugin;
+const cc = {}
+cc.create = require("./create1")
+function Plugin(action, argvs) {
+    cc[action](argvs)
+}
+
+module.exports = Plugin;

package/src/recordType/get.js

@@ -1,13 +1,13 @@
-const { getBusToken } = require("../../utils/utils")
-const { postNormal } = require("../../utils/http")
-
-async function get(path, prefix) {
-    
-    if (await getBusToken(path)) {
-        let res = await postNormal(global.apiSvc + "/api/batch/getRecordType", { prefix: prefix })
-        console.log(JSON.stringify(res.data.recordTypeList))
-        return res.data
-    }
-}
-
-module.exports = get;
+const { getBusToken } = require("../../utils/utils")
+const { postNormal } = require("../../utils/http")
+
+async function get(path, prefix) {
+    
+    if (await getBusToken(path)) {
+        let res = await postNormal(global.apiSvc + "/api/batch/getRecordType", { prefix: prefix })
+        console.log(JSON.stringify(res.data.recordTypeList))
+        return res.data
+    }
+}
+
+module.exports = get;

package/src/recordType/index.js

@@ -1,7 +1,7 @@
-const cc = {}
-cc.get = require("./get")
-function main(action, argvs) {
-  cc[action](argvs[2],argvs[3])
-}
-
-module.exports = main;
+const cc = {}
+cc.get = require("./get")
+function main(action, argvs) {
+  cc[action](argvs[2],argvs[3])
+}
+
+module.exports = main;

package/src/script/create.js

@@ -1,36 +1,36 @@
-const { checkUpdate } = require("../../utils/checkVersion")
-const fs = require("fs");
-const path = require("path")
-const chalk = require("chalk")
-
-async function create(argvs) {
-    let res = await checkUpdate();
-    if (!res) {
-        let body = JSON.parse(decodeURI(argvs[2]))
-        const baseScriptPath = path.join(process.cwd(), "script");
-        const objectFolderPath = path.join(baseScriptPath, body.schemetableName.toLowerCase());
-        const filePath = path.join(objectFolderPath, body.scriptName);
-
-        try {
-            // 确保对象文件夹和脚本文件夹都存在
-            fs.mkdirSync(objectFolderPath, { recursive: true });
-            fs.mkdirSync(filePath, { recursive: true });
-
-            const fileTmp =
-                `function main($CCDK, obj){
-    console.log("hello World")
-}`
-            fs.writeFileSync(path.join(filePath, body.scriptName + ".js"), fileTmp)
-            fs.writeFileSync(path.join(filePath, "config.json"), JSON.stringify(body))
-            console.log()
-            console.log(chalk.green("Successfully Created:" + body.scriptName))
-            console.log()
-        } catch (e) {
-            console.log()
-            console.log(chalk.red("Creation Failed:" + e))
-            console.log()
-        }
-    }
-}
-
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+
+async function create(argvs) {
+    let res = await checkUpdate();
+    if (!res) {
+        let body = JSON.parse(decodeURI(argvs[2]))
+        const baseScriptPath = path.join(process.cwd(), "script");
+        const objectFolderPath = path.join(baseScriptPath, body.schemetableName.toLowerCase());
+        const filePath = path.join(objectFolderPath, body.scriptName);
+
+        try {
+            // 确保对象文件夹和脚本文件夹都存在
+            fs.mkdirSync(objectFolderPath, { recursive: true });
+            fs.mkdirSync(filePath, { recursive: true });
+
+            const fileTmp =
+                `function main($CCDK, obj){
+    console.log("hello World")
+}`
+            fs.writeFileSync(path.join(filePath, body.scriptName + ".js"), fileTmp)
+            fs.writeFileSync(path.join(filePath, "config.json"), JSON.stringify(body))
+            console.log()
+            console.log(chalk.green("Successfully Created:" + body.scriptName))
+            console.log()
+        } catch (e) {
+            console.log()
+            console.log(chalk.red("Creation Failed:" + e))
+            console.log()
+        }
+    }
+}
+
 module.exports = create;

package/src/script/index.js

@@ -1,8 +1,8 @@
-const cc = {}
-cc.create = require("./create")
-cc.publish = require("./publish")
-function main(action, argvs) {
-  cc[action](argvs)
-}
-
-module.exports = main;
+const cc = {}
+cc.create = require("./create")
+cc.publish = require("./publish")
+function main(action, argvs) {
+  cc[action](argvs)
+}
+
+module.exports = main;

package/src/script/publish.js

@@ -1,51 +1,71 @@
-
-const { checkUpdate } = require("../../utils/checkVersion")
-const fs = require("fs");
-const path = require("path")
-const chalk = require("chalk")
-const { post } = require("../../utils/http")
-const { getPackageJson } = require("../../utils/config.js")
-const BaseUrl = "https://developer.apis.cloudcc.cn"
-const { getBusToken } = require("../../utils/utils")
-
-async function publish(argvs) {
-  let namePath = argvs[2]
-  let name = namePath.split("/")[1]
-  let res = await checkUpdate();
-  if (!res) {
-    const srcPath = path.join(process.cwd(), `script/${namePath}/`);
-    let classContent = fs.readFileSync(srcPath + `${name}.js`, 'utf8').replace(/\s+/g, '').replace(/\n/g, '').match(/\{([\s\S]*?)\}/)[1];
-    let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
-    let configContentOld = JSON.parse(JSON.stringify(configContent))
-
-    if (classContent) {
-      let devConsoleConfig = getPackageJson()
-      if ("private" != devConsoleConfig.version) {
-        devConsoleConfig.accessToken = await getBusToken();
-      }
-      console.log(chalk.green('Posting, please wait...'));
-      configContent.scriptContent = classContent
-      let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
-      if (res.result) {
-        console.log();
-        console.log(chalk.green('Success！'));
-        console.log();
-
-        if (!configContentOld.id) {
-          configContentOld.id = res.data
-          fs.writeFileSync(path.join(srcPath, "config.json"), JSON.stringify(configContentOld))
-        }
-      } else {
-        console.log();
-        console.log(chalk.red('Fail：' + res.returnInfo));
-        console.log();
-      }
-    } else {
-      console.log();
-      console.log(chalk.red('Invalid Script Content'));
-      console.log();
-    }
-  }
-}
-
-module.exports = publish;
+
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { post } = require("../../utils/http")
+const { getPackageJson } = require("../../utils/config.js")
+const BaseUrl = "https://developer.apis.cloudcc.cn"
+const { getBusToken } = require("../../utils/utils")
+
+function checkMainFunctionExists(content) {
+  const mainFunctionPattern = /^function\s+main\s*\(\$CCDK,\s*obj\)\s*\{/m;
+  return mainFunctionPattern.test(content);
+}
+
+async function publish(argvs) {
+  let namePath = argvs[2]
+  let name = namePath.split("/")[1]
+  let res = await checkUpdate();
+  if (!res) {
+    const srcPath = path.join(process.cwd(), `script/${namePath}/`);
+    let scriptContent = fs.readFileSync(srcPath + `${name}.js`, 'utf8');
+    if (!checkMainFunctionExists(scriptContent)) {
+      console.log();
+      console.log(chalk.red('Warning: No valid main function definition found in file'));
+      console.log();
+      return null;
+    }
+    const executableCode = `
+            ${scriptContent}
+            main.toString();
+        `;
+    const functionStr = eval(executableCode);
+    const bodyStart = functionStr.indexOf('{') + 1;
+    const bodyEnd = functionStr.lastIndexOf('}');
+
+    scriptContent = functionStr.substring(bodyStart, bodyEnd);
+    let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
+    let configContentOld = JSON.parse(JSON.stringify(configContent))
+
+    if (scriptContent) {
+      let devConsoleConfig = getPackageJson()
+      if ("private" != devConsoleConfig.version) {
+        devConsoleConfig.accessToken = await getBusToken();
+      }
+      console.log(chalk.green('Posting, please wait...'));
+      configContent.scriptContent = scriptContent
+      let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
+      if (res.result) {
+        console.log();
+        console.log(chalk.green('Success！'));
+        console.log();
+
+        if (!configContentOld.id) {
+          configContentOld.id = res.data
+          fs.writeFileSync(path.join(srcPath, "config.json"), JSON.stringify(configContentOld))
+        }
+      } else {
+        console.log();
+        console.log(chalk.red('Fail：' + res.returnInfo));
+        console.log();
+      }
+    } else {
+      console.log();
+      console.log(chalk.red('Invalid Script Content'));
+      console.log();
+    }
+  }
+}
+
+module.exports = publish;