@tremho/mist-lift 2.2.1-prerelease.2 → 2.2.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.
Files changed (35) hide show
  1. package/README.md +8 -0
  2. package/build/commands/builtin/ApiDocMaker.js +23 -6
  3. package/build/commands/builtin/ApiDocMaker.js.map +1 -1
  4. package/build/commands/builtin/BuiltInHandler.js +3 -1
  5. package/build/commands/builtin/BuiltInHandler.js.map +1 -1
  6. package/build/commands/builtin/DeployBuiltInZip.js +6 -38
  7. package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
  8. package/build/commands/builtin/StageWebrootZip.js +16 -2
  9. package/build/commands/builtin/StageWebrootZip.js.map +1 -1
  10. package/build/commands/deploy.js +9 -0
  11. package/build/commands/deploy.js.map +1 -1
  12. package/build/commands/doctor.js +21 -1
  13. package/build/commands/doctor.js.map +1 -1
  14. package/build/commands/publish.js +32 -14
  15. package/build/commands/publish.js.map +1 -1
  16. package/build/commands/test.js +30 -0
  17. package/build/commands/test.js.map +1 -1
  18. package/build/commands/update.js +1 -1
  19. package/build/commands/update.js.map +1 -1
  20. package/build/lib/IdSrc.js +21 -1
  21. package/build/lib/IdSrc.js.map +1 -1
  22. package/build/lift.js +1 -2
  23. package/build/lift.js.map +1 -1
  24. package/package.json +2 -2
  25. package/src/commands/builtin/ApiDocMaker.ts +20 -3
  26. package/src/commands/builtin/BuiltInHandler.ts +3 -1
  27. package/src/commands/builtin/DeployBuiltInZip.ts +5 -15
  28. package/src/commands/builtin/StageWebrootZip.ts +16 -2
  29. package/src/commands/deploy.ts +10 -0
  30. package/src/commands/doctor.ts +19 -0
  31. package/src/commands/publish.ts +35 -15
  32. package/src/commands/test.ts +9 -0
  33. package/src/commands/update.ts +1 -1
  34. package/src/lib/IdSrc.ts +19 -1
  35. 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.2
68
+ - updated docs and prompts regarding tap installation
69
+ - addressed hanging issue on publish command
70
+ - addressed fileserve issues
71
+
72
+ ### 2.2.1
73
+ - minor logging support updates
74
+
67
75
  ### 2.2.0 - webroot redirects
68
76
 
69
77
  - See [Webroot redirect documentation](https://github.com/tremho/MistLift/blob/main/doc/Webroot%20Resource%20Redirects.md)
package/build/commands/builtin/ApiDocMaker.js CHANGED
@@ -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
- const fsdef = Object.assign({}, fileServeDef); // copy
43
- fsdef.name = 'fileserve_docs';
44
- fsdef.pathMap = '/docs/{path}';
45
- defs.push(fsdef);
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 = rootPath.replace('/', '').toLowerCase().trim();
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
  }
package/build/commands/builtin/ApiDocMaker.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ApiDocMaker.js","sourceRoot":"","sources":["../../../src/commands/builtin/ApiDocMaker.ts"],"names":[],"mappings":"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"}
package/build/commands/builtin/BuiltInHandler.js CHANGED
@@ -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
  }
package/build/commands/builtin/BuiltInHandler.js.map CHANGED
@@ -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;AAEjC,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,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,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;AApBD,oDAoBC;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
+ {"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"}
package/build/commands/builtin/DeployBuiltInZip.js CHANGED
@@ -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.DeployFileserve = exports.DeployBuiltInZip = void 0;
36
- const path = __importStar(require("path"));
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(">> Deploying "+name)
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
package/build/commands/builtin/DeployBuiltInZip.js.map CHANGED
@@ -1 +1 @@
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"}
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"}
package/build/commands/builtin/StageWebrootZip.js CHANGED
@@ -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(">>>> copying "+filepath+" to "+zipFilesPath+relPath)
81
- fs.copyFileSync(filepath, zipFilesPath + relPath);
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
  });
package/build/commands/builtin/StageWebrootZip.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StageWebrootZip.js","sourceRoot":"","sources":["../../../src/commands/builtin/StageWebrootZip.ts"],"names":[],"mappings":"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"}
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;
package/build/commands/deploy.js.map CHANGED
@@ -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
package/build/commands/doctor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
package/build/commands/publish.js CHANGED
@@ -72,17 +72,21 @@ function publishApi(stageName) {
72
72
  if (stageName === undefined)
73
73
  stageName = 'Dev';
74
74
  console.log(ac.green.bold(`Publishing Api to ${stageName}`));
75
- // console.log('esbuild...')
76
- yield (0, ESBuild_1.esbuilder)();
77
- // console.log('done')
75
+ // console.log(ac.gray.dim('>> esbuilder '))
76
+ yield (0, ESBuild_1.esbuilder)(null, true);
78
77
  // do the built-in deploys
78
+ // console.log(ac.gray.dim('>> webroot '))
79
79
  yield (0, BuiltInHandler_1.DeployWebrootBuiltIn)();
80
+ // console.log(ac.gray.dim('>> fileserves '))
80
81
  yield (0, BuiltInHandler_1.DeployRootFileserves)();
82
+ // console.log(ac.gray.dim('>> api built in '))
81
83
  yield (0, BuiltInHandler_1.DeployApiBuiltin)();
84
+ // console.log(ac.gray.dim('>> past api built in '))
82
85
  // make a private api
83
86
  // const fs = require('fs')
84
87
  // const os = require('os')
85
88
  // const path = require('path')
89
+ // console.log(ac.gray.dim('>> create staging folder '))
86
90
  let tmpDir;
87
91
  let apiBytes;
88
92
  const appPrefix = 'MistLift';
@@ -91,7 +95,9 @@ function publishApi(stageName) {
91
95
  // console.log("making "+tmpDir)
92
96
  (0, fs_1.mkdirSync)(tmpDir, { recursive: true });
93
97
  const yamlFile = path_1.default.join(tmpDir, 'papi.yaml');
98
+ // console.log(ac.gray.dim('>> Make builtin ApiDoc '))
94
99
  yield (0, ApiDocMaker_1.MakeBuiltinApiDoc)(yamlFile);
100
+ // console.log(ac.gray.dim('>> Past making builtin ApiDoc '))
95
101
  // console.log("reading "+yamlFile)
96
102
  apiBytes = fs_1.default.readFileSync(yamlFile);
97
103
  }
@@ -109,7 +115,9 @@ function publishApi(stageName) {
109
115
  console.error(`An error has occurred while removing the temp folder at ${tmpDir !== null && tmpDir !== void 0 ? tmpDir : ''}. Please remove it manually. Error: ${e.message}`);
110
116
  }
111
117
  }
118
+ // console.log(ac.gray.dim('>> past that part, onto API Gateway '))
112
119
  const client = new client_api_gateway_1.APIGatewayClient((0, LiftConfig_1.getAWSCredentials)());
120
+ // console.log(ac.gray.dim('>> remove Existing versions '))
113
121
  yield RemoveExistingVersions(client);
114
122
  const command = new client_api_gateway_1.ImportRestApiCommand({
115
123
  failOnWarnings: false,
@@ -139,14 +147,15 @@ function publishApi(stageName) {
139
147
  return;
140
148
  console.log(ac.grey('Continuing with binding...'));
141
149
  const prereq = yield PrequisiteValues(apiId !== null && apiId !== void 0 ? apiId : '');
150
+ // console.log(ac.gray.dim('>> making intRequests'))
142
151
  const intRequests = prereq.MakeRequests();
152
+ // console.log(ac.magenta.dim('>> putting integration'), intRequests)
143
153
  yield PutIntegrations(intRequests);
144
154
  yield DeployApi(apiId !== null && apiId !== void 0 ? apiId : '', stageName);
145
155
  const region = (_f = (_e = (0, LiftConfig_1.getSettings)()) === null || _e === void 0 ? void 0 : _e.awsPreferredRegion) !== null && _f !== void 0 ? _f : '';
146
156
  const publishUrl = `https://${apiId !== null && apiId !== void 0 ? apiId : ''}.execute-api.${region}.amazonaws.com/${stageName}`;
147
157
  console.log(ac.green.bold(`\n Successfully deployed to ${publishUrl}`));
148
158
  recordLatestPublish(publishUrl);
149
- // process.exit(0) // this was a dumb idea
150
159
  });
151
160
  }
152
161
  function findApiName() {
@@ -219,7 +228,7 @@ class PrereqInfo {
219
228
  if ((api === null || api === void 0 ? void 0 : api.path) === pathMap) {
220
229
  // console.log("resourceMethods", api.resourceMethods)
221
230
  const methodList = Object.getOwnPropertyNames(api.resourceMethods);
222
- // ClogTrace("methodList", methodList)
231
+ // console.log("methodList", methodList)
223
232
  for (const meth of allowedMethods.toUpperCase().split(',')) { // NOTE: we no longer try to support multiples, but this still works as is.
224
233
  // console.log("meth", meth)
225
234
  if (methodList.includes(meth)) {
@@ -233,9 +242,12 @@ class PrereqInfo {
233
242
  }
234
243
  findARN(name) {
235
244
  var _a;
236
- // console.warn(`>>> finding name ${name} in functions ${JSON.stringify(this.functions)}`)
245
+ let lastus = name.lastIndexOf((0, IdSrc_1.getIdDelimiter)());
246
+ if (lastus !== -1)
247
+ name = name.substring(0, lastus);
248
+ // console.warn(`>>> finding name ${name} in ${this.functions.length} functions`)
237
249
  for (const f of (_a = this.functions) !== null && _a !== void 0 ? _a : []) {
238
- const lastus = f.name.lastIndexOf((0, IdSrc_1.getIdDelimiter)());
250
+ lastus = f.name.lastIndexOf((0, IdSrc_1.getIdDelimiter)());
239
251
  const fname = f.name.substring(0, lastus);
240
252
  // console.warn('comparing name, fname, lc ', {lastus, fname, name})
241
253
  if (fname.toLowerCase() === name.toLowerCase()) {
@@ -243,7 +255,8 @@ class PrereqInfo {
243
255
  return f.arn;
244
256
  }
245
257
  }
246
- console.log("$$$ Couldn't find " + name + ' in ', this.functions);
258
+ console.error(ac.red.bold("$$ Couldn't find " + name + ' in integration list'));
259
+ process.exit(1);
247
260
  return '';
248
261
  }
249
262
  MakeRequests() {
@@ -252,12 +265,15 @@ class PrereqInfo {
252
265
  const out = [];
253
266
  for (const d of this.defs) {
254
267
  const def = (d);
268
+ // console.log(ac.magenta.dim('>> finding api and arn for '), {pathMap:def.pathMap, name: def.name})
255
269
  const api = this.findApi(def.pathMap, def.method);
256
270
  const arn = (_c = this.findARN(def.name)) !== null && _c !== void 0 ? _c : '';
257
271
  if (arn === '') {
258
- console.log(`>>> No ARN for ${def.name} ${def.pathMap}, ${api.id}`);
272
+ console.log(ac.red.dim(`>>> No ARN for ${def.name} ${def.pathMap}, ${api.id}`));
273
+ process.exit(1);
259
274
  }
260
- if (api !== undefined) {
275
+ // console.log(ac.magenta.dim.italic('>> api for '+arn), api)
276
+ if (api !== null && api !== undefined && arn !== '') {
261
277
  out.push({
262
278
  restApiId: this.requestApiId,
263
279
  resourceId: api.id, // api.parentId
@@ -289,10 +305,12 @@ function GetFunctionInfo(info) {
289
305
  const client = new client_lambda_1.LambdaClient((0, LiftConfig_1.getAWSCredentials)());
290
306
  const listCommand = new client_lambda_1.ListFunctionsCommand({});
291
307
  const response = yield client.send(listCommand);
292
- const sfx = (0, IdSrc_1.decoratedName)('');
308
+ const sfx = (0, IdSrc_1.getIdSrc)();
293
309
  for (const func of (_a = response.Functions) !== null && _a !== void 0 ? _a : []) {
294
310
  const fName = (_b = func === null || func === void 0 ? void 0 : func.FunctionName) !== null && _b !== void 0 ? _b : '';
295
- if (fName.endsWith(sfx)) {
311
+ // console.log(ac.gray.dim('>> checking if '+fName+' has our suffix '+sfx))
312
+ if (fName.includes(sfx)) {
313
+ // console.log(ac.gray.dim('>>> Yes'))
296
314
  info.functions.push({
297
315
  name: (_c = func.FunctionName) !== null && _c !== void 0 ? _c : '',
298
316
  arn: (_d = func.FunctionArn) !== null && _d !== void 0 ? _d : ''
@@ -343,8 +361,8 @@ function DeployApi(restApiId, stageName) {
343
361
  yield client.send(command);
344
362
  }
345
363
  catch (e) {
346
- console.error(ac.red.bold(`Error with deployApi: ${e.message}`));
347
- throw e;
364
+ console.error(ac.red.bold(`Fatal Error with deployApi: ${e.message}`));
365
+ process.exit(-1);
348
366
  }
349
367
  });
350
368
  }
package/build/commands/publish.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}