npm - @faasjs/load - Versions diffs - 0.0.3-beta.38 → 0.0.3-beta.40 - Mend

@faasjs/load 0.0.3-beta.38 → 0.0.3-beta.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -25,34 +25,8 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
-// ../deep_merge/src/index.ts
-var shouldMerge = function(item) {
-  const type = Object.prototype.toString.call(item);
-  return type === "[object Object]" || type === "[object Array]";
-};
-function deepMerge(...sources) {
-  let acc = /* @__PURE__ */ Object.create(null);
-  for (const source of sources)
-    if (source instanceof Array) {
-      if (!(acc instanceof Array))
-        acc = [];
-      acc = [...new Set(source.concat(...acc))];
-    } else if (shouldMerge(source))
-      for (const [key, value] of Object.entries(source)) {
-        let val;
-        if (shouldMerge(value))
-          val = deepMerge(acc[key], value);
-        else
-          val = value;
-        acc = {
-          ...acc,
-          [key]: val
-        };
-      }
-  return acc;
-}
 // src/load_config.ts
+var import_deep_merge = require("@faasjs/deep_merge");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_js_yaml = require("js-yaml");
@@ -73,11 +47,11 @@ var Config = class {
         configs.push((0, import_js_yaml.load)((0, import_fs.readFileSync)(faas).toString()));
       return root2;
     });
-    this.origin = deepMerge(...configs);
-    this.defaults = deepMerge(this.origin.defaults || {});
+    this.origin = (0, import_deep_merge.deepMerge)(...configs);
+    this.defaults = (0, import_deep_merge.deepMerge)(this.origin.defaults || {});
     for (const key in this.origin) {
       if (key !== "defaults")
-        this[key] = deepMerge(this.origin.defaults, this.origin[key]);
+        this[key] = (0, import_deep_merge.deepMerge)(this.origin.defaults, this.origin[key]);
       const data = this[key];
       if (data.plugins)
         for (const pluginKey in data.plugins) {
@@ -89,7 +63,7 @@ var Config = class {
                 throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
               plugin.provider = data.providers[plugin.provider];
             } else
-              plugin.provider = deepMerge(data.providers[plugin.provider], plugin.provider);
+              plugin.provider = (0, import_deep_merge.deepMerge)(data.providers[plugin.provider], plugin.provider);
         }
     }
   }
@@ -99,86 +73,11 @@ function loadConfig(root, filename) {
 }
 // src/load_ts.ts
-var import_fs3 = require("fs");
-var import_rollup = require("rollup/dist/rollup.js");
-var import_path3 = require("path");
-// ../ts-transform/src/index.ts
-var import_core = require("@swc/core");
-var import_spack = require("@swc/core/spack");
+var import_deep_merge2 = require("@faasjs/deep_merge");
 var import_fs2 = require("fs");
+var import_rollup = require("rollup/dist/rollup.js");
 var import_path2 = require("path");
-var NodeBuiltinModules = [
-  "async_hooks",
-  "child_process",
-  "cluster",
-  "crypto",
-  "dns",
-  "events",
-  "fs",
-  "http",
-  "http2",
-  "https",
-  "inspector",
-  "net",
-  "os",
-  "path",
-  "perf_hooks",
-  "process",
-  "querystring",
-  "readline",
-  "repl",
-  "stream",
-  "string_decoder",
-  "tls",
-  "trace_events",
-  "tty",
-  "dgram",
-  "udp4",
-  "url",
-  "util",
-  "v8",
-  "vm",
-  "wasi",
-  "worker_threads",
-  "zlib"
-];
-async function bundle(options) {
-  var _a;
-  if (!options.root)
-    options.root = process.cwd();
-  if (!options.jscTarget)
-    options.jscTarget = "es2019";
-  const tsconfig = JSON.parse((0, import_fs2.readFileSync)((0, import_path2.join)(options.root, "tsconfig.json")).toString());
-  if (!tsconfig.compilerOptions)
-    tsconfig.compilerOptions = {};
-  tsconfig.compilerOptions.baseUrl = ((_a = tsconfig.compilerOptions.baseUrl) == null ? void 0 : _a.replace(".", options.root)) || options.root;
-  if (tsconfig.compilerOptions.paths) {
-    for (const key of Object.keys(tsconfig.compilerOptions.paths))
-      tsconfig.compilerOptions.paths[key] = tsconfig.compilerOptions.paths[key].map((item) => item.replace(".", tsconfig.compilerOptions.baseUrl));
-  } else
-    tsconfig.compilerOptions.paths = {};
-  return (0, import_core.bundle)((0, import_spack.config)(deepMerge({
-    mode: "production",
-    entry: { index: options.filename },
-    module: { type: "commonjs" },
-    options: {
-      jsc: {
-        parser: {
-          syntax: "typescript",
-          tsx: true
-        },
-        target: options.jscTarget,
-        baseUrl: tsconfig.compilerOptions.baseUrl,
-        paths: tsconfig.compilerOptions.paths,
-        transform: { react: { runtime: "automatic" } }
-      }
-    },
-    externalModules: NodeBuiltinModules.concat(options.externalModules || [])
-  }, options))).then((res) => res.index);
-}
-// src/load_ts.ts
+var import_ts_transform = require("@faasjs/ts-transform");
 var FaasPackages = [
   "@faasjs/cloud_function",
   "@faasjs/deep_merge",
@@ -200,10 +99,10 @@ function resolveModuleBasePath(moduleName) {
   let searchForPathSection;
   if (moduleName.startsWith("@") && moduleNameParts.length > 1) {
     const [org, mod] = moduleNameParts;
-    searchForPathSection = `node_modules${import_path3.sep}${org}${import_path3.sep}${mod}`;
+    searchForPathSection = `node_modules${import_path2.sep}${org}${import_path2.sep}${mod}`;
   } else {
     const [mod] = moduleNameParts;
-    searchForPathSection = `node_modules${import_path3.sep}${mod}`;
+    searchForPathSection = `node_modules${import_path2.sep}${mod}`;
   }
   const lastIndex = moduleMainFilePath.lastIndexOf(searchForPathSection);
   if (lastIndex === -1) {
@@ -218,7 +117,7 @@ function findModule(list, key, options = { excludes: [] }) {
   if (key.startsWith("@types/") || options.excludes.includes(key))
     return;
   try {
-    list[key] = (0, import_path3.dirname)(require.resolve((0, import_path3.join)(key, "package.json")));
+    list[key] = (0, import_path2.dirname)(require.resolve((0, import_path2.join)(key, "package.json")));
   } catch (error) {
     console.warn(error);
     try {
@@ -229,7 +128,7 @@ function findModule(list, key, options = { excludes: [] }) {
   }
   if (!list[key])
     return;
-  const pkg = JSON.parse((0, import_fs3.readFileSync)((0, import_path3.join)(list[key], "package.json")).toString());
+  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) => {
@@ -246,7 +145,7 @@ function swc(externalModules) {
   return {
     name: "swc",
     async transform(code, filename) {
-      return bundle({
+      return (0, import_ts_transform.bundle)({
         filename,
         externalModules
       });
@@ -259,7 +158,7 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   const external = PackageJSON.dependencies ? Object.keys(PackageJSON.dependencies) : [];
   if (options.modules && options.modules.excludes == null)
     options.modules.excludes = [];
-  const input = deepMerge({
+  const input = (0, import_deep_merge2.deepMerge)({
     input: filename,
     external,
     plugins: [swc(external.concat(FaasPackages))],
@@ -269,9 +168,9 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   const dependencies = /* @__PURE__ */ Object.create(null);
   for (const m of ((_a = bundle2.cache) == null ? void 0 : _a.modules) || [])
     for (const d of m.dependencies)
-      if (!d.startsWith("/") && !dependencies[d] && !NodeBuiltinModules.includes(d))
+      if (!d.startsWith("/") && !dependencies[d] && !import_ts_transform.NodeBuiltinModules.includes(d))
         dependencies[d] = "*";
-  const output = deepMerge({
+  const output = (0, import_deep_merge2.deepMerge)({
     file: filename + ".tmp.js",
     format: "cjs",
     exports: "auto"
@@ -281,7 +180,7 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   result.dependencies = dependencies;
   result.module = require(output.file);
   if (options.tmp)
-    (0, import_fs3.unlinkSync)(output.file);
+    (0, import_fs2.unlinkSync)(output.file);
   if (options.modules) {
     const modules = /* @__PURE__ */ Object.create(null);
     Object.keys(dependencies).map((d) => findModule(modules, d, options.modules));

package/dist/index.mjs CHANGED Viewed

@@ -6,34 +6,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
-// ../deep_merge/src/index.ts
-var shouldMerge = function(item) {
-  const type = Object.prototype.toString.call(item);
-  return type === "[object Object]" || type === "[object Array]";
-};
-function deepMerge(...sources) {
-  let acc = /* @__PURE__ */ Object.create(null);
-  for (const source of sources)
-    if (source instanceof Array) {
-      if (!(acc instanceof Array))
-        acc = [];
-      acc = [...new Set(source.concat(...acc))];
-    } else if (shouldMerge(source))
-      for (const [key, value] of Object.entries(source)) {
-        let val;
-        if (shouldMerge(value))
-          val = deepMerge(acc[key], value);
-        else
-          val = value;
-        acc = {
-          ...acc,
-          [key]: val
-        };
-      }
-  return acc;
-}
 // src/load_config.ts
+import { deepMerge } from "@faasjs/deep_merge";
 import { existsSync, readFileSync } from "fs";
 import {
   sep,
@@ -84,93 +58,15 @@ function loadConfig(root, filename) {
 }
 // src/load_ts.ts
-import { readFileSync as readFileSync3, unlinkSync } from "fs";
+import { deepMerge as deepMerge2 } from "@faasjs/deep_merge";
+import { readFileSync as readFileSync2, unlinkSync } from "fs";
 import { rollup } from "rollup/dist/rollup.js";
 import {
-  join as join3,
+  join as join2,
   sep as sep2,
   dirname as dirname2
 } from "path";
-// ../ts-transform/src/index.ts
-import {
-  transformSync,
-  bundle as swcBundle
-} from "@swc/core";
-import { config } from "@swc/core/spack";
-import { readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
-var NodeBuiltinModules = [
-  "async_hooks",
-  "child_process",
-  "cluster",
-  "crypto",
-  "dns",
-  "events",
-  "fs",
-  "http",
-  "http2",
-  "https",
-  "inspector",
-  "net",
-  "os",
-  "path",
-  "perf_hooks",
-  "process",
-  "querystring",
-  "readline",
-  "repl",
-  "stream",
-  "string_decoder",
-  "tls",
-  "trace_events",
-  "tty",
-  "dgram",
-  "udp4",
-  "url",
-  "util",
-  "v8",
-  "vm",
-  "wasi",
-  "worker_threads",
-  "zlib"
-];
-async function bundle(options) {
-  var _a;
-  if (!options.root)
-    options.root = process.cwd();
-  if (!options.jscTarget)
-    options.jscTarget = "es2019";
-  const tsconfig = JSON.parse(readFileSync2(join2(options.root, "tsconfig.json")).toString());
-  if (!tsconfig.compilerOptions)
-    tsconfig.compilerOptions = {};
-  tsconfig.compilerOptions.baseUrl = ((_a = tsconfig.compilerOptions.baseUrl) == null ? void 0 : _a.replace(".", options.root)) || options.root;
-  if (tsconfig.compilerOptions.paths) {
-    for (const key of Object.keys(tsconfig.compilerOptions.paths))
-      tsconfig.compilerOptions.paths[key] = tsconfig.compilerOptions.paths[key].map((item) => item.replace(".", tsconfig.compilerOptions.baseUrl));
-  } else
-    tsconfig.compilerOptions.paths = {};
-  return swcBundle(config(deepMerge({
-    mode: "production",
-    entry: { index: options.filename },
-    module: { type: "commonjs" },
-    options: {
-      jsc: {
-        parser: {
-          syntax: "typescript",
-          tsx: true
-        },
-        target: options.jscTarget,
-        baseUrl: tsconfig.compilerOptions.baseUrl,
-        paths: tsconfig.compilerOptions.paths,
-        transform: { react: { runtime: "automatic" } }
-      }
-    },
-    externalModules: NodeBuiltinModules.concat(options.externalModules || [])
-  }, options))).then((res) => res.index);
-}
-// src/load_ts.ts
+import { bundle, NodeBuiltinModules } from "@faasjs/ts-transform";
 var FaasPackages = [
   "@faasjs/cloud_function",
   "@faasjs/deep_merge",
@@ -210,7 +106,7 @@ function findModule(list, key, options = { excludes: [] }) {
   if (key.startsWith("@types/") || options.excludes.includes(key))
     return;
   try {
-    list[key] = dirname2(__require.resolve(join3(key, "package.json")));
+    list[key] = dirname2(__require.resolve(join2(key, "package.json")));
   } catch (error) {
     console.warn(error);
     try {
@@ -221,7 +117,7 @@ function findModule(list, key, options = { excludes: [] }) {
   }
   if (!list[key])
     return;
-  const pkg = JSON.parse(readFileSync3(join3(list[key], "package.json")).toString());
+  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) => {
@@ -251,7 +147,7 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   const external = PackageJSON.dependencies ? Object.keys(PackageJSON.dependencies) : [];
   if (options.modules && options.modules.excludes == null)
     options.modules.excludes = [];
-  const input = deepMerge({
+  const input = deepMerge2({
     input: filename,
     external,
     plugins: [swc(external.concat(FaasPackages))],
@@ -263,7 +159,7 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
     for (const d of m.dependencies)
       if (!d.startsWith("/") && !dependencies[d] && !NodeBuiltinModules.includes(d))
         dependencies[d] = "*";
-  const output = deepMerge({
+  const output = deepMerge2({
     file: filename + ".tmp.js",
     format: "cjs",
     exports: "auto"

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "0.0.3-beta.38",
+  "version": "0.0.3-beta.40",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,9 +22,9 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "^0.0.3-beta.38",
-    "@faasjs/func": "^0.0.3-beta.38",
-    "@faasjs/ts-transform": "^0.0.3-beta.38",
+    "@faasjs/deep_merge": "^0.0.3-beta.40",
+    "@faasjs/func": "^0.0.3-beta.40",
+    "@faasjs/ts-transform": "^0.0.3-beta.40",
     "js-yaml": "*",
     "rollup": "*"
   },