@tsed/json-mapper 7.0.0-alpha.2 → 7.0.0-beta.1

package/lib/esm/decorators/onDeserialize.js

@@ -0,0 +1,25 @@
+import { JsonEntityFn } from "@tsed/schema";
+/**
+ * Call the function before property deserialization.
+ *
+ * ## Example
+ *
+ * ```typescript
+ * class Model {
+ *    @OnDeserialize(v => v + 1)
+ *    property: string;
+ * }
+ * ```
+ *
+ * @returns {Function}
+ * @decorator
+ * @schema
+ * @property
+ * @param cb
+ */
+export function OnDeserialize(cb) {
+    return JsonEntityFn((storedJson) => {
+        storedJson.schema.$hooks.on("onDeserialize", cb);
+    });
+}
+//# sourceMappingURL=onDeserialize.js.map

package/lib/esm/decorators/onDeserialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"onDeserialize.js","sourceRoot":"","sources":["../../../src/decorators/onDeserialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAC,MAAM,cAAc,CAAC;AAM3D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,aAAa,CAAC,EAAyB;IACrD,OAAO,YAAY,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {JsonHookContext, JsonEntityFn} from \"@tsed/schema\";\n\nexport interface OnDeserializeCallback {\n  (value: any, ctx: JsonHookContext): any;\n}\n\n/**\n * Call the function before property deserialization.\n *\n * ## Example\n *\n * ```typescript\n * class Model {\n *    @OnDeserialize(v => v + 1)\n *    property: string;\n * }\n * ```\n *\n * @returns {Function}\n * @decorator\n * @schema\n * @property\n * @param cb\n */\nexport function OnDeserialize(cb: OnDeserializeCallback): PropertyDecorator {\n  return JsonEntityFn((storedJson) => {\n    storedJson.schema.$hooks.on(\"onDeserialize\", cb);\n  });\n}\n"]}

package/lib/esm/decorators/onSerialize.js

@@ -0,0 +1,25 @@
+import { JsonEntityFn } from "@tsed/schema";
+/**
+ * Call the function before property serialization.
+ *
+ * ## Example
+ *
+ * ```typescript
+ * class Model {
+ *    @OnSerialize(v => v + 1)
+ *    property: string;
+ * }
+ * ```
+ *
+ * @returns {Function}
+ * @decorator
+ * @schema
+ * @property
+ * @param cb
+ */
+export function OnSerialize(cb) {
+    return JsonEntityFn((storedJson) => {
+        storedJson.schema.$hooks.on("onSerialize", cb);
+    });
+}
+//# sourceMappingURL=onSerialize.js.map

package/lib/esm/decorators/onSerialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"onSerialize.js","sourceRoot":"","sources":["../../../src/decorators/onSerialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAkB,MAAM,cAAc,CAAC;AAM3D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,WAAW,CAAC,EAAuB;IACjD,OAAO,YAAY,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {JsonEntityFn, JsonHookContext} from \"@tsed/schema\";\n\nexport interface OnSerializeCallback {\n  (value: any, ctx: JsonHookContext): any;\n}\n\n/**\n * Call the function before property serialization.\n *\n * ## Example\n *\n * ```typescript\n * class Model {\n *    @OnSerialize(v => v + 1)\n *    property: string;\n * }\n * ```\n *\n * @returns {Function}\n * @decorator\n * @schema\n * @property\n * @param cb\n */\nexport function OnSerialize(cb: OnSerializeCallback): PropertyDecorator {\n  return JsonEntityFn((storedJson) => {\n    storedJson.schema.$hooks.on(\"onSerialize\", cb);\n  });\n}\n"]}

package/lib/esm/domain/JsonMapperContext.js

@@ -0,0 +1,19 @@
+import { isCollection } from "@tsed/core";
+/**
+ * @ignore
+ */
+export class JsonMapperContext {
+    constructor({ type, collectionType, next, options }) {
+        this.type = type;
+        this.collectionType = isCollection(collectionType) ? collectionType : undefined;
+        this._next = next;
+        this.options = options;
+    }
+    next(data) {
+        return this._next(data, {
+            ...this.options,
+            type: this.type
+        });
+    }
+}
+//# sourceMappingURL=JsonMapperContext.js.map

package/lib/esm/domain/JsonMapperContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JsonMapperContext.js","sourceRoot":"","sources":["../../../src/domain/JsonMapperContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAO,MAAM,YAAY,CAAC;AAS9C;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAM5B,YAAY,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAyB;QACvE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAChF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACtB,GAAG,IAAI,CAAC,OAAO;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import {isCollection, Type} from \"@tsed/core\";\nimport {JsonMapperCtx} from \"../interfaces/JsonMapperMethods\";\n/**\n * @ignore\n */\nexport interface JsonMapperContextProps extends Partial<Omit<JsonMapperCtx, \"next\">> {\n  next: (data: any, options: any) => void;\n  options: any;\n}\n/**\n * @ignore\n */\nexport class JsonMapperContext implements JsonMapperCtx {\n  readonly collectionType: Type<any> | undefined;\n  readonly type: Type<any> | any;\n  readonly options: any;\n  private _next: (data: any, options: any) => void;\n\n  constructor({type, collectionType, next, options}: JsonMapperContextProps) {\n    this.type = type;\n    this.collectionType = isCollection(collectionType) ? collectionType : undefined;\n    this._next = next;\n    this.options = options;\n  }\n\n  next(data: any) {\n    return this._next(data, {\n      ...this.options,\n      type: this.type\n    });\n  }\n}\n"]}

package/lib/esm/domain/JsonMapperTypesContainer.js

@@ -0,0 +1,18 @@
+/**
+ * @ignore
+ */
+// tslint:disable-next-line:variable-name
+const JsonMapperTypesContainer = new Map();
+/**
+ * @ignore
+ */
+export function registerJsonTypeMapper(type, token) {
+    JsonMapperTypesContainer.set(type, new token());
+}
+/**
+ * @ignore
+ */
+export function getJsonMapperTypes() {
+    return JsonMapperTypesContainer;
+}
+//# sourceMappingURL=JsonMapperTypesContainer.js.map

package/lib/esm/domain/JsonMapperTypesContainer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JsonMapperTypesContainer.js","sourceRoot":"","sources":["../../../src/domain/JsonMapperTypesContainer.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,yCAAyC;AACzC,MAAM,wBAAwB,GAA+C,IAAI,GAAG,EAAE,CAAC;AACvF;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAe,EAAE,KAA8B;IACpF,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;AAClD,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,wBAAwB,CAAC;AAClC,CAAC","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {JsonMapperMethods} from \"../interfaces/JsonMapperMethods\";\n/**\n * @ignore\n */\n// tslint:disable-next-line:variable-name\nconst JsonMapperTypesContainer: Map<Type<any> | Symbol, JsonMapperMethods> = new Map();\n/**\n * @ignore\n */\nexport function registerJsonTypeMapper(type: Type<any>, token: Type<JsonMapperMethods>) {\n  JsonMapperTypesContainer.set(type, new token());\n}\n/**\n * @ignore\n */\nexport function getJsonMapperTypes(): WeakMap<Type<any> | Symbol, JsonMapperMethods> {\n  return JsonMapperTypesContainer;\n}\n"]}

package/lib/esm/hooks/alterAfterDeserialize.js

@@ -0,0 +1,5 @@
+export function alterAfterDeserialize(data, schema, options) {
+    var _a;
+    return (_a = schema === null || schema === void 0 ? void 0 : schema.$hooks) === null || _a === void 0 ? void 0 : _a.alter("afterDeserialize", data, [options]);
+}
+//# sourceMappingURL=alterAfterDeserialize.js.map

package/lib/esm/hooks/alterAfterDeserialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alterAfterDeserialize.js","sourceRoot":"","sources":["../../../src/hooks/alterAfterDeserialize.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CAAC,IAAS,EAAE,MAAuB,EAAE,OAAY;;IACpF,OAAO,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACpE,CAAC","sourcesContent":["import {Hooks} from \"@tsed/core\";\n\nexport function alterAfterDeserialize(data: any, schema: {$hooks: Hooks}, options: any) {\n  return schema?.$hooks?.alter(\"afterDeserialize\", data, [options]);\n}\n"]}

package/lib/esm/hooks/alterBeforeDeserialize.js

@@ -0,0 +1,5 @@
+export function alterBeforeDeserialize(data, schema, options) {
+    var _a;
+    return (_a = schema === null || schema === void 0 ? void 0 : schema.$hooks) === null || _a === void 0 ? void 0 : _a.alter("beforeDeserialize", data, [options]);
+}
+//# sourceMappingURL=alterBeforeDeserialize.js.map

package/lib/esm/hooks/alterBeforeDeserialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alterBeforeDeserialize.js","sourceRoot":"","sources":["../../../src/hooks/alterBeforeDeserialize.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,sBAAsB,CAAC,IAAS,EAAE,MAAuB,EAAE,OAAY;;IACrF,OAAO,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,KAAK,CAAC,mBAAmB,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACrE,CAAC","sourcesContent":["import {Hooks} from \"@tsed/core\";\n\nexport function alterBeforeDeserialize(data: any, schema: {$hooks: Hooks}, options: any) {\n  return schema?.$hooks?.alter(\"beforeDeserialize\", data, [options]);\n}\n"]}

package/lib/esm/index.js

@@ -0,0 +1,12 @@
+export * from "./components";
+export * from "./decorators/jsonMapper";
+export * from "./decorators/onDeserialize";
+export * from "./decorators/onSerialize";
+export * from "./decorators/afterDeserialize";
+export * from "./decorators/beforeDeserialize";
+export * from "./domain/JsonMapperContext";
+export * from "./domain/JsonMapperTypesContainer";
+export * from "./interfaces/JsonMapperMethods";
+export * from "./utils/deserialize";
+export * from "./utils/serialize";
+//# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC","sourcesContent":["export * from \"./components\";\nexport * from \"./decorators/jsonMapper\";\nexport * from \"./decorators/onDeserialize\";\nexport * from \"./decorators/onSerialize\";\nexport * from \"./decorators/afterDeserialize\";\nexport * from \"./decorators/beforeDeserialize\";\nexport * from \"./domain/JsonMapperContext\";\nexport * from \"./domain/JsonMapperTypesContainer\";\nexport * from \"./interfaces/JsonMapperMethods\";\nexport * from \"./utils/deserialize\";\nexport * from \"./utils/serialize\";\n"]}

package/lib/esm/interfaces/JsonMapperMethods.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=JsonMapperMethods.js.map

package/lib/esm/interfaces/JsonMapperMethods.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JsonMapperMethods.js","sourceRoot":"","sources":["../../../src/interfaces/JsonMapperMethods.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\n\nexport interface JsonMapperCtx<T = any, C = any> {\n  collectionType: Type<C> | undefined;\n  type: Type<T> | T;\n  next: JsonMapperNext;\n}\n\nexport interface JsonMapperNext {\n  (obj: any): any;\n}\n\nexport interface JsonMapperMethods {\n  /**\n   *\n   * @param obj\n   * @param {JsonMapperNext} ctx\n   * @returns {any}\n   */\n  deserialize<T = any, C = any>(obj: any, ctx: JsonMapperCtx<T, C>): any;\n\n  /**\n   *\n   * @param obj\n   * @param ctx\n   * @returns {any}\n   */\n  serialize(obj: any, ctx: JsonMapperCtx<any>): any;\n}\n"]}

package/lib/esm/utils/deserialize.js

@@ -0,0 +1,135 @@
+import { isArray, isEmpty, isNil, nameOf, objectKeys } from "@tsed/core";
+import { alterIgnore, getProperties, JsonEntityStore, JsonSchema } from "@tsed/schema";
+import "../components";
+import { JsonMapperContext } from "../domain/JsonMapperContext";
+import { getJsonMapperTypes } from "../domain/JsonMapperTypesContainer";
+import { alterAfterDeserialize } from "../hooks/alterAfterDeserialize";
+import { alterBeforeDeserialize } from "../hooks/alterBeforeDeserialize";
+function isDeserializable(obj, options) {
+    if ((!!options.collectionType && isNil(obj)) || obj === undefined) {
+        return false;
+    }
+    return !(isEmpty(options.type) || (options.type === Object && !options.collectionType));
+}
+function alterValue(schema, value, options) {
+    return schema.$hooks.alter("onDeserialize", value, [options]);
+}
+function transformCollection(src, options) {
+    var _a;
+    const { types, type = Object, collectionType } = options;
+    const context = new JsonMapperContext({
+        type,
+        collectionType,
+        options,
+        next: (data, { collectionType, ...options }) => deserialize(data, options)
+    });
+    return (_a = types === null || types === void 0 ? void 0 : types.get(options.collectionType)) === null || _a === void 0 ? void 0 : _a.deserialize(src, context);
+}
+function transformType(src, options) {
+    var _a;
+    const { types, type = Object } = options;
+    const context = new JsonMapperContext({
+        type,
+        options,
+        next: (data, { type, ...options }) => deserialize(data, options)
+    });
+    return (_a = types === null || types === void 0 ? void 0 : types.get(type)) === null || _a === void 0 ? void 0 : _a.deserialize(src, context);
+}
+/**
+ * Transform given plain object to class.
+ * @param src
+ * @param options
+ */
+export function plainObjectToClass(src, options) {
+    if (isEmpty(src)) {
+        return src;
+    }
+    const { type, store = JsonEntityStore.from(type), ...next } = options;
+    const propertiesMap = getProperties(store, { ...options, withIgnoredProps: true });
+    let keys = objectKeys(src);
+    const additionalProperties = propertiesMap.size ? !!store.schema.get("additionalProperties") || options.additionalProperties : true;
+    src = alterBeforeDeserialize(src, store.schema, options);
+    const out = new type(src);
+    propertiesMap.forEach((propStore) => {
+        const key = options.useAlias
+            ? propStore.parent.schema.getAliasOf(propStore.propertyName) || propStore.propertyName
+            : propStore.propertyName;
+        keys = keys.filter((k) => k !== key);
+        next.type = propStore.computedType;
+        if (alterIgnore(propStore.itemSchema, options)) {
+            return;
+        }
+        let value = alterValue(propStore.schema, src[key], { ...options, self: src });
+        if (propStore.schema.hasGenerics) {
+            next.nestedGenerics = propStore.schema.nestedGenerics;
+        }
+        else if (propStore.schema.isGeneric && options.nestedGenerics) {
+            const [genericTypes = [], ...nestedGenerics] = options.nestedGenerics;
+            const genericLabels = propStore.parent.schema.genericLabels || [];
+            next.type = genericTypes[genericLabels.indexOf(propStore.schema.genericType)] || Object;
+            if (next.type instanceof JsonSchema) {
+                next.type = next.type.getTarget();
+            }
+            next.nestedGenerics = nestedGenerics;
+        }
+        value = deserialize(value, {
+            ...next,
+            type: value === src[key] ? next.type : undefined,
+            collectionType: propStore.collectionType
+        });
+        if (value !== undefined) {
+            out[propStore.propertyName] = value;
+        }
+    });
+    if (additionalProperties) {
+        keys.forEach((key) => {
+            out[key] = src[key];
+        });
+    }
+    return alterAfterDeserialize(out, store.schema, options);
+}
+function buildOptions(options) {
+    if (options.store instanceof JsonEntityStore) {
+        if (options.store.parameter && options.store.parameter.nestedGenerics.length) {
+            options.nestedGenerics = options.store.parameter.nestedGenerics;
+        }
+        options.type = options.store.computedType;
+        options.collectionType = options.store.collectionType;
+        delete options.store;
+    }
+    return {
+        groups: false,
+        useAlias: true,
+        ...options,
+        type: options.type ? options.type : undefined,
+        types: options.types ? options.types : getJsonMapperTypes()
+    };
+}
+/**
+ * Transform given source to class base on the given `options.type`.
+ *
+ * @param src
+ * @param options
+ */
+export function deserialize(src, options = {}) {
+    var _a, _b;
+    options = buildOptions(options);
+    if (!isDeserializable(src, options)) {
+        return src;
+    }
+    if (!options.collectionType && isArray(src)) {
+        options.collectionType = Array;
+    }
+    if (options.collectionType) {
+        if (!((_a = options.types) === null || _a === void 0 ? void 0 : _a.has(options.collectionType))) {
+            throw new Error(`${nameOf(options.collectionType)} is not supported by JsonMapper.`);
+        }
+        return transformCollection(src, options);
+    }
+    if ((_b = options.types) === null || _b === void 0 ? void 0 : _b.has(options.type)) {
+        return transformType(src, options);
+    }
+    // class converter
+    return plainObjectToClass(src, options);
+}
+//# sourceMappingURL=deserialize.js.map

package/lib/esm/utils/deserialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../../src/utils/deserialize.ts"],"names":[],"mappings":"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","sourcesContent":["import {isArray, isEmpty, isNil, MetadataTypes, nameOf, objectKeys, Type} from \"@tsed/core\";\nimport {alterIgnore, getProperties, JsonEntityStore, JsonHookContext, JsonSchema} from \"@tsed/schema\";\nimport \"../components\";\nimport {JsonMapperContext} from \"../domain/JsonMapperContext\";\nimport {getJsonMapperTypes} from \"../domain/JsonMapperTypesContainer\";\nimport {alterAfterDeserialize} from \"../hooks/alterAfterDeserialize\";\nimport {alterBeforeDeserialize} from \"../hooks/alterBeforeDeserialize\";\nimport {JsonMapperMethods} from \"../interfaces/JsonMapperMethods\";\n\nexport interface JsonDeserializerOptions<T = any, C = any> extends MetadataTypes<T, C> {\n  /**\n   * Types used to map complex types (Symbol, Array, Set, Map)\n   */\n  types?: WeakMap<Type<any>, JsonMapperMethods>;\n  /**\n   * useAlias mapping\n   */\n  useAlias?: boolean;\n  /**\n   * Accept additionalProperties or ignore it\n   */\n  additionalProperties?: boolean;\n  /**\n   * Use the store which have all metadata to deserialize correctly the model. This\n   * property is useful when you deal with metadata parameters.\n   */\n  store?: JsonEntityStore;\n  /**\n   *\n   */\n  groups?: string[] | false;\n\n  [key: string]: any;\n}\n\nfunction isDeserializable(obj: any, options: JsonDeserializerOptions) {\n  if ((!!options.collectionType && isNil(obj)) || obj === undefined) {\n    return false;\n  }\n\n  return !(isEmpty(options.type) || (options.type === Object && !options.collectionType));\n}\n\nfunction alterValue(schema: JsonSchema, value: any, options: JsonHookContext) {\n  return schema.$hooks.alter(\"onDeserialize\", value, [options]);\n}\n\nfunction transformCollection<T = any>(src: any, options: JsonDeserializerOptions<any, any>): T {\n  const {types, type = Object, collectionType} = options;\n\n  const context = new JsonMapperContext({\n    type,\n    collectionType,\n    options,\n    next: (data, {collectionType, ...options}) => deserialize(data, options)\n  });\n\n  return types?.get(options.collectionType)?.deserialize<T>(src, context);\n}\n\nfunction transformType<T = any>(src: any, options: JsonDeserializerOptions<any, any>): T {\n  const {types, type = Object} = options;\n\n  const context = new JsonMapperContext({\n    type,\n    options,\n    next: (data, {type, ...options}) => deserialize(data, options)\n  });\n\n  return types?.get(type)?.deserialize<T>(src, context);\n}\n\n/**\n * Transform given plain object to class.\n * @param src\n * @param options\n */\nexport function plainObjectToClass<T = any>(src: any, options: JsonDeserializerOptions): T {\n  if (isEmpty(src)) {\n    return src;\n  }\n\n  const {type, store = JsonEntityStore.from(type), ...next} = options;\n\n  const propertiesMap = getProperties(store, {...options, withIgnoredProps: true});\n\n  let keys = objectKeys(src);\n  const additionalProperties = propertiesMap.size ? !!store.schema.get(\"additionalProperties\") || options.additionalProperties : true;\n  src = alterBeforeDeserialize(src, store.schema, options);\n  const out: any = new type(src);\n\n  propertiesMap.forEach((propStore) => {\n    const key = options.useAlias\n      ? propStore.parent.schema.getAliasOf(propStore.propertyName) || propStore.propertyName\n      : propStore.propertyName;\n\n    keys = keys.filter((k) => k !== key);\n\n    next.type = propStore.computedType;\n\n    if (alterIgnore(propStore.itemSchema, options)) {\n      return;\n    }\n\n    let value = alterValue(propStore.schema, src[key], {...options, self: src});\n\n    if (propStore.schema.hasGenerics) {\n      next.nestedGenerics = propStore.schema.nestedGenerics;\n    } else if (propStore.schema.isGeneric && options.nestedGenerics) {\n      const [genericTypes = [], ...nestedGenerics] = options.nestedGenerics;\n      const genericLabels = propStore.parent.schema.genericLabels || [];\n\n      next.type = genericTypes[genericLabels.indexOf(propStore.schema.genericType)] || Object;\n\n      if (next.type instanceof JsonSchema) {\n        next.type = next.type.getTarget();\n      }\n\n      next.nestedGenerics = nestedGenerics;\n    }\n\n    value = deserialize(value, {\n      ...next,\n      type: value === src[key] ? next.type : undefined,\n      collectionType: propStore.collectionType\n    });\n\n    if (value !== undefined) {\n      out[propStore.propertyName] = value;\n    }\n  });\n\n  if (additionalProperties) {\n    keys.forEach((key) => {\n      out[key] = src[key];\n    });\n  }\n\n  return alterAfterDeserialize(out, store.schema, options);\n}\n\nfunction buildOptions(options: JsonDeserializerOptions<any, any>): any {\n  if (options.store instanceof JsonEntityStore) {\n    if (options.store.parameter && options.store.parameter.nestedGenerics.length) {\n      options.nestedGenerics = options.store.parameter.nestedGenerics;\n    }\n\n    options.type = options.store.computedType;\n    options.collectionType = options.store.collectionType;\n\n    delete options.store;\n  }\n\n  return {\n    groups: false,\n    useAlias: true,\n    ...options,\n    type: options.type ? options.type : undefined,\n    types: options.types ? options.types : getJsonMapperTypes()\n  };\n}\n\n/**\n * Transform given source to class base on the given `options.type`.\n *\n * @param src\n * @param options\n */\nexport function deserialize<T = any>(src: any, options: JsonDeserializerOptions = {}): T {\n  options = buildOptions(options);\n\n  if (!isDeserializable(src, options)) {\n    return src;\n  }\n\n  if (!options.collectionType && isArray(src)) {\n    options.collectionType = Array;\n  }\n\n  if (options.collectionType) {\n    if (!options.types?.has(options.collectionType)) {\n      throw new Error(`${nameOf(options.collectionType)} is not supported by JsonMapper.`);\n    }\n\n    return transformCollection(src, options);\n  }\n\n  if (options.types?.has(options.type)) {\n    return transformType(src, options);\n  }\n\n  // class converter\n  return plainObjectToClass(src, options);\n}\n"]}

package/lib/esm/utils/serialize.js

@@ -0,0 +1,109 @@
+import { classOf, isArray, isClassObject, isCollection, isEmpty, isFunction, isNil, objectKeys } from "@tsed/core";
+import { alterIgnore, getPropertiesStores, JsonEntityStore } from "@tsed/schema";
+import "../components";
+import { JsonMapperContext } from "../domain/JsonMapperContext";
+import { getJsonMapperTypes } from "../domain/JsonMapperTypesContainer";
+function alterValue(schema, value, options) {
+    return schema.$hooks.alter("onSerialize", value, [options]);
+}
+function getSchemaProperties(storedJson, obj) {
+    const stores = Array.from(getPropertiesStores(storedJson).entries());
+    if (!stores.length) {
+        // fallback to auto discovering field from obj
+        objectKeys(obj).forEach((key) => {
+            const propStore = JsonEntityStore.from(storedJson.target, key);
+            stores.push([key, propStore]);
+        });
+    }
+    return stores;
+}
+function getObjectProperties(obj) {
+    return Object.entries(obj).filter(([, value]) => !isFunction(value));
+}
+function getType(propStore, value) {
+    if (isNil(value) || propStore.type === Object || isCollection(propStore.type)) {
+        return undefined;
+    }
+    return propStore.type;
+}
+export function classToPlainObject(obj, options) {
+    const { useAlias = true, type, ...props } = options;
+    const entity = JsonEntityStore.from(type || obj);
+    return getSchemaProperties(entity, obj).reduce((newObj, [key, propStore]) => {
+        const schema = propStore.schema;
+        if (alterIgnore(schema, { useAlias, ...props, self: obj })) {
+            return newObj;
+        }
+        let value = alterValue(schema, obj[key], { useAlias, ...props, self: obj });
+        value = serialize(value, {
+            useAlias,
+            type: value === obj[key] ? getType(propStore, value) : undefined,
+            collectionType: propStore.collectionType,
+            ...props
+        });
+        if (value === undefined) {
+            return newObj;
+        }
+        key = useAlias ? propStore.parent.schema.getAliasOf(key) || key : key;
+        return {
+            ...newObj,
+            [key]: value
+        };
+    }, {});
+}
+function toObject(obj, options) {
+    return getObjectProperties(obj).reduce((newObj, [key, value]) => ({
+        ...newObj,
+        [key]: serialize(value, options)
+    }), {});
+}
+function getBestType(type, obj) {
+    const dataType = classOf(obj);
+    if (dataType && !isClassObject(dataType)) {
+        return dataType;
+    }
+    return type || Object;
+}
+export function serialize(obj, { type, collectionType, groups = false, ...options } = {}) {
+    var _a;
+    if (isEmpty(obj)) {
+        return obj;
+    }
+    let currentType = type;
+    const types = options.types ? options.types : getJsonMapperTypes();
+    options.groups = groups;
+    // FIX custom serialization function from @tsed/mongoose and bson
+    if ((typeof obj.toJSON === "function" && obj.$isMongooseModelPrototype) || obj._bsontype) {
+        return obj.toJSON(options);
+    }
+    if (typeof obj.toJSON === "function") {
+        return serialize(obj.toJSON(), { ...options, type: classOf(obj) });
+    }
+    if (!isCollection(obj)) {
+        options.type = currentType = getBestType(currentType, obj);
+    }
+    else if (!options.collectionType) {
+        currentType = classOf(obj);
+        options.type = type;
+        options.collectionType = currentType;
+    }
+    const context = new JsonMapperContext({
+        type: currentType,
+        options,
+        next: (data) => serialize(data, {
+            ...options,
+            collectionType: undefined,
+            type: options.type
+        })
+    });
+    if (types.has(currentType)) {
+        const jsonMapper = types.get(currentType);
+        return jsonMapper.serialize(obj, context);
+    }
+    if (isArray(obj)) {
+        // Serialize Array class like
+        return (_a = types.get(Array)) === null || _a === void 0 ? void 0 : _a.serialize(obj, context);
+    }
+    return !isClassObject(currentType) ? classToPlainObject(obj, options) : toObject(obj, options);
+}
+//# sourceMappingURL=serialize.js.map

package/lib/esm/utils/serialize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serialize.js","sourceRoot":"","sources":["../../../src/utils/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAiB,UAAU,EAAO,MAAM,YAAY,CAAC;AACtI,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAA8B,MAAM,cAAc,CAAC;AAC5G,OAAO,eAAe,CAAC;AACvB,OAAO,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAC,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AAgBtE,SAAS,UAAU,CAAC,MAAkB,EAAE,KAAU,EAAE,OAAwB;IAC1E,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,mBAAmB,CAAC,UAA2B,EAAE,GAAQ;IAChE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAErE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,8CAA8C;QAC9C,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9B,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAQ;IACnC,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,OAAO,CAAC,SAA0B,EAAE,KAAU;IACrD,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QAC7E,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,SAAS,CAAC,IAAI,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAQ,EAAE,OAAwC;IACnF,MAAM,EAAC,QAAQ,GAAG,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,EAAC,GAAG,OAAO,CAAC;IAElD,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;IAEjD,OAAO,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE;QAC1E,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAEhC,IAAI,WAAW,CAAC,MAAM,EAAE,EAAC,QAAQ,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,CAAC,EAAE;YACxD,OAAO,MAAM,CAAC;SACf;QAED,IAAI,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,CAAC,CAAC;QAC1E,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE;YACvB,QAAQ;YACR,IAAI,EAAE,KAAK,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;YAChE,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,GAAG,KAAK;SACT,CAAC,CAAC;QAEH,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,MAAM,CAAC;SACf;QAED,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAEtE,OAAO;YACL,GAAG,MAAM;YACT,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,QAAQ,CAAC,GAAQ,EAAE,OAA8B;IACxD,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,MAAM,CACpC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACzB,GAAG,MAAM;QACT,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC;KACjC,CAAC,EACF,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAe,EAAE,GAAQ;IAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9B,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QACxC,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,IAAI,IAAI,MAAM,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAQ,EAAE,EAAC,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,KAAK,EAAE,GAAG,OAAO,KAA2B,EAAE;;IAChH,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACnE,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IAExB,iEAAiE;IACjE,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,IAAI,GAAG,CAAC,yBAAyB,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE;QACxF,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC5B;IAED,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,EAAE;QACpC,OAAO,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,EAAC,GAAG,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC;KAClE;IAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO,CAAC,IAAI,GAAG,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;KAC5D;SAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAClC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,cAAc,GAAG,WAAW,CAAC;KACtC;IAED,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC;QACpC,IAAI,EAAE,WAAW;QACjB,OAAO;QACP,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CACb,SAAS,CAAC,IAAI,EAAE;YACd,GAAG,OAAO;YACV,cAAc,EAAE,SAAS;YACzB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC;KACL,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC1B,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;QAE3C,OAAO,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;KAC3C;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;QAChB,6BAA6B;QAC7B,OAAO,MAAA,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;KAClD;IAED,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACjG,CAAC","sourcesContent":["import {classOf, isArray, isClassObject, isCollection, isEmpty, isFunction, isNil, MetadataTypes, objectKeys, Type} from \"@tsed/core\";\nimport {alterIgnore, getPropertiesStores, JsonEntityStore, JsonHookContext, JsonSchema} from \"@tsed/schema\";\nimport \"../components\";\nimport {JsonMapperContext} from \"../domain/JsonMapperContext\";\nimport {getJsonMapperTypes} from \"../domain/JsonMapperTypesContainer\";\nimport {JsonMapperMethods} from \"../interfaces/JsonMapperMethods\";\n\nexport interface JsonSerializerOptions<T = any, C = any> extends MetadataTypes<T, C> {\n  /**\n   * Types used to map complex types (Symbol, Array, Set, Map)\n   */\n  types?: Map<Type<any>, JsonMapperMethods>;\n  /**\n   * useAlias mapping\n   */\n  useAlias?: boolean;\n\n  [key: string]: any;\n}\n\nfunction alterValue(schema: JsonSchema, value: any, options: JsonHookContext) {\n  return schema.$hooks.alter(\"onSerialize\", value, [options]);\n}\n\nfunction getSchemaProperties(storedJson: JsonEntityStore, obj: any) {\n  const stores = Array.from(getPropertiesStores(storedJson).entries());\n\n  if (!stores.length) {\n    // fallback to auto discovering field from obj\n    objectKeys(obj).forEach((key) => {\n      const propStore = JsonEntityStore.from(storedJson.target, key);\n      stores.push([key, propStore]);\n    });\n  }\n\n  return stores;\n}\n\nfunction getObjectProperties(obj: any): [string, any][] {\n  return Object.entries(obj).filter(([, value]) => !isFunction(value));\n}\n\nfunction getType(propStore: JsonEntityStore, value: any) {\n  if (isNil(value) || propStore.type === Object || isCollection(propStore.type)) {\n    return undefined;\n  }\n\n  return propStore.type;\n}\n\nexport function classToPlainObject(obj: any, options: JsonSerializerOptions<any, any>) {\n  const {useAlias = true, type, ...props} = options;\n\n  const entity = JsonEntityStore.from(type || obj);\n\n  return getSchemaProperties(entity, obj).reduce((newObj, [key, propStore]) => {\n    const schema = propStore.schema;\n\n    if (alterIgnore(schema, {useAlias, ...props, self: obj})) {\n      return newObj;\n    }\n\n    let value = alterValue(schema, obj[key], {useAlias, ...props, self: obj});\n    value = serialize(value, {\n      useAlias,\n      type: value === obj[key] ? getType(propStore, value) : undefined,\n      collectionType: propStore.collectionType,\n      ...props\n    });\n\n    if (value === undefined) {\n      return newObj;\n    }\n\n    key = useAlias ? propStore.parent.schema.getAliasOf(key) || key : key;\n\n    return {\n      ...newObj,\n      [key]: value\n    };\n  }, {});\n}\n\nfunction toObject(obj: any, options: JsonSerializerOptions): any {\n  return getObjectProperties(obj).reduce(\n    (newObj, [key, value]) => ({\n      ...newObj,\n      [key]: serialize(value, options)\n    }),\n    {}\n  );\n}\n\nfunction getBestType(type: Type<any>, obj: any) {\n  const dataType = classOf(obj);\n\n  if (dataType && !isClassObject(dataType)) {\n    return dataType;\n  }\n\n  return type || Object;\n}\n\nexport function serialize(obj: any, {type, collectionType, groups = false, ...options}: JsonSerializerOptions = {}): any {\n  if (isEmpty(obj)) {\n    return obj;\n  }\n\n  let currentType = type;\n\n  const types = options.types ? options.types : getJsonMapperTypes();\n  options.groups = groups;\n\n  // FIX custom serialization function from @tsed/mongoose and bson\n  if ((typeof obj.toJSON === \"function\" && obj.$isMongooseModelPrototype) || obj._bsontype) {\n    return obj.toJSON(options);\n  }\n\n  if (typeof obj.toJSON === \"function\") {\n    return serialize(obj.toJSON(), {...options, type: classOf(obj)});\n  }\n\n  if (!isCollection(obj)) {\n    options.type = currentType = getBestType(currentType, obj);\n  } else if (!options.collectionType) {\n    currentType = classOf(obj);\n    options.type = type;\n    options.collectionType = currentType;\n  }\n\n  const context = new JsonMapperContext({\n    type: currentType,\n    options,\n    next: (data) =>\n      serialize(data, {\n        ...options,\n        collectionType: undefined,\n        type: options.type\n      })\n  });\n\n  if (types.has(currentType)) {\n    const jsonMapper = types.get(currentType)!;\n\n    return jsonMapper.serialize(obj, context);\n  }\n\n  if (isArray(obj)) {\n    // Serialize Array class like\n    return types.get(Array)?.serialize(obj, context);\n  }\n\n  return !isClassObject(currentType) ? classToPlainObject(obj, options) : toObject(obj, options);\n}\n"]}

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "@tsed/json-mapper",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-beta.1",
   "description": "Json mapper module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
-  "main": "./lib/index.js",
-  "typings": "./lib/index.d.ts",
+  "main": "./lib/cjs/index.js",
+  "typings": "./lib/types/index.d.ts",
   "exports": {
-    "require": "./lib/index.js",
-    "default": "./lib/index.modern.js"
+    "types": "./lib/types/index.d.ts",
+    "import": "./lib/esm/index.js",
+    "require": "./lib/cjs/index.js",
+    "default": "./lib/esm/index.js"
+  },
+  "scripts": {
+    "build": "yarn run build:esm && yarn run build:cjs",
+    "build:cjs": "tsc --build tsconfig.compile.json",
+    "build:esm": "tsc --build tsconfig.compile.esm.json"
   },
   "keywords": [
     "TypeScript",
@@ -22,21 +29,18 @@
     "classes",
     "tsed"
   ],
-  "scripts": {
-    "build": "microbundle --target node --no-compress --format modern,cjs --tsconfig ./tsconfig.compile.json"
-  },
   "dependencies": {
     "tslib": "2.2.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-alpha.2",
-    "@tsed/exceptions": "7.0.0-alpha.2",
-    "@tsed/schema": "7.0.0-alpha.2"
+    "@tsed/core": "7.0.0-beta.1",
+    "@tsed/exceptions": "7.0.0-beta.1",
+    "@tsed/schema": "7.0.0-beta.1"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-alpha.2",
-    "@tsed/exceptions": "^7.0.0-alpha.2",
-    "@tsed/schema": "^7.0.0-alpha.2"
+    "@tsed/core": "^7.0.0-beta.1",
+    "@tsed/exceptions": "^7.0.0-beta.1",
+    "@tsed/schema": "^7.0.0-beta.1"
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {
@@ -44,8 +48,5 @@
   },
   "homepage": "https://github.com/tsedio/tsed/tree/alpha/packages/specs/json-mapper",
   "author": "Romain Lenzotti",
-  "license": "MIT",
-  "publishConfig": {
-    "tag": "alpha"
-  }
+  "license": "MIT"
 }

package/tsconfig.compile.esm.json

@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.compile.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "module": "ES2020",
+    "rootDir": "src",
+    "outDir": "./lib/esm",
+    "declaration": true,
+    "declarationDir": "./lib/types"
+  },
+  "exclude": [
+    "node_modules",
+    "test",
+    "lib",
+    "benchmark",
+    "coverage",
+    "spec",
+    "**/*.benchmark.ts",
+    "**/*.spec.ts",
+    "keys",
+    "jest.config.js"
+  ]
+}