@faasjs/load 0.0.2-beta.314 → 0.0.2-beta.320

package/dist/index.js

@@ -88,6 +88,8 @@ var import_path2 = require("path");
 var import_plugin_node_resolve = __toESM(require("@rollup/plugin-node-resolve"));
 var import_core = require("@swc/core");
 var FAAS_PACKAGES = [
+  "@faasjs/ant-design",
+  "@faasjs/aws",
   "@faasjs/browser",
   "@faasjs/cli",
   "@faasjs/cloud_function",
@@ -146,26 +148,50 @@ var NODE_PACKAGES = [
   "worker_threads",
   "zlib"
 ];
-function findModule(list, key, basePath, options = { excludes: [] }) {
+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;
   if (key.startsWith("@types/") || options.excludes.includes(key))
     return;
-  const paths = [(0, import_path2.join)(process.cwd(), "node_modules", key), (0, import_path2.join)(basePath, "node_modules", key)];
-  let path;
-  for (const p of paths)
-    if ((0, import_fs2.existsSync)(p)) {
-      path = p;
-      break;
+  try {
+    list[key] = (0, import_path2.dirname)(require.resolve((0, import_path2.join)(key, "package.json")));
+  } catch (error) {
+    console.warn(error);
+    try {
+      list[key] = resolveModuleBasePath(key);
+    } catch (error2) {
+      console.warn(error2);
     }
-  if (!path)
-    return;
-  list[key] = path;
-  if ((0, import_fs2.existsSync)((0, import_path2.join)(path, "package.json"))) {
-    const pkg = JSON.parse((0, import_fs2.readFileSync)((0, import_path2.join)(path, "package.json")).toString());
-    const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
-    deps.map((d) => findModule(list, d, path, options));
   }
+  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);
+        deps.splice(index, 1);
+      }
+    });
+  }
+  deps.map((d) => findModule(list, d, options));
 }
 function swc(options) {
   return {
@@ -222,9 +248,9 @@ async function loadTs(filename, options = Object.create(null)) {
     (0, import_fs2.unlinkSync)(output.file);
   if (options.modules) {
     const modules = Object.create(null);
-    Object.keys(dependencies).map((d) => findModule(modules, d, process.cwd(), options.modules));
+    Object.keys(dependencies).map((d) => findModule(modules, d, options.modules));
     if (options.modules.additions)
-      options.modules.additions.map((d) => findModule(modules, d, process.cwd(), options.modules));
+      options.modules.additions.map((d) => findModule(modules, d, options.modules));
     result.modules = modules;
   }
   return result;

package/dist/index.mjs

@@ -59,16 +59,18 @@ function loadConfig(root, filename) {
 
 // src/load_ts.ts
 import { deepMerge as deepMerge2 } from "@faasjs/deep_merge";
-import {
-  existsSync as existsSync2,
-  readFileSync as readFileSync2,
-  unlinkSync
-} from "fs";
+import { readFileSync as readFileSync2, unlinkSync } from "fs";
 import { rollup } from "rollup";
-import { 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 = [
+  "@faasjs/ant-design",
+  "@faasjs/aws",
   "@faasjs/browser",
   "@faasjs/cli",
   "@faasjs/cloud_function",
@@ -127,26 +129,50 @@ var NODE_PACKAGES = [
   "worker_threads",
   "zlib"
 ];
-function findModule(list, key, basePath, options = { excludes: [] }) {
+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;
   if (key.startsWith("@types/") || options.excludes.includes(key))
     return;
-  const paths = [join2(process.cwd(), "node_modules", key), join2(basePath, "node_modules", key)];
-  let path;
-  for (const p of paths)
-    if (existsSync2(p)) {
-      path = p;
-      break;
+  try {
+    list[key] = dirname2(__require.resolve(join2(key, "package.json")));
+  } catch (error) {
+    console.warn(error);
+    try {
+      list[key] = resolveModuleBasePath(key);
+    } catch (error2) {
+      console.warn(error2);
     }
-  if (!path)
-    return;
-  list[key] = path;
-  if (existsSync2(join2(path, "package.json"))) {
-    const pkg = JSON.parse(readFileSync2(join2(path, "package.json")).toString());
-    const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
-    deps.map((d) => findModule(list, d, path, options));
   }
+  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);
+        deps.splice(index, 1);
+      }
+    });
+  }
+  deps.map((d) => findModule(list, d, options));
 }
 function swc(options) {
   return {
@@ -203,9 +229,9 @@ async function loadTs(filename, options = Object.create(null)) {
     unlinkSync(output.file);
   if (options.modules) {
     const modules = Object.create(null);
-    Object.keys(dependencies).map((d) => findModule(modules, d, process.cwd(), options.modules));
+    Object.keys(dependencies).map((d) => findModule(modules, d, options.modules));
     if (options.modules.additions)
-      options.modules.additions.map((d) => findModule(modules, d, process.cwd(), options.modules));
+      options.modules.additions.map((d) => findModule(modules, d, options.modules));
     result.modules = modules;
   }
   return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "0.0.2-beta.314",
+  "version": "0.0.2-beta.320",
   "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.320",
+    "@faasjs/func": "^0.0.2-beta.320",
     "@rollup/plugin-node-resolve": "*",
     "@swc/core": "*",
     "js-yaml": "*",
@@ -37,5 +37,5 @@
   "engines": {
     "npm": ">=8.0.0"
   },
-  "gitHead": "60be0e54eb369177b416d109a3f9a5a12dedbf24"
+  "gitHead": "4a9f699171ad7e20d922e68b74418d1ec5b7d016"
 }