mushroom-cli 1.1.0-alpha.9 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,7 +7,7 @@ function encodeHtml(str) {
7
7
  return "";
8
8
  if (typeof str !== "string")
9
9
  str = str.toString();
10
- var html = str.replace(/&/g, "&");
10
+ let html = str.replace(/&/g, "&");
11
11
  html = html.replace(/</g, "&lt;");
12
12
  html = html.replace(/>/g, "&gt;");
13
13
  html = html.replace(/"/g, "&quot;");
@@ -175,7 +175,7 @@ function genDatabaseDocs(args, projectName, project, alias, source) {
175
175
  const aliasProject = ((project.dbDocs || {}).alias || {})[alias];
176
176
 
177
177
  if (!aliasProject) {
178
- throw new Error(`Not found gen db-docs configuration. Please run 'npx mr config ${projectName} gen db-docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
178
+ throw new Error(`Not found gen db-docs configuration. Please run 'npx mushroom-cli config ${projectName} gen db-docs OUTPUT_FILE.html${alias === "default" ? "" : " alias " + alias}' first`);
179
179
  }
180
180
 
181
181
  const entities = common.getEntities(source, aliasProject.allowRoles, true);
@@ -1,9 +1,9 @@
1
1
  const fs = require("fs");
2
2
  const path = require('path');
3
- var targz = require('targz');
3
+ const targz = require('targz');
4
4
  const javascriptDriverGenerator = require("./gen-js-driver");
5
5
  const typescriptDriverGenerator = require("./gen-ts-driver");
6
- const package = require("./../package.json");
6
+ const package_json = require("./../package.json");
7
7
 
8
8
  function compressAsync(src, dest, folderName) {
9
9
  return new Promise((resolve, reject) => {
@@ -39,7 +39,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
39
39
 
40
40
  const dirPath = path.join(path.dirname(aliasProject.output), tarballName);
41
41
 
42
- const versionGroup = package.version.match(/([^-]+)(-(\w+).*)?/);
42
+ const versionGroup = package_json.version.match(/([^-]+)(-(\w+).*)?/);
43
43
  const currentDistTag = versionGroup[3] ? versionGroup[3] : "latest";
44
44
 
45
45
  const dependencies = [`"mushroomjs": "${currentDistTag}"`];
@@ -63,7 +63,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
63
63
 
64
64
  if (fs.existsSync(dirPath)) {
65
65
  console.log("Clean up tarball folder");
66
- fs.rmdirSync(dirPath, { recursive: true });
66
+ fs.rmSync(dirPath, { recursive: true });
67
67
  }
68
68
 
69
69
  const tarballFileName = path.join(path.dirname(aliasProject.output), tarballName + ".tar.gz");
@@ -75,7 +75,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
75
75
 
76
76
  console.log("Creating tarball folder");
77
77
 
78
- fs.mkdirSync(dirPath, { recursive: true, mode: 0755 });
78
+ fs.mkdirSync(dirPath, { recursive: true, mode: 493 }); // 493 = 755 in octa
79
79
 
80
80
  console.log("Generating main file: " + tarballName + ".js");
81
81
  let code = javascriptDriverGenerator.genJavascriptDriverString(aliasProject, source);
@@ -92,7 +92,7 @@ async function genJavascriptDriverTarball(args, projectName, project, alias, sou
92
92
  await compressAsync(dirPath, tarballFileName, tarballName);
93
93
 
94
94
  console.log("Generated tarball file");
95
- fs.rmdirSync(dirPath, { recursive: true });
95
+ fs.rmSync(dirPath, { recursive: true });
96
96
  console.log("Cleaned up tarball folder");
97
97
  }
98
98
 
@@ -36,23 +36,34 @@ function genJavascriptDriverString(aliasProject, source) {
36
36
 
37
37
  if (Array.isArray(aliasProject.features)) {
38
38
  if (aliasProject.features.includes("auth")) {
39
- extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
39
+ extensionsImportLines.push('//import * as AuthExtension from "mushroomjs-auth";');
40
+ extensionsImportLines.push('var AuthExtension = require("mushroomjs-auth");');
40
41
  extensionsExportLines.push('Auth: AuthExtension');
41
- extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
42
+ extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom_1.default);");
42
43
  }
43
44
  if (aliasProject.features.includes("file")) {
44
- extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
45
+ extensionsImportLines.push('//import * as FileExtension from "mushroomjs-file";');
46
+ extensionsImportLines.push('var FileExtension = require("mushroomjs-file");');
45
47
  extensionsExportLines.push('File: FileExtension');
46
- extensionsCodeLines.push("FileExtension.useFile();");
48
+ extensionsCodeLines.push("FileExtension.useFile(mushroom_1.default);");
47
49
  }
48
50
  }
49
51
 
50
- let code = `import mushroom, {defineAsyncResource} from "mushroomjs";
51
- export * from "mushroomjs";
52
+ let code = `//import mushroom, {defineAsyncResource} from "mushroomjs";
53
+ Object.defineProperty(exports, "__esModule", { value: true });
54
+ var mushroom_1 = require("mushroomjs");
55
+ var mushroom = mushroom_1.default;
56
+ var defineAsyncResource = mushroom_1.defineAsyncResource;
57
+
58
+ //export * from "mushroomjs";
59
+ for (var m in mushroom_1) exports[m] = mushroom_1[m];
60
+
52
61
  ${extensionsImportLines.join("\n")}
53
- export const extensions = {
62
+ //export const extensions = {
63
+ var extensions = {
54
64
  ${extensionsExportLines.join(",\n ")}
55
65
  };
66
+ exports.extensions = extensions;
56
67
 
57
68
  "use strict";
58
69
 
@@ -69,7 +80,8 @@ export const extensions = {
69
80
  continue;
70
81
 
71
82
  actions[actionName] = {
72
- clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined
83
+ clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
84
+ includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
73
85
  };
74
86
  }
75
87
 
@@ -88,7 +100,8 @@ mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
88
100
 
89
101
  ${extensionsCodeLines.join('\n')}
90
102
 
91
- export default mushroom;`;
103
+ //export default mushroom;
104
+ exports.default = mushroom;`;
92
105
 
93
106
  return code;
94
107
  }
@@ -97,7 +110,7 @@ function genJavascriptDriver(args, projectName, project, alias, source) {
97
110
  const aliasProject = ((project.jsDriver || {}).alias || {})[alias];
98
111
 
99
112
  if (!aliasProject) {
100
- throw new Error(`Not found gen js-driver configuration. Please run 'npx mr config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
113
+ throw new Error(`Not found gen js-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} js-driver OUTPUT_FILE.js${alias === "default" ? "" : " alias " + alias}' first`);
101
114
  }
102
115
 
103
116
  let code = genJavascriptDriverString(aliasProject, source);
@@ -25,7 +25,7 @@ function isAllowCache(actions, defaultValue) {
25
25
  function toVietnameseNonTongue(str) {
26
26
  const signText = "ăâđêôơưàảãạáằẳẵặắầẩẫậấèẻẽẹéềểễệếìỉĩịíòỏõọóồổỗộốờởỡợớùủũụúừửữựứỳỷỹỵýĂÂĐÐÊÔƠƯÀẢÃẠÁẰẲẴẶẮẦẨẪẬẤÈẺẼẸÉỀỂỄỆẾÌỈĨỊÍÒỎÕỌÓỒỔỖỘỐỜỞỠỢỚÙỦŨỤÚỪỬỮỰỨỲỶỸỴÝ";
27
27
  const unsignedText = "aadeoouaaaaaaaaaaaaaaaeeeeeeeeeeiiiiiooooooooooooooouuuuuuuuuuyyyyyAADDEOOUAAAAAAAAAAAAAAAEEEEEEEEEEIIIIIOOOOOOOOOOOOOOOUUUUUUUUUUYYYYY";
28
- var returnValue = "";
28
+ let returnValue = "";
29
29
  for (let i = 0; i < str.length; i++) {
30
30
  const index = signText.indexOf(str.charAt(i));
31
31
  returnValue += index !== -1 ? unsignedText.charAt(index) : str.charAt(i);
@@ -38,7 +38,7 @@ function toTypeScriptClassName(str) {
38
38
  return "_";
39
39
  const name = toVietnameseNonTongue(str).replace(/\W/g, "_");
40
40
  const c = name.charAt(0);
41
- return ('0' <= c && c <= '9' ? '_' : "") + c.toUpperCase() + name.substr(1);
41
+ return ('0' <= c && c <= '9' ? '_' : "") + c.toUpperCase() + name.substring(1);
42
42
  }
43
43
 
44
44
  function getCSharpTypeFromMushroomType(type) {
@@ -114,19 +114,19 @@ function genTypescriptDriverString(aliasProject, source) {
114
114
  extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
115
115
  extensionsExportLines.push('File: FileExtension');
116
116
  extensionsTypes.push("AuthExtension.IMushroomAuth & ");
117
- extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage);");
117
+ extensionsCodeLines.push("AuthExtension.useAuth(AuthExtension.AuthLocalStorage, mushroom);");
118
118
  }
119
119
  if (aliasProject.features.includes("file")) {
120
120
  extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
121
121
  extensionsExportLines.push('Auth: AuthExtension');
122
122
  extensionsTypes.push("FileExtension.IMushroomFile & ");
123
- extensionsCodeLines.push("FileExtension.useFile();");
123
+ extensionsCodeLines.push("FileExtension.useFile(mushroom);");
124
124
  }
125
125
  }
126
126
 
127
127
  let code = `import mushroom, { defineAsyncResource, defineAsyncView, fireEvent, createRestfulAsyncFunction, IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError } from "mushroomjs";
128
- export * from "mushroomjs";
129
128
  ${extensionsImportLines.join("\n")}
129
+ export * from "mushroomjs";
130
130
  export const extensions = {
131
131
  ${extensionsExportLines.join(",\n ")}
132
132
  };
@@ -154,7 +154,8 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
154
154
  continue;
155
155
 
156
156
  actions[actionName] = {
157
- clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined
157
+ clientCache: (actionName === "findById" || actionName === "findMany") && isAllowCache(entity.actions[actionName], true) ? true : undefined,
158
+ includeTotal: actionName === "findMany" && entity.actions[actionName].some(a => a.includeTotal) ? true: undefined
158
159
  };
159
160
 
160
161
  switch (actionName) {
@@ -196,7 +197,7 @@ export type IdValue = ${source.idType == "AutoIncInt" || source.idType == "AutoI
196
197
  }
197
198
  default: {
198
199
  if (actionName.indexOf("_raw_http_method_") === 0) {
199
- customMethodCode += ` ${actionName.substr("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
200
+ customMethodCode += ` ${actionName.substring("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
200
201
  `;
201
202
  break;
202
203
  }
@@ -255,7 +256,9 @@ ${customMethodCode}}
255
256
  code += `
256
257
  mushroom.$using(${JSON.stringify(common.getRootUrl(source))});
257
258
 
259
+ (function(){
258
260
  ${extensionsCodeLines.join('\n')}
261
+ })();
259
262
 
260
263
  export interface IApi extends IMushroom {
261
264
  ${iApiClassBody}};
@@ -281,19 +284,19 @@ function genDtsString(aliasProject, source) {
281
284
  if (Array.isArray(aliasProject.features)) {
282
285
  if (aliasProject.features.includes("auth")) {
283
286
  extensionsImportLines.push('import * as AuthExtension from "mushroomjs-auth";');
284
- extensionsExportLines.push('Auth: typeof AuthExtension');
287
+ extensionsExportLines.push('Auth: AuthExtension');
285
288
  extensionsTypes.push("AuthExtension.IMushroomAuth & ");
286
289
  }
287
290
  if (aliasProject.features.includes("file")) {
288
291
  extensionsImportLines.push('import * as FileExtension from "mushroomjs-file";');
289
- extensionsExportLines.push('File: typeof FileExtension');
292
+ extensionsExportLines.push('File: FileExtension');
290
293
  extensionsTypes.push("FileExtension.IMushroomFile & ");
291
294
  }
292
295
  }
293
296
 
294
297
  let code = `import { IdType, IMushroom, Mushroom, MushroomRequest, MushroomRequestSetting, MushroomRestfulRequest, MushroomResponse, MushroomResourceBase, MushroomListResource, MushroomFindByIdResource, MushroomCreateResource, MushroomBatchCreateResource, MushroomUpdateResource, MushroomBatchUpdateResource, MushroomPartialUpdateResource, MushroomDeleteResource, MushroomBatchDeleteResource, MushroomExtensibleResource, MushroomViewFunction, MushroomError } from "mushroomjs";
295
- export * from "mushroomjs";
296
298
  ${extensionsImportLines.join("\n")}
299
+ export * from "mushroomjs";
297
300
  export declare const extensions = {
298
301
  ${extensionsExportLines.join(",\n ")}
299
302
  };
@@ -363,7 +366,7 @@ export declare type IdValue = ${source.idType == "AutoIncInt" || source.idType =
363
366
  }
364
367
  default: {
365
368
  if (actionName.indexOf("_raw_http_method_") === 0) {
366
- customMethodCode += ` ${actionName.substr("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
369
+ customMethodCode += ` ${actionName.substring("_raw_http_method_".length)}Async: (rawRequest: MushroomRequest) => Promise<MushroomResponse<any>>,
367
370
  `;
368
371
  break;
369
372
  }
@@ -430,7 +433,7 @@ function genTypescriptDriver(args, projectName, project, alias, source) {
430
433
  const aliasProject = ((project.tsDriver || {}).alias || {})[alias];
431
434
 
432
435
  if (!aliasProject) {
433
- throw new Error(`Not found gen ts-driver configuration. Please run 'npx mr config gen ${projectName} ts-driver OUTPUT_FILE.ts${alias === "default" ? "" : " alias " + alias}' first`);
436
+ throw new Error(`Not found gen ts-driver configuration. Please run 'npx mushroom-cli config gen ${projectName} ts-driver OUTPUT_FILE.ts${alias === "default" ? "" : " alias " + alias}' first`);
434
437
  }
435
438
 
436
439
  const code = genTypescriptDriverString(aliasProject, source);
package/gen.js CHANGED
@@ -24,8 +24,8 @@ async function gen(args) {
24
24
 
25
25
  const atIndex = projectName.indexOf("@");
26
26
  if (atIndex !== -1) {
27
- alias = projectName.substr(atIndex + 1);
28
- projectName = projectName.substr(0, atIndex);
27
+ alias = projectName.substring(atIndex + 1);
28
+ projectName = projectName.substring(0, atIndex);
29
29
  if (!projectName) {
30
30
  help(args);
31
31
  return;
@@ -55,7 +55,7 @@ async function gen(args) {
55
55
  if (!project.src)
56
56
  throw new Error("Project source (src) not found");
57
57
 
58
- var source;
58
+ let source;
59
59
  try {
60
60
  const sourceContent = fs.readFileSync(project.src).toString();
61
61
  source = JSON5.parse(sourceContent);
@@ -71,7 +71,6 @@ async function gen(args) {
71
71
  if (Array.isArray(source.fragments)) {
72
72
  console.log("Process master file: " + project.src);
73
73
  source = masterFile.processMasterFile(path.dirname(project.src), source);
74
- //console.log(source);
75
74
  }
76
75
 
77
76
  if (!source || typeof source !== "object") {
package/help.js CHANGED
@@ -10,46 +10,46 @@ function help(key, wrong) {
10
10
  }
11
11
  else
12
12
  console.log(`Init a mushroom json file
13
- npx mr init json ./api/SampleProject.json [silent]
13
+ npx mushroom-cli init json ./api/SampleProject.json [silent]
14
14
 
15
15
  Init a dotnet core project which pre-install Mushroom Server
16
- npx mr init netcore projectName [features file,auth,mail]
16
+ npx mushroom-cli init netcore
17
17
 
18
18
  Add the mushroom json file into mushroom-config.json
19
- npx mr config add ./api/yourProjectName.json
19
+ npx mushroom-cli config add ./api/yourProjectName.json
20
20
 
21
21
  Config gen docs api
22
- npx mr config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
22
+ npx mushroom-cli config gen projectName docs ./wwwroot/docs.html [alias aliasName] [features file,auth,mail,driver] [roles Admin,User-Contributor]
23
23
 
24
24
  Generate docs api (html format)
25
- npx mr gen projectName[@aliasName] docs [tmp]
25
+ npx mushroom-cli gen projectName[@aliasName] docs [tmp]
26
26
 
27
27
  Config gen database docs
28
- npx mr config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
28
+ npx mushroom-cli config gen projectName db-docs ./wwwroot/db-docs.html [alias aliasName] [features file,auth,mail]
29
29
 
30
30
  Generate database docs (html format)
31
- npx mr gen projectName[@aliasName] db-docs [tmp]
31
+ npx mushroom-cli gen projectName[@aliasName] db-docs [tmp]
32
32
 
33
33
  Config gen javascript driver
34
- npx mr config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
34
+ npx mushroom-cli config gen projectName js-driver ./src/api/mushroom.api.js [alias aliasName] [roles Admin,User-Contributor] [tarball tarballName]
35
35
 
36
36
  Generate javascript driver
37
- npx mr gen projectName[@aliasName] js-driver
37
+ npx mushroom-cli gen projectName[@aliasName] js-driver
38
38
 
39
39
  Config gen entities for Mushroom project in CSharp and using MongoDb
40
- npx mr config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
40
+ npx mushroom-cli config gen projectName c#-mongo ./API/Generated.cs [alias aliasName]
41
41
 
42
42
  Generate entities for Mushroom project in CSharp and using MongoDb
43
- npx mr gen projectName[@aliasName] c#-mongo
43
+ npx mushroom-cli gen projectName[@aliasName] c#-mongo
44
44
 
45
45
  Config gen entities for CSharp project which calls Mushroom API
46
- npx mr config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
46
+ npx mushroom-cli config gen projectName c#-driver ./API/Generated.cs [roles Admin,User-Contributor] [alias aliasName]
47
47
 
48
48
  Generate entities for CSharp project which calls Mushroom API
49
- npx mr gen projectName[@aliasName] c#-driver
49
+ npx mushroom-cli gen projectName[@aliasName] c#-driver
50
50
 
51
51
  Disable checking for update:
52
- npx mr parameters --no-check-update`);
52
+ npx mushroom-cli parameters --no-check-update`);
53
53
  }
54
54
 
55
55
  module.exports = help;
@@ -0,0 +1,104 @@
1
+ const fs = require("fs");
2
+ const fetch = require('node-fetch');
3
+ const readlineSync = require("readline-sync");
4
+ const help = require("../help.js");
5
+ const common = require("../common.js");
6
+
7
+ function initJson(args) {
8
+ const path = args[2];
9
+ if (!path) {
10
+ help(args);
11
+ return;
12
+ }
13
+
14
+ if (fs.existsSync(path)){
15
+ console.error(`File ${path} is already existed`);
16
+ return;
17
+ }
18
+
19
+ if (args[3] === "silent") {
20
+ console.log("Fetch https://api.siten.vn/gen/template/default.json");
21
+ fetch("https://api.siten.vn/gen/template/default.json").then(res => res.text()).then(text => {
22
+ common.ensureFolder(path);
23
+
24
+ fs.writeFile(path, text, err => {
25
+ if (err)
26
+ throw err;
27
+ console.log(`Initialized json at ${path}`);
28
+ });
29
+ });
30
+ return;
31
+ }
32
+
33
+ console.log("Fetch https://api.siten.vn/gen/template/template-def.json");
34
+ fetch("https://api.siten.vn/gen/template/template-def.json").then(res => res.json()).then(templateConfig => {
35
+ const info = {};
36
+ templateConfig.fields.forEach(field => {
37
+ while (true)
38
+ {
39
+ let question = `${field.required ? "[Required] " : ""}${field.label || field.name}`;
40
+ if (Array.isArray(field.list)) {
41
+ question += "\n";
42
+ let i = 1;
43
+ field.list.forEach(item => { question += "\t" + i++ + ". " + item + "\n"; });
44
+ question += "Please choose";
45
+ }
46
+ if (field.defaultValue !== undefined) {
47
+ question += ` (default: '${field.defaultValue}')`;
48
+ }
49
+ question += ": ";
50
+ let choice = readlineSync.question(question);
51
+ if (choice === "") {
52
+ if (field.defaultValue != undefined)
53
+ choice = field.defaultValue;
54
+ }
55
+ else if (Array.isArray(field.list)) {
56
+ if (choice !== null && choice !== "" && !isNaN(choice))
57
+ choice = field.list[choice - 1];
58
+ else
59
+ choice = undefined;
60
+ if (choice === undefined) {
61
+ console.warn("Invalid input");
62
+ continue;
63
+ }
64
+ }
65
+
66
+ if (choice === "" || choice === undefined || choice == null) {
67
+ choice = "";
68
+
69
+ if (field.required) {
70
+ console.warn("Required input value");
71
+ continue;
72
+ }
73
+ }
74
+
75
+ if (choice !== "" && field.pattern) {
76
+ const re = new RegExp(field.pattern, field.patternFlags);
77
+ if (!re.test(choice)) {
78
+ console.warn("Input doesn't match with pattern " + field.pattern);
79
+ continue;
80
+ }
81
+ }
82
+
83
+ info[field.name] = choice;
84
+ break;
85
+ }
86
+ });
87
+
88
+ console.log(`Fetch ${templateConfig.templateUrl}`);
89
+ fetch(templateConfig.templateUrl).then(res => res.text()).then(json => {
90
+ json = json.replace(/\"\$\{(\w+)\}\"/g, (s0, s1) => JSON.stringify(info[s1]));
91
+ json = json.replace(/\$\{(\w+)\}/g, (s0, s1) => JSON.stringify(info[s1]).replace(/(^")|("$)/g, ""));
92
+
93
+ common.ensureFolder(path);
94
+
95
+ fs.writeFile(path, json, err => {
96
+ if (err)
97
+ throw err;
98
+ console.log(`Initialized json at ${path}`);
99
+ });
100
+ });
101
+ })
102
+ }
103
+
104
+ module.exports = initJson;
@@ -0,0 +1,32 @@
1
+ const fs = require("fs");
2
+ const { spawn } = require("child_process");
3
+ const common = require("../common.js");
4
+
5
+
6
+ function fetchFromGit() {
7
+ return new Promise((resolve, reject) => {
8
+ const git = spawn("git", ["clone", "https://tfs.siten.vn/tfs/Siten/CodeBase/_git/Mushroom", "-b", "full_extensions", "--single-branch"]);
9
+ git.stdout.on('data', (data) => {
10
+ console.log(`GIT: ${data}`);
11
+ });
12
+
13
+ git.stderr.on('data', (data) => {
14
+ console.error(`GIT: ${data}`);
15
+ });
16
+
17
+ git.on('close', (code) => {
18
+ if (code) {
19
+ reject(new Error(`GIT exited with code ${code}`));
20
+ return;
21
+ }
22
+ resolve();
23
+ });
24
+ })
25
+ }
26
+
27
+ async function initNetCore(args) {
28
+ await fetchFromGit();
29
+ common.processTemplate("Mushroom", "mushroom-template.json");
30
+ }
31
+
32
+ module.exports = initNetCore;
package/init.js CHANGED
@@ -1,120 +1,16 @@
1
- const fs = require("fs");
2
- const fetch = require('node-fetch');
3
- const readlineSync = require("readline-sync");
4
1
  const help = require("./help.js");
5
- const common = require("./common.js");
6
2
 
7
- function initJson(args) {
8
- const path = args[2];
9
- if (!path) {
10
- help(args);
11
- return;
12
- }
13
-
14
- if (fs.existsSync(path)){
15
- console.error(`File ${path} is already existed`);
16
- return;
17
- }
18
-
19
- if (args[3] === "silent") {
20
- console.log("Fetch http://api.siten.vn/gen/template/default.json");
21
- fetch("http://api.siten.vn/gen/template/default.json").then(res => res.text()).then(text => {
22
- common.ensureFolder(path);
23
-
24
- fs.writeFile(path, text, err => {
25
- if (err)
26
- throw err;
27
- console.log(`Initialized json at ${path}`);
28
- });
29
- });
30
- return;
31
- }
32
-
33
- console.log("Fetch http://api.siten.vn/gen/template/template-def.json");
34
- fetch("http://api.siten.vn/gen/template/template-def.json").then(res => res.json()).then(templateConfig => {
35
- const info = {};
36
- templateConfig.fields.forEach(field => {
37
- while (true)
38
- {
39
- let question = `${field.required ? "[Required] " : ""}${field.label || field.name}`;
40
- if (Array.isArray(field.list)) {
41
- question += "\n";
42
- let i = 1;
43
- field.list.forEach(item => { question += "\t" + i++ + ". " + item + "\n"; });
44
- question += "Please choose";
45
- }
46
- if (field.defaultValue !== undefined) {
47
- question += ` (default: '${field.defaultValue}')`;
48
- }
49
- question += ": ";
50
- let choice = readlineSync.question(question);
51
- if (choice === "") {
52
- if (field.defaultValue != undefined)
53
- choice = field.defaultValue;
54
- }
55
- else if (Array.isArray(field.list)) {
56
- if (choice !== null && choice !== "" && !isNaN(choice))
57
- choice = field.list[choice - 1];
58
- else
59
- choice = undefined;
60
- if (choice === undefined) {
61
- console.warn("Invalid input");
62
- continue;
63
- }
64
- }
65
-
66
- if (choice === "" || choice === undefined || choice == null) {
67
- choice = "";
68
-
69
- if (field.required) {
70
- console.warn("Required input value");
71
- continue;
72
- }
73
- }
74
-
75
- if (choice !== "" && field.pattern) {
76
- const re = new RegExp(field.pattern, field.patternFlags);
77
- if (!re.test(choice)) {
78
- console.warn("Input doesn't match with pattern " + field.pattern);
79
- continue;
80
- }
81
- }
82
-
83
- info[field.name] = choice;
84
- break;
85
- }
86
- });
87
- //console.log(info);
88
-
89
- console.log(`Fetch ${templateConfig.templateUrl}`);
90
- fetch(templateConfig.templateUrl).then(res => res.text()).then(json => {
91
- json = json.replace(/\"\$\{([\w]+)\}\"/g, (s0, s1) => JSON.stringify(info[s1]));
92
- json = json.replace(/\$\{([\w]+)\}/g, (s0, s1) => JSON.stringify(info[s1]).replace(/^\"|\"$/g, ""));
93
-
94
- common.ensureFolder(path);
95
- //console.log(json);
96
-
97
- fs.writeFile(path, json, err => {
98
- if (err)
99
- throw err;
100
- console.log(`Initialized json at ${path}`);
101
- });
102
- });
103
- })
104
- }
105
-
106
- function initNetCore(args) {
107
- console.log("init netcore is comming soon");
108
- }
3
+ const initJson = require("./init/init-json");
4
+ const initNetCore = require("./init/init-netcore");
109
5
 
110
- function init(args) {
6
+ async function init(args) {
111
7
  const configCommand = args[1];
112
8
  switch(configCommand) {
113
9
  case "json":
114
10
  initJson(args);
115
11
  break;
116
12
  case "netcore":
117
- initNetCore(args);
13
+ await initNetCore(args);
118
14
  break;
119
15
  case "":
120
16
  case undefined: