effect-app 0.199.0 → 0.201.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @effect-app/prelude
 
+## 0.201.0
+
+### Minor Changes
+
+- 290a709: update packages
+
+### Patch Changes
+
+- Updated dependencies [290a709]
+  - @effect-app/schema@0.220.0
+  - @effect-app/core@0.169.0
+
+## 0.200.0
+
+### Minor Changes
+
+- 564a95c: fix branded schemas
+
+### Patch Changes
+
+- Updated dependencies [564a95c]
+  - @effect-app/schema@0.219.0
+
 ## 0.199.0
 
 ### Minor Changes

package/_cjs/schema.cjs

@@ -13,17 +13,15 @@ var _exportNames = {
 };
 exports.taggedUnion = exports.makeIsAnyOf = exports.makeIs = exports.extendTaggedUnion = exports.PhoneNumber = exports.Email = void 0;
 var _core = require("@effect-app/core");
-var _validation = require("@effect-app/core/validation");
-var _schema = _interopRequireWildcard(require("@effect-app/schema"));
-var S = _schema;
-Object.keys(_schema).forEach(function (key) {
+var S = _interopRequireWildcard(require("@effect-app/schema"));
+Object.keys(S).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _schema[key]) return;
+  if (key in exports && exports[key] === S[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _schema[key];
+      return S[key];
     }
   });
 });
@@ -31,27 +29,13 @@ var _faker = require("./faker.cjs");
 var _utils = require("./utils.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const Email = exports.Email = S.string.pipe(S.filter(_validation.isValidEmail, {
-  title: "Email",
-  description: "an email according to RFC 5322",
-  jsonSchema: {
-    format: "email"
-  },
+const Email = exports.Email = S.Email.pipe(S.annotations({
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  arbitrary: () => (0, _faker.fakerArb)(faker => faker.internet.exampleEmail)
-}), (0, _schema.fromBrand)((0, _schema.nominal)(), {
-  jsonSchema: {}
+  arbitrary: () => fc => (0, _faker.fakerArb)(faker => faker.internet.exampleEmail)(fc).map(Email)
 }), S.withDefaults);
-const PhoneNumber = exports.PhoneNumber = S.string.pipe(S.filter(_validation.isValidPhone, {
-  title: "PhoneNumber",
-  description: "a phone number with at least 7 digits",
-  jsonSchema: {
-    format: "phone"
-  },
+const PhoneNumber = exports.PhoneNumber = S.PhoneNumber.pipe(S.annotations({
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  arbitrary: () => (0, _faker.fakerArb)(faker => faker.phone.number)
-}), (0, _schema.fromBrand)((0, _schema.nominal)(), {
-  jsonSchema: {}
+  arbitrary: () => fc => (0, _faker.fakerArb)(faker => faker.phone.number)(fc).map(PhoneNumber)
 }), S.withDefaults);
 const makeIs = schema => {
   if (S.AST.isUnion(schema.ast)) {

package/_cjs/schema.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema.cjs","names":["_core","require","_validation","_schema","_interopRequireWildcard","S","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_faker","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","Email","string","pipe","filter","isValidEmail","title","description","jsonSchema","format","arbitrary","fakerArb","faker","internet","exampleEmail","fromBrand","nominal","withDefaults","PhoneNumber","isValidPhone","phone","number","makeIs","schema","AST","isUnion","ast","types","reduce","acc","isTransform","isDeclaration","to","from","isTypeLiteral","tag","ReadonlyArray","findFirst","propertySignatures","_","name","isLiteral","type","Option","some","none","getOrUndefined","String","literal","x","_tag","Error","makeIsAnyOf","includes","extendTaggedUnion","extendM","is","isAnyOf","taggedUnion","union"],"sources":["../src/schema.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAC,uBAAA,CAAAH,OAAA;AAAuH,IAAAI,CAAA,GAAAF,OAAA;AA6FvHG,MAAA,CAAAC,IAAA,CAAAJ,OAAA,EAAAK,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAN,OAAA,CAAAM,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAd,OAAA,CAAAM,GAAA;IAAA;EAAA;AAAA;AA3FA,IAAAS,MAAA,GAAAjB,OAAA;AACA,IAAAkB,MAAA,GAAAlB,OAAA;AAAoC,SAAAmB,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAjB,wBAAAiB,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAP,GAAA,CAAAI,CAAA,OAAAO,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAxB,MAAA,CAAAS,cAAA,IAAAT,MAAA,CAAAyB,wBAAA,WAAAC,CAAA,IAAAX,CAAA,oBAAAW,CAAA,OAAArB,cAAA,CAAAC,IAAA,CAAAS,CAAA,EAAAW,CAAA,SAAAC,CAAA,GAAAH,CAAA,GAAAxB,MAAA,CAAAyB,wBAAA,CAAAV,CAAA,EAAAW,CAAA,UAAAC,CAAA,KAAAA,CAAA,CAAAhB,GAAA,IAAAgB,CAAA,CAAAC,GAAA,IAAA5B,MAAA,CAAAS,cAAA,CAAAa,CAAA,EAAAI,CAAA,EAAAC,CAAA,IAAAL,CAAA,CAAAI,CAAA,IAAAX,CAAA,CAAAW,CAAA,YAAAJ,CAAA,CAAAF,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAU,GAAA,CAAAb,CAAA,EAAAO,CAAA,GAAAA,CAAA;AAE7B,MAAMO,KAAK,GAAArB,OAAA,CAAAqB,KAAA,GAAG9B,CAAC,CACnB+B,MAAM,CACNC,IAAI,CACHhC,CAAC,CAACiC,MAAM,CAACC,wBAAY,EAAE;EACrBC,KAAK,EAAE,OAAO;EACdC,WAAW,EAAE,gCAAgC;EAC7CC,UAAU,EAAE;IAAEC,MAAM,EAAE;EAAO,CAAE;EAC/B;EACAC,SAAS,EAAEA,CAAA,KAA2B,IAAAC,eAAQ,EAAEC,KAAK,IAAKA,KAAK,CAACC,QAAQ,CAACC,YAAY;CACtF,CAAC,EACF,IAAAC,iBAAS,EAAC,IAAAC,eAAO,GAAS,EAAE;EAAER,UAAU,EAAE;AAAE,CAAE,CAAC,EAC/CrC,CAAC,CAAC8C,YAAY,CACf;AAII,MAAMC,WAAW,GAAAtC,OAAA,CAAAsC,WAAA,GAAG/C,CAAC,CACzB+B,MAAM,CACNC,IAAI,CACHhC,CAAC,CAACiC,MAAM,CAACe,wBAAY,EAAE;EACrBb,KAAK,EAAE,aAAa;EACpBC,WAAW,EAAE,uCAAuC;EACpDC,UAAU,EAAE;IAAEC,MAAM,EAAE;EAAO,CAAE;EAC/B;EACAC,SAAS,EAAEA,CAAA,KAA2B,IAAAC,eAAQ,EAAEC,KAAK,IAAKA,KAAK,CAACQ,KAAK,CAACC,MAAM;CAC7E,CAAC,EACF,IAAAN,iBAAS,EAAC,IAAAC,eAAO,GAAe,EAAE;EAAER,UAAU,EAAE;AAAE,CAAE,CAAC,EACrDrC,CAAC,CAAC8C,YAAY,CACf;AAEI,MAAMK,MAAM,GACjBC,MAAyB,IACvB;EACF,IAAIpD,CAAC,CAACqD,GAAG,CAACC,OAAO,CAACF,MAAM,CAACG,GAAG,CAAC,EAAE;IAC7B,OAAOH,MAAM,CAACG,GAAG,CAACC,KAAK,CAACC,MAAM,CAAC,CAACC,GAAG,EAAEvC,CAAC,KAAI;MACxC,IAAInB,CAAC,CAACqD,GAAG,CAACM,WAAW,CAACxC,CAAC,CAAC,EAAE;QACxB,IAAInB,CAAC,CAACqD,GAAG,CAACO,aAAa,CAACzC,CAAC,CAAC0C,EAAE,CAAC,EAAE;UAC7B1C,CAAC,GAAGA,CAAC,CAAC2C,IAAI;QACZ,CAAC,MAAM;UACL3C,CAAC,GAAGA,CAAC,CAAC0C,EAAE;QACV;MACF;MACA,IAAI,CAAC7D,CAAC,CAACqD,GAAG,CAACU,aAAa,CAAC5C,CAAC,CAAC,EAAE,OAAOuC,GAAG;MACvC,MAAMM,GAAG,GAAGC,mBAAa,CAACC,SAAS,CAAC/C,CAAC,CAACgD,kBAAkB,EAAGC,CAAC,IAAI;QAC9D,IAAIA,CAAC,CAACC,IAAI,KAAK,MAAM,IAAIrE,CAAC,CAACqD,GAAG,CAACiB,SAAS,CAACF,CAAC,CAACG,IAAI,CAAC,EAAE;UAChD,OAAOC,YAAM,CAACC,IAAI,CAACL,CAAC,CAACG,IAAI,CAAC;QAC5B;QACA,OAAOC,YAAM,CAACE,IAAI,EAAE;MACtB,CAAC,CAAC;MACF,MAAMnB,GAAG,GAAGiB,YAAM,CAACG,cAAc,CAACX,GAAG,CAAC;MACtC,IAAI,CAACT,GAAG,EAAE;QACR,OAAOG,GAAG;MACZ;MACA,OAAO;QACL,GAAGA,GAAG;QACN,CAACkB,MAAM,CAACrB,GAAG,CAACsB,OAAO,CAAC,GAAIC,CAAmB,IAAKA,CAAC,CAACC,IAAI,KAAKxB,GAAG,CAACsB;OAChE;IACH,CAAC,EAAE,EAAW,CAAC;EACjB;EACA,MAAM,IAAIG,KAAK,CAAC,aAAa,CAAC;AAChC,CAAC;AAAAvE,OAAA,CAAA0C,MAAA,GAAAA,MAAA;AAEM,MAAM8B,WAAW,GACtB7B,MAAyB,IACb;EACZ,IAAIpD,CAAC,CAACqD,GAAG,CAACC,OAAO,CAACF,MAAM,CAACG,GAAG,CAAC,EAAE;IAC7B,OAAO,CAA2B,GAAGrD,IAAU,KAAMuB,CAAI,IACvDvB,IAAI,CAACgF,QAAQ,CAACzD,CAAC,CAACsD,IAAI,CAAC;EACzB;EACA,MAAM,IAAIC,KAAK,CAAC,aAAa,CAAC;AAChC,CAAC;AAAAvE,OAAA,CAAAwE,WAAA,GAAAA,WAAA;AAEM,MAAME,iBAAiB,GAC5B/B,MAAyB,IACtB,IAAAgC,cAAO,EAAChC,MAAM,EAAGgB,CAAC,KAAM;EAAEiB,EAAE,EAAElC,MAAM,CAACiB,CAAC,CAAC;EAAEkB,OAAO,EAAEL,WAAW,CAACb,CAAC;AAAC,CAAE,CAAC,CAAC;AAAA3D,OAAA,CAAA0E,iBAAA,GAAAA,iBAAA;AASlE,MAAMI,WAAW,GAAGA,CAAkE,GAAG9D,CAAU,KACxG,IAAAO,UAAI,EAAChC,CAAC,CAACwF,KAAK,CAAC,GAAG/D,CAAC,CAAC,EAAG2C,CAAC,IAAK,IAAAgB,cAAO,EAAChB,CAAC,EAAGA,CAAC,KAAM;EAAEiB,EAAE,EAAElC,MAAM,CAACiB,CAAC,CAAC;EAAEkB,OAAO,EAAEL,WAAW,CAACb,CAAC;AAAC,CAAE,CAAC,CAAC,CAAC;AAAA3D,OAAA,CAAA8E,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"file":"schema.cjs","names":["_core","require","S","_interopRequireWildcard","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_faker","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","Email","pipe","annotations","arbitrary","fc","fakerArb","faker","internet","exampleEmail","map","withDefaults","PhoneNumber","phone","number","makeIs","schema","AST","isUnion","ast","types","reduce","acc","isTransform","isDeclaration","to","from","isTypeLiteral","tag","ReadonlyArray","findFirst","propertySignatures","_","name","isLiteral","type","Option","some","none","getOrUndefined","String","literal","x","_tag","Error","makeIsAnyOf","includes","extendTaggedUnion","extendM","is","isAnyOf","taggedUnion","union"],"sources":["../src/schema.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,CAAA,GAAAC,uBAAA,CAAAF,OAAA;AAIAG,MAAA,CAAAC,IAAA,CAAAH,CAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,CAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,CAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AAHA,IAAAS,MAAA,GAAAf,OAAA;AACA,IAAAgB,MAAA,GAAAhB,OAAA;AAAoC,SAAAiB,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAhB,wBAAAgB,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAP,GAAA,CAAAI,CAAA,OAAAO,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAxB,MAAA,CAAAS,cAAA,IAAAT,MAAA,CAAAyB,wBAAA,WAAAC,CAAA,IAAAX,CAAA,oBAAAW,CAAA,OAAArB,cAAA,CAAAC,IAAA,CAAAS,CAAA,EAAAW,CAAA,SAAAC,CAAA,GAAAH,CAAA,GAAAxB,MAAA,CAAAyB,wBAAA,CAAAV,CAAA,EAAAW,CAAA,UAAAC,CAAA,KAAAA,CAAA,CAAAhB,GAAA,IAAAgB,CAAA,CAAAC,GAAA,IAAA5B,MAAA,CAAAS,cAAA,CAAAa,CAAA,EAAAI,CAAA,EAAAC,CAAA,IAAAL,CAAA,CAAAI,CAAA,IAAAX,CAAA,CAAAW,CAAA,YAAAJ,CAAA,CAAAF,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAU,GAAA,CAAAb,CAAA,EAAAO,CAAA,GAAAA,CAAA;AAI7B,MAAMO,KAAK,GAAArB,OAAA,CAAAqB,KAAA,GAAG/B,CAAC,CACnB+B,KAAK,CACLC,IAAI,CACHhC,CAAC,CAACiC,WAAW,CAAC;EACZ;EACAC,SAAS,EAAEA,CAAA,KAA2BC,EAAE,IAAK,IAAAC,eAAQ,EAAEC,KAAK,IAAKA,KAAK,CAACC,QAAQ,CAACC,YAAY,CAAC,CAACJ,EAAE,CAAC,CAACK,GAAG,CAACT,KAAK;CAC5G,CAAC,EACF/B,CAAC,CAACyC,YAAY,CACf;AAII,MAAMC,WAAW,GAAAhC,OAAA,CAAAgC,WAAA,GAAG1C,CAAC,CACzB0C,WAAW,CACXV,IAAI,CACHhC,CAAC,CAACiC,WAAW,CAAC;EACZ;EACAC,SAAS,EAAEA,CAAA,KAAiCC,EAAE,IAAK,IAAAC,eAAQ,EAAEC,KAAK,IAAKA,KAAK,CAACM,KAAK,CAACC,MAAM,CAAC,CAACT,EAAE,CAAC,CAACK,GAAG,CAACE,WAAW;CAC/G,CAAC,EACF1C,CAAC,CAACyC,YAAY,CACf;AAEI,MAAMI,MAAM,GACjBC,MAAyB,IACvB;EACF,IAAI9C,CAAC,CAAC+C,GAAG,CAACC,OAAO,CAACF,MAAM,CAACG,GAAG,CAAC,EAAE;IAC7B,OAAOH,MAAM,CAACG,GAAG,CAACC,KAAK,CAACC,MAAM,CAAC,CAACC,GAAG,EAAEhC,CAAC,KAAI;MACxC,IAAIpB,CAAC,CAAC+C,GAAG,CAACM,WAAW,CAACjC,CAAC,CAAC,EAAE;QACxB,IAAIpB,CAAC,CAAC+C,GAAG,CAACO,aAAa,CAAClC,CAAC,CAACmC,EAAE,CAAC,EAAE;UAC7BnC,CAAC,GAAGA,CAAC,CAACoC,IAAI;QACZ,CAAC,MAAM;UACLpC,CAAC,GAAGA,CAAC,CAACmC,EAAE;QACV;MACF;MACA,IAAI,CAACvD,CAAC,CAAC+C,GAAG,CAACU,aAAa,CAACrC,CAAC,CAAC,EAAE,OAAOgC,GAAG;MACvC,MAAMM,GAAG,GAAGC,mBAAa,CAACC,SAAS,CAACxC,CAAC,CAACyC,kBAAkB,EAAGC,CAAC,IAAI;QAC9D,IAAIA,CAAC,CAACC,IAAI,KAAK,MAAM,IAAI/D,CAAC,CAAC+C,GAAG,CAACiB,SAAS,CAACF,CAAC,CAACG,IAAI,CAAC,EAAE;UAChD,OAAOC,YAAM,CAACC,IAAI,CAACL,CAAC,CAACG,IAAI,CAAC;QAC5B;QACA,OAAOC,YAAM,CAACE,IAAI,EAAE;MACtB,CAAC,CAAC;MACF,MAAMnB,GAAG,GAAGiB,YAAM,CAACG,cAAc,CAACX,GAAG,CAAC;MACtC,IAAI,CAACT,GAAG,EAAE;QACR,OAAOG,GAAG;MACZ;MACA,OAAO;QACL,GAAGA,GAAG;QACN,CAACkB,MAAM,CAACrB,GAAG,CAACsB,OAAO,CAAC,GAAIC,CAAmB,IAAKA,CAAC,CAACC,IAAI,KAAKxB,GAAG,CAACsB;OAChE;IACH,CAAC,EAAE,EAAW,CAAC;EACjB;EACA,MAAM,IAAIG,KAAK,CAAC,aAAa,CAAC;AAChC,CAAC;AAAAhE,OAAA,CAAAmC,MAAA,GAAAA,MAAA;AAEM,MAAM8B,WAAW,GACtB7B,MAAyB,IACb;EACZ,IAAI9C,CAAC,CAAC+C,GAAG,CAACC,OAAO,CAACF,MAAM,CAACG,GAAG,CAAC,EAAE;IAC7B,OAAO,CAA2B,GAAG9C,IAAU,KAAMuB,CAAI,IACvDvB,IAAI,CAACyE,QAAQ,CAAClD,CAAC,CAAC+C,IAAI,CAAC;EACzB;EACA,MAAM,IAAIC,KAAK,CAAC,aAAa,CAAC;AAChC,CAAC;AAAAhE,OAAA,CAAAiE,WAAA,GAAAA,WAAA;AAEM,MAAME,iBAAiB,GAC5B/B,MAAyB,IACtB,IAAAgC,cAAO,EAAChC,MAAM,EAAGgB,CAAC,KAAM;EAAEiB,EAAE,EAAElC,MAAM,CAACiB,CAAC,CAAC;EAAEkB,OAAO,EAAEL,WAAW,CAACb,CAAC;AAAC,CAAE,CAAC,CAAC;AAAApD,OAAA,CAAAmE,iBAAA,GAAAA,iBAAA;AASlE,MAAMI,WAAW,GAAGA,CAAkE,GAAGvD,CAAU,KACxG,IAAAM,UAAI,EAAChC,CAAC,CAACkF,KAAK,CAAC,GAAGxD,CAAC,CAAC,EAAGoC,CAAC,IAAK,IAAAgB,cAAO,EAAChB,CAAC,EAAGA,CAAC,KAAM;EAAEiB,EAAE,EAAElC,MAAM,CAACiB,CAAC,CAAC;EAAEkB,OAAO,EAAEL,WAAW,CAACb,CAAC;AAAC,CAAE,CAAC,CAAC,CAAC;AAAApD,OAAA,CAAAuE,WAAA,GAAAA,WAAA","ignoreList":[]}

package/dist/Operations.d.ts

@@ -66,15 +66,15 @@ declare const Operation_base: S.EnhancedClass<Operation, {
     createdAt: S.PropertySignature<":", Date, never, ":", string, true, never>;
     updatedAt: S.PropertySignature<":", Date | null, never, ":", string | null, true, never>;
 }, {
-    readonly title: string & S.NonEmptyString2kBrand;
     readonly id: string & S.StringIdBrand;
+    readonly title: string & S.NonEmptyString2kBrand;
     readonly progress?: OperationProgress | undefined;
     readonly result?: Success | Failure | undefined;
     readonly createdAt: Date;
     readonly updatedAt: Date | null;
 }, Operation.From, never, {
-    readonly title: string & S.NonEmptyString2kBrand;
     readonly id: string & S.StringIdBrand;
+    readonly title: string & S.NonEmptyString2kBrand;
     readonly progress?: OperationProgress | undefined;
     readonly result?: Success | Failure | undefined;
     readonly createdAt?: Date;

package/dist/schema.d.ts

@@ -1,5 +1,6 @@
 import { type Email as EmailT, type PhoneNumber as PhoneNumberT } from "@effect-app/schema";
 import * as S from "@effect-app/schema";
+export * from "@effect-app/schema";
 export declare const Email: S.WithDefaults<S.Schema<string & S.EmailBrand, string, never>> & S.Schema<string & S.EmailBrand, string, never>;
 export type Email = EmailT;
 export declare const PhoneNumber: S.WithDefaults<S.Schema<string & S.PhoneNumberBrand, string, never>> & S.Schema<string & S.PhoneNumberBrand, string, never>;
@@ -36,5 +37,4 @@ export declare const taggedUnion: <Members extends readonly S.Schema<{
     isAnyOf: IsAny<S.Schema.Type<[...Members][number]>>;
 };
 export type PhoneNumber = PhoneNumberT;
-export * from "@effect-app/schema";
 //# sourceMappingURL=schema.d.ts.map

package/dist/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAU,KAAK,KAAK,IAAI,MAAM,EAAsB,KAAK,WAAW,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACvH,OAAO,KAAK,CAAC,MAAM,oBAAoB,CAAA;AAIvC,eAAO,MAAM,KAAK,iHAYf,CAAA;AAEH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAA;AAE1B,eAAO,MAAM,WAAW,6HAYrB,CAAA;AAEH,eAAO,MAAM,MAAM;UAAsB,MAAM;iBACrC,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UA6B1B,CAAA;AAED,eAAO,MAAM,WAAW;UAAsB,MAAM;iBAC1C,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACxB,MAAM,CAAC,CAMT,CAAA;AAED,eAAO,MAAM,iBAAiB;UAAsB,MAAM;iBAChD,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;CAC8C,CAAA;AAEzE,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,SAAS,CAAC,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;AAC/G,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,IAAI;KAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;CAAE,CAAA;AACxF,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAC9D,MAAM,WAAW,KAAK,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE;IAC/C,CAAC,IAAI,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;CAC1F;AAED,eAAO,MAAM,WAAW;UAA8C,MAAM;sBAAuB,OAAO;;;CACb,CAAA;AAE7F,MAAM,MAAM,WAAW,GAAG,YAAY,CAAA;AAEtC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,KAAK,IAAI,MAAM,EAAE,KAAK,WAAW,IAAI,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACnG,OAAO,KAAK,CAAC,MAAM,oBAAoB,CAAA;AAIvC,cAAc,oBAAoB,CAAA;AAElC,eAAO,MAAM,KAAK,iHAQf,CAAA;AAEH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAA;AAE1B,eAAO,MAAM,WAAW,6HAQrB,CAAA;AAEH,eAAO,MAAM,MAAM;UAAsB,MAAM;iBACrC,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UA6B1B,CAAA;AAED,eAAO,MAAM,WAAW;UAAsB,MAAM;iBAC1C,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACxB,MAAM,CAAC,CAMT,CAAA;AAED,eAAO,MAAM,iBAAiB;UAAsB,MAAM;iBAChD,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;CAC8C,CAAA;AAEzE,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,SAAS,CAAC,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;AAC/G,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,IAAI;KAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;CAAE,CAAA;AACxF,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAC9D,MAAM,WAAW,KAAK,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE;IAC/C,CAAC,IAAI,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;CAC1F;AAED,eAAO,MAAM,WAAW;UAA8C,MAAM;sBAAuB,OAAO;;;CACb,CAAA;AAE7F,MAAM,MAAM,WAAW,GAAG,YAAY,CAAA"}

package/dist/schema.js

@@ -1,27 +1,20 @@
 import { Option, pipe, ReadonlyArray } from "@effect-app/core";
-import { isValidEmail, isValidPhone } from "@effect-app/core/validation";
-import { fromBrand, nominal } from "@effect-app/schema";
 import * as S from "@effect-app/schema";
 import { fakerArb } from "./faker.js";
 import { extendM } from "./utils.js";
+export * from "@effect-app/schema";
 export const Email = S
-    .string
-    .pipe(S.filter(isValidEmail, {
-    title: "Email",
-    description: "an email according to RFC 5322",
-    jsonSchema: { format: "email" },
+    .Email
+    .pipe(S.annotations({
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    arbitrary: () => fakerArb((faker) => faker.internet.exampleEmail)
-}), fromBrand(nominal(), { jsonSchema: {} }), S.withDefaults);
+    arbitrary: () => (fc) => fakerArb((faker) => faker.internet.exampleEmail)(fc).map(Email)
+}), S.withDefaults);
 export const PhoneNumber = S
-    .string
-    .pipe(S.filter(isValidPhone, {
-    title: "PhoneNumber",
-    description: "a phone number with at least 7 digits",
-    jsonSchema: { format: "phone" },
+    .PhoneNumber
+    .pipe(S.annotations({
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    arbitrary: () => fakerArb((faker) => faker.phone.number)
-}), fromBrand(nominal(), { jsonSchema: {} }), S.withDefaults);
+    arbitrary: () => (fc) => fakerArb((faker) => faker.phone.number)(fc).map(PhoneNumber)
+}), S.withDefaults);
 export const makeIs = (schema) => {
     if (S.AST.isUnion(schema.ast)) {
         return schema.ast.types.reduce((acc, t) => {
@@ -61,5 +54,4 @@ export const makeIsAnyOf = (schema) => {
 };
 export const extendTaggedUnion = (schema) => extendM(schema, (_) => ({ is: makeIs(_), isAnyOf: makeIsAnyOf(_) }));
 export const taggedUnion = (...a) => pipe(S.union(...a), (_) => extendM(_, (_) => ({ is: makeIs(_), isAnyOf: makeIsAnyOf(_) })));
-export * from "@effect-app/schema";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFBO0FBQ3hFLE9BQU8sRUFBZ0MsU0FBUyxFQUFFLE9BQU8sRUFBb0MsTUFBTSxvQkFBb0IsQ0FBQTtBQUN2SCxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVwQyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQztLQUNuQixNQUFNO0tBQ04sSUFBSSxDQUNILENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFO0lBQ3JCLEtBQUssRUFBRSxPQUFPO0lBQ2QsV0FBVyxFQUFFLGdDQUFnQztJQUM3QyxVQUFVLEVBQUUsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFO0lBQy9CLDZEQUE2RDtJQUM3RCxTQUFTLEVBQUUsR0FBd0IsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUM7Q0FDdkYsQ0FBQyxFQUNGLFNBQVMsQ0FBQyxPQUFPLEVBQVMsRUFBRSxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUMvQyxDQUFDLENBQUMsWUFBWSxDQUNmLENBQUE7QUFJSCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQztLQUN6QixNQUFNO0tBQ04sSUFBSSxDQUNILENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFO0lBQ3JCLEtBQUssRUFBRSxhQUFhO0lBQ3BCLFdB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LEdBQUcsQ0FDL0IsTUFBeUIsRUFDekIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFTekUsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLENBQWtFLEdBQUcsQ0FBVSxFQUFFLEVBQUUsQ0FDNUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBSTdGLGNBQWMsb0JBQW9CLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUU5RCxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVwQyxjQUFjLG9CQUFvQixDQUFBO0FBRWxDLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxDQUFDO0tBQ25CLEtBQUs7S0FDTCxJQUFJLENBQ0gsQ0FBQyxDQUFDLFdBQVcsQ0FBQztJQUNaLDZEQUE2RDtJQUM3RCxTQUFTLEVBQUUsR0FBdUIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztDQUM3RyxDQUFDLEVBQ0YsQ0FBQyxDQUFDLFlBQVksQ0FDZixDQUFBO0FBSUgsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLENBQUM7S0FDekIsV0FBVztLQUNYLElBQUksQ0FDSCxDQUFDLENBQUMsV0FBVyxDQUFDO0lBQ1osNkRBQTZEO0lBQzdELFNBQVMsRUFBRSxHQUE2QixFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDO0NBQ2hILENBQUMsRUFDRixDQUFDLENBQUMsWUFBWSxDQUNmLENBQUE7QUFFSCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsQ0FDcEIsTUFBeUIsRUFDekIsRUFBRTtJQUNGLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDOUIsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDeEMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO2dCQUN6QixJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDO29CQUM5QixDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQTtnQkFDWixDQUFDO3FCQUFNLENBQUM7b0JBQ04sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUE7Z0JBQ1YsQ0FBQztZQUNILENBQUM7WUFDRCxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO2dCQUFFLE9BQU8sR0FBRyxDQUFBO1lBQ3ZDLE1BQU0sR0FBRyxHQUFHLGFBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUU7Z0JBQzlELElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxNQUFNLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7b0JBQ2pELE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUE7Z0JBQzVCLENBQUM7Z0JBQ0QsT0FBTyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUE7WUFDdEIsQ0FBQyxDQUFDLENBQUE7WUFDRixNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ3RDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztnQkFDVCxPQUFPLEdBQUcsQ0FBQTtZQUNaLENBQUM7WUFDRCxPQUFPO2dCQUNMLEdBQUcsR0FBRztnQkFDTixDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQW1CLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLE9BQU87YUFDdkUsQ0FBQTtRQUNILENBQUMsRUFBRSxFQUFXLENBQUMsQ0FBQTtJQUNqQixDQUFDO0lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUNoQyxDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FDekIsTUFBeUIsRUFDZixFQUFFO0lBQ1osSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUM5QixPQUFPLENBQTJCLEdBQUcsSUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUksRUFBd0MsRUFBRSxDQUNqRyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN6QixDQUFDO0lBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUNoQyxDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUMvQixNQUF5QixFQUN6QixFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQVN6RSxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBa0UsR0FBRyxDQUFVLEVBQUUsRUFBRSxDQUM1RyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUEifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "0.199.0",
+  "version": "0.201.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -12,13 +12,13 @@
     "ts-pattern": "^5.1.0",
     "uuid": "^9.0.1",
     "validator": "^13.11.0",
-    "@effect-app/schema": "0.218.0",
-    "@effect-app/core": "0.168.0"
+    "@effect-app/core": "0.169.0",
+    "@effect-app/schema": "0.220.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",
     "@faker-js/faker": "^8.4.1",
-    "@types/node": "~20.12.2",
+    "@types/node": "~20.12.3",
     "@types/uuid": "^9.0.8",
     "@types/validator": "^13.11.9",
     "fast-check": "~3.17.1",
@@ -27,9 +27,9 @@
     "vitest": "^1.4.0"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.48.22",
-    "effect": "^2.4.15",
-    "@effect/schema": "^0.64.16"
+    "@effect/platform": "^0.48.24",
+    "effect": "^2.4.17",
+    "@effect/schema": "^0.64.18"
   },
   "typesVersions": {
     "*": {

package/src/schema.ts

@@ -1,37 +1,30 @@
 import { Option, pipe, ReadonlyArray } from "@effect-app/core"
-import { isValidEmail, isValidPhone } from "@effect-app/core/validation"
-import { type A, type Email as EmailT, fromBrand, nominal, type PhoneNumber as PhoneNumberT } from "@effect-app/schema"
+import { type A, type Email as EmailT, type PhoneNumber as PhoneNumberT } from "@effect-app/schema"
 import * as S from "@effect-app/schema"
 import { fakerArb } from "./faker.js"
 import { extendM } from "./utils.js"
 
+export * from "@effect-app/schema"
+
 export const Email = S
-  .string
+  .Email
   .pipe(
-    S.filter(isValidEmail, {
-      title: "Email",
-      description: "an email according to RFC 5322",
-      jsonSchema: { format: "email" },
+    S.annotations({
       // eslint-disable-next-line @typescript-eslint/unbound-method
-      arbitrary: (): A.Arbitrary<string> => fakerArb((faker) => faker.internet.exampleEmail)
+      arbitrary: (): A.Arbitrary<Email> => (fc) => fakerArb((faker) => faker.internet.exampleEmail)(fc).map(Email)
     }),
-    fromBrand(nominal<Email>(), { jsonSchema: {} }),
     S.withDefaults
   )
 
 export type Email = EmailT
 
 export const PhoneNumber = S
-  .string
+  .PhoneNumber
   .pipe(
-    S.filter(isValidPhone, {
-      title: "PhoneNumber",
-      description: "a phone number with at least 7 digits",
-      jsonSchema: { format: "phone" },
+    S.annotations({
       // eslint-disable-next-line @typescript-eslint/unbound-method
-      arbitrary: (): A.Arbitrary<string> => fakerArb((faker) => faker.phone.number)
+      arbitrary: (): A.Arbitrary<PhoneNumber> => (fc) => fakerArb((faker) => faker.phone.number)(fc).map(PhoneNumber)
     }),
-    fromBrand(nominal<PhoneNumber>(), { jsonSchema: {} }),
     S.withDefaults
   )
 
@@ -92,5 +85,3 @@ export const taggedUnion = <Members extends readonly S.Schema<{ _tag: string },
   pipe(S.union(...a), (_) => extendM(_, (_) => ({ is: makeIs(_), isAnyOf: makeIsAnyOf(_) })))
 
 export type PhoneNumber = PhoneNumberT
-
-export * from "@effect-app/schema"

package/test/schema.test.ts

@@ -1,6 +1,15 @@
-import { StringId } from "@effect-app/schema"
+// import { generateFromArbitrary } from "@effect-app/infra/test.arbs"
+import { JSONSchema } from "@effect/schema"
+import { ReadonlyArray, S } from "effect-app"
 import { test } from "vitest"
 
+const A = S.struct({ a: S.NonEmptyString255, email: S.nullable(S.Email) })
 test("works", () => {
-  console.log(StringId.make())
+  console.log(S.StringId.make())
+  // console.log(generateFromArbitrary(S.A.make(A)).value)
+  console.log(S.AST.getTitleAnnotation(S.Email.ast))
+  console.log(S.AST.getDescriptionAnnotation(S.Email.ast))
+  console.log(S.AST.getJSONSchemaAnnotation(S.Email.ast))
+  console.log(JSONSchema.make(S.Email))
+  console.log(S.decodeEither(A, { errors: "all" })({ a: ReadonlyArray.range(1, 256).join(""), email: "hello" }))
 })