@tremho/mist-lift 1.0.2-pre-release.3 → 1.0.2-pre-release.5

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 (106) hide show
  1. package/build/commands/actions/initQuestions.js +24 -22
  2. package/build/commands/actions/initQuestions.js.map +1 -1
  3. package/build/commands/actions/setupPackageJson.js +4 -4
  4. package/build/commands/actions/setupPackageJson.js.map +1 -1
  5. package/build/commands/build.js +31 -25
  6. package/build/commands/build.js.map +1 -1
  7. package/build/commands/builtin/ApiDocMaker.js +60 -23
  8. package/build/commands/builtin/ApiDocMaker.js.map +1 -1
  9. package/build/commands/builtin/BuiltInHandler.js +6 -6
  10. package/build/commands/builtin/BuiltInHandler.js.map +1 -1
  11. package/build/commands/builtin/DeployBuiltInZip.js +4 -4
  12. package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
  13. package/build/commands/builtin/StageWebrootZip.js +1 -0
  14. package/build/commands/builtin/StageWebrootZip.js.map +1 -1
  15. package/build/commands/create.js +10 -11
  16. package/build/commands/create.js.map +1 -1
  17. package/build/commands/deploy.js +38 -42
  18. package/build/commands/deploy.js.map +1 -1
  19. package/build/commands/doctor.js +38 -37
  20. package/build/commands/doctor.js.map +1 -1
  21. package/build/commands/help.js +93 -93
  22. package/build/commands/help.js.map +1 -1
  23. package/build/commands/init.js +7 -7
  24. package/build/commands/init.js.map +1 -1
  25. package/build/commands/package.js +50 -51
  26. package/build/commands/package.js.map +1 -1
  27. package/build/commands/publish.js +98 -102
  28. package/build/commands/publish.js.map +1 -1
  29. package/build/commands/settings.js +19 -18
  30. package/build/commands/settings.js.map +1 -1
  31. package/build/commands/start.js +4 -4
  32. package/build/commands/start.js.map +1 -1
  33. package/build/commands/test.js +3 -3
  34. package/build/commands/test.js.map +1 -1
  35. package/build/commands/user.js +1 -1
  36. package/build/commands/user.js.map +1 -1
  37. package/build/expressRoutes/all.js +27 -26
  38. package/build/expressRoutes/all.js.map +1 -1
  39. package/build/expressRoutes/api.js +9 -7
  40. package/build/expressRoutes/api.js.map +1 -1
  41. package/build/expressRoutes/functionBinder.js +38 -36
  42. package/build/expressRoutes/functionBinder.js.map +1 -1
  43. package/build/lib/CaseUtils.js +2 -2
  44. package/build/lib/CaseUtils.js.map +1 -1
  45. package/build/lib/DirectoryUtils.js +4 -3
  46. package/build/lib/DirectoryUtils.js.map +1 -1
  47. package/build/lib/LiftConfig.js +18 -20
  48. package/build/lib/LiftConfig.js.map +1 -1
  49. package/build/lib/LiftVersion.js +17 -12
  50. package/build/lib/LiftVersion.js.map +1 -1
  51. package/build/lib/Tests/fileCompare.test.js +11 -10
  52. package/build/lib/Tests/fileCompare.test.js.map +1 -1
  53. package/build/lib/askQuestion.js +3 -2
  54. package/build/lib/askQuestion.js.map +1 -1
  55. package/build/lib/executeCommand.js +46 -33
  56. package/build/lib/executeCommand.js.map +1 -1
  57. package/build/lib/fileCompare.js +9 -8
  58. package/build/lib/fileCompare.js.map +1 -1
  59. package/build/lib/openAPI/ApiBuildCollector.js +9 -8
  60. package/build/lib/openAPI/ApiBuildCollector.js.map +1 -1
  61. package/build/lib/openAPI/WebrootFileSupport.js +4 -3
  62. package/build/lib/openAPI/WebrootFileSupport.js.map +1 -1
  63. package/build/lib/openAPI/openApiConstruction.js +62 -61
  64. package/build/lib/openAPI/openApiConstruction.js.map +1 -1
  65. package/build/lib/pathResolve.js +4 -4
  66. package/build/lib/pathResolve.js.map +1 -1
  67. package/build/lib/utils.js +5 -4
  68. package/build/lib/utils.js.map +1 -1
  69. package/build/lift.js +14 -15
  70. package/build/lift.js.map +1 -1
  71. package/package.json +2 -1
  72. package/src/commands/actions/initQuestions.ts +112 -112
  73. package/src/commands/actions/setupPackageJson.ts +21 -25
  74. package/src/commands/build.ts +143 -146
  75. package/src/commands/builtin/ApiDocMaker.ts +86 -54
  76. package/src/commands/builtin/BuiltInHandler.ts +31 -35
  77. package/src/commands/builtin/DeployBuiltInZip.ts +15 -17
  78. package/src/commands/builtin/StageWebrootZip.ts +29 -32
  79. package/src/commands/create.ts +40 -47
  80. package/src/commands/deploy.ts +139 -152
  81. package/src/commands/doctor.ts +86 -82
  82. package/src/commands/help.ts +152 -153
  83. package/src/commands/init.ts +37 -39
  84. package/src/commands/package.ts +201 -204
  85. package/src/commands/publish.ts +277 -312
  86. package/src/commands/settings.ts +67 -70
  87. package/src/commands/start.ts +32 -37
  88. package/src/commands/test.ts +15 -16
  89. package/src/commands/user.ts +1 -1
  90. package/src/expressRoutes/all.ts +73 -78
  91. package/src/expressRoutes/api.ts +14 -16
  92. package/src/expressRoutes/functionBinder.ts +144 -151
  93. package/src/lib/CaseUtils.ts +49 -54
  94. package/src/lib/DirectoryUtils.ts +25 -27
  95. package/src/lib/LiftConfig.ts +46 -54
  96. package/src/lib/LiftVersion.ts +69 -77
  97. package/src/lib/Tests/fileCompare.test.ts +27 -26
  98. package/src/lib/askQuestion.ts +12 -13
  99. package/src/lib/executeCommand.ts +40 -33
  100. package/src/lib/fileCompare.ts +46 -37
  101. package/src/lib/openAPI/ApiBuildCollector.ts +36 -36
  102. package/src/lib/openAPI/WebrootFileSupport.ts +15 -17
  103. package/src/lib/openAPI/openApiConstruction.ts +169 -175
  104. package/src/lib/pathResolve.ts +22 -28
  105. package/src/lib/utils.ts +31 -33
  106. package/src/lift.ts +68 -67
@@ -34,12 +34,11 @@ const help_1 = require("./help");
34
34
  /// Create command
35
35
  function doCreate(funcName // name of function to create
36
36
  ) {
37
- if (!funcName) {
37
+ if (funcName === '' || funcName === undefined) {
38
38
  (0, help_1.helpCreate)();
39
- return;
40
39
  }
41
40
  else {
42
- console.log(ac.green.bold("Creating new function named ") + funcName);
41
+ console.log(ac.green.bold('Creating new function named ') + funcName);
43
42
  const projectPaths = (0, pathResolve_1.resolvePaths)();
44
43
  const funcPath = path.join(projectPaths.functionPath, funcName);
45
44
  if (!fs.existsSync(funcPath))
@@ -51,20 +50,20 @@ function doCreate(funcName // name of function to create
51
50
  if (!fs.existsSync(path.join(funcPath, 'src')))
52
51
  fs.mkdirSync(path.join(funcPath, 'src'));
53
52
  let localsrc = fs.readFileSync(path.join(dataDir, 'function-local-ts')).toString();
54
- while (localsrc.indexOf("$$FUNCTION_NAME$$") !== -1) {
55
- localsrc = localsrc.replace("$$FUNCTION_NAME$$", funcName);
53
+ while (localsrc.includes('$$FUNCTION_NAME$$')) {
54
+ localsrc = localsrc.replace('$$FUNCTION_NAME$$', funcName);
56
55
  }
57
56
  fs.writeFileSync(path.join(funcPath, 'src', 'local.ts'), localsrc);
58
57
  let defsrc = fs.readFileSync(path.join(dataDir, 'function-definition-template')).toString();
59
- while (defsrc.indexOf("$$FUNCTION_NAME$$") !== -1) {
60
- defsrc = defsrc.replace("$$FUNCTION_NAME$$", funcName);
58
+ while (defsrc.includes('$$FUNCTION_NAME$$')) {
59
+ defsrc = defsrc.replace('$$FUNCTION_NAME$$', funcName);
61
60
  }
62
- let defpathMap = "/" + funcName.toLowerCase();
63
- defsrc = defsrc.replace("$$PATHMAP$$", defpathMap);
61
+ const defpathMap = '/' + funcName.toLowerCase();
62
+ defsrc = defsrc.replace('$$PATHMAP$$', defpathMap);
64
63
  fs.writeFileSync(path.join(funcPath, 'src', 'definition.json'), defsrc);
65
64
  let mainsrc = fs.readFileSync(path.join(dataDir, 'function-main-ts')).toString();
66
- while (mainsrc.indexOf("$$TemplateName$$") !== -1) {
67
- mainsrc = mainsrc.replace("$$TemplateName$$", funcName);
65
+ while (mainsrc.includes('$$TemplateName$$')) {
66
+ mainsrc = mainsrc.replace('$$TemplateName$$', funcName);
68
67
  }
69
68
  fs.writeFileSync(path.join(funcPath, 'src', 'main.ts'), mainsrc);
70
69
  fs.copyFileSync(path.join(dataDir, 'function-test-template'), path.join(funcPath, testdirname, 'Sanity.test.ts'));
@@ -1 +1 @@
1
- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvD,uCAAwB;AACxB,2CAA4B;AAC5B,gDAAiC;AACjC,oDAAgD;AAChD,gDAAsD;AACtD,iCAAkC;AAGlC,kBAAkB;AAClB,SAAgB,QAAQ,CACpB,QAAe,CAAC,6BAA6B;;IAGzC,IAAG,CAAC,QAAQ,EAAE,CAAC;QACP,IAAA,iBAAU,GAAE,CAAA;QACZ,OAAM;IACd,CAAC;SAAM,CAAC;QAER,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,GAAC,QAAQ,CAAC,CAAA;QAEnE,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAChE,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACnD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjE,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QACnD,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACnG,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;QAEvF,IAAI,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnF,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAClD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAC/D,CAAC;QACD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnE,IAAI,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5F,OAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC/C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,UAAU,GAAG,GAAG,GAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;QAClD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC;QACxE,IAAI,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjF,OAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;QACD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;QACjE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAwB,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAA;QACjH,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAEpG,CAAC;AAEL,CAAC;AA1CD,4BA0CC"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
@@ -59,57 +59,48 @@ function doDeployAsync(args) {
59
59
  deploymentRecord = JSON.parse(fs_1.default.readFileSync(deploymentRecordPath).toString());
60
60
  }
61
61
  catch (_b) { }
62
- // the main package json that has all imports
63
- const mainPkgJsonPath = path_1.default.join(projectPaths.packagePath);
64
- const mainPkgSrc = fs_1.default.readFileSync(mainPkgJsonPath).toString();
65
- const mainPkgJson = JSON.parse(mainPkgSrc);
66
- const projectName = (0, LiftVersion_1.getProjectName)();
67
- const projectVersion = (0, LiftVersion_1.getProjectVersion)();
68
- const liftVersion = (0, LiftVersion_1.getLiftVersion)();
69
62
  const funcsToDeploy = [];
70
63
  const options = [];
71
- for (let arg of args) {
72
- if (arg.charAt(0) == '-') {
64
+ for (const arg of args) {
65
+ if (arg.charAt(0) === '-') {
73
66
  options.push(arg.toLowerCase());
74
67
  }
75
68
  else
76
69
  funcsToDeploy.push(arg);
77
70
  }
78
- if (options.indexOf("--no-package") === -1) {
79
- let ret = yield (0, package_1.doPackageAsync)(args);
80
- if (ret)
71
+ if (!options.includes('--no-package')) {
72
+ const ret = yield (0, package_1.doPackageAsync)(args);
73
+ if (ret !== 0)
81
74
  return ret;
82
75
  else
83
76
  yield (0, utils_1.delay)(2500);
84
77
  }
85
- if (options.indexOf("--clean") !== -1) {
78
+ if (options.includes('--clean')) {
86
79
  deploymentRecord = {};
87
80
  }
88
- if (!funcsToDeploy.length) {
81
+ if (funcsToDeploy.length === 0) {
89
82
  let firstDepth = 0;
90
83
  (0, DirectoryUtils_1.recurseDirectory)(projectPaths.functionPath, (filepath, stats) => {
91
- let depth = filepath.split(path_1.default.sep).length;
92
- if (!firstDepth)
84
+ const depth = filepath.split(path_1.default.sep).length;
85
+ if (firstDepth === 0)
93
86
  firstDepth = depth;
94
- if (stats.isDirectory() && depth == firstDepth) {
87
+ if (stats.isDirectory() && depth === firstDepth) {
95
88
  funcsToDeploy.push(path_1.default.basename(filepath));
96
89
  }
90
+ return false;
97
91
  });
98
92
  }
99
- const all = [];
100
- let error = 0;
101
- for (let funcName of funcsToDeploy) {
102
- // console.log("Deploy "+funcName)
103
- const zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + ".zip");
93
+ for (const funcName of funcsToDeploy) {
94
+ const zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip');
104
95
  if (fs_1.default.existsSync(zipFile)) {
105
- let zipTime = fs_1.default.statSync(zipFile).mtime;
96
+ const zipTime = fs_1.default.statSync(zipFile).mtime;
106
97
  if (zipTime.getTime() > ((_a = deploymentRecord[funcName]) !== null && _a !== void 0 ? _a : 0)) {
107
98
  yield deployPackage(funcName);
108
99
  deploymentRecord[funcName] = Date.now();
109
100
  }
110
101
  }
111
102
  else {
112
- console.error("deploy: " + zipFile + ac.red.bold(` ${funcName} does not exist`));
103
+ console.error('deploy: ' + zipFile + ac.red.bold(` ${funcName} does not exist`));
113
104
  return -1;
114
105
  }
115
106
  }
@@ -121,15 +112,15 @@ function doDeployAsync(args) {
121
112
  });
122
113
  }
123
114
  exports.doDeployAsync = doDeployAsync;
124
- //------------
115
+ // ------------
125
116
  function deployPackage(funcName, zipFile) {
126
117
  return __awaiter(this, void 0, void 0, function* () {
127
- var _a, _b;
118
+ var _a, _b, _c;
128
119
  // first off, anchor a base directory
129
- zipFile !== null && zipFile !== void 0 ? zipFile : (zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + ".zip"));
120
+ zipFile !== null && zipFile !== void 0 ? zipFile : (zipFile = path_1.default.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip'));
130
121
  // funcname gets decorated with current instance identifier
131
- var idsrc = (0, md5_1.default)(((_a = (0, LiftVersion_1.getProjectName)()) !== null && _a !== void 0 ? _a : "") + ((_b = (0, LiftVersion_1.getProjectVersion)()) !== null && _b !== void 0 ? _b : ""));
132
- var dFuncName = funcName + "_" + idsrc;
122
+ const idsrc = (0, md5_1.default)(((_a = (0, LiftVersion_1.getProjectName)()) !== null && _a !== void 0 ? _a : '') + ((_c = (_b = (0, LiftVersion_1.getProjectVersion)()) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : ''));
123
+ const dFuncName = funcName + '_' + idsrc;
133
124
  // See if function exists
134
125
  const client = new client_lambda_1.LambdaClient((0, LiftConfig_1.getAWSCredentials)());
135
126
  const command = new client_lambda_1.DeleteFunctionCommand({
@@ -141,13 +132,13 @@ function deployPackage(funcName, zipFile) {
141
132
  // console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+"...")
142
133
  try {
143
134
  const response = yield CreateCloudFunction(dFuncName, zipFile);
144
- const parts = response.FunctionArn.split(":");
135
+ const parts = response.FunctionArn.split(':');
145
136
  const principal = parts[4];
146
137
  yield AddPermissions(client, dFuncName, principal);
147
138
  console.log(ac.green.bold(`Successfully deployed ${funcName}`));
148
139
  }
149
140
  catch (e) {
150
- console.error(ac.red.bold.italic("Error deploying " + funcName), e);
141
+ console.error(ac.red.bold.italic('Error deploying ' + funcName), e);
151
142
  }
152
143
  });
153
144
  }
@@ -157,7 +148,7 @@ function CreateCloudFunction(funcName, zipFile) {
157
148
  var _a;
158
149
  const settings = (0, LiftConfig_1.getSettings)();
159
150
  const nodeRuntime = settings.awsNodeRuntime;
160
- const serviceRole = (_a = settings.awsServiceRoleARN) !== null && _a !== void 0 ? _a : "";
151
+ const serviceRole = (_a = settings.awsServiceRoleARN) !== null && _a !== void 0 ? _a : '';
161
152
  const zipFileBase64 = fs_1.default.readFileSync(zipFile);
162
153
  const client = new client_lambda_1.LambdaClient((0, LiftConfig_1.getAWSCredentials)());
163
154
  const command = new client_lambda_1.CreateFunctionCommand({
@@ -169,19 +160,24 @@ function CreateCloudFunction(funcName, zipFile) {
169
160
  ZipFile: zipFileBase64
170
161
  }
171
162
  });
172
- return yield client.send(command); // response
163
+ const resp = yield client.send(command); // response
164
+ return resp;
173
165
  });
174
166
  }
175
167
  function AddPermissions(client, funcName, principal) {
176
- const region = (0, LiftConfig_1.getSettings)().awsPreferredRegion;
177
- const WSApi = "/" + funcName.toLowerCase();
178
- const command = new client_lambda_1.AddPermissionCommand({
179
- FunctionName: funcName,
180
- StatementId: "InvokePermission",
181
- Action: "lambda:invokeFunction",
182
- Principal: "apigateway.amazonaws.com",
183
- SourceArn: `arn:aws:execute-api:${region}:${principal}:${WSApi}`
168
+ return __awaiter(this, void 0, void 0, function* () {
169
+ var _a;
170
+ const region = (_a = (0, LiftConfig_1.getSettings)().awsPreferredRegion) !== null && _a !== void 0 ? _a : '';
171
+ const WSApi = '/' + funcName.toLowerCase();
172
+ const command = new client_lambda_1.AddPermissionCommand({
173
+ FunctionName: funcName,
174
+ StatementId: 'InvokePermission',
175
+ Action: 'lambda:invokeFunction',
176
+ Principal: 'apigateway.amazonaws.com',
177
+ SourceArn: `arn:aws:execute-api:${region}:${principal}:${WSApi}`
178
+ });
179
+ const resp = yield client.send(command);
180
+ return resp;
184
181
  });
185
- return client.send(command);
186
182
  }
187
183
  //# sourceMappingURL=deploy.js.map
@@ -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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"}
@@ -40,35 +40,36 @@ const pathResolve_1 = require("../lib/pathResolve");
40
40
  const LiftConfig_1 = require("../lib/LiftConfig");
41
41
  function doDoctor() {
42
42
  return __awaiter(this, void 0, void 0, function* () {
43
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
43
44
  console.log(ac.blue.bold('Lift doctor'));
44
- const liftVersion = (0, LiftVersion_1.getLiftVersion)().toString();
45
- const projectVersion = (0, LiftVersion_1.getProjectVersion)().toString();
46
- const projectName = (0, LiftVersion_1.getProjectName)();
47
- const typescriptVersion = yield fetchTypescriptVersion();
48
- const nodeVersion = yield fetchNodeVersion();
49
- const npmVersion = yield fetchNpmVersion();
50
- const gitVersion = yield fetchGitVersion();
45
+ const liftVersion = (_b = (_a = (0, LiftVersion_1.getLiftVersion)()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
46
+ const projectVersion = (_d = (_c = (0, LiftVersion_1.getProjectVersion)()) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : '';
47
+ const projectName = (_e = (0, LiftVersion_1.getProjectName)()) !== null && _e !== void 0 ? _e : '';
48
+ const typescriptVersion = (_f = yield fetchTypescriptVersion()) !== null && _f !== void 0 ? _f : '';
49
+ const nodeVersion = (_g = yield fetchNodeVersion()) !== null && _g !== void 0 ? _g : '';
50
+ const npmVersion = (_h = yield fetchNpmVersion()) !== null && _h !== void 0 ? _h : '';
51
+ const gitVersion = (_j = yield fetchGitVersion()) !== null && _j !== void 0 ? _j : '';
51
52
  const settingsAvail = (0, LiftConfig_1.areSettingsAvailable)();
52
- console.log("Checking installed dependencies:");
53
- let ok = report("MistLift", liftVersion, "0.1.0");
54
- ok = ok && report("Typescript", typescriptVersion, "5.3.3");
55
- ok = ok && report("Node", nodeVersion, "20.11.0");
56
- ok = ok && report("Npm", npmVersion, "10.3.0");
57
- report("Git", gitVersion, "2.0.0");
53
+ console.log('Checking installed dependencies:');
54
+ let ok = report('MistLift', liftVersion, '0.1.0');
55
+ ok = ok && report('Typescript', typescriptVersion, '5.3.3');
56
+ ok = ok && report('Node', nodeVersion, '20.11.0');
57
+ ok = ok && report('Npm', npmVersion, '10.3.0');
58
+ report('Git', gitVersion, '2.0.0');
58
59
  if (!settingsAvail) {
59
- console.log("");
60
- console.log(ac.yellow.dim.bold("Cloud Settings are not set. ") + ac.blue("run " + ac.bold("lift settings")));
60
+ console.log('');
61
+ console.log(ac.yellow.dim.bold('Cloud Settings are not set. ') + ac.blue('run ' + ac.bold('lift settings')));
61
62
  }
62
63
  if (!ok) {
63
- console.log("");
64
- console.log(ac.red.bold("System needs updates before MistLift can be used."));
64
+ console.log('');
65
+ console.log(ac.red.bold('System needs updates before MistLift can be used.'));
65
66
  }
66
67
  else {
67
- console.log("");
68
- console.log(ac.green.bold("Ready for MistLift"));
69
- console.log("");
68
+ console.log('');
69
+ console.log(ac.green.bold('Ready for MistLift'));
70
+ console.log('');
70
71
  if ((0, pathResolve_1.resolvePaths)().verified) {
71
- console.log(ac.blue.italic("Current project " + projectName + " " + projectVersion));
72
+ console.log(ac.blue.italic('Current project ' + projectName + ' ' + projectVersion));
72
73
  }
73
74
  }
74
75
  return ok;
@@ -79,7 +80,7 @@ function versionTrim(vstr) {
79
80
  vstr = vstr.trim();
80
81
  let i = -1;
81
82
  while (++i < vstr.length) {
82
- let c = vstr.charAt(i);
83
+ const c = vstr.charAt(i);
83
84
  if (c >= '0' && c <= '9')
84
85
  break;
85
86
  }
@@ -88,36 +89,36 @@ function versionTrim(vstr) {
88
89
  function fetchTypescriptVersion() {
89
90
  return __awaiter(this, void 0, void 0, function* () {
90
91
  const result = yield (0, executeCommand_1.executeCommand)('tsc', ['-v']);
91
- if (result.retcode)
92
- return "Typescript not found";
93
- var vstr = versionTrim(result.stdStr);
92
+ if (result.retcode !== 0)
93
+ return 'Typescript not found';
94
+ const vstr = versionTrim(result.stdStr);
94
95
  return vstr;
95
96
  });
96
97
  }
97
98
  function fetchNodeVersion() {
98
99
  return __awaiter(this, void 0, void 0, function* () {
99
100
  const result = yield (0, executeCommand_1.executeCommand)('node', ['-v']);
100
- if (result.retcode)
101
- return "Node not found";
102
- var vstr = versionTrim(result.stdStr);
101
+ if (result.retcode !== 0)
102
+ return 'Node not found';
103
+ const vstr = versionTrim(result.stdStr);
103
104
  return vstr;
104
105
  });
105
106
  }
106
107
  function fetchNpmVersion() {
107
108
  return __awaiter(this, void 0, void 0, function* () {
108
109
  const result = yield (0, executeCommand_1.executeCommand)('npm', ['-v']);
109
- if (result.retcode)
110
- return "npm not found";
111
- var vstr = versionTrim(result.stdStr);
110
+ if (result.retcode !== 0)
111
+ return 'npm not found';
112
+ const vstr = versionTrim(result.stdStr);
112
113
  return vstr;
113
114
  });
114
115
  }
115
116
  function fetchGitVersion() {
116
117
  return __awaiter(this, void 0, void 0, function* () {
117
118
  const result = yield (0, executeCommand_1.executeCommand)('git', ['-v']);
118
- if (result.retcode)
119
- return "Git not found";
120
- var vstr = versionTrim(result.stdStr);
119
+ if (result.retcode !== 0)
120
+ return 'Git not found';
121
+ const vstr = versionTrim(result.stdStr);
121
122
  return vstr;
122
123
  });
123
124
  }
@@ -125,12 +126,12 @@ function fetchGitVersion() {
125
126
  function report(name, version, minStr) {
126
127
  const ver = new LiftVersion_1.VersionInfo(version);
127
128
  const minVer = new LiftVersion_1.VersionInfo(minStr);
128
- let ok = (ver.isGreaterThan(minVer) || ver.equals(minVer));
129
+ const ok = (ver.isGreaterThan(minVer) || ver.equals(minVer));
129
130
  if (ok) {
130
- console.log(ac.green.bold("") + ac.black.bold(name) + " " + ac.grey(version));
131
+ console.log(ac.green.bold('') + ac.black.bold(name) + ' ' + ac.grey(version));
131
132
  }
132
133
  else {
133
- console.log(ac.red.bold("X ") + ac.black.bold(name) + ac.red.bold(" does not meet minimum version of ") + ac.blue(minStr));
134
+ console.log(ac.red.bold('X ') + ac.black.bold(name) + ac.red.bold(' does not meet minimum version of ') + ac.blue(minStr));
134
135
  }
135
136
  return ok;
136
137
  }
@@ -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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"}