@tremho/mist-lift 2.2.1 → 2.2.2

package/build/commands/test.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,10 +35,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doTestAsync = void 0;
 const executeCommand_1 = require("../lib/executeCommand");
 const build_1 = require("./build");
+const doctor_1 = require("./doctor");
+const ac = __importStar(require("ansi-colors"));
 function doTestAsync(args) {
     return __awaiter(this, void 0, void 0, function* () {
         if ((yield (0, build_1.doBuildAsync)(args)) !== 0)
             return 1; // don't test if build fails
+        if (!(yield (0, doctor_1.isTapInstalled)())) {
+            // don't continue if tap unavaiable
+            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'));
+            return 1;
+        }
         if (args.length === 0)
             args = ['*'];
         let ret = 0;

package/build/commands/test.js.map

@@ -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"}
+{"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;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;AAxCD,kCAwCC"}

package/build/commands/update.js

@@ -51,7 +51,7 @@ function doUpdateAsync(stageName) {
         console.log(ac.green.bold(`Updating Webroot files to ${stageName}`));
         try {
             // console.warn(">>> esbuilder")
-            yield (0, ESBuild_1.esbuilder)();
+            yield (0, ESBuild_1.esbuilder)(null, true);
             // console.warn(">>> DeployRootFileserves")
             yield (0, BuiltInHandler_1.DeployRootFileserves)();
             // console.warn(">>> DeployWebrootBuiltIn")

package/build/commands/update.js.map

@@ -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"}
+{"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"}

package/build/lib/IdSrc.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decoratedName = exports.getIdSrc = exports.getIdDelimiter = void 0;
 const LiftVersion_1 = require("../lib/LiftVersion");
+const sha1_1 = __importDefault(require("sha1"));
 function getIdDelimiter() {
     return '_-_';
 }
@@ -17,7 +21,23 @@ function getIdSrc() {
 }
 exports.getIdSrc = getIdSrc;
 function decoratedName(name) {
-    return name + getIdDelimiter() + getIdSrc();
+    if (name.includes(getIdDelimiter())) {
+        // console.warn('name '+name+' appears to be decorated already')
+        return name;
+    }
+    while (name.includes('/'))
+        name = name.replace('/', '');
+    const hash8 = (0, sha1_1.default)(name.toLowerCase()).toString().substring(0, 8);
+    const fullName = name + getIdDelimiter() + getIdSrc();
+    let dname;
+    if (name.startsWith('fileserve_')) {
+        dname = ('fileServe_' + hash8 + getIdDelimiter() + getIdSrc()).substring(0, 64);
+    }
+    else {
+        dname = fullName.substring(0, 50) + '_' + hash8;
+    }
+    // console.warn('decorated to '+dname+' from '+name)
+    return dname;
 }
 exports.decoratedName = decoratedName;
 //# sourceMappingURL=IdSrc.js.map

package/build/lib/IdSrc.js.map

@@ -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"}
+{"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

@@ -104,8 +104,7 @@ function processCommand() {
             case 'publish':
                 {
                     const ret = yield (0, publish_1.doPublishAsync)();
-                    if (ret !== 0)
-                        process.exit(ret);
+                    process.exit(ret);
                 }
                 return;
             case 'update':

package/build/lift.js.map

@@ -1 +1 @@
-{"version":3,"file":"lift.js","sourceRoot":"","sources":["../src/lift.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lift.js","sourceRoot":"","sources":["../src/lift.ts"],"names":[],"mappings":";;AAEA,2DAA2D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE3D,gDAAiC;AACjC,iDAAkC;AAElC,mDAAkD;AAElD,0CAAwC;AACxC,0CAAwC;AACxC,8CAA4C;AAC5C,4CAA+C;AAC/C,0CAA6C;AAC7C,gDAAmD;AACnD,8CAAiD;AACjD,gDAAmD;AACnD,8CAAiD;AACjD,8CAA4C;AAC5C,4CAAmD;AACnD,kDAAgD;AAChD,0CAAwC;AAExC,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAI,MAAM,CAAA;AACzC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAElC,SAAe,cAAc;;;QAC3B,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,SAAS,CAAC;YACf,KAAK,WAAW,CAAC;YACjB,KAAK,IAAI;gBACP,OAAO,CAAC,GAAG,CAAC,SAAS,IAAA,4BAAc,GAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;gBACnD,OAAM;YACR,KAAK,MAAM;gBACT,OAAO,IAAA,aAAM,EAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAA;YAC9B,KAAK,QAAQ;gBACX,MAAM,IAAA,iBAAQ,GAAE,CAAA;gBAChB,OAAM;YACR,KAAK,MAAM;gBACT,OAAO,MAAM,IAAA,aAAM,EAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAA;YACpC,KAAK,QAAQ;gBACX,OAAO,IAAA,iBAAQ,EAAC,MAAA,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAA;YAChC,KAAK,OAAO;gBAAE,CAAC;oBACb,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,CAAA;oBACpC,IAAI,GAAG,KAAK,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;gBACjC,CAAC;gBACC,OAAM;YACR,KAAK,MAAM;gBAAE,CAAC;oBACZ,MAAM,GAAG,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAA;oBACnC,IAAI,GAAG,KAAK,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAClC,CAAC;gBACC,OAAM;YACR,KAAK,OAAO;gBACV,OAAO,MAAM,IAAA,wBAAgB,GAAE,CAAA;YAEjC,KAAK,SAAS;gBAAE,CAAC;oBACf,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAc,EAAC,IAAI,CAAC,CAAA;oBACtC,IAAI,GAAG,KAAK,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAClC,CAAC;gBACC,OAAM;YACR,KAAK,QAAQ;gBAAE,CAAC;oBACd,MAAM,GAAG,GAAG,MAAM,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAA;oBACrC,IAAI,GAAG,KAAK,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAClC,CAAC;gBACC,OAAM;YACR,KAAK,SAAS;gBAAE,CAAC;oBACf,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAc,GAAE,CAAA;oBAClC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACnB,CAAC;gBACC,OAAM;YACR,KAAK,QAAQ;gBAAE,CAAC;oBACd,MAAM,GAAG,GAAG,MAAM,IAAA,sBAAa,GAAE,CAAA;oBACjC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACnB,CAAC;gBACC,OAAM;YACR,KAAK,UAAU;gBACb,MAAM,IAAA,qBAAU,GAAE,CAAA;gBAClB,OAAM;YACR,KAAK,MAAM;gBACT,MAAM,IAAA,aAAM,GAAE,CAAA;gBACd,OAAM;QACV,CAAC;QACD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;CAAA;AAED,SAAS,SAAS,CAAE,OAAe;IACjC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EAAE,CAAC,CAAC,CAAA;IACjE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAC,CAAA;IACtG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AACjB,CAAC;AAED,cAAc,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tremho/mist-lift",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "lift command line utility for MistLift development",
   "main": "build/lift.js",
   "bin": {

package/src/commands/builtin/ApiDocMaker.ts

@@ -3,6 +3,8 @@ import { buildOpenApi } from '../../lib/openAPI/openApiConstruction'
 import { GetWebrootServePaths } from '../../lib/openAPI/WebrootFileSupport'
 
 import path from 'path'
+// import * as ac from 'ansi-colors'
+import { decoratedName } from '../../lib/IdSrc'
 
 export async function MakePublicApiDoc
 (
@@ -16,33 +18,48 @@ export async function MakeBuiltinApiDoc
   yamlFile: string
 
 ): Promise<Uint8Array> {
+  // console.log(ac.gray.dim('>>> gatherFunctionDefinitions '))
   const defs = gatherFunctionDefinitions()
+  // console.log(ac.gray.dim('>> after gatherfunctions'), defs)
+  // console.log(ac.gray.dim('>>> addBuiltInDefinitions '))
   addBuiltInDefinitions(defs)
+  // console.log(ac.gray.dim('>> after addBuiltIns'), defs)
+  // console.log(ac.gray.dim('>>> buildOpenApi '))
   return await buildOpenApi(defs, false, yamlFile) //, true)
 }
 
 export function addBuiltInDefinitions (defs: any[]): void {
   // console.warn("NOT ADDING ANY BUILTIN API INTEGRATIONS")
   // console.log("ADDING apiDef");
+  // console.log(ac.gray.dim('>>>> pushing apiDef '), apiDef)
   defs.push(apiDef)
+  // console.log(ac.gray.dim('>>>> pushing webrootDef '), webrootDef)
   defs.push(webrootDef)
 
+  // console.log(ac.gray.dim('>>>> Adding webroot literals '))
   // console.warn("Adding webroot literals");
   // do just /docs and see how that goes
+  /*
   const fsdef = Object.assign({}, fileServeDef) // copy
-  fsdef.name = 'fileserve_docs'
+  fsdef.name = decoratedName('fileserve_docs')
   fsdef.pathMap = '/docs/{path}'
   defs.push(fsdef)
+   */
   const roots = GetWebrootServePaths()
   // console.log("roots", roots)
+  // console.log(ac.gray.dim('>>>> roots here: '), roots)
   for (const root of roots) {
+    // console.log(ac.gray.dim('>> top of loop with root '+root))
     if (root !== '') {
       const rootPath = root.replace(path.sep, '/')
       let rootName = rootPath
-      while (rootName.includes('/')) rootName = rootPath.replace('/', '').toLowerCase().trim()
+      // console.log(ac.gray.dim('>> rootName = '+rootName))
+      while (rootName.includes('/')) rootName = rootName.replace('/', '').toLowerCase().trim()
+      // console.log(ac.gray.dim('>> past stupid error = '+rootName))
       const fileserve = Object.assign({}, fileServeDef) // copy
-      fileserve.name = 'fileserve_' + rootName
+      fileserve.name = decoratedName('fileserve_' + rootName)
       fileserve.pathMap = `${rootPath}/{path}`
+      // console.log('pathmap = '+fileserve.pathMap)
       defs.push(fileserve)
     }
   }

package/src/commands/builtin/BuiltInHandler.ts

@@ -2,6 +2,7 @@ import { StageWebrootZip } from './StageWebrootZip'
 import { DeployBuiltInZip } from './DeployBuiltInZip'
 import { GetWebrootServePaths } from '../../lib/openAPI/WebrootFileSupport'
 import * as ac from 'ansi-colors'
+import { decoratedName } from '../../lib/IdSrc'
 
 import fs from 'fs'
 import path from 'path'
@@ -28,7 +29,8 @@ export async function DeployRootFileserves
   const all: Array<Promise<any>> = []
   for (let root of roots) {
     root = root.trim()
-    let name = 'fileserve_' + root
+    let name = decoratedName('fileserve_' + root)
+    // console.log(ac.gray.dim('>> '+root+' > '+name))
     while (name.includes('/')) {
       name = name.replace('/', '')
     }

package/src/commands/builtin/DeployBuiltInZip.ts

@@ -1,25 +1,15 @@
 
-import * as path from 'path'
+// import * as path from 'path'
 import { deployPackage } from '../deploy'
+// import sha1 from 'sha1'
+// import * as ac from 'ansi-colors'
 
 export async function DeployBuiltInZip
 (
   name: string,
   zipPath: string
 ): Promise<void> {
-  // console.log(">> Deploying "+name)
+  // console.log(ac.gray.dim('>> DeployBuiltInZip '))
   await deployPackage(name, zipPath)
-}
-
-export async function DeployFileserve
-(
-  root: string
-): Promise<void> {
-  // rootName is without slash
-  if (root !== '') {
-    const rootName = root.replace('/', '')
-    const name = 'fileserve_' + rootName
-    const zipPath = path.join(__dirname, 'prebuilt-zips', 'FileServe.zip')
-    await DeployBuiltInZip(name, zipPath)
-  }
+  // console.log(ac.gray.dim('>> returning from DeployBuiltInZip '))
 }

package/src/commands/builtin/StageWebrootZip.ts

@@ -7,6 +7,7 @@ import { recurseDirectory } from '../../lib/DirectoryUtils'
 import { FolderToZip, UnzipToFolder } from '../../lib/utils'
 // import { executeCommand } from '../../lib/executeCommand'
 import { rmSync } from 'fs'
+// import * as ac from 'ansi-colors'
 
 export async function StageWebrootZip
 (
@@ -41,14 +42,27 @@ export async function StageWebrootZip
   // console.log(">>>> making zipFilesPath "+zipFilesPath)
   await fs.mkdirSync(zipFilesPath)
 
+  // todo: read the redirects.json file
+  let redirected: string[] = []
+  try {
+    const redir = JSON.parse(fs.readFileSync(path.join(webroot, 'redirects.json')).toString())
+    redirected = Object.getOwnPropertyNames(redir)
+    // console.log(ac.grey.dim('>> redirected files '), redirected)
+  } catch (e: any) {
+    // console.log(ac.grey.dim('>> exception reading redirects.json'), e)
+  }
+
   // console.log(">>>> enumerating "+webroot)
   await recurseDirectory(webroot, (filepath, stats) => {
     const relPath = filepath.substring(webroot.length)
     if (stats.isDirectory()) {
       fs.mkdirSync(zipFilesPath + relPath, { recursive: true })
     } else {
-      // console.log(">>>> copying "+filepath+" to "+zipFilesPath+relPath)
-      fs.copyFileSync(filepath, zipFilesPath + relPath)
+      // console.log(ac.grey.dim('>> considering ' + relPath))
+      if (!redirected.includes(relPath.substring(1))) {
+        // console.log(ac.grey.dim('>> copying...'))
+        fs.copyFileSync(filepath, zipFilesPath + relPath) // copy only if not in redirected list
+      }
     }
     return false
   })

package/src/commands/deploy.ts

@@ -68,12 +68,16 @@ export async function doDeployAsync (
     })
   }
 
+  // console.log(ac.gray.dim('>> beginning loop in doDeployAsync '))
+
   for (const funcName of funcsToDeploy) {
     const zipFile = path.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip')
     if (fs.existsSync(zipFile)) {
       const zipTime = fs.statSync(zipFile).mtime
       if (zipTime.getTime() > (deploymentRecord[funcName] ?? 0)) {
+        // console.log(ac.gray.dim('>> calling deployPackage '))
         await deployPackage(funcName)
+        // console.log(ac.gray.dim('>> recording result '))
         deploymentRecord[funcName] = Date.now()
       }
     } else {
@@ -84,6 +88,7 @@ export async function doDeployAsync (
 
   try { fs.writeFileSync(deploymentRecordPath, JSON.stringify(deploymentRecord)) } catch {}
 
+  // console.log(ac.gray.dim('>> returning from doDeployAsync '))
   return 0
 }
 
@@ -132,10 +137,13 @@ export async function deployPackage (
     const principal = parts[4]
     await AddPermissions(client, dFuncName, principal)
     let deployMsg: string = `Successfully deployed ${funcName}`
+    // console.log(ac.gray.dim('>> deploy trace 1'))
     if (memorySize > 0 || timeout > 0) {
+      // console.log(ac.gray.dim('>> deploy trace 1a'))
       deployMsg += ac.grey.italic(' with ')
       const useAnd = memorySize > 9 && timeout > 0
       if (memorySize > 0) {
+        // console.log(ac.gray.dim('>> deploy trace 1b'))
         deployMsg += ac.grey(`memorySize ${memorySize}mb`)
         if (useAnd) deployMsg += ac.grey.italic(' and ')
       }
@@ -143,11 +151,13 @@ export async function deployPackage (
         deployMsg += ac.grey(`timeout ${timeout} seconds`)
       }
     }
+    // console.log(ac.gray.dim('>> deploy trace 2'))
 
     console.log(ac.green.bold(deployMsg))
   } catch (e: any) {
     console.error(ac.red.bold.italic('Error deploying ' + funcName), e)
   }
+  // console.log(ac.gray.dim('>> deploy trace 3'))
 }
 async function CreateCloudFunction (
   funcName: string,

package/src/commands/doctor.ts

@@ -5,6 +5,8 @@ import { executeCommand } from '../lib/executeCommand'
 import { resolvePaths } from '../lib/pathResolve'
 import { areSettingsAvailable } from '../lib/LiftConfig'
 
+const minTapVersion = '19.2.5'
+
 export async function doDoctor (): Promise<boolean> {
   console.log(ac.blue.bold('Lift doctor'))
 
@@ -26,6 +28,11 @@ export async function doDoctor (): Promise<boolean> {
   ok = ok && report('Npm', npmVersion, isWin ? '9.6.4' : '10.3.0')
   report('Git', gitVersion, '2.0.0')
   report('unzip', unzipVersion, '1.0.0')
+
+  if (!await isTapInstalled()) {
+    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'))
+  }
+
   if (!settingsAvail) {
     console.log('')
     console.log(ac.yellow.dim.bold('Cloud Settings are not set. ') + ac.blue('run ' + ac.bold('lift settings')))
@@ -81,6 +88,13 @@ async function fetchNpmVersion (
   return vstr
 }
 
+async function fetchTapVersion (): Promise<string> {
+  const result = await executeCommand('tap', ['-v'])
+  if (result.retcode !== 0) return 'Tap not found'
+  const vstr = versionTrim(result.stdStr)
+  return vstr
+}
+
 async function fetchGitVersion (
 
 ): Promise<string> {
@@ -116,3 +130,8 @@ function report (
   }
   return ok
 }
+
+export async function isTapInstalled (): Promise<boolean> {
+  const v = await fetchTapVersion()
+  return report('tap', v, minTapVersion)
+}

package/src/commands/publish.ts

@@ -27,7 +27,7 @@ import { delay } from '../lib/utils'
 import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
 import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
 import { esbuilder } from '../lib/ESBuild'
-import { decoratedName, getIdDelimiter } from '../lib/IdSrc'
+import { getIdSrc, getIdDelimiter } from '../lib/IdSrc'
 
 let projectPaths: any
 
@@ -53,19 +53,24 @@ async function publishApi (
   if (stageName === undefined) stageName = 'Dev'
   console.log(ac.green.bold(`Publishing Api to ${stageName}`))
 
-  // console.log('esbuild...')
-  await esbuilder()
-  // console.log('done')
+  // console.log(ac.gray.dim('>> esbuilder '))
+  await esbuilder(null, true)
   // do the built-in deploys
+  // console.log(ac.gray.dim('>> webroot '))
   await DeployWebrootBuiltIn()
+  // console.log(ac.gray.dim('>> fileserves '))
   await DeployRootFileserves()
+  // console.log(ac.gray.dim('>> api built in '))
   await DeployApiBuiltin()
+  // console.log(ac.gray.dim('>> past api built in '))
 
   // make a private api
   // const fs = require('fs')
   // const os = require('os')
   // const path = require('path')
 
+  // console.log(ac.gray.dim('>> create staging folder '))
+
   let tmpDir
   let apiBytes
   const appPrefix = 'MistLift'
@@ -75,7 +80,9 @@ async function publishApi (
     mkdirSync(tmpDir, { recursive: true })
 
     const yamlFile = path.join(tmpDir, 'papi.yaml')
+    // console.log(ac.gray.dim('>> Make builtin ApiDoc '))
     await MakeBuiltinApiDoc(yamlFile)
+    // console.log(ac.gray.dim('>> Past making builtin ApiDoc '))
     // console.log("reading "+yamlFile)
     apiBytes = fs.readFileSync(yamlFile)
   } catch (e: any) {
@@ -90,9 +97,11 @@ async function publishApi (
       console.error(`An error has occurred while removing the temp folder at ${tmpDir ?? ''}. Please remove it manually. Error: ${(e.message as string)}`)
     }
   }
+  // console.log(ac.gray.dim('>> past that part, onto API Gateway '))
 
   const client = new APIGatewayClient(getAWSCredentials())
 
+  // console.log(ac.gray.dim('>> remove Existing versions '))
   await RemoveExistingVersions(client)
 
   const command: any = new ImportRestApiCommand({
@@ -123,15 +132,17 @@ async function publishApi (
 
   console.log(ac.grey('Continuing with binding...'))
   const prereq = await PrequisiteValues(apiId ?? '')
+  // console.log(ac.gray.dim('>> making intRequests'))
   const intRequests = prereq.MakeRequests()
+  // console.log(ac.magenta.dim('>> putting integration'), intRequests)
   await PutIntegrations(intRequests)
   await DeployApi(apiId ?? '', stageName)
   const region = getSettings()?.awsPreferredRegion ?? ''
   const publishUrl = `https://${apiId ?? ''}.execute-api.${region}.amazonaws.com/${stageName}`
   console.log(ac.green.bold(`\n Successfully deployed to ${publishUrl}`))
   recordLatestPublish(publishUrl)
-  // process.exit(0) // this was a dumb idea
 }
+
 function findApiName (): string {
   const infoFile = path.join(projectPaths.functionPath, 'apiService.info.json')
   const pkgFile = projectPaths.packagePath
@@ -198,7 +209,7 @@ class PrereqInfo {
       if (api?.path === pathMap) {
         // console.log("resourceMethods", api.resourceMethods)
         const methodList: string[] = Object.getOwnPropertyNames(api.resourceMethods)
-        // ClogTrace("methodList", methodList)
+        // console.log("methodList", methodList)
         for (const meth of allowedMethods.toUpperCase().split(',')) { // NOTE: we no longer try to support multiples, but this still works as is.
           // console.log("meth", meth)
           if (methodList.includes(meth)) {
@@ -212,9 +223,11 @@ class PrereqInfo {
   }
 
   public findARN (name: string): string {
-    // console.warn(`>>> finding name ${name} in functions ${JSON.stringify(this.functions)}`)
+    let lastus = name.lastIndexOf(getIdDelimiter())
+    if (lastus !== -1) name = name.substring(0, lastus)
+    // console.warn(`>>> finding name ${name} in ${this.functions.length} functions`)
     for (const f of this.functions ?? []) {
-      const lastus = f.name.lastIndexOf(getIdDelimiter())
+      lastus = f.name.lastIndexOf(getIdDelimiter())
       const fname = f.name.substring(0, lastus)
       // console.warn('comparing name, fname, lc ', {lastus, fname, name})
       if (fname.toLowerCase() === name.toLowerCase()) {
@@ -222,21 +235,26 @@ class PrereqInfo {
         return f.arn
       }
     }
-    console.log("$$$ Couldn't find " + name + ' in ', this.functions)
+    console.error(ac.red.bold("$$ Couldn't find " + name + ' in integration list'))
+    process.exit(1)
     return ''
   }
 
   public MakeRequests (): PutIntegrationRequest[] {
     const region = getSettings()?.awsPreferredRegion ?? ''
     const out: PutIntegrationRequest[] = []
+
     for (const d of this.defs) {
       const def = (d)
+      // console.log(ac.magenta.dim('>> finding api and arn for '), {pathMap:def.pathMap, name: def.name})
       const api = this.findApi(def.pathMap, def.method)
       const arn = this.findARN(def.name) ?? ''
       if (arn === '') {
-        console.log(`>>> No ARN for ${(def.name as string)} ${(def.pathMap as string)}, ${(api.id as string)}`)
+        console.log(ac.red.dim(`>>> No ARN for ${(def.name as string)} ${(def.pathMap as string)}, ${(api.id as string)}`))
+        process.exit(1)
       }
-      if (api !== undefined) {
+      // console.log(ac.magenta.dim.italic('>> api for '+arn), api)
+      if (api !== null && api !== undefined && arn !== '') {
         out.push({
           restApiId: this.requestApiId,
           resourceId: api.id, // api.parentId
@@ -268,11 +286,13 @@ async function GetFunctionInfo (info: PrereqInfo): Promise<PrereqInfo> {
   const listCommand: any = new ListFunctionsCommand({})
   const response: any = await client.send(listCommand)
 
-  const sfx = decoratedName('')
+  const sfx = getIdSrc()
 
   for (const func of response.Functions ?? []) {
     const fName: string = func?.FunctionName ?? ''
-    if (fName.endsWith(sfx)) {
+    // console.log(ac.gray.dim('>> checking if '+fName+' has our suffix '+sfx))
+    if (fName.includes(sfx)) {
+      // console.log(ac.gray.dim('>>> Yes'))
       info.functions.push({
         name: func.FunctionName ?? '',
         arn: func.FunctionArn ?? ''
@@ -321,8 +341,8 @@ async function DeployApi (restApiId: string, stageName: string): Promise<void> {
     })
     await client.send(command)
   } catch (e: any) {
-    console.error(ac.red.bold(`Error with deployApi: ${e.message as string}`))
-    throw e
+    console.error(ac.red.bold(`Fatal Error with deployApi: ${e.message as string}`))
+    process.exit(-1)
   }
 }
 

package/src/commands/test.ts

@@ -1,8 +1,17 @@
 import { executeCommand } from '../lib/executeCommand'
 import { doBuildAsync } from './build'
+import { isTapInstalled } from './doctor'
+import * as ac from 'ansi-colors'
 
 export async function doTestAsync (args: string[]): Promise<number> {
   if (await doBuildAsync(args) !== 0) return 1 // don't test if build fails
+
+  if (!await isTapInstalled()) {
+    // don't continue if tap unavaiable
+    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'))
+    return 1
+  }
+
   if (args.length === 0) args = ['*']
   let ret = 0
   for (const funcName of args) {

package/src/commands/update.ts

@@ -21,7 +21,7 @@ export async function doUpdateAsync (
 
   try {
     // console.warn(">>> esbuilder")
-    await esbuilder()
+    await esbuilder(null, true)
     // console.warn(">>> DeployRootFileserves")
     await DeployRootFileserves()
     // console.warn(">>> DeployWebrootBuiltIn")

package/src/lib/IdSrc.ts

@@ -1,5 +1,6 @@
 
 import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
+import sha1 from 'sha1'
 
 export function getIdDelimiter (): string {
   return '_-_'
@@ -12,5 +13,22 @@ export function getIdSrc (): string {
   return idsrc
 }
 export function decoratedName (name: string): string {
-  return name + getIdDelimiter() + getIdSrc()
+  if (name.includes(getIdDelimiter())) {
+    // console.warn('name '+name+' appears to be decorated already')
+    return name
+  }
+
+  while (name.includes('/')) name = name.replace('/', '')
+
+  const hash8 = sha1(name.toLowerCase()).toString().substring(0, 8)
+
+  const fullName = name + getIdDelimiter() + getIdSrc()
+  let dname
+  if (name.startsWith('fileserve_')) {
+    dname = ('fileServe_' + hash8 + getIdDelimiter() + getIdSrc()).substring(0, 64)
+  } else {
+    dname = fullName.substring(0, 50) + '_' + hash8
+  }
+  // console.warn('decorated to '+dname+' from '+name)
+  return dname
 }

package/src/lift.ts

@@ -65,7 +65,7 @@ async function processCommand (): Promise<void> {
       return
     case 'publish': {
       const ret = await doPublishAsync()
-      if (ret !== 0) process.exit(ret)
+      process.exit(ret)
     }
       return
     case 'update': {