bk-schema-checker 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bk-schema-checker",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "对照前端 services、Django REST 序列化器，以及可选的 bk-local-mock 响应，做接口协议检查。不启动 Django。",
   "type": "module",
   "author": "austinqli",

package/py/load_backend.py

@@ -938,7 +938,9 @@ class BackendLoader:
         if func is not None and is_paginated(func):
             return True
         if spec["action"] == "list" and not self.pagination_disabled(ref):
-            return self.class_assign_mro(ref, "pagination_class") is not None
+            # DRF ListModelMixin.list 在 pagination_class 非空时包成 {count, results}。
+            # 类上没写则用 REST_FRAMEWORK["DEFAULT_PAGINATION_CLASS"]，和查询参数同源。
+            return self.pagination_source(ref, spec) is not None
         return False
 
     def pagination_disabled_here(self, ref):

package/src/mock-shim.js

@@ -23,7 +23,7 @@ export const listResult = (results) => ({
 });
 
 export const getRequestParam = (config, key) => {
-  const value = config?.params?.[key];
+  const value = config?.params?.[key] ?? new URL(config?.url || "", "https://mock.local").searchParams.get(key);
   return value === undefined || value === null ? "" : String(value);
 };
 
@@ -38,3 +38,5 @@ export const paginatedListResult = (results, config) => {
 };
 
 export const getMethod = (config) => (config?.method || "get").toLowerCase();
+
+export const getPathname = (url) => new URL(url || "", "https://mock.local").pathname;

package/src/runtime.js

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
@@ -9,12 +10,12 @@ const METHOD_ORDER = ["get", "post", "put", "patch", "delete"];
  * 同一个运行时里模块缓存是共享的，后执行的接口能看到前面写入的内存数据。
  */
 export async function createMockRuntime({ root, mockDir, servicesDir }) {
-  const createJiti = await loadCreateJiti(root);
+  const createJiti = await loadCreateJiti(root, mockDir);
   const jiti = createJiti(import.meta.url, {
     alias: {
       "@mock": mockDir,
       "@services": servicesDir,
-      "bk-local-mock": findMockPackage(root),
+      "bk-local-mock": findMockPackage(root, mockDir),
     },
     interopDefault: true,
     fsCache: false,
@@ -200,7 +201,7 @@ function snapshot(value) {
   }
 }
 
-async function loadCreateJiti(root) {
+async function loadCreateJiti(root, mockDir) {
   try {
     const mod = await import("jiti");
     if (typeof mod.createJiti === "function") {
@@ -209,6 +210,17 @@ async function loadCreateJiti(root) {
   } catch {
     // 检查器自己没装 jiti 时，用前端工程里的那一份。
   }
+  for (const start of moduleResolveStarts(root, mockDir)) {
+    try {
+      const resolved = createRequire(start).resolve("jiti");
+      const mod = await import(pathToFileURL(resolved).href);
+      if (typeof mod.createJiti === "function") {
+        return mod.createJiti;
+      }
+    } catch {
+      // 这一层没有安装，继续往上看。
+    }
+  }
   for (const candidate of jitiCandidates(root)) {
     if (fs.existsSync(candidate)) {
       const mod = await import(pathToFileURL(candidate).href);
@@ -220,13 +232,25 @@ async function loadCreateJiti(root) {
   throw new Error("执行 mock 需要 jiti。请在 frontend 安装依赖，或在 bk-schema-checker 中安装 jiti。");
 }
 
-function findMockPackage(root) {
-  for (const candidate of [
-    path.join(root, "frontend/node_modules/bk-local-mock/index.js"),
-    path.resolve(fileDir(), "../../frontend/node_modules/bk-local-mock/index.js"),
-  ]) {
-    if (fs.existsSync(candidate)) {
-      return candidate;
+function moduleResolveStarts(root, mockDir) {
+  return [
+    mockDir && path.join(mockDir, "handler.js"),
+    root && path.join(root, "package.json"),
+    root && path.join(root, "frontend/package.json"),
+    path.join(fileDir(), "runtime.js"),
+  ].filter(Boolean);
+}
+
+/**
+ * 按 Node 解析规则找已安装的 bk-local-mock。
+ * 配置文件常放在 frontend/，旧逻辑只认 root/frontend/node_modules，会漏掉当前工程自己的依赖。
+ */
+export function findMockPackage(root, mockDir) {
+  for (const start of moduleResolveStarts(root, mockDir)) {
+    try {
+      return createRequire(start).resolve("bk-local-mock");
+    } catch {
+      // 这一层没有安装，继续往上看。
     }
   }
   return path.join(fileDir(), "mock-shim.js");

package/src/ts.js

@@ -6,6 +6,7 @@ import { maskComments, readIdentifier, skipSpace, sliceBalanced, splitTop } from
 const HELPERS = new Set([
   "clone",
   "getMethod",
+  "getPathname",
   "getRequestParam",
   "listResult",
   "paginatedListResult",
@@ -1532,7 +1533,7 @@ function evalCall(node, env) {
     }
     return new Partial("string");
   }
-  if (callee?.helper === "getMethod") {
+  if (callee?.helper === "getMethod" || callee?.helper === "getPathname") {
     return new Partial("string");
   }
   if (callee && callee.kind === "function") {