@next-core/brick-kit 2.194.0 → 2.194.2

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.
package/dist/index.esm.js CHANGED
@@ -6106,11 +6106,11 @@ function getApiArgsFromApiProfile(_ref, originalArgs, method) {
6106
6106
  }, ...args];
6107
6107
  }
6108
6108
  function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version) {
6109
- var prefix = version ? serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
6109
+ var prefix = version ? serviceName === "logic.api.gateway" ? "" : serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
6110
6110
  var restArgs = originalArgs.slice();
6111
6111
  var transformedUri = uri.replace(/:([^/]+)/g, () => restArgs.shift());
6112
6112
  return {
6113
- url: prefix + transformedUri,
6113
+ url: prefix ? prefix + transformedUri : transformedUri.replace(/^\//, ""),
6114
6114
  args: restArgs
6115
6115
  };
6116
6116
  }
@@ -9121,9 +9121,12 @@ class Kernel {
9121
9121
  var bricksMap = new Map();
9122
9122
 
9123
9123
  // bootstrapData 数据和 pubDeps 中可能同时存在同一个包名,需要过滤去重, 以 pubDeps 中的包为准
9124
- [...brickPackages, ...pubDeps].forEach(pkg => {
9124
+ [...pubDeps, ...brickPackages].forEach(pkg => {
9125
9125
  var pkgName = pkg.filePath.split("/")[1];
9126
- bricksMap.set(pkgName, pkg);
9126
+ // 始终将 pubDeps 放在前面
9127
+ if (!bricksMap.has(pkgName)) {
9128
+ bricksMap.set(pkgName, pkg);
9129
+ }
9127
9130
  });
9128
9131
  return Array.from(bricksMap.values());
9129
9132
  }