@ddd-ts/shape 0.0.32 → 0.0.33

package/dist/optional.d.ts

@@ -6,23 +6,21 @@ type Matcher<V> = {
 };
 type Internal<S extends Definition | Shorthand> = {
     Serialized: ReturnType<DefinitionOf<S>["$serialize"]> | undefined;
+    Deserializing: Parameters<DefinitionOf<S>["$deserialize"]>[0] | undefined;
     Inline: Expand<DefinitionOf<S>["$inline"]> | undefined;
     Required: Expand<DefinitionOf<S>["$inline"]>;
 };
-export declare const Optional: <S extends Definition | Shorthand, B extends AbstractConstructor<{}> = typeof Empty, Cache extends Internal<S> = Internal<S>>(of: S, base?: B) => Omit<B, "prototype"> & Omit<(abstract new (value: Cache["Inline"]) => {
-    value: Cache["Inline"];
-    serialize(): Expand<Cache["Serialized"]>;
-    match<M extends Matcher<Expand<Cache["Required"]>>>(config: M): ReturnType<M["some"]> | ReturnType<M["none"]>;
-}) & {
+export declare const Optional: <S extends Definition | Shorthand, B extends AbstractConstructor<{}> = typeof Empty>(of: S, base?: B) => IOptional<S, B>;
+export type IOptional<S extends Definition | Shorthand, B extends AbstractConstructor<{}> = typeof Object> = Omit<B, "prototype"> & {
     $shape: "optional";
-    deserialize<T extends Constructor>(this: T, value: Cache["Inline"]): InstanceType<T>;
-    $deserialize(value: Cache["Serialized"]): Definition["$inline"];
-    $serialize<T extends /*elided*/ any>(this: T, value: Cache["Inline"]): Cache["Serialized"];
-    $inline: Cache["Inline"];
-}, ""> & (abstract new (value: Expand<Cache["Inline"]>) => InstanceType<B> & {
-    value: Cache["Inline"];
-    serialize(): Expand<Cache["Serialized"]>;
-    match<M extends Matcher<Expand<Cache["Required"]>>>(config: M): ReturnType<M["some"]> | ReturnType<M["none"]>;
+    deserialize<T extends Constructor>(this: T, value: Internal<S>["Deserializing"]): InstanceType<T>;
+    $deserialize(value: Internal<S>["Deserializing"]): Definition["$inline"];
+    $serialize<T>(this: T, value: Internal<S>["Inline"]): Internal<S>["Serialized"];
+    $inline: Internal<S>["Inline"];
+} & (abstract new (value: Internal<S>["Inline"]) => InstanceType<B> & {
+    value: Internal<S>["Inline"];
+    serialize(): Expand<Internal<S>["Serialized"]>;
+    match<M extends Matcher<Expand<Internal<S>["Required"]>>>(config: M): ReturnType<M["some"]> | ReturnType<M["none"]>;
 });
 export {};
 //# sourceMappingURL=optional.d.ts.map

package/dist/optional.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optional.d.ts","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,MAAM,EACN,SAAS,EACT,YAAY,EAEZ,WAAW,EACX,mBAAmB,EACnB,KAAK,EACN,MAAM,KAAK,CAAC;AAEb,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,SAAS,CAAC;AAE3D,KAAK,OAAO,CAAC,CAAC,IAAI;IAAE,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC;AAE/D,KAAK,QAAQ,CAAC,CAAC,SAAS,UAAU,GAAG,SAAS,IAAI;IAChD,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC;IAClE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;IACvD,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,CAAC,SAAS,UAAU,GAAG,SAAS,EAChC,CAAC,SAAS,mBAAmB,CAAC,EAAE,CAAC,iBACjC,KAAK,SAAS,QAAQ,CAAC,CAAC,CAAC,oBAErB,CAAC,SACC,CAAC,uDAGqB,KAAK,CAAC,QAAQ,CAAC;WAAf,KAAK,CAAC,QAAQ,CAAC;iBAM5B,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;UAIlC,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,UACxC,CAAC,GACR,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;;YARhC,UAAU;gBAeP,CAAC,SAAS,WAAW,QAChC,CAAC,SACA,KAAK,CAAC,QAAQ,CAAC,GACrB,YAAY,CAAC,CAAC,CAAC;wBAIS,KAAK,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC;eAOpD,CAAC,+BACX,CAAC,SACA,KAAK,CAAC,QAAQ,CAAC,GACrB,KAAK,CAAC,YAAY,CAAC;aAMN,KAAK,CAAC,QAAQ,CAAC;+BAIxB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,KAC3B,YAAY,CAAC,CAAC,CAAC;WA/CQ,KAAK,CAAC,QAAQ,CAAC;iBAM5B,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;UAIlC,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,UACxC,CAAC,GACR,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;CAmClB,CAOjC,CAAC"}
+{"version":3,"file":"optional.d.ts","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,MAAM,EACN,SAAS,EACT,YAAY,EAEZ,WAAW,EACX,mBAAmB,EACnB,KAAK,EACN,MAAM,KAAK,CAAC;AAEb,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,SAAS,CAAC;AAE3D,KAAK,OAAO,CAAC,CAAC,IAAI;IAAE,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,CAAA;CAAE,CAAC;AAE/D,KAAK,QAAQ,CAAC,CAAC,SAAS,UAAU,GAAG,SAAS,IAAI;IAChD,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC;IAClE,aAAa,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAC1E,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;IACvD,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;CAC9C,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,CAAC,SAAS,UAAU,GAAG,SAAS,EAChC,CAAC,SAAS,mBAAmB,CAAC,EAAE,CAAC,qBAE7B,CAAC,SACC,CAAC,KACN,SAAS,CAAC,CAAC,EAAE,CAAC,CA2ChB,CAAC;AAEF,MAAM,MAAM,SAAS,CACnB,CAAC,SAAS,UAAU,GAAG,SAAS,EAChC,CAAC,SAAS,mBAAmB,CAAC,EAAE,CAAC,GAAG,OAAO,MAAM,IAC/C,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,CAAC,CAAC,SAAS,WAAW,EAC/B,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,GAClC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnB,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IACzE,UAAU,CAAC,CAAC,EACV,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAC3B,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAC7B,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;CAChC,GAAG,CAAC,QAAQ,MACT,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KACzB,YAAY,CAAC,CAAC,CAAC,GAAG;IACrB,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7B,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/C,KAAK,CAAC,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EACtD,MAAM,EAAE,CAAC,GACR,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CAClD,CAAC,CAAC"}

package/dist/optional.js.map

@@ -1 +1 @@
-{"version":3,"file":"optional.js","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":";;;AAAA,0BASa;AAYN,MAAM,QAAQ,GAAG,CAKtB,EAAK,EACL,OAAU,QAAY,EACtB,EAAE;IACF,MAAe,SAAU,SAAS,IAA+B;QAC5C;QAAnB,YAAmB,KAAsB;YACvC,KAAK,EAAE,CAAC;YADS,UAAK,GAAL,KAAK,CAAiB;QAEzC,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,UAAmB,CAAC;QAEpC,SAAS;YACP,OAAO,SAAS,CAAC,UAAU,CAAE,IAAY,CAAC,KAAK,CAAQ,CAAC;QAC1D,CAAC;QAED,KAAK,CACH,MAAS;YAET,IAAK,IAAY,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,MAAM,CAAC,IAAI,CAAE,IAAY,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,CAAC,WAAW,CAEhB,KAAsB;YAEtB,OAAO,IAAK,IAAY,CAAE,IAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAQ,CAAC;QACrE,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,KAA0B;YAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAQ,IAAA,QAAK,EAAC,EAAE,CAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,CAAC,UAAU,CAEf,KAAsB;YAEtB,OAAO,KAAK,KAAK,SAAS;gBACxB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAE,IAAA,QAAK,EAAC,EAAE,CAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,CAAC,OAAO,CAAkB;;IAWlC,OAAO,SAA4B,CAAC;AACtC,CAAC,CAAC;AA/DW,QAAA,QAAQ,YA+DnB","sourcesContent":["import {\n  Definition,\n  Expand,\n  Shorthand,\n  DefinitionOf,\n  Shape,\n  Constructor,\n  AbstractConstructor,\n  Empty,\n} from \"./_\";\n\nexport type OptionalConfiguration = Definition | Shorthand;\n\ntype Matcher<V> = { some: (value: V) => any; none: () => any };\n\ntype Internal<S extends Definition | Shorthand> = {\n  Serialized: ReturnType<DefinitionOf<S>[\"$serialize\"]> | undefined;\n  Inline: Expand<DefinitionOf<S>[\"$inline\"]> | undefined;\n  Required: Expand<DefinitionOf<S>[\"$inline\"]>;\n};\n\nexport const Optional = <\n  S extends Definition | Shorthand,\n  B extends AbstractConstructor<{}> = typeof Empty,\n  Cache extends Internal<S> = Internal<S>,\n>(\n  of: S,\n  base: B = Empty as any,\n) => {\n  abstract class $Optional extends (base as any as Constructor<{}>) {\n    constructor(public value: Cache[\"Inline\"]) {\n      super();\n    }\n\n    static $shape = \"optional\" as const;\n\n    serialize(): Expand<Cache[\"Serialized\"]> {\n      return $Optional.$serialize((this as any).value) as any;\n    }\n\n    match<M extends Matcher<Expand<Cache[\"Required\"]>>>(\n      config: M,\n    ): ReturnType<M[\"some\"]> | ReturnType<M[\"none\"]> {\n      if ((this as any).value === undefined) {\n        return config.none();\n      }\n      return config.some((this as any).value);\n    }\n\n    static deserialize<T extends Constructor>(\n      this: T,\n      value: Cache[\"Inline\"],\n    ): InstanceType<T> {\n      return new (this as any)((this as any).$deserialize(value)) as any;\n    }\n\n    static $deserialize(value: Cache[\"Serialized\"]): Definition[\"$inline\"] {\n      if (value === undefined) {\n        return undefined;\n      }\n      return (Shape(of) as any).$deserialize(value);\n    }\n\n    static $serialize<T extends typeof $Optional>(\n      this: T,\n      value: Cache[\"Inline\"],\n    ): Cache[\"Serialized\"] {\n      return value === undefined\n        ? undefined\n        : (Shape(of) as any).$serialize(value);\n    }\n\n    static $inline: Cache[\"Inline\"];\n  }\n\n  type OptionalConstructor = abstract new (\n    value: Expand<Cache[\"Inline\"]>,\n  ) => InstanceType<B> & $Optional;\n\n  type Optional = Omit<B, \"prototype\"> &\n    Omit<typeof $Optional, \"\"> &\n    OptionalConstructor;\n\n  return $Optional as any as Optional;\n};\n"]}
+{"version":3,"file":"optional.js","sourceRoot":"","sources":["../src/optional.ts"],"names":[],"mappings":";;;AAAA,0BASa;AAaN,MAAM,QAAQ,GAAG,CAItB,EAAK,EACL,OAAU,QAAY,EACL,EAAE;IACnB,MAAe,SAAU,SAAS,IAA+B;QAC5C;QAAnB,YAAmB,KAAU;YAC3B,KAAK,EAAE,CAAC;YADS,UAAK,GAAL,KAAK,CAAK;QAE7B,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,UAAmB,CAAC;QAEpC,SAAS;YACP,OAAO,SAAS,CAAC,UAAU,CAAE,IAAY,CAAC,KAAK,CAAQ,CAAC;QAC1D,CAAC;QAED,KAAK,CAAC,MAAW;YACf,IAAK,IAAY,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,MAAM,CAAC,IAAI,CAAE,IAAY,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,CAAC,WAAW,CAEhB,KAAU;YAEV,OAAO,IAAK,IAAY,CAAE,IAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAQ,CAAC;QACrE,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,KAAU;YAC5B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAQ,IAAA,QAAK,EAAC,EAAE,CAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,CAAC,UAAU,CAAsC,KAAU;YAC/D,OAAO,KAAK,KAAK,SAAS;gBACxB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAE,IAAA,QAAK,EAAC,EAAE,CAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,CAAC,OAAO,CAAM;;IAGtB,OAAO,SAAgB,CAAC;AAC1B,CAAC,CAAC;AAjDW,QAAA,QAAQ,YAiDnB","sourcesContent":["import {\n  Definition,\n  Expand,\n  Shorthand,\n  DefinitionOf,\n  Shape,\n  Constructor,\n  AbstractConstructor,\n  Empty,\n} from \"./_\";\n\nexport type OptionalConfiguration = Definition | Shorthand;\n\ntype Matcher<V> = { some: (value: V) => any; none: () => any };\n\ntype Internal<S extends Definition | Shorthand> = {\n  Serialized: ReturnType<DefinitionOf<S>[\"$serialize\"]> | undefined;\n  Deserializing: Parameters<DefinitionOf<S>[\"$deserialize\"]>[0] | undefined;\n  Inline: Expand<DefinitionOf<S>[\"$inline\"]> | undefined;\n  Required: Expand<DefinitionOf<S>[\"$inline\"]>;\n};\n\nexport const Optional = <\n  S extends Definition | Shorthand,\n  B extends AbstractConstructor<{}> = typeof Empty,\n>(\n  of: S,\n  base: B = Empty as any,\n): IOptional<S, B> => {\n  abstract class $Optional extends (base as any as Constructor<{}>) {\n    constructor(public value: any) {\n      super();\n    }\n\n    static $shape = \"optional\" as const;\n\n    serialize() {\n      return $Optional.$serialize((this as any).value) as any;\n    }\n\n    match(config: any) {\n      if ((this as any).value === undefined) {\n        return config.none();\n      }\n      return config.some((this as any).value);\n    }\n\n    static deserialize<T extends Constructor>(\n      this: T,\n      value: any,\n    ): InstanceType<T> {\n      return new (this as any)((this as any).$deserialize(value)) as any;\n    }\n\n    static $deserialize(value: any): any {\n      if (value === undefined) {\n        return undefined;\n      }\n      return (Shape(of) as any).$deserialize(value);\n    }\n\n    static $serialize<T extends typeof $Optional>(this: T, value: any): any {\n      return value === undefined\n        ? undefined\n        : (Shape(of) as any).$serialize(value);\n    }\n\n    static $inline: any;\n  }\n\n  return $Optional as any;\n};\n\nexport type IOptional<\n  S extends Definition | Shorthand,\n  B extends AbstractConstructor<{}> = typeof Object,\n> = Omit<B, \"prototype\"> & {\n  $shape: \"optional\";\n  deserialize<T extends Constructor>(\n    this: T,\n    value: Internal<S>[\"Deserializing\"],\n  ): InstanceType<T>;\n  $deserialize(value: Internal<S>[\"Deserializing\"]): Definition[\"$inline\"];\n  $serialize<T>(\n    this: T,\n    value: Internal<S>[\"Inline\"],\n  ): Internal<S>[\"Serialized\"];\n  $inline: Internal<S>[\"Inline\"];\n} & (abstract new (\n    value: Internal<S>[\"Inline\"],\n  ) => InstanceType<B> & {\n    value: Internal<S>[\"Inline\"];\n    serialize(): Expand<Internal<S>[\"Serialized\"]>;\n    match<M extends Matcher<Expand<Internal<S>[\"Required\"]>>>(\n      config: M,\n    ): ReturnType<M[\"some\"]> | ReturnType<M[\"none\"]>;\n  });\n"]}

package/dist/primitive.d.ts

@@ -1,4 +1,4 @@
-import { AbstractConstructor, Empty, Expand } from "./_";
+import { AbstractConstructor, Constructor, Empty, Expand } from "./_";
 type PrimitiveMap = [
     [
         StringConstructor,
@@ -23,18 +23,16 @@ export type PrimitiveFromConstructor<S> = Extract<PrimitiveMap[number], [
     any
 ]>[1];
 export type PrimitiveShorthand = PrimitiveConstructor;
-export declare const Primitive: <S extends PrimitiveConstructor, B extends AbstractConstructor<{}> = typeof Empty>(of: S, base?: B) => Omit<B, "prototype"> & Omit<(abstract new (value: Expand<PrimitiveFromConstructor<S>>) => {
+export type IPrimitive<S extends PrimitiveConstructor, B extends AbstractConstructor<{}> = typeof Empty> = Omit<B, ""> & (abstract new (value: Expand<PrimitiveFromConstructor<S>>) => InstanceType<B> & {
     readonly value: Expand<PrimitiveFromConstructor<S>>;
     serialize(): PrimitiveFromConstructor<S>;
 }) & {
     $shape: "primitive";
-    deserialize<T extends /*elided*/ any>(this: T, value: PrimitiveFromConstructor<S>): InstanceType<T>;
+    deserialize<T extends Constructor<any>>(this: T, value: PrimitiveFromConstructor<S>): InstanceType<T>;
     $serialize(value: PrimitiveFromConstructor<S>): PrimitiveFromConstructor<S>;
     $deserialize(value: PrimitiveFromConstructor<S>): PrimitiveFromConstructor<S>;
     $inline: Expand<PrimitiveFromConstructor<S>>;
-}, "prototype"> & (abstract new (value: Expand<PrimitiveFromConstructor<S>>) => InstanceType<B> & {
-    readonly value: Expand<PrimitiveFromConstructor<S>>;
-    serialize(): PrimitiveFromConstructor<S>;
-});
+};
+export declare const Primitive: <S extends PrimitiveConstructor, B extends AbstractConstructor<{}> = typeof Empty>(of: S, base?: B) => IPrimitive<S, B>;
 export {};
 //# sourceMappingURL=primitive.d.ts.map

package/dist/primitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primitive.d.ts","sourceRoot":"","sources":["../src/primitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAyB,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAEhF,KAAK,YAAY,GAAG;IAClB;QAAC,iBAAiB;QAAE,MAAM;KAAC;IAC3B;QAAC,iBAAiB;QAAE,MAAM;KAAC;IAC3B;QAAC,eAAe;QAAE,IAAI;KAAC;IACvB;QAAC,kBAAkB;QAAE,OAAO;KAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAAI,OAAO,CAC/C,YAAY,CAAC,MAAM,CAAC,EACpB;IAAC,CAAC;IAAE,GAAG;CAAC,CACT,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,eAAO,MAAM,SAAS,GACpB,CAAC,SAAS,oBAAoB,EAC9B,CAAC,SAAS,mBAAmB,CAAC,EAAE,CAAC,qBAE7B,CAAC,SACC,CAAC,uDAK8B,MAAM,6BAAQ;;;;YAIjC,WAAW;gBAMR,CAAC,+BACZ,CAAC,uCAEN,YAAY,CAAC,CAAC,CAAC;;;aAeF,MAAM,6BAAQ;wCAIvB,MAAM,6BAAQ,KAClB,YAAY,CAAC,CAAC,CAAC;;;CAAa,CAOlC,CAAC"}
+{"version":3,"file":"primitive.d.ts","sourceRoot":"","sources":["../src/primitive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAY,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAEhF,KAAK,YAAY,GAAG;IAClB;QAAC,iBAAiB;QAAE,MAAM;KAAC;IAC3B;QAAC,iBAAiB;QAAE,MAAM;KAAC;IAC3B;QAAC,eAAe;QAAE,IAAI;KAAC;IACvB;QAAC,kBAAkB;QAAE,OAAO;KAAC;CAC9B,CAAC;AAEF,KAAK,oBAAoB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,MAAM,MAAM,wBAAwB,CAAC,CAAC,IAAI,OAAO,CAC/C,YAAY,CAAC,MAAM,CAAC,EACpB;IAAC,CAAC;IAAE,GAAG;CAAC,CACT,CAAC,CAAC,CAAC,CAAC;AAEL,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,UAAU,CACpB,CAAC,SAAS,oBAAoB,EAC9B,CAAC,SAAS,mBAAmB,CAAC,EAAE,CAAC,GAAG,OAAO,KAAK,IAC9C,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,GACb,CAAC,QAAQ,MACP,KAAK,EAAE,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,KACvC,YAAY,CAAC,CAAC,CAAC,GAAG;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,SAAS,IAAI,wBAAwB,CAAC,CAAC,CAAC,CAAC;CAC1C,CAAC,GAAG;IACH,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,CAAC,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,EACpC,IAAI,EAAE,CAAC,EACP,KAAK,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACjC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnB,UAAU,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAC5E,YAAY,CACV,KAAK,EAAE,wBAAwB,CAAC,CAAC,CAAC,GACjC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;CAC9C,CAAC;AAEJ,eAAO,MAAM,SAAS,GACpB,CAAC,SAAS,oBAAoB,EAC9B,CAAC,SAAS,mBAAmB,CAAC,EAAE,CAAC,qBAE7B,CAAC,SACC,CAAC,KACN,UAAU,CAAC,CAAC,EAAE,CAAC,CA4CjB,CAAC"}

package/dist/primitive.js.map

@@ -1 +1 @@
-{"version":3,"file":"primitive.js","sourceRoot":"","sources":["../src/primitive.ts"],"names":[],"mappings":";;;AAAA,0BAAgF;AAiBzE,MAAM,SAAS,GAAG,CAIvB,EAAK,EACL,OAAU,QAAY,EACtB,EAAE;IAGF,MAAe,UAAW,SAAS,IAA+B;QACpC;QAA5B,YAA4B,KAAqB;YAC/C,KAAK,EAAE,CAAC;YADkB,UAAK,GAAL,KAAK,CAAgB;QAEjD,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,WAAoB,CAAC;QAErC,SAAS;YACP,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,MAAM,CAAC,WAAW,CAEhB,KAAa;YAEb,OAAO,IAAK,IAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAoB,CAAC;QACxE,CAAC;QAED,MAAM,CAAC,UAAU,CAAC,KAAa;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,KAAa;YAC/B,IAAI,EAAE,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7C,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,OAAO,CAAiB;;IAWjC,OAAO,UAAuB,CAAC;AACjC,CAAC,CAAC;AAlDW,QAAA,SAAS,aAkDpB","sourcesContent":["import { AbstractConstructor, Concrete, Constructor, Empty, Expand } from \"./_\";\n\ntype PrimitiveMap = [\n  [StringConstructor, string],\n  [NumberConstructor, number],\n  [DateConstructor, Date],\n  [BooleanConstructor, boolean],\n];\n\ntype PrimitiveConstructor = PrimitiveMap[number][0];\nexport type PrimitiveFromConstructor<S> = Extract<\n  PrimitiveMap[number],\n  [S, any]\n>[1];\n\nexport type PrimitiveShorthand = PrimitiveConstructor;\n\nexport const Primitive = <\n  S extends PrimitiveConstructor,\n  B extends AbstractConstructor<{}> = typeof Empty,\n>(\n  of: S,\n  base: B = Empty as any,\n) => {\n  type Inline = PrimitiveFromConstructor<S>;\n\n  abstract class $Primitive extends (base as any as Constructor<{}>) {\n    constructor(public readonly value: Expand<Inline>) {\n      super();\n    }\n\n    static $shape = \"primitive\" as const;\n\n    serialize(): Inline {\n      return this.value;\n    }\n\n    static deserialize<T extends typeof $Primitive>(\n      this: T,\n      value: Inline,\n    ): InstanceType<T> {\n      return new (this as any)(this.$deserialize(value)) as InstanceType<T>;\n    }\n\n    static $serialize(value: Inline): Inline {\n      return value;\n    }\n\n    static $deserialize(value: Inline): Inline {\n      if (of === Date && typeof value === \"string\") {\n        return new Date(value);\n      }\n      return value;\n    }\n\n    static $inline: Expand<Inline>;\n  }\n\n  type PrimitiveConstructor = abstract new (\n    value: Expand<Inline>,\n  ) => InstanceType<B> & $Primitive;\n\n  type Primitive = Omit<B, \"prototype\"> &\n    Omit<typeof $Primitive, \"prototype\"> &\n    PrimitiveConstructor;\n\n  return $Primitive as Primitive;\n};\n"]}
+{"version":3,"file":"primitive.js","sourceRoot":"","sources":["../src/primitive.ts"],"names":[],"mappings":";;;AAAA,0BAAgF;AAuCzE,MAAM,SAAS,GAAG,CAIvB,EAAK,EACL,OAAU,QAAY,EACJ,EAAE;IAGpB,MAAe,UAAW,SAAS,IAA+B;QACpC;QAA5B,YAA4B,KAAqB;YAC/C,KAAK,EAAE,CAAC;YADkB,UAAK,GAAL,KAAK,CAAgB;QAEjD,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,WAAoB,CAAC;QAErC,SAAS;YACP,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,MAAM,CAAC,WAAW,CAEhB,KAAa;YAEb,OAAO,IAAK,IAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAoB,CAAC;QACxE,CAAC;QAED,MAAM,CAAC,UAAU,CAAC,KAAa;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,KAAa;YAC/B,IAAI,EAAE,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC7C,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,OAAO,CAAiB;;IAWjC,OAAO,UAAiB,CAAC;AAC3B,CAAC,CAAC;AAlDW,QAAA,SAAS,aAkDpB","sourcesContent":["import { AbstractConstructor, Concrete, Constructor, Empty, Expand } from \"./_\";\n\ntype PrimitiveMap = [\n  [StringConstructor, string],\n  [NumberConstructor, number],\n  [DateConstructor, Date],\n  [BooleanConstructor, boolean],\n];\n\ntype PrimitiveConstructor = PrimitiveMap[number][0];\nexport type PrimitiveFromConstructor<S> = Extract<\n  PrimitiveMap[number],\n  [S, any]\n>[1];\n\nexport type PrimitiveShorthand = PrimitiveConstructor;\n\nexport type IPrimitive<\n  S extends PrimitiveConstructor,\n  B extends AbstractConstructor<{}> = typeof Empty,\n> = Omit<B, \"\"> &\n  (abstract new (\n    value: Expand<PrimitiveFromConstructor<S>>,\n  ) => InstanceType<B> & {\n    readonly value: Expand<PrimitiveFromConstructor<S>>;\n    serialize(): PrimitiveFromConstructor<S>;\n  }) & {\n    $shape: \"primitive\";\n    deserialize<T extends Constructor<any>>(\n      this: T,\n      value: PrimitiveFromConstructor<S>,\n    ): InstanceType<T>;\n    $serialize(value: PrimitiveFromConstructor<S>): PrimitiveFromConstructor<S>;\n    $deserialize(\n      value: PrimitiveFromConstructor<S>,\n    ): PrimitiveFromConstructor<S>;\n    $inline: Expand<PrimitiveFromConstructor<S>>;\n  };\n\nexport const Primitive = <\n  S extends PrimitiveConstructor,\n  B extends AbstractConstructor<{}> = typeof Empty,\n>(\n  of: S,\n  base: B = Empty as any,\n): IPrimitive<S, B> => {\n  type Inline = PrimitiveFromConstructor<S>;\n\n  abstract class $Primitive extends (base as any as Constructor<{}>) {\n    constructor(public readonly value: Expand<Inline>) {\n      super();\n    }\n\n    static $shape = \"primitive\" as const;\n\n    serialize(): Inline {\n      return this.value;\n    }\n\n    static deserialize<T extends typeof $Primitive>(\n      this: T,\n      value: Inline,\n    ): InstanceType<T> {\n      return new (this as any)(this.$deserialize(value)) as InstanceType<T>;\n    }\n\n    static $serialize(value: Inline): Inline {\n      return value;\n    }\n\n    static $deserialize(value: Inline): Inline {\n      if (of === Date && typeof value === \"string\") {\n        return new Date(value);\n      }\n      return value;\n    }\n\n    static $inline: Expand<Inline>;\n  }\n\n  type PrimitiveConstructor = abstract new (\n    value: Expand<Inline>,\n  ) => InstanceType<B> & $Primitive;\n\n  type Primitive = Omit<B, \"prototype\"> &\n    Omit<typeof $Primitive, \"prototype\"> &\n    PrimitiveConstructor;\n\n  return $Primitive as any;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddd-ts/shape",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -9,11 +9,11 @@
     "test": "jest --config node_modules/@ddd-ts/tools/jest.config.js"
   },
   "dependencies": {
-    "@ddd-ts/traits": "0.0.32"
+    "@ddd-ts/traits": "0.0.33"
   },
   "devDependencies": {
-    "@ddd-ts/tools": "0.0.32",
-    "@ddd-ts/types": "0.0.32",
+    "@ddd-ts/tools": "0.0.33",
+    "@ddd-ts/types": "0.0.33",
     "@types/jest": "^29.5.1"
   }
 }