quidproquo-webserver 0.0.51 → 0.0.52

package/lib/config/QPQConfig.d.ts

@@ -4,6 +4,7 @@ export declare enum QPQWebServerConfigSettingType {
     Dns = "@quidproquo-webserver/config/Dns",
     OpenApi = "@quidproquo-webserver/config/OpenApi",
     Seo = "@quidproquo-webserver/config/Seo",
-    DeployRegion = "@quidproquo-webserver/config/DeployRegion",
-    SubdomainRedirect = "@quidproquo-webserver/config/SubdomainRedirect"
+    SubdomainRedirect = "@quidproquo-webserver/config/SubdomainRedirect",
+    WebEntry = "@quidproquo-webserver/config/WebEntry",
+    Api = "@quidproquo-webserver/config/Api"
 }

package/lib/config/QPQConfig.js

@@ -8,6 +8,7 @@ var QPQWebServerConfigSettingType;
     QPQWebServerConfigSettingType["Dns"] = "@quidproquo-webserver/config/Dns";
     QPQWebServerConfigSettingType["OpenApi"] = "@quidproquo-webserver/config/OpenApi";
     QPQWebServerConfigSettingType["Seo"] = "@quidproquo-webserver/config/Seo";
-    QPQWebServerConfigSettingType["DeployRegion"] = "@quidproquo-webserver/config/DeployRegion";
     QPQWebServerConfigSettingType["SubdomainRedirect"] = "@quidproquo-webserver/config/SubdomainRedirect";
+    QPQWebServerConfigSettingType["WebEntry"] = "@quidproquo-webserver/config/WebEntry";
+    QPQWebServerConfigSettingType["Api"] = "@quidproquo-webserver/config/Api";
 })(QPQWebServerConfigSettingType = exports.QPQWebServerConfigSettingType || (exports.QPQWebServerConfigSettingType = {}));

package/lib/config/settings/api.d.ts

@@ -0,0 +1,12 @@
+import { QPQConfigSetting, QPQConfigAdvancedSettings } from 'quidproquo-core';
+export interface QPQConfigAdvancedApiSettings extends QPQConfigAdvancedSettings {
+    onRootDomain?: boolean;
+    apiName?: string;
+}
+export interface ApiQPQWebServerConfigSetting extends QPQConfigSetting {
+    apiSubdomain: string;
+    onRootDomain: boolean;
+    apiName: string;
+    buildPath: string;
+}
+export declare const defineApi: (apiSubdomain: string, buildPath: string, options?: QPQConfigAdvancedApiSettings) => ApiQPQWebServerConfigSetting;

package/lib/config/settings/api.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineApi = void 0;
+const QPQConfig_1 = require("../QPQConfig");
+const defineApi = (apiSubdomain, buildPath, options) => {
+    return {
+        configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.Api,
+        uniqueKey: apiSubdomain,
+        apiSubdomain,
+        buildPath,
+        // advanced
+        onRootDomain: (options === null || options === void 0 ? void 0 : options.onRootDomain) || false,
+        apiName: (options === null || options === void 0 ? void 0 : options.apiName) || 'api',
+    };
+};
+exports.defineApi = defineApi;

package/lib/config/settings/defaultRouteOptions.d.ts

@@ -3,4 +3,4 @@ import { RouteOptions } from './route';
 export interface DefaultRouteOptionsQPQWebServerConfigSetting extends QPQConfigSetting {
     routeOptions: RouteOptions;
 }
-export declare const defineDefaultRouteOptions: (routeOptions: RouteOptions) => DefaultRouteOptionsQPQWebServerConfigSetting;
+export declare const defineDefaultRouteOptions: (groupName: string, routeOptions: RouteOptions) => DefaultRouteOptionsQPQWebServerConfigSetting;

package/lib/config/settings/defaultRouteOptions.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineDefaultRouteOptions = void 0;
 const QPQConfig_1 = require("../QPQConfig");
-const defineDefaultRouteOptions = (routeOptions) => ({
+const defineDefaultRouteOptions = (groupName, routeOptions) => ({
     configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.DefaultRouteOptions,
+    uniqueKey: groupName,
     routeOptions,
 });
 exports.defineDefaultRouteOptions = defineDefaultRouteOptions;

package/lib/config/settings/dns.d.ts

@@ -1,4 +1,4 @@
-import { QPQConfigSetting } from "quidproquo-core";
+import { QPQConfigSetting } from 'quidproquo-core';
 export interface DnsQPQWebServerConfigSetting extends QPQConfigSetting {
     dnsBase: string;
 }

package/lib/config/settings/dns.js

@@ -4,6 +4,7 @@ exports.defineDns = void 0;
 const QPQConfig_1 = require("../QPQConfig");
 const defineDns = (dnsBase) => ({
     configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.Dns,
+    uniqueKey: dnsBase,
     dnsBase,
 });
 exports.defineDns = defineDns;

package/lib/config/settings/index.d.ts

@@ -1,7 +1,8 @@
+export * from './api';
 export * from './defaultRouteOptions';
-export * from './deployRegion';
 export * from './dns';
 export * from './openApi';
 export * from './route';
 export * from './seo';
 export * from './subdomainRedirect';
+export * from './webEntry';

package/lib/config/settings/index.js

@@ -14,10 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./api"), exports);
 __exportStar(require("./defaultRouteOptions"), exports);
-__exportStar(require("./deployRegion"), exports);
 __exportStar(require("./dns"), exports);
 __exportStar(require("./openApi"), exports);
 __exportStar(require("./route"), exports);
 __exportStar(require("./seo"), exports);
 __exportStar(require("./subdomainRedirect"), exports);
+__exportStar(require("./webEntry"), exports);

package/lib/config/settings/openApi.js

@@ -5,6 +5,7 @@ const QPQConfig_1 = require("../QPQConfig");
 const defineOpenApi = (openApiSpecPath) => {
     return {
         configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.OpenApi,
+        uniqueKey: openApiSpecPath,
         openApiSpecPath,
     };
 };

package/lib/config/settings/route.js

@@ -4,6 +4,7 @@ exports.defineRoute = void 0;
 const QPQConfig_1 = require("../QPQConfig");
 const defineRoute = (method, path, src, runtime, options = {}) => ({
     configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.Route,
+    uniqueKey: runtime,
     method,
     path,
     src,

package/lib/config/settings/seo.js

@@ -4,6 +4,7 @@ exports.defineSeo = void 0;
 const QPQConfig_1 = require("../QPQConfig");
 const defineSeo = (path, src, runtime, options = {}) => ({
     configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.Seo,
+    uniqueKey: runtime,
     path,
     src,
     runtime,

package/lib/config/settings/subdomainRedirect.js

@@ -4,6 +4,7 @@ exports.defineSubdomainRedirect = void 0;
 const QPQConfig_1 = require("../QPQConfig");
 const defineSubdomainRedirect = (subdomain, redirectUrl, addFeatureEnvironment = false) => ({
     configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.SubdomainRedirect,
+    uniqueKey: subdomain,
     subdomain,
     redirectUrl,
     addFeatureEnvironment,

package/lib/config/settings/webEntry.d.ts

@@ -0,0 +1,7 @@
+import { QPQConfigSetting } from 'quidproquo-core';
+export interface WebEntryQPQWebServerConfigSetting extends QPQConfigSetting {
+    name: string;
+    buildPath: string;
+    seoBuildPath?: string;
+}
+export declare const defineWebEntry: (name: string, buildPath: string, seoBuildPath?: string) => WebEntryQPQWebServerConfigSetting;

package/lib/config/settings/webEntry.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineWebEntry = void 0;
+const QPQConfig_1 = require("../QPQConfig");
+const defineWebEntry = (name, buildPath, seoBuildPath) => ({
+    configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.WebEntry,
+    uniqueKey: name,
+    name,
+    buildPath,
+    seoBuildPath,
+});
+exports.defineWebEntry = defineWebEntry;

package/lib/qpqWebServerUtils.d.ts

@@ -5,14 +5,19 @@ import { SubdomainRedirectQPQWebServerConfigSetting } from './config/settings/su
 import { OpenApiQPQWebServerConfigSetting } from './config/settings/openApi';
 import { HttpEventHeaders, HTTPEventParams, HTTPEventResponse } from './types/HTTPEvent';
 import { RouteOptions } from './config/settings/route';
+import { WebEntryQPQWebServerConfigSetting, ApiQPQWebServerConfigSetting } from './config';
 export declare const getAllRoutes: (configs: QPQConfig) => RouteQPQWebServerConfigSetting[];
 export declare const getAllSeo: (configs: QPQConfig) => SeoQPQWebServerConfigSetting[];
-export declare const getDeployRegion: (configs: QPQConfig) => string;
 export declare const getAllOpenApiSpecs: (configs: QPQConfig) => OpenApiQPQWebServerConfigSetting[];
 export declare const getAllSrcEntries: (configs: QPQConfig) => string[];
 export declare const getDomainName: (configs: QPQConfig) => string;
+export declare const getWebEntry: (configs: QPQConfig) => string;
+export declare const getWebEntryFullPath: (qpqConfig: QPQConfig, webEntryQPQWebServerConfigSetting: WebEntryQPQWebServerConfigSetting) => string;
+export declare const getWebEntrySeoFullPath: (qpqConfig: QPQConfig, webEntryQPQWebServerConfigSetting: WebEntryQPQWebServerConfigSetting) => string;
+export declare const getApiEntryFullPath: (qpqConfig: QPQConfig, apiConfig: ApiQPQWebServerConfigSetting) => string;
 export declare const getSubdomainRedirects: (configs: QPQConfig) => SubdomainRedirectQPQWebServerConfigSetting[];
 export declare const getFeatureDomainName: (configs: QPQConfig) => string;
+export declare const getServiceDomainName: (qpqConfig: QPQConfig) => string;
 export declare const getHeaderValue: (header: string, headers: HttpEventHeaders) => string | null;
 export declare const getAllowedOrigins: (configs: QPQConfig, route: RouteOptions) => string[];
 export declare const getCorsHeaders: (configs: QPQConfig, route: RouteOptions, reqHeaders: HttpEventHeaders) => HttpEventHeaders;

package/lib/qpqWebServerUtils.js

@@ -1,6 +1,30 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJsonEventResponse = exports.fromJsonEventRequest = exports.getCorsHeaders = exports.getAllowedOrigins = exports.getHeaderValue = exports.getFeatureDomainName = exports.getSubdomainRedirects = exports.getDomainName = exports.getAllSrcEntries = exports.getAllOpenApiSpecs = exports.getDeployRegion = exports.getAllSeo = exports.getAllRoutes = void 0;
+exports.toJsonEventResponse = exports.fromJsonEventRequest = exports.getCorsHeaders = exports.getAllowedOrigins = exports.getHeaderValue = exports.getServiceDomainName = exports.getFeatureDomainName = exports.getSubdomainRedirects = exports.getApiEntryFullPath = exports.getWebEntrySeoFullPath = exports.getWebEntryFullPath = exports.getWebEntry = exports.getDomainName = exports.getAllSrcEntries = exports.getAllOpenApiSpecs = exports.getAllSeo = exports.getAllRoutes = void 0;
+const path = __importStar(require("path"));
 const quidproquo_core_1 = require("quidproquo-core");
 const QPQConfig_1 = require("./config/QPQConfig");
 const qpqCoreUtils_1 = require("quidproquo-core/lib/qpqCoreUtils");
@@ -14,12 +38,6 @@ const getAllSeo = (configs) => {
     return seoConfigs;
 };
 exports.getAllSeo = getAllSeo;
-const getDeployRegion = (configs) => {
-    var _a;
-    const deployRegions = quidproquo_core_1.qpqCoreUtils.getConfigSettings(configs, QPQConfig_1.QPQWebServerConfigSettingType.DeployRegion);
-    return ((_a = deployRegions[0]) === null || _a === void 0 ? void 0 : _a.deployRegion) || 'ap-southeast-2';
-};
-exports.getDeployRegion = getDeployRegion;
 const getAllOpenApiSpecs = (configs) => {
     const openApiSpecs = quidproquo_core_1.qpqCoreUtils.getConfigSettings(configs, QPQConfig_1.QPQWebServerConfigSettingType.OpenApi);
     return openApiSpecs;
@@ -40,6 +58,30 @@ const getDomainName = (configs) => {
     return (dnsSettings === null || dnsSettings === void 0 ? void 0 : dnsSettings.dnsBase) || '';
 };
 exports.getDomainName = getDomainName;
+const getWebEntry = (configs) => {
+    const webEntry = quidproquo_core_1.qpqCoreUtils.getConfigSetting(configs, QPQConfig_1.QPQWebServerConfigSettingType.WebEntry);
+    if (!(webEntry === null || webEntry === void 0 ? void 0 : webEntry.buildPath)) {
+        throw new Error('please use defineWebEntry in your qpq config');
+    }
+    return webEntry === null || webEntry === void 0 ? void 0 : webEntry.buildPath;
+};
+exports.getWebEntry = getWebEntry;
+const getWebEntryFullPath = (qpqConfig, webEntryQPQWebServerConfigSetting) => {
+    return path.join(quidproquo_core_1.qpqCoreUtils.getConfigRoot(qpqConfig), webEntryQPQWebServerConfigSetting.buildPath);
+};
+exports.getWebEntryFullPath = getWebEntryFullPath;
+const getWebEntrySeoFullPath = (qpqConfig, webEntryQPQWebServerConfigSetting) => {
+    return path.join(quidproquo_core_1.qpqCoreUtils.getConfigRoot(qpqConfig), webEntryQPQWebServerConfigSetting.seoBuildPath || webEntryQPQWebServerConfigSetting.buildPath);
+};
+exports.getWebEntrySeoFullPath = getWebEntrySeoFullPath;
+const getApiEntryFullPath = (qpqConfig, apiConfig) => {
+    const apiEntry = apiConfig.buildPath;
+    if (!apiEntry) {
+        throw new Error('please use defineWebEntry in your qpq config');
+    }
+    return path.join(quidproquo_core_1.qpqCoreUtils.getConfigRoot(qpqConfig), apiEntry);
+};
+exports.getApiEntryFullPath = getApiEntryFullPath;
 const getSubdomainRedirects = (configs) => {
     const subdomainRedirects = quidproquo_core_1.qpqCoreUtils.getConfigSettings(configs, QPQConfig_1.QPQWebServerConfigSettingType.SubdomainRedirect);
     return subdomainRedirects;
@@ -54,6 +96,12 @@ const getFeatureDomainName = (configs) => {
     return `${feature}.${apexDomainName}`;
 };
 exports.getFeatureDomainName = getFeatureDomainName;
+const getServiceDomainName = (qpqConfig) => {
+    const appName = quidproquo_core_1.qpqCoreUtils.getAppName(qpqConfig);
+    const featureDomain = (0, exports.getFeatureDomainName)(qpqConfig);
+    return `${appName}.${featureDomain}`;
+};
+exports.getServiceDomainName = getServiceDomainName;
 const getHeaderValue = (header, headers) => {
     const headerAsLower = header.toLowerCase();
     const realHeaderKey = Object.keys(headers).find((k) => k.toLowerCase() === headerAsLower);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-webserver",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",

package/lib/config/settings/deployRegion.d.ts

@@ -1,5 +0,0 @@
-import { QPQConfigSetting } from 'quidproquo-core';
-export interface DeployRegionQPQWebServerConfigSetting extends QPQConfigSetting {
-    deployRegion: string;
-}
-export declare const defineDeployRegion: (deployRegion: string) => DeployRegionQPQWebServerConfigSetting;

package/lib/config/settings/deployRegion.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineDeployRegion = void 0;
-const QPQConfig_1 = require("../QPQConfig");
-const defineDeployRegion = (deployRegion) => {
-    return {
-        configSettingType: QPQConfig_1.QPQWebServerConfigSettingType.DeployRegion,
-        deployRegion,
-    };
-};
-exports.defineDeployRegion = defineDeployRegion;