@faasjs/load 0.0.3-beta.9 → 0.0.3-beta.91

package/dist/index.d.mts

@@ -0,0 +1,63 @@
+import { Config as Config$1, Func } from '@faasjs/func';
+
+/**
+ * 配置类
+ */
+declare class Config {
+    [key: string]: any;
+    readonly root: string;
+    readonly filename: string;
+    readonly origin: {
+        [key: string]: Config$1;
+        defaults: Config$1;
+    };
+    readonly defaults: Config$1;
+    /**
+     * 创建配置类，并自动读取配置内容
+     *
+     * @param root {string} 根目录
+     * @param filename {filename} 目标文件，用于读取目录层级
+     */
+    constructor(root: string, filename: string);
+}
+/**
+ * 加载配置
+ * @param root {string} 根目录
+ * @param filename {filename} 目标文件，用于读取目录层级
+ */
+declare function loadConfig(root: string, filename: string): Config;
+
+/**
+ * 加载 ts 文件
+ *
+ * @param filename {string} 完整源文件路径
+ * @param options {object} 配置项
+ * @param options.input {object} 读取配置
+ * @param options.output {object} 写入配置
+ * @param options.tmp {boolean} 是否为临时文件，true 则生成的文件会被删除，默认为 false
+ * @param options.modules {object} 生成 modules 的配置
+ * @param options.modules.excludes {string[]} modules 中需排除的模块
+ */
+declare function loadTs(filename: string, options?: {
+    input?: {
+        [key: string]: any;
+    };
+    output?: {
+        [key: string]: any;
+    };
+    tmp?: boolean;
+    modules?: {
+        excludes?: string[];
+        additions?: string[];
+    };
+}): Promise<{
+    module?: Func;
+    dependencies: {
+        [key: string]: string;
+    };
+    modules?: {
+        [key: string]: string;
+    };
+}>;
+
+export { loadConfig, loadTs };

package/dist/index.js

@@ -1,57 +1,47 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+'use strict';
 
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  loadConfig: () => loadConfig,
-  loadTs: () => loadTs
-});
-module.exports = __toCommonJS(src_exports);
+var deep_merge = require('@faasjs/deep_merge');
+var fs = require('fs');
+var path = require('path');
+var jsYaml = require('js-yaml');
+var rollup_js = require('rollup/dist/rollup.js');
+var tsTransform = require('@faasjs/ts-transform');
 
-// 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");
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 var Config = class {
+  /**
+   * 创建配置类，并自动读取配置内容
+   *
+   * @param root {string} 根目录
+   * @param filename {filename} 目标文件，用于读取目录层级
+   */
   constructor(root, filename) {
     this.root = root;
-    if (!this.root.endsWith(import_path.sep))
-      this.root += import_path.sep;
+    if (!this.root.endsWith(path.sep))
+      this.root += path.sep;
     this.filename = filename;
     const configs = [];
-    const paths = [this.root, "."].concat((0, import_path.dirname)(filename.replace(root, "")).split(import_path.sep));
-    paths.reduce(function(base, path) {
-      const root2 = (0, import_path.join)(base, path);
+    const paths = [this.root, "."].concat(path.dirname(filename.replace(root, "")).split(path.sep));
+    paths.reduce(function(base, path$1) {
+      const root2 = path.join(base, path$1);
       if (root2 === base)
         return base;
-      const faas = (0, import_path.join)(root2, "faas.yaml");
-      if ((0, import_fs.existsSync)(faas))
-        configs.push((0, import_js_yaml.load)((0, import_fs.readFileSync)(faas).toString()));
+      const faas = path.join(root2, "faas.yaml");
+      if (fs.existsSync(faas))
+        configs.push(jsYaml.load(fs.readFileSync(faas).toString()));
       return root2;
     });
-    this.origin = (0, import_deep_merge.deepMerge)(...configs);
-    this.defaults = (0, import_deep_merge.deepMerge)(this.origin.defaults || {});
+    this.origin = deep_merge.deepMerge(...configs);
+    this.defaults = deep_merge.deepMerge(this.origin.defaults || {});
     for (const key in this.origin) {
       if (key !== "defaults")
-        this[key] = (0, import_deep_merge.deepMerge)(this.origin.defaults, this.origin[key]);
+        this[key] = deep_merge.deepMerge(this.origin.defaults, this.origin[key]);
       const data = this[key];
       if (data.plugins)
         for (const pluginKey in data.plugins) {
@@ -63,7 +53,7 @@ var Config = class {
                 throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
               plugin.provider = data.providers[plugin.provider];
             } else
-              plugin.provider = (0, import_deep_merge.deepMerge)(data.providers[plugin.provider], plugin.provider);
+              plugin.provider = deep_merge.deepMerge(data.providers[plugin.provider], plugin.provider);
         }
     }
   }
@@ -71,13 +61,6 @@ var Config = class {
 function loadConfig(root, filename) {
   return new Config(root, filename);
 }
-
-// src/load_ts.ts
-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 import_ts_transform = require("@faasjs/ts-transform");
 var FaasPackages = [
   "@faasjs/cloud_function",
   "@faasjs/deep_merge",
@@ -94,15 +77,15 @@ var FaasPackages = [
   "@faasjs/ts-transform"
 ];
 function resolveModuleBasePath(moduleName) {
-  const moduleMainFilePath = require.resolve(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}`;
+    searchForPathSection = `node_modules${path.sep}${org}${path.sep}${mod}`;
   } else {
     const [mod] = moduleNameParts;
-    searchForPathSection = `node_modules${import_path2.sep}${mod}`;
+    searchForPathSection = `node_modules${path.sep}${mod}`;
   }
   const lastIndex = moduleMainFilePath.lastIndexOf(searchForPathSection);
   if (lastIndex === -1) {
@@ -117,7 +100,7 @@ function findModule(list, key, options = { excludes: [] }) {
   if (key.startsWith("@types/") || options.excludes.includes(key))
     return;
   try {
-    list[key] = (0, import_path2.dirname)(require.resolve((0, import_path2.join)(key, "package.json")));
+    list[key] = path.dirname(__require.resolve(path.join(key, "package.json")));
   } catch (error) {
     console.warn(error);
     try {
@@ -128,7 +111,7 @@ function findModule(list, key, options = { excludes: [] }) {
   }
   if (!list[key])
     return;
-  const pkg = JSON.parse((0, import_fs2.readFileSync)((0, import_path2.join)(list[key], "package.json")).toString());
+  const pkg = JSON.parse(fs.readFileSync(path.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) => {
@@ -145,7 +128,7 @@ function swc(externalModules) {
   return {
     name: "swc",
     async transform(code, filename) {
-      return (0, import_ts_transform.bundle)({
+      return tsTransform.bundle({
         filename,
         externalModules
       });
@@ -154,23 +137,23 @@ function swc(externalModules) {
 }
 async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   var _a;
-  const PackageJSON = require(`${process.cwd()}/package.json`);
+  const PackageJSON = __require(`${process.cwd()}/package.json`);
   const external = PackageJSON.dependencies ? Object.keys(PackageJSON.dependencies) : [];
   if (options.modules && options.modules.excludes == null)
     options.modules.excludes = [];
-  const input = (0, import_deep_merge2.deepMerge)({
+  const input = deep_merge.deepMerge({
     input: filename,
     external,
     plugins: [swc(external.concat(FaasPackages))],
     onwarn: () => null
   }, options.input || {});
-  const bundle2 = await (0, import_rollup.rollup)(input);
+  const bundle2 = await rollup_js.rollup(input);
   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] && !import_ts_transform.NodeBuiltinModules.includes(d))
+      if (!d.startsWith("/") && !dependencies[d] && !tsTransform.NodeBuiltinModules.includes(d))
         dependencies[d] = "*";
-  const output = (0, import_deep_merge2.deepMerge)({
+  const output = deep_merge.deepMerge({
     file: filename + ".tmp.js",
     format: "cjs",
     exports: "auto"
@@ -178,9 +161,9 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   await bundle2.write(output);
   const result = /* @__PURE__ */ Object.create(null);
   result.dependencies = dependencies;
-  result.module = require(output.file);
+  result.module = __require(output.file);
   if (options.tmp)
-    (0, import_fs2.unlinkSync)(output.file);
+    fs.unlinkSync(output.file);
   if (options.modules) {
     const modules = /* @__PURE__ */ Object.create(null);
     Object.keys(dependencies).map((d) => findModule(modules, d, options.modules));
@@ -190,8 +173,6 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   }
   return result;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  loadConfig,
-  loadTs
-});
+
+exports.loadConfig = loadConfig;
+exports.loadTs = loadTs;

package/dist/index.mjs

@@ -1,21 +1,24 @@
+import { deepMerge } from '@faasjs/deep_merge';
+import { unlinkSync, existsSync, readFileSync } from 'fs';
+import { sep, dirname, join } from 'path';
+import { load } from 'js-yaml';
+import { rollup } from 'rollup/dist/rollup.js';
+import { NodeBuiltinModules, bundle } from '@faasjs/ts-transform';
+
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
   if (typeof require !== "undefined")
     return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
-
-// src/load_config.ts
-import { deepMerge } from "@faasjs/deep_merge";
-import { existsSync, readFileSync } from "fs";
-import {
-  sep,
-  dirname,
-  join
-} from "path";
-import { load } from "js-yaml";
 var Config = class {
+  /**
+   * 创建配置类，并自动读取配置内容
+   *
+   * @param root {string} 根目录
+   * @param filename {filename} 目标文件，用于读取目录层级
+   */
   constructor(root, filename) {
     this.root = root;
     if (!this.root.endsWith(sep))
@@ -56,17 +59,6 @@ var Config = class {
 function loadConfig(root, filename) {
   return new Config(root, filename);
 }
-
-// src/load_ts.ts
-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 join2,
-  sep as sep2,
-  dirname as dirname2
-} from "path";
-import { bundle, NodeBuiltinModules } from "@faasjs/ts-transform";
 var FaasPackages = [
   "@faasjs/cloud_function",
   "@faasjs/deep_merge",
@@ -88,10 +80,10 @@ function resolveModuleBasePath(moduleName) {
   let searchForPathSection;
   if (moduleName.startsWith("@") && moduleNameParts.length > 1) {
     const [org, mod] = moduleNameParts;
-    searchForPathSection = `node_modules${sep2}${org}${sep2}${mod}`;
+    searchForPathSection = `node_modules${sep}${org}${sep}${mod}`;
   } else {
     const [mod] = moduleNameParts;
-    searchForPathSection = `node_modules${sep2}${mod}`;
+    searchForPathSection = `node_modules${sep}${mod}`;
   }
   const lastIndex = moduleMainFilePath.lastIndexOf(searchForPathSection);
   if (lastIndex === -1) {
@@ -106,7 +98,7 @@ function findModule(list, key, options = { excludes: [] }) {
   if (key.startsWith("@types/") || options.excludes.includes(key))
     return;
   try {
-    list[key] = dirname2(__require.resolve(join2(key, "package.json")));
+    list[key] = dirname(__require.resolve(join(key, "package.json")));
   } catch (error) {
     console.warn(error);
     try {
@@ -117,7 +109,7 @@ function findModule(list, key, options = { excludes: [] }) {
   }
   if (!list[key])
     return;
-  const pkg = JSON.parse(readFileSync2(join2(list[key], "package.json")).toString());
+  const pkg = JSON.parse(readFileSync(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) => {
@@ -147,7 +139,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 = deepMerge2({
+  const input = deepMerge({
     input: filename,
     external,
     plugins: [swc(external.concat(FaasPackages))],
@@ -159,7 +151,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 = deepMerge2({
+  const output = deepMerge({
     file: filename + ".tmp.js",
     format: "cjs",
     exports: "auto"
@@ -179,7 +171,5 @@ async function loadTs(filename, options = /* @__PURE__ */ Object.create(null)) {
   }
   return result;
 }
-export {
-  loadConfig,
-  loadTs
-};
+
+export { loadConfig, loadTs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "0.0.3-beta.9",
+  "version": "0.0.3-beta.91",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,16 +15,15 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup-node src/index.ts --format esm,cjs",
-    "build:types": "tsup-node src/index.ts --dts-only"
+    "build": "tsup-node src/index.ts --config ../../tsup.config.json"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "^0.0.3-beta.9",
-    "@faasjs/func": "^0.0.3-beta.9",
-    "@faasjs/ts-transform": "^0.0.3-beta.9",
+    "@faasjs/deep_merge": "^0.0.3-beta.91",
+    "@faasjs/func": "^0.0.3-beta.91",
+    "@faasjs/ts-transform": "^0.0.3-beta.91",
     "js-yaml": "*",
     "rollup": "*"
   },