@mpilk/mp-route 3.0.0 → 3.0.1

package/dist/cli.js

@@ -1,18 +1,18 @@
-#!/usr/bin/env node
-import { builder, builderWithWatch } from './chunk-6MZ3UWKK.js';
-import { program } from 'commander';
-
-// package.json
-var version = "1.1.3";
-
-// src/cli.ts
-program.name("uni-route").description(`\u8FD9\u662F\u4E00\u4E2A\u7528\u6765\u751F\u6210 uni-app \u8DEF\u7531\u6587\u4EF6\u7684\u5DE5\u5177
-  \u901A\u8FC7\u626B\u63CFsrc\u76EE\u5F55\u4E0B\u7684\u914D\u7F6E\u6587\u4EF6\uFF0C\u751F\u6210 uni-app \u8DEF\u7531\u914D\u7F6E\u6587\u4EF6\u3002`).version(version);
-program.option("-i, --input <input>", "\u626B\u63CF\u914D\u7F6E\u7684\u6587\u4EF6\u5939\u5165\u53E3\u8DEF\u5F84", "src/").option("-rn, --routeName <routeName>", "\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84", "route").option("-tn, --tabbarName <tabbarName>", "\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84", "tabbar").option("-pp, --pagesPath <pagesPath>", "\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84", "src/pages.json").option("-vvv, --verbose", "\u8F93\u51FA\u8BE6\u7EC6\u7684\u8C03\u8BD5\u4FE1\u606F");
-program.command("build", { isDefault: true }).description("\u641C\u7D22\u8DEF\u5F84\u4E0B\u7684\u8DEF\u7531\u6587\u4EF6\uFF0C\u751F\u6210\u8DEF\u7531\u914D\u7F6E").action((_, command) => {
-  builder(command.optsWithGlobals());
-});
-program.command("watch").description("\u76D1\u542C\u6587\u4EF6\u53D8\u5316\uFF0C\u5B9E\u65F6\u751F\u6210\u8DEF\u7531\u914D\u7F6E").option("-t --delay [delay]", "\u5EF6\u8FDF\u65F6\u95F4").action((_, command) => {
-  builderWithWatch(command.optsWithGlobals());
-});
-program.parse();
+#!/usr/bin/env node
+import { builder, builderWithWatch } from './chunk-6MZ3UWKK.js';
+import { program } from 'commander';
+
+// package.json
+var version = "3.0.1";
+
+// src/cli.ts
+program.name("uni-route").description(`\u8FD9\u662F\u4E00\u4E2A\u7528\u6765\u751F\u6210 uni-app \u8DEF\u7531\u6587\u4EF6\u7684\u5DE5\u5177
+  \u901A\u8FC7\u626B\u63CFsrc\u76EE\u5F55\u4E0B\u7684\u914D\u7F6E\u6587\u4EF6\uFF0C\u751F\u6210 uni-app \u8DEF\u7531\u914D\u7F6E\u6587\u4EF6\u3002`).version(version);
+program.option("-i, --input <input>", "\u626B\u63CF\u914D\u7F6E\u7684\u6587\u4EF6\u5939\u5165\u53E3\u8DEF\u5F84", "src/").option("-rn, --routeName <routeName>", "\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84", "route").option("-tn, --tabbarName <tabbarName>", "\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84", "tabbar").option("-pp, --pagesPath <pagesPath>", "\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84", "src/pages.json").option("-vvv, --verbose", "\u8F93\u51FA\u8BE6\u7EC6\u7684\u8C03\u8BD5\u4FE1\u606F");
+program.command("build", { isDefault: true }).description("\u641C\u7D22\u8DEF\u5F84\u4E0B\u7684\u8DEF\u7531\u6587\u4EF6\uFF0C\u751F\u6210\u8DEF\u7531\u914D\u7F6E").action((_, command) => {
+  builder(command.optsWithGlobals());
+});
+program.command("watch").description("\u76D1\u542C\u6587\u4EF6\u53D8\u5316\uFF0C\u5B9E\u65F6\u751F\u6210\u8DEF\u7531\u914D\u7F6E").option("-t --delay [delay]", "\u5EF6\u8FDF\u65F6\u95F4").action((_, command) => {
+  builderWithWatch(command.optsWithGlobals());
+});
+program.parse();

package/dist/index.cjs

@@ -1,287 +1,287 @@
-'use strict'
-
-var path = require('path')
-var fs = require('fs')
-var pino = require('pino')
-var mpShared = require('@mpilk/mp-shared')
-var lodashEs = require('lodash-es')
-var chokidar = require('chokidar')
-
-function _interopDefault(e) {
-  return e && e.__esModule ? e : { default: e }
-}
-
-var path__default = /*#__PURE__*/ _interopDefault(path)
-var fs__default = /*#__PURE__*/ _interopDefault(fs)
-var pino__default = /*#__PURE__*/ _interopDefault(pino)
-var chokidar__default = /*#__PURE__*/ _interopDefault(chokidar)
-
-// src/helper.ts
-function defineMiniRouter(config) {
-  return config
-}
-function defineMiniTabbar(config) {
-  return config
-}
-var _indexPath = ''
-var logger = pino__default.default({
-  transport: {
-    target: 'pino-pretty',
-    options: {
-      colorize: true
-      // ignore: 'hostname,pid',
-    }
-  }
-})
-var verboseLogger = logger.child({ verbose: true })
-function builderWithWatch(options) {
-  let timer = null
-  function run() {
-    if (timer) clearTimeout(timer)
-    timer = setTimeout(() => {
-      timer = null
-      return builder(options)
-    }, options?.delay || 200)
-  }
-  return chokidar__default.default
-    .watch([
-      `src/**/${options?.routeName || 'route'}.{ts,js}`,
-      `src/${options?.tabbarName || 'tabbar'}.{ts,js}`
-    ])
-    .on('all', (eventName) => {
-      switch (eventName) {
-        case 'add':
-        case 'change':
-        case 'unlink':
-          run()
-          break
-      }
-    })
-}
-async function builder(options = {}) {
-  const {
-    input = './src',
-    routeName = 'route',
-    tabbarName = 'tabbar',
-    pagesPath = './src/pages.json',
-    verbose
-  } = options
-  logger.info('\u5F00\u59CB\u751F\u6210\u8DEF\u7531\u6587\u4EF6...')
-  const filePaths = loadDirFiles(input, routeName)
-  logger.info(
-    `\u6839\u636E ${routeName} \u627E\u5230 ${filePaths.length} \u4E2A\u6587\u4EF6`
-  )
-  const routeConfigs = []
-  for (const filePath of filePaths) {
-    verbose &&
-      verboseLogger.info(`\u5F00\u59CB\u89E3\u6790\u6587\u4EF6 ${filePath}`)
-    let content = await mpShared.loadFileContent(filePath)
-    if (!content || typeof content !== 'object' || lodashEs.isEmpty(content)) {
-      verbose &&
-        verboseLogger.info(
-          `\u6587\u4EF6 ${filePath} \u4E3A\u7A7A\uFF0C\u8DF3\u8FC7`
-        )
-      continue
-    }
-    if (!lodashEs.isArray(content)) content = [content]
-    verbose &&
-      verboseLogger.info(
-        `\u6587\u4EF6 ${filePath} \u89E3\u6790\u5B8C\u6210\uFF1A${JSON.stringify(
-          content
-        )}`
-      )
-    routeConfigs.push(...content)
-  }
-  const rs = buildRoute(routeConfigs)
-  if (_indexPath) {
-    const idx2 = rs.pages.findIndex((page) => page.path === _indexPath)
-    if (idx2 !== -1) rs.pages.unshift(...rs.pages.splice(idx2, 1))
-  }
-  logger.info('\u8DEF\u7531\u6587\u4EF6\u89E3\u6790\u5B8C\u6210')
-  if (!rs.condition.list.length) rs.condition = void 0
-  else if (rs.condition.list.length && rs.condition.current === -1)
-    rs.condition.current = 0
-  const idx = rs.pages.findIndex((page) => page['_index'])
-  if (idx !== -1) rs.pages.unshift(...rs.pages.splice(idx, 1))
-  let tabbarObj
-  const [tabbarPath] = loadDirFiles('./src', tabbarName)
-  if (tabbarPath && !lodashEs.isEmpty(tabbarPath)) {
-    logger.info(`\u6839\u636E ${tabbarName} \u627E\u52301\u4E2A\u6587\u4EF6`)
-    tabbarObj = await mpShared.loadFileContent(tabbarPath)
-    if (tabbarObj && !lodashEs.isEmpty(tabbarObj)) rs.tabBar = tabbarObj
-  }
-  const {
-    debug: _debug = false,
-    pages,
-    subPackages,
-    preloadRule,
-    condition,
-    tabBar,
-    ...otherProps
-  } = await mpShared.loadJson(pagesPath)
-  const writeContent = {
-    debug: _debug,
-    pages: rs.pages || pages,
-    subPackages: rs.subPackages || subPackages,
-    preloadRule: rs.preloadRule || preloadRule,
-    condition: rs.condition || condition,
-    tabBar: tabbarObj || tabBar,
-    ...otherProps
-  }
-  await mpShared.outputFile(pagesPath, JSON.stringify(writeContent, null, 2))
-  logger.info('\u8DEF\u7531\u6587\u4EF6\u751F\u6210\u5B8C\u6210\uFF01')
-}
-function buildRoute(content, ext = {}) {
-  const result = {
-    pages: [],
-    subPackages: [],
-    preloadRule: {},
-    condition: {
-      current: -1,
-      list: []
-    }
-  }
-  const { parentName = '', parentPath = '', subpackageRoot = '' } = ext
-  for (const route of content) {
-    const {
-      subPackages = false,
-      isSubpackage = subPackages,
-      path: path2,
-      title,
-      name,
-      children
-    } = route
-    const style = {
-      navigationBarTitleText: title || name || parentName,
-      ...route.style
-    }
-    const _path = pathJoin(parentPath, path2)
-    if (isSubpackage && !subpackageRoot) {
-      let { preLoadPath, preLoadNetwork } = route
-      const { pages, preloadRule, condition } = buildRoute(children ?? [], {
-        parentName: style.navigationBarTitleText,
-        subpackageRoot: _path
-      })
-      const subPackage = {
-        root: _path,
-        pages
-      }
-      result.preloadRule = deepMerge(result.preloadRule, preloadRule)
-      result.condition = deepMerge(result.condition, condition)
-      if (condition.current > -1)
-        result.condition.current = result.condition?.list?.indexOf(
-          condition.list[condition.current]
-        )
-      result.subPackages.push(subPackage)
-      if (preLoadPath) {
-        if (!lodashEs.isArray(preLoadPath)) preLoadPath = [preLoadPath]
-        const preLoadRule = preLoadPath.reduce((acc, cur) => {
-          acc[pathJoin(cur)] = {
-            network: preLoadNetwork,
-            packages: [_path]
-          }
-          return acc
-        }, {})
-        result.preloadRule = deepMerge(result.preloadRule, preLoadRule)
-      }
-      continue
-    }
-    if (children?.length) {
-      const {
-        pages,
-        subPackages: subPackages2,
-        preloadRule,
-        condition
-      } = buildRoute(children, {
-        parentName: style.navigationBarTitleText,
-        parentPath: _path,
-        subpackageRoot
-      })
-      result.pages = deepMerge(result.pages, pages)
-      result.subPackages = deepMerge(result.subPackages, subPackages2)
-      result.preloadRule = deepMerge(result.preloadRule, preloadRule)
-      result.condition = deepMerge(result.condition, condition)
-      if (condition.current > -1)
-        result.condition.current = result.condition?.list?.indexOf(
-          condition.list[condition.current]
-        )
-    } else {
-      const { conditionActive, conditionQuery } = route
-      const item = {
-        path: _path,
-        style
-      }
-      route.isIndex && (_indexPath = _path)
-      result.pages.push(item)
-      if (conditionQuery || conditionActive) {
-        const conditionItem = {
-          name: style.navigationBarTitleText,
-          path: _path,
-          query: conditionQuery
-        }
-        result.condition.list.push(conditionItem)
-        if (conditionActive)
-          result.condition.current =
-            result.condition.list?.indexOf(conditionItem)
-      }
-    }
-  }
-  return result
-}
-var extension = ['.ts', '.js', '.mjs', '.json']
-function loadDirFiles(roots, name, exitByFirst = false) {
-  if (!Array.isArray(roots)) roots = [roots]
-  const files = []
-  for (let root of roots) {
-    root = path__default.default.resolve(root)
-    if (!fs__default.default.existsSync(root)) continue
-    const stat = fs__default.default.statSync(root)
-    const regex = new RegExp(`${name}(${extension.join('|')})$`)
-    if (stat.isFile() && regex.test(root)) {
-      files.push(root)
-      if (exitByFirst) break
-    }
-    if (stat.isDirectory()) {
-      const dirents = fs__default.default
-        .readdirSync(root)
-        .map((o) => path__default.default.resolve(root, o))
-      files.push(...loadDirFiles(dirents, name))
-    }
-  }
-  return files
-}
-function pathJoin(...paths) {
-  return paths.join('/').split('/').filter(Boolean).join('/')
-}
-function deepMerge(target, ...sources) {
-  if (typeof target !== 'object' || target === null) target = {}
-  if (!sources.length) return target
-  for (const source of sources) {
-    if (typeof source !== 'object' || source === null) continue
-    if (lodashEs.isArray(target) && lodashEs.isArray(source)) {
-      const set = /* @__PURE__ */ new Set([...target, ...source])
-      return [...set]
-    } else if (
-      lodashEs.isPlainObject(target) &&
-      lodashEs.isPlainObject(source)
-    ) {
-      for (const key in source) {
-        if (
-          key in target &&
-          typeof target[key] === 'object' &&
-          typeof source[key] === 'object'
-        ) {
-          target[key] = deepMerge(target[key], source[key])
-        } else {
-          target[key] = source[key] || target[key]
-        }
-      }
-    }
-  }
-  return target
-}
-
-exports.builder = builder
-exports.builderWithWatch = builderWithWatch
-exports.defineMiniRouter = defineMiniRouter
-exports.defineMiniTabbar = defineMiniTabbar
+'use strict'
+
+var path = require('path')
+var fs = require('fs')
+var pino = require('pino')
+var mpShared = require('@mpilk/mp-shared')
+var lodashEs = require('lodash-es')
+var chokidar = require('chokidar')
+
+function _interopDefault(e) {
+  return e && e.__esModule ? e : { default: e }
+}
+
+var path__default = /*#__PURE__*/ _interopDefault(path)
+var fs__default = /*#__PURE__*/ _interopDefault(fs)
+var pino__default = /*#__PURE__*/ _interopDefault(pino)
+var chokidar__default = /*#__PURE__*/ _interopDefault(chokidar)
+
+// src/helper.ts
+function defineMiniRouter(config) {
+  return config
+}
+function defineMiniTabbar(config) {
+  return config
+}
+var _indexPath = ''
+var logger = pino__default.default({
+  transport: {
+    target: 'pino-pretty',
+    options: {
+      colorize: true
+      // ignore: 'hostname,pid',
+    }
+  }
+})
+var verboseLogger = logger.child({ verbose: true })
+function builderWithWatch(options) {
+  let timer = null
+  function run() {
+    if (timer) clearTimeout(timer)
+    timer = setTimeout(() => {
+      timer = null
+      return builder(options)
+    }, options?.delay || 200)
+  }
+  return chokidar__default.default
+    .watch([
+      `src/**/${options?.routeName || 'route'}.{ts,js}`,
+      `src/${options?.tabbarName || 'tabbar'}.{ts,js}`
+    ])
+    .on('all', (eventName) => {
+      switch (eventName) {
+        case 'add':
+        case 'change':
+        case 'unlink':
+          run()
+          break
+      }
+    })
+}
+async function builder(options = {}) {
+  const {
+    input = './src',
+    routeName = 'route',
+    tabbarName = 'tabbar',
+    pagesPath = './src/pages.json',
+    verbose
+  } = options
+  logger.info('\u5F00\u59CB\u751F\u6210\u8DEF\u7531\u6587\u4EF6...')
+  const filePaths = loadDirFiles(input, routeName)
+  logger.info(
+    `\u6839\u636E ${routeName} \u627E\u5230 ${filePaths.length} \u4E2A\u6587\u4EF6`
+  )
+  const routeConfigs = []
+  for (const filePath of filePaths) {
+    verbose &&
+      verboseLogger.info(`\u5F00\u59CB\u89E3\u6790\u6587\u4EF6 ${filePath}`)
+    let content = await mpShared.loadFileContent(filePath)
+    if (!content || typeof content !== 'object' || lodashEs.isEmpty(content)) {
+      verbose &&
+        verboseLogger.info(
+          `\u6587\u4EF6 ${filePath} \u4E3A\u7A7A\uFF0C\u8DF3\u8FC7`
+        )
+      continue
+    }
+    if (!lodashEs.isArray(content)) content = [content]
+    verbose &&
+      verboseLogger.info(
+        `\u6587\u4EF6 ${filePath} \u89E3\u6790\u5B8C\u6210\uFF1A${JSON.stringify(
+          content
+        )}`
+      )
+    routeConfigs.push(...content)
+  }
+  const rs = buildRoute(routeConfigs)
+  if (_indexPath) {
+    const idx2 = rs.pages.findIndex((page) => page.path === _indexPath)
+    if (idx2 !== -1) rs.pages.unshift(...rs.pages.splice(idx2, 1))
+  }
+  logger.info('\u8DEF\u7531\u6587\u4EF6\u89E3\u6790\u5B8C\u6210')
+  if (!rs.condition.list.length) rs.condition = void 0
+  else if (rs.condition.list.length && rs.condition.current === -1)
+    rs.condition.current = 0
+  const idx = rs.pages.findIndex((page) => page['_index'])
+  if (idx !== -1) rs.pages.unshift(...rs.pages.splice(idx, 1))
+  let tabbarObj
+  const [tabbarPath] = loadDirFiles('./src', tabbarName)
+  if (tabbarPath && !lodashEs.isEmpty(tabbarPath)) {
+    logger.info(`\u6839\u636E ${tabbarName} \u627E\u52301\u4E2A\u6587\u4EF6`)
+    tabbarObj = await mpShared.loadFileContent(tabbarPath)
+    if (tabbarObj && !lodashEs.isEmpty(tabbarObj)) rs.tabBar = tabbarObj
+  }
+  const {
+    debug: _debug = false,
+    pages,
+    subPackages,
+    preloadRule,
+    condition,
+    tabBar,
+    ...otherProps
+  } = await mpShared.loadJson(pagesPath)
+  const writeContent = {
+    debug: _debug,
+    pages: rs.pages || pages,
+    subPackages: rs.subPackages || subPackages,
+    preloadRule: rs.preloadRule || preloadRule,
+    condition: rs.condition || condition,
+    tabBar: tabbarObj || tabBar,
+    ...otherProps
+  }
+  await mpShared.outputFile(pagesPath, JSON.stringify(writeContent, null, 2))
+  logger.info('\u8DEF\u7531\u6587\u4EF6\u751F\u6210\u5B8C\u6210\uFF01')
+}
+function buildRoute(content, ext = {}) {
+  const result = {
+    pages: [],
+    subPackages: [],
+    preloadRule: {},
+    condition: {
+      current: -1,
+      list: []
+    }
+  }
+  const { parentName = '', parentPath = '', subpackageRoot = '' } = ext
+  for (const route of content) {
+    const {
+      subPackages = false,
+      isSubpackage = subPackages,
+      path: path2,
+      title,
+      name,
+      children
+    } = route
+    const style = {
+      navigationBarTitleText: title || name || parentName,
+      ...route.style
+    }
+    const _path = pathJoin(parentPath, path2)
+    if (isSubpackage && !subpackageRoot) {
+      let { preLoadPath, preLoadNetwork } = route
+      const { pages, preloadRule, condition } = buildRoute(children ?? [], {
+        parentName: style.navigationBarTitleText,
+        subpackageRoot: _path
+      })
+      const subPackage = {
+        root: _path,
+        pages
+      }
+      result.preloadRule = deepMerge(result.preloadRule, preloadRule)
+      result.condition = deepMerge(result.condition, condition)
+      if (condition.current > -1)
+        result.condition.current = result.condition?.list?.indexOf(
+          condition.list[condition.current]
+        )
+      result.subPackages.push(subPackage)
+      if (preLoadPath) {
+        if (!lodashEs.isArray(preLoadPath)) preLoadPath = [preLoadPath]
+        const preLoadRule = preLoadPath.reduce((acc, cur) => {
+          acc[pathJoin(cur)] = {
+            network: preLoadNetwork,
+            packages: [_path]
+          }
+          return acc
+        }, {})
+        result.preloadRule = deepMerge(result.preloadRule, preLoadRule)
+      }
+      continue
+    }
+    if (children?.length) {
+      const {
+        pages,
+        subPackages: subPackages2,
+        preloadRule,
+        condition
+      } = buildRoute(children, {
+        parentName: style.navigationBarTitleText,
+        parentPath: _path,
+        subpackageRoot
+      })
+      result.pages = deepMerge(result.pages, pages)
+      result.subPackages = deepMerge(result.subPackages, subPackages2)
+      result.preloadRule = deepMerge(result.preloadRule, preloadRule)
+      result.condition = deepMerge(result.condition, condition)
+      if (condition.current > -1)
+        result.condition.current = result.condition?.list?.indexOf(
+          condition.list[condition.current]
+        )
+    } else {
+      const { conditionActive, conditionQuery } = route
+      const item = {
+        path: _path,
+        style
+      }
+      route.isIndex && (_indexPath = _path)
+      result.pages.push(item)
+      if (conditionQuery || conditionActive) {
+        const conditionItem = {
+          name: style.navigationBarTitleText,
+          path: _path,
+          query: conditionQuery
+        }
+        result.condition.list.push(conditionItem)
+        if (conditionActive)
+          result.condition.current =
+            result.condition.list?.indexOf(conditionItem)
+      }
+    }
+  }
+  return result
+}
+var extension = ['.ts', '.js', '.mjs', '.json']
+function loadDirFiles(roots, name, exitByFirst = false) {
+  if (!Array.isArray(roots)) roots = [roots]
+  const files = []
+  for (let root of roots) {
+    root = path__default.default.resolve(root)
+    if (!fs__default.default.existsSync(root)) continue
+    const stat = fs__default.default.statSync(root)
+    const regex = new RegExp(`${name}(${extension.join('|')})$`)
+    if (stat.isFile() && regex.test(root)) {
+      files.push(root)
+      if (exitByFirst) break
+    }
+    if (stat.isDirectory()) {
+      const dirents = fs__default.default
+        .readdirSync(root)
+        .map((o) => path__default.default.resolve(root, o))
+      files.push(...loadDirFiles(dirents, name))
+    }
+  }
+  return files
+}
+function pathJoin(...paths) {
+  return paths.join('/').split('/').filter(Boolean).join('/')
+}
+function deepMerge(target, ...sources) {
+  if (typeof target !== 'object' || target === null) target = {}
+  if (!sources.length) return target
+  for (const source of sources) {
+    if (typeof source !== 'object' || source === null) continue
+    if (lodashEs.isArray(target) && lodashEs.isArray(source)) {
+      const set = /* @__PURE__ */ new Set([...target, ...source])
+      return [...set]
+    } else if (
+      lodashEs.isPlainObject(target) &&
+      lodashEs.isPlainObject(source)
+    ) {
+      for (const key in source) {
+        if (
+          key in target &&
+          typeof target[key] === 'object' &&
+          typeof source[key] === 'object'
+        ) {
+          target[key] = deepMerge(target[key], source[key])
+        } else {
+          target[key] = source[key] || target[key]
+        }
+      }
+    }
+  }
+  return target
+}
+
+exports.builder = builder
+exports.builderWithWatch = builderWithWatch
+exports.defineMiniRouter = defineMiniRouter
+exports.defineMiniTabbar = defineMiniTabbar