fix: type issues

shairez · shairez · commit ba0eaaa168b7 · 2023-09-04T18:40:31.000+03:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,7 +9,7 @@
         "@nx/enforce-module-boundaries": [
           "error",
           {
-            "enforceBuildableLibDependency": true,
+            "enforceBuildableLibDependency": false,
             "allow": [],
             "depConstraints": [
               {
diff --git a/.prettierignore b/.prettierignore
@@ -2,6 +2,7 @@
 **/*.log
 **/.DS_Store
 *.
+.vscode
 dist
 node_modules
 coverage
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "nx": "^16.7.4",
     "nx-cloud": "^16.3.0",
     "postcss": "^8.4.29",
-    "prettier": "^2",
+    "prettier": "^2.6.2",
     "prettier-plugin-tailwindcss": "0.4.1",
     "pretty-quick": "^3.1.3",
     "qwik-nx": "^1.0.8",
diff --git a/packages/kit-headless/src/components/checkbox/checkbox.tsx b/packages/kit-headless/src/components/checkbox/checkbox.tsx
@@ -1,12 +1,14 @@
-import { component$, Slot, QwikChangeEvent, PropFunction } from '@builder.io/qwik';
+import {
+  PropFunction,
+  QwikChangeEvent,
+  QwikIntrinsicElements,
+  Slot,
+  component$,
+} from '@builder.io/qwik';
 
-interface StyleProps {
-  class?: string;
-  style?: string;
-}
-interface LabelProps extends StyleProps {
+export type LabelProps = QwikIntrinsicElements['label'] & {
   htmlFor?: string;
-}
+};
 
 export const Label = component$(({ ...props }: LabelProps) => {
   return (
@@ -16,7 +18,7 @@ export const Label = component$(({ ...props }: LabelProps) => {
   );
 });
 
-export interface CheckboxProps extends StyleProps {
+export type CheckboxProps = QwikIntrinsicElements['input'] & {
   checked?: boolean;
   disabled?: boolean;
   name?: string;
@@ -27,7 +29,7 @@ export interface CheckboxProps extends StyleProps {
   onChange?: PropFunction<
     (event: QwikChangeEvent<HTMLInputElement>, element: HTMLInputElement) => void
   >;
-}
+};
 
 export const Root = component$(
   ({
diff --git a/packages/kit-headless/src/components/slider/slider.tsx b/packages/kit-headless/src/components/slider/slider.tsx
@@ -9,6 +9,7 @@ import {
   useSignal,
   useVisibleTask$,
 } from '@builder.io/qwik';
+import { OmitSignalClass } from '@qwik-ui/type-utils';
 
 export const getPercentage = (value: number, min = 0, max = 100) => {
   return ((value - min) * 100) / (max - min);
@@ -24,14 +25,12 @@ interface SliderContextService {
 
 export const sliderContext = createContextId<SliderContextService>('slider');
 
-export type SliderProps = {
+export type SliderProps = OmitSignalClass<QwikIntrinsicElements['div']> & {
   value: number;
   min: number;
   max: number;
   onChange$?: PropFunction<(value: number) => void>;
-  class?: string;
-  style?: string;
-} & QwikIntrinsicElements['div'];
+};
 
 export const Slider = component$(
   ({
diff --git a/packages/kit-tailwind/src/components/button-group/button-group.tsx b/packages/kit-tailwind/src/components/button-group/button-group.tsx
@@ -1,12 +1,10 @@
 import { HTMLAttributes, Slot, component$ } from '@builder.io/qwik';
 import { ButtonGroup as HeadlessButtonGroup } from '@qwik-ui/headless';
 // eslint-disable-next-line @nx/enforce-module-boundaries
-import type { OmitSignalClass } from '../../../../shared/src/utils';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 
 export type ButtonGroupProps = OmitSignalClass<HTMLAttributes<HTMLElement>>;
 
-// TODO: discuss this
-
 export const ButtonGroup = component$((props: ButtonGroupProps) => {
   const { class: classNames, ...rest } = props;
   return (
diff --git a/packages/kit-tailwind/src/components/button/button.tsx b/packages/kit-tailwind/src/components/button/button.tsx
@@ -1,7 +1,8 @@
 import { component$, QwikIntrinsicElements, Slot } from '@builder.io/qwik';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 import { daisyConfig } from './daisy.config';
 
-export type HTMLButtonProps = QwikIntrinsicElements['button'];
+export type HTMLButtonProps = OmitSignalClass<QwikIntrinsicElements['button']>;
 
 export type TailwindButtonProps = {
   variant?: TailwindButtonVariants;
@@ -46,7 +47,7 @@ export const Button = component$((props: ButtonProps) => {
   } = props;
 
   const { variants, sizes, options } = daisyConfig;
-  // TODO: discuss this
+
   return (
     <button
       {...rest}
diff --git a/packages/kit-tailwind/src/components/card/card.tsx b/packages/kit-tailwind/src/components/card/card.tsx
@@ -1,9 +1,8 @@
 import { component$, HTMLAttributes, Slot } from '@builder.io/qwik';
 import { Card as HeadlessCard } from '@qwik-ui/headless';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 
-export type CardProps = HTMLAttributes<HTMLElement>;
-
-// TODO: discuss this
+export type CardProps = OmitSignalClass<HTMLAttributes<HTMLElement>>;
 
 export const Card = component$((props: CardProps) => {
   const { class: classNames, ...rest } = props;
diff --git a/packages/kit-tailwind/src/components/checkbox/checkbox.tsx b/packages/kit-tailwind/src/components/checkbox/checkbox.tsx
@@ -1,13 +1,12 @@
 import { component$ } from '@builder.io/qwik';
 import { Checkbox as HeadlessCheckbox } from '@qwik-ui/headless';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 
-export interface CheckboxProps extends HeadlessCheckbox.CheckboxProps {
+export type CheckboxProps = OmitSignalClass<HeadlessCheckbox.CheckboxProps> & {
   label?: string;
-  class?: string;
-  labelPosition?: 'end' | 'start';
-}
 
-// TODO: discuss this
+  labelPosition?: 'end' | 'start';
+};
 
 export const Checkbox = component$((props: CheckboxProps) => {
   const { class: classNames, label, labelPosition, ...rest } = props;
diff --git a/packages/kit-tailwind/src/components/navigation-bar/navigation-bar.tsx b/packages/kit-tailwind/src/components/navigation-bar/navigation-bar.tsx
@@ -1,13 +1,12 @@
 import { component$, QwikIntrinsicElements, Slot } from '@builder.io/qwik';
 import { NavigationBar as HeadlessNavigationBar } from '@qwik-ui/headless';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 
-export type HTMLNavigationBarProps = QwikIntrinsicElements['div'];
+export type HTMLNavigationBarProps = OmitSignalClass<QwikIntrinsicElements['div']>;
 
 export const NavigationBar = component$((props: HTMLNavigationBarProps) => {
   const { class: className, ...rest } = props;
 
-  // TODO: discuss this
-
   return (
     <HeadlessNavigationBar class={['navbar', className]} {...rest}>
       <div class="navbar-start">
diff --git a/packages/kit-tailwind/src/components/progress/progress.tsx b/packages/kit-tailwind/src/components/progress/progress.tsx
@@ -1,8 +1,9 @@
 import { component$, QwikIntrinsicElements } from '@builder.io/qwik';
 import { Progress as HeadlessProgress } from '@qwik-ui/primitives';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 import { daisyConfig } from './daisy.config';
 
-export type HTMLProgressProps = QwikIntrinsicElements['progress'];
+export type HTMLProgressProps = OmitSignalClass<QwikIntrinsicElements['progress']>;
 
 export type TailwindProgressProps = {
   variant?: TailwindProgressVariants;
@@ -25,7 +26,7 @@ export const Progress = component$((props: ProgressProps) => {
   const { variant = 'primary', class: classNames, value = 0, max = 100, ...rest } = props;
 
   const { variants } = daisyConfig;
-  // TODO: discuss this
+
   return (
     <HeadlessProgress
       {...rest}
diff --git a/packages/kit-tailwind/src/components/ratio/radio.tsx b/packages/kit-tailwind/src/components/ratio/radio.tsx
@@ -5,9 +5,10 @@ import {
   component$,
 } from '@builder.io/qwik';
 import { Radio as HeadlessRadio } from '@qwik-ui/primitives';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 import { daisyConfig } from './daisy.config';
 
-export type HTMLRadioProps = QwikIntrinsicElements['input'];
+export type HTMLRadioProps = OmitSignalClass<QwikIntrinsicElements['input']>;
 
 export type TailwindRadioProps = {
   variant?: TailwindRadioVariants;
@@ -48,5 +49,3 @@ export const Radio = component$((props: RadioProps) => {
     ></HeadlessRadio>
   );
 });
-
-// TODO: discuss this
diff --git a/packages/kit-tailwind/src/components/slider/slider.tsx b/packages/kit-tailwind/src/components/slider/slider.tsx
@@ -1,19 +1,18 @@
-import { component$, PropFunction } from '@builder.io/qwik';
+import { component$, PropFunction, QwikIntrinsicElements } from '@builder.io/qwik';
 import {
   Slider as HeadlessSlider,
   SliderProgress as HeadlessSliderProgress,
   SliderThumb as HeadlessSliderThumb,
 } from '@qwik-ui/headless';
+import type { OmitSignalClass } from '@qwik-ui/type-utils';
 import { daisyConfig } from './daisy.config';
 
-export type SliderProps = {
+export type SliderProps = OmitSignalClass<QwikIntrinsicElements['div']> & {
   variant?: TailwindSliderVariants;
   value: number;
   min: number;
   max: number;
   onChange$?: PropFunction<(value: number) => void>;
-  class?: string;
-  style?: string;
 };
 
 export type TailwindSliderVariants =
@@ -35,8 +34,6 @@ export const Slider = component$(
   }: SliderProps) => {
     const { variants } = daisyConfig;
 
-    // TODO: discuss this
-
     return (
       <HeadlessSlider
         {...rest}
diff --git a/packages/kit-tailwind/src/components/toast/toast.tsx b/packages/kit-tailwind/src/components/toast/toast.tsx
@@ -1,17 +1,17 @@
-import { component$ } from '@builder.io/qwik';
+import { QwikIntrinsicElements, component$ } from '@builder.io/qwik';
 import { Toast as HeadlessToast } from '@qwik-ui/primitives';
+import { OmitSignalClass } from '@qwik-ui/type-utils';
 import { daisyConfig } from './daisy.config';
 
 export type TailwindToastVariants = 'info' | 'success' | 'warning' | 'error';
-export type TailwindToastProps = {
+export type TailwindToastProps = OmitSignalClass<QwikIntrinsicElements['div']> & {
   variant?: TailwindToastVariants;
   top?: boolean;
   end?: boolean;
   start?: boolean;
   middle?: boolean;
   bottom?: boolean;
   center?: boolean;
-  class?: string;
   label?: string;
 };
 
@@ -30,7 +30,7 @@ export const Toast = component$(
     ...rest
   }: ToastProps) => {
     const { variants, positions } = daisyConfig;
-    // TODO: discuss this
+
     return (
       <div
         class={[
diff --git a/packages/primitives/src/lib/toast/toast.tsx b/packages/primitives/src/lib/toast/toast.tsx
@@ -1,9 +1,7 @@
-export type ToastProps = {
-  /**
-   * The controlled state of the toast.
-   */
+import { QwikIntrinsicElements } from '@builder.io/qwik';
+
+export type ToastProps = QwikIntrinsicElements['div'] & {
   label?: string;
-  class?: string;
 };
 
 export const Toast = ({ label = 'New Message', ...toastProps }: ToastProps) => {
diff --git a/packages/shared/util/types/.eslintrc.json b/packages/shared/util/types/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/packages/shared/util/types/README.md b/packages/shared/util/types/README.md
@@ -0,0 +1,3 @@
+# types
+
+This library was generated with [Nx](https://nx.dev).
diff --git a/packages/shared/util/types/project.json b/packages/shared/util/types/project.json
@@ -0,0 +1,16 @@
+{
+  "name": "types-utils",
+  "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/shared/util/types/src",
+  "projectType": "library",
+  "targets": {
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["packages/shared/util/types/**/*.ts"]
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/packages/shared/util/types/src/index.ts b/packages/shared/util/types/src/index.ts
@@ -0,0 +1 @@
+export * from './omit-signal-class';
diff --git a/packages/shared/util/types/src/omit-signal-class.ts b/packages/shared/util/types/src/omit-signal-class.ts
diff --git a/packages/shared/util/types/tsconfig.json b/packages/shared/util/types/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    }
+  ]
+}
diff --git a/packages/shared/util/types/tsconfig.lib.json b/packages/shared/util/types/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.base.json b/tsconfig.base.json

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"@nx/enforce-module-boundaries": [`
`10`	`10`	`"error",`
`11`	`11`	`{`
`12`		`- "enforceBuildableLibDependency": true,`
	`12`	`+ "enforceBuildableLibDependency": false,`
`13`	`13`	`"allow": [],`
`14`	`14`	`"depConstraints": [`
`15`	`15`	`{`