@tremho/mist-lift 2.2.9 → 2.5.1

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

@@ -0,0 +1,435 @@
+"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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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 = buildOpenApi;
+/**
+ * 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"));
+const IdSrc_1 = require("../IdSrc");
+const LiftConfig_1 = require("../LiftConfig");
+const TypeCheck_1 = require("../TypeCheck");
+const js_yaml_1 = __importDefault(require("js-yaml"));
+function buildOpenApi(defs_1) {
+    return __awaiter(this, arguments, void 0, function* (defs, includePrivate = false, includeCORS = false, yamlFile) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const builder = new oas30_1.OpenApiBuilder();
+        // console.log("buildOpenApi to "+yamlFile)
+        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();
+            yield addFunctionMethod(pathDef, method, def, includeCORS);
+            for (const param of parameters) {
+                addParameter(pathDef, param);
+            }
+            if (includeCORS)
+                addCORSOptionMethod(pathDef);
+            let pathMap = (_h = def.pathMap) !== null && _h !== void 0 ? _h : '/' + def.name;
+            pathMap = pathMap.replace('?', '');
+            // 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 spec = builder.getSpec();
+        spec['x-amazon-apigateway-binary-media-types'] = [
+            'application/octet-stream',
+            'image/*',
+            'audio/*'
+        ];
+        const yamlSpec = js_yaml_1.default.dump(spec);
+        const bytes = str2ab(yamlSpec);
+        // if (!includePrivate) {
+        fs_1.default.writeFileSync(outFile, yamlSpec);
+        // }
+        return bytes;
+    });
+}
+function addTypeSchema(builder, schemaName, schema) {
+    var _a, _b, _c, _d, _e;
+    let primType = '';
+    let type = (_a = schema === null || schema === void 0 ? void 0 : schema.type) !== null && _a !== void 0 ? _a : 'Empty';
+    if (type === 'empty')
+        type = 'Empty'; // fix case
+    const isArray = (type.endsWith('[]'));
+    if (isArray)
+        type = type.substring(0, type.length - 2);
+    if (type === 'string' || type === 'number' || type === 'object')
+        primType = type;
+    // const sm: string = schema?.mime
+    // const mime: string = sm !== '' ?? primType !== '' ? 'text/plain' : 'application/json'
+    const sref = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type };
+    let ref = {};
+    if (isArray) {
+        ref = { type: 'array', items: sref };
+    }
+    else {
+        ref = sref;
+    }
+    ref.title = schemaName;
+    if (ref.type === 'object')
+        ref.properties = {};
+    const constraints = schema.type !== 'object' && Array.isArray(schema === null || schema === void 0 ? void 0 : schema.constraints) ? (0, TypeCheck_1.parseConstraints)(schema.type, schema.constraints.join('\n'), '\n') : undefined;
+    const cdesc = (constraints != null) ? '\n  - ' + ((_b = constraints.describe()) !== null && _b !== void 0 ? _b : '').split('\n').join('\n  - ') : '';
+    let description = schema.description;
+    if (cdesc !== '')
+        description += cdesc;
+    ref.description = description;
+    const required = [];
+    if (ref.properties) {
+        const sp = (_c = schema.properties) !== null && _c !== void 0 ? _c : {};
+        for (const [propName, propDef] of Object.entries(sp)) {
+            const pda = propDef;
+            const constraints = Array.isArray(pda === null || pda === void 0 ? void 0 : pda.constraints) ? (0, TypeCheck_1.parseConstraints)(pda.type, pda.constraints.join('\n'), '\n') : undefined;
+            const cdesc = (constraints != null) ? '\n  - ' + ((_d = constraints.describe()) !== null && _d !== void 0 ? _d : '').split('\n').join('\n  - ') : '';
+            let description = propDef.description;
+            if (cdesc !== '')
+                description += cdesc;
+            // if(constraints) {
+            //   console.log("schema definition for "+schemaName+', prop '+propName)
+            //   console.log(description)
+            // }
+            const propSchema = {
+                type: propDef.type,
+                description
+            };
+            // You can add other custom handling here (e.g., enums, format, pattern)
+            ref.properties[propName] = propSchema;
+            // Only mark as required if declared explicitly
+            const sr = (_e = schema.required) !== null && _e !== void 0 ? _e : '';
+            if (sr !== '' && sr.includes(propName)) {
+                required.push(propName);
+            }
+        }
+        if (required.length > 0) {
+            ref.required = required;
+        }
+    }
+    builder.addSchema(schemaName, ref);
+}
+function addFunctionMethod(pathDef_1, method_1, def_1) {
+    return __awaiter(this, arguments, void 0, function* (pathDef, method, def, includeCORS = true) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const retDef = (def.returns)['200'];
+        const content = {};
+        let primType = '';
+        let type = (_a = retDef === null || retDef === void 0 ? void 0 : retDef.type) !== null && _a !== void 0 ? _a : 'Empty';
+        if (type === 'empty')
+            type = 'Empty'; // fix case
+        const isArray = (type.endsWith('[]'));
+        if (isArray)
+            type = type.substring(0, type.length - 2);
+        if (type === 'string' || type === 'number' || type === 'object')
+            primType = type;
+        const rdm = (_b = retDef === null || retDef === void 0 ? void 0 : retDef.mime) !== null && _b !== void 0 ? _b : '';
+        const mime = rdm !== '' ? rdm : primType !== '' ? 'text/plain' : 'application/json';
+        const ref = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type };
+        let schema;
+        if (isArray) {
+            schema = { type: 'array', items: ref };
+        }
+        else {
+            schema = ref;
+        }
+        content[mime] = {
+            schema
+        };
+        const region = (_d = (_c = (0, LiftConfig_1.getSettings)()) === null || _c === void 0 ? void 0 : _c.awsPreferredRegion) !== null && _d !== void 0 ? _d : '';
+        const accountId = (_e = yield (0, IdSrc_1.getAccountId)()) !== null && _e !== void 0 ? _e : '';
+        const decName = (_f = (0, IdSrc_1.decoratedName)(def.name)) !== null && _f !== void 0 ? _f : '';
+        const bodyType = (_g = def.bodyType) !== null && _g !== void 0 ? _g : '';
+        const isBinary = bodyType.startsWith('text') && bodyType.endsWith('json');
+        const methData = {
+            summary: def.name,
+            description: def.description,
+            responses: {
+                200: {
+                    description: (_h = retDef === null || retDef === void 0 ? void 0 : retDef.description) !== null && _h !== void 0 ? _h : 'Success Response',
+                    headers: includeCORS
+                        ? {
+                            'Access-Control-Allow-Origin': {
+                                schema: {
+                                    type: 'string'
+                                },
+                                example: '*'
+                            },
+                            'Access-Control-Allow-Headers': {
+                                schema: {
+                                    type: 'string'
+                                },
+                                example: 'Content-Type, Authorization'
+                            },
+                            'Access-Control-Allow-Methods': {
+                                schema: {
+                                    type: 'string'
+                                },
+                                example: 'GET,POST,PUT,OPTIONS'
+                            }
+                        }
+                        : undefined,
+                    content
+                }
+            },
+            'x-amazon-apigateway-integration': {
+                uri: `arn:aws:apigateway:${region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${region}:${accountId}:function:${decName}/invocations`,
+                passthroughbehavior: 'when_no_match',
+                contentHandling: isBinary ? 'CONVERT_TO_BINARY' : undefined,
+                httpMethod: 'POST', // always POST - this is how API gateway calls Lambda, not the method of the api
+                type: 'aws_proxy'
+            }
+        };
+        if (!includeCORS) {
+            // get the other response code declarations
+            for (const rcode of Object.getOwnPropertyNames(def.returns)) {
+                if (rcode !== '200') {
+                    const retDef = (_j = def.returns[rcode]) !== null && _j !== void 0 ? _j : {};
+                    const content = {};
+                    let primType = '';
+                    let type = (_k = retDef === null || retDef === void 0 ? void 0 : retDef.type) !== null && _k !== void 0 ? _k : 'Empty';
+                    if (type === 'empty')
+                        type = 'Empty'; // fix case
+                    const isArray = (type.endsWith('[]'));
+                    if (isArray)
+                        type = type.substring(0, type.length - 2);
+                    if (type === 'string' || type === 'number' || type === 'object')
+                        primType = type;
+                    const mime = (retDef === null || retDef === void 0 ? void 0 : retDef.mime.length) > 0 ? (primType === null || primType === void 0 ? void 0 : primType.length) > 0 ? 'text/plain' : 'application/json' : '';
+                    const ref = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type };
+                    let schema;
+                    if (isArray) {
+                        schema = { type: 'array', items: ref };
+                    }
+                    else {
+                        schema = ref;
+                    }
+                    content[mime] = {
+                        schema
+                    };
+                    retDef.content = content;
+                    methData.responses[rcode] = retDef;
+                }
+            }
+        }
+        pathDef[method] = methData;
+    });
+}
+function addCORSOptionMethod(pathDef) {
+    // if (pathDef.options === undefined) return // already assinged by definition
+    // add options for CORS
+    pathDef.options = {
+        summary: 'CORS support',
+        responses: {
+            200: {
+                description: 'CORS response',
+                headers: {
+                    'Access-Control-Allow-Origin': {
+                        schema: {
+                            type: 'string'
+                        },
+                        example: '*'
+                    },
+                    'Access-Control-Allow-Methods': {
+                        schema: {
+                            type: 'string'
+                        },
+                        example: 'GET,POST,PUT,OPTIONS'
+                    },
+                    'Access-Control-Allow-Headers': {
+                        schema: {
+                            type: 'string'
+                        },
+                        example: 'Content-Type, Authorization'
+                    }
+                }
+            }
+        },
+        'x-amazon-apigateway-integration': {
+            type: 'mock',
+            requestTemplates: {
+                'application/json': '{"statusCode": 200}'
+            },
+            responses: {
+                default: {
+                    statusCode: '200',
+                    responseParameters: {
+                        'method.response.header.Access-Control-Allow-Origin': "'*'",
+                        'method.response.header.Access-Control-Allow-Methods': "'GET, POST, PUT, OPTIONS'",
+                        'method.response.header.Access-Control-Allow-Headers': "'Content-Type, Authorization'"
+                    }
+                }
+            },
+            passthroughBehavior: 'when_no_match'
+        }
+    };
+}
+function addParameter(pathDef, param) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (pathDef.parameters === undefined)
+        pathDef.parameters = [];
+    const parameters = pathDef.parameters;
+    const example = (_a = param.example) !== null && _a !== void 0 ? _a : '';
+    const type = (_b = param.type) !== null && _b !== void 0 ? _b : 'string';
+    const deflt = (_c = param.default) !== null && _c !== void 0 ? _c : '';
+    // parameter is always required if it comes from path
+    // never required if it comes from query
+    // and may or may not be if it comes from body (per def)
+    const src = (_e = (_d = param === null || param === void 0 ? void 0 : param.in) === null || _d === void 0 ? void 0 : _d.trim().toLowerCase()) !== null && _e !== void 0 ? _e : '';
+    let required = (src === 'path');
+    if (src === 'body')
+        required = (_f = param.required) !== null && _f !== void 0 ? _f : false;
+    const constraints = Array.isArray(param.constraints) ? (0, TypeCheck_1.parseConstraints)(param.type, param.constraints.join('\n'), '\n') : undefined;
+    const cdesc = (constraints != null) ? '\n  - ' + ((_g = constraints.describe()) !== null && _g !== void 0 ? _g : '').split('\n').join('\n  - ') : '';
+    let description = param.description;
+    if (cdesc !== '')
+        description += cdesc;
+    // don't declare parameters marked as 'body'.  OpenAPI doesn't support that.
+    if (param.in === 'path' || param.in === 'query') {
+        parameters.push({
+            in: param.in,
+            name: param.name,
+            description,
+            example: example !== null && example !== void 0 ? example : undefined,
+            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';
+    if (deflt === null || deflt === '')
+        deflt = undefined;
+    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/{lib → src/lib}/pathResolve.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePaths = void 0;
+exports.resolvePaths = resolvePaths;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 // Find the path roots in the project directory
@@ -23,5 +23,4 @@ function resolvePaths() {
         }
     }
 }
-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":";;;;;AAIA,oCAqBC;AAzBD,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"}

package/build/{lib → src/lib}/utils.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -32,7 +42,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnzipToFolder = exports.FolderToZip = exports.delay = void 0;
+exports.delay = delay;
+exports.FolderToZip = FolderToZip;
+exports.UnzipToFolder = UnzipToFolder;
 /* eslint @typescript-eslint/no-var-requires: "off" */
 const executeCommand_1 = require("./executeCommand");
 const ac = __importStar(require("ansi-colors"));
@@ -46,7 +58,6 @@ function delay(ms // milliseconds to delay
         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 => {
@@ -60,7 +71,6 @@ function FolderToZip(folderPath, zipPath) {
         });
     });
 }
-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.
@@ -73,5 +83,4 @@ function UnzipToFolder(zipPath_1, folderPath_1) {
         }
     });
 }
-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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,sBAIC;AAED,kCAYC;AACD,sCAaC;AA1CD,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;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;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"}

package/build/{lift.js → src/lift.js}

@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -68,7 +78,7 @@ function processCommand() {
                 yield (0, doctor_1.doDoctor)();
                 return;
             case 'init':
-                return yield (0, init_1.doInit)((_b = args[0]) !== null && _b !== void 0 ? _b : '');
+                return yield (0, init_1.doInit)((_b = args[0]) !== null && _b !== void 0 ? _b : '', args[1]); // folder, clientType (react or js default js)
             case 'create':
                 return (0, create_1.doCreate)((_c = args[0]) !== null && _c !== void 0 ? _c : '');
             case 'build':
@@ -103,7 +113,7 @@ function processCommand() {
                 return;
             case 'publish':
                 {
-                    const ret = yield (0, publish_1.doPublishAsync)();
+                    const ret = yield (0, publish_1.doPublishAsync)(args);
                     process.exit(ret);
                 }
                 return;

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.2.9",
+  "version": "2.5.1",
   "description": "lift command line utility for MistLift development",
   "main": "build/lift.js",
   "bin": {
@@ -20,7 +20,7 @@
     "indev:nix": "echo nix",
     "indev:windows": "echo windows",
     "postbuild": "run-script-os",
-    "postbuild:nix": "cp -r src/commands/builtin/prebuilt-zips build/commands/builtin",
+    "postbuild:nix": "cp -r src/commands/builtin/prebuilt-zips build/commands/builtin && chmod +x build/src/lift.js",
     "postbuild:windows": "robocopy src/commands/builtin/prebuilt-zips build/commands/builtin/prebuilt-zips /e > NUL 2>&1"
   },
   "files": [
@@ -49,13 +49,15 @@
     "@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.33",
+    "@tremho/basic-s3-actions": "^2.3.8",
+    "@tremho/inverse-y": "^2.2.30",
     "ansi-colors": "^4.1.3",
     "body-parser": "^1.20.2",
     "clear-module": "^4.1.2",
     "esbuild": "^0.23.0",
     "express": "^4.19.2",
     "express-ws": "^5.0.2",
+    "js-yaml": "^4.1.0",
     "md5": "^2.3.0",
     "node-watch": "^0.7.4",
     "openapi-ui": "^1.0.4",
@@ -67,11 +69,11 @@
     "@tremho/tap-assert": "^1.0.4-pre-release.2",
     "@types/express": "^4.17.21",
     "@types/express-ws": "^3.0.4",
+    "@types/js-yaml": "^4.0.9",
     "@types/md5": "^2.3.5",
     "@types/node": "^20.14.2",
     "@types/tap": "^15.0.11",
     "@types/ws": "^8.5.10",
-    "axios": "^1.7.2",
     "rimraf": "^5.0.7",
     "run-script-os": "^1.1.6",
     "tap": "^19.2.5",