@faasjs/load 7.0.4 → 8.0.0-beta.0

package/README.md

@@ -15,6 +15,7 @@ npm install @faasjs/load
 
 - [detectNodeRuntime](functions/detectNodeRuntime.md)
 - [loadConfig](functions/loadConfig.md)
+- [loadFunc](functions/loadFunc.md)
 - [loadPackage](functions/loadPackage.md)
 - [resetRuntime](functions/resetRuntime.md)
 

package/dist/index.cjs

@@ -3,7 +3,7 @@
 var fs = require('fs');
 var path = require('path');
 var deep_merge = require('@faasjs/deep_merge');
-var logger$1 = require('@faasjs/logger');
+var logger = require('@faasjs/logger');
 var jsYaml = require('js-yaml');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -14,9 +14,9 @@ var Config = class {
   origin;
   defaults;
   logger;
-  constructor(root, filename, logger2) {
-    this.logger = new logger$1.Logger(
-      logger2?.label ? `${logger2.label}] [config` : "config"
+  constructor(root, filename, logger$1) {
+    this.logger = new logger.Logger(
+      logger$1?.label ? `${logger$1.label}] [config` : "config"
     );
     this.root = root;
     if (!this.root.endsWith(path.sep)) this.root += path.sep;
@@ -53,9 +53,11 @@ var Config = class {
     return this[key] || this.defaults || /* @__PURE__ */ Object.create(null);
   }
 };
-function loadConfig(root, filename, staging, logger2) {
-  return new Config(root, filename, logger2).get(staging);
+function loadConfig(root, filename, staging, logger) {
+  return new Config(root, filename, logger).get(staging);
 }
+
+// src/load_package.ts
 var _runtime = null;
 function resetRuntime() {
   _runtime = null;
@@ -67,23 +69,10 @@ function detectNodeRuntime() {
   if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) }) !== "undefined") return _runtime = "module";
   throw Error("Unknown runtime");
 }
-var tsxLoaded = null;
-var logger = new logger$1.Logger("loadPackage");
 async function loadPackage(name, defaultNames = "default") {
   const runtime = detectNodeRuntime();
   let module2;
   if (runtime === "module") {
-    if (tsxLoaded === null) {
-      try {
-        await import('tsx');
-        tsxLoaded = true;
-      } catch (_) {
-        tsxLoaded = false;
-        logger.warn(
-          'Recommend installing the "tsx" package for loading ts/tsx files'
-        );
-      }
-    }
     module2 = await import(name);
     if (typeof defaultNames === "string")
       return defaultNames in module2 ? module2[defaultNames] : module2;
@@ -91,17 +80,6 @@ async function loadPackage(name, defaultNames = "default") {
     return module2;
   }
   if (runtime === "commonjs") {
-    if (tsxLoaded === null) {
-      try {
-        globalThis.require("tsx");
-        tsxLoaded = true;
-      } catch (_) {
-        tsxLoaded = false;
-        logger.warn(
-          'Recommend installing the "tsx" package for loading ts/tsx files'
-        );
-      }
-    }
     module2 = globalThis.require(name);
     if (typeof defaultNames === "string")
       return defaultNames in module2 ? module2[defaultNames] : module2;
@@ -111,7 +89,15 @@ async function loadPackage(name, defaultNames = "default") {
   throw Error("Unknown runtime");
 }
 
+// src/load_func.ts
+async function loadFunc(root, filename, staging) {
+  const func = await loadPackage(filename);
+  func.config = await loadConfig(root, filename, staging);
+  return func.export().handler;
+}
+
 exports.detectNodeRuntime = detectNodeRuntime;
 exports.loadConfig = loadConfig;
+exports.loadFunc = loadFunc;
 exports.loadPackage = loadPackage;
 exports.resetRuntime = resetRuntime;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Config } from '@faasjs/func';
+import { Config, ExportedHandler } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 
 /**
@@ -6,28 +6,51 @@ import { Logger } from '@faasjs/logger';
  */
 declare function loadConfig(root: string, filename: string, staging: string, logger?: Logger): Config;
 
+/**
+ * Load a FaasJS function and its configuration, returning the handler.
+ *
+ * @param root - Project root directory used to resolve configuration
+ * @param filename - Path to the packaged FaasJS function file to load
+ * @param staging - Staging directory name (used when locating config)
+ *
+ * @returns A Promise that resolves to the function handler
+ *
+ * @example
+ * ```ts
+ * import { loadFunc } from '@faasjs/load'
+ *
+ * const handler = await loadFunc(
+ *   process.cwd(),
+ *   __dirname + '/example.func.ts',
+ *   'development'
+ * )
+ *
+ * const result = await handler(event, context)
+ * console.log(result)
+ * ```
+ */
+declare function loadFunc<TEvent = any, TContext = any, TResult = any>(root: string, filename: string, staging: string): Promise<ExportedHandler<TEvent, TContext, TResult>>;
+
 type NodeRuntime = 'commonjs' | 'module';
 declare function resetRuntime(): void;
 /**
- * Detect the current JavaScript runtime environment.
+ * Detect current JavaScript runtime environment.
  *
- * This function checks for the presence of `import.meta` and `require` to determine
- * whether the runtime is using ECMAScript modules (ESM) or CommonJS modules (CJS).
+ * This function checks for presence of `import.meta` and `require` to determine
+ * whether runtime is using ECMAScript modules (ESM) or CommonJS modules (CJS).
  *
- * @returns {NodeRuntime} - Returns 'module' if the runtime is using ECMAScript modules,
+ * @returns {NodeRuntime} - Returns 'module' if runtime is using ECMAScript modules,
  *                            and 'cjs' if the runtime is using CommonJS modules.
- * @throws {Error} - Throws an error if the runtime cannot be determined.
+ * @throws {Error} - Throws an error if runtime cannot be determined.
  */
 declare function detectNodeRuntime(): NodeRuntime;
 /**
  * Asynchronously loads a package by its name, supporting both ESM and CommonJS runtimes.
  *
- * Also supports loading TypeScript and TSX files by checking for the presence of the "tsx" package.
- *
- * @template T - The type of the module to be loaded.
- * @param {string} name - The name of the package to load.
- * @returns {Promise<T>} A promise that resolves to the loaded module.
- * @throws {Error} If the runtime is unknown.
+ * @template T - The type of module to be loaded.
+ * @param {string} name - The name of package to load.
+ * @returns {Promise<T>} A promise that resolves to loaded module.
+ * @throws {Error} If runtime is unknown.
  *
  * @example
  * ```typescript
@@ -36,4 +59,4 @@ declare function detectNodeRuntime(): NodeRuntime;
  */
 declare function loadPackage<T = unknown>(name: string, defaultNames?: string | string[]): Promise<T>;
 
-export { type NodeRuntime, detectNodeRuntime, loadConfig, loadPackage, resetRuntime };
+export { type NodeRuntime, detectNodeRuntime, loadConfig, loadFunc, loadPackage, resetRuntime };

package/dist/index.mjs

@@ -11,9 +11,9 @@ var Config = class {
   origin;
   defaults;
   logger;
-  constructor(root, filename, logger2) {
+  constructor(root, filename, logger) {
     this.logger = new Logger(
-      logger2?.label ? `${logger2.label}] [config` : "config"
+      logger?.label ? `${logger.label}] [config` : "config"
     );
     this.root = root;
     if (!this.root.endsWith(sep)) this.root += sep;
@@ -50,9 +50,11 @@ var Config = class {
     return this[key] || this.defaults || /* @__PURE__ */ Object.create(null);
   }
 };
-function loadConfig(root, filename, staging, logger2) {
-  return new Config(root, filename, logger2).get(staging);
+function loadConfig(root, filename, staging, logger) {
+  return new Config(root, filename, logger).get(staging);
 }
+
+// src/load_package.ts
 var _runtime = null;
 function resetRuntime() {
   _runtime = null;
@@ -64,23 +66,10 @@ function detectNodeRuntime() {
   if (typeof import.meta !== "undefined") return _runtime = "module";
   throw Error("Unknown runtime");
 }
-var tsxLoaded = null;
-var logger = new Logger("loadPackage");
 async function loadPackage(name, defaultNames = "default") {
   const runtime = detectNodeRuntime();
   let module2;
   if (runtime === "module") {
-    if (tsxLoaded === null) {
-      try {
-        await import('tsx');
-        tsxLoaded = true;
-      } catch (_) {
-        tsxLoaded = false;
-        logger.warn(
-          'Recommend installing the "tsx" package for loading ts/tsx files'
-        );
-      }
-    }
     module2 = await import(name);
     if (typeof defaultNames === "string")
       return defaultNames in module2 ? module2[defaultNames] : module2;
@@ -88,17 +77,6 @@ async function loadPackage(name, defaultNames = "default") {
     return module2;
   }
   if (runtime === "commonjs") {
-    if (tsxLoaded === null) {
-      try {
-        globalThis.require("tsx");
-        tsxLoaded = true;
-      } catch (_) {
-        tsxLoaded = false;
-        logger.warn(
-          'Recommend installing the "tsx" package for loading ts/tsx files'
-        );
-      }
-    }
     module2 = globalThis.require(name);
     if (typeof defaultNames === "string")
       return defaultNames in module2 ? module2[defaultNames] : module2;
@@ -108,4 +86,11 @@ async function loadPackage(name, defaultNames = "default") {
   throw Error("Unknown runtime");
 }
 
-export { detectNodeRuntime, loadConfig, loadPackage, resetRuntime };
+// src/load_func.ts
+async function loadFunc(root, filename, staging) {
+  const func = await loadPackage(filename);
+  func.config = await loadConfig(root, filename, staging);
+  return func.export().handler;
+}
+
+export { detectNodeRuntime, loadConfig, loadFunc, loadPackage, resetRuntime };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "7.0.4",
+  "version": "v8.0.0-beta.0",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.cjs",
@@ -31,16 +31,14 @@
   ],
   "peerDependencies": {
     "js-yaml": "*",
-    "tsx": "*",
-    "@faasjs/deep_merge": ">=7.0.4",
-    "@faasjs/func": ">=7.0.4"
+    "@faasjs/deep_merge": ">=v8.0.0-beta.0",
+    "@faasjs/func": ">=v8.0.0-beta.0"
   },
   "devDependencies": {
     "js-yaml": "*",
-    "tsx": "*",
     "@types/js-yaml": "*",
-    "@faasjs/deep_merge": ">=7.0.4",
-    "@faasjs/func": ">=7.0.4"
+    "@faasjs/deep_merge": ">=v8.0.0-beta.0",
+    "@faasjs/func": ">=v8.0.0-beta.0"
   },
   "engines": {
     "node": ">=24.0.0",