@pactor-app/cli 0.1.0 → 1.0.0

package/dist/cli.js

@@ -52,6 +52,7 @@ import { join as join2 } from "path";
 // src/dsl-io.ts
 import { existsSync, readdirSync, readFileSync, statSync } from "fs";
 import { join } from "path";
+import { isDslSourceRef } from "@pactor-app/core";
 import { validatePageDsl } from "@pactor-app/schema";
 import { parseDocument } from "yaml";
 var DSL_FILE_RE = /\.(page|fragment)\.(yaml|yml)$/;
@@ -201,10 +202,23 @@ function walkDslTree(root, visit, basePath = "/body") {
   visit(root, basePath);
   if (Array.isArray(root.children)) {
     root.children.forEach((child, index) => {
+      if (isDslSourceRef(child)) return;
       walkDslTree(child, visit, `${basePath}/children/${index}`);
     });
   }
 }
+function walkPageTrees(data, visit) {
+  if (data.body !== void 0) {
+    walkDslTree(data.body, visit, "/body");
+    return;
+  }
+  if (Array.isArray(data.children)) {
+    data.children.forEach((child, index) => {
+      if (isDslSourceRef(child)) return;
+      walkDslTree(child, visit, `/children/${index}`);
+    });
+  }
+}
 
 // src/commands/build.ts
 function runBuild(args, io) {
@@ -334,6 +348,7 @@ function runCreate(args, io, templatesDir = defaultTemplatesDir()) {
 
 // src/commands/inspect.ts
 import { existsSync as existsSync4, statSync as statSync4 } from "fs";
+import { isDslSourceRef as isDslSourceRef2 } from "@pactor-app/core";
 function permissionCodes(permission) {
   if (permission === void 0) return [];
   if (typeof permission === "string") return [permission];
@@ -384,8 +399,21 @@ function runInspect(args, io) {
   const componentCounts = /* @__PURE__ */ new Map();
   const actions = [];
   const permissions = [];
-  walkDslTree(data.body, (node, path) => {
-    componentCounts.set(node.type, (componentCounts.get(node.type) ?? 0) + 1);
+  walkPageTrees(data, (node, path) => {
+    const nodeKey = node.type ?? `\u2192${node.component ?? "?"}`;
+    componentCounts.set(nodeKey, (componentCounts.get(nodeKey) ?? 0) + 1);
+    if (isDslSourceRef2(node.children)) {
+      const key = `source(${node.children.source.type})`;
+      componentCounts.set(key, (componentCounts.get(key) ?? 0) + 1);
+    }
+    if (Array.isArray(node.children)) {
+      for (const child of node.children) {
+        if (isDslSourceRef2(child)) {
+          const key = `source(${child.source.type})`;
+          componentCounts.set(key, (componentCounts.get(key) ?? 0) + 1);
+        }
+      }
+    }
     for (const [event, config] of Object.entries(node.events ?? {})) {
       for (const action of actionList(config)) {
         actions.push(`  - ${path} events.${event} \u2192 ${action.action}`);
@@ -395,6 +423,18 @@ function runInspect(args, io) {
       permissions.push(`  - ${path} \u2192 ${code}`);
     }
   });
+  if (!data.body && isDslSourceRef2(data.children)) {
+    const key = `source(${data.children.source.type})`;
+    componentCounts.set(key, (componentCounts.get(key) ?? 0) + 1);
+  }
+  if (!data.body && Array.isArray(data.children)) {
+    for (const child of data.children) {
+      if (isDslSourceRef2(child)) {
+        const key = `source(${child.source.type})`;
+        componentCounts.set(key, (componentCounts.get(key) ?? 0) + 1);
+      }
+    }
+  }
   lines.push(`\u7EC4\u4EF6: ${[...componentCounts.values()].reduce((a, b) => a + b, 0)} \u4E2A`);
   for (const [type, count] of [...componentCounts.entries()].sort()) {
     lines.push(`  - ${type} x${count}`);
@@ -481,8 +521,11 @@ function lintExpressions(data, findings) {
     }
   }
 }
-function lintComponentNaming(body, findings) {
-  walkDslTree(body, (node, path) => {
+function lintComponentNaming(data, findings) {
+  walkPageTrees(data, (node, path) => {
+    if (node.component !== void 0) {
+      return;
+    }
     if (typeof node.type !== "string" || !PASCAL_CASE_RE.test(node.type)) {
       findings.push({
         level: "warning",
@@ -507,7 +550,7 @@ function lintPermissionFormat(data, findings) {
     }
   };
   check(permissionCodes2(data.page?.permission), "/page/permission");
-  walkDslTree(data.body, (node, path) => {
+  walkPageTrees(data, (node, path) => {
     check(permissionCodes2(node.permission), `${path}/permission`);
     for (const [event, config] of Object.entries(node.events ?? {})) {
       for (const action of actionList2(config)) {
@@ -533,10 +576,21 @@ function lintDslData(data, isFragment) {
   }
   lintExpressions(data, findings);
   const typed = data;
-  lintComponentNaming(typed.body, findings);
+  lintComponentNaming(typed, findings);
   lintPermissionFormat(typed, findings);
+  lintBodyChildrenConflict(typed, findings);
   return findings;
 }
+function lintBodyChildrenConflict(data, findings) {
+  if (data.body !== void 0 && data.children !== void 0) {
+    findings.push({
+      level: "warning",
+      rule: "body-children-conflict",
+      path: "/children",
+      message: "body \u4E0E\u6839\u7EA7 children \u540C\u65F6\u58F0\u660E\uFF0Cchildren \u5C06\u88AB\u5FFD\u7565\uFF08body \u4F18\u5148\uFF09"
+    });
+  }
+}
 function runLint(args, io) {
   if (args.positionals.length === 0) {
     io.err("\u7528\u6CD5: pactor lint <paths...>");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pactor-app/cli",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Pactor CLI: local DSL toolchain (validate / inspect / lint / schema / build / create)",
   "keywords": [
     "pactor",
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "yaml": "^2.9.0",
-    "@pactor-app/core": "0.1.0",
-    "@pactor-app/schema": "0.1.0",
-    "@pactor-app/expression": "0.1.0"
+    "@pactor-app/core": "1.0.0",
+    "@pactor-app/expression": "1.0.0",
+    "@pactor-app/schema": "1.0.0"
   },
   "scripts": {
     "build": "tsup",

package/templates/app/README.md

@@ -13,6 +13,6 @@ pnpm dev
 
 ## 说明
 
-- 依赖版本为语义化占位（`^0.1.0` 等），请在 Pactor 发布后按实际版本对齐。
+- 依赖版本为语义化占位（`^1.0.0` 等），请在 Pactor 发布后按实际版本对齐。
 - 如需 `*.page.yaml` 的 TypeScript 类型声明，按 @pactor-app/vite-plugin 文档添加 `src/dsl-modules.d.ts`。
 - 常用命令：`pactor validate src/pages/*.page.yaml`、`pactor lint src`、`pactor build src/pages -o dist/runtime`。

package/templates/app/package.json

@@ -9,10 +9,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@pactor-app/app": "^0.1.0",
-    "@pactor-app/core": "^0.1.0",
-    "@pactor-app/resource": "^0.1.0",
-    "@pactor-app/ui": "^0.1.0",
+    "@pactor-app/app": "^1.0.0",
+    "@pactor-app/core": "^1.0.0",
+    "@pactor-app/resource": "^1.0.0",
+    "@pactor-app/ui": "^1.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
@@ -20,7 +20,7 @@
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-react": "^4.3.4",
-    "@pactor-app/vite-plugin": "^0.1.0",
+    "@pactor-app/vite-plugin": "^1.0.0",
     "typescript": "^5.6.3",
     "vite": "^5.4.11"
   }