@tremho/mist-lift 1.0.2-pre-release.4 → 1.0.2
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.
- package/README.md +12 -0
- package/build/commands/actions/initQuestions.js +24 -22
- package/build/commands/actions/initQuestions.js.map +1 -1
- package/build/commands/actions/setupPackageJson.js +4 -4
- package/build/commands/actions/setupPackageJson.js.map +1 -1
- package/build/commands/build.js +31 -25
- package/build/commands/build.js.map +1 -1
- package/build/commands/builtin/ApiDocMaker.js +60 -23
- package/build/commands/builtin/ApiDocMaker.js.map +1 -1
- package/build/commands/builtin/BuiltInHandler.js +6 -6
- package/build/commands/builtin/BuiltInHandler.js.map +1 -1
- package/build/commands/builtin/DeployBuiltInZip.js +4 -4
- package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
- package/build/commands/builtin/StageWebrootZip.js +1 -0
- package/build/commands/builtin/StageWebrootZip.js.map +1 -1
- package/build/commands/create.js +10 -11
- package/build/commands/create.js.map +1 -1
- package/build/commands/deploy.js +38 -42
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/doctor.js +38 -37
- package/build/commands/doctor.js.map +1 -1
- package/build/commands/help.js +93 -93
- package/build/commands/help.js.map +1 -1
- package/build/commands/init.js +7 -7
- package/build/commands/init.js.map +1 -1
- package/build/commands/package.js +50 -51
- package/build/commands/package.js.map +1 -1
- package/build/commands/publish.js +98 -102
- package/build/commands/publish.js.map +1 -1
- package/build/commands/settings.js +19 -18
- package/build/commands/settings.js.map +1 -1
- package/build/commands/start.js +4 -4
- package/build/commands/start.js.map +1 -1
- package/build/commands/test.js +3 -3
- package/build/commands/test.js.map +1 -1
- package/build/commands/user.js +1 -1
- package/build/commands/user.js.map +1 -1
- package/build/expressRoutes/all.js +27 -26
- package/build/expressRoutes/all.js.map +1 -1
- package/build/expressRoutes/api.js +9 -7
- package/build/expressRoutes/api.js.map +1 -1
- package/build/expressRoutes/functionBinder.js +38 -36
- package/build/expressRoutes/functionBinder.js.map +1 -1
- package/build/lib/CaseUtils.js +2 -2
- package/build/lib/CaseUtils.js.map +1 -1
- package/build/lib/DirectoryUtils.js +4 -3
- package/build/lib/DirectoryUtils.js.map +1 -1
- package/build/lib/LiftConfig.js +18 -20
- package/build/lib/LiftConfig.js.map +1 -1
- package/build/lib/LiftVersion.js +17 -12
- package/build/lib/LiftVersion.js.map +1 -1
- package/build/lib/Tests/fileCompare.test.js +11 -10
- package/build/lib/Tests/fileCompare.test.js.map +1 -1
- package/build/lib/askQuestion.js +3 -2
- package/build/lib/askQuestion.js.map +1 -1
- package/build/lib/executeCommand.js +46 -33
- package/build/lib/executeCommand.js.map +1 -1
- package/build/lib/fileCompare.js +9 -8
- package/build/lib/fileCompare.js.map +1 -1
- package/build/lib/openAPI/ApiBuildCollector.js +9 -8
- package/build/lib/openAPI/ApiBuildCollector.js.map +1 -1
- package/build/lib/openAPI/WebrootFileSupport.js +4 -3
- package/build/lib/openAPI/WebrootFileSupport.js.map +1 -1
- package/build/lib/openAPI/openApiConstruction.js +62 -61
- package/build/lib/openAPI/openApiConstruction.js.map +1 -1
- package/build/lib/pathResolve.js +4 -4
- package/build/lib/pathResolve.js.map +1 -1
- package/build/lib/utils.js +5 -4
- package/build/lib/utils.js.map +1 -1
- package/build/lift.js +14 -15
- package/build/lift.js.map +1 -1
- package/package.json +2 -1
- package/src/commands/actions/initQuestions.ts +112 -112
- package/src/commands/actions/setupPackageJson.ts +21 -25
- package/src/commands/build.ts +143 -146
- package/src/commands/builtin/ApiDocMaker.ts +86 -54
- package/src/commands/builtin/BuiltInHandler.ts +31 -35
- package/src/commands/builtin/DeployBuiltInZip.ts +15 -17
- package/src/commands/builtin/StageWebrootZip.ts +29 -32
- package/src/commands/create.ts +40 -47
- package/src/commands/deploy.ts +139 -152
- package/src/commands/doctor.ts +86 -82
- package/src/commands/help.ts +152 -153
- package/src/commands/init.ts +37 -39
- package/src/commands/package.ts +201 -204
- package/src/commands/publish.ts +277 -312
- package/src/commands/settings.ts +67 -70
- package/src/commands/start.ts +32 -37
- package/src/commands/test.ts +15 -16
- package/src/commands/user.ts +1 -1
- package/src/expressRoutes/all.ts +73 -78
- package/src/expressRoutes/api.ts +14 -16
- package/src/expressRoutes/functionBinder.ts +144 -151
- package/src/lib/CaseUtils.ts +49 -54
- package/src/lib/DirectoryUtils.ts +25 -27
- package/src/lib/LiftConfig.ts +46 -54
- package/src/lib/LiftVersion.ts +69 -77
- package/src/lib/Tests/fileCompare.test.ts +27 -26
- package/src/lib/askQuestion.ts +12 -13
- package/src/lib/executeCommand.ts +40 -33
- package/src/lib/fileCompare.ts +46 -37
- package/src/lib/openAPI/ApiBuildCollector.ts +36 -36
- package/src/lib/openAPI/WebrootFileSupport.ts +15 -17
- package/src/lib/openAPI/openApiConstruction.ts +169 -175
- package/src/lib/pathResolve.ts +22 -28
- package/src/lib/utils.ts +31 -33
- package/src/lift.ts +68 -67
package/README.md
CHANGED
|
@@ -36,3 +36,15 @@ and the [issues page](https://github.com/tremho/MistLift/issues) for future stat
|
|
|
36
36
|
## Getting Started
|
|
37
37
|
|
|
38
38
|
To get started using MistLift, please see the [QuickStart Guide](https://github.com/tremho/MistLift/blob/main/doc/MistLift%20Quick%20Start.md)
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
## Changelog
|
|
42
|
+
|
|
43
|
+
### 1.0.0 - 1.0.2 -- Initial Release 6/27/24
|
|
44
|
+
- Basic functionality
|
|
45
|
+
- minor bug fixes
|
|
46
|
+
- documentation
|
|
47
|
+
- ts-standard linter adopted
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
|
|
@@ -53,40 +53,40 @@ function interrogateUserForPackageJsonSettings(projectPath) {
|
|
|
53
53
|
const gitAuthor = yield findGitAuthor();
|
|
54
54
|
const pkgJson = existingPackageJson(projectPath);
|
|
55
55
|
let name = (_a = pkgJson.name) !== null && _a !== void 0 ? _a : nameFromProjectPath(projectPath);
|
|
56
|
-
let version = (_b = pkgJson.version) !== null && _b !== void 0 ? _b :
|
|
57
|
-
let description = (_c = pkgJson.description) !== null && _c !== void 0 ? _c :
|
|
56
|
+
let version = (_b = pkgJson.version) !== null && _b !== void 0 ? _b : '1.0.0-prerelease.1';
|
|
57
|
+
let description = (_c = pkgJson.description) !== null && _c !== void 0 ? _c : '';
|
|
58
58
|
let author = (_d = pkgJson.author) !== null && _d !== void 0 ? _d : gitAuthor;
|
|
59
59
|
let copyright = (_e = pkgJson.copyright) !== null && _e !== void 0 ? _e : defaultCopyright(author);
|
|
60
|
-
let spdx = (_f = pkgJson.license) !== null && _f !== void 0 ? _f :
|
|
60
|
+
let spdx = (_f = pkgJson.license) !== null && _f !== void 0 ? _f : 'MIT';
|
|
61
61
|
let ok = false;
|
|
62
62
|
while (!ok) {
|
|
63
|
-
name = (0, askQuestion_1.ask)(
|
|
64
|
-
ok = name && name.indexOf(' ') === -1;
|
|
63
|
+
name = (0, askQuestion_1.ask)('Module name of this project', 'module name', name);
|
|
64
|
+
ok = name !== undefined && name.indexOf(' ') === -1;
|
|
65
65
|
}
|
|
66
66
|
ok = false;
|
|
67
67
|
while (!ok) {
|
|
68
|
-
version = (0, askQuestion_1.ask)(
|
|
69
|
-
ok = version && version.indexOf('.') !== -1;
|
|
68
|
+
version = (0, askQuestion_1.ask)('Project version. Use prerelease suffix for development versions. Use Semantic Versioning (https://semver.org).', 'version', version !== null && version !== void 0 ? version : '0.1.0-prerelease.1');
|
|
69
|
+
ok = version !== undefined && version.indexOf('.') !== -1;
|
|
70
70
|
}
|
|
71
71
|
ok = false;
|
|
72
72
|
while (!ok) {
|
|
73
|
-
description = (0, askQuestion_1.ask)(
|
|
74
|
-
ok = description !==
|
|
73
|
+
description = (0, askQuestion_1.ask)('Give a brief description of what this project does / what it is for', 'description', description !== null && description !== void 0 ? description : '');
|
|
74
|
+
ok = description !== '';
|
|
75
75
|
}
|
|
76
76
|
ok = false;
|
|
77
77
|
while (!ok) {
|
|
78
|
-
author = (0, askQuestion_1.ask)(
|
|
79
|
-
ok = author !==
|
|
78
|
+
author = (0, askQuestion_1.ask)('Identify yourself as the author of this project', 'name', author);
|
|
79
|
+
ok = author !== '';
|
|
80
80
|
}
|
|
81
81
|
ok = false;
|
|
82
82
|
while (!ok) {
|
|
83
|
-
copyright = (0, askQuestion_1.ask)(
|
|
84
|
-
ok = copyright !==
|
|
83
|
+
copyright = (0, askQuestion_1.ask)('Specify a displayable copyright notice', 'Copyright', copyright);
|
|
84
|
+
ok = copyright !== '';
|
|
85
85
|
}
|
|
86
86
|
ok = false;
|
|
87
87
|
while (!ok) {
|
|
88
|
-
spdx = (0, askQuestion_1.ask)(
|
|
89
|
-
ok = spdx !==
|
|
88
|
+
spdx = (0, askQuestion_1.ask)('Specify the appropriate SPDX license identifier for this project. See https://spdx.org/licenses/ for more info.', 'spdx identifier', spdx);
|
|
89
|
+
ok = spdx !== '';
|
|
90
90
|
}
|
|
91
91
|
pkgJson.name = name;
|
|
92
92
|
pkgJson.version = version;
|
|
@@ -94,22 +94,24 @@ function interrogateUserForPackageJsonSettings(projectPath) {
|
|
|
94
94
|
pkgJson.author = author;
|
|
95
95
|
pkgJson.copyright = copyright;
|
|
96
96
|
pkgJson.license = spdx;
|
|
97
|
-
const pkgPath = path.join(projectPath,
|
|
97
|
+
const pkgPath = path.join(projectPath, 'package.json');
|
|
98
98
|
fs.writeFileSync(pkgPath, JSON.stringify(pkgJson, null, 2));
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
exports.interrogateUserForPackageJsonSettings = interrogateUserForPackageJsonSettings;
|
|
102
102
|
function findGitAuthor() {
|
|
103
103
|
return __awaiter(this, void 0, void 0, function* () {
|
|
104
|
-
return (0, executeCommand_1.executeCommand)('git', ['config', '--get', 'user.name']).then(rt => {
|
|
104
|
+
return yield (0, executeCommand_1.executeCommand)('git', ['config', '--get', 'user.name']).then((rt) => {
|
|
105
|
+
var _a;
|
|
106
|
+
const rrt = rt;
|
|
105
107
|
let name = '';
|
|
106
|
-
if (
|
|
107
|
-
console.error(
|
|
108
|
+
if ((rrt === null || rrt === void 0 ? void 0 : rrt.retcode) !== 0) {
|
|
109
|
+
console.error(`Error ${rrt.retcode}`, rrt.errStr);
|
|
108
110
|
}
|
|
109
111
|
else {
|
|
110
|
-
name =
|
|
112
|
+
name = (_a = rrt === null || rrt === void 0 ? void 0 : rrt.stdStr) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase();
|
|
111
113
|
}
|
|
112
|
-
return name;
|
|
114
|
+
return name !== null && name !== void 0 ? name : '';
|
|
113
115
|
});
|
|
114
116
|
});
|
|
115
117
|
}
|
|
@@ -122,7 +124,7 @@ function nameFromProjectPath(refPath) {
|
|
|
122
124
|
}
|
|
123
125
|
function existingPackageJson(refPath) {
|
|
124
126
|
let packageJson = {};
|
|
125
|
-
const pkgPath = path.join(refPath,
|
|
127
|
+
const pkgPath = path.join(refPath, 'package.json');
|
|
126
128
|
if (fs.existsSync((pkgPath))) {
|
|
127
129
|
try {
|
|
128
130
|
packageJson = JSON.parse(fs.readFileSync(pkgPath).toString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initQuestions.js","sourceRoot":"","sources":["../../../src/commands/actions/initQuestions.ts"],"names":[],"mappings":";AAAA;GACG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA4B;AAC5B,uCAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"initQuestions.js","sourceRoot":"","sources":["../../../src/commands/actions/initQuestions.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,26 +42,26 @@ const executeCommand_1 = require("../../lib/executeCommand");
|
|
|
42
42
|
*/
|
|
43
43
|
function addPackageScripts(projectPath) {
|
|
44
44
|
var _a;
|
|
45
|
-
const pkgPath = path.join(projectPath,
|
|
45
|
+
const pkgPath = path.join(projectPath, 'package.json');
|
|
46
46
|
let pkgJson = {};
|
|
47
47
|
try {
|
|
48
48
|
pkgJson = JSON.parse(fs.readFileSync(pkgPath).toString());
|
|
49
49
|
}
|
|
50
50
|
catch (_b) { }
|
|
51
51
|
const script = (_a = pkgJson.script) !== null && _a !== void 0 ? _a : {};
|
|
52
|
-
script.test =
|
|
52
|
+
script.test = 'lift test';
|
|
53
53
|
pkgJson.script = script;
|
|
54
54
|
}
|
|
55
55
|
exports.addPackageScripts = addPackageScripts;
|
|
56
56
|
function installPackage(projectPath, packageName) {
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
|
|
58
|
+
yield (0, executeCommand_1.executeCommand)('npm', ['i', packageName], projectPath, true);
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
exports.installPackage = installPackage;
|
|
62
62
|
function installDevPackage(projectPath, packageName) {
|
|
63
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
-
|
|
64
|
+
yield (0, executeCommand_1.executeCommand)('npm', ['i', '--save-dev', packageName], projectPath, true);
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
exports.installDevPackage = installDevPackage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupPackageJson.js","sourceRoot":"","sources":["../../../src/commands/actions/setupPackageJson.ts"],"names":[],"mappings":";AAAA,6CAA6C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7C,2CAA4B;AAC5B,uCAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"setupPackageJson.js","sourceRoot":"","sources":["../../../src/commands/actions/setupPackageJson.ts"],"names":[],"mappings":";AAAA,6CAA6C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7C,2CAA4B;AAC5B,uCAAwB;AACxB,6DAAyD;AAEzD;;GAEG;AACH,SAAgB,iBAAiB,CAC/B,WAAmB;;IAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACtD,IAAI,OAAO,GAAQ,EAAE,CAAA;IACrB,IAAI,CAAC;QAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAAC,CAAC;IAAC,WAAM,CAAC,CAAA,CAAC;IAC1E,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAA;IACnC,MAAM,CAAC,IAAI,GAAG,WAAW,CAAA;IACzB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;AACzB,CAAC;AATD,8CASC;AACD,SAAsB,cAAc,CAClC,WAAmB,EACnB,WAAmB;;QAEnB,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;IACpE,CAAC;CAAA;AALD,wCAKC;AAED,SAAsB,iBAAiB,CACrC,WAAmB,EACnB,WAAmB;;QAEnB,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;IAClF,CAAC;CAAA;AALD,8CAKC"}
|
package/build/commands/build.js
CHANGED
|
@@ -48,33 +48,34 @@ function doBuildAsync(args // zero or more functions to build. zero means build
|
|
|
48
48
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
49
49
|
const funcsToBuild = [];
|
|
50
50
|
const options = [];
|
|
51
|
-
for (
|
|
52
|
-
if (arg.charAt(0)
|
|
51
|
+
for (const arg of args) {
|
|
52
|
+
if (arg.charAt(0) === '-') {
|
|
53
53
|
options.push(arg.toLowerCase());
|
|
54
54
|
}
|
|
55
55
|
else
|
|
56
56
|
funcsToBuild.push(arg);
|
|
57
57
|
}
|
|
58
|
-
if (
|
|
58
|
+
if (funcsToBuild.length === 0) {
|
|
59
59
|
let firstDepth = 0;
|
|
60
60
|
(0, DirectoryUtils_1.recurseDirectory)(projectPaths.functionPath, (filepath, stats) => {
|
|
61
|
-
|
|
62
|
-
if (
|
|
61
|
+
const depth = filepath.split(path.sep).length;
|
|
62
|
+
if (firstDepth === 0)
|
|
63
63
|
firstDepth = depth;
|
|
64
|
-
if (stats.isDirectory() && depth
|
|
64
|
+
if (stats.isDirectory() && depth === firstDepth) {
|
|
65
65
|
funcsToBuild.push(path.basename(filepath));
|
|
66
66
|
}
|
|
67
|
+
return false;
|
|
67
68
|
});
|
|
68
69
|
}
|
|
69
70
|
let fails = 0;
|
|
70
|
-
let failFast = options.
|
|
71
|
-
if (options.
|
|
71
|
+
let failFast = options.includes('--failfast');
|
|
72
|
+
if (options.includes('--deferfail'))
|
|
72
73
|
failFast = false;
|
|
73
|
-
for (
|
|
74
|
+
for (const func of funcsToBuild) {
|
|
74
75
|
const funcDir = path.join(projectPaths.functionPath, func);
|
|
75
76
|
if (fs.existsSync(funcDir)) {
|
|
76
77
|
fails += yield buildSingleFunction(funcDir, options);
|
|
77
|
-
if (fails && failFast)
|
|
78
|
+
if (fails > 0 && failFast)
|
|
78
79
|
break;
|
|
79
80
|
}
|
|
80
81
|
else {
|
|
@@ -88,11 +89,12 @@ function doBuildAsync(args // zero or more functions to build. zero means build
|
|
|
88
89
|
});
|
|
89
90
|
}
|
|
90
91
|
exports.doBuildAsync = doBuildAsync;
|
|
92
|
+
// build command for a single function
|
|
91
93
|
function buildSingleFunction(funcDir, options) {
|
|
92
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
93
95
|
const funcName = funcDir.substring(funcDir.lastIndexOf('/') + 1);
|
|
94
96
|
const buildPath = path.normalize(path.join(funcDir, '..', '..', 'build', 'functions', funcName));
|
|
95
|
-
if (options.
|
|
97
|
+
if (options.includes('--clean')) {
|
|
96
98
|
if (fs.existsSync(buildPath)) {
|
|
97
99
|
fs.rmSync(buildPath, { recursive: true });
|
|
98
100
|
}
|
|
@@ -101,29 +103,30 @@ function buildSingleFunction(funcDir, options) {
|
|
|
101
103
|
return yield buildFunctionModules(funcName, funcDir, buildPath, options);
|
|
102
104
|
});
|
|
103
105
|
}
|
|
106
|
+
// build all the function modules in path
|
|
104
107
|
function buildFunctionModules(funcName, funcDir, buildPath, options) {
|
|
105
108
|
return __awaiter(this, void 0, void 0, function* () {
|
|
106
109
|
const announce = ac.blue.dim(`building ${funcName}...`);
|
|
107
110
|
let announced = false;
|
|
108
111
|
let fails = 0;
|
|
109
|
-
let builds = 0
|
|
110
|
-
let failFast = options.
|
|
111
|
-
if (options.
|
|
112
|
+
// let builds = 0
|
|
113
|
+
let failFast = options.includes('--failfast');
|
|
114
|
+
if (options.includes('--deferfail'))
|
|
112
115
|
failFast = false;
|
|
113
116
|
const all = [];
|
|
114
117
|
(0, DirectoryUtils_1.recurseDirectory)(funcDir, (filepath, stats) => {
|
|
115
|
-
if (path.extname(filepath) ===
|
|
118
|
+
if (path.extname(filepath) === '.ts') {
|
|
116
119
|
let relPath = filepath.substring(funcDir.length);
|
|
117
120
|
relPath = relPath.substring(0, relPath.lastIndexOf('/'));
|
|
118
|
-
|
|
121
|
+
const outDir = path.join(buildPath, relPath);
|
|
119
122
|
// console.log(`tsc --esModuleInterop true --outdir ${outDir} ${filepath}`);
|
|
120
|
-
if (!(fails && failFast)) {
|
|
123
|
+
if (!(fails > 0 && failFast)) {
|
|
121
124
|
if ((0, fileCompare_1.isNewer)(filepath, outDir)) {
|
|
122
125
|
if (!announced) {
|
|
123
126
|
announced = true;
|
|
124
127
|
console.log(announce);
|
|
125
128
|
}
|
|
126
|
-
builds
|
|
129
|
+
// builds++
|
|
127
130
|
all.push((0, executeCommand_1.executeCommand)('tsc', [
|
|
128
131
|
'--esModuleInterop', 'true',
|
|
129
132
|
'--target', 'ES2015',
|
|
@@ -136,8 +139,8 @@ function buildFunctionModules(funcName, funcDir, buildPath, options) {
|
|
|
136
139
|
'--sourceMap', 'true',
|
|
137
140
|
'--outdir', outDir,
|
|
138
141
|
filepath
|
|
139
|
-
], '', true).then(result => {
|
|
140
|
-
if (result.retcode) {
|
|
142
|
+
], '', true).then((result) => {
|
|
143
|
+
if (result.retcode !== 0) {
|
|
141
144
|
fails++;
|
|
142
145
|
// console.log("error detected", fails)
|
|
143
146
|
const now = new Date();
|
|
@@ -147,13 +150,15 @@ function buildFunctionModules(funcName, funcDir, buildPath, options) {
|
|
|
147
150
|
}
|
|
148
151
|
}
|
|
149
152
|
}
|
|
153
|
+
return false;
|
|
150
154
|
});
|
|
151
|
-
return Promise.all(all).then(() => __awaiter(this, void 0, void 0, function* () {
|
|
155
|
+
return yield Promise.all(all).then(() => __awaiter(this, void 0, void 0, function* () {
|
|
152
156
|
fails += yield doPostBuildSteps(funcDir, buildPath);
|
|
153
157
|
return fails;
|
|
154
158
|
}));
|
|
155
159
|
});
|
|
156
160
|
}
|
|
161
|
+
// do the steps after the build (file copies, etc)
|
|
157
162
|
function doPostBuildSteps(funcDir, buildPath) {
|
|
158
163
|
return __awaiter(this, void 0, void 0, function* () {
|
|
159
164
|
// copy the definitions,json file over
|
|
@@ -163,11 +168,11 @@ function doPostBuildSteps(funcDir, buildPath) {
|
|
|
163
168
|
fs.copyFileSync(srcdef, dstdef);
|
|
164
169
|
}
|
|
165
170
|
else {
|
|
166
|
-
console.error(ac.red.bold(
|
|
171
|
+
console.error(ac.red.bold('no definition file found at ' + srcdef));
|
|
167
172
|
return 1;
|
|
168
173
|
}
|
|
169
174
|
// copy the __files__ folder if it exists
|
|
170
|
-
const filedirPath = path.join(funcDir,
|
|
175
|
+
const filedirPath = path.join(funcDir, '__files__');
|
|
171
176
|
if (fs.existsSync(filedirPath)) {
|
|
172
177
|
const bfiles = path.join(buildPath, '__files__');
|
|
173
178
|
if (!fs.existsSync(bfiles))
|
|
@@ -175,14 +180,15 @@ function doPostBuildSteps(funcDir, buildPath) {
|
|
|
175
180
|
(0, DirectoryUtils_1.recurseDirectory)(filedirPath, (filepath, stats) => {
|
|
176
181
|
let relPath = filepath.substring(funcDir.length);
|
|
177
182
|
relPath = relPath.substring(0, relPath.lastIndexOf('/'));
|
|
178
|
-
|
|
179
|
-
|
|
183
|
+
const outDir = path.join(buildPath, relPath);
|
|
184
|
+
const target = path.join(outDir, path.basename(filepath));
|
|
180
185
|
if (stats.isDirectory() && !fs.existsSync(target)) {
|
|
181
186
|
fs.mkdirSync(target, { recursive: true });
|
|
182
187
|
}
|
|
183
188
|
if (stats.isFile()) {
|
|
184
189
|
fs.copyFileSync(filepath, target);
|
|
185
190
|
}
|
|
191
|
+
return false;
|
|
186
192
|
});
|
|
187
193
|
}
|
|
188
194
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":";AAAA,gDAAgD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhD,2CAA4B;AAC5B,uCAAwB;AACxB,gDAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,37 +36,74 @@ function addBuiltInDefinitions(defs) {
|
|
|
36
36
|
defs.push(webrootDef);
|
|
37
37
|
// console.warn("Adding webroot literals");
|
|
38
38
|
// do just /docs and see how that goes
|
|
39
|
-
|
|
40
|
-
fsdef.name =
|
|
41
|
-
fsdef.pathMap =
|
|
39
|
+
const fsdef = Object.assign({}, fileServeDef); // copy
|
|
40
|
+
fsdef.name = 'fileserve_docs';
|
|
41
|
+
fsdef.pathMap = '/docs/{path}';
|
|
42
42
|
defs.push(fsdef);
|
|
43
43
|
const roots = (0, WebrootFileSupport_1.GetWebrootServePaths)();
|
|
44
44
|
// console.log("roots", roots)
|
|
45
|
-
for (
|
|
46
|
-
if (root) {
|
|
45
|
+
for (const root of roots) {
|
|
46
|
+
if (root !== '') {
|
|
47
47
|
let rootName = root;
|
|
48
|
-
while (rootName.
|
|
49
|
-
rootName = rootName.replace(
|
|
50
|
-
|
|
51
|
-
fileserve.name =
|
|
48
|
+
while (rootName.includes('/'))
|
|
49
|
+
rootName = rootName.replace('/', '').toLowerCase().trim();
|
|
50
|
+
const fileserve = Object.assign({}, fileServeDef); // copy
|
|
51
|
+
fileserve.name = 'fileserve_' + rootName;
|
|
52
52
|
fileserve.pathMap = `${root}/{path}`;
|
|
53
53
|
defs.push(fileserve);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
exports.addBuiltInDefinitions = addBuiltInDefinitions;
|
|
58
|
-
const apiDef = {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
58
|
+
const apiDef = {
|
|
59
|
+
name: 'API',
|
|
60
|
+
description: '',
|
|
61
|
+
version: '1.0.0',
|
|
62
|
+
pathMap: '/api',
|
|
63
|
+
allowedMethods: 'GET',
|
|
64
|
+
logLevel: 'Debug',
|
|
65
|
+
sessionRequired: false,
|
|
66
|
+
userRequired: false,
|
|
67
|
+
schemas: {},
|
|
68
|
+
parameters: [],
|
|
69
|
+
returns: {
|
|
70
|
+
200: { type: 'empty', description: 'successful response.' },
|
|
71
|
+
500: {
|
|
72
|
+
type: 'string',
|
|
73
|
+
description: 'Error details'
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
const fileServeDef = {
|
|
78
|
+
name: 'FileServe',
|
|
79
|
+
description: 'file service',
|
|
80
|
+
version: '1.0.0',
|
|
81
|
+
pathMap: '',
|
|
82
|
+
allowedMethods: 'GET',
|
|
83
|
+
logLevel: 'Debug',
|
|
84
|
+
sessionRequired: false,
|
|
85
|
+
userRequired: false,
|
|
86
|
+
schemas: {},
|
|
87
|
+
parameters: [{ name: 'path', in: 'path' }],
|
|
88
|
+
returns: {
|
|
89
|
+
200: { type: 'empty', description: 'successful response.' },
|
|
90
|
+
500: { type: 'string', description: 'Error details' }
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
const webrootDef = {
|
|
94
|
+
name: 'Webroot',
|
|
95
|
+
description: 'Serves files from the webroot /',
|
|
96
|
+
version: '1.0.0',
|
|
97
|
+
pathMap: '/{path}',
|
|
98
|
+
allowedMethods: 'get',
|
|
99
|
+
logLevel: 'Debug',
|
|
100
|
+
sessionRequired: false,
|
|
101
|
+
userRequired: false,
|
|
102
|
+
schemas: {},
|
|
103
|
+
parameters: [{ name: 'path', in: 'path' }],
|
|
104
|
+
returns: {
|
|
105
|
+
200: { type: 'empty', description: 'successful response.' },
|
|
106
|
+
500: { type: 'string', description: 'Error details' }
|
|
107
|
+
}
|
|
108
|
+
};
|
|
72
109
|
//# sourceMappingURL=ApiDocMaker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ function DeployWebrootBuiltIn() {
|
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
const wrZip = yield (0, StageWebrootZip_1.StageWebrootZip)();
|
|
24
24
|
// console.log("Deploy Webroot Builtin from "+wrZip)
|
|
25
|
-
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)(
|
|
25
|
+
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)('Webroot', wrZip);
|
|
26
26
|
// remove temp zip when done
|
|
27
27
|
fs_1.default.rmSync(wrZip, { recursive: true });
|
|
28
28
|
});
|
|
@@ -35,11 +35,11 @@ function DeployRootFileserves() {
|
|
|
35
35
|
const roots = (0, WebrootFileSupport_1.GetWebrootServePaths)();
|
|
36
36
|
// for each, deploy under the name of each
|
|
37
37
|
const fileserveZip = path_1.default.join(__dirname, 'prebuilt-zips', 'FileServe.zip');
|
|
38
|
-
|
|
38
|
+
const all = [];
|
|
39
39
|
for (let root of roots) {
|
|
40
40
|
root = root.trim();
|
|
41
|
-
let name =
|
|
42
|
-
while (name.
|
|
41
|
+
let name = 'fileserve_' + root;
|
|
42
|
+
while (name.includes('/')) {
|
|
43
43
|
name = name.replace('/', '');
|
|
44
44
|
}
|
|
45
45
|
all.push((0, DeployBuiltInZip_1.DeployBuiltInZip)(name, fileserveZip));
|
|
@@ -52,10 +52,10 @@ function DeployRootFileserves() {
|
|
|
52
52
|
exports.DeployRootFileserves = DeployRootFileserves;
|
|
53
53
|
function DeployApiBuiltin() {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
console.log(
|
|
55
|
+
console.log('Deploy API Builtin');
|
|
56
56
|
// get the prebuilt zip location
|
|
57
57
|
const apiZip = path_1.default.join(__dirname, 'prebuilt-zips', 'API.zip');
|
|
58
|
-
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)(
|
|
58
|
+
yield (0, DeployBuiltInZip_1.DeployBuiltInZip)('api', apiZip);
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
exports.DeployApiBuiltin = DeployApiBuiltin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAE3E,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,oDAAoD;QACpD,MAAM,IAAA,mCAAgB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,4BAA4B;QAC5B,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;AARD,oDAQC;AAED,SAAsB,oBAAoB;;QAGxC,wCAAwC;QACxC,iBAAiB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAoB,GAAE,CAAA;QACpC,0CAA0C;QAC1C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;QAC3E,MAAM,GAAG,GAAwB,EAAE,CAAA;QACnC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;YAClB,IAAI,IAAI,GAAG,YAAY,GAAG,IAAI,CAAA;YAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC9B,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,IAAA,mCAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,2BAA2B;QAC3B,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,+BAA+B;IACjC,CAAC;CAAA;AApBD,oDAoBC;AAED,SAAsB,gBAAgB;;QAGpC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;QACjC,gCAAgC;QAChC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,IAAA,mCAAgB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CAAA;AAPD,4CAOC"}
|
|
@@ -45,10 +45,10 @@ exports.DeployBuiltInZip = DeployBuiltInZip;
|
|
|
45
45
|
function DeployFileserve(root) {
|
|
46
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
47
|
// rootName is without slash
|
|
48
|
-
if (root) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
if (root !== '') {
|
|
49
|
+
const rootName = root.replace('/', '');
|
|
50
|
+
const name = 'fileserve_' + rootName;
|
|
51
|
+
const zipPath = path.join(__dirname, 'prebuilt-zips', 'FileServe.zip');
|
|
52
52
|
yield DeployBuiltInZip(name, zipPath);
|
|
53
53
|
}
|
|
54
54
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployBuiltInZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/DeployBuiltInZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"DeployBuiltInZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/DeployBuiltInZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA4B;AAC5B,sCAAyC;AAEzC,SAAsB,gBAAgB,CAEpC,IAAY,EACZ,OAAe;;QAEf,oCAAoC;QACpC,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACpC,CAAC;CAAA;AAPD,4CAOC;AAED,SAAsB,eAAe,CAEnC,IAAY;;QAEZ,4BAA4B;QAC5B,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YACtC,MAAM,IAAI,GAAG,YAAY,GAAG,QAAQ,CAAA;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;YACtE,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;CAAA;AAXD,0CAWC"}
|
|
@@ -59,6 +59,7 @@ function StageWebrootZip() {
|
|
|
59
59
|
else {
|
|
60
60
|
fs.copyFileSync(filepath, zipFilesPath + relPath);
|
|
61
61
|
}
|
|
62
|
+
return false;
|
|
62
63
|
});
|
|
63
64
|
const webrootZip = path.join(projectPaths.basePath, 'a.zip');
|
|
64
65
|
yield (0, utils_1.FolderToZip)(path.join(packageTemp, 'Webroot'), webrootZip);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgD;AAEhD,2CAA4B;AAC5B,uCAAwB;AACxB,uDAAoD;AACpD,6DAA2D;AAC3D,2CAA4D;AAE5D,SAAsB,eAAe;;QAGnC,2CAA2C;QAC3C,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QACnC,qBAAqB;QACrB,MAAM,IAAA,8BAAgB,GAAE,CAAA,CAAC,6BAA6B;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,CAAC,CAAA;QACxE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QAC/D,MAAM,IAAA,qBAAa,EAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;QACrE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;QACnE,MAAM,IAAA,iCAAgB,EAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;YAClD,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAClD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,EAAE,CAAC,SAAS,CAAC,YAAY,GAAG,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC3D,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,CAAA;YACnD,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE5D,MAAM,IAAA,mBAAW,EAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAA;QAChE,0BAA0B;QAC1B,OAAO,UAAU,CAAA;IACnB,CAAC;CAAA;AA3BD,0CA2BC"}
|