@tremho/mist-lift 2.2.1 → 2.2.3
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 +8 -0
- package/build/commands/build.js +39 -27
- package/build/commands/build.js.map +1 -1
- package/build/commands/builtin/ApiDocMaker.js +23 -6
- package/build/commands/builtin/ApiDocMaker.js.map +1 -1
- package/build/commands/builtin/BuiltInHandler.js +3 -1
- package/build/commands/builtin/BuiltInHandler.js.map +1 -1
- package/build/commands/builtin/DeployBuiltInZip.js +6 -38
- package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
- package/build/commands/builtin/StageWebrootZip.js +16 -2
- package/build/commands/builtin/StageWebrootZip.js.map +1 -1
- package/build/commands/deploy.js +9 -0
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/doctor.js +21 -1
- package/build/commands/doctor.js.map +1 -1
- package/build/commands/publish.js +32 -14
- package/build/commands/publish.js.map +1 -1
- package/build/commands/test.js +42 -12
- package/build/commands/test.js.map +1 -1
- package/build/commands/update.js +1 -1
- package/build/commands/update.js.map +1 -1
- package/build/lib/IdSrc.js +21 -1
- package/build/lib/IdSrc.js.map +1 -1
- package/build/lift.js +1 -2
- package/build/lift.js.map +1 -1
- package/package.json +1 -1
- package/src/commands/build.ts +36 -29
- package/src/commands/builtin/ApiDocMaker.ts +20 -3
- package/src/commands/builtin/BuiltInHandler.ts +3 -1
- package/src/commands/builtin/DeployBuiltInZip.ts +5 -15
- package/src/commands/builtin/StageWebrootZip.ts +16 -2
- package/src/commands/deploy.ts +10 -0
- package/src/commands/doctor.ts +19 -0
- package/src/commands/publish.ts +35 -15
- package/src/commands/test.ts +16 -7
- package/src/commands/update.ts +1 -1
- package/src/lib/IdSrc.ts +19 -1
- package/src/lift.ts +1 -1
package/README.md
CHANGED
|
@@ -64,6 +64,14 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
|
|
|
64
64
|
|
|
65
65
|
## Changelog
|
|
66
66
|
|
|
67
|
+
### 2.2.3
|
|
68
|
+
- fixes problematic bug w/rt test, build, and package consistency.
|
|
69
|
+
|
|
70
|
+
### 2.2.2
|
|
71
|
+
- updated docs and prompts regarding tap installation
|
|
72
|
+
- addressed hanging issue on publish command
|
|
73
|
+
- addressed fileserve issues
|
|
74
|
+
|
|
67
75
|
### 2.2.1
|
|
68
76
|
- minor logging support updates
|
|
69
77
|
|
package/build/commands/build.js
CHANGED
|
@@ -114,53 +114,65 @@ function buildFunctionModules(funcName, funcDir, buildPath, options) {
|
|
|
114
114
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
115
|
const announce = ac.blue.dim(`building ${funcName}...`);
|
|
116
116
|
let announced = false;
|
|
117
|
-
let fails = 0
|
|
117
|
+
// let fails = 0
|
|
118
|
+
const statObj = {
|
|
119
|
+
fails: 0
|
|
120
|
+
};
|
|
118
121
|
// let builds = 0
|
|
119
122
|
let failFast = options.includes('--failfast');
|
|
120
123
|
if (options.includes('--deferfail'))
|
|
121
124
|
failFast = false;
|
|
122
125
|
const all = [];
|
|
123
|
-
(0, DirectoryUtils_1.recurseDirectory)(funcDir, (filepath, stats) => {
|
|
126
|
+
yield (0, DirectoryUtils_1.recurseDirectory)(funcDir, (filepath, stats) => {
|
|
124
127
|
if (path.extname(filepath) === '.ts') {
|
|
125
128
|
let relPath = filepath.substring(funcDir.length);
|
|
126
129
|
relPath = relPath.substring(0, relPath.lastIndexOf(path.sep));
|
|
127
130
|
const outDir = path.join(buildPath, relPath);
|
|
128
|
-
if (!(fails > 0 && failFast)) {
|
|
131
|
+
if (!(statObj.fails > 0 && failFast)) {
|
|
129
132
|
if ((0, fileCompare_1.isNewer)(filepath, outDir)) {
|
|
130
133
|
if (!announced) {
|
|
131
134
|
announced = true;
|
|
132
135
|
console.log(announce);
|
|
133
136
|
}
|
|
134
137
|
// builds++
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
'
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
'--noImplicitAny', 'false',
|
|
142
|
-
'--skipLibCheck', 'true',
|
|
143
|
-
'--forceConsistentCasingInFileNames', 'true',
|
|
144
|
-
'--sourceMap', 'true',
|
|
145
|
-
'--outdir', outDir,
|
|
146
|
-
filepath
|
|
147
|
-
], '', true).then((result) => {
|
|
148
|
-
if (result.retcode !== 0) {
|
|
149
|
-
fails++;
|
|
150
|
-
// console.log("error detected", fails)
|
|
151
|
-
const now = new Date();
|
|
152
|
-
fs.utimesSync(filepath, now, now); // touch file so it is not skipped next build
|
|
153
|
-
}
|
|
154
|
-
}));
|
|
138
|
+
if (!filepath.endsWith('test.ts')) {
|
|
139
|
+
// if(builds >= 16 && builds < 17) {
|
|
140
|
+
// console.warn('>> pushing to tsc ', {filepath, outDir})
|
|
141
|
+
all.push(buildFile(filepath, outDir, statObj));
|
|
142
|
+
// }
|
|
143
|
+
}
|
|
155
144
|
}
|
|
156
145
|
}
|
|
157
146
|
}
|
|
158
|
-
fails += doPostBuildSteps(funcDir, buildPath);
|
|
159
147
|
return false;
|
|
160
148
|
});
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
149
|
+
statObj.fails += doPostBuildSteps(funcDir, buildPath);
|
|
150
|
+
yield Promise.all(all);
|
|
151
|
+
return statObj.fails;
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
function buildFile(filepath, outDir, statObj) {
|
|
155
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
156
|
+
const result = yield (0, executeCommand_1.executeCommand)('tsc', [
|
|
157
|
+
'--esModuleInterop', 'true',
|
|
158
|
+
'--target', 'ES2015',
|
|
159
|
+
'--module', 'commonjs',
|
|
160
|
+
'--lib', 'dom,es2015,scripthost,es2015.proxy',
|
|
161
|
+
'--strict', 'true',
|
|
162
|
+
'--noImplicitAny', 'false',
|
|
163
|
+
'--skipLibCheck', 'true',
|
|
164
|
+
'--forceConsistentCasingInFileNames', 'true',
|
|
165
|
+
'--sourceMap', 'true',
|
|
166
|
+
'--outdir', outDir,
|
|
167
|
+
filepath
|
|
168
|
+
], '', true);
|
|
169
|
+
if (result.retcode !== 0) {
|
|
170
|
+
if (statObj !== null && statObj !== undefined)
|
|
171
|
+
statObj.fails++;
|
|
172
|
+
// console.log("error detected", fails)
|
|
173
|
+
const now = new Date();
|
|
174
|
+
fs.utimesSync(filepath, now, now); // touch file so it is not skipped next build
|
|
175
|
+
}
|
|
164
176
|
});
|
|
165
177
|
}
|
|
166
178
|
// do the steps after the build (file copies, etc)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ const ApiBuildCollector_1 = require("../../lib/openAPI/ApiBuildCollector");
|
|
|
17
17
|
const openApiConstruction_1 = require("../../lib/openAPI/openApiConstruction");
|
|
18
18
|
const WebrootFileSupport_1 = require("../../lib/openAPI/WebrootFileSupport");
|
|
19
19
|
const path_1 = __importDefault(require("path"));
|
|
20
|
+
// import * as ac from 'ansi-colors'
|
|
21
|
+
const IdSrc_1 = require("../../lib/IdSrc");
|
|
20
22
|
function MakePublicApiDoc() {
|
|
21
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
24
|
const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
|
|
@@ -26,8 +28,13 @@ function MakePublicApiDoc() {
|
|
|
26
28
|
exports.MakePublicApiDoc = MakePublicApiDoc;
|
|
27
29
|
function MakeBuiltinApiDoc(yamlFile) {
|
|
28
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
+
// console.log(ac.gray.dim('>>> gatherFunctionDefinitions '))
|
|
29
32
|
const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
|
|
33
|
+
// console.log(ac.gray.dim('>> after gatherfunctions'), defs)
|
|
34
|
+
// console.log(ac.gray.dim('>>> addBuiltInDefinitions '))
|
|
30
35
|
addBuiltInDefinitions(defs);
|
|
36
|
+
// console.log(ac.gray.dim('>> after addBuiltIns'), defs)
|
|
37
|
+
// console.log(ac.gray.dim('>>> buildOpenApi '))
|
|
31
38
|
return yield (0, openApiConstruction_1.buildOpenApi)(defs, false, yamlFile); //, true)
|
|
32
39
|
});
|
|
33
40
|
}
|
|
@@ -35,25 +42,35 @@ exports.MakeBuiltinApiDoc = MakeBuiltinApiDoc;
|
|
|
35
42
|
function addBuiltInDefinitions(defs) {
|
|
36
43
|
// console.warn("NOT ADDING ANY BUILTIN API INTEGRATIONS")
|
|
37
44
|
// console.log("ADDING apiDef");
|
|
45
|
+
// console.log(ac.gray.dim('>>>> pushing apiDef '), apiDef)
|
|
38
46
|
defs.push(apiDef);
|
|
47
|
+
// console.log(ac.gray.dim('>>>> pushing webrootDef '), webrootDef)
|
|
39
48
|
defs.push(webrootDef);
|
|
49
|
+
// console.log(ac.gray.dim('>>>> Adding webroot literals '))
|
|
40
50
|
// console.warn("Adding webroot literals");
|
|
41
51
|
// do just /docs and see how that goes
|
|
42
|
-
|
|
43
|
-
fsdef
|
|
44
|
-
fsdef.
|
|
45
|
-
|
|
52
|
+
/*
|
|
53
|
+
const fsdef = Object.assign({}, fileServeDef) // copy
|
|
54
|
+
fsdef.name = decoratedName('fileserve_docs')
|
|
55
|
+
fsdef.pathMap = '/docs/{path}'
|
|
56
|
+
defs.push(fsdef)
|
|
57
|
+
*/
|
|
46
58
|
const roots = (0, WebrootFileSupport_1.GetWebrootServePaths)();
|
|
47
59
|
// console.log("roots", roots)
|
|
60
|
+
// console.log(ac.gray.dim('>>>> roots here: '), roots)
|
|
48
61
|
for (const root of roots) {
|
|
62
|
+
// console.log(ac.gray.dim('>> top of loop with root '+root))
|
|
49
63
|
if (root !== '') {
|
|
50
64
|
const rootPath = root.replace(path_1.default.sep, '/');
|
|
51
65
|
let rootName = rootPath;
|
|
66
|
+
// console.log(ac.gray.dim('>> rootName = '+rootName))
|
|
52
67
|
while (rootName.includes('/'))
|
|
53
|
-
rootName =
|
|
68
|
+
rootName = rootName.replace('/', '').toLowerCase().trim();
|
|
69
|
+
// console.log(ac.gray.dim('>> past stupid error = '+rootName))
|
|
54
70
|
const fileserve = Object.assign({}, fileServeDef); // copy
|
|
55
|
-
fileserve.name = 'fileserve_' + rootName;
|
|
71
|
+
fileserve.name = (0, IdSrc_1.decoratedName)('fileserve_' + rootName);
|
|
56
72
|
fileserve.pathMap = `${rootPath}/{path}`;
|
|
73
|
+
// console.log('pathmap = '+fileserve.pathMap)
|
|
57
74
|
defs.push(fileserve);
|
|
58
75
|
}
|
|
59
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2EAA+E;AAC/E,+EAAoE;AACpE,6EAA2E;AAE3E,gDAAuB;
|
|
1
|
+
{"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,7 @@ const StageWebrootZip_1 = require("./StageWebrootZip");
|
|
|
40
40
|
const DeployBuiltInZip_1 = require("./DeployBuiltInZip");
|
|
41
41
|
const WebrootFileSupport_1 = require("../../lib/openAPI/WebrootFileSupport");
|
|
42
42
|
const ac = __importStar(require("ansi-colors"));
|
|
43
|
+
const IdSrc_1 = require("../../lib/IdSrc");
|
|
43
44
|
const fs_1 = __importDefault(require("fs"));
|
|
44
45
|
const path_1 = __importDefault(require("path"));
|
|
45
46
|
function DeployWebrootBuiltIn() {
|
|
@@ -63,7 +64,8 @@ function DeployRootFileserves() {
|
|
|
63
64
|
const all = [];
|
|
64
65
|
for (let root of roots) {
|
|
65
66
|
root = root.trim();
|
|
66
|
-
let name = 'fileserve_' + root;
|
|
67
|
+
let name = (0, IdSrc_1.decoratedName)('fileserve_' + root);
|
|
68
|
+
// console.log(ac.gray.dim('>> '+root+' > '+name))
|
|
67
69
|
while (name.includes('/')) {
|
|
68
70
|
name = name.replace('/', '');
|
|
69
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAC3E,gDAAiC;
|
|
1
|
+
{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAC3E,gDAAiC;AACjC,2CAA+C;AAE/C,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,0CAA0C;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,uDAAuD;QACvD,MAAM,IAAA,mCAAgB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,4BAA4B;QAC5B,uCAAuC;QACvC,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;AAVD,oDAUC;AAED,SAAsB,oBAAoB;;QAGxC,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,IAAA,qBAAa,EAAC,YAAY,GAAG,IAAI,CAAC,CAAA;YAC7C,kDAAkD;YAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC9B,CAAC;YACD,gDAAgD;YAChD,GAAG,CAAC,IAAI,CAAC,IAAA,mCAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,MAAM,iBAAiB,CAAC,CAAC,CAAA;QACtE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,+BAA+B;IACjC,CAAC;CAAA;AArBD,oDAqBC;AAED,SAAsB,gBAAgB;;QAGpC,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;AAND,4CAMC"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -32,26 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
9
|
});
|
|
33
10
|
};
|
|
34
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.
|
|
36
|
-
|
|
12
|
+
exports.DeployBuiltInZip = void 0;
|
|
13
|
+
// import * as path from 'path'
|
|
37
14
|
const deploy_1 = require("../deploy");
|
|
15
|
+
// import sha1 from 'sha1'
|
|
16
|
+
// import * as ac from 'ansi-colors'
|
|
38
17
|
function DeployBuiltInZip(name, zipPath) {
|
|
39
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
|
-
// console.log(
|
|
19
|
+
// console.log(ac.gray.dim('>> DeployBuiltInZip '))
|
|
41
20
|
yield (0, deploy_1.deployPackage)(name, zipPath);
|
|
21
|
+
// console.log(ac.gray.dim('>> returning from DeployBuiltInZip '))
|
|
42
22
|
});
|
|
43
23
|
}
|
|
44
24
|
exports.DeployBuiltInZip = DeployBuiltInZip;
|
|
45
|
-
function DeployFileserve(root) {
|
|
46
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
-
// rootName is without slash
|
|
48
|
-
if (root !== '') {
|
|
49
|
-
const rootName = root.replace('/', '');
|
|
50
|
-
const name = 'fileserve_' + rootName;
|
|
51
|
-
const zipPath = path.join(__dirname, 'prebuilt-zips', 'FileServe.zip');
|
|
52
|
-
yield DeployBuiltInZip(name, zipPath);
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
exports.DeployFileserve = DeployFileserve;
|
|
57
25
|
//# sourceMappingURL=DeployBuiltInZip.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployBuiltInZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/DeployBuiltInZip.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DeployBuiltInZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/DeployBuiltInZip.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+BAA+B;AAC/B,sCAAyC;AACzC,0BAA0B;AAC1B,oCAAoC;AAEpC,SAAsB,gBAAgB,CAEpC,IAAY,EACZ,OAAe;;QAEf,mDAAmD;QACnD,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAClC,kEAAkE;IACpE,CAAC;CAAA;AARD,4CAQC"}
|
|
@@ -41,6 +41,7 @@ const DirectoryUtils_1 = require("../../lib/DirectoryUtils");
|
|
|
41
41
|
const utils_1 = require("../../lib/utils");
|
|
42
42
|
// import { executeCommand } from '../../lib/executeCommand'
|
|
43
43
|
const fs_1 = require("fs");
|
|
44
|
+
// import * as ac from 'ansi-colors'
|
|
44
45
|
function StageWebrootZip() {
|
|
45
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
47
|
// console.log(">>>> staging webroot to zip")
|
|
@@ -70,6 +71,16 @@ function StageWebrootZip() {
|
|
|
70
71
|
// await executeCommand('ls', [ '-l', stagedWebrootFolder], '', true)
|
|
71
72
|
// console.log(">>>> making zipFilesPath "+zipFilesPath)
|
|
72
73
|
yield fs.mkdirSync(zipFilesPath);
|
|
74
|
+
// todo: read the redirects.json file
|
|
75
|
+
let redirected = [];
|
|
76
|
+
try {
|
|
77
|
+
const redir = JSON.parse(fs.readFileSync(path.join(webroot, 'redirects.json')).toString());
|
|
78
|
+
redirected = Object.getOwnPropertyNames(redir);
|
|
79
|
+
// console.log(ac.grey.dim('>> redirected files '), redirected)
|
|
80
|
+
}
|
|
81
|
+
catch (e) {
|
|
82
|
+
// console.log(ac.grey.dim('>> exception reading redirects.json'), e)
|
|
83
|
+
}
|
|
73
84
|
// console.log(">>>> enumerating "+webroot)
|
|
74
85
|
yield (0, DirectoryUtils_1.recurseDirectory)(webroot, (filepath, stats) => {
|
|
75
86
|
const relPath = filepath.substring(webroot.length);
|
|
@@ -77,8 +88,11 @@ function StageWebrootZip() {
|
|
|
77
88
|
fs.mkdirSync(zipFilesPath + relPath, { recursive: true });
|
|
78
89
|
}
|
|
79
90
|
else {
|
|
80
|
-
// console.log(
|
|
81
|
-
|
|
91
|
+
// console.log(ac.grey.dim('>> considering ' + relPath))
|
|
92
|
+
if (!redirected.includes(relPath.substring(1))) {
|
|
93
|
+
// console.log(ac.grey.dim('>> copying...'))
|
|
94
|
+
fs.copyFileSync(filepath, zipFilesPath + relPath); // copy only if not in redirected list
|
|
95
|
+
}
|
|
82
96
|
}
|
|
83
97
|
return false;
|
|
84
98
|
});
|
|
@@ -1 +1 @@
|
|
|
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;AAC5D,4DAA4D;AAC5D,2BAA2B;
|
|
1
|
+
{"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":"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"}
|
package/build/commands/deploy.js
CHANGED
|
@@ -95,12 +95,15 @@ function doDeployAsync(args) {
|
|
|
95
95
|
return false;
|
|
96
96
|
});
|
|
97
97
|
}
|
|
98
|
+
// console.log(ac.gray.dim('>> beginning loop in doDeployAsync '))
|
|
98
99
|
for (const funcName of funcsToDeploy) {
|
|
99
100
|
const zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip');
|
|
100
101
|
if (fs_1.default.existsSync(zipFile)) {
|
|
101
102
|
const zipTime = fs_1.default.statSync(zipFile).mtime;
|
|
102
103
|
if (zipTime.getTime() > ((_a = deploymentRecord[funcName]) !== null && _a !== void 0 ? _a : 0)) {
|
|
104
|
+
// console.log(ac.gray.dim('>> calling deployPackage '))
|
|
103
105
|
yield deployPackage(funcName);
|
|
106
|
+
// console.log(ac.gray.dim('>> recording result '))
|
|
104
107
|
deploymentRecord[funcName] = Date.now();
|
|
105
108
|
}
|
|
106
109
|
}
|
|
@@ -113,6 +116,7 @@ function doDeployAsync(args) {
|
|
|
113
116
|
fs_1.default.writeFileSync(deploymentRecordPath, JSON.stringify(deploymentRecord));
|
|
114
117
|
}
|
|
115
118
|
catch (_c) { }
|
|
119
|
+
// console.log(ac.gray.dim('>> returning from doDeployAsync '))
|
|
116
120
|
return 0;
|
|
117
121
|
});
|
|
118
122
|
}
|
|
@@ -158,10 +162,13 @@ function deployPackage(funcName, zipFile) {
|
|
|
158
162
|
const principal = parts[4];
|
|
159
163
|
yield AddPermissions(client, dFuncName, principal);
|
|
160
164
|
let deployMsg = `Successfully deployed ${funcName}`;
|
|
165
|
+
// console.log(ac.gray.dim('>> deploy trace 1'))
|
|
161
166
|
if (memorySize > 0 || timeout > 0) {
|
|
167
|
+
// console.log(ac.gray.dim('>> deploy trace 1a'))
|
|
162
168
|
deployMsg += ac.grey.italic(' with ');
|
|
163
169
|
const useAnd = memorySize > 9 && timeout > 0;
|
|
164
170
|
if (memorySize > 0) {
|
|
171
|
+
// console.log(ac.gray.dim('>> deploy trace 1b'))
|
|
165
172
|
deployMsg += ac.grey(`memorySize ${memorySize}mb`);
|
|
166
173
|
if (useAnd)
|
|
167
174
|
deployMsg += ac.grey.italic(' and ');
|
|
@@ -170,11 +177,13 @@ function deployPackage(funcName, zipFile) {
|
|
|
170
177
|
deployMsg += ac.grey(`timeout ${timeout} seconds`);
|
|
171
178
|
}
|
|
172
179
|
}
|
|
180
|
+
// console.log(ac.gray.dim('>> deploy trace 2'))
|
|
173
181
|
console.log(ac.green.bold(deployMsg));
|
|
174
182
|
}
|
|
175
183
|
catch (e) {
|
|
176
184
|
console.error(ac.red.bold.italic('Error deploying ' + funcName), e);
|
|
177
185
|
}
|
|
186
|
+
// console.log(ac.gray.dim('>> deploy trace 3'))
|
|
178
187
|
});
|
|
179
188
|
}
|
|
180
189
|
exports.deployPackage = deployPackage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
package/build/commands/doctor.js
CHANGED
|
@@ -32,12 +32,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.doDoctor = void 0;
|
|
35
|
+
exports.isTapInstalled = exports.doDoctor = void 0;
|
|
36
36
|
const ac = __importStar(require("ansi-colors"));
|
|
37
37
|
const LiftVersion_1 = require("../lib/LiftVersion");
|
|
38
38
|
const executeCommand_1 = require("../lib/executeCommand");
|
|
39
39
|
const pathResolve_1 = require("../lib/pathResolve");
|
|
40
40
|
const LiftConfig_1 = require("../lib/LiftConfig");
|
|
41
|
+
const minTapVersion = '19.2.5';
|
|
41
42
|
function doDoctor() {
|
|
42
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
44
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
@@ -59,6 +60,9 @@ function doDoctor() {
|
|
|
59
60
|
ok = ok && report('Npm', npmVersion, isWin ? '9.6.4' : '10.3.0');
|
|
60
61
|
report('Git', gitVersion, '2.0.0');
|
|
61
62
|
report('unzip', unzipVersion, '1.0.0');
|
|
63
|
+
if (!(yield isTapInstalled())) {
|
|
64
|
+
console.log(ac.yellow.dim.bold.italic('\nTap is necessary for the lift test command.\nInstall with ') + ac.black.bold('npm i -g tap\n'));
|
|
65
|
+
}
|
|
62
66
|
if (!settingsAvail) {
|
|
63
67
|
console.log('');
|
|
64
68
|
console.log(ac.yellow.dim.bold('Cloud Settings are not set. ') + ac.blue('run ' + ac.bold('lift settings')));
|
|
@@ -116,6 +120,15 @@ function fetchNpmVersion() {
|
|
|
116
120
|
return vstr;
|
|
117
121
|
});
|
|
118
122
|
}
|
|
123
|
+
function fetchTapVersion() {
|
|
124
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
125
|
+
const result = yield (0, executeCommand_1.executeCommand)('tap', ['-v']);
|
|
126
|
+
if (result.retcode !== 0)
|
|
127
|
+
return 'Tap not found';
|
|
128
|
+
const vstr = versionTrim(result.stdStr);
|
|
129
|
+
return vstr;
|
|
130
|
+
});
|
|
131
|
+
}
|
|
119
132
|
function fetchGitVersion() {
|
|
120
133
|
return __awaiter(this, void 0, void 0, function* () {
|
|
121
134
|
const result = yield (0, executeCommand_1.executeCommand)('git', ['-v']);
|
|
@@ -147,4 +160,11 @@ function report(name, version, minStr) {
|
|
|
147
160
|
}
|
|
148
161
|
return ok;
|
|
149
162
|
}
|
|
163
|
+
function isTapInstalled() {
|
|
164
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
165
|
+
const v = yield fetchTapVersion();
|
|
166
|
+
return report('tap', v, minTapVersion);
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
exports.isTapInstalled = isTapInstalled;
|
|
150
170
|
//# sourceMappingURL=doctor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAiC;AACjC,oDAAmG;AACnG,0DAAsD;AACtD,oDAAiD;AACjD,kDAAwD;AAExD,SAAsB,QAAQ;;;QAC5B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAA;QAExC,MAAM,WAAW,GAAG,MAAA,MAAA,IAAA,4BAAc,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAA;QACtD,MAAM,cAAc,GAAG,MAAA,MAAA,IAAA,+BAAiB,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAA;QAC5D,MAAM,WAAW,GAAG,MAAA,IAAA,4BAAc,GAAE,mCAAI,EAAE,CAAA;QAC1C,MAAM,iBAAiB,GAAG,MAAA,MAAM,sBAAsB,EAAE,mCAAI,EAAE,CAAA;QAC9D,MAAM,WAAW,GAAG,MAAA,MAAM,gBAAgB,EAAE,mCAAI,EAAE,CAAA;QAClD,MAAM,UAAU,GAAG,MAAA,MAAM,eAAe,EAAE,mCAAI,EAAE,CAAA;QAChD,MAAM,UAAU,GAAG,MAAA,MAAM,eAAe,EAAE,mCAAI,EAAE,CAAA;QAChD,MAAM,YAAY,GAAG,MAAA,MAAM,iBAAiB,EAAE,mCAAI,EAAE,CAAA;QACpD,MAAM,aAAa,GAAG,IAAA,iCAAoB,GAAE,CAAA;QAE5C,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;QAC/C,IAAI,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QACjD,EAAE,GAAG,EAAE,IAAI,MAAM,CAAC,YAAY,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;QAC3D,EAAE,GAAG,EAAE,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;QACjD,MAAM,KAAK,GAAY,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAA;QACnD,EAAE,GAAG,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QAChE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;QAClC,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
|