Merge branch 'main' of github.com:zauberzeug/nicegui

DEPENDENCIES.md

@@ -1,16 +1,16 @@
 # Included Web Dependencies
 
-- vue: 3.3.4
-- quasar: 2.12.2
-- tailwindcss: 3.3.2
-- socket.io: 4.7.1
-- es-module-shims: 1.7.3
-- aggrid: 30.0.3
-- echarts: 5.4.3
-- highcharts: 11.1.0
-- mermaid: 10.2.4
-- nipplejs: 0.10.1
-- plotly: 2.24.3
-- three: 0.154.0
-- tween: 21.0.0
-- vanilla-jsoneditor: 0.18.0
+- vue: 3.3.4 ([MIT](https://opensource.org/licenses/MIT))
+- quasar: 2.12.2 ([MIT](https://opensource.org/licenses/MIT))
+- tailwindcss: 3.3.2 ([MIT](https://opensource.org/licenses/MIT))
+- socket.io: 4.7.1 ([MIT](https://opensource.org/licenses/MIT))
+- es-module-shims: 1.7.3 ([MIT](https://opensource.org/licenses/MIT))
+- aggrid: 30.0.3 ([MIT](https://opensource.org/licenses/MIT))
+- echarts: 5.4.3 ([Apache-2.0](https://opensource.org/licenses/Apache-2.0))
+- highcharts: 11.1.0 ([https://www.highcharts.com/license](https://www.highcharts.com/license))
+- mermaid: 10.2.4 ([MIT](https://opensource.org/licenses/MIT))
+- nipplejs: 0.10.1 ([MIT](https://opensource.org/licenses/MIT))
+- plotly: 2.24.3 ([MIT](https://opensource.org/licenses/MIT))
+- three: 0.154.0 ([MIT](https://opensource.org/licenses/MIT))
+- tween: 21.0.0 ([MIT](https://opensource.org/licenses/MIT))
+- vanilla-jsoneditor: 0.18.0 ([ISC](https://opensource.org/licenses/ISC))

fetch_tailwind.py

@@ -18,7 +18,7 @@ class Property:
 
     def __post_init__(self) -> None:
         words = [s.split('-') for s in self.members]
-        prefix = words[0]
+        prefix = words[0]  # pylint: disable=redefined-outer-name
         for w in words:
             i = 0
             while i < len(prefix) and i < len(w) and prefix[i] == w[i]:
@@ -142,13 +142,17 @@ def get_soup(url: str) -> BeautifulSoup:
     f.write('        element.update()\n')
     for property_ in properties:
         f.write('\n')
+        prefix = property_.common_prefix
         if property_.members:
             f.write(f"    def {property_.snake_title}(self, value: {property_.pascal_title}) -> Tailwind:\n")
             f.write(f'        """{property_.description}"""\n')
-            f.write(f"        self.element.classes('{property_.common_prefix}' + value)\n")
+            if '' in property_.short_members:
+                f.write(f"        self.element.classes('{prefix}' + value if value else '{prefix.rstrip('''-''')}')\n")
+            else:
+                f.write(f"        self.element.classes('{prefix}' + value)\n")
             f.write(f'        return self\n')  # pylint: disable=f-string-without-interpolation
         else:
             f.write(f"    def {property_.snake_title}(self) -> Tailwind:\n")
             f.write(f'        """{property_.description}"""\n')
-            f.write(f"        self.element.classes('{property_.common_prefix}')\n")
+            f.write(f"        self.element.classes('{prefix}')\n")
             f.write(f'        return self\n')  # pylint: disable=f-string-without-interpolation

nicegui/tailwind.py

@@ -323,12 +323,12 @@ def flex(self, value: Flex) -> Tailwind:
 
     def flex_grow(self, value: FlexGrow) -> Tailwind:
         """Utilities for controlling how flex items grow."""
-        self.element.classes('grow-' + value)
+        self.element.classes('grow-' + value if value else 'grow')
         return self
 
     def flex_shrink(self, value: FlexShrink) -> Tailwind:
         """Utilities for controlling how flex items shrink."""
-        self.element.classes('shrink-' + value)
+        self.element.classes('shrink-' + value if value else 'shrink')
         return self
 
     def order(self, value: Order) -> Tailwind:
@@ -648,12 +648,12 @@ def gradient_color_stops(self, value: GradientColorStops) -> Tailwind:
 
     def border_radius(self, value: BorderRadius) -> Tailwind:
         """Utilities for controlling the border radius of an element."""
-        self.element.classes('rounded-' + value)
+        self.element.classes('rounded-' + value if value else 'rounded')
         return self
 
     def border_width(self, value: BorderWidth) -> Tailwind:
         """Utilities for controlling the width of an element's borders."""
-        self.element.classes('border-' + value)
+        self.element.classes('border-' + value if value else 'border')
         return self
 
     def border_color(self, value: BorderColor) -> Tailwind:
@@ -693,7 +693,7 @@ def outline_color(self, value: OutlineColor) -> Tailwind:
 
     def outline_style(self, value: OutlineStyle) -> Tailwind:
         """Utilities for controlling the style of an element's outline."""
-        self.element.classes('outline-' + value)
+        self.element.classes('outline-' + value if value else 'outline')
         return self
 
     def outline_offset(self, value: OutlineOffset) -> Tailwind:
@@ -703,7 +703,7 @@ def outline_offset(self, value: OutlineOffset) -> Tailwind:
 
     def ring_width(self, value: RingWidth) -> Tailwind:
         """Utilities for creating outline rings with box-shadows."""
-        self.element.classes('ring-' + value)
+        self.element.classes('ring-' + value if value else 'ring')
         return self
 
     def ring_color(self, value: RingColor) -> Tailwind:
@@ -723,7 +723,7 @@ def ring_offset_color(self, value: RingOffsetColor) -> Tailwind:
 
     def box_shadow(self, value: BoxShadow) -> Tailwind:
         """Utilities for controlling the box shadow of an element."""
-        self.element.classes('shadow-' + value)
+        self.element.classes('shadow-' + value if value else 'shadow')
         return self
 
     def box_shadow_color(self, value: BoxShadowColor) -> Tailwind:
@@ -748,7 +748,7 @@ def background_blend_mode(self, value: BackgroundBlendMode) -> Tailwind:
 
     def blur(self, value: Blur) -> Tailwind:
         """Utilities for applying blur filters to an element."""
-        self.element.classes('blur-' + value)
+        self.element.classes('blur-' + value if value else 'blur')
         return self
 
     def brightness(self, value: Brightness) -> Tailwind:
@@ -763,12 +763,12 @@ def contrast(self, value: Contrast) -> Tailwind:
 
     def drop_shadow(self, value: DropShadow) -> Tailwind:
         """Utilities for applying drop-shadow filters to an element."""
-        self.element.classes('drop-shadow-' + value)
+        self.element.classes('drop-shadow-' + value if value else 'drop-shadow')
         return self
 
     def grayscale(self, value: Grayscale) -> Tailwind:
         """Utilities for applying grayscale filters to an element."""
-        self.element.classes('grayscale-' + value)
+        self.element.classes('grayscale-' + value if value else 'grayscale')
         return self
 
     def hue_rotate(self, value: HueRotate) -> Tailwind:
@@ -778,7 +778,7 @@ def hue_rotate(self, value: HueRotate) -> Tailwind:
 
     def invert(self, value: Invert) -> Tailwind:
         """Utilities for applying invert filters to an element."""
-        self.element.classes('invert-' + value)
+        self.element.classes('invert-' + value if value else 'invert')
         return self
 
     def saturate(self, value: Saturate) -> Tailwind:
@@ -788,12 +788,12 @@ def saturate(self, value: Saturate) -> Tailwind:
 
     def sepia(self, value: Sepia) -> Tailwind:
         """Utilities for applying sepia filters to an element."""
-        self.element.classes('sepia-' + value)
+        self.element.classes('sepia-' + value if value else 'sepia')
         return self
 
     def backdrop_blur(self, value: BackdropBlur) -> Tailwind:
         """Utilities for applying backdrop blur filters to an element."""
-        self.element.classes('backdrop-blur-' + value)
+        self.element.classes('backdrop-blur-' + value if value else 'backdrop-blur')
         return self
 
     def backdrop_brightness(self, value: BackdropBrightness) -> Tailwind:
@@ -808,7 +808,7 @@ def backdrop_contrast(self, value: BackdropContrast) -> Tailwind:
 
     def backdrop_grayscale(self, value: BackdropGrayscale) -> Tailwind:
         """Utilities for applying backdrop grayscale filters to an element."""
-        self.element.classes('backdrop-grayscale-' + value)
+        self.element.classes('backdrop-grayscale-' + value if value else 'backdrop-grayscale')
         return self
 
     def backdrop_hue_rotate(self, value: BackdropHueRotate) -> Tailwind:
@@ -818,7 +818,7 @@ def backdrop_hue_rotate(self, value: BackdropHueRotate) -> Tailwind:
 
     def backdrop_invert(self, value: BackdropInvert) -> Tailwind:
         """Utilities for applying backdrop invert filters to an element."""
-        self.element.classes('backdrop-invert-' + value)
+        self.element.classes('backdrop-invert-' + value if value else 'backdrop-invert')
         return self
 
     def backdrop_opacity(self, value: BackdropOpacity) -> Tailwind:
@@ -833,7 +833,7 @@ def backdrop_saturate(self, value: BackdropSaturate) -> Tailwind:
 
     def backdrop_sepia(self, value: BackdropSepia) -> Tailwind:
         """Utilities for applying backdrop sepia filters to an element."""
-        self.element.classes('backdrop-sepia-' + value)
+        self.element.classes('backdrop-sepia-' + value if value else 'backdrop-sepia')
         return self
 
     def border_collapse(self, value: BorderCollapse) -> Tailwind:
@@ -858,7 +858,7 @@ def caption_side(self, value: CaptionSide) -> Tailwind:
 
     def transition_property(self, value: TransitionProperty) -> Tailwind:
         """Utilities for controlling which CSS properties transition."""
-        self.element.classes('transition-' + value)
+        self.element.classes('transition-' + value if value else 'transition')
         return self
 
     def transition_duration(self, value: TransitionDuration) -> Tailwind:
@@ -933,7 +933,7 @@ def pointer_events(self, value: PointerEvents) -> Tailwind:
 
     def resize(self, value: Resize) -> Tailwind:
         """Utilities for controlling how an element can be resized."""
-        self.element.classes('resize-' + value)
+        self.element.classes('resize-' + value if value else 'resize')
         return self
 
     def scroll_behavior(self, value: ScrollBehavior) -> Tailwind:

npm.py

@@ -39,13 +39,18 @@ def download_buffered(url: str) -> Path:
     path.mkdir(exist_ok=True)
     filepath = path / url_to_filename(url)
     if not filepath.exists():
-        response = requests.get(url, headers={'User-Agent': 'Mozilla/5.0'})
+        response = requests.get(url, headers={'User-Agent': 'Mozilla/5.0'}, timeout=3)
         filepath.write_bytes(response.content)
     return filepath
 
 
 DEPENDENCIES = (Path(__file__).parent / 'DEPENDENCIES.md').open('w')
 DEPENDENCIES.write('# Included Web Dependencies\n\n')
+KNOWN_LICENSES = {
+    'MIT': 'https://opensource.org/licenses/MIT',
+    'ISC': 'https://opensource.org/licenses/ISC',
+    'Apache-2.0': 'https://opensource.org/licenses/Apache-2.0',
+}
 
 # Create a hidden folder to work in.
 tmp = cleanup(Path('.npm'))
@@ -60,8 +65,9 @@ def download_buffered(url: str) -> Path:
     npm_data = json.loads(download_buffered(f'https://registry.npmjs.org/{package_name}').read_text())
     npm_version = dependency.get('version', npm_data['dist-tags']['latest'])
     npm_tarball = npm_data['versions'][npm_version]['dist']['tarball']
-    print(f'{key}: {npm_version} - {npm_tarball}')
-    DEPENDENCIES.write(f'- {key}: {npm_version}\n')
+    license_ = npm_data['versions'][npm_version]['license']
+    print(f'{key}: {npm_version} - {npm_tarball} ({license_})')
+    DEPENDENCIES.write(f'- {key}: {npm_version} ([{license_}]({KNOWN_LICENSES.get(license_, license_)}))\n')
 
     # Handle the special case of tailwind. Hopefully remove this soon.
     if 'download' in dependency: