create-antd-skin 1.0.9 → 1.1.1

package/bin/layout.js

@@ -36,76 +36,77 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLayoutFiles = getLayoutFiles;
 exports.updateLayouts = updateLayouts;
-exports.patchLayoutFile = patchLayoutFile;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
 const parser_1 = require("@babel/parser");
 const traverse_1 = __importDefault(require("@babel/traverse"));
 const generator_1 = __importDefault(require("@babel/generator"));
 const t = __importStar(require("@babel/types"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const ANTD_LAYOUT_PKG = "@adminui-dev/antd-layout";
 async function patchLayoutFile(filePath) {
     const code = await fs_extra_1.default.readFile(filePath, "utf8");
-    if (!code.includes("AntdLayout")) {
+    if (!code.includes("<AntdLayout"))
         return;
-    }
     const ast = (0, parser_1.parse)(code, {
         sourceType: "module",
-        plugins: [
-            "typescript",
-            "jsx"
-        ]
+        plugins: ["typescript", "jsx"],
     });
-    let hasImport = false;
+    let layoutNames = new Set();
+    let hasLayoutImport = false;
+    let hasWardenSkinImport = false;
     let changed = false;
+    // 1. 收集 import
     (0, traverse_1.default)(ast, {
         ImportDeclaration(path) {
-            if (path.node.source.value ===
-                "../components/warden-skin") {
-                hasImport = true;
+            const source = path.node.source.value;
+            // layout package
+            if (source === "@adminui-dev/antd-layout") {
+                hasLayoutImport = true;
+                for (const spec of path.node.specifiers) {
+                    if (t.isImportSpecifier(spec)) {
+                        layoutNames.add(spec.local.name);
+                    }
+                }
+            }
+            // ❗关键：wardenSkin 是否已存在
+            if (source === "../components/warden-skin") {
+                hasWardenSkinImport = true;
             }
         },
+    });
+    if (layoutNames.size === 0)
+        return;
+    // 2. 修改 JSX
+    (0, traverse_1.default)(ast, {
         JSXOpeningElement(path) {
-            if (!t.isJSXIdentifier(path.node.name) ||
-                path.node.name.name !== "AntdLayout") {
+            const name = path.node.name;
+            if (!t.isJSXIdentifier(name))
                 return;
-            }
-            const hasThemeSkins = path.node.attributes.some(attr => {
-                return (t.isJSXAttribute(attr) &&
-                    t.isJSXIdentifier(attr.name) &&
-                    attr.name.name === "themeSkins");
-            });
-            if (hasThemeSkins) {
+            if (!layoutNames.has(name.name))
+                return;
+            if (hasThemeSkinsProp(path.node))
                 return;
-            }
             path.node.attributes.push(t.jsxAttribute(t.jsxIdentifier("themeSkins"), t.jsxExpressionContainer(t.identifier("wardenSkin"))));
             changed = true;
         }
     });
-    if (!changed) {
+    if (!changed)
         return;
-    }
-    if (!hasImport) {
+    // 3. 注入 import（只在 layouts 文件里）
+    if (!hasWardenSkinImport) {
         ast.program.body.unshift(t.importDeclaration([
             t.importDefaultSpecifier(t.identifier("wardenSkin"))
-        ], t.stringLiteral("../components/warden-skin")));
+        ], t.stringLiteral("@/components/warden-skin")));
     }
-    const output = (0, generator_1.default)(ast, {
-        retainLines: true
-    }, code);
+    const output = (0, generator_1.default)(ast, {}, code);
     await fs_extra_1.default.writeFile(filePath, output.code);
-    console.log(`✔ updated ${path_1.default.relative(process.cwd(), filePath)}`);
+    console.log("✔ updated:", path_1.default.relative(process.cwd(), filePath));
 }
-async function updateLayouts(projectRoot) {
-    const layoutsDir = path_1.default.join(projectRoot, "src/layouts");
-    if (!(await fs_extra_1.default.pathExists(layoutsDir))) {
-        return;
-    }
-    const files = await getLayoutFiles(layoutsDir);
-    for (const file of files) {
-        await patchLayoutFile(file);
-    }
+function hasThemeSkinsProp(node) {
+    return node.attributes.some(attr => t.isJSXAttribute(attr) &&
+        t.isJSXIdentifier(attr.name) &&
+        attr.name.name === "themeSkins");
 }
 async function getLayoutFiles(dir) {
     const result = [];
@@ -123,3 +124,12 @@ async function getLayoutFiles(dir) {
     }
     return result;
 }
+async function updateLayouts(projectRoot) {
+    const layoutsDir = path_1.default.join(projectRoot, "src/layouts");
+    if (!(await fs_extra_1.default.pathExists(layoutsDir)))
+        return;
+    const files = await getLayoutFiles(layoutsDir);
+    for (const file of files) {
+        await patchLayoutFile(file);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-antd-skin",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "description": "this is skin-cli for @adminui-dev/antd-layout",
   "main": "index.js",
   "author": "zhouwenqi",