@modern-js/plugin-koa 2.19.1 → 2.20.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/plugin-koa
 
+## 2.20.0
+
+### Patch Changes
+
+- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config.
+  chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置
+- Updated dependencies [3c4e0a5]
+- Updated dependencies [6b9d90a]
+- Updated dependencies [5f055ab]
+  - @modern-js/utils@2.20.0
+  - @modern-js/bff-runtime@2.20.0
+  - @modern-js/bff-core@2.20.0
+  - @modern-js/types@2.20.0
+
 ## 2.19.1
 
 ### Patch Changes

package/dist/cjs/cli/index.js

@@ -6,48 +6,9 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
-const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
 const _utils = require("@modern-js/utils");
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 const _default = () => ({
   name: "@modern-js/plugin-koa",
   setup: (api) => {

package/dist/cjs/index.js

@@ -6,24 +6,8 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
-const _plugin = /* @__PURE__ */ _interop_require_default(require("./plugin"));
-_export_star(require("./context"), exports);
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _plugin = /* @__PURE__ */ _interop_require_default._(require("./plugin"));
+_export_star._(require("./context"), exports);
 const _default = _plugin.default;

package/dist/cjs/plugin.js

@@ -6,58 +6,15 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
-const _path = /* @__PURE__ */ _interop_require_wildcard(require("path"));
-const _koa = /* @__PURE__ */ _interop_require_default(require("koa"));
-const _koarouter = /* @__PURE__ */ _interop_require_default(require("koa-router"));
-const _koabody = /* @__PURE__ */ _interop_require_default(require("koa-body"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
+const _koa = /* @__PURE__ */ _interop_require_default._(require("koa"));
+const _koarouter = /* @__PURE__ */ _interop_require_default._(require("koa-router"));
+const _koabody = /* @__PURE__ */ _interop_require_default._(require("koa-body"));
 const _utils = require("@modern-js/utils");
 const _context = require("./context");
-const _registerRoutes = /* @__PURE__ */ _interop_require_default(require("./registerRoutes"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
+const _registerRoutes = /* @__PURE__ */ _interop_require_default._(require("./registerRoutes"));
 const findAppModule = async (apiDir) => {
   const exts = [
     ".ts",

package/dist/cjs/runtime.js

@@ -13,19 +13,7 @@ _export(exports, {
   hook: () => hook,
   useContext: () => _context.useContext
 });
+const _export_star = require("@swc/helpers/_/_export_star");
 const _context = require("./context");
-_export_star(require("@modern-js/bff-core"), exports);
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
+_export_star._(require("@modern-js/bff-core"), exports);
 const hook = (attacher) => attacher;

package/dist/cjs/utils.js

@@ -13,14 +13,10 @@ _export(exports, {
   createRouteHandler: () => createRouteHandler,
   isNormalMethod: () => isNormalMethod
 });
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _bffcore = require("@modern-js/bff-core");
 const _bffruntime = require("@modern-js/bff-runtime");
-const _typeis = /* @__PURE__ */ _interop_require_default(require("type-is"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _typeis = /* @__PURE__ */ _interop_require_default._(require("type-is"));
 const handleResponseMeta = (ctx, handler) => {
   const responseMeta = Reflect.getMetadata(_bffcore.HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {

package/dist/esm/plugin.js

@@ -1,141 +1,6 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-function _async_to_generator(fn) {
-  return function() {
-    var self = this, args = arguments;
-    return new Promise(function(resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(void 0);
-    });
-  };
-}
-function _instanceof(left, right) {
-  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-    return !!right[Symbol.hasInstance](left);
-  } else {
-    return left instanceof right;
-  }
-}
-var __generator = function(thisArg, body) {
-  var f, y, t, g, _ = {
-    label: 0,
-    sent: function() {
-      if (t[0] & 1)
-        throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  };
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-    return this;
-  }), g;
-  function verb(n) {
-    return function(v) {
-      return step([
-        n,
-        v
-      ]);
-    };
-  }
-  function step(op) {
-    if (f)
-      throw new TypeError("Generator is already executing.");
-    while (_)
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-          return t;
-        if (y = 0, t)
-          op = [
-            op[0] & 2,
-            t.value
-          ];
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [
-              0
-            ];
-            continue;
-          case 7:
-            op = _.ops.pop();
-            _.trys.pop();
-            continue;
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-              _.ops.push(op);
-              break;
-            }
-            if (t[2])
-              _.ops.pop();
-            _.trys.pop();
-            continue;
-        }
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [
-          6,
-          e
-        ];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    if (op[0] & 5)
-      throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import Koa from "koa";
 import Router from "koa-router";
@@ -146,7 +11,7 @@ import registerRoutes from "./registerRoutes";
 var findAppModule = function() {
   var _ref = _async_to_generator(function(apiDir) {
     var exts, paths, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, filename, err;
-    return __generator(this, function(_state) {
+    return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           exts = [
@@ -252,7 +117,7 @@ export default function() {
           var pwd = param.pwd, config = param.config, render = param.render;
           return _async_to_generator(function() {
             var _userConfig_bff, app, router, apiDir, appContext, apiHandlerInfos, mode, userConfig, middleware, middleware1;
-            return __generator(this, function(_state) {
+            return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   router = new Router();
@@ -310,7 +175,7 @@ export default function() {
                     app.use(function() {
                       var _ref = _async_to_generator(function(ctx, next) {
                         var html;
-                        return __generator(this, function(_state2) {
+                        return _ts_generator(this, function(_state2) {
                           switch (_state2.label) {
                             case 0:
                               return [
@@ -359,7 +224,7 @@ export default function() {
           var app = new Koa();
           app.use(function() {
             var _ref = _async_to_generator(function(ctx, next2) {
-              return __generator(this, function(_state) {
+              return _ts_generator(this, function(_state) {
                 switch (_state.label) {
                   case 0:
                     return [

package/dist/esm/utils.js

@@ -1,213 +1,8 @@
-function _array_like_to_array(arr, len) {
-  if (len == null || len > arr.length)
-    len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++)
-    arr2[i] = arr[i];
-  return arr2;
-}
-function _array_with_holes(arr) {
-  if (Array.isArray(arr))
-    return arr;
-}
-function _array_without_holes(arr) {
-  if (Array.isArray(arr))
-    return _array_like_to_array(arr);
-}
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-function _async_to_generator(fn) {
-  return function() {
-    var self = this, args = arguments;
-    return new Promise(function(resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(void 0);
-    });
-  };
-}
-function _instanceof(left, right) {
-  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-    return !!right[Symbol.hasInstance](left);
-  } else {
-    return left instanceof right;
-  }
-}
-function _iterable_to_array(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null)
-    return Array.from(iter);
-}
-function _iterable_to_array_limit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i == null)
-    return;
-  var _arr = [];
-  var _n = true;
-  var _d = false;
-  var _s, _e;
-  try {
-    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
-      _arr.push(_s.value);
-      if (i && _arr.length === i)
-        break;
-    }
-  } catch (err) {
-    _d = true;
-    _e = err;
-  } finally {
-    try {
-      if (!_n && _i["return"] != null)
-        _i["return"]();
-    } finally {
-      if (_d)
-        throw _e;
-    }
-  }
-  return _arr;
-}
-function _non_iterable_rest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _non_iterable_spread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _sliced_to_array(arr, i) {
-  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _to_consumable_array(arr) {
-  return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (!o)
-    return;
-  if (typeof o === "string")
-    return _array_like_to_array(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor)
-    n = o.constructor.name;
-  if (n === "Map" || n === "Set")
-    return Array.from(n);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
-    return _array_like_to_array(o, minLen);
-}
-var __generator = function(thisArg, body) {
-  var f, y, t, g, _ = {
-    label: 0,
-    sent: function() {
-      if (t[0] & 1)
-        throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  };
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-    return this;
-  }), g;
-  function verb(n) {
-    return function(v) {
-      return step([
-        n,
-        v
-      ]);
-    };
-  }
-  function step(op) {
-    if (f)
-      throw new TypeError("Generator is already executing.");
-    while (_)
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-          return t;
-        if (y = 0, t)
-          op = [
-            op[0] & 2,
-            t.value
-          ];
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [
-              0
-            ];
-            continue;
-          case 7:
-            op = _.ops.pop();
-            _.trys.pop();
-            continue;
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-              _.ops.push(op);
-              break;
-            }
-            if (t[2])
-              _.ops.pop();
-            _.trys.pop();
-            continue;
-        }
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [
-          6,
-          e
-        ];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    if (op[0] & 5)
-      throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { httpMethods, isWithMetaHandler, ResponseMetaType, HttpMetadata } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
 import typeIs from "type-is";
@@ -279,7 +74,7 @@ export var createRouteHandler = function(handler) {
   var apiHandler = function() {
     var _ref = _async_to_generator(function(ctx) {
       var input, body, error, result, args, body1;
-      return __generator(this, function(_state) {
+      return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             return [
@@ -398,7 +193,7 @@ export var isNormalMethod = function(httpMethod) {
 var getInputFromRequest = function() {
   var _ref = _async_to_generator(function(ctx) {
     var draft;
-    return __generator(this, function(_state) {
+    return _ts_generator(this, function(_state) {
       draft = {
         params: ctx.params,
         query: ctx.query,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.19.1",
+  "version": "2.20.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -63,14 +63,14 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.19.1",
-    "@modern-js/bff-runtime": "2.19.1",
-    "@modern-js/utils": "2.19.1",
-    "@modern-js/types": "2.19.1"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/bff-core": "2.20.0",
+    "@modern-js/bff-runtime": "2.20.0",
+    "@modern-js/utils": "2.20.0",
+    "@modern-js/types": "2.20.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -84,11 +84,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.19.1",
-    "@modern-js/server-core": "2.19.1",
-    "@modern-js/app-tools": "2.19.1",
-    "@scripts/build": "2.19.1",
-    "@scripts/jest-config": "2.19.1"
+    "@modern-js/core": "2.20.0",
+    "@modern-js/server-core": "2.20.0",
+    "@modern-js/app-tools": "2.20.0",
+    "@scripts/build": "2.20.0",
+    "@scripts/jest-config": "2.20.0"
   },
   "peerDependencies": {
     "koa": "^2.13.3"