@vlad_kramarukha/json-statham 1.2.2 → 1.3.1

package/index.ts

@@ -3,3 +3,6 @@ export { field, fieldName, mapper, schema, value, skipIf, skip } from './lib/dec
 
 /* Mappers */
 export { fromJson, toJson } from './lib/mappers.ts'
+
+/* Types */
+export { type FieldOptions, type Mapper, type SkipMapper } from './lib/types.ts'

package/lib/decorators.ts

@@ -1,4 +1,5 @@
 import Meta from './meta.ts'
+import type { FieldOptions, Mapper, SkipMapper } from './types.ts'
 
 function field(options: FieldOptions) {
     return <Target extends object>(target: Target, property: keyof Target) => {

package/lib/mappers.ts

@@ -1,9 +1,10 @@
 import Meta from './meta.ts'
+import type { FieldOptions, MetaInfo } from './types.ts'
 
-export function fromJson<Schema, Json extends object>(
-    schema: new () => Schema & MetaInfo,
+export function fromJson<Schema extends object, Json extends object>(
+    schema: new () => Schema,
     json: Json
-): (Schema & MetaInfo) | Schema {
+): Schema {
     const result = {} as Record<string, any>
     const instance = new schema()
 

package/lib/meta.ts

@@ -1,3 +1,5 @@
+import type { FieldOptions, MetaInfo } from './types.ts'
+
 const META_KEY = Symbol('meta')
 
 const pt = (target: object) => target.constructor.prototype

package/lib/{index.d.ts → types.ts}

@@ -1,22 +1,22 @@
-interface Mapper<Record extends object> {
+export interface Mapper<Record extends object = any> {
     from?: (field: any, record: Record) => any
     to?: (field: any, record: Record) => any
 }
 
-interface SkipMapper {
+export interface SkipMapper {
     <Record>(field: any, record: Record): boolean
 }
 
-interface FieldOptions {
+export interface FieldOptions<Record extends object = any> {
     skip?: boolean | SkipMapper
     value?: any
-    mapper?: Mapper
+    mapper?: Mapper<Record>
     fieldName?: string
     isArray?: boolean
     reconstruct?: boolean
     schema?: new () => object
 }
 
-interface MetaInfo {
-    [p: string]: FieldOptions | SimpleFieldOptions
+export interface MetaInfo {
+    [p: string]: FieldOptions
 }

package/package.json

@@ -1,13 +1,21 @@
 {
     "name": "@vlad_kramarukha/json-statham",
-    "version": "1.2.2",
+    "version": "1.3.1",
     "author": "Vlad Kramarukha",
     "private": false,
     "description": "TS library for data mapping",
+    "main": "index.ts",
     "module": "index.ts",
     "type": "module",
     "license": "Apache-2.0",
-    "keywords": ["TS", "JSON", "mapping", "data", "schema", "Jason Statham"],
+    "keywords": [
+        "TS",
+        "JSON",
+        "mapping",
+        "data",
+        "schema",
+        "Jason Statham"
+    ],
     "files": [
         "index.ts",
         "lib/*",