vueless 0.0.679 → 0.0.681

package/bin/commands/copy.js

@@ -0,0 +1,94 @@
+/* eslint-disable no-console */
+
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { cwd } from "node:process";
+import { cp, readFile, writeFile, rename } from "node:fs/promises";
+import { styleText } from "node:util";
+
+import { getDirFiles } from "../../utils/node/helper.js";
+import { replaceRelativeImports } from "../utils/formatUtil.js";
+import { getStorybookId, getStoryMetaKeyIndex } from "../utils/dataUtils.js";
+
+import { SRC_COMPONENTS_PATH, COMPONENTS_PATH } from "../constants.js";
+import { COMPONENTS, VUELESS_DIR, VUELESS_LOCAL_DIR } from "../../constants.js";
+
+function getSourcePath(componentName) {
+  return path.join(cwd(), VUELESS_DIR, COMPONENTS[componentName]);
+}
+
+export async function copyVuelessComponent(options) {
+  const [componentName, newComponentName] = options;
+
+  if (!componentName) {
+    throw new Error("Component name is required.");
+  }
+
+  if (!(componentName in COMPONENTS)) {
+    throw new Error("There is no such component.");
+  }
+
+  const sourceComponentPath = getSourcePath(componentName);
+
+  const isSrcDir = existsSync(path.join(cwd(), VUELESS_LOCAL_DIR));
+  const destPath = isSrcDir
+    ? path.join(cwd(), SRC_COMPONENTS_PATH, newComponentName)
+    : path.join(cwd(), COMPONENTS_PATH, newComponentName);
+
+  const isComponentExists = newComponentName in COMPONENTS || existsSync(destPath);
+
+  if (isComponentExists) {
+    throw new Error(`Component with name ${newComponentName} alrady exists.`);
+  }
+
+  await cp(sourceComponentPath, destPath, { recursive: true });
+  await modifyCreatedComponent(destPath, componentName, newComponentName);
+
+  const successMessage = styleText(
+    "green",
+    `Success: ${componentName} was copied into ${destPath} directory.`,
+  );
+
+  console.log(successMessage);
+}
+
+async function modifyCreatedComponent(destPath, componentName, newComponentName) {
+  const destFiles = await getDirFiles(destPath, "");
+  const storybookId = await getStorybookId();
+
+  for await (const filePath of destFiles) {
+    const fileContent = await readFile(filePath, "utf-8");
+
+    let updatedContent = replaceRelativeImports(newComponentName, filePath, fileContent);
+    let targetPath = filePath;
+
+    if (filePath.endsWith("constants.ts")) {
+      updatedContent = updatedContent.replace(componentName, newComponentName);
+    }
+
+    if (filePath.endsWith("stories.ts")) {
+      const storyLines = updatedContent.split("\n");
+
+      const storyComponentImportIndex = storyLines.findIndex(
+        (line) => line.includes(componentName) && line.includes("import"),
+      );
+      const storyIdIndex = getStoryMetaKeyIndex(fileContent, "id");
+      const storyTitleIndex = getStoryMetaKeyIndex(fileContent, "title");
+
+      storyLines[storyIdIndex] = `  id: "${storybookId}",`;
+      storyLines[storyTitleIndex] = `  title: "Custom / ${newComponentName}",`;
+      storyLines[storyComponentImportIndex] =
+        `import ${newComponentName} from "../${newComponentName}.vue"`;
+
+      updatedContent = storyLines.join("\n").replaceAll(componentName, newComponentName);
+    }
+
+    if (targetPath.endsWith(`${componentName}.vue`)) {
+      targetPath = targetPath.replace(componentName, newComponentName);
+
+      await rename(filePath, targetPath);
+    }
+
+    await writeFile(targetPath, updatedContent);
+  }
+}

package/bin/commands/create.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+
 import { existsSync } from "node:fs";
 import path from "node:path";
 import { cwd } from "node:process";
@@ -7,7 +8,7 @@ import { styleText } from "node:util";
 
 import { getDirFiles } from "../../utils/node/helper.js";
 import { replaceRelativeImports } from "../utils/formatUtil.js";
-import { getLastStorybookId } from "../utils/dataUtils.js";
+import { getStorybookId } from "../utils/dataUtils.js";
 
 import { SRC_COMPONENTS_PATH, COMPONENTS_PATH } from "../constants.js";
 
@@ -20,7 +21,7 @@ export async function createVuelessComponent(options) {
   const [componentName] = options;
 
   if (!componentName) {
-    throw new Error("Component name is required");
+    throw new Error("Component name is required.");
   }
 
   const isSrcDir = existsSync(path.join(cwd(), VUELESS_LOCAL_DIR));
@@ -31,7 +32,7 @@ export async function createVuelessComponent(options) {
   const isComponentExists = componentName in COMPONENTS || existsSync(destPath);
 
   if (isComponentExists) {
-    throw new Error(`Component with name ${componentName} alrady exists`);
+    throw new Error(`Component with name ${componentName} alrady exists.`);
   }
 
   await cp(boilerplatePath, destPath, { recursive: true });
@@ -40,7 +41,7 @@ export async function createVuelessComponent(options) {
 
   const successMessage = styleText(
     "green",
-    `Success: ${componentName} was created in ${destPath} directory`,
+    `Success: ${componentName} was created in ${destPath} directory.`,
   );
 
   console.log(successMessage);
@@ -48,7 +49,7 @@ export async function createVuelessComponent(options) {
 
 async function modifyCreatedComponent(destPath, componentName) {
   const destFiles = await getDirFiles(destPath, "");
-  const lastStorybookId = await getLastStorybookId();
+  const storybookId = await getStorybookId();
 
   for await (const filePath of destFiles) {
     const fileContent = await readFile(filePath, "utf-8");
@@ -63,7 +64,7 @@ async function modifyCreatedComponent(destPath, componentName) {
     if (filePath.endsWith("stories.ts")) {
       updatedContent = updatedContent
         .replaceAll(boilerplateName, componentName)
-        .replace("{{component_id}}", String(lastStorybookId + 10));
+        .replace("{{component_id}}", String(storybookId));
     }
 
     if (targetPath.endsWith(`${boilerplateName}.vue`)) {

package/bin/commands/index.js

@@ -1,7 +1,9 @@
 import { vuelssInit } from "./init.js";
 import { createVuelessComponent } from "./create.js";
+import { copyVuelessComponent } from "./copy.js";
 
 export const commands = {
   init: vuelssInit,
   create: createVuelessComponent,
+  copy: copyVuelessComponent,
 };

package/bin/commands/init.js

@@ -16,7 +16,7 @@ export async function vuelssInit(options) {
   const isValidOptions = options.every((option) => vuelessInitOptions.includes(option));
 
   if (options.length && !isValidOptions) {
-    throw new Error("Ivalid options were provided");
+    throw new Error("Ivalid options were provided.");
   }
 
   const fileExt = options.includes("--ts") ? TYPESCRIPT_EXT : JAVASCRIPT_EXT;
@@ -28,7 +28,7 @@ export async function vuelssInit(options) {
 
   const successMessage = styleText(
     "green",
-    `Success: ${formattedDestPath.split(path.sep).at(-1)} was created in ${cwd()} directory`,
+    `Success: ${formattedDestPath.split(path.sep).at(-1)} was created in ${cwd()} directory.`,
   );
 
   console.log(successMessage);

package/bin/utils/dataUtils.js

@@ -10,7 +10,7 @@ import { VUELESS_DIR } from "../../constants.js";
 
 const storiesName = "stories.ts";
 
-export async function getLastStorybookId() {
+export async function getStorybookId() {
   const srcComponentsDir = path.join(cwd(), SRC_COMPONENTS_PATH);
   const componentsDir = path.join(cwd(), COMPONENTS_PATH);
   const vuelessPackagePath = path.join(cwd(), VUELESS_DIR);
@@ -36,9 +36,8 @@ export async function getLastStorybookId() {
   for await (const storyPath of stories) {
     const storyContent = await readFile(storyPath, "utf-8");
 
-    const storyIdLine = storyContent.split("\n").find((line, idx, array) => {
-      return line.includes("id:") && idx && array[idx - 1].includes("export default");
-    });
+    const storyIdLineIndex = getStoryMetaKeyIndex(storyContent, "id");
+    const storyIdLine = storyContent.split("\n").at(storyIdLineIndex);
 
     if (!storyIdLine) continue;
 
@@ -49,5 +48,36 @@ export async function getLastStorybookId() {
     }
   }
 
-  return id;
+  return id + 10;
+}
+
+export function getStoryMetaKeyIndex(fileContent, key) {
+  const lines = fileContent.split("\n");
+  let insideExportBlock = false;
+  let bracketDepth = 0;
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i].trim();
+
+    if (line.startsWith("export default {")) {
+      insideExportBlock = true;
+      bracketDepth = 1;
+      continue;
+    }
+
+    if (insideExportBlock) {
+      bracketDepth += (line.match(/{/g) || []).length;
+      bracketDepth -= (line.match(/}/g) || []).length;
+
+      if (bracketDepth === 1 && line.startsWith(`${key}:`)) {
+        return i;
+      }
+
+      if (bracketDepth === 0) {
+        break;
+      }
+    }
+  }
+
+  return -1; // Return -1 if no top-level `id` is found
 }

package/bin/utils/formatUtil.js

@@ -1,5 +1,7 @@
 import path from "node:path";
 
+import { VUELESS_LIBRARY } from "../../constants.js";
+
 export function replaceRelativeImports(componentName, filePath, fileContent) {
   const isTopLevelFile = path.dirname(filePath).endsWith(componentName);
   const contentLines = fileContent.split("\n");
@@ -9,6 +11,7 @@ export function replaceRelativeImports(componentName, filePath, fileContent) {
 
 function replaceRelativeLineImports(line, isTopLevelFile) {
   const importRegex = /import\s+(?:[\w\s{},*]+)\s+from\s+(['"])(\.\.?\/.*?)(\.[tj]s)?\1(?!\?)/g;
+  const multiLineImportRegExp = /from\s+(['"])(\.\.?\/.*?)(\.[tj]s)?\1(?!\?)/g; // Matches import's "from" part
 
   const isTopLevelLocalImport = isTopLevelFile && !line.includes("../");
   const isInnerLocalImport =
@@ -18,6 +21,12 @@ function replaceRelativeLineImports(line, isTopLevelFile) {
     return line;
   }
 
+  if (line.startsWith("}")) {
+    return line.replace(multiLineImportRegExp, (match, quote, oldPath, ext) => {
+      return match.replace(oldPath + (ext || ""), VUELESS_LIBRARY);
+    });
+  }
+
   return line.replace(importRegex, (match, quote, oldPath, ext) => {
     const isDefaultImport = match.includes("{");
 
@@ -25,7 +34,7 @@ function replaceRelativeLineImports(line, isTopLevelFile) {
       match = defaultToNamedImport(match);
     }
 
-    return match.replace(oldPath + (ext || ""), "vueless");
+    return match.replace(oldPath + (ext || ""), VUELESS_LIBRARY);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "0.0.679",
+  "version": "0.0.681",
   "license": "MIT",
   "description": "Vue Styleless UI Component Library, powered by Tailwind CSS.",
   "keywords": [

package/ui.button-toggle/storybook/stories.ts

@@ -36,7 +36,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(UToggle.__name),
-    modelValue: { control: { type: "text" } },
   },
   parameters: {
     docs: {

package/ui.dropdown-badge/UDropdownBadge.vue

@@ -78,6 +78,7 @@ const { config, wrapperAttrs, dropdownBadgeAttrs, dropdownListAttrs, dropdownIco
       :size="size"
       :color="color"
       :variant="variant"
+      :round="round"
       v-bind="dropdownBadgeAttrs"
       tabindex="0"
       :data-test="dataTest"
@@ -102,17 +103,15 @@ const { config, wrapperAttrs, dropdownBadgeAttrs, dropdownListAttrs, dropdownIco
         <slot :label="label" :opened="isShownOptions" />
       </template>
 
-      <template #right="{ iconSize }">
+      <template #right>
         <!--
           @slot Use it to add something after the label.
           @binding {boolean} opened
         -->
-        <slot name="right" :opened="isShownOptions">
+        <slot v-if="!noIcon" name="right" :opened="isShownOptions">
           <UIcon
-            v-if="!noIcon"
             internal
             color="inherit"
-            :size="iconSize"
             :name="config.defaults.dropdownIcon"
             v-bind="dropdownIconAttrs"
             :data-test="`${dataTest}-dropdown`"

package/ui.dropdown-badge/config.ts

@@ -9,7 +9,16 @@ export default /*tw*/ {
     },
     compoundVariants: [{ opened: true, color: ["grayscale", "white"], class: "ring-gray-700/15" }],
   },
-  dropdownIcon: "{UIcon} transition duration-300 group-[]:rotate-180",
+  dropdownIcon: {
+    base: "{UIcon} transition duration-300 group-[]:rotate-180",
+    defaults: {
+      size: {
+        sm: "2xs",
+        md: "xs",
+        lg: "xs",
+      },
+    },
+  },
   dropdownList: {
     base: "{UDropdownList} w-fit",
     variants: {

package/ui.dropdown-button/UDropdownButton.vue

@@ -110,9 +110,8 @@ const { config, dropdownButtonAttrs, dropdownListAttrs, dropdownIconAttrs, wrapp
           @slot Use it to add something after the label.
           @binding {boolean} opened
         -->
-        <slot name="toggle" :opened="isShownOptions">
+        <slot v-if="!noIcon" name="toggle" :opened="isShownOptions">
           <UIcon
-            v-if="!noIcon"
             internal
             color="inherit"
             :name="config.defaults.dropdownIcon"

package/ui.dropdown-button/config.ts

@@ -13,12 +13,12 @@ export default /*tw*/ {
     base: "{UIcon} transition duration-300 group-[]:rotate-180",
     defaults: {
       size: {
-        "2xs": "sm",
-        xs: "sm",
+        "2xs": "2xs",
+        xs: "xs",
         sm: "sm",
-        md: "md",
-        lg: "lg",
-        xl: "lg",
+        md: "sm",
+        lg: "sm",
+        xl: "sm",
       },
     },
   },

package/ui.form-checkbox/storybook/stories.ts

@@ -27,7 +27,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(UCheckbox.__name),
-    modelValue: { control: { type: "boolean" } },
   },
   parameters: {
     docs: {

package/ui.form-color-picker/UColorPicker.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, useId } from "vue";
+import { ref, computed, useId } from "vue";
 
 import { vTooltip } from "../directives";
 import useUI from "../composables/useUI.ts";
@@ -31,13 +31,16 @@ const emit = defineEmits([
 
 const elementId = props.id || useId();
 
+const localValue = ref("");
+
 const selectedItem = computed({
-  get: () => props.modelValue,
+  get: () => props.modelValue || localValue.value,
   set: (value) => emit("update:modelValue", value),
 });
 
 function onClickColor(color: string) {
   selectedItem.value = color;
+  localValue.value = color;
 }
 
 /**

package/ui.form-input/config.ts

@@ -2,11 +2,14 @@ export default /*tw*/ {
   inputLabel: "{ULabel}",
   wrapper: {
     base: `
-      w-full bg-white relative flex border border-gray-300 rounded-dynamic transition
+      w-full bg-white relative flex border border-gray-300 rounded-dynamic-sm transition
       hover:border-gray-400 hover:focus-within:border-brand-500 focus-within:border-brand-500
       focus-within:ring-dynamic focus-within:ring-offset-dynamic focus-within:ring-brand-700/15
     `,
     variants: {
+      labelAlign: {
+        topInside: "rounded-dynamic",
+      },
       error: {
         true: `
           border-red-300 bg-red-50
@@ -53,9 +56,9 @@ export default /*tw*/ {
       },
       error: {
         true: `
-        bg-red-50 placeholder:text-red-300 hover:border-red-400 focus:border-red-500 focus:ring-red-700/15
-        focus-within:border-red-500 focus-within:ring-red-700/15
-      `,
+          bg-red-50 placeholder:text-red-300 hover:border-red-400 focus:border-red-500 focus:ring-red-700/15
+          focus-within:border-red-500 focus-within:ring-red-700/15
+        `,
       },
       typePassword: {
         true: "tracking-widest !leading-[1.18] [font-family:text-security-disc,serif] [-webkit-text-security:disc]",

package/ui.form-input/storybook/stories.ts

@@ -27,7 +27,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(UInput.__name),
-    modelValue: { control: { type: "text" } },
   },
   parameters: {
     docs: {

package/ui.form-input-money/storybook/stories.ts

@@ -27,7 +27,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(UInputMoney.__name),
-    modelValue: { control: { type: "number" } },
   },
   parameters: {
     docs: {

package/ui.form-input-money/types.ts

@@ -17,7 +17,7 @@ export interface Props {
   /**
    * Input value.
    */
-  modelValue?: string | number;
+  modelValue?: number | string;
   /**
    * Input label.
    */

package/ui.form-input-number/storybook/stories.ts

@@ -25,7 +25,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(UInputNumber.__name),
-    modelValue: { control: { type: "number" } },
   },
   parameters: {
     docs: {

package/ui.form-label/config.ts

@@ -3,9 +3,9 @@ export default /*tw*/ {
     base: "flex w-full",
     variants: {
       align: {
-        top: "flex-col gap-2",
         topInside: "flex-col gap-0 relative",
-        topWithDesc: "flex-col-reverse w-fit",
+        topWithDesc: "flex-col-reverse gap-2",
+        top: "flex-col gap-2",
         right: "flex-row w-fit",
         left: "flex-row-reverse w-fit",
       },
@@ -68,7 +68,7 @@ export default /*tw*/ {
         lg: "text-sm",
       },
       align: {
-        top: "pl-3",
+        top: "",
         topInside: "pl-3 mt-1.5",
         topWithDesc: "pt-0.5",
         left: "pt-0.5",

package/ui.form-select/storybook/stories.ts

@@ -41,7 +41,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(USelect.__name),
-    modelValue: { control: { type: "number" } },
   },
   parameters: {
     docs: {

package/ui.form-select/types.ts

@@ -9,7 +9,7 @@ export interface Props {
   /**
    * Select value.
    */
-  modelValue?: string | number | (string | number)[];
+  modelValue?: number | string | (number | string)[];
 
   /**
    * Select options.

package/ui.form-textarea/storybook/stories.ts

@@ -26,7 +26,6 @@ export default {
   },
   argTypes: {
     ...getArgTypes(UTextarea.__name),
-    modelValue: { control: { type: "text" } },
   },
   parameters: {
     docs: {

package/ui.other-theme-color-toggle/UThemeColorToggle.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, useId } from "vue";
+import { ref, computed, useId } from "vue";
 
 import useUI from "../composables/useUI.ts";
 import { getDefaults } from "../utils/ui.ts";
@@ -42,8 +42,11 @@ const emit = defineEmits([
 
 const elementId = props.id || useId();
 
+const localBrand = ref("");
+const localGray = ref("");
+
 const selectedBrandColor = computed({
-  get: () => props.brand || getSelectedBrandColor(),
+  get: () => props.brand || localBrand.value || getSelectedBrandColor(),
   set: (brand: string) => {
     const prevBrand = getSelectedBrandColor();
     const isBrandGrayscale = brand === GRAYSCALE_COLOR;
@@ -55,14 +58,16 @@ const selectedBrandColor = computed({
 
     setTheme({ brand });
     emit("update:brand", brand);
+    localBrand.value = brand;
   },
 });
 
 const selectedGrayColor = computed({
-  get: () => props.gray || getSelectedGrayColor(),
-  set: (value: string) => {
-    setTheme({ gray: value });
-    emit("update:gray", value);
+  get: () => props.gray || localGray.value || getSelectedGrayColor(),
+  set: (gray: string) => {
+    setTheme({ gray });
+    emit("update:gray", gray);
+    localGray.value = gray;
   },
 });
 

package/ui.text-badge/UBadge.vue

@@ -98,9 +98,9 @@ const { badgeAttrs, bodyAttrs, leftIconAttrs, centerIconAttrs, rightIconAttrs }
   >
     <div v-bind="bodyAttrs">
       <!--
-          @slot Use it to add icon before the text.
-          @binding {string} icon-name
-        -->
+        @slot Use it to add icon before the text.
+        @binding {string} icon-name
+      -->
       <slot name="left" :icon-name="leftIcon">
         <UIcon v-if="leftIcon" internal :name="leftIcon" color="inherit" v-bind="leftIconAttrs" />
       </slot>
@@ -118,9 +118,9 @@ const { badgeAttrs, bodyAttrs, leftIconAttrs, centerIconAttrs, rightIconAttrs }
       </slot>
 
       <!--
-          @slot Use it to add icon after the text.
-          @binding {string} icon-name
-        -->
+        @slot Use it to add icon after the text.
+        @binding {string} icon-name
+      -->
       <slot name="right" :icon-name="rightIcon">
         <UIcon
           v-if="rightIcon"

package/utils/storybook.ts

@@ -100,37 +100,36 @@ export function getArgTypes(componentName: string | undefined) {
     const type = attribute.value.type;
 
     if (attribute.enum) {
-      types[attribute.name] = {
-        options: attribute.enum,
-        control: "select",
-        table: {
-          defaultValue: { summary: attribute.default || "" },
-          type: { summary: attribute.enum.join(" | ") },
-        },
-      };
-    }
+      attribute.enum = attribute.enum.map((item) => {
+        if (item === "UnknownObject") return "Object";
+        if (item === "UnknownArray") return "Array";
 
-    if (attribute.enum?.length === 1) {
-      types[attribute.name] = {
-        control: "object",
-        table: {
-          defaultValue: { summary: attribute.default || "" },
-          type: { summary: attribute.enum.join(" | ") },
-        },
-      };
+        return item;
+      });
     }
 
     const nonUnionTypes = [
+      "null",
       "string",
       "number",
       "boolean",
       "Date",
-      "UnknownObject",
-      "UnknownArray",
       "Array",
+      "Object",
+      "UnknownArray",
+      "UnknownObject",
     ];
 
-    if (attribute.enum?.every((value) => nonUnionTypes.includes(value))) {
+    if (attribute.enum?.some((value) => !nonUnionTypes.includes(value))) {
+      types[attribute.name] = {
+        options: attribute.enum,
+        control: "select",
+        table: {
+          defaultValue: { summary: attribute.default || "" },
+          type: { summary: attribute.enum.join(" | ") },
+        },
+      };
+    } else if (attribute.enum?.some((value) => nonUnionTypes.includes(value))) {
       let control = attribute.enum[0];
 
       if (control === "string") {
@@ -145,6 +144,17 @@ export function getArgTypes(componentName: string | undefined) {
         control: control as ArgType["control"],
         table: {
           defaultValue: { summary: attribute.default || "" },
+          type: { summary: attribute.enum.join(" | ") },
+        },
+      };
+    }
+
+    if (attribute.enum?.length === 1) {
+      types[attribute.name] = {
+        control: "object",
+        table: {
+          defaultValue: { summary: attribute.default || "" },
+          type: { summary: attribute.enum.join(" | ") },
         },
       };
     }