lwr 0.6.5 → 0.7.0-alpha.10

package/LICENSE

@@ -0,0 +1,10 @@
+MIT LICENSE
+
+Copyright (c) 2020, Salesforce.com, Inc.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/build/cjs/cli/cli.cjs

@@ -32,7 +32,7 @@ cli.command("").action((o) => {
   cli.outputHelp();
   process.exit(1);
 });
-cli.command("serve", "Starts an LWR server (defaults to dev mode)").alias("dev").option("--port <port>", `[number] specify port`).option("--mode <mode>", "[string] server mode").option("--open [path]", `[boolean | string] open browser on startup`).action(async (options) => {
+cli.command("serve", "Starts an LWR server (defaults to dev mode)").alias("dev").option("--port <port>", `[number] specify port`).option("--mode <mode>", "[string] server mode").option("--open <path>", `[boolean | string] open browser on startup`).action(async (options) => {
   const {createServer} = await Promise.resolve().then(() => __toModule(require("@lwrjs/core")));
   const {port, mode = "dev", open} = options;
   try {
@@ -52,7 +52,7 @@ cli.command("serve", "Starts an LWR server (defaults to dev mode)").alias("dev")
     }
   }
 });
-cli.command("build", "Builds a static LWR site").alias("static-build").option("--outputDir [output]", `[number] specify port`).action(async (options) => {
+cli.command("build", "Builds a static LWR site").alias("static-build").option("--outputDir <directory>", `[string] output directory`).action(async (options) => {
   const {output = "__generated_site__"} = options;
   const {generateStaticSite} = await Promise.resolve().then(() => __toModule(require("@lwrjs/core")));
   try {
@@ -72,6 +72,21 @@ cli.command("build", "Builds a static LWR site").alias("static-build").option("-
     }
   }
 });
+cli.command("bundle-lambda", "Bundles the lambda source").option("--entryPoint <entry>", "[string] bundling entry point").option("--format <format>", "[string] bundle output format").action(async (options) => {
+  const entryPoint = options.entryPoint || "./src/index.ts";
+  const format = options.format || "esm";
+  try {
+    const {bundleLambda} = await Promise.resolve().then(() => __toModule(require("./commands/bundle-lambda.cjs")));
+    await bundleLambda({entryPoint, format});
+  } catch (error) {
+    if (error instanceof import_diagnostics.DiagnosticsError) {
+      console.log(error.diagnostics);
+      process.exit(1);
+    } else {
+      throw error;
+    }
+  }
+});
 cli.on("command:*", () => {
   console.error(import_chalk.default.redBright(`Invalid command: ${cli.args.join(" ")}`));
   cli.outputHelp();

package/build/cjs/cli/commands/bundle-lambda.cjs

@@ -0,0 +1,116 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/lwr/src/cli/commands/bundle-lambda.ts
+__markAsModule(exports);
+__export(exports, {
+  bundleLambda: () => bundleLambda
+});
+var import_fs = __toModule(require("fs"));
+var import_path = __toModule(require("path"));
+var import_esbuild = __toModule(require("esbuild"));
+var import_vm2 = __toModule(require("vm2"));
+var import_core = __toModule(require("@lwrjs/core"));
+var import_esm_require_shim = __toModule(require("./shims/esm-require-shim.cjs"));
+var import_lwr_lambda_shim = __toModule(require("./shims/lwr-lambda-shim.cjs"));
+async function bundleLambda({entryPoint, format}) {
+  const arg = await getConfigArg(entryPoint);
+  const server = (0, import_core.createServer)(arg);
+  const config = server.getConfig();
+  const lambdaShim = generateLambdaShim(config);
+  const buildDir = import_path.default.resolve("./build/generated");
+  const lambdaShimPath = import_path.default.join(buildDir, "lwr-lambda-shim.js");
+  import_fs.default.mkdirSync(buildDir, {recursive: true});
+  import_fs.default.writeFileSync(lambdaShimPath, lambdaShim);
+  const options = {
+    bundle: true,
+    format,
+    treeShaking: true,
+    entryPoints: [entryPoint],
+    outdir: "./build",
+    platform: "node",
+    external: ["fsevents", "esbuild", "rollup", "esinstall", "rollup-plugin-node-polyfills"],
+    inject: [lambdaShimPath]
+  };
+  if (format === "esm") {
+    options.banner = {
+      js: import_esm_require_shim.default
+    };
+  }
+  (0, import_esbuild.build)(options);
+}
+async function getConfigArg(entryPoint) {
+  const result = await (0, import_esbuild.build)({
+    entryPoints: [entryPoint],
+    bundle: true,
+    write: false,
+    format: "cjs",
+    platform: "node",
+    external: [
+      "@lwrjs/lambda"
+    ]
+  });
+  const lambda = result.outputFiles[0].text;
+  const vm = new import_vm2.NodeVM({
+    console: "inherit",
+    sandbox: {},
+    require: {
+      external: true,
+      builtin: ["*"],
+      root: [import_path.default.dirname(entryPoint)],
+      mock: {
+        "@lwrjs/lambda": {
+          createHandler: (arg) => {
+            return arg;
+          }
+        }
+      }
+    }
+  });
+  try {
+    const {get} = vm.run(lambda);
+    return get;
+  } catch (e) {
+    console.error(e);
+    process.exit(1);
+  }
+}
+function generateLambdaShim(config) {
+  const serviceCtors = [];
+  const services = [];
+  const serviceConfigs = [];
+  for (const [index, [servicePath, serviceConfig = {}]] of config.moduleProviders.entries()) {
+    serviceCtors.push(`import ServiceCtor${index} from '${servicePath}';`);
+    services.push(`ServiceCtor${index}`);
+    serviceConfigs.push(JSON.stringify(serviceConfig));
+  }
+  const hookCtors = [];
+  const hooks = [];
+  const hookConfigs = [];
+  for (const [index, [hookPath, hookConfig = {}]] of config.moduleProviders.entries()) {
+    hookCtors.push(`import HookCtor${index} from '${hookPath}';`);
+    hooks.push(`HookCtor${index}`);
+    hookConfigs.push(JSON.stringify(hookConfig));
+  }
+  return import_lwr_lambda_shim.default.replace("{ serviceCtors }", serviceCtors.join("\n")).replace("{ services }", services.join()).replace("{ serviceConfigs }", serviceConfigs.join()).replace("{ hookCtors }", hookCtors.join("\n")).replace("{ hooks }", hooks.join()).replace("{ hookConfigs }", hookConfigs.join());
+}

package/build/cjs/cli/commands/shims/esm-require-shim.cjs

@@ -0,0 +1,34 @@
+var __defProp = Object.defineProperty;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+
+// packages/lwr/src/cli/commands/shims/esm-require-shim.ts
+__markAsModule(exports);
+__export(exports, {
+  default: () => esm_require_shim_default
+});
+var esm_require_shim_default = `
+await (async () => {
+  const { dirname } = await import("path");
+  const { fileURLToPath } = await import("url");
+  /**
+   * Shim entry-point related paths.
+   */
+  if (typeof globalThis.__filename === "undefined") {
+    globalThis.__filename = fileURLToPath(import.meta.url);
+  }
+  if (typeof globalThis.__dirname === "undefined") {
+    globalThis.__dirname = dirname(globalThis.__filename);
+  }
+  /**
+   * Shim require if needed.
+   */
+  if (typeof globalThis.require === "undefined") {
+    const { default: module } = await import("module");
+    globalThis.require = module.createRequire(import.meta.url);
+  }
+})();
+`;

package/build/cjs/cli/commands/shims/lwr-lambda-shim.cjs

@@ -0,0 +1,30 @@
+var __defProp = Object.defineProperty;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+
+// packages/lwr/src/cli/commands/shims/lwr-lambda-shim.ts
+__markAsModule(exports);
+__export(exports, {
+  default: () => lwr_lambda_shim_default
+});
+var lwr_lambda_shim_default = `
+{ serviceCtors }
+{ hookCtors }
+export const LWR = {
+    getModuleProviders: (context) => {
+        const serviceConfigs = [{ serviceConfigs }];
+        return [{ services }].map((ServiceCtor, index) => {
+            return new ServiceCtor(serviceConfigs[index], context);
+        });
+    },
+    getHooks: () => {
+        const hookConfigs = [{ hookConfigs }];
+        return [{ hooks }].map((HookCtor, index) => {
+            return new HookCtor(hookConfigs[index]);
+        });
+    }
+};
+`;

package/build/es/cli/cli.js

@@ -24,7 +24,7 @@ cli.command('serve', 'Starts an LWR server (defaults to dev mode)')
     .alias('dev')
     .option('--port <port>', `[number] specify port`)
     .option('--mode <mode>', '[string] server mode')
-    .option('--open [path]', `[boolean | string] open browser on startup`)
+    .option('--open <path>', `[boolean | string] open browser on startup`)
     // .option('--https', `[boolean] use TLS + HTTP/2`)
     // .option('--strictPort', `[boolean] exit if specified port is already in use`)
     // .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
@@ -52,7 +52,7 @@ cli.command('serve', 'Starts an LWR server (defaults to dev mode)')
 });
 cli.command('build', 'Builds a static LWR site') // default command
     .alias('static-build')
-    .option('--outputDir [output]', `[number] specify port`)
+    .option('--outputDir <directory>', `[string] output directory`)
     .action(async (options) => {
     const { output = '__generated_site__' } = options;
     const { generateStaticSite } = await import('@lwrjs/core');
@@ -75,6 +75,26 @@ cli.command('build', 'Builds a static LWR site') // default command
         }
     }
 });
+cli.command('bundle-lambda', 'Bundles the lambda source')
+    .option('--entryPoint <entry>', '[string] bundling entry point')
+    .option('--format <format>', '[string] bundle output format')
+    .action(async (options) => {
+    const entryPoint = options.entryPoint || './src/index.ts';
+    const format = options.format || 'esm';
+    try {
+        const { bundleLambda } = await import('./commands/bundle-lambda.js');
+        await bundleLambda({ entryPoint, format });
+    }
+    catch (error) {
+        if (error instanceof DiagnosticsError) {
+            console.log(error.diagnostics);
+            process.exit(1);
+        }
+        else {
+            throw error;
+        }
+    }
+});
 cli.on('command:*', () => {
     console.error(chalk.redBright(`Invalid command: ${cli.args.join(' ')}`));
     cli.outputHelp();

package/build/es/cli/commands/bundle-lambda.d.ts

@@ -0,0 +1,8 @@
+import { Format } from 'esbuild';
+interface BundleOptions {
+    entryPoint: string;
+    format: Format;
+}
+export declare function bundleLambda({ entryPoint, format }: BundleOptions): Promise<void>;
+export {};
+//# sourceMappingURL=bundle-lambda.d.ts.map

package/build/es/cli/commands/bundle-lambda.js

@@ -0,0 +1,104 @@
+import fs from 'fs';
+import path from 'path';
+import { build } from 'esbuild';
+import { NodeVM } from 'vm2';
+import { createServer } from '@lwrjs/core';
+import ESM_REQUIRE_SHIM from './shims/esm-require-shim.js';
+import LWR_LAMBDA_SHIM from './shims/lwr-lambda-shim.js';
+export async function bundleLambda({ entryPoint, format }) {
+    // get createHandler config argument
+    const arg = await getConfigArg(entryPoint);
+    // HACK: creating server just for config loading
+    const server = createServer(arg);
+    const config = server.getConfig();
+    // generate the lambda shim source
+    const lambdaShim = generateLambdaShim(config);
+    const buildDir = path.resolve('./build/generated');
+    const lambdaShimPath = path.join(buildDir, 'lwr-lambda-shim.js');
+    fs.mkdirSync(buildDir, { recursive: true });
+    fs.writeFileSync(lambdaShimPath, lambdaShim);
+    // bundle lambda handler and inject the lwr shim
+    const options = {
+        bundle: true,
+        format,
+        treeShaking: true,
+        entryPoints: [entryPoint],
+        outdir: './build',
+        platform: 'node',
+        external: ['fsevents', 'esbuild', 'rollup', 'esinstall', 'rollup-plugin-node-polyfills'],
+        inject: [lambdaShimPath],
+    };
+    if (format === 'esm') {
+        options.banner = {
+            js: ESM_REQUIRE_SHIM,
+        };
+    }
+    build(options);
+}
+async function getConfigArg(entryPoint) {
+    // bundle lambda source for execution in a sandbox
+    const result = await build({
+        entryPoints: [entryPoint],
+        bundle: true,
+        write: false,
+        format: 'cjs',
+        platform: 'node',
+        external: [
+            // skip @lwrjs/lambda because it will be mocked at execution
+            '@lwrjs/lambda',
+        ],
+    });
+    // execute lambda source with mocked createHandler to capture config
+    const lambda = result.outputFiles[0].text;
+    const vm = new NodeVM({
+        console: 'inherit',
+        sandbox: {},
+        require: {
+            external: true,
+            builtin: ['*'],
+            root: [path.dirname(entryPoint)],
+            mock: {
+                '@lwrjs/lambda': {
+                    createHandler: (arg) => {
+                        return arg;
+                    },
+                },
+            },
+        },
+    });
+    try {
+        const { get } = vm.run(lambda);
+        return get;
+    }
+    catch (e) {
+        console.error(e);
+        process.exit(1);
+    }
+}
+function generateLambdaShim(config) {
+    const serviceCtors = [];
+    const services = [];
+    const serviceConfigs = [];
+    // module provider generation
+    for (const [index, [servicePath, serviceConfig = {}]] of config.moduleProviders.entries()) {
+        serviceCtors.push(`import ServiceCtor${index} from '${servicePath}';`);
+        services.push(`ServiceCtor${index}`);
+        serviceConfigs.push(JSON.stringify(serviceConfig));
+    }
+    const hookCtors = [];
+    const hooks = [];
+    const hookConfigs = [];
+    // hooks generation
+    for (const [index, [hookPath, hookConfig = {}]] of config.moduleProviders.entries()) {
+        hookCtors.push(`import HookCtor${index} from '${hookPath}';`);
+        hooks.push(`HookCtor${index}`);
+        hookConfigs.push(JSON.stringify(hookConfig));
+    }
+    return LWR_LAMBDA_SHIM.replace('{ serviceCtors }', serviceCtors.join('\n'))
+        .replace('{ services }', services.join())
+        .replace('{ serviceConfigs }', serviceConfigs.join())
+        .replace('{ hookCtors }', hookCtors.join('\n'))
+        .replace('{ hooks }', hooks.join())
+        .replace('{ hookConfigs }', hookConfigs.join());
+}
+//# sourceMappingURL=bundle-lambda.js.map

package/build/es/cli/commands/shims/esm-require-shim.d.ts

@@ -0,0 +1,3 @@
+declare const _default: "\nawait (async () => {\n  const { dirname } = await import(\"path\");\n  const { fileURLToPath } = await import(\"url\");\n  /**\n   * Shim entry-point related paths.\n   */\n  if (typeof globalThis.__filename === \"undefined\") {\n    globalThis.__filename = fileURLToPath(import.meta.url);\n  }\n  if (typeof globalThis.__dirname === \"undefined\") {\n    globalThis.__dirname = dirname(globalThis.__filename);\n  }\n  /**\n   * Shim require if needed.\n   */\n  if (typeof globalThis.require === \"undefined\") {\n    const { default: module } = await import(\"module\");\n    globalThis.require = module.createRequire(import.meta.url);\n  }\n})();\n";
+export default _default;
+//# sourceMappingURL=esm-require-shim.d.ts.map

package/build/es/cli/commands/shims/esm-require-shim.js

@@ -0,0 +1,24 @@
+// work-around copied from: https://github.com/evanw/esbuild/pull/2067#issuecomment-1073039746
+export default `
+await (async () => {
+  const { dirname } = await import("path");
+  const { fileURLToPath } = await import("url");
+  /**
+   * Shim entry-point related paths.
+   */
+  if (typeof globalThis.__filename === "undefined") {
+    globalThis.__filename = fileURLToPath(import.meta.url);
+  }
+  if (typeof globalThis.__dirname === "undefined") {
+    globalThis.__dirname = dirname(globalThis.__filename);
+  }
+  /**
+   * Shim require if needed.
+   */
+  if (typeof globalThis.require === "undefined") {
+    const { default: module } = await import("module");
+    globalThis.require = module.createRequire(import.meta.url);
+  }
+})();
+`;
+//# sourceMappingURL=esm-require-shim.js.map

package/build/es/cli/commands/shims/lwr-lambda-shim.d.ts

@@ -0,0 +1,3 @@
+declare const _default: "\n{ serviceCtors }\n{ hookCtors }\nexport const LWR = {\n    getModuleProviders: (context) => {\n        const serviceConfigs = [{ serviceConfigs }];\n        return [{ services }].map((ServiceCtor, index) => {\n            return new ServiceCtor(serviceConfigs[index], context);\n        });\n    },\n    getHooks: () => {\n        const hookConfigs = [{ hookConfigs }];\n        return [{ hooks }].map((HookCtor, index) => {\n            return new HookCtor(hookConfigs[index]);\n        });\n    }\n};\n";
+export default _default;
+//# sourceMappingURL=lwr-lambda-shim.d.ts.map

package/build/es/cli/commands/shims/lwr-lambda-shim.js

@@ -0,0 +1,19 @@
+export default `
+{ serviceCtors }
+{ hookCtors }
+export const LWR = {
+    getModuleProviders: (context) => {
+        const serviceConfigs = [{ serviceConfigs }];
+        return [{ services }].map((ServiceCtor, index) => {
+            return new ServiceCtor(serviceConfigs[index], context);
+        });
+    },
+    getHooks: () => {
+        const hookConfigs = [{ hookConfigs }];
+        return [{ hooks }].map((HookCtor, index) => {
+            return new HookCtor(hookConfigs[index]);
+        });
+    }
+};
+`;
+//# sourceMappingURL=lwr-lambda-shim.js.map

package/package.json

@@ -18,7 +18,7 @@
     },
     "type": "module",
     "types": "build/es/index.d.ts",
-    "version": "0.6.5",
+    "version": "0.7.0-alpha.10",
     "module": "build/es/index.js",
     "main": "build/cjs/index.cjs",
     "files": [
@@ -38,8 +38,11 @@
         }
     },
     "dependencies": {
-        "@lwrjs/core": "0.6.5",
-        "@lwrjs/types": "0.6.5",
-        "cac": "^6.7.8"
-    }
+        "@lwrjs/core": "0.7.0-alpha.10",
+        "@lwrjs/types": "0.7.0-alpha.10",
+        "cac": "^6.7.8",
+        "esbuild": "^0.14.38",
+        "vm2": "^3.9.9"
+    },
+    "gitHead": "83c1e65e2169094cb55ac2c37e5aef16d3a9aa4a"
 }