@faasjs/load 0.0.2-beta.3 → 0.0.2-beta.302

package/README.md

@@ -2,6 +2,6 @@
 
 资源加载类库
 
-[![License: MIT](https://img.shields.io/npm/l/@faasjs/load.svg)](https://github.com/faasjs/faasjs/blob/master/packages/faasjs/load/LICENSE)
+[![License: MIT](https://img.shields.io/npm/l/@faasjs/load.svg)](https://github.com/faasjs/faasjs/blob/main/packages/faasjs/load/LICENSE)
 [![NPM Stable Version](https://img.shields.io/npm/v/@faasjs/load/stable.svg)](https://www.npmjs.com/package/@faasjs/load)
 [![NPM Beta Version](https://img.shields.io/npm/v/@faasjs/load/beta.svg)](https://www.npmjs.com/package/@faasjs/load)

package/lib/index.es.js

@@ -1,9 +1,10 @@
-import deepMerge from '@faasjs/deep_merge';
+import { deepMerge } from '@faasjs/deep_merge';
 import { existsSync, readFileSync, unlinkSync } from 'fs';
 import { sep, dirname, join } from 'path';
-import { safeLoad } from 'js-yaml';
-import { rollup } from 'rollup';
-import typescript from 'rollup-plugin-typescript2';
+import { load } from 'js-yaml';
+import * as rollup from 'rollup';
+import typescript from '@rollup/plugin-typescript';
+import { NodeVM } from 'vm2';
 
 /**
  * 配置类
@@ -17,51 +18,39 @@ class Config {
      */
     constructor(root, filename) {
         this.root = root;
-        if (!this.root.endsWith(sep)) {
+        if (!this.root.endsWith(sep))
             this.root += sep;
-        }
         this.filename = filename;
         const configs = [];
         const paths = [this.root, '.'].concat(dirname(filename.replace(root, '')).split(sep));
         paths.reduce(function (base, path) {
             const root = join(base, path);
+            if (root === base)
+                return base;
             const faas = join(root, 'faas.yaml');
-            if (existsSync(faas)) {
-                configs.push(safeLoad(readFileSync(faas).toString()));
-            }
+            if (existsSync(faas))
+                configs.push(load(readFileSync(faas).toString()));
             return root;
         });
         this.origin = deepMerge(...configs);
-        if (!this.origin.defaults) {
-            throw Error('[faas.yaml] need defaults env.');
-        }
-        this.defaults = deepMerge(this.origin.defaults);
+        this.defaults = deepMerge(this.origin.defaults || {});
         for (const key in this.origin) {
-            if (key !== 'defaults') {
+            if (key !== 'defaults')
                 this[key] = deepMerge(this.origin.defaults, this.origin[key]);
-            }
             const data = this[key];
-            if (!data.providers) {
-                throw Error(`[faas.yaml] missing key: ${key}/providers`);
-            }
-            if (!data.plugins) {
-                throw Error(`[faas.yaml] missing key: ${key}/plugins`);
-            }
-            for (const pluginKey in data.plugins) {
-                const plugin = data.plugins[pluginKey];
-                plugin.name = pluginKey;
-                if (plugin.provider) {
-                    if (typeof plugin.provider === 'string') {
-                        if (!data.providers[plugin.provider]) {
-                            throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
+            if (data.plugins)
+                for (const pluginKey in data.plugins) {
+                    const plugin = data.plugins[pluginKey];
+                    plugin.name = pluginKey;
+                    if (plugin.provider)
+                        if (typeof plugin.provider === 'string') {
+                            if (!data.providers[plugin.provider])
+                                throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
+                            plugin.provider = data.providers[plugin.provider];
                         }
-                        plugin.provider = data.providers[plugin.provider];
-                    }
-                    else {
-                        plugin.provider = deepMerge(data.providers[plugin.provider], plugin.provider);
-                    }
+                        else
+                            plugin.provider = deepMerge(data.providers[plugin.provider], plugin.provider);
                 }
-            }
         }
     }
 }
@@ -85,18 +74,75 @@ const FAAS_PACKAGES = [
     '@faasjs/eslint-config-vue',
     'faasjs',
     '@faasjs/func',
+    '@faasjs/graphql-server',
     '@faasjs/http',
+    '@faasjs/knex',
     '@faasjs/load',
     '@faasjs/logger',
-    '@faasjs/nuxt',
+    '@faasjs/react',
     '@faasjs/redis',
     '@faasjs/request',
     '@faasjs/server',
-    '@faasjs/sql',
     '@faasjs/tencentcloud',
     '@faasjs/test',
     '@faasjs/vue-plugin'
 ];
+const NODE_PACKAGES = [
+    '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'
+];
+function findModule(list, key, basePath, options = { excludes: [] }) {
+    if (list[key])
+        return;
+    if (key.startsWith('@types/') || options.excludes.includes(key))
+        return;
+    const paths = [join(process.cwd(), 'node_modules', key), join(basePath, 'node_modules', key)];
+    let path;
+    for (const p of paths)
+        if (existsSync(p)) {
+            path = p;
+            break;
+        }
+    if (!path)
+        return;
+    list[key] = path;
+    if (existsSync(join(path, 'package.json'))) {
+        const pkg = JSON.parse(readFileSync(join(path, 'package.json')).toString());
+        const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
+        deps.map(d => findModule(list, d, path, options));
+    }
+}
 /**
  * 加载 ts 文件
  *
@@ -105,50 +151,62 @@ const FAAS_PACKAGES = [
  * @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 中需排除的模块
  */
 async function loadTs(filename, options = Object.create(null)) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+    var _a;
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const PackageJSON = require(`${process.cwd()}/package.json`);
+    const external = PackageJSON.dependencies ?
+        FAAS_PACKAGES.concat(Object.keys(PackageJSON.dependencies)) : FAAS_PACKAGES;
+    if ((options.modules) && (options.modules.excludes == null))
+        options.modules.excludes = [];
     const input = deepMerge({
         input: filename,
-        external: PackageJSON['dependencies'] ? FAAS_PACKAGES.concat(Object.keys(PackageJSON.dependencies)) : FAAS_PACKAGES,
-        plugins: [
-            typescript({
-                tsconfigOverride: {
-                    compilerOptions: {
-                        declaration: false
-                    }
-                }
-            })
-        ]
-    }, options.input || {});
-    const bundle = await rollup(input);
+        external,
+        plugins: [typescript({ declaration: false })],
+        onwarn: () => null
+    }, (options.input) || {});
+    const bundle = await rollup.rollup(input);
     const dependencies = Object.create(null);
-    for (const m of bundle.cache.modules || []) {
-        for (const d of m.dependencies) {
-            if (!d.startsWith('/') && !dependencies[d]) {
+    for (const m of ((_a = bundle.cache) === null || _a === void 0 ? void 0 : _a.modules) || [])
+        for (const d of m.dependencies)
+            if (!d.startsWith('/') &&
+                !dependencies[d] &&
+                !NODE_PACKAGES.includes(d))
                 dependencies[d] = '*';
-            }
-        }
-    }
-    // 特殊处理，避免引入 tslib
-    if (dependencies['\u0000tslib.js']) {
-        delete dependencies['\u0000tslib.js'];
-    }
     const output = deepMerge({
         file: filename + '.tmp.js',
-        format: 'cjs'
-    }, options.output || {});
+        format: 'cjs',
+        exports: 'auto'
+    }, (options.output) || {});
     await bundle.write(output);
-    // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
-    const module = require(output.file);
-    if (options.tmp) {
+    const result = Object.create(null);
+    result.dependencies = dependencies;
+    if (options.vm) {
+        const vm = new NodeVM({
+            require: {
+                external: true,
+                context: 'sandbox',
+                builtin: ['*']
+            }
+        });
+        result.module = vm.require(output.file);
+    }
+    else
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        result.module = require(output.file);
+    if (options.tmp)
         unlinkSync(output.file);
+    if (options.modules) {
+        const modules = Object.create(null);
+        Object.keys(dependencies).map(d => findModule(modules, d, process.cwd(), options.modules));
+        if (options.modules.additions)
+            options.modules.additions.map(d => findModule(modules, d, process.cwd(), options.modules));
+        result.modules = modules;
     }
-    return {
-        module,
-        dependencies
-    };
+    return result;
 }
 
 export { loadConfig, loadTs };

package/lib/index.js

@@ -2,14 +2,36 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var deepMerge = _interopDefault(require('@faasjs/deep_merge'));
+var deep_merge = require('@faasjs/deep_merge');
 var fs = require('fs');
 var path = require('path');
 var jsYaml = require('js-yaml');
 var rollup = require('rollup');
-var typescript = _interopDefault(require('rollup-plugin-typescript2'));
+var typescript = require('@rollup/plugin-typescript');
+var vm2 = require('vm2');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var rollup__namespace = /*#__PURE__*/_interopNamespace(rollup);
+var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 
 /**
  * 配置类
@@ -23,51 +45,39 @@ class Config {
      */
     constructor(root, filename) {
         this.root = root;
-        if (!this.root.endsWith(path.sep)) {
+        if (!this.root.endsWith(path.sep))
             this.root += path.sep;
-        }
         this.filename = filename;
         const configs = [];
         const paths = [this.root, '.'].concat(path.dirname(filename.replace(root, '')).split(path.sep));
         paths.reduce(function (base, path$1) {
             const root = path.join(base, path$1);
+            if (root === base)
+                return base;
             const faas = path.join(root, 'faas.yaml');
-            if (fs.existsSync(faas)) {
-                configs.push(jsYaml.safeLoad(fs.readFileSync(faas).toString()));
-            }
+            if (fs.existsSync(faas))
+                configs.push(jsYaml.load(fs.readFileSync(faas).toString()));
             return root;
         });
-        this.origin = deepMerge(...configs);
-        if (!this.origin.defaults) {
-            throw Error('[faas.yaml] need defaults env.');
-        }
-        this.defaults = 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] = deepMerge(this.origin.defaults, this.origin[key]);
-            }
+            if (key !== 'defaults')
+                this[key] = deep_merge.deepMerge(this.origin.defaults, this.origin[key]);
             const data = this[key];
-            if (!data.providers) {
-                throw Error(`[faas.yaml] missing key: ${key}/providers`);
-            }
-            if (!data.plugins) {
-                throw Error(`[faas.yaml] missing key: ${key}/plugins`);
-            }
-            for (const pluginKey in data.plugins) {
-                const plugin = data.plugins[pluginKey];
-                plugin.name = pluginKey;
-                if (plugin.provider) {
-                    if (typeof plugin.provider === 'string') {
-                        if (!data.providers[plugin.provider]) {
-                            throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
+            if (data.plugins)
+                for (const pluginKey in data.plugins) {
+                    const plugin = data.plugins[pluginKey];
+                    plugin.name = pluginKey;
+                    if (plugin.provider)
+                        if (typeof plugin.provider === 'string') {
+                            if (!data.providers[plugin.provider])
+                                throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
+                            plugin.provider = data.providers[plugin.provider];
                         }
-                        plugin.provider = data.providers[plugin.provider];
-                    }
-                    else {
-                        plugin.provider = deepMerge(data.providers[plugin.provider], plugin.provider);
-                    }
+                        else
+                            plugin.provider = deep_merge.deepMerge(data.providers[plugin.provider], plugin.provider);
                 }
-            }
         }
     }
 }
@@ -91,18 +101,75 @@ const FAAS_PACKAGES = [
     '@faasjs/eslint-config-vue',
     'faasjs',
     '@faasjs/func',
+    '@faasjs/graphql-server',
     '@faasjs/http',
+    '@faasjs/knex',
     '@faasjs/load',
     '@faasjs/logger',
-    '@faasjs/nuxt',
+    '@faasjs/react',
     '@faasjs/redis',
     '@faasjs/request',
     '@faasjs/server',
-    '@faasjs/sql',
     '@faasjs/tencentcloud',
     '@faasjs/test',
     '@faasjs/vue-plugin'
 ];
+const NODE_PACKAGES = [
+    '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'
+];
+function findModule(list, key, basePath, options = { excludes: [] }) {
+    if (list[key])
+        return;
+    if (key.startsWith('@types/') || options.excludes.includes(key))
+        return;
+    const paths = [path.join(process.cwd(), 'node_modules', key), path.join(basePath, 'node_modules', key)];
+    let path$1;
+    for (const p of paths)
+        if (fs.existsSync(p)) {
+            path$1 = p;
+            break;
+        }
+    if (!path$1)
+        return;
+    list[key] = path$1;
+    if (fs.existsSync(path.join(path$1, 'package.json'))) {
+        const pkg = JSON.parse(fs.readFileSync(path.join(path$1, 'package.json')).toString());
+        const deps = Object.keys(pkg.dependencies || {}).concat(Object.keys(pkg.peerDependencies || {}));
+        deps.map(d => findModule(list, d, path$1, options));
+    }
+}
 /**
  * 加载 ts 文件
  *
@@ -111,50 +178,62 @@ const FAAS_PACKAGES = [
  * @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 中需排除的模块
  */
 async function loadTs(filename, options = Object.create(null)) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+    var _a;
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const PackageJSON = require(`${process.cwd()}/package.json`);
-    const input = deepMerge({
+    const external = PackageJSON.dependencies ?
+        FAAS_PACKAGES.concat(Object.keys(PackageJSON.dependencies)) : FAAS_PACKAGES;
+    if ((options.modules) && (options.modules.excludes == null))
+        options.modules.excludes = [];
+    const input = deep_merge.deepMerge({
         input: filename,
-        external: PackageJSON['dependencies'] ? FAAS_PACKAGES.concat(Object.keys(PackageJSON.dependencies)) : FAAS_PACKAGES,
-        plugins: [
-            typescript({
-                tsconfigOverride: {
-                    compilerOptions: {
-                        declaration: false
-                    }
-                }
-            })
-        ]
-    }, options.input || {});
-    const bundle = await rollup.rollup(input);
+        external,
+        plugins: [typescript__default["default"]({ declaration: false })],
+        onwarn: () => null
+    }, (options.input) || {});
+    const bundle = await rollup__namespace.rollup(input);
     const dependencies = Object.create(null);
-    for (const m of bundle.cache.modules || []) {
-        for (const d of m.dependencies) {
-            if (!d.startsWith('/') && !dependencies[d]) {
+    for (const m of ((_a = bundle.cache) === null || _a === void 0 ? void 0 : _a.modules) || [])
+        for (const d of m.dependencies)
+            if (!d.startsWith('/') &&
+                !dependencies[d] &&
+                !NODE_PACKAGES.includes(d))
                 dependencies[d] = '*';
-            }
-        }
-    }
-    // 特殊处理，避免引入 tslib
-    if (dependencies['\u0000tslib.js']) {
-        delete dependencies['\u0000tslib.js'];
-    }
-    const output = deepMerge({
+    const output = deep_merge.deepMerge({
         file: filename + '.tmp.js',
-        format: 'cjs'
-    }, options.output || {});
+        format: 'cjs',
+        exports: 'auto'
+    }, (options.output) || {});
     await bundle.write(output);
-    // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-require-imports
-    const module = require(output.file);
-    if (options.tmp) {
+    const result = Object.create(null);
+    result.dependencies = dependencies;
+    if (options.vm) {
+        const vm = new vm2.NodeVM({
+            require: {
+                external: true,
+                context: 'sandbox',
+                builtin: ['*']
+            }
+        });
+        result.module = vm.require(output.file);
+    }
+    else
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        result.module = require(output.file);
+    if (options.tmp)
         fs.unlinkSync(output.file);
+    if (options.modules) {
+        const modules = Object.create(null);
+        Object.keys(dependencies).map(d => findModule(modules, d, process.cwd(), options.modules));
+        if (options.modules.additions)
+            options.modules.additions.map(d => findModule(modules, d, process.cwd(), options.modules));
+        result.modules = modules;
     }
-    return {
-        module,
-        dependencies
-    };
+    return result;
 }
 
 exports.loadConfig = loadConfig;

package/lib/load_ts.d.ts

@@ -7,6 +7,8 @@ import { Func } from '@faasjs/func';
  * @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 中需排除的模块
  */
 export default function loadTs(filename: string, options?: {
     input?: {
@@ -16,9 +18,17 @@ export default function loadTs(filename: string, options?: {
         [key: string]: any;
     };
     tmp?: boolean;
+    modules?: {
+        excludes?: string[];
+        additions?: string[];
+    };
+    vm?: boolean;
 }): Promise<{
-    module: Func;
+    module?: Func;
     dependencies: {
         [key: string]: string;
     };
+    modules?: {
+        [key: string]: string;
+    };
 }>;

package/package.json

@@ -1,31 +1,44 @@
 {
   "name": "@faasjs/load",
-  "version": "0.0.2-beta.3",
+  "version": "0.0.2-beta.302",
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "lib/index.es.js",
+  "homepage": "https://faasjs.com/doc/load.html",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/faasjs/faasjs.git",
+    "directory": "packages/load"
+  },
+  "bugs": {
+    "url": "https://github.com/faasjs/faasjs/issues"
+  },
+  "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
     "lint": "eslint --ext .ts src",
-    "prepack": "rm -rf ./lib && rollup -c && mv lib/*/src/* lib/",
-    "ci": "yarn lint && jest --silent"
+    "prepack": "rm -rf ./lib && rollup -c && mv lib/*/src/* lib/"
   },
   "files": [
     "lib"
   ],
-  "dependencies": {
-    "@faasjs/deep_merge": "^0.0.2-beta.1",
+  "peerDependencies": {
+    "@faasjs/deep_merge": "^0.0.2-beta.244",
+    "@rollup/plugin-typescript": "*",
     "js-yaml": "*",
     "rollup": "*",
-    "rollup-plugin-typescript2": "*",
-    "typescript": "*"
+    "typescript": "*",
+    "vm2": "*"
   },
   "devDependencies": {
-    "@faasjs/func": "^0.0.2-beta.3",
+    "@faasjs/func": "^0.0.2-beta.302",
     "@types/debug": "*",
     "@types/jest": "*",
     "@types/js-yaml": "*",
     "@types/node": "*"
   },
-  "gitHead": "b8a0f4fa85f5de73e017cebfcfe23068cc2aba38"
+  "engines": {
+    "npm": ">=8.0.0"
+  },
+  "gitHead": "b53fb35a91369afd0185fb555d98e5c9d90b54bd"
 }