@tsed/schema 7.84.1 → 7.85.1

package/lib/types-esm/fn/oneOf.d.ts

@@ -0,0 +1,10 @@
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
+ */
+export declare function oneOf(...oneOf: AnyJsonSchema[]): JsonSchema;

package/lib/types-esm/fn/string.d.ts

@@ -0,0 +1,7 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function string(): JsonSchema;

package/lib/types-esm/fn/uri.d.ts

@@ -0,0 +1,9 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model with `format: uri`.
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ */
+export declare function uri(): JsonSchema;

package/lib/types-esm/fn/url.d.ts

@@ -0,0 +1,7 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model with `format: url`.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function url(): JsonSchema;

package/lib/types-esm/index.d.ts

@@ -71,6 +71,7 @@ export * from "./decorators/common/hidden.js";
 export * from "./decorators/common/ignore.js";
 export * from "./decorators/common/integer.js";
 export * from "./decorators/common/jsonEntityFn.js";
+export * from "./decorators/common/labelledAs.js";
 export * from "./decorators/common/maximum.js";
 export * from "./decorators/common/maxLength.js";
 export * from "./decorators/common/minimum.js";
@@ -138,6 +139,23 @@ export * from "./domain/JsonRequestBody.js";
 export * from "./domain/JsonResponse.js";
 export * from "./domain/JsonSchema.js";
 export * from "./domain/SpecTypes.js";
+export * from "./fn/allOf.js";
+export * from "./fn/any.js";
+export * from "./fn/anyOf.js";
+export * from "./fn/boolean.js";
+export * from "./fn/collection.js";
+export * from "./fn/date.js";
+export * from "./fn/email.js";
+export * from "./fn/enums.js";
+export * from "./fn/from.js";
+export * from "./fn/integer.js";
+export * from "./fn/lazyRef.js";
+export * from "./fn/number.js";
+export * from "./fn/object.js";
+export * from "./fn/oneOf.js";
+export * from "./fn/string.js";
+export * from "./fn/uri.js";
+export * from "./fn/url.js";
 export * from "./hooks/alterIgnore.js";
 export * from "./hooks/alterOneOf.js";
 export * from "./hooks/alterRequiredGroups.js";
@@ -151,7 +169,6 @@ export * from "./utils/buildPath.js";
 export * from "./utils/concatParameters.js";
 export * from "./utils/concatPath.js";
 export * from "./utils/defineStatusModel.js";
-export * from "./utils/from.js";
 export * from "./utils/generateSpec.js";
 export * from "./utils/generics.js";
 export * from "./utils/getComputedType.js";

package/lib/types-esm/registries/JsonSchemaMapperContainer.d.ts

@@ -18,4 +18,4 @@ export declare function getJsonSchemaMapper(type: string, options: any): JsonSch
  */
 export declare function execMapper(type: string, args: any[], options: any, parent?: any): any;
 export declare function hasMapper(type: string): boolean;
-export declare function oneOfMapper(types: string[], options: any): string;
+export declare function execOneOfMapper(types: string[], options: any): string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "commonjs",
-  "version": "7.84.1",
+  "version": "7.85.1",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -37,7 +37,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "7.84.1",
+    "@tsed/openspec": "7.85.1",
     "change-case": "^4.1.2",
     "fs-extra": "^11.2.0",
     "json-schema": "0.4.0",
@@ -47,10 +47,10 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "7.84.1",
-    "@tsed/core": "7.84.1",
-    "@tsed/openspec": "7.84.1",
-    "@tsed/typescript": "7.84.1",
+    "@tsed/barrels": "7.85.1",
+    "@tsed/core": "7.85.1",
+    "@tsed/openspec": "7.85.1",
+    "@tsed/typescript": "7.85.1",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "2.3.3",
@@ -61,8 +61,8 @@
     "vitest": "2.0.4"
   },
   "peerDependencies": {
-    "@tsed/core": "7.84.1",
-    "@tsed/openspec": "7.84.1"
+    "@tsed/core": "7.85.1",
+    "@tsed/openspec": "7.85.1"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {

package/readme.md

@@ -1,5 +1,5 @@
 <p style="text-align: center" align="center">
- <a href="https://tsed.io" target="_blank"><img src="https://tsed.io/tsed-og.png" width="200" alt="Ts.ED logo"/></a>
+ <a href="https://tsed.dev" target="_blank"><img src="https://tsed.dev/tsed-og.png" width="200" alt="Ts.ED logo"/></a>
 </p>
 
 <div align="center">
@@ -16,9 +16,9 @@
 </div>
 
 <div align="center">
-  <a href="https://tsed.io/">Website</a>
+  <a href="https://tsed.dev/">Website</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
-  <a href="https://tsed.io/getting-started/">Getting started</a>
+  <a href="https://tsed.dev/getting-started/">Getting started</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
   <a href="https://api.tsed.io/rest/slack/tsedio/tsed">Slack</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
@@ -27,13 +27,13 @@
 
 <hr />
 
-A package of Ts.ED framework. See website: https://tsed.io/
+A package of Ts.ED framework. See website: https://tsed.dev/
 
 Package to declare JsonSchema and OpenAPI.
 
 ## Documentation
 
-Documentation is available on [https://tsed.io](https://tsed.io/docs/model.html)
+Documentation is available on [https://tsed.dev](https://tsed.dev/docs/model.html)
 
 ## Installation
 
@@ -45,7 +45,7 @@ npm install --save @tsed/schema
 
 ## Contributors
 
-Please read [contributing guidelines here](https://tsed.io/contributing.html)
+Please read [contributing guidelines here](https://tsed.dev/contributing.html)
 
 <a href="https://github.com/tsedio/tsed/graphs/contributors"><img src="https://opencollective.com/tsed/contributors.svg?width=890" /></a>
 

package/lib/cjs/utils/from.js

@@ -1,280 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.enums = exports.lazyRef = exports.allOf = exports.oneOf = exports.anyOf = exports.any = exports.object = exports.set = exports.map = exports.array = exports.url = exports.uri = exports.email = exports.time = exports.datetime = exports.date = exports.boolean = exports.string = exports.integer = exports.number = exports.from = void 0;
-const core_1 = require("@tsed/core");
-const JsonEntityStore_js_1 = require("../domain/JsonEntityStore.js");
-const JsonFormatTypes_js_1 = require("../domain/JsonFormatTypes.js");
-const JsonLazyRef_js_1 = require("../domain/JsonLazyRef.js");
-const JsonSchema_js_1 = require("../domain/JsonSchema.js");
-const enumRegistries_js_1 = require("../registries/enumRegistries.js");
-const getJsonEntityStore_js_1 = require("./getJsonEntityStore.js");
-/**
- * Create a new model from the given type.
- *
- * ```typescript
- * from(String)
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function from(type = Object) {
-    if ((0, core_1.isClass)(type)) {
-        const { schema } = (0, getJsonEntityStore_js_1.getJsonEntityStore)(type);
-        schema.properties = function properties(obj) {
-            Object.entries(obj).forEach(([propertyKey, propSchema]) => {
-                (0, getJsonEntityStore_js_1.getJsonEntityStore)(type.prototype, propertyKey).schema.assign(propSchema);
-            });
-            return this;
-        };
-        return schema;
-    }
-    return JsonSchema_js_1.JsonSchema.from({ type });
-}
-exports.from = from;
-/**
- * Declare a new number model.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function number() {
-    return from(Number);
-}
-exports.number = number;
-/**
- * Declare a new integer model.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function integer() {
-    return from(Number).integer();
-}
-exports.integer = integer;
-/**
- * Declare a new string model.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function string() {
-    return from(String);
-}
-exports.string = string;
-/**
- * Declare a new boolean model.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function boolean() {
-    return from(Boolean);
-}
-exports.boolean = boolean;
-/**
- * Declare a new string model with `format: date`.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function date() {
-    return from(Date).format(JsonFormatTypes_js_1.JsonFormatTypes.DATE);
-}
-exports.date = date;
-/**
- * Declare a new string model with `format: datetime`.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function datetime() {
-    return from(Date).format(JsonFormatTypes_js_1.JsonFormatTypes.DATE_TIME);
-}
-exports.datetime = datetime;
-/**
- * Declare a new string model with `format: time`.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function time() {
-    return from(Date).format(JsonFormatTypes_js_1.JsonFormatTypes.TIME);
-}
-exports.time = time;
-/**
- * Declare a new string model with `format: email`.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function email() {
-    return from(String).format(JsonFormatTypes_js_1.JsonFormatTypes.EMAIL);
-}
-exports.email = email;
-/**
- * Declare a new string model with `format: uri`.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function uri() {
-    return from(String).format(JsonFormatTypes_js_1.JsonFormatTypes.URI);
-}
-exports.uri = uri;
-/**
- * Declare a new string model with `format: url`.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function url() {
-    return from(String).format(JsonFormatTypes_js_1.JsonFormatTypes.URL);
-}
-exports.url = url;
-/**
- * Declare a new object model with `additionalProperties: true`.
- *
- * ```json
- * {
- *   "type": "array"
- * }
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function array() {
-    return from(Array);
-}
-exports.array = array;
-/**
- * Declare a new object model with `additionalProperties: true`.
- *
- * ```json
- * {
- *   "type": "object",
- *   "additionalProperties": true
- * }
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function map() {
-    return from(Map).unknown(true);
-}
-exports.map = map;
-/**
- * Declare a new array model with `uniqueItems: true`.
- *
- * ```json
- * {
- *   "type": "array",
- *   "uniqueItems": true
- * }
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function set() {
-    return from(Array).uniqueItems(true);
-}
-exports.set = set;
-/**
- * Declare a new object model.
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function object(properties = {}) {
-    return from(Object).properties(properties);
-}
-exports.object = object;
-/**
- * Declare a model with any type (By default: `integer`, `number`, `string`, `boolean`, `array`, `object`, `null`)
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-function any(...types) {
-    return from().any(...types);
-}
-exports.any = any;
-/**
- * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
- * @schemaFunctional
- */
-function anyOf(...anyOf) {
-    return from().anyOf(anyOf);
-}
-exports.anyOf = anyOf;
-/**
- * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
- */
-function oneOf(...oneOf) {
-    return from().oneOf(oneOf);
-}
-exports.oneOf = oneOf;
-/**
- * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
- * @schemaFunctional
- */
-function allOf(...allOf) {
-    return from().allOf(allOf);
-}
-exports.allOf = allOf;
-/**
- * Declare a sub schema which will be resolved later. Use this function when you have a circular reference between two schemes.
- *
- * @schemaFunctional
- */
-function lazyRef(cb) {
-    try {
-        // solve issue with a self referenced model
-        if (cb()) {
-            // type is already accessible
-            return JsonEntityStore_js_1.JsonEntityStore.from(cb()).schema;
-        }
-    }
-    catch (er) { }
-    return new JsonLazyRef_js_1.JsonLazyRef(cb);
-}
-exports.lazyRef = lazyRef;
-function enums(e) {
-    const schema = string().enum(e);
-    enumRegistries_js_1.enumsRegistry.set(e, schema);
-    return schema;
-}
-exports.enums = enums;
-//# sourceMappingURL=from.js.map

package/lib/cjs/utils/from.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"from.js","sourceRoot":"","sources":["../../../src/utils/from.ts"],"names":[],"mappings":"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"}