@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.
Files changed (38) hide show
  1. package/README.md +8 -0
  2. package/build/commands/build.js +39 -27
  3. package/build/commands/build.js.map +1 -1
  4. package/build/commands/builtin/ApiDocMaker.js +23 -6
  5. package/build/commands/builtin/ApiDocMaker.js.map +1 -1
  6. package/build/commands/builtin/BuiltInHandler.js +3 -1
  7. package/build/commands/builtin/BuiltInHandler.js.map +1 -1
  8. package/build/commands/builtin/DeployBuiltInZip.js +6 -38
  9. package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
  10. package/build/commands/builtin/StageWebrootZip.js +16 -2
  11. package/build/commands/builtin/StageWebrootZip.js.map +1 -1
  12. package/build/commands/deploy.js +9 -0
  13. package/build/commands/deploy.js.map +1 -1
  14. package/build/commands/doctor.js +21 -1
  15. package/build/commands/doctor.js.map +1 -1
  16. package/build/commands/publish.js +32 -14
  17. package/build/commands/publish.js.map +1 -1
  18. package/build/commands/test.js +42 -12
  19. package/build/commands/test.js.map +1 -1
  20. package/build/commands/update.js +1 -1
  21. package/build/commands/update.js.map +1 -1
  22. package/build/lib/IdSrc.js +21 -1
  23. package/build/lib/IdSrc.js.map +1 -1
  24. package/build/lift.js +1 -2
  25. package/build/lift.js.map +1 -1
  26. package/package.json +1 -1
  27. package/src/commands/build.ts +36 -29
  28. package/src/commands/builtin/ApiDocMaker.ts +20 -3
  29. package/src/commands/builtin/BuiltInHandler.ts +3 -1
  30. package/src/commands/builtin/DeployBuiltInZip.ts +5 -15
  31. package/src/commands/builtin/StageWebrootZip.ts +16 -2
  32. package/src/commands/deploy.ts +10 -0
  33. package/src/commands/doctor.ts +19 -0
  34. package/src/commands/publish.ts +35 -15
  35. package/src/commands/test.ts +16 -7
  36. package/src/commands/update.ts +1 -1
  37. package/src/lib/IdSrc.ts +19 -1
  38. package/src/lift.ts +1 -1
@@ -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
  }
@@ -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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"}
@@ -1,4 +1,27 @@
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
+ };
2
25
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
26
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
27
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,28 +35,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
35
  exports.doTestAsync = void 0;
13
36
  const executeCommand_1 = require("../lib/executeCommand");
14
37
  const build_1 = require("./build");
38
+ const doctor_1 = require("./doctor");
39
+ const ac = __importStar(require("ansi-colors"));
15
40
  function doTestAsync(args) {
16
41
  return __awaiter(this, void 0, void 0, function* () {
17
42
  if ((yield (0, build_1.doBuildAsync)(args)) !== 0)
18
43
  return 1; // don't test if build fails
44
+ if (!(yield (0, doctor_1.isTapInstalled)())) {
45
+ // don't continue if tap unavaiable
46
+ 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'));
47
+ return 1;
48
+ }
19
49
  if (args.length === 0)
20
50
  args = ['*'];
21
51
  let ret = 0;
22
52
  for (const funcName of args) {
23
53
  const result = yield (0, executeCommand_1.executeCommand)('tap', [
24
- `build/functions/${funcName}/*.test.js`,
54
+ `functions/${funcName}/*.test.ts`,
25
55
  /*
26
- - base -- looks a lot like terse
27
- - terse -- pass/fail counts
28
- - min -- errors only
29
- - dot -- like min, but a dot per assert
30
- - silent
31
- - json
32
- - jsonstream
33
- - markdown
34
- - junit
35
- - tap
36
- */
56
+ - base -- looks a lot like terse
57
+ - terse -- pass/fail counts
58
+ - min -- errors only
59
+ - dot -- like min, but a dot per assert
60
+ - silent
61
+ - json
62
+ - jsonstream
63
+ - markdown
64
+ - junit
65
+ - tap
66
+ */
37
67
  '--reporter=base',
38
68
  '--color',
39
69
  '--passes',
@@ -1 +1 @@
1
- {"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAsD;AACtD,mCAAsC;AAEtC,SAAsB,WAAW,CAAE,IAAc;;QAC/C,IAAI,CAAA,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAK,CAAC;YAAE,OAAO,CAAC,CAAA,CAAC,4BAA4B;QACzE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QACnC,IAAI,GAAG,GAAG,CAAC,CAAA;QACX,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE;gBACnC,mBAAmB,QAAQ,YAAY;gBACvC;;;;;;;;;;;mBAWG;gBACH,iBAAiB;gBACjB,SAAS;gBACT,UAAU;gBACV,wBAAwB;gBACxB,6BAA6B;aAEpC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YAEZ,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;gBACzB,GAAG,GAAG,MAAM,CAAC,OAAO,CAAA;gBACpB,MAAK;YACP,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CAAA;AAjCD,kCAiCC"}
1
+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAsD;AACtD,mCAAsC;AACtC,qCAAyC;AACzC,gDAAiC;AAEjC,SAAsB,WAAW,CAAE,IAAc;;QAC/C,IAAI,CAAA,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAK,CAAC;YAAE,OAAO,CAAC,CAAA,CAAC,4BAA4B;QAEzE,IAAI,CAAC,CAAA,MAAM,IAAA,uBAAc,GAAE,CAAA,EAAE,CAAC;YAC5B,mCAAmC;YACnC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,8DAA8D,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;YACxI,OAAO,CAAC,CAAA;QACV,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QACnC,IAAI,GAAG,GAAG,CAAC,CAAA;QACX,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE;gBACzC,aAAa,QAAQ,YAAY;gBACjC;;;;;;;;;;;yBAWS;gBACT,iBAAiB;gBACjB,SAAS;gBACT,UAAU;gBACV,wBAAwB;gBACxB,6BAA6B;aAE9B,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YAEZ,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;gBACzB,GAAG,GAAG,MAAM,CAAC,OAAO,CAAA;gBACpB,MAAK;YACP,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CAAA;AAxCD,kCAwCC"}
@@ -51,7 +51,7 @@ function doUpdateAsync(stageName) {
51
51
  console.log(ac.green.bold(`Updating Webroot files to ${stageName}`));
52
52
  try {
53
53
  // console.warn(">>> esbuilder")
54
- yield (0, ESBuild_1.esbuilder)();
54
+ yield (0, ESBuild_1.esbuilder)(null, true);
55
55
  // console.warn(">>> DeployRootFileserves")
56
56
  yield (0, BuiltInHandler_1.DeployRootFileserves)();
57
57
  // console.warn(">>> DeployWebrootBuiltIn")
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAiC;AACjC,oDAAiD;AACjD,6DAAqF;AACrF,4CAA0C;AAE1C,gBAAgB;AAChB,SAAsB,aAAa,CACjC,SAAkB;;QAElB,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QAEnC,6BAA6B;QAE7B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC,CAAA;YACxE,OAAO,CAAC,CAAC,CAAA;QACX,CAAC;QAED,IAAI,SAAS,KAAK,SAAS;YAAE,SAAS,GAAG,KAAK,CAAA;QAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC,CAAA;QAEpE,IAAI,CAAC;YACH,gCAAgC;YAChC,MAAM,IAAA,mBAAS,GAAE,CAAA;YACjB,2CAA2C;YAC3C,MAAM,IAAA,qCAAoB,GAAE,CAAA;YAC5B,2CAA2C;YAC3C,MAAM,IAAA,qCAAoB,GAAE,CAAA;YAC5B,OAAO,CAAC,CAAA;QACV,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC,CAAA;YAC3E,OAAO,CAAC,CAAC,CAAA;QACX,CAAC;IACH,CAAC;CAAA;AA3BD,sCA2BC"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAiC;AACjC,oDAAiD;AACjD,6DAAqF;AACrF,4CAA0C;AAE1C,gBAAgB;AAChB,SAAsB,aAAa,CACjC,SAAkB;;QAElB,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;QAEnC,6BAA6B;QAE7B,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC,CAAA;YACxE,OAAO,CAAC,CAAC,CAAA;QACX,CAAC;QAED,IAAI,SAAS,KAAK,SAAS;YAAE,SAAS,GAAG,KAAK,CAAA;QAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC,CAAA;QAEpE,IAAI,CAAC;YACH,gCAAgC;YAChC,MAAM,IAAA,mBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAC3B,2CAA2C;YAC3C,MAAM,IAAA,qCAAoB,GAAE,CAAA;YAC5B,2CAA2C;YAC3C,MAAM,IAAA,qCAAoB,GAAE,CAAA;YAC5B,OAAO,CAAC,CAAA;QACV,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC,CAAA;YAC3E,OAAO,CAAC,CAAC,CAAA;QACX,CAAC;IACH,CAAC;CAAA;AA3BD,sCA2BC"}
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.decoratedName = exports.getIdSrc = exports.getIdDelimiter = void 0;
4
7
  const LiftVersion_1 = require("../lib/LiftVersion");
8
+ const sha1_1 = __importDefault(require("sha1"));
5
9
  function getIdDelimiter() {
6
10
  return '_-_';
7
11
  }
@@ -17,7 +21,23 @@ function getIdSrc() {
17
21
  }
18
22
  exports.getIdSrc = getIdSrc;
19
23
  function decoratedName(name) {
20
- return name + getIdDelimiter() + getIdSrc();
24
+ if (name.includes(getIdDelimiter())) {
25
+ // console.warn('name '+name+' appears to be decorated already')
26
+ return name;
27
+ }
28
+ while (name.includes('/'))
29
+ name = name.replace('/', '');
30
+ const hash8 = (0, sha1_1.default)(name.toLowerCase()).toString().substring(0, 8);
31
+ const fullName = name + getIdDelimiter() + getIdSrc();
32
+ let dname;
33
+ if (name.startsWith('fileserve_')) {
34
+ dname = ('fileServe_' + hash8 + getIdDelimiter() + getIdSrc()).substring(0, 64);
35
+ }
36
+ else {
37
+ dname = fullName.substring(0, 50) + '_' + hash8;
38
+ }
39
+ // console.warn('decorated to '+dname+' from '+name)
40
+ return dname;
21
41
  }
22
42
  exports.decoratedName = decoratedName;
23
43
  //# sourceMappingURL=IdSrc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"IdSrc.js","sourceRoot":"","sources":["../../src/lib/IdSrc.ts"],"names":[],"mappings":";;;AACA,oDAAsE;AAEtE,SAAgB,cAAc;IAC5B,OAAO,KAAK,CAAA;AACd,CAAC;AAFD,wCAEC;AACD,SAAgB,QAAQ;;IACtB,IAAI,KAAK,GAAG,EAAE,GAAG,CAAC,MAAA,IAAA,4BAAc,GAAE,mCAAI,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,MAAA,MAAA,IAAA,+BAAiB,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAA;IAC3F,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC3D,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAE3D,OAAO,KAAK,CAAA;AACd,CAAC;AAND,4BAMC;AACD,SAAgB,aAAa,CAAE,IAAY;IACzC,OAAO,IAAI,GAAG,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAA;AAC7C,CAAC;AAFD,sCAEC"}
1
+ {"version":3,"file":"IdSrc.js","sourceRoot":"","sources":["../../src/lib/IdSrc.ts"],"names":[],"mappings":";;;;;;AACA,oDAAsE;AACtE,gDAAuB;AAEvB,SAAgB,cAAc;IAC5B,OAAO,KAAK,CAAA;AACd,CAAC;AAFD,wCAEC;AACD,SAAgB,QAAQ;;IACtB,IAAI,KAAK,GAAG,EAAE,GAAG,CAAC,MAAA,IAAA,4BAAc,GAAE,mCAAI,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,MAAA,MAAA,IAAA,+BAAiB,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAA;IAC3F,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC3D,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAE3D,OAAO,KAAK,CAAA;AACd,CAAC;AAND,4BAMC;AACD,SAAgB,aAAa,CAAE,IAAY;IACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;QACpC,gEAAgE;QAChE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,KAAK,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEjE,MAAM,QAAQ,GAAG,IAAI,GAAG,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAA;IACrD,IAAI,KAAK,CAAA;IACT,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,KAAK,GAAG,CAAC,YAAY,GAAG,KAAK,GAAG,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACjF,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,KAAK,CAAA;IACjD,CAAC;IACD,oDAAoD;IACpD,OAAO,KAAK,CAAA;AACd,CAAC;AAnBD,sCAmBC"}
package/build/lift.js CHANGED
@@ -104,8 +104,7 @@ function processCommand() {
104
104
  case 'publish':
105
105
  {
106
106
  const ret = yield (0, publish_1.doPublishAsync)();
107
- if (ret !== 0)
108
- process.exit(ret);
107
+ process.exit(ret);
109
108
  }
110
109
  return;
111
110
  case 'update':
package/build/lift.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lift.js","sourceRoot":"","sources":["../src/lift.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lift.js","sourceRoot":"","sources":["../src/lift.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tremho/mist-lift",
3
- "version": "2.2.1",
3
+ "version": "2.2.3",
4
4
  "description": "lift command line utility for MistLift development",
5
5
  "main": "build/lift.js",
6
6
  "bin": {
@@ -85,53 +85,60 @@ async function buildFunctionModules (
85
85
  ): Promise<number> {
86
86
  const announce = ac.blue.dim(`building ${funcName}...`)
87
87
  let announced = false
88
- let fails = 0
89
- // let builds = 0
88
+ // let fails = 0
89
+ const statObj = {
90
+ fails: 0
91
+ }
92
+
90
93
  let failFast = options.includes('--failfast')
91
94
  if (options.includes('--deferfail')) failFast = false
92
95
  const all: Array<Promise<void>> = []
93
- recurseDirectory(funcDir, (filepath, stats) => {
96
+ await recurseDirectory(funcDir, (filepath, stats) => {
94
97
  if (path.extname(filepath) === '.ts') {
95
98
  let relPath = filepath.substring(funcDir.length)
96
99
  relPath = relPath.substring(0, relPath.lastIndexOf(path.sep))
97
100
  const outDir = path.join(buildPath, relPath)
98
101
 
99
- if (!(fails > 0 && failFast)) {
102
+ if (!(statObj.fails > 0 && failFast)) {
100
103
  if (isNewer(filepath, outDir)) {
101
104
  if (!announced) {
102
105
  announced = true
103
106
  console.log(announce)
104
107
  }
105
- // builds++
106
- all.push(executeCommand('tsc', [
107
- '--esModuleInterop', 'true',
108
- '--target', 'ES2015',
109
- '--module', 'commonjs',
110
- '--lib', 'dom,es2015,scripthost,es2015.proxy',
111
- '--strict', 'true',
112
- '--noImplicitAny', 'false',
113
- '--skipLibCheck', 'true',
114
- '--forceConsistentCasingInFileNames', 'true',
115
- '--sourceMap', 'true',
116
- '--outdir', outDir,
117
- filepath
118
- ], '', true).then((result: { retcode: number | undefined, stdOut: string, stdErr: string }) => {
119
- if (result.retcode !== 0) {
120
- fails++
121
- // console.log("error detected", fails)
122
- const now = new Date()
123
- fs.utimesSync(filepath, now, now) // touch file so it is not skipped next build
124
- }
125
- }))
108
+ if (!filepath.endsWith('test.ts')) {
109
+ all.push(buildFile(filepath, outDir, statObj))
110
+ }
126
111
  }
127
112
  }
128
113
  }
129
- fails += doPostBuildSteps(funcDir, buildPath)
130
114
  return false
131
115
  })
132
- return await Promise.all(all).then(async () => {
133
- return fails
134
- })
116
+ statObj.fails += doPostBuildSteps(funcDir, buildPath)
117
+ await Promise.all(all)
118
+ return statObj.fails
119
+ }
120
+
121
+ async function buildFile (filepath: string, outDir: string, statObj: any): Promise<void> {
122
+ const result: any = await executeCommand('tsc', [
123
+ '--esModuleInterop', 'true',
124
+ '--target', 'ES2015',
125
+ '--module', 'commonjs',
126
+ '--lib', 'dom,es2015,scripthost,es2015.proxy',
127
+ '--strict', 'true',
128
+ '--noImplicitAny', 'false',
129
+ '--skipLibCheck', 'true',
130
+ '--forceConsistentCasingInFileNames', 'true',
131
+ '--sourceMap', 'true',
132
+ '--outdir', outDir,
133
+ filepath
134
+ ], '', true)
135
+
136
+ if (result.retcode !== 0) {
137
+ if (statObj !== null && statObj !== undefined) statObj.fails++
138
+ // console.log("error detected", fails)
139
+ const now = new Date()
140
+ fs.utimesSync(filepath, now, now) // touch file so it is not skipped next build
141
+ }
135
142
  }
136
143
 
137
144
  // do the steps after the build (file copies, etc)
@@ -3,6 +3,8 @@ import { buildOpenApi } from '../../lib/openAPI/openApiConstruction'
3
3
  import { GetWebrootServePaths } from '../../lib/openAPI/WebrootFileSupport'
4
4
 
5
5
  import path from 'path'
6
+ // import * as ac from 'ansi-colors'
7
+ import { decoratedName } from '../../lib/IdSrc'
6
8
 
7
9
  export async function MakePublicApiDoc
8
10
  (
@@ -16,33 +18,48 @@ export async function MakeBuiltinApiDoc
16
18
  yamlFile: string
17
19
 
18
20
  ): Promise<Uint8Array> {
21
+ // console.log(ac.gray.dim('>>> gatherFunctionDefinitions '))
19
22
  const defs = gatherFunctionDefinitions()
23
+ // console.log(ac.gray.dim('>> after gatherfunctions'), defs)
24
+ // console.log(ac.gray.dim('>>> addBuiltInDefinitions '))
20
25
  addBuiltInDefinitions(defs)
26
+ // console.log(ac.gray.dim('>> after addBuiltIns'), defs)
27
+ // console.log(ac.gray.dim('>>> buildOpenApi '))
21
28
  return await buildOpenApi(defs, false, yamlFile) //, true)
22
29
  }
23
30
 
24
31
  export function addBuiltInDefinitions (defs: any[]): void {
25
32
  // console.warn("NOT ADDING ANY BUILTIN API INTEGRATIONS")
26
33
  // console.log("ADDING apiDef");
34
+ // console.log(ac.gray.dim('>>>> pushing apiDef '), apiDef)
27
35
  defs.push(apiDef)
36
+ // console.log(ac.gray.dim('>>>> pushing webrootDef '), webrootDef)
28
37
  defs.push(webrootDef)
29
38
 
39
+ // console.log(ac.gray.dim('>>>> Adding webroot literals '))
30
40
  // console.warn("Adding webroot literals");
31
41
  // do just /docs and see how that goes
42
+ /*
32
43
  const fsdef = Object.assign({}, fileServeDef) // copy
33
- fsdef.name = 'fileserve_docs'
44
+ fsdef.name = decoratedName('fileserve_docs')
34
45
  fsdef.pathMap = '/docs/{path}'
35
46
  defs.push(fsdef)
47
+ */
36
48
  const roots = GetWebrootServePaths()
37
49
  // console.log("roots", roots)
50
+ // console.log(ac.gray.dim('>>>> roots here: '), roots)
38
51
  for (const root of roots) {
52
+ // console.log(ac.gray.dim('>> top of loop with root '+root))
39
53
  if (root !== '') {
40
54
  const rootPath = root.replace(path.sep, '/')
41
55
  let rootName = rootPath
42
- while (rootName.includes('/')) rootName = rootPath.replace('/', '').toLowerCase().trim()
56
+ // console.log(ac.gray.dim('>> rootName = '+rootName))
57
+ while (rootName.includes('/')) rootName = rootName.replace('/', '').toLowerCase().trim()
58
+ // console.log(ac.gray.dim('>> past stupid error = '+rootName))
43
59
  const fileserve = Object.assign({}, fileServeDef) // copy
44
- fileserve.name = 'fileserve_' + rootName
60
+ fileserve.name = decoratedName('fileserve_' + rootName)
45
61
  fileserve.pathMap = `${rootPath}/{path}`
62
+ // console.log('pathmap = '+fileserve.pathMap)
46
63
  defs.push(fileserve)
47
64
  }
48
65
  }
@@ -2,6 +2,7 @@ import { StageWebrootZip } from './StageWebrootZip'
2
2
  import { DeployBuiltInZip } from './DeployBuiltInZip'
3
3
  import { GetWebrootServePaths } from '../../lib/openAPI/WebrootFileSupport'
4
4
  import * as ac from 'ansi-colors'
5
+ import { decoratedName } from '../../lib/IdSrc'
5
6
 
6
7
  import fs from 'fs'
7
8
  import path from 'path'
@@ -28,7 +29,8 @@ export async function DeployRootFileserves
28
29
  const all: Array<Promise<any>> = []
29
30
  for (let root of roots) {
30
31
  root = root.trim()
31
- let name = 'fileserve_' + root
32
+ let name = decoratedName('fileserve_' + root)
33
+ // console.log(ac.gray.dim('>> '+root+' > '+name))
32
34
  while (name.includes('/')) {
33
35
  name = name.replace('/', '')
34
36
  }
@@ -1,25 +1,15 @@
1
1
 
2
- import * as path from 'path'
2
+ // import * as path from 'path'
3
3
  import { deployPackage } from '../deploy'
4
+ // import sha1 from 'sha1'
5
+ // import * as ac from 'ansi-colors'
4
6
 
5
7
  export async function DeployBuiltInZip
6
8
  (
7
9
  name: string,
8
10
  zipPath: string
9
11
  ): Promise<void> {
10
- // console.log(">> Deploying "+name)
12
+ // console.log(ac.gray.dim('>> DeployBuiltInZip '))
11
13
  await deployPackage(name, zipPath)
12
- }
13
-
14
- export async function DeployFileserve
15
- (
16
- root: string
17
- ): Promise<void> {
18
- // rootName is without slash
19
- if (root !== '') {
20
- const rootName = root.replace('/', '')
21
- const name = 'fileserve_' + rootName
22
- const zipPath = path.join(__dirname, 'prebuilt-zips', 'FileServe.zip')
23
- await DeployBuiltInZip(name, zipPath)
24
- }
14
+ // console.log(ac.gray.dim('>> returning from DeployBuiltInZip '))
25
15
  }
@@ -7,6 +7,7 @@ import { recurseDirectory } from '../../lib/DirectoryUtils'
7
7
  import { FolderToZip, UnzipToFolder } from '../../lib/utils'
8
8
  // import { executeCommand } from '../../lib/executeCommand'
9
9
  import { rmSync } from 'fs'
10
+ // import * as ac from 'ansi-colors'
10
11
 
11
12
  export async function StageWebrootZip
12
13
  (
@@ -41,14 +42,27 @@ export async function StageWebrootZip
41
42
  // console.log(">>>> making zipFilesPath "+zipFilesPath)
42
43
  await fs.mkdirSync(zipFilesPath)
43
44
 
45
+ // todo: read the redirects.json file
46
+ let redirected: string[] = []
47
+ try {
48
+ const redir = JSON.parse(fs.readFileSync(path.join(webroot, 'redirects.json')).toString())
49
+ redirected = Object.getOwnPropertyNames(redir)
50
+ // console.log(ac.grey.dim('>> redirected files '), redirected)
51
+ } catch (e: any) {
52
+ // console.log(ac.grey.dim('>> exception reading redirects.json'), e)
53
+ }
54
+
44
55
  // console.log(">>>> enumerating "+webroot)
45
56
  await recurseDirectory(webroot, (filepath, stats) => {
46
57
  const relPath = filepath.substring(webroot.length)
47
58
  if (stats.isDirectory()) {
48
59
  fs.mkdirSync(zipFilesPath + relPath, { recursive: true })
49
60
  } else {
50
- // console.log(">>>> copying "+filepath+" to "+zipFilesPath+relPath)
51
- fs.copyFileSync(filepath, zipFilesPath + relPath)
61
+ // console.log(ac.grey.dim('>> considering ' + relPath))
62
+ if (!redirected.includes(relPath.substring(1))) {
63
+ // console.log(ac.grey.dim('>> copying...'))
64
+ fs.copyFileSync(filepath, zipFilesPath + relPath) // copy only if not in redirected list
65
+ }
52
66
  }
53
67
  return false
54
68
  })