@faasjs/load 0.0.2-beta.318 → 0.0.2-beta.322

package/dist/index.js

@@ -148,6 +148,24 @@ var NODE_PACKAGES = [
   "worker_threads",
   "zlib"
 ];
+function resolveModuleBasePath(moduleName) {
+  const moduleMainFilePath = require.resolve(moduleName);
+  const moduleNameParts = moduleName.split("/");
+  let searchForPathSection;
+  if (moduleName.startsWith("@") && moduleNameParts.length > 1) {
+    const [org, mod] = moduleNameParts;
+    searchForPathSection = `node_modules${import_path2.sep}${org}${import_path2.sep}${mod}`;
+  } else {
+    const [mod] = moduleNameParts;
+    searchForPathSection = `node_modules${import_path2.sep}${mod}`;
+  }
+  const lastIndex = moduleMainFilePath.lastIndexOf(searchForPathSection);
+  if (lastIndex === -1) {
+    console.log(searchForPathSection, moduleMainFilePath);
+    throw new Error(`Couldn't resolve the base path of "${moduleName}". Searched inside the resolved main file path "${moduleMainFilePath}" using "${searchForPathSection}"`);
+  }
+  return moduleMainFilePath.slice(0, lastIndex + searchForPathSection.length);
+}
 function findModule(list, key, options = { excludes: [] }) {
   if (list[key])
     return;
@@ -155,12 +173,26 @@ function findModule(list, key, options = { excludes: [] }) {
     return;
   try {
     list[key] = (0, import_path2.dirname)(require.resolve((0, import_path2.join)(key, "package.json")));
-    const pkg = JSON.parse((0, import_fs2.readFileSync)((0, import_path2.join)(list[key], "package.json")).toString());
-    const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
-    deps.map((d) => findModule(list, d, options));
   } catch (error) {
-    console.warn(`[FaasJS] Cannot find module path: ${key}`, error);
+    console.warn(error);
+    try {
+      list[key] = resolveModuleBasePath(key);
+    } catch (error2) {
+      console.warn(error2);
+    }
+  }
+  const pkg = JSON.parse((0, import_fs2.readFileSync)((0, import_path2.join)(list[key], "package.json")).toString());
+  const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
+  if (pkg.peerDependenciesMeta) {
+    Object.keys(pkg.peerDependenciesMeta).forEach((key2) => {
+      if (pkg.peerDependenciesMeta[key2].optional) {
+        const index = deps.indexOf(key2);
+        if (index >= 0)
+          deps.splice(index, 1);
+      }
+    });
   }
+  deps.map((d) => findModule(list, d, options));
 }
 function swc(options) {
   return {

package/dist/index.mjs

@@ -61,7 +61,11 @@ function loadConfig(root, filename) {
 import { deepMerge as deepMerge2 } from "@faasjs/deep_merge";
 import { readFileSync as readFileSync2, unlinkSync } from "fs";
 import { rollup } from "rollup";
-import { dirname as dirname2, join as join2 } from "path";
+import {
+  join as join2,
+  sep as sep2,
+  dirname as dirname2
+} from "path";
 import resolve from "@rollup/plugin-node-resolve";
 import { transform } from "@swc/core";
 var FAAS_PACKAGES = [
@@ -125,6 +129,24 @@ var NODE_PACKAGES = [
   "worker_threads",
   "zlib"
 ];
+function resolveModuleBasePath(moduleName) {
+  const moduleMainFilePath = __require.resolve(moduleName);
+  const moduleNameParts = moduleName.split("/");
+  let searchForPathSection;
+  if (moduleName.startsWith("@") && moduleNameParts.length > 1) {
+    const [org, mod] = moduleNameParts;
+    searchForPathSection = `node_modules${sep2}${org}${sep2}${mod}`;
+  } else {
+    const [mod] = moduleNameParts;
+    searchForPathSection = `node_modules${sep2}${mod}`;
+  }
+  const lastIndex = moduleMainFilePath.lastIndexOf(searchForPathSection);
+  if (lastIndex === -1) {
+    console.log(searchForPathSection, moduleMainFilePath);
+    throw new Error(`Couldn't resolve the base path of "${moduleName}". Searched inside the resolved main file path "${moduleMainFilePath}" using "${searchForPathSection}"`);
+  }
+  return moduleMainFilePath.slice(0, lastIndex + searchForPathSection.length);
+}
 function findModule(list, key, options = { excludes: [] }) {
   if (list[key])
     return;
@@ -132,12 +154,26 @@ function findModule(list, key, options = { excludes: [] }) {
     return;
   try {
     list[key] = dirname2(__require.resolve(join2(key, "package.json")));
-    const pkg = JSON.parse(readFileSync2(join2(list[key], "package.json")).toString());
-    const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
-    deps.map((d) => findModule(list, d, options));
   } catch (error) {
-    console.warn(`[FaasJS] Cannot find module path: ${key}`, error);
+    console.warn(error);
+    try {
+      list[key] = resolveModuleBasePath(key);
+    } catch (error2) {
+      console.warn(error2);
+    }
+  }
+  const pkg = JSON.parse(readFileSync2(join2(list[key], "package.json")).toString());
+  const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
+  if (pkg.peerDependenciesMeta) {
+    Object.keys(pkg.peerDependenciesMeta).forEach((key2) => {
+      if (pkg.peerDependenciesMeta[key2].optional) {
+        const index = deps.indexOf(key2);
+        if (index >= 0)
+          deps.splice(index, 1);
+      }
+    });
   }
+  deps.map((d) => findModule(list, d, options));
 }
 function swc(options) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "0.0.2-beta.318",
+  "version": "0.0.2-beta.322",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/deep_merge": "^0.0.2-beta.244",
-    "@faasjs/func": "^0.0.2-beta.302",
+    "@faasjs/deep_merge": "^0.0.2-beta.322",
+    "@faasjs/func": "^0.0.2-beta.322",
     "@rollup/plugin-node-resolve": "*",
     "@swc/core": "*",
     "js-yaml": "*",