create-packer 1.13.1 → 1.13.3

package/bin/clis/createTemp.d.ts

@@ -1,5 +1,5 @@
-export interface tempInfoType {
-    name: string;
-    src: string;
-}
-export declare function createTemp(dirname: string): Promise<void>;
+export interface tempInfoType {
+    name: string;
+    src: string;
+}
+export declare function createTemp(dirname: string): Promise<void>;

package/bin/clis/createTemp.js

@@ -1,58 +1,58 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTemp = void 0;
-const inquirer = require("inquirer");
-const fsExtra = require("fs-extra");
-const path = require("path");
-const fs = require("fs");
-const chalk = require("chalk");
-const ora = require("ora");
-const child_process_1 = require("child_process");
-const utils_1 = require("../utils");
-const cwd = process.cwd();
-const command = utils_1.onGenCommand();
-const excludes = ['node_modules', 'yarn-error.log', 'dist'];
-const tempRoot = path.join(__dirname, '../../template');
-const tempInfo = utils_1.onGetDir(tempRoot).map(name => {
-    return {
-        name,
-        src: path.join(tempRoot, name)
-    };
-});
-function copyTempFile(tempPath, output) {
-    fsExtra.readdirSync(tempPath).map(name => {
-        if (!excludes.includes(name)) {
-            fsExtra.copySync(path.join(tempPath, name), path.join(output, name));
-        }
-    });
-}
-function createTempEnd(output) {
-    child_process_1.spawnSync(command, ['install'], {
-        cwd: output,
-        stdio: 'inherit'
-    });
-}
-async function createTemp(dirname) {
-    const isCurrent = dirname === '.';
-    const { temp } = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'temp',
-            message: 'Select temp.',
-            choices: tempInfo.map(o => o.name)
-        }
-    ]);
-    const creating = ora(chalk.yellow('Creating...\n')).start();
-    const output = path.join(cwd, isCurrent ? '' : dirname);
-    if (!isCurrent && fs.existsSync(output)) {
-        return console.log(chalk.red(`${dirname} already exists!`));
-    }
-    if (!isCurrent) {
-        fsExtra.mkdirSync(output);
-    }
-    const tempPath = path.join(tempRoot, temp);
-    copyTempFile(tempPath, output);
-    createTempEnd(output);
-    creating.succeed();
-}
-exports.createTemp = createTemp;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createTemp = void 0;
+const inquirer = require("inquirer");
+const fsExtra = require("fs-extra");
+const path = require("path");
+const fs = require("fs");
+const chalk = require("chalk");
+const ora = require("ora");
+const child_process_1 = require("child_process");
+const utils_1 = require("../utils");
+const cwd = process.cwd();
+const command = utils_1.onGenCommand();
+const excludes = ['node_modules', 'yarn-error.log', 'dist'];
+const tempRoot = path.join(__dirname, '../../template');
+const tempInfo = utils_1.onGetDir(tempRoot).map(name => {
+    return {
+        name,
+        src: path.join(tempRoot, name)
+    };
+});
+function copyTempFile(tempPath, output) {
+    fsExtra.readdirSync(tempPath).map(name => {
+        if (!excludes.includes(name)) {
+            fsExtra.copySync(path.join(tempPath, name), path.join(output, name));
+        }
+    });
+}
+function createTempEnd(output) {
+    child_process_1.spawnSync(command, ['install'], {
+        cwd: output,
+        stdio: 'inherit'
+    });
+}
+async function createTemp(dirname) {
+    const isCurrent = dirname === '.';
+    const { temp } = await inquirer.prompt([
+        {
+            type: 'list',
+            name: 'temp',
+            message: 'Select temp.',
+            choices: tempInfo.map(o => o.name)
+        }
+    ]);
+    const creating = ora(chalk.yellow('Creating...\n')).start();
+    const output = path.join(cwd, isCurrent ? '' : dirname);
+    if (!isCurrent && fs.existsSync(output)) {
+        return console.log(chalk.red(`${dirname} already exists!`));
+    }
+    if (!isCurrent) {
+        fsExtra.mkdirSync(output);
+    }
+    const tempPath = path.join(tempRoot, temp);
+    copyTempFile(tempPath, output);
+    createTempEnd(output);
+    creating.succeed();
+}
+exports.createTemp = createTemp;

package/bin/index.d.ts

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
-export {};
+#!/usr/bin/env node
+export {};

package/bin/index.js

@@ -1,10 +1,10 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const createTemp_1 = require("./clis/createTemp");
-const commander_1 = require("commander");
-commander_1.program
-    .option('-c, --create <dirname>', 'Create project.', dirname => {
-    return createTemp_1.createTemp(dirname);
-})
-    .parse(process.argv);
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const createTemp_1 = require("./clis/createTemp");
+const commander_1 = require("commander");
+commander_1.program
+    .option('-c, --create <dirname>', 'Create project.', dirname => {
+    return createTemp_1.createTemp(dirname);
+})
+    .parse(process.argv);

package/bin/utils/index.d.ts

@@ -1,4 +1,4 @@
-export declare function hasPnpm(): boolean;
-export declare function hasYarn(): boolean;
-export declare function onGenCommand(): "pnpm" | "yarn" | "npm";
-export declare function onGetDir(root: string): string[];
+export declare function hasPnpm(): boolean;
+export declare function hasYarn(): boolean;
+export declare function onGenCommand(): "pnpm" | "yarn" | "npm";
+export declare function onGetDir(root: string): string[];

package/bin/utils/index.js

@@ -1,45 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.onGetDir = exports.onGenCommand = exports.hasYarn = exports.hasPnpm = void 0;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-function hasPnpm() {
-    try {
-        child_process_1.execSync('pnpm --version');
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-exports.hasPnpm = hasPnpm;
-function hasYarn() {
-    try {
-        child_process_1.execSync('yarnpkg --version');
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-exports.hasYarn = hasYarn;
-function onGenCommand() {
-    if (hasPnpm()) {
-        return 'pnpm';
-    }
-    if (hasYarn()) {
-        return 'yarn';
-    }
-    return 'npm';
-}
-exports.onGenCommand = onGenCommand;
-function onGetDir(root) {
-    const dirs = [];
-    fs_1.readdirSync(root, { withFileTypes: true }).forEach(o => {
-        if (o.isDirectory()) {
-            dirs.push(o.name);
-        }
-    });
-    return dirs;
-}
-exports.onGetDir = onGetDir;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.onGetDir = exports.onGenCommand = exports.hasYarn = exports.hasPnpm = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+function hasPnpm() {
+    try {
+        child_process_1.execSync('pnpm --version');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+exports.hasPnpm = hasPnpm;
+function hasYarn() {
+    try {
+        child_process_1.execSync('yarnpkg --version');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+exports.hasYarn = hasYarn;
+function onGenCommand() {
+    if (hasPnpm()) {
+        return 'pnpm';
+    }
+    if (hasYarn()) {
+        return 'yarn';
+    }
+    return 'npm';
+}
+exports.onGenCommand = onGenCommand;
+function onGetDir(root) {
+    const dirs = [];
+    fs_1.readdirSync(root, { withFileTypes: true }).forEach(o => {
+        if (o.isDirectory()) {
+            dirs.push(o.name);
+        }
+    });
+    return dirs;
+}
+exports.onGetDir = onGetDir;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-packer",
-    "version": "1.13.1",
+    "version": "1.13.3",
     "main": "index.js",
     "repository": "https://github.com/kevily/create-packer",
     "author": "1k <bug_zero@163.com>",

package/template/react/.eslintrc

@@ -2,8 +2,18 @@
     "root": true,
     "parser": "@typescript-eslint/parser",
     "plugins": ["@typescript-eslint", "prettier"],
-    "extends": ["eslint:recommended", "plugin:react/recommended", "plugin:react-hooks/recommended"],
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended",
+        "plugin:react-hooks/recommended",
+        "plugin:import/recommended",
+        "plugin:import/typescript"
+    ],
     "settings": {
+        "import/resolver": {
+            "typescript": true,
+            "node": true
+        },
         "react": {
             "version": "18"
         }
@@ -23,6 +33,21 @@
         "useJSXTextNode": true
     },
     "rules": {
+        "import/order": [
+            "error",
+            {
+                "groups": [
+                    "builtin",
+                    "external",
+                    "internal",
+                    "parent",
+                    "sibling",
+                    "index",
+                    "object",
+                    "type"
+                ]
+            }
+        ],
         "@typescript-eslint/no-var-requires": 0,
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/no-explicit-any": 0,

package/template/react/package.json

@@ -48,6 +48,8 @@
         "commitizen": "4.3.0",
         "cssnano": "5.1.14",
         "eslint": "8.34.0",
+        "eslint-import-resolver-typescript": "^3.5.3",
+        "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-react": "7.32.2",
         "eslint-plugin-react-hooks": "4.6.0",

package/template/react/src/controllers/index.ts

@@ -0,0 +1 @@
+export { default as useVisible } from './useVisible'

package/template/react/src/{providers → controllers}/useVisible.ts

@@ -2,11 +2,12 @@ import { useState } from 'react'
 import { isFunction } from 'lodash-es'
 
 export interface useVisibleConfigType {
+    defaultVisible?: boolean
     onBeforeShow?: () => Promise<boolean | void>
     onBeforeHide?: () => Promise<boolean | void>
 }
 export default function useVisible(config?: useVisibleConfigType) {
-    const [visible, setVisible] = useState(false)
+    const [visible, setVisible] = useState(config?.defaultVisible ?? false)
     const onShow = async () => {
         let isShow: boolean | void = true
         if (isFunction(config?.onBeforeShow)) {

package/template/react/src/providers/index.ts

@@ -1,3 +1,2 @@
 export * from './defineStore'
-export { default as useVisible } from './useVisible'
 export { default as request } from './request'

package/template/vue/.eslintrc

@@ -16,8 +16,16 @@
     "extends": [
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
-        "plugin:vue/vue3-recommended"
+        "plugin:vue/vue3-recommended",
+        "plugin:import/recommended",
+        "plugin:import/typescript"
     ],
+    "settings": {
+        "import/resolver": {
+            "typescript": true,
+            "node": true
+        }
+    },
     "parser": "vue-eslint-parser",
     "parserOptions": {
         "parser": "@typescript-eslint/parser",
@@ -27,6 +35,21 @@
         }
     },
     "rules": {
+        "import/order": [
+            "error",
+            {
+                "groups": [
+                    "builtin",
+                    "external",
+                    "internal",
+                    "parent",
+                    "sibling",
+                    "index",
+                    "object",
+                    "type"
+                ]
+            }
+        ],
         "@typescript-eslint/no-var-requires": 0,
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/no-explicit-any": 0,

package/template/vue/package.json

@@ -35,6 +35,8 @@
         "commitizen": "4.3.0",
         "cssnano": "5.1.14",
         "eslint": "8.34.0",
+        "eslint-import-resolver-typescript": "^3.5.3",
+        "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-prettier": "4.2.1",
         "eslint-plugin-vue": "9.9.0",
         "husky": "8.0.3",

package/template/vue/src/controllers/index.ts

@@ -0,0 +1,2 @@
+export { default as useVisible } from './useVisible'
+export { default as useList } from './useList'

package/template/vue/src/controllers/useList.ts

@@ -0,0 +1,107 @@
+import { ref, reactive, computed, unref } from 'vue'
+import { cloneDeep, concat, assign, pick, isNil, size, map } from 'lodash-es'
+
+export interface stateType<ListItem, P> {
+    loading: boolean
+    total: number
+    params: P
+    list: ListItem[]
+    sum: Record<string, any>
+    selected: any[]
+    pagination: {
+        current: number
+        pageSize: number
+        total: number
+    }
+    selectedLen: number
+}
+export interface createListStorePropsType<ListItem, P> {
+    /**
+     * @description 默认请求参数
+     */
+    defaultParams: P
+    /** 列表请求 */
+    fetch: (
+        state: Pick<stateType<ListItem, P>, 'pagination' | 'selected' | 'total' | 'params'>
+    ) => Promise<{
+        list: any[]
+        page?: number
+        pageSize?: number
+        total?: number
+        sum?: Record<string, any>
+    }>
+    /** 初始化列表时的配置 */
+    initConfig?: {
+        /** 初始化的时候需要保留值的字段 */
+        keepParamsKeys?: Array<keyof P>
+    }
+}
+
+export default function createListStore<
+    ListItem extends Record<string, any>,
+    P extends { page?: number; pageSize?: number; [key: string]: any }
+>(config: createListStorePropsType<ListItem, P>) {
+    const loading = ref<stateType<ListItem, P>['loading']>(true)
+    const total = ref<stateType<ListItem, P>['total']>(0)
+    const params = reactive<stateType<ListItem, P>['params']>(cloneDeep(config.defaultParams))
+    const list = ref<stateType<ListItem, P>['list']>([])
+    const sum = reactive<stateType<ListItem, P>['sum']>({})
+    const selected = ref<stateType<ListItem, P>['selected']>([])
+    const pagination = computed<stateType<ListItem, P>['pagination']>(() => ({
+        current: params.page || 0,
+        pageSize: params.pageSize || 0,
+        total: total.value
+    }))
+    const selectedLen = computed<stateType<ListItem, P>['selectedLen']>(() => size(selected.value))
+    function resetParams() {
+        assign(params, cloneDeep(config.defaultParams))
+    }
+    async function fetchList(arg?: { params?: Partial<P>; isConcat?: boolean; isInit?: boolean }) {
+        loading.value = true
+        try {
+            if (arg?.isInit) {
+                assign(
+                    params,
+                    cloneDeep(config.defaultParams),
+                    pick(params, config?.initConfig?.keepParamsKeys || [])
+                )
+            }
+            assign(params, arg?.params)
+            const result = await config.fetch({
+                pagination: unref(pagination),
+                selected: unref(selected),
+                total: unref(total),
+                params
+            })
+            const newData = map(result.list, (item: any) => ({
+                ...item,
+                __active__: {
+                    campaign: false,
+                    adGroup: false,
+                    target: false,
+                    searchTerm: false
+                }
+            }))
+            list.value = !isNil(result.page) && arg?.isConcat ? concat(list, newData) : newData
+            sum.value = result.sum || {}
+            total.value = result.total || total.value
+            params.page = result.page || params.page
+            params.pageSize = result.pageSize || params.pageSize
+        } finally {
+            loading.value = false
+        }
+    }
+
+    return {
+        loading,
+        total,
+        params,
+        list,
+        sum,
+        selected,
+        pagination,
+        selectedLen,
+        resetParams,
+        fetchList
+    }
+}

package/template/vue/src/providers/index.ts

@@ -1,4 +1,3 @@
 export { default as app } from './app'
-export { default as useVisible } from './useVisible'
 export { default as createApiComponent } from './createApiComponent'
 export { default as request } from './request'