@likable-hair/svelte 3.1.26 → 3.1.28

package/dist/components/simple/forms/Autocomplete.css

@@ -10,4 +10,5 @@
   --autocomplete-default-padding: 0.5rem .5rem .5rem .5rem;
   --autocomplete-default-border-radius: 1.5rem;
   --autocomplete-default-options-max-width: 100%;
+  --autocomplete-default-input-margin-left: 4px;
 }

package/dist/components/simple/forms/Autocomplete.svelte

@@ -205,12 +205,6 @@ import MenuOrDrawer from "../../composed/common/MenuOrDrawer.svelte";
       {/if}
 
       <input 
-        style:--simple-textfield-max-width="min(200px, 90%)"
-        style:--simple-textfield-height="auto"
-        style:--simple-textfield-padding="0px"
-        style:--simple-textfield-default-background-color="rgb(1, 1, 1, 0)"
-        style:--simple-textfield-default-margin-bottom="0px"
-        style:--simple-textfield-default-margin-left="10px"
         class="autocomplete-input"
         bind:value={searchText}
         on:focus={handleTextFieldFocus}
@@ -426,7 +420,10 @@ import MenuOrDrawer from "../../composed/common/MenuOrDrawer.svelte";
 
   .autocomplete-input {
     background-color: rgb(1, 1, 1, 0);
-    /* margin-left: 10px; */
+    margin-left: var(
+      --autocomplete-input-margin-left,
+      var(--autocomplete-default-input-margin-left)
+    );
     outline: none;
     border: none;
     color: inherit;

package/dist/components/simple/media/DescriptiveAvatar.svelte

@@ -23,6 +23,7 @@ export let src = void 0, title = void 0, subtitle = void 0, avatarText = !title
         {#if !!title}
           <div 
             class="font-bold title"
+            class:text-start={direction == 'row' && !reverse}
             class:text-center={direction == 'column'}
             class:text-end={direction == 'row' && reverse}
           >{title}</div>
@@ -30,6 +31,7 @@ export let src = void 0, title = void 0, subtitle = void 0, avatarText = !title
         {#if !!subtitle}
           <div 
             class="subtitle"
+            class:text-start={direction == 'row' && !reverse}
             class:text-center={direction == 'column'}
             class:text-end={direction == 'row' && reverse}
           >{subtitle}</div>
@@ -160,6 +162,10 @@ export let src = void 0, title = void 0, subtitle = void 0, avatarText = !title
     text-align: end;
   }
 
+  .text-end {
+    text-align: start;
+  }
+
   .title {
     font-size: var(
       --descriptive-avatar-title-font-size,

package/dist/utils/filters/builder.d.ts

@@ -8,8 +8,9 @@ export type JsonQuery = {
     modifiers: Modifier[];
 };
 export default class Builder {
-    private modifiers;
+    private _modifiers;
     constructor();
+    get modifiers(): Modifier[];
     where(callback: (builder: Builder) => void): Builder;
     where(key: Record<string, WhereFilterValue>): Builder;
     where(key: string, value: WhereFilterValue): Builder;
@@ -52,6 +53,8 @@ export default class Builder {
     join(table: string, onCallback: (onBuilder: OnClauseBuilder) => void): this;
     leftJoin(table: string, onCallback: (onBuilder: OnClauseBuilder) => void): this;
     rightJoin(table: string, onCallback: (onBuilder: OnClauseBuilder) => void): this;
+    hasModifier(builderCallback: (builder: Builder) => Builder): boolean;
+    hasWhereOnColumn(column: string, modifiers?: Modifier[] | undefined): boolean;
     private applyJoinClause;
     toJson(): JsonQuery;
     select(fields: string | string[]): this;

package/dist/utils/filters/builder.js

@@ -1,7 +1,11 @@
+import lodash from "lodash";
 export default class Builder {
-    modifiers = [];
+    _modifiers = [];
     constructor() {
-        this.modifiers = [];
+        this._modifiers = [];
+    }
+    get modifiers() {
+        return lodash.cloneDeep(this._modifiers);
     }
     where(first, second, third) {
         return this.applyWhereClause('and', first, second, third);
@@ -43,16 +47,16 @@ export default class Builder {
         if (typeof second == 'function') {
             let inBuilder = new Builder();
             second(inBuilder);
-            this.modifiers.push({
+            this._modifiers.push({
                 method: 'where',
                 kind: 'inBuilder',
                 logicalOperator: logicalOperator,
                 key: key,
-                children: inBuilder.modifiers.filter((el) => el.method == 'where' || el.method == 'select')
+                children: inBuilder._modifiers.filter((el) => el.method == 'where' || el.method == 'select')
             });
         }
         else {
-            this.modifiers.push({
+            this._modifiers.push({
                 method: 'where',
                 kind: 'in',
                 logicalOperator: logicalOperator,
@@ -75,7 +79,7 @@ export default class Builder {
         return this.applyWhereNullClause('orNot', key);
     }
     applyWhereNullClause(logicalOperator, key) {
-        this.modifiers.push({
+        this._modifiers.push({
             method: 'where',
             kind: 'null',
             logicalOperator: logicalOperator,
@@ -86,7 +90,7 @@ export default class Builder {
     applyWhereClause(logicalOperator, first, second, third) {
         if (third !== undefined) {
             if (!!second && typeof first == 'string' && typeof second == 'string') {
-                this.modifiers.push({
+                this._modifiers.push({
                     method: 'where',
                     kind: 'simple',
                     key: first,
@@ -96,7 +100,7 @@ export default class Builder {
                 });
             }
             else if (typeof first == 'object') {
-                this.modifiers.push({
+                this._modifiers.push({
                     method: 'where',
                     kind: 'object',
                     values: first,
@@ -105,7 +109,7 @@ export default class Builder {
             }
         }
         else if (typeof first == 'string' && second !== undefined) {
-            this.modifiers.push({
+            this._modifiers.push({
                 method: 'where',
                 kind: 'simple',
                 key: first,
@@ -116,20 +120,20 @@ export default class Builder {
         else if (typeof first == 'function') {
             let builder = new Builder();
             first(builder);
-            if (!builder.modifiers.every(el => el.method == 'where'))
+            if (!builder._modifiers.every(el => el.method == 'where'))
                 throw new Error('inconsistent json query from where callback');
-            this.modifiers.push({
+            this._modifiers.push({
                 method: 'where',
                 kind: 'grouped',
                 logicalOperator,
-                children: builder.modifiers.filter((el) => el.method == 'where')
+                children: builder._modifiers.filter((el) => el.method == 'where')
             });
         }
         return this;
     }
     applyWhereColumnClause(logicalOperator, first, second, third) {
         if (third !== undefined) {
-            this.modifiers.push({
+            this._modifiers.push({
                 method: 'where',
                 kind: 'column',
                 key: first,
@@ -139,7 +143,7 @@ export default class Builder {
             });
         }
         else {
-            this.modifiers.push({
+            this._modifiers.push({
                 method: 'where',
                 kind: 'column',
                 key: first,
@@ -150,7 +154,7 @@ export default class Builder {
         return this;
     }
     applyWhereJsonSupersetClause(logicalOperator, first, second) {
-        this.modifiers.push({
+        this._modifiers.push({
             method: 'where',
             kind: 'jsonSuperset',
             key: first,
@@ -177,8 +181,31 @@ export default class Builder {
         this.applyJoinClause('right', table, onBuilder.json);
         return this;
     }
+    hasModifier(builderCallback) {
+        let parameterBuilder = new Builder();
+        parameterBuilder = builderCallback(parameterBuilder);
+        for (let i = 0; i < parameterBuilder._modifiers.length; i += 1) {
+            let modifierToSearch = parameterBuilder._modifiers[i];
+            let found = false;
+            for (let k = 0; k < this._modifiers.length; k += 1) {
+                let currentModifier = this._modifiers[k];
+                found = lodash.isEqual(modifierToSearch, currentModifier);
+                if (found)
+                    break;
+            }
+            if (!found)
+                return false;
+        }
+        return true;
+    }
+    hasWhereOnColumn(column, modifiers = undefined) {
+        return (modifiers || this._modifiers).some((m) => {
+            return m.method == 'where' &&
+                ((m.kind == 'column' && m.key == column) || (m.kind == 'grouped' && this.hasWhereOnColumn(column, m.children)) || (m.kind == 'in' && m.key == column) || (m.kind == 'inBuilder' && this.hasWhereOnColumn(column, m.children)) || (m.kind == 'jsonSuperset' && m.key == column) || (m.kind == 'null' && m.key == column) || (m.kind == 'object' && Object.keys(m.values).includes(column)) || (m.kind == 'simple' && m.key == column));
+        });
+    }
     applyJoinClause(kind, table, on) {
-        this.modifiers.push({
+        this._modifiers.push({
             method: 'join',
             kind: kind,
             on: on,
@@ -188,25 +215,25 @@ export default class Builder {
     }
     toJson() {
         return {
-            modifiers: this.modifiers
+            modifiers: this._modifiers
         };
     }
     select(fields) {
-        this.modifiers.push({
+        this._modifiers.push({
             method: 'select',
             fields: fields
         });
         return this;
     }
     from(from) {
-        this.modifiers.push({
+        this._modifiers.push({
             method: 'from',
             from: from
         });
         return this;
     }
     orderBy(sortBy, sortDirection) {
-        this.modifiers.push({
+        this._modifiers.push({
             method: 'orderBy',
             sortBy: sortBy,
             sortDirection: sortDirection

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@likable-hair/svelte",
   "description": "A Svelte component for likablehair and others",
-  "version": "3.1.26",
+  "version": "3.1.28",
   "scripts": {
     "host": "vite --host",
     "dev": "vite dev",