@tremho/mist-lift 2.2.9 → 2.4.0

package/README.md

@@ -69,7 +69,15 @@ If you would like to support my late night efforts, please consider a contributi
 
 ## Changelog
 
-### 2.2.6, 2.2.7, 2.2.8
+### 2.4.0
+  - maintenance update
+
+### 2.3.0
+__New feature for S3-based webroot static files__
+Please see [Webroot redirect documentation](https://github.com/tremho/MistLift/blob/main/doc/Webroot%20S3%20exports.md)
+for information on this new feature that improves support for larger apps and assets.
+
+### 2.2.6, 2.2.7, 2.2.8, 2.2.9, 2.2.10
   - package updates
 
 ### 2.2.5

package/build/commands/actions/updateDeployedPermissions.js

@@ -0,0 +1,109 @@
+"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.generateSourceArnForApiGateway = void 0;
+const ac = __importStar(require("ansi-colors"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const DirectoryUtils_1 = require("../../lib/DirectoryUtils");
+const IdSrc_1 = require("../../lib/IdSrc");
+const LiftConfig_1 = require("../../lib/LiftConfig");
+const pathResolve_1 = require("../../lib/pathResolve");
+const client_lambda_1 = require("@aws-sdk/client-lambda");
+// let projectPaths: { basePath: string, buildPath: string, functionPath: string, packagePath: string, verified: boolean }
+function updateDeployedPermissions(apiId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const projectPaths = (0, pathResolve_1.resolvePaths)();
+        if (!projectPaths.verified) {
+            console.log(ac.bold.magenta('current directory is not at project root'));
+            return -1;
+        }
+        const funcsToDeploy = [];
+        let firstDepth = 0;
+        (0, DirectoryUtils_1.recurseDirectory)(projectPaths.functionPath, (filepath, stats) => {
+            const depth = filepath.split(path_1.default.sep).length;
+            if (firstDepth === 0)
+                firstDepth = depth;
+            if (stats.isDirectory() && depth === firstDepth) {
+                funcsToDeploy.push(path_1.default.basename(filepath));
+            }
+            return false;
+        });
+        const accountId = yield (0, IdSrc_1.getAccountId)();
+        const region = (_a = (0, LiftConfig_1.getSettings)().awsPreferredRegion) !== null && _a !== void 0 ? _a : '';
+        const client = new client_lambda_1.LambdaClient((0, LiftConfig_1.getAWSCredentials)());
+        for (const funcName of funcsToDeploy) {
+            // read the def file and get the method from there
+            const defPath = path_1.default.join(projectPaths.functionPath, funcName, 'src', 'definition.json');
+            const def = JSON.parse(fs_1.default.readFileSync(defPath).toString());
+            const method = def.method;
+            const pathMap = def.pathMap;
+            const arn = generateSourceArnForApiGateway(region, accountId, apiId, method, pathMap);
+            const dname = (0, IdSrc_1.decoratedName)(funcName);
+            console.log(ac.grey.italic('update permissions for resource ' + arn));
+            const command = new client_lambda_1.AddPermissionCommand({
+                FunctionName: dname,
+                StatementId: 'InvokePermission',
+                Action: 'lambda:invokeFunction',
+                Principal: 'apigateway.amazonaws.com',
+                SourceArn: arn
+            });
+            yield client.send(command);
+        }
+    });
+}
+exports.default = updateDeployedPermissions;
+/**
+ * Generates the correct SourceArn to authorize API Gateway to invoke a Lambda function.
+ *
+ * @param region - The AWS region, e.g., 'us-west-1'
+ * @param accountId - Your AWS account ID
+ * @param apiId - The API Gateway ID, e.g., 'sfr7yltmc3'
+ * @param method - The HTTP method, e.g., 'POST'
+ * @param routePath - The API route path, e.g., '/upstart/{artistId}/{id}'
+ * @returns The complete SourceArn string
+ */
+function generateSourceArnForApiGateway(region, accountId, apiId, method, routePath) {
+    // Clean leading slashes and replace path params with wildcards
+    const cleanedPath = routePath
+        .replace(/^\/+/, '') // remove leading slashes
+        .replace(/{[^}]+}/g, '*'); // replace path params with *
+    return `arn:aws:execute-api:${region}:${accountId}:${apiId}/*/${method.toUpperCase()}/${cleanedPath}`;
+}
+exports.generateSourceArnForApiGateway = generateSourceArnForApiGateway;
+//# sourceMappingURL=updateDeployedPermissions.js.map

package/build/commands/actions/updateDeployedPermissions.js.map

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

package/build/commands/builtin/ApiDocMaker.js

@@ -19,6 +19,7 @@ const WebrootFileSupport_1 = require("../../lib/openAPI/WebrootFileSupport");
 const path_1 = __importDefault(require("path"));
 // import * as ac from 'ansi-colors'
 const IdSrc_1 = require("../../lib/IdSrc");
+const ExportWebroot_1 = require("./ExportWebroot");
 function MakePublicApiDoc() {
     return __awaiter(this, void 0, void 0, function* () {
         const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
@@ -28,33 +29,37 @@ function MakePublicApiDoc() {
 exports.MakePublicApiDoc = MakePublicApiDoc;
 function MakeBuiltinApiDoc(yamlFile) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         // console.log(ac.gray.dim('>>> gatherFunctionDefinitions '))
         const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
         // console.log(ac.gray.dim('>> after gatherfunctions'), defs)
         // console.log(ac.gray.dim('>>> addBuiltInDefinitions '))
-        addBuiltInDefinitions(defs);
+        const wrs = yield (0, ExportWebroot_1.getWebrootSettings)();
+        const withWebroot = ((_a = wrs.webrootMethod) !== null && _a !== void 0 ? _a : 'SELF') === 'SELF';
+        // console.log("wrs.webrootMethod=",wrs.webrootMethod)
+        addBuiltInDefinitions(defs, withWebroot);
         // console.log(ac.gray.dim('>> after addBuiltIns'), defs)
         // console.log(ac.gray.dim('>>> buildOpenApi '))
-        return yield (0, openApiConstruction_1.buildOpenApi)(defs, false, yamlFile); //, true)
+        return yield (0, openApiConstruction_1.buildOpenApi)(defs, true, true, yamlFile);
     });
 }
 exports.MakeBuiltinApiDoc = MakeBuiltinApiDoc;
-function addBuiltInDefinitions(defs) {
+function addBuiltInDefinitions(defs, withWebroot) {
     // 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("withWebroot = "+withWebroot)
     // console.log(ac.gray.dim('>>>> pushing webrootDef '), webrootDef)
-    defs.push(webrootDef);
+    defs.push(webrootDef); // we need to do this to support index or anything else.
     // 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 = decoratedName('fileserve_docs')
-    fsdef.pathMap = '/docs/{path}'
-    defs.push(fsdef)
-     */
+    // const fsdef = Object.assign({}, fileServeDef) // copy
+    // fsdef.name = decoratedName('fileserve_docs')
+    // fsdef.pathMap = '/docs/{path}'
+    // defs.push(fsdef)
+    // }
     const roots = (0, WebrootFileSupport_1.GetWebrootServePaths)();
     // console.log("roots", roots)
     // console.log(ac.gray.dim('>>>> roots here: '), roots)
@@ -66,6 +71,9 @@ function addBuiltInDefinitions(defs) {
             // console.log(ac.gray.dim('>> rootName = '+rootName))
             while (rootName.includes('/'))
                 rootName = rootName.replace('/', '').toLowerCase().trim();
+            // TODO: Trying to exclude here seems to remove our ability to get anything from root (webroot, should be there already)
+            // console.log('fileserve '+ rootName)
+            // if(!withWebroot && rootName !== 'docs') continue; // only copy docs for non-self export types
             // console.log(ac.gray.dim('>> past stupid error = '+rootName))
             const fileserve = Object.assign({}, fileServeDef); // copy
             fileserve.name = (0, IdSrc_1.decoratedName)('fileserve_' + rootName);

package/build/commands/builtin/ApiDocMaker.js.map

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

package/build/commands/builtin/BuiltInHandler.js

@@ -44,11 +44,14 @@ const IdSrc_1 = require("../../lib/IdSrc");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 function DeployWebrootBuiltIn() {
-    return __awaiter(this, void 0, void 0, function* () {
+    return __awaiter(this, arguments, void 0, function* (externalizedFolders = true) {
         // console.warn(">> DeployWebrootBuiltIn")
+        // const withRoot = externalizedFolders
+        // const withFolders = true
         const wrZip = yield (0, StageWebrootZip_1.StageWebrootZip)();
-        // console.log(">> Deploy Webroot Builtin from "+wrZip)
-        yield (0, DeployBuiltInZip_1.DeployBuiltInZip)('Webroot', wrZip);
+        const wrName = (0, IdSrc_1.decoratedName)('Webroot');
+        // console.log(">> Deploy Webroot Builtin from "+wrZip+" as "+wrName)
+        yield (0, DeployBuiltInZip_1.DeployBuiltInZip)(wrName, wrZip);
         // remove temp zip when done
         // console.warn("a.zip is left behind")
         fs_1.default.rmSync(wrZip, { recursive: true });

package/build/commands/builtin/BuiltInHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAC3E,gDAAiC;AACjC,2CAA+C;AAE/C,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;;QAGxC,0CAA0C;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,uDAAuD;QACvD,MAAM,IAAA,mCAAgB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAA;QACxC,4BAA4B;QAC5B,uCAAuC;QACvC,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;AAVD,oDAUC;AAED,SAAsB,oBAAoB;;QAGxC,iBAAiB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAoB,GAAE,CAAA;QACpC,0CAA0C;QAC1C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;QAC3E,MAAM,GAAG,GAAwB,EAAE,CAAA;QACnC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;YAClB,IAAI,IAAI,GAAG,IAAA,qBAAa,EAAC,YAAY,GAAG,IAAI,CAAC,CAAA;YAC7C,kDAAkD;YAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC9B,CAAC;YACD,gDAAgD;YAChD,GAAG,CAAC,IAAI,CAAC,IAAA,mCAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,MAAM,iBAAiB,CAAC,CAAC,CAAA;QACtE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,+BAA+B;IACjC,CAAC;CAAA;AArBD,oDAqBC;AAED,SAAsB,gBAAgB;;QAGpC,gCAAgC;QAChC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,IAAA,mCAAgB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CAAA;AAND,4CAMC"}
+{"version":3,"file":"BuiltInHandler.js","sourceRoot":"","sources":["../../../src/commands/builtin/BuiltInHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAmD;AACnD,yDAAqD;AACrD,6EAA2E;AAC3E,gDAAiC;AACjC,2CAA+C;AAE/C,4CAAmB;AACnB,gDAAuB;AAEvB,SAAsB,oBAAoB;yDAExC,sBAA+B,IAAI;QAEnC,0CAA0C;QAC1C,uCAAuC;QACvC,2BAA2B;QAC3B,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,GAAE,CAAA;QACrC,MAAM,MAAM,GAAG,IAAA,qBAAa,EAAC,SAAS,CAAC,CAAA;QACvC,qEAAqE;QAErE,MAAM,IAAA,mCAAgB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACrC,4BAA4B;QAC5B,uCAAuC;QACvC,YAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;CAAA;AAfD,oDAeC;AAED,SAAsB,oBAAoB;;QAGxC,iBAAiB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAoB,GAAE,CAAA;QACpC,0CAA0C;QAC1C,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;QAC3E,MAAM,GAAG,GAAwB,EAAE,CAAA;QACnC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;YAClB,IAAI,IAAI,GAAG,IAAA,qBAAa,EAAC,YAAY,GAAG,IAAI,CAAC,CAAA;YAC7C,kDAAkD;YAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAC9B,CAAC;YACD,gDAAgD;YAChD,GAAG,CAAC,IAAI,CAAC,IAAA,mCAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,MAAM,iBAAiB,CAAC,CAAC,CAAA;QACtE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtB,+BAA+B;IACjC,CAAC;CAAA;AArBD,oDAqBC;AAED,SAAsB,gBAAgB;;QAGpC,gCAAgC;QAChC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;QAC/D,MAAM,IAAA,mCAAgB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CAAA;AAND,4CAMC"}

package/build/commands/builtin/ExportWebroot.js

@@ -0,0 +1,242 @@
+"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.getWebrootSettings = exports.ExportWebroot = exports.WebrootExportConfig = exports.WebrootExportType = exports.WebrootDefaultOptions = exports.WebrootS3Options = exports.WebrootScriptOptions = void 0;
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const ac = __importStar(require("ansi-colors"));
+const pathResolve_1 = require("../../lib/pathResolve");
+const DirectoryUtils_1 = require("../../lib/DirectoryUtils");
+// import { isNewer } from '../../lib/fileCompare'
+const executeCommand_1 = require("../../lib/executeCommand");
+// import { mkdirSync } from 'fs'
+const BuiltInHandler_1 = require("./BuiltInHandler");
+// import { ServiceSettingsData } from '@tremho/inverse-y'
+const s3webroot_1 = require("./webroot-export/s3webroot");
+/*
+Here we want to handle exporting the webroot to other serving sources according to configuration.
+
+- Read the config  options
+- enumerate the webroot and find recent changes
+- write these file paths to a temp file
+- per config, call the handler that will do this
+    - to S3
+    - to script
+    later:
+    - to Blob ?
+    -
+
+ */
+/*
+Script will be called with comma delimited list of files as arg 1, and options (string) as arg2
+ */
+class WebrootScriptOptions {
+    constructor() {
+        this.scriptName = ''; // name of script to call (relative to project root)
+        this.options = ''; // options passed as second parameter to script (see comment above)
+    }
+}
+exports.WebrootScriptOptions = WebrootScriptOptions;
+class WebrootS3Options {
+    constructor() {
+        this.unused = ''; // empty (lint)
+    }
+}
+exports.WebrootS3Options = WebrootS3Options;
+class WebrootDefaultOptions {
+    constructor() {
+        this.unused = ''; // empty (lint)
+    }
+}
+exports.WebrootDefaultOptions = WebrootDefaultOptions;
+/*
+For non-SELF types, only the files *not* in subdirectories will be packaged to the deployed webroot
+ */
+var WebrootExportType;
+(function (WebrootExportType) {
+    WebrootExportType["SELF"] = "SELF";
+    WebrootExportType["SCRIPT"] = "SCRIPT";
+    WebrootExportType["S3"] = "S3"; // built-in function (instead of script) is called for an S3 target
+})(WebrootExportType || (exports.WebrootExportType = WebrootExportType = {}));
+/*
+This is what webrootConfig.json looks like
+ */
+class WebrootExportConfig {
+    constructor() {
+        this.type = WebrootExportType.SELF;
+        this.options = new WebrootDefaultOptions();
+    }
+}
+exports.WebrootExportConfig = WebrootExportConfig;
+let basePath = '';
+/**
+ * Exports the webroot according to configuration
+ */
+function ExportWebroot() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectPaths = (0, pathResolve_1.resolvePaths)();
+        basePath = projectPaths.basePath;
+        const webrootConfig = readWebrootConfig(path.join(basePath, 'webrootConfig.json'));
+        // console.log(">> ExportWebroot", {webrootConfig})
+        const fla = yield getUpdatedExportFileList();
+        switch (webrootConfig.type) {
+            case WebrootExportType.SELF:
+                yield exportSelf();
+                break;
+            case WebrootExportType.S3:
+                yield (0, s3webroot_1.exportWebrootToS3)(fla, webrootConfig.options);
+                break;
+            case WebrootExportType.SCRIPT:
+                yield exportScript(fla, webrootConfig.options);
+                break;
+            default: {
+                throw new Error(`UNSUPPORTED WEBROOT EXPORT ${WebrootExportType[webrootConfig.type]}`);
+            }
+        }
+    });
+}
+exports.ExportWebroot = ExportWebroot;
+function getWebrootSettings() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const projectPaths = (0, pathResolve_1.resolvePaths)();
+        basePath = projectPaths.basePath;
+        const webrootConfig = readWebrootConfig(path.join(basePath, 'webrootConfig.json'));
+        let baseUrl = '';
+        switch (webrootConfig.type) {
+            case WebrootExportType.SELF:
+                baseUrl = '';
+                break;
+            case WebrootExportType.S3:
+                baseUrl = yield (0, s3webroot_1.getS3Prefix)();
+                break;
+            case WebrootExportType.SCRIPT: {
+                const options = webrootConfig.options;
+                const scriptPath = path.join(basePath, options.scriptName);
+                const out = yield (0, executeCommand_1.executeCommand)(scriptPath, ['--prefix'], basePath, false);
+                baseUrl = out.stdStr.trim();
+                break;
+            }
+            default: {
+                const unreachable = webrootConfig.type;
+                throw new Error(`UNSUPPORTED WEBROOT EXPORT ${unreachable}`);
+            }
+        }
+        return {
+            webrootMethod: webrootConfig.type.toString(),
+            webrootBaseUrl: baseUrl
+        };
+    });
+}
+exports.getWebrootSettings = getWebrootSettings;
+let warned = false;
+function readWebrootConfig(configPath) {
+    let conf = new WebrootExportConfig();
+    let content = '';
+    // console.log("... reading from "+configPath)
+    try {
+        // console.log("  >> readWebrootConfig")
+        content = fs.readFileSync(configPath).toString();
+        conf = JSON.parse(content);
+    }
+    catch (e) {
+        if (!warned) {
+            warned = true;
+            console.error(ac.yellow.bold('Warning: Failed to read or parse ' + configPath));
+            console.warn(ac.yellow.bold.dim("Falling back to 'self' publish mode"));
+        }
+    }
+    return conf;
+}
+function exportSelf() {
+    return __awaiter(this, void 0, void 0, function* () {
+        // zip up everything
+        // console.log(">> exportSelf")
+        // console.log("  >> deployWebrootBuiltIn")
+        yield (0, BuiltInHandler_1.DeployWebrootBuiltIn)(false);
+        // console.log("  >> deployRootFileserves")
+        yield (0, BuiltInHandler_1.DeployRootFileserves)();
+    });
+}
+function exportScript(fla, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // console.log(">> exportScript")
+        // console.log("  >> DeployWebrootBuiltIn")
+        // await DeployWebrootBuiltIn(true)
+        console.log(ac.bold.green(`calling webroot exportScript ${options.scriptName}`));
+        // console.log("files", fla)
+        const fl = fla.join(',');
+        const args = [fl];
+        // args.unshift(options.options)
+        // console.log("args", args)
+        const scriptPath = path.join(basePath, options.scriptName);
+        // console.log("Executing script", scriptPath)
+        yield (0, executeCommand_1.executeCommand)(scriptPath, args, basePath, true);
+    });
+}
+function getUpdatedExportFileList() {
+    return __awaiter(this, void 0, void 0, function* () {
+        // console.log(">> getUpdatedExportFileList")
+        // find the last published time from .published file
+        let lastPublished = 0;
+        try {
+            const pubjson = JSON.parse(fs.readFileSync(path.join(basePath, '.published')).toString());
+            lastPublished = pubjson.time;
+            // console.log("last published ", lastPublished)
+        }
+        catch (e) {
+            console.warn(ac.yellow.italic.dim('no .published information available - full export'));
+        }
+        const outbin = [];
+        // enumerate at webroot and files from all non-root directories
+        const folder = path.join(basePath, 'webroot');
+        const rootpathsteps = folder.split(path.sep).length;
+        const enumerating = true;
+        function gatherFiles(filepath, stats) {
+            // console.log(filepath, {steps:filepath.split(path.sep).length, rootpathsteps, isDir:stats.isDirectory()})
+            if (filepath.split(path.sep).length > rootpathsteps + 1) {
+                // console.log({filepath, mtime:stats.mtime.getTime(), lastPublished})
+                if (stats.mtime.getTime() >= lastPublished) {
+                    filepath = '+' + filepath;
+                    // console.log("will update "+filepath)
+                }
+                outbin.push(filepath);
+            }
+            return false;
+        }
+        // console.log("recursing folder ", folder)
+        yield (0, DirectoryUtils_1.recurseDirectory)(folder, gatherFiles);
+        return outbin;
+    });
+}
+//# sourceMappingURL=ExportWebroot.js.map

package/build/commands/builtin/ExportWebroot.js.map

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

package/build/commands/builtin/StageWebrootZip.js

@@ -43,7 +43,7 @@ const utils_1 = require("../../lib/utils");
 const fs_1 = require("fs");
 // import * as ac from 'ansi-colors'
 function StageWebrootZip() {
-    return __awaiter(this, void 0, void 0, function* () {
+    return __awaiter(this, arguments, void 0, function* (withRoot = true, withFolders = true) {
         // console.log(">>>> staging webroot to zip")
         const projectPaths = (0, pathResolve_1.resolvePaths)();
         const webroot = path.join(projectPaths.basePath, 'webroot');
@@ -90,6 +90,7 @@ function StageWebrootZip() {
         // console.log(">>>> making zipFilesPath "+zipFilesPath)
         yield fs.mkdirSync(zipFilesPath);
         // todo: read the redirects.json file
+        // todo: Document as deprecated
         let redirected = [];
         try {
             const redir = JSON.parse(fs.readFileSync(path.join(webroot, 'redirects.json')).toString());
@@ -102,14 +103,17 @@ function StageWebrootZip() {
         // console.log(">>>> enumerating "+webroot)
         yield (0, DirectoryUtils_1.recurseDirectory)(webroot, (filepath, stats) => {
             const relPath = filepath.substring(webroot.length);
-            if (stats.isDirectory()) {
+            if (stats.isDirectory() && withFolders) {
                 fs.mkdirSync(zipFilesPath + relPath, { recursive: true });
             }
             else {
-                // 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
+                if ((relPath.includes(path.sep) && withFolders) ||
+                    ((!relPath.includes(path.sep)) && withRoot)) {
+                    // TODO: Deprecate redirection. we'll continue to supoort it  here, though for now
+                    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/build/commands/builtin/StageWebrootZip.js.map

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