@tremho/mist-lift 2.1.4 → 2.2.0

package/build/src/lib/openAPI/openApiConstruction.js

@@ -0,0 +1,237 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildOpenApi = void 0;
+/**
+ * This is part 2 of 2 -- we take our pre-built json array of definitions and apply them to openApi in this phase.
+ */
+const oas30_1 = require("openapi3-ts/oas30");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const pathResolve_1 = require("../pathResolve");
+const ac = __importStar(require("ansi-colors"));
+function buildOpenApi(defs_1) {
+    return __awaiter(this, arguments, void 0, function* (defs, includePrivate = false, yamlFile) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const builder = new oas30_1.OpenApiBuilder();
+        const projectPaths = yield (0, pathResolve_1.resolvePaths)();
+        if (!projectPaths.verified)
+            return new Uint8Array(0); // don't continue if not valid
+        // Read our package.json and construct info from that
+        const pkgFile = projectPaths.packagePath;
+        let pkg = {};
+        try {
+            pkg = JSON.parse(fs_1.default.readFileSync(pkgFile).toString());
+        }
+        catch (_j) { }
+        const title = (_a = pkg.name) !== null && _a !== void 0 ? _a : '';
+        // let summary = pkg.description;
+        // let spdx: string = pkg.license ?? ''
+        // const contactName: string = pkg.author ?? ''
+        const version = (_b = pkg.version) !== null && _b !== void 0 ? _b : '';
+        // license and version definitely come from package.json
+        // description and title might get overridden by service.info file
+        const infoFile = path_1.default.join(projectPaths.functionPath, 'apiService.info.json');
+        let svcInfo = {};
+        if (fs_1.default.existsSync(infoFile)) {
+            svcInfo = JSON.parse(fs_1.default.readFileSync(infoFile).toString());
+        }
+        // spdx = svcInfo.contact?.spdx ?? spdx
+        // const stagePathSegment = '/Dev' // todo: at some point this should be in config somewhere. it is used in many places.
+        const info = {
+            title: (_c = svcInfo.name) !== null && _c !== void 0 ? _c : title,
+            // summary: summary,
+            description: svcInfo.description,
+            version: (_e = (_d = svcInfo.version) !== null && _d !== void 0 ? _d : version) !== null && _e !== void 0 ? _e : new Date().toUTCString()
+        };
+        builder.addInfo(info);
+        // map our defs into openApi values
+        for (const def of defs) {
+            const pathDef = {};
+            if (def.private === true && !includePrivate)
+                continue; // skip private
+            const parameters = (_f = def.parameters) !== null && _f !== void 0 ? _f : [];
+            let method = def.method;
+            if (def.method === undefined) {
+                console.log(ac.red(`no method defined for ${def.name}`));
+                if (def.allowedMethods !== undefined) {
+                    console.log(ac.bgBlack.yellowBright('DEPRECATED') + ac.blue(' As of v1.1.8, The use of ') + ac.black.italic('allowedMethods') + ac.blue(' is replaced by the single' +
+                        ac.black.italic(' method ') + ac.blue('property.') + ac.black.bold('Please update your definition file')));
+                    def.method = def.allowedMethods.split(',')[0];
+                }
+            }
+            const schemas = (_g = def.schemas) !== null && _g !== void 0 ? _g : {};
+            for (const schemaName of Object.getOwnPropertyNames(schemas)) {
+                const schema = schemas[schemaName];
+                addTypeSchema(builder, schemaName, schema);
+            }
+            method = method.trim().toLowerCase();
+            addFunctionMethod(pathDef, method, def);
+            for (const param of parameters) {
+                addParameter(pathDef, param);
+            }
+            addCORSOptionMethod(pathDef);
+            const pathMap = (_h = def.pathMap) !== null && _h !== void 0 ? _h : '/' + def.name;
+            // pathMap = stagePathSegment + pathMap
+            builder.addPath(pathMap, pathDef);
+            builder.addSchema('Empty', {
+                title: 'Empty Schema',
+                type: 'object'
+            });
+        }
+        const outFile = yamlFile !== null && yamlFile !== void 0 ? yamlFile : path_1.default.join(projectPaths.basePath, 'webroot', 'docs', 'apidoc.yaml');
+        const str2ab = (str) => {
+            const buf = new ArrayBuffer(str.length * 2); // 2 bytes for each char
+            const bufView = new Uint8Array(buf);
+            for (let i = 0, strLen = str.length; i < strLen; i++) {
+                bufView[i] = str.charCodeAt(i);
+            }
+            return bufView;
+        };
+        const yaml = builder.getSpecAsYaml();
+        const bytes = str2ab(yaml);
+        if (!includePrivate) {
+            fs_1.default.writeFileSync(outFile, yaml);
+        }
+        return bytes;
+    });
+}
+exports.buildOpenApi = buildOpenApi;
+function addTypeSchema(builder, schemaName, schema) {
+    const ref = { title: schemaName, type: 'object', properties: {} };
+    for (const prop of Object.getOwnPropertyNames(schema)) {
+        const scType = schemaType('', schema[prop], false);
+        ref.properties[prop] = scType;
+    }
+    builder.addSchema(schemaName, ref);
+}
+function addFunctionMethod(pathDef, method, def) {
+    var _a, _b, _c;
+    // TODO: Define a return schema and put that here
+    const retDef = (def.returns)['200'];
+    const content = {};
+    const mime = (_b = (_a = retDef === null || retDef === void 0 ? void 0 : retDef.content) !== null && _a !== void 0 ? _a : retDef === null || retDef === void 0 ? void 0 : retDef.mime) !== null && _b !== void 0 ? _b : 'text/plain';
+    content[mime] = {};
+    const methData = {
+        summary: def.name,
+        description: def.description,
+        responses: {
+            200: {
+                description: (_c = retDef === null || retDef === void 0 ? void 0 : retDef.description) !== null && _c !== void 0 ? _c : 'Success Response',
+                content
+            }
+        }
+    };
+    pathDef[method] = methData;
+}
+function addCORSOptionMethod(pathDef) {
+    if (pathDef.options === undefined)
+        return; // already assinged by definition
+    // add options for CORS
+    pathDef.options = {
+        responses: {
+            200: {
+                description: '200 response',
+                content: {
+                    'application/json': {
+                        schema: {
+                            $ref: '#/components/schemas/Empty'
+                        }
+                    }
+                }
+            }
+        },
+        'x-amazon-apigateway-integration': {
+            responses: {
+                default: {
+                    statusCode: '200'
+                }
+            },
+            requestTemplates: {
+                'application/json': '{"statusCode": 200}'
+            },
+            passthroughBehavior: 'when_no_match',
+            type: 'mock'
+        }
+    };
+}
+function addParameter(pathDef, param) {
+    var _a, _b, _c, _d;
+    if (pathDef.parameters === undefined)
+        pathDef.parameters = [];
+    const parameters = pathDef.parameters;
+    const example = (_b = (_a = param.example) !== null && _a !== void 0 ? _a : param.default) !== null && _b !== void 0 ? _b : '';
+    const type = (_c = param.type) !== null && _c !== void 0 ? _c : typeof example;
+    const deflt = (_d = param.default) !== null && _d !== void 0 ? _d : example;
+    parameters.push({
+        in: param.in,
+        name: param.name,
+        description: param.description,
+        example,
+        required: param.required,
+        schema: schemaType(deflt, type, true)
+    });
+}
+function schemaType(deflt, namedType, innerOnly) {
+    if (typeof namedType === 'object')
+        return namedType;
+    const typeFormat = namedType.split(':');
+    let type = typeFormat[0];
+    const format = typeFormat.length > 1 ? typeFormat[1] : undefined;
+    if (!(type === 'string' ||
+        type === 'number' ||
+        type === 'integer' ||
+        type === 'boolean' ||
+        type === 'int' ||
+        type === 'bool')) {
+        return innerOnly
+            ? {
+                $ref: `#/components/schemas/${type}`
+            }
+            : {
+                schema: {
+                    $ref: `#/components/schemas/${type}`
+                }
+            };
+    }
+    if (type === 'int')
+        type = 'integer';
+    if (type === 'bool')
+        type = 'boolean';
+    return innerOnly ? { type, format, example: deflt } : { schema: { type, format, example: deflt } };
+}
+//# sourceMappingURL=openApiConstruction.js.map

package/build/src/lib/openAPI/openApiConstruction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":"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"}

package/build/src/lib/pathResolve.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePaths = void 0;
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+// Find the path roots in the project directory
+function resolvePaths() {
+    const cwd = process.cwd();
+    let funcPath = path_1.default.join(cwd, 'functions');
+    while (true) {
+        if (!fs_1.default.existsSync(funcPath)) {
+            funcPath = path_1.default.normalize(path_1.default.join(funcPath, '..'));
+        }
+        else {
+            const basePath = path_1.default.normalize(path_1.default.join(funcPath, '..'));
+            const buildPath = path_1.default.join(basePath, 'build');
+            const packagePath = path_1.default.join(basePath, 'package.json');
+            const verified = fs_1.default.existsSync(basePath) && fs_1.default.existsSync(funcPath) && fs_1.default.existsSync(packagePath);
+            return { basePath, buildPath, functionPath: funcPath, packagePath, verified };
+        }
+    }
+}
+exports.resolvePaths = resolvePaths;
+//# sourceMappingURL=pathResolve.js.map

package/build/src/lib/pathResolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pathResolve.js","sourceRoot":"","sources":["../../../src/lib/pathResolve.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,4CAAmB;AAEnB,+CAA+C;AAC/C,SAAgB,YAAY;IAQ1B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IACzB,IAAI,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC1C,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;YAC1D,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC9C,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;YACvD,MAAM,QAAQ,GAAG,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;YACjG,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;QAC/E,CAAC;IACH,CAAC;AACH,CAAC;AArBD,oCAqBC"}

package/build/src/lib/utils.js

@@ -0,0 +1,77 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnzipToFolder = exports.FolderToZip = exports.delay = void 0;
+/* eslint @typescript-eslint/no-var-requires: "off" */
+const executeCommand_1 = require("./executeCommand");
+const ac = __importStar(require("ansi-colors"));
+const fs = __importStar(require("fs"));
+/** General utilities */
+const zipDir = require('zip-dir');
+// pause the given number of milliseconds
+function delay(ms // milliseconds to delay
+) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield new Promise(resolve => { setTimeout(resolve, ms); });
+    });
+}
+exports.delay = delay;
+function FolderToZip(folderPath, zipPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield new Promise(resolve => {
+            zipDir(folderPath, { saveTo: zipPath }, function (err, buffer) {
+                if (err !== '' && err !== undefined && err !== null)
+                    throw err;
+                // `buffer` is the buffer of the zipped file
+                // And the buffer was saved to `~/myzip.zip`
+                resolve(buffer);
+            });
+        });
+    });
+}
+exports.FolderToZip = FolderToZip;
+function UnzipToFolder(zipPath_1, folderPath_1) {
+    return __awaiter(this, arguments, void 0, function* (zipPath, folderPath, replace = true) {
+        // TODO: using CLI -- find a good package. "unzip" has vulnerabilities. Try others.
+        if (replace)
+            fs.rmSync(folderPath, { recursive: true, force: true });
+        const result = yield (0, executeCommand_1.executeCommand)('unzip', [zipPath, '-d', folderPath]);
+        if (result.retcode !== 0) {
+            console.error(ac.red.bold(`failed to stage webroot (${result.retcode}): ${result.errStr}`));
+            throw Error();
+        }
+    });
+}
+exports.UnzipToFolder = UnzipToFolder;
+//# sourceMappingURL=utils.js.map

package/build/src/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAsD;AACtD,qDAAiD;AACjD,gDAAiC;AACjC,uCAAwB;AAExB,wBAAwB;AAExB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAEjC,yCAAyC;AACzC,SAAsB,KAAK,CACzB,EAAU,CAAC,wBAAwB;;;QAEnC,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC;CAAA;AAJD,sBAIC;AAED,SAAsB,WAAW,CAC/B,UAAkB,EAClB,OAAe;;QAEf,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,UAAU,GAAQ,EAAE,MAAkB;gBAC5E,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI;oBAAE,MAAM,GAAG,CAAA;gBAC9D,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,MAAM,CAAC,CAAA;YACjB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAZD,kCAYC;AACD,SAAsB,aAAa;yDACjC,OAAe,EACf,UAAkB,EAClB,UAAmB,IAAI;QAEvB,mFAAmF;QAEnF,IAAI,OAAO;YAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACpE,MAAM,MAAM,GAAwC,MAAM,IAAA,+BAAc,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAA;QAC9G,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,OAAO,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;YAC3F,MAAM,KAAK,EAAE,CAAA;QACf,CAAC;IACH,CAAC;CAAA;AAbD,sCAaC"}

package/build/src/lift.js

@@ -0,0 +1,134 @@
+#!/usr/bin/env node
+"use strict";
+/* eslint @typescript-eslint/no-floating-promises: "off" */
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const ac = __importStar(require("ansi-colors"));
+const process = __importStar(require("process"));
+const LiftVersion_1 = require("./lib/LiftVersion");
+const help_1 = require("./commands/help");
+const init_1 = require("./commands/init");
+const create_1 = require("./commands/create");
+const build_1 = require("./commands/build");
+const test_1 = require("./commands/test");
+const package_1 = require("./commands/package");
+const deploy_1 = require("./commands/deploy");
+const publish_1 = require("./commands/publish");
+const update_1 = require("./commands/update");
+const doctor_1 = require("./commands/doctor");
+const start_1 = require("./commands/start");
+const settings_1 = require("./commands/settings");
+const info_1 = require("./commands/info");
+const command = (_a = process.argv[2]) !== null && _a !== void 0 ? _a : 'help';
+const args = process.argv.slice(3);
+function processCommand() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        switch (command) {
+            case 'version':
+            case '--version':
+            case '-v':
+                console.log(`Lift v${(0, LiftVersion_1.getLiftVersion)().toString()}`);
+                return;
+            case 'help':
+                return (0, help_1.doHelp)((_a = args[0]) !== null && _a !== void 0 ? _a : '');
+            case 'doctor':
+                yield (0, doctor_1.doDoctor)();
+                return;
+            case 'init':
+                return yield (0, init_1.doInit)((_b = args[0]) !== null && _b !== void 0 ? _b : '');
+            case 'create':
+                return (0, create_1.doCreate)((_c = args[0]) !== null && _c !== void 0 ? _c : '');
+            case 'build':
+                {
+                    const ret = yield (0, build_1.doBuildAsync)(args);
+                    if (ret !== 0)
+                        process.exit(-1);
+                }
+                return;
+            case 'test':
+                {
+                    const ret = yield (0, test_1.doTestAsync)(args);
+                    if (ret !== 0)
+                        process.exit(ret);
+                }
+                return;
+            case 'start':
+                return yield (0, start_1.startLocalServer)();
+            case 'package':
+                {
+                    const ret = yield (0, package_1.doPackageAsync)(args);
+                    if (ret !== 0)
+                        process.exit(ret);
+                }
+                return;
+            case 'deploy':
+                {
+                    const ret = yield (0, deploy_1.doDeployAsync)(args);
+                    if (ret !== 0)
+                        process.exit(ret);
+                }
+                return;
+            case 'publish':
+                {
+                    const ret = yield (0, publish_1.doPublishAsync)();
+                    if (ret !== 0)
+                        process.exit(ret);
+                }
+                return;
+            case 'update':
+                {
+                    const ret = yield (0, update_1.doUpdateAsync)();
+                    process.exit(ret);
+                }
+                return;
+            case 'settings':
+                yield (0, settings_1.doSettings)();
+                return;
+            case 'info':
+                yield (0, info_1.doInfo)();
+                return;
+        }
+        return doUnknown(command);
+    });
+}
+function doUnknown(command) {
+    console.log(ac.red.bold(`Unrecognized command ${command !== null && command !== void 0 ? command : ''}`));
+    console.log(ac.grey.dim('try'));
+    console.log(ac.blue.dim('help, init, create, build, test, start, package, deploy, publish, settings'));
+    console.log('');
+}
+processCommand();
+//# sourceMappingURL=lift.js.map

package/build/src/lift.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lift.js","sourceRoot":"","sources":["../../src/lift.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tremho/mist-lift",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "lift command line utility for MistLift development",
   "main": "build/lift.js",
   "bin": {
@@ -49,8 +49,7 @@
     "@aws-sdk/client-api-gateway": "^3.598.0",
     "@aws-sdk/client-lambda": "^3.598.0",
     "@aws-sdk/credential-providers": "^3.598.0",
-    "@tremho/inverse-y": "^2.0.4",
-    "@tremho/session-tbd": "^2.0.2",
+    "@tremho/inverse-y": "^2.0.15",
     "ansi-colors": "^4.1.3",
     "body-parser": "^1.20.2",
     "clear-module": "^4.1.2",

package/src/commands/deploy.ts

@@ -6,7 +6,7 @@ import {
   AddPermissionCommand
 } from '@aws-sdk/client-lambda'
 
-import md5 from 'md5'
+// import md5 from 'md5'
 
 import path from 'path'
 import fs from 'fs'
@@ -15,10 +15,11 @@ import { resolvePaths } from '../lib/pathResolve'
 import * as ac from 'ansi-colors'
 
 import { recurseDirectory } from '../lib/DirectoryUtils'
-import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
+
 import { delay } from '../lib/utils'
 import { doPackageAsync } from './package'
 import { getAWSCredentials, getSettings, RuntimeType } from '../lib/LiftConfig'
+import { decoratedName } from '../lib/IdSrc'
 // import { executeCommand } from '../lib/executeCommand'
 
 let projectPaths: { basePath: string, buildPath: string, functionPath: string, packagePath: string, verified: boolean }
@@ -110,8 +111,7 @@ export async function deployPackage (
   const timeout: number = def.timeoutSeconds ?? 0 // zero will mean default (3 seconds on AWS)
   const memorySize: number = def.memorySize ?? 0 // zero is default (128 [mb] for AWS)
   // funcname gets decorated with current instance identifier
-  const idsrc = md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
-  const dFuncName = funcName + '_' + idsrc
+  const dFuncName = decoratedName(funcName)
 
   // See if function exists
   const client: any = new LambdaClient(getAWSCredentials())

package/src/commands/package.ts

@@ -218,7 +218,7 @@ function reconcileVersionImports (
       if (isDev) {
         console.error(ac.magenta(`  ${m} import is dev-only, not migrated`))
       } else {
-        if (depsOut[m] !== undefined) console.log(ac.blue.dim(`  ${m} exported as ${r}`))
+        if (depsOut[m] !== r) console.log(ac.blue.dim(`  ${m} exported as ${r}`))
         depsOut[m] = r
       }
     } else {

package/src/commands/publish.ts

@@ -26,8 +26,8 @@ import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
 import { delay } from '../lib/utils'
 import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
 import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
-import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
-import md5 from 'md5'
+import { esbuilder } from '../lib/ESBuild'
+import { decoratedName, getIdDelimiter } from '../lib/IdSrc'
 
 let projectPaths: any
 
@@ -53,6 +53,9 @@ 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')
   // do the built-in deploys
   await DeployWebrootBuiltIn()
   await DeployRootFileserves()
@@ -127,6 +130,7 @@ async function publishApi (
   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')
@@ -208,10 +212,15 @@ class PrereqInfo {
   }
 
   public findARN (name: string): string {
+    // console.warn(`>>> finding name ${name} in functions ${JSON.stringify(this.functions)}`)
     for (const f of this.functions ?? []) {
-      const lastus = f.name.lastIndexOf('_')
+      const lastus = f.name.lastIndexOf(getIdDelimiter())
       const fname = f.name.substring(0, lastus)
-      if (fname.toLowerCase() === name.toLowerCase()) return f.arn
+      // console.warn('comparing name, fname, lc ', {lastus, fname, name})
+      if (fname.toLowerCase() === name.toLowerCase()) {
+        // console.warn(">>> Match! ", f)
+        return f.arn
+      }
     }
     console.log("$$$ Couldn't find " + name + ' in ', this.functions)
     return ''
@@ -259,7 +268,7 @@ async function GetFunctionInfo (info: PrereqInfo): Promise<PrereqInfo> {
   const listCommand: any = new ListFunctionsCommand({})
   const response: any = await client.send(listCommand)
 
-  const sfx = '_' + md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
+  const sfx = decoratedName('')
 
   for (const func of response.Functions ?? []) {
     const fName: string = func?.FunctionName ?? ''