reborn-ui 0.1.71 → 0.1.74

package/dist/index.js

@@ -254,7 +254,7 @@ function addCommand() {
       if (opts.yes) {
         throw new Error("\u672A\u6307\u5B9A\u7EC4\u4EF6\u540D\uFF1B\u8BF7\u4F20\u5165\u7EC4\u4EF6\u53C2\u6570\u6216\u53BB\u6389 --yes \u4EE5\u4EA4\u4E92\u9009\u62E9\u3002");
       }
-      const choices = registry.components.map((c) => ({
+      const choices = registry.components?.map((c) => ({
         title: c.name,
         value: c.name
       }));
@@ -431,11 +431,11 @@ function buildCommand() {
     const sourceDir = path5.join(rootDir, opts.source);
     const uniappSourceDir = opts.uniappSource ? path5.join(rootDir, opts.uniappSource) : "";
     const outPath = path5.join(rootDir, opts.out);
-    const alsoOutPaths = (opts.alsoOut ?? []).map(
+    const alsoOutPaths = (opts.alsoOut ?? [])?.map(
       (p) => path5.join(rootDir, p)
     );
     const dirents = await fs4.readdir(sourceDir, { withFileTypes: true });
-    const componentDirs = dirents.filter((d) => d.isDirectory()).map((d) => path5.join(sourceDir, d.name)).sort((a, b) => a.localeCompare(b));
+    const componentDirs = dirents.filter((d) => d.isDirectory())?.map((d) => path5.join(sourceDir, d.name)).sort((a, b) => a.localeCompare(b));
     const components = [];
     for (const absComponentDir of componentDirs) {
       const name = path5.basename(absComponentDir);
@@ -519,7 +519,7 @@ function buildCommand() {
           {
             ...c,
             fileCount: c.files.length,
-            contentHash: sha1(JSON.stringify(c.files.map((f) => f.content)))
+            contentHash: sha1(JSON.stringify(c.files?.map((f) => f.content)))
           }
         );
       }
@@ -559,7 +559,7 @@ var TEMPLATES = {
   "web": {
     "lib/tv.ts": 'import { createTV } from "tailwind-variants";\r\nimport { twMergeConfig } from "./utils";\r\n\r\nexport const tv = createTV({\r\n  twMergeConfig,\r\n});\r\nexport type { VariantProps } from "tailwind-variants";\r\n',
     "lib/utils.ts": 'import type { ClassValue } from "clsx";\r\nimport { clsx } from "clsx";\r\nimport { extendTailwindMerge } from "tailwind-merge";\r\n\r\nexport const twMergeConfig = {\r\n  extend: {\r\n    classGroups: {\r\n      "font-size": [{ text: [(value: string) => !isNaN(Number(value))] }],\r\n    },\r\n  },\r\n};\r\n\r\nconst customTwMerge = extendTailwindMerge(twMergeConfig);\r\n\r\nexport function cn(...inputs: ClassValue[]) {\r\n  return customTwMerge(clsx(inputs));\r\n}\r\n\r\nexport type ObjectValues<T> = T[keyof T];\r\n',
-    "composables/useFieldGroup.ts": "\r\nimport { ref } from 'vue'\r\n\r\nexport function useFieldGroup(props: any) {\r\n  return {\r\n    orientation: ref(undefined),\r\n    size: ref(undefined)\r\n  }\r\n}\r\n",
+    "composables/useFieldGroup.ts": "\r\nimport { ref } from 'vue'\r\n\r\nexport function useFieldGroup(props: any) {\r\n  return {\r\n    disabled: ref(undefined),\r\n    isError: ref(undefined),\r\n    orientation: ref(undefined),\r\n    size: ref(undefined)\r\n  }\r\n}\r\n",
     "composables/useMouseState.ts": 'import { readonly, ref } from "vue";\r\n\r\nexport function useMouseState() {\r\n  const isMouseEntered = ref(false);\r\n\r\n  function setMouseEntered(value: boolean) {\r\n    isMouseEntered.value = value;\r\n  }\r\n\r\n  return {\r\n    isMouseEntered: readonly(isMouseEntered),\r\n    setMouseEntered,\r\n  };\r\n}\r\n',
     "composables/useNavigation.ts": `import type { ContentNavigationItem } from "@nuxt/content";\r
 \r
@@ -611,9 +611,235 @@ export function useNavigation(navigation?: Ref<ContentNavigationItem[]>) {\r
 `
   },
   "uniapp": {
-    "lib/tv.ts": "// @ts-ignore\r\nimport { create } from '@weapp-tailwindcss/variants-v3'\r\n// @ts-ignore\r\nconst isH5 = process.env.UNI_PLATFORM === 'h5'\r\n\r\nconst { tv } = create({\r\n  escape: !isH5,\r\n  unescape: !isH5,\r\n})\r\n\r\nexport { tv }\r\n",
-    "lib/utils.ts": "import { type ClassValue, clsx } from 'clsx'\r\nimport { create } from '@weapp-tailwindcss/merge-v3'\r\n\r\n// @ts-ignore\r\nconst isH5 = process.env.UNI_PLATFORM === 'h5'\r\nconst { twMerge } = create({\r\n  escape: !isH5,\r\n  unescape: !isH5,\r\n})\r\n\r\nexport function cn(...inputs: ClassValue[]) {\r\n  return twMerge(clsx(inputs))\r\n}\r\n",
-    "composables/useFieldGroup.ts": "import { ref } from 'vue'\r\n\r\nexport function useFieldGroup(props?: any) {\r\n  return {\r\n    disabled: ref(undefined),\r\n    orientation: ref(undefined),\r\n    size: ref(undefined)\r\n  }\r\n}\r\n"
+    "lib/tv.ts": `// @ts-ignore\r
+import type { TV } from "tailwind-variants";\r
+import { create } from '@weapp-tailwindcss/variants-v3'\r
+\r
+// @ts-ignore\r
+const isH5 = process.env.UNI_PLATFORM === 'h5'\r
+\r
+const { tv: createTV } = create({\r
+  // @ts-ignore\r
+  escape: !isH5,\r
+  // @ts-ignore\r
+  unescape: !isH5,\r
+})\r
+\r
+const textSizeKeys = ['20', '22', '24', '26', '28', '30', '32', '36', '40', '48', '52']\r
+\r
+const twMergeConfig = {\r
+  extend: {\r
+    classGroups: {\r
+      'font-size': [{ text: textSizeKeys }],\r
+    },\r
+  },\r
+} as const\r
+\r
+export const tv: TV = (options, config) =>\r
+  createTV(options, {\r
+    ...config,\r
+    twMerge: config?.twMerge ?? true,\r
+    twMergeConfig: {\r
+      ...config?.twMergeConfig,\r
+      ...twMergeConfig,\r
+    },\r
+  });\r
+`,
+    "lib/utils.ts": "import { type ClassValue, clsx } from 'clsx'\r\nimport { create } from '@weapp-tailwindcss/merge-v3'\r\n\r\n// @ts-ignore\r\nconst isH5 = process.env.UNI_PLATFORM === 'h5'\r\nconst { twMerge } = create({\r\n  escape: !isH5,\r\n  unescape: !isH5,\r\n  // @ts-ignore\r\n  extend: {\r\n    classGroups: {\r\n      'font-size': [{ text: ['20', '22', '24', '26', '28', '30', '32', '36', '40', '48', '52'] }],\r\n    },\r\n  },\r\n})\r\n\r\nexport function cn(...inputs: ClassValue[]) {\r\n  return twMerge(clsx(inputs))\r\n}\r\n",
+    "composables/useDarkMode.ts": "export const useDarkMode = () => {\r\n    const isDark = ref(false)\r\n\r\n    const toggleDarkMode = () => {\r\n        isDark.value = !isDark.value\r\n        updateTheme()\r\n    }\r\n\r\n    const updateTheme = () => {\r\n        const value = isDark.value\r\n        uni.setStorageSync('darkMode', value)\r\n\r\n        // #ifdef H5\r\n        if (value) {\r\n            document.documentElement.classList.add('dark')\r\n        } else {\r\n            document.documentElement.classList.remove('dark')\r\n        }\r\n        // #endif\r\n\r\n    }\r\n\r\n    const initTheme = () => {\r\n        const saved = uni.getStorageSync('darkMode')\r\n        if (saved !== '') {\r\n            isDark.value = !!saved\r\n        } else {\r\n            isDark.value = false\r\n        }\r\n        updateTheme()\r\n    }\r\n\r\n    initTheme()\r\n\r\n    return {\r\n        isDark,\r\n        toggleDarkMode\r\n    }\r\n}\r\n",
+    "composables/useFieldGroup.ts": `import { ref, provide, inject, computed, watch, onMounted, onUnmounted, getCurrentInstance } from 'vue';\r
+import * as z from 'zod';\r
+\r
+export type FormValidateError = {\r
+  field: string;\r
+  message: string;\r
+};\r
+\r
+export interface UseFieldGroupProps {\r
+  modelValue?: any;\r
+}\r
+\r
+export function useFieldGroup() {\r
+\r
+  // Data & Context\r
+  const errors = ref(new Map<string, string>());\r
+  const fields = ref(new Set<string>([]));\r
+  const fieldInstances = ref<any[]>([]);\r
+\r
+  // --- Field Management ---\r
+  const addField = (field: any) => {\r
+    fieldInstances.value.push(field);\r
+    if (field.prop) {\r
+      fields.value.add(field.prop);\r
+    }\r
+  };\r
+\r
+  const removeField = (field: any) => {\r
+    const index = fieldInstances.value.indexOf(field);\r
+    if (index > -1) {\r
+      fieldInstances.value.splice(index, 1);\r
+    }\r
+    if (field.prop) {\r
+      fields.value.delete(field.prop);\r
+    }\r
+  };\r
+\r
+  // --- Error Management ---\r
+  const errorLock = ref(false);\r
+\r
+  function setError(prop: string, error: string) {\r
+    if (errorLock.value) return;\r
+    if (prop !== "") errors.value.set(prop, error);\r
+  }\r
+\r
+  function removeError(prop: string) {\r
+    if (prop !== "") errors.value.delete(prop);\r
+  }\r
+\r
+  function getError(prop: string): string {\r
+    if (prop !== "") return errors.value.get(prop) ?? "";\r
+    return "";\r
+  }\r
+\r
+  async function getErrors(): Promise<FormValidateError[]> {\r
+    const errs = [] as FormValidateError[];\r
+    errors.value.forEach((msg, field) => {\r
+      errs.push({ field, message: msg });\r
+    });\r
+    return errs;\r
+  }\r
+\r
+  function clearValidate(fieldsToClear?: string | string[]) {\r
+    if (fieldsToClear) {\r
+      const propsArray = Array.isArray(fieldsToClear) ? fieldsToClear : [fieldsToClear];\r
+      propsArray.forEach(prop => removeError(prop));\r
+    } else {\r
+      errors.value.clear();\r
+    }\r
+  }\r
+\r
+  return {\r
+    errors,\r
+    fields,\r
+    fieldInstances,\r
+    addField,\r
+    removeField,\r
+    setError,\r
+    removeError,\r
+    getError, // Used by children\r
+    getErrors, // Used by validate\r
+    clearValidate\r
+  };\r
+}\r
+\r
+\r
+export interface UseFieldGroupItemProps {\r
+  prop?: string;\r
+  label?: string;\r
+  labelPosition?: string;\r
+  labelWidth?: string | number;\r
+  ui?: any;\r
+}\r
+\r
+export function useFieldGroupItem(props: UseFieldGroupItemProps) {\r
+  const form = inject<any>('rebornForm', undefined);\r
+  const instance = getCurrentInstance();\r
+\r
+\r
+  const error = computed(() => {\r
+    if (!form || !props.prop) return '';\r
+    return form.getError ? form.getError(props.prop) : '';\r
+  });\r
+\r
+  const labelPosition = computed(() => {\r
+    return props.labelPosition || form?.props?.labelPosition || 'left';\r
+  });\r
+\r
+  const labelWidth = computed(() => {\r
+    if (labelPosition.value === 'top') return 'auto';\r
+    return props.labelWidth || form?.props?.labelWidth || 'auto';\r
+  });\r
+\r
+  const size = computed(() => {\r
+    const s = form?.props?.size;\r
+    if (s && ['sm', 'md', 'lg'].includes(s)) {\r
+      return s as "sm" | "md" | "lg";\r
+    }\r
+    return 'sm';\r
+  });\r
+\r
+  const getBoundingClientRect = (callback: (res: any) => void) => {\r
+    uni.createSelectorQuery()\r
+      .in(instance?.proxy)\r
+      .select('.re-form-item')\r
+      .boundingClientRect(callback)\r
+      .exec();\r
+  };\r
+\r
+  // Watch for prop changes to update registration\r
+  watch(() => props.prop, (newProp, oldProp) => {\r
+    if (form) {\r
+      if (oldProp) {\r
+        form.removeField({ uid: instance?.uid, prop: oldProp });\r
+      }\r
+      if (newProp) {\r
+        form.addField({ uid: instance?.uid, prop: newProp, getBoundingClientRect });\r
+      }\r
+    }\r
+  });\r
+\r
+  onMounted(() => {\r
+    if (form && props.prop) {\r
+      form.addField({ uid: instance?.uid, prop: props.prop, getBoundingClientRect });\r
+    }\r
+  });\r
+\r
+  onUnmounted(() => {\r
+    if (form && props.prop) {\r
+      form.removeField({ uid: instance?.uid, prop: props.prop });\r
+    }\r
+  });\r
+\r
+  return {\r
+    form,\r
+    error,\r
+    labelPosition,\r
+    labelWidth,\r
+    size,\r
+    getBoundingClientRect\r
+  };\r
+}\r
+\r
+// Consumer for inner components (Input, Select, etc.)\r
+export function useFormInject(props: any) {\r
+  const form = inject<any>('rebornForm', null);\r
+  const formItem = inject<any>('rebornFormItem', null);\r
+\r
+  const size = computed(() => {\r
+    return form?.props?.size || props.size;\r
+  });\r
+\r
+  const disabled = computed(() => {\r
+    return form?.props?.disabled || props.disabled;\r
+  });\r
+\r
+  const orientation = computed(() => {\r
+    return form?.props?.orientation || props.orientation;\r
+  });\r
+\r
+  const isError = computed(() => {\r
+    return formItem?.isError?.value || false;\r
+  });\r
+\r
+  return {\r
+    form,\r
+    size,\r
+    disabled,\r
+    orientation,\r
+    isError\r
+  };\r
+}\r
+`
   }
 };
 
@@ -686,7 +912,7 @@ async function copyTemplates(params) {
       fromDir: currentRepoPaths.composables,
       toDir: path7.join(cwd, cfg.composablesDir),
       overwrite,
-      ignoreFileNames: platform === "web" ? /* @__PURE__ */ new Set(["useComponentCode.ts", "useCopyToClipboard.ts"]) : void 0
+      ignoreFileNames: platform === "web" ? /* @__PURE__ */ new Set(["useComponentCode.ts", "useCopyToClipboard.ts", "getComponentCode.ts", "getUniappCode.ts"]) : void 0
     });
     copiedFromRepo = true;
   }
@@ -861,7 +1087,7 @@ function initCommand() {
 // package.json
 var package_default = {
   name: "reborn-ui",
-  version: "0.1.71",
+  version: "0.1.74",
   description: "A CLI for Reborn UI",
   author: "1997liuyh-boop",
   license: "MIT",