@effect-app/vue-components 3.0.5 → 3.0.7

package/dist/vue-components.es51.js

@@ -1,50 +1,28 @@
-import { NoopContextManager as f } from "./vue-components.es59.js";
-import { registerGlobal as s, getGlobal as p, unregisterGlobal as g } from "./vue-components.es57.js";
-import { DiagAPI as u } from "./vue-components.es54.js";
-var y = function(t, e) {
-  var a = typeof Symbol == "function" && t[Symbol.iterator];
-  if (!a) return t;
-  var n = a.call(t), o, r = [], i;
-  try {
-    for (; (e === void 0 || e-- > 0) && !(o = n.next()).done; ) r.push(o.value);
-  } catch (c) {
-    i = { error: c };
-  } finally {
-    try {
-      o && !o.done && (a = n.return) && a.call(n);
-    } finally {
-      if (i) throw i.error;
-    }
-  }
-  return r;
-}, d = function(t, e, a) {
-  if (a || arguments.length === 2) for (var n = 0, o = e.length, r; n < o; n++)
-    (r || !(n in e)) && (r || (r = Array.prototype.slice.call(e, 0, n)), r[n] = e[n]);
-  return t.concat(r || Array.prototype.slice.call(e));
-}, l = "context", _ = new f(), A = (
+import { registerGlobal as a, getGlobal as p, unregisterGlobal as s } from "./vue-components.es57.js";
+import { ProxyTracerProvider as i } from "./vue-components.es44.js";
+import { wrapSpanContext as c, isSpanContextValid as h } from "./vue-components.es47.js";
+import { deleteSpan as g, getSpan as S, getActiveSpan as x, getSpanContext as d, setSpan as f, setSpanContext as l } from "./vue-components.es58.js";
+import { DiagAPI as o } from "./vue-components.es54.js";
+var n = "trace", y = (
   /** @class */
   (function() {
     function t() {
+      this._proxyTracerProvider = new i(), this.wrapSpanContext = c, this.isSpanContextValid = h, this.deleteSpan = g, this.getSpan = S, this.getActiveSpan = x, this.getSpanContext = d, this.setSpan = f, this.setSpanContext = l;
     }
     return t.getInstance = function() {
       return this._instance || (this._instance = new t()), this._instance;
-    }, t.prototype.setGlobalContextManager = function(e) {
-      return s(l, e, u.instance());
-    }, t.prototype.active = function() {
-      return this._getContextManager().active();
-    }, t.prototype.with = function(e, a, n) {
-      for (var o, r = [], i = 3; i < arguments.length; i++)
-        r[i - 3] = arguments[i];
-      return (o = this._getContextManager()).with.apply(o, d([e, a, n], y(r), !1));
-    }, t.prototype.bind = function(e, a) {
-      return this._getContextManager().bind(e, a);
-    }, t.prototype._getContextManager = function() {
-      return p(l) || _;
+    }, t.prototype.setGlobalTracerProvider = function(r) {
+      var e = a(n, this._proxyTracerProvider, o.instance());
+      return e && this._proxyTracerProvider.setDelegate(r), e;
+    }, t.prototype.getTracerProvider = function() {
+      return p(n) || this._proxyTracerProvider;
+    }, t.prototype.getTracer = function(r, e) {
+      return this.getTracerProvider().getTracer(r, e);
     }, t.prototype.disable = function() {
-      this._getContextManager().disable(), g(l, u.instance());
+      s(n, o.instance()), this._proxyTracerProvider = new i();
     }, t;
   })()
 );
 export {
-  A as ContextAPI
+  y as TraceAPI
 };

package/dist/vue-components.es52.js

@@ -1,28 +1,13 @@
-import { registerGlobal as a, getGlobal as p, unregisterGlobal as s } from "./vue-components.es57.js";
-import { ProxyTracerProvider as i } from "./vue-components.es45.js";
-import { wrapSpanContext as c, isSpanContextValid as h } from "./vue-components.es48.js";
-import { deleteSpan as g, getSpan as S, getActiveSpan as x, getSpanContext as d, setSpan as f, setSpanContext as l } from "./vue-components.es58.js";
-import { DiagAPI as o } from "./vue-components.es54.js";
-var n = "trace", y = (
-  /** @class */
-  (function() {
-    function t() {
-      this._proxyTracerProvider = new i(), this.wrapSpanContext = c, this.isSpanContextValid = h, this.deleteSpan = g, this.getSpan = S, this.getActiveSpan = x, this.getSpanContext = d, this.setSpan = f, this.setSpanContext = l;
-    }
-    return t.getInstance = function() {
-      return this._instance || (this._instance = new t()), this._instance;
-    }, t.prototype.setGlobalTracerProvider = function(r) {
-      var e = a(n, this._proxyTracerProvider, o.instance());
-      return e && this._proxyTracerProvider.setDelegate(r), e;
-    }, t.prototype.getTracerProvider = function() {
-      return p(n) || this._proxyTracerProvider;
-    }, t.prototype.getTracer = function(r, e) {
-      return this.getTracerProvider().getTracer(r, e);
-    }, t.prototype.disable = function() {
-      s(n, o.instance()), this._proxyTracerProvider = new i();
-    }, t;
-  })()
-);
+import { useStore as u } from "@tanstack/vue-form";
+import { computed as f } from "vue";
+function c(o, t) {
+  return f(() => t ? u(o.store, (n) => {
+    const r = {};
+    for (const e of t)
+      r[e] = n[e];
+    return r;
+  }).value : {});
+}
 export {
-  y as TraceAPI
+  c as getOmegaStore
 };

package/dist/vue-components.es53.js

@@ -1,13 +1,6 @@
-import { useStore as u } from "@tanstack/vue-form";
-import { computed as f } from "vue";
-function c(o, t) {
-  return f(() => t ? u(o.store, (n) => {
-    const r = {};
-    for (const e of t)
-      r[e] = n[e];
-    return r;
-  }).value : {});
-}
+(function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
+import o from "./vue-components.es38.js";
+
 export {
-  c as getOmegaStore
+  o as default
 };

package/dist/vue-components.es54.js

@@ -1,6 +1,6 @@
 import { DiagComponentLogger as m } from "./vue-components.es55.js";
 import { createLogLevelDiagLogger as y } from "./vue-components.es56.js";
-import { DiagLogLevel as d } from "./vue-components.es42.js";
+import { DiagLogLevel as d } from "./vue-components.es41.js";
 import { unregisterGlobal as p, getGlobal as v, registerGlobal as w } from "./vue-components.es57.js";
 var b = function(i, n) {
   var r = typeof Symbol == "function" && i[Symbol.iterator];

package/dist/vue-components.es56.js

@@ -1,4 +1,4 @@
-import { DiagLogLevel as r } from "./vue-components.es42.js";
+import { DiagLogLevel as r } from "./vue-components.es41.js";
 function c(n, o) {
   n < r.NONE ? n = r.NONE : n > r.ALL && (n = r.ALL), o = o || {};
   function i(t, f) {

package/dist/vue-components.es58.js

@@ -1,6 +1,6 @@
-import { createContextKey as o } from "./vue-components.es41.js";
-import { NonRecordingSpan as a } from "./vue-components.es50.js";
-import { ContextAPI as u } from "./vue-components.es51.js";
+import { createContextKey as o } from "./vue-components.es40.js";
+import { NonRecordingSpan as a } from "./vue-components.es49.js";
+import { ContextAPI as u } from "./vue-components.es50.js";
 var n = o("OpenTelemetry Context Key SPAN");
 function r(e) {
   return e.getValue(n) || void 0;

package/dist/vue-components.es59.js

@@ -1,4 +1,4 @@
-import { ROOT_CONTEXT as l } from "./vue-components.es41.js";
+import { ROOT_CONTEXT as l } from "./vue-components.es40.js";
 var c = function(t, o) {
   var n = typeof Symbol == "function" && t[Symbol.iterator];
   if (!n) return t;

package/dist/vue-components.es7.js

@@ -1,7 +1,7 @@
 (function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
 import { defineComponent as N, computed as n, getCurrentInstance as k, useAttrs as q, useSlots as B, useId as S, renderSlot as d, normalizeProps as s, guardReactiveProps as p, createElementVNode as w, normalizeClass as F, createBlock as I, createCommentVNode as L, unref as A, openBlock as O, mergeProps as R, createSlots as V, withCtx as z } from "vue";
 import { useStore as f } from "@tanstack/vue-form";
-import T from "./vue-components.es30.js";
+import T from "./vue-components.es38.js";
 
 const H = /* @__PURE__ */ N({
   inheritAttrs: !1,
@@ -48,8 +48,8 @@ const H = /* @__PURE__ */ N({
         required: l.value,
         minLength: e.meta?.type === "string" && e.meta?.minLength,
         maxLength: e.meta?.type === "string" && e.meta?.maxLength,
-        max: e.meta?.type === "number" && (e.meta?.maximum ?? (typeof e.meta?.exclusiveMaximum == "number" && e.meta.exclusiveMaximum - 1)),
-        min: e.meta?.type === "number" && (e.meta?.minimum ?? (typeof e.meta?.exclusiveMinimum == "number" && e.meta.exclusiveMinimum + 1)),
+        max: (e.meta?.type === "number" || e.meta?.type === "int") && (e.meta?.maximum ?? (typeof e.meta?.exclusiveMaximum == "number" && e.meta.exclusiveMaximum - 1)),
+        min: (e.meta?.type === "number" || e.meta?.type === "int") && (e.meta?.minimum ?? (typeof e.meta?.exclusiveMinimum == "number" && e.meta.exclusiveMinimum + 1)),
         errorMessages: m.value,
         error: !!m.value.length,
         type: C.value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.19.3",

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -246,7 +246,7 @@ export type StringFieldMeta = BaseFieldMeta & {
 }
 
 export type NumberFieldMeta = BaseFieldMeta & {
-  type: "number"
+  type: "number" | "int"
   minimum?: number
   maximum?: number
   exclusiveMinimum?: number
@@ -346,12 +346,23 @@ export const createMeta = <T = any>(
 ): MetaRecord<T> | FieldMeta => {
   // unwraps class (Class are transformations)
   // this calls createMeta recursively, so wrapped transformations are also unwrapped
+  // BUT: check for Int title annotation first - S.Int and branded Int have title "Int" or "int"
+  // and we don't want to lose that information by unwrapping
   if (property && property._tag === "Transformation") {
-    return createMeta<T>({
-      parent,
-      meta,
-      property: property.from
-    })
+    const titleOnTransform = S
+      .AST
+      .getAnnotation(property, S.AST.TitleAnnotationId)
+      .pipe(Option.getOrElse(() => ""))
+
+    // only unwrap if this is NOT an Int type
+    if (titleOnTransform !== "Int" && titleOnTransform !== "int") {
+      return createMeta<T>({
+        parent,
+        meta,
+        property: property.from
+      })
+    }
+    // if it's Int, fall through to process it with the Int type
   }
 
   if (property?._tag === "TypeLiteral" && "propertySignatures" in property) {
@@ -655,24 +666,32 @@ export const createMeta = <T = any>(
 
     meta = { ...JSONAnnotation, ...meta }
 
-    if ("from" in property) {
+    // check the title annotation BEFORE following "from" to detect refinements like S.Int
+    const titleType = S
+      .AST
+      .getAnnotation(
+        property,
+        S.AST.TitleAnnotationId
+      )
+      .pipe(
+        Option.getOrElse(() => {
+          return "unknown"
+        })
+      )
+
+    // if this is S.Int (a refinement), set the type and skip following "from"
+    // otherwise we'd lose the "Int" information and get "number" instead
+    if (titleType === "Int" || titleType === "int") {
+      meta["type"] = "int"
+      // don't follow "from" for Int refinements
+    } else if ("from" in property) {
       return createMeta<T>({
         parent,
         meta,
         property: property.from
       })
     } else {
-      meta["type"] = S
-        .AST
-        .getAnnotation(
-          property,
-          S.AST.TitleAnnotationId
-        )
-        .pipe(
-          Option.getOrElse(() => {
-            return "unknown"
-          })
-        )
+      meta["type"] = titleType
     }
 
     return meta as FieldMeta
@@ -869,9 +888,59 @@ export const generateInputStandardSchemaFromFieldMeta = (
       }
       break
 
+    case "int": {
+      // create a custom integer schema with translations
+      // S.Number with empty message, then S.int with integer message
+      schema = S
+        .Number
+        .annotations({
+          message: () => trans("validation.empty")
+        })
+        .pipe(
+          S.int({ message: (issue) => trans("validation.integer.expected", { actualValue: String(issue.actual) }) })
+        )
+      if (typeof meta.minimum === "number") {
+        schema = schema.pipe(S.greaterThanOrEqualTo(meta.minimum)).annotations({
+          message: () =>
+            trans(meta.minimum === 0 ? "validation.number.positive" : "validation.number.min", {
+              minimum: meta.minimum,
+              isExclusive: true
+            })
+        })
+      }
+      if (typeof meta.maximum === "number") {
+        schema = schema.pipe(S.lessThanOrEqualTo(meta.maximum)).annotations({
+          message: () =>
+            trans("validation.number.max", {
+              maximum: meta.maximum,
+              isExclusive: true
+            })
+        })
+      }
+      if (typeof meta.exclusiveMinimum === "number") {
+        schema = schema.pipe(S.greaterThan(meta.exclusiveMinimum)).annotations({
+          message: () =>
+            trans(meta.exclusiveMinimum === 0 ? "validation.number.positive" : "validation.number.min", {
+              minimum: meta.exclusiveMinimum,
+              isExclusive: false
+            })
+        })
+      }
+      if (typeof meta.exclusiveMaximum === "number") {
+        schema = schema.pipe(S.lessThan(meta.exclusiveMaximum)).annotations({
+          message: () =>
+            trans("validation.number.max", {
+              maximum: meta.exclusiveMaximum,
+              isExclusive: false
+            })
+        })
+      }
+      break
+    }
+
     case "number":
       schema = S.Number.annotations({
-        message: () => trans("validation.empty")
+        message: () => trans("validation.number.expected", { actualValue: "NaN" })
       })
 
       if (meta.required) {

package/src/components/OmegaForm/OmegaInputVuetify.vue

@@ -81,12 +81,12 @@
     </v-textarea>
     <component
       :is="inputProps.type === 'range' ? 'v-slider' : 'v-text-field'"
-      v-if="inputProps.type === 'number' || inputProps.type === 'range'"
+      v-if="inputProps.type === 'number' || inputProps.type === 'int' || inputProps.type === 'range'"
       :id="inputProps.id"
       :required="inputProps.required"
       :min="inputProps.min"
       :max="inputProps.max"
-      :type="inputProps.type"
+      :type="inputProps.type === 'int' ? 'number' : inputProps.type"
       :name="field.name"
       :label="inputProps.label"
       :error-messages="inputProps.errorMessages"

package/src/components/OmegaForm/OmegaInternalInput.vue

@@ -162,10 +162,10 @@ const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
     required: isRequired.value,
     minLength: props.meta?.type === "string" && props.meta?.minLength,
     maxLength: props.meta?.type === "string" && props.meta?.maxLength,
-    max: props.meta?.type === "number"
+    max: (props.meta?.type === "number" || props.meta?.type === "int")
       && (props.meta?.maximum
         ?? (typeof props.meta?.exclusiveMaximum === "number" && props.meta.exclusiveMaximum - 1)),
-    min: props.meta?.type === "number"
+    min: (props.meta?.type === "number" || props.meta?.type === "int")
       && (props.meta?.minimum
         ?? (typeof props.meta?.exclusiveMinimum === "number" && props.meta.exclusiveMinimum + 1)),
     errorMessages: errors.value,

package/dist/vue-components.es34.js

@@ -1,4 +0,0 @@
-import f from "./vue-components.es19.js";
-export {
-  f as default
-};

package/dist/vue-components.es37.js

@@ -1,9 +0,0 @@
-const s = (t, e) => {
-  const o = t.__vccOpts || t;
-  for (const [r, c] of e)
-    o[r] = c;
-  return o;
-};
-export {
-  s as default
-};