diff --git a/src/gen/cmd_gen.js b/src/gen/cmd_gen.js index e62079015162712498fa31eafa3be6d6a45a0683..cba8e805dbdd47a111641279556c3d023c104e79 100644 --- a/src/gen/cmd_gen.js +++ b/src/gen/cmd_gen.js @@ -83,7 +83,6 @@ function checkGenerate(fileName) { else { NapiLog.logError(result[1]); } - } else { NapiLog.logError("file name " + fn + " format invalid, @ohos.input_sample.d.ts"); diff --git a/src/gen/main.js b/src/gen/main.js index 703b10540c7b496a5bdb513103da727963b6a5dc..f5ea2f7cdfd7778ed078f51a475cb7f609700ee2 100644 --- a/src/gen/main.js +++ b/src/gen/main.js @@ -20,13 +20,16 @@ const re = require("./tools/re"); function doGenerate(ifname, destdir) { let structOfTs = analyzeFile(ifname); let fn = re.getFileInPath(ifname) - let tt = re.match("@ohos.([a-zA-Z0-9]+).d.ts", fn) + let tt = re.match("@ohos.([\.a-z_A-Z0-9]+).d.ts", fn) if(tt) { - let moduleName=re.getReg(fn,tt.regs[1]); + let moduleName =re.getReg(fn,tt.regs[1]); + if(moduleName[moduleName.length-1]==".") { + NapiLog.logError("file name " + fn + " format invalid, @ohos.input_sample.d.ts"); + return; + } generateAll(structOfTs, destdir, moduleName); - } - else { + } else { NapiLog.logError("file name " + fn + " format invalid, @ohos.input_sample.d.ts"); } }