@powerlines/schema 0.11.45 → 0.11.46

package/dist/helpers.d.mts

@@ -1,6 +1,11 @@
-import { JsonSchema, JsonSchemaProperty, Schema } from "./types.mjs";
+import { JsonSchema, JsonSchemaObject, Schema } from "./types.mjs";
 
 //#region src/helpers.d.ts
+type GetPropertiesResult = JsonSchema & {
+  name: string;
+  required: boolean;
+  default?: unknown;
+};
 /**
  * Extracts object properties from a JSON Schema object form.
  *
@@ -10,7 +15,11 @@ import { JsonSchema, JsonSchemaProperty, Schema } from "./types.mjs";
  * @param obj - The JSON Schema object form or a Schema wrapper to extract properties from.
  * @returns An object mapping property names to their corresponding JSON Schema fragments, including metadata.
  */
-declare function getProperties<T extends Record<string, any> = Record<string, any>>(obj: Schema<T> | JsonSchema<T>): Record<string, JsonSchemaProperty<T>>;
+declare function getProperties(obj: Schema | JsonSchemaObject): Record<string, JsonSchema & {
+  name: string;
+  required: boolean;
+  default?: unknown;
+}>;
 /**
  * Returns object properties as an array.
  *
@@ -20,7 +29,11 @@ declare function getProperties<T extends Record<string, any> = Record<string, an
  * @param obj - The JSON Schema object form or a Schema wrapper to extract properties from.
  * @returns An array of JSON Schema fragments representing the properties, each including metadata.
  */
-declare function getPropertiesList<T extends Record<string, any> = Record<string, any>>(obj: Schema<T> | JsonSchema<T>): Array<JsonSchemaProperty<T>>;
+declare function getPropertiesList(obj: Schema | JsonSchemaObject): (JsonSchema & {
+  name: string;
+  required: boolean;
+  default?: unknown;
+})[];
 /**
  * Adds a property to a JSON Schema object form.
  *
@@ -32,7 +45,7 @@ declare function getPropertiesList<T extends Record<string, any> = Record<string
  * @param property - The JSON Schema fragment representing the property's schema, including metadata.
  * @throws Will throw an error if the provided schema is not an object form.
  */
-declare function addProperty<T extends Record<string, any> = Record<string, any>>(obj: Schema<T> | JsonSchema<T>, name: string, property: JsonSchemaProperty<T>): void;
+declare function addProperty(obj: Schema | JsonSchemaObject, name: string, property: JsonSchema): void;
 /**
  * Merges multiple JSON Schema object forms into one.
  *
@@ -42,7 +55,28 @@ declare function addProperty<T extends Record<string, any> = Record<string, any>
  * @param schemas - An array of JSON Schema objects or Schema wrappers to merge.
  * @returns A new JSON Schema object that is the result of merging all input schemas.
  */
-declare function mergeSchemas<T extends Record<string, any> = Record<string, any>>(...schemas: (JsonSchema<T> | Schema<T>)[]): JsonSchema<T>;
+declare function mergeSchemas(...schemas: (JsonSchema | Schema)[]): JsonSchema;
+/**
+ * Returns whether a JSON Schema fragment accepts `null`.
+ *
+ * @remarks
+ * This is true if the schema has `nullable: true` or if its `type` includes `"null"`.
+ *
+ * @param schema - The JSON Schema fragment to check.
+ * @returns `true` if the schema accepts `null`, otherwise `false`.
+ */
+declare function isSchemaNullable(schema?: JsonSchema): boolean;
+/**
+ * Returns whether an object property is optional (not listed in `required`).
+ *
+ * @remarks
+ * In JSON Schema, object properties are optional by default unless they are listed in the `required` array of the parent schema. This function checks whether a given property name is not included in the `required` array of its parent schema, indicating that it is optional.
+ *
+ * @param parent - The parent JSON Schema object containing the property.
+ * @param propertyName - The name of the property to check for optionality.
+ * @returns `true` if the property is optional, otherwise `false`.
+ */
+declare function isPropertyOptional(parent: JsonSchemaObject, propertyName: string): boolean;
 //#endregion
-export { addProperty, getProperties, getPropertiesList, mergeSchemas };
+export { GetPropertiesResult, addProperty, getProperties, getPropertiesList, isPropertyOptional, isSchemaNullable, mergeSchemas };
 //# sourceMappingURL=helpers.d.mts.map

package/dist/helpers.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.mts","names":[],"sources":["../src/helpers.ts"],"mappings":";;;;;AAsCA;;;;;;;iBAAgB,aAAA,WACJ,MAAA,gBAAsB,MAAA,cAAA,CAChC,GAAA,EAAK,MAAA,CAAO,CAAA,IAAK,UAAA,CAAW,CAAA,IAAK,MAAA,SAAe,kBAAA,CAAmB,CAAA;;;;;;;;;;iBA6BrD,iBAAA,WACJ,MAAA,gBAAsB,MAAA,cAAA,CAChC,GAAA,EAAK,MAAA,CAAO,CAAA,IAAK,UAAA,CAAW,CAAA,IAAK,KAAA,CAAM,kBAAA,CAAmB,CAAA;;;;;;;;;AA/BU;AA6BtE;;iBAiBgB,WAAA,WACJ,MAAA,gBAAsB,MAAA,cAAA,CAEhC,GAAA,EAAK,MAAA,CAAO,CAAA,IAAK,UAAA,CAAW,CAAA,GAC5B,IAAA,UACA,QAAA,EAAU,kBAAA,CAAmB,CAAA;;;;;;;;;;iBA+Bf,YAAA,WACJ,MAAA,gBAAsB,MAAA,cAAA,CAAA,GAC7B,OAAA,GAAU,UAAA,CAAW,CAAA,IAAK,MAAA,CAAO,CAAA,OAAQ,UAAA,CAAW,CAAA"}
+{"version":3,"file":"helpers.d.mts","names":[],"sources":["../src/helpers.ts"],"mappings":";;;KAwBY,mBAAA,GAAsB,UAAU;EAC1C,IAAA;EACA,QAAA;EACA,OAAA;AAAA;;;;;;;AAAO;AAYT;;iBAAgB,aAAA,CACd,GAAA,EAAK,MAAA,GAAS,gBAAA,GACb,MAAA,SAED,UAAA;EAAe,IAAA;EAAc,QAAA;EAAmB,OAAA;AAAA;;;;;;;;;;iBA0ClC,iBAAA,CAAkB,GAAA,EAAK,MAAA,GAAS,gBAAA,IAAgB,UAAA;;;;;;;;;;;;;;;;iBAehD,WAAA,CACd,GAAA,EAAK,MAAA,GAAS,gBAAA,EACd,IAAA,UACA,QAAA,EAAU,UAAA;;;;AAHZ;;;;;;iBAgCgB,YAAA,CAAA,GAAgB,OAAA,GAAU,UAAA,GAAa,MAAA,MAAY,UAAA;;;;;;;;;AA7B7C;iBAoDN,gBAAA,CAAiB,MAAmB,GAAV,UAAU;;;;;;;;;;;iBAsBpC,kBAAA,CACd,MAAA,EAAQ,gBAAgB,EACxB,YAAA"}

package/dist/helpers.mjs

@@ -1,4 +1,4 @@
-import { isPropertyOptional, isSchemaNullable } from "./metadata.mjs";
+import { readSchemaTypes } from "./metadata.mjs";
 import { isJsonSchemaObject, isSchema } from "./type-checks.mjs";
 import { defu as defu$1 } from "defu";
 import { isSetObject } from "@stryke/type-checks";
@@ -16,12 +16,18 @@ import { isSetObject } from "@stryke/type-checks";
 function getProperties(obj) {
 	const properties = {};
 	const schema = isSchema(obj) ? obj.schema : obj;
-	if (!isJsonSchemaObject(schema) || !isSetObject(schema.properties)) return properties;
-	for (const [key, value] of Object.entries(schema.properties)) properties[key] = {
-		...value,
-		name: key,
-		nullable: isSchemaNullable(value) || isPropertyOptional(schema, key)
-	};
+	if (!isJsonSchemaObject(schema)) return properties;
+	if (!isSetObject(schema.properties)) return properties;
+	for (const [key, value] of Object.entries(schema.properties)) {
+		const propertySchema = {};
+		if (typeof value !== "boolean") Object.assign(propertySchema, value);
+		properties[key] = {
+			...propertySchema,
+			name: key,
+			required: !isPropertyOptional(schema, key),
+			default: schema.default?.[key] ?? propertySchema.default
+		};
+	}
 	return properties;
 }
 /**
@@ -56,8 +62,7 @@ function addProperty(obj, name, property) {
 		...property,
 		name
 	};
-	if (property?.optional) schema.required = schema.required.filter((key) => key !== name);
-	else if (!schema.required.includes(name)) schema.required.push(name);
+	if (!schema.required.includes(name)) schema.required.push(name);
 	if (schema.required.length === 0) delete schema.required;
 }
 /**
@@ -78,7 +83,35 @@ function mergeSchemas(...schemas) {
 	}
 	return result;
 }
+/**
+* Returns whether a JSON Schema fragment accepts `null`.
+*
+* @remarks
+* This is true if the schema has `nullable: true` or if its `type` includes `"null"`.
+*
+* @param schema - The JSON Schema fragment to check.
+* @returns `true` if the schema accepts `null`, otherwise `false`.
+*/
+function isSchemaNullable(schema) {
+	if (!isSetObject(schema)) return false;
+	if (schema.nullable === true) return true;
+	return readSchemaTypes(schema).includes("null");
+}
+/**
+* Returns whether an object property is optional (not listed in `required`).
+*
+* @remarks
+* In JSON Schema, object properties are optional by default unless they are listed in the `required` array of the parent schema. This function checks whether a given property name is not included in the `required` array of its parent schema, indicating that it is optional.
+*
+* @param parent - The parent JSON Schema object containing the property.
+* @param propertyName - The name of the property to check for optionality.
+* @returns `true` if the property is optional, otherwise `false`.
+*/
+function isPropertyOptional(parent, propertyName) {
+	if (!parent.properties?.[propertyName]) throw new Error(`The property "${propertyName}" does not exist in the parent schema.`);
+	return !(parent.required ?? []).includes(propertyName);
+}
 
 //#endregion
-export { addProperty, getProperties, getPropertiesList, mergeSchemas };
+export { addProperty, getProperties, getPropertiesList, isPropertyOptional, isSchemaNullable, mergeSchemas };
 //# sourceMappingURL=helpers.mjs.map

package/dist/helpers.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.mjs","names":[],"sources":["../src/helpers.ts"],"sourcesContent":["/* -------------------------------------------------------------------\n\n                   ⚡ Storm Software - Powerlines\n\n This code was released as part of the Powerlines project. Powerlines\n is maintained by Storm Software under the Apache-2.0 license, and is\n free for commercial and private use. For more information, please visit\n our licensing page at https://stormsoftware.com/licenses/projects/powerlines.\n\n Website:                  https://stormsoftware.com\n Repository:               https://github.com/storm-software/powerlines\n Documentation:            https://docs.stormsoftware.com/projects/powerlines\n Contact:                  https://stormsoftware.com/contact\n\n SPDX-License-Identifier:  Apache-2.0\n\n ------------------------------------------------------------------- */\n\nimport { isSetObject } from \"@stryke/type-checks\";\nimport { defu } from \"defu\";\nimport { isPropertyOptional, isSchemaNullable } from \"./metadata\";\nimport { isJsonSchemaObject, isSchema } from \"./type-checks\";\nimport {\n  JsonSchema,\n  JsonSchemaObject,\n  JsonSchemaProperty,\n  Schema\n} from \"./types\";\n\n/**\n * Extracts object properties from a JSON Schema object form.\n *\n * @remarks\n * This function returns an empty object if the schema is not an object form or if it has no properties.\n *\n * @param obj - The JSON Schema object form or a Schema wrapper to extract properties from.\n * @returns An object mapping property names to their corresponding JSON Schema fragments, including metadata.\n */\nexport function getProperties<\n  T extends Record<string, any> = Record<string, any>\n>(obj: Schema<T> | JsonSchema<T>): Record<string, JsonSchemaProperty<T>> {\n  const properties: Record<string, JsonSchemaProperty<T>> = {};\n  const schema: JsonSchema<T> = isSchema<T>(obj) ? obj.schema : obj;\n  if (!isJsonSchemaObject<T>(schema) || !isSetObject(schema.properties)) {\n    return properties;\n  }\n\n  for (const [key, value] of Object.entries(schema.properties)) {\n    properties[key] = {\n      ...value,\n      name: key,\n      nullable:\n        isSchemaNullable(value as JsonSchema<any>) ||\n        isPropertyOptional(schema, key)\n    };\n  }\n\n  return properties;\n}\n\n/**\n * Returns object properties as an array.\n *\n * @remarks\n * This is a convenience function that extracts properties using `getProperties` and returns them as an array.\n *\n * @param obj - The JSON Schema object form or a Schema wrapper to extract properties from.\n * @returns An array of JSON Schema fragments representing the properties, each including metadata.\n */\nexport function getPropertiesList<\n  T extends Record<string, any> = Record<string, any>\n>(obj: Schema<T> | JsonSchema<T>): Array<JsonSchemaProperty<T>> {\n  return Object.values(getProperties<T>(obj));\n}\n\n/**\n * Adds a property to a JSON Schema object form.\n *\n * @remarks\n * This function modifies the provided schema in place by adding a new property with the specified name and schema. It also updates the `required` array based on the `optional` flag of the property. If the property is marked as optional, it will be removed from the `required` array; otherwise, it will be added to it.\n *\n * @param obj - The JSON Schema object form or a Schema wrapper to which the property should be added.\n * @param name - The name of the property to add.\n * @param property - The JSON Schema fragment representing the property's schema, including metadata.\n * @throws Will throw an error if the provided schema is not an object form.\n */\nexport function addProperty<\n  T extends Record<string, any> = Record<string, any>\n>(\n  obj: Schema<T> | JsonSchema<T>,\n  name: string,\n  property: JsonSchemaProperty<T>\n): void {\n  const schema = (isSchema<T>(obj) ? obj.schema : obj) as JsonSchemaObject<T>;\n  if (!isJsonSchemaObject<T>(schema)) {\n    throw new Error(\"Cannot add property to non-object schema\");\n  }\n\n  schema.properties ??= {};\n  schema.required ??= [];\n\n  schema.properties[name] = { ...property, name };\n  if (property?.optional) {\n    schema.required = schema.required.filter(key => key !== name);\n  } else if (!schema.required.includes(name)) {\n    schema.required.push(name);\n  }\n\n  if (schema.required.length === 0) {\n    delete schema.required;\n  }\n}\n\n/**\n * Merges multiple JSON Schema object forms into one.\n *\n * @remarks\n * This function takes multiple JSON Schema objects or Schema wrappers and merges them into a single JSON Schema object. The merging process combines properties and metadata from all provided schemas, with later schemas in the arguments list taking precedence over earlier ones in case of conflicts. The resulting schema will include all unique properties and metadata from the input schemas.\n *\n * @param schemas - An array of JSON Schema objects or Schema wrappers to merge.\n * @returns A new JSON Schema object that is the result of merging all input schemas.\n */\nexport function mergeSchemas<\n  T extends Record<string, any> = Record<string, any>\n>(...schemas: (JsonSchema<T> | Schema<T>)[]): JsonSchema<T> {\n  const result: JsonSchema<T> = {} as JsonSchema<T>;\n  for (const schema of schemas) {\n    const jsonSchema: JsonSchema<T> = isSchema<T>(schema)\n      ? schema.schema\n      : schema;\n    if (!isJsonSchemaObject<T>(jsonSchema)) {\n      continue;\n    }\n\n    defu(result, jsonSchema);\n  }\n\n  return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;AAsCA,SAAgB,cAEd,KAAuE;CACvE,MAAM,aAAoD,CAAC;CAC3D,MAAM,SAAwB,SAAY,GAAG,IAAI,IAAI,SAAS;CAC9D,IAAI,CAAC,mBAAsB,MAAM,KAAK,CAAC,YAAY,OAAO,UAAU,GAClE,OAAO;CAGT,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,UAAU,GACzD,WAAW,OAAO;EAChB,GAAG;EACH,MAAM;EACN,UACE,iBAAiB,KAAwB,KACzC,mBAAmB,QAAQ,GAAG;CAClC;CAGF,OAAO;AACT;;;;;;;;;;AAWA,SAAgB,kBAEd,KAA8D;CAC9D,OAAO,OAAO,OAAO,cAAiB,GAAG,CAAC;AAC5C;;;;;;;;;;;;AAaA,SAAgB,YAGd,KACA,MACA,UACM;CACN,MAAM,SAAU,SAAY,GAAG,IAAI,IAAI,SAAS;CAChD,IAAI,CAAC,mBAAsB,MAAM,GAC/B,MAAM,IAAI,MAAM,0CAA0C;CAG5D,OAAO,eAAe,CAAC;CACvB,OAAO,aAAa,CAAC;CAErB,OAAO,WAAW,QAAQ;EAAE,GAAG;EAAU;CAAK;CAC9C,IAAI,UAAU,UACZ,OAAO,WAAW,OAAO,SAAS,QAAO,QAAO,QAAQ,IAAI;MACvD,IAAI,CAAC,OAAO,SAAS,SAAS,IAAI,GACvC,OAAO,SAAS,KAAK,IAAI;CAG3B,IAAI,OAAO,SAAS,WAAW,GAC7B,OAAO,OAAO;AAElB;;;;;;;;;;AAWA,SAAgB,aAEd,GAAG,SAAuD;CAC1D,MAAM,SAAwB,CAAC;CAC/B,KAAK,MAAM,UAAU,SAAS;EAC5B,MAAM,aAA4B,SAAY,MAAM,IAChD,OAAO,SACP;EACJ,IAAI,CAAC,mBAAsB,UAAU,GACnC;EAGF,OAAK,QAAQ,UAAU;CACzB;CAEA,OAAO;AACT"}
+{"version":3,"file":"helpers.mjs","names":[],"sources":["../src/helpers.ts"],"sourcesContent":["/* -------------------------------------------------------------------\n\n                   ⚡ Storm Software - Powerlines\n\n This code was released as part of the Powerlines project. Powerlines\n is maintained by Storm Software under the Apache-2.0 license, and is\n free for commercial and private use. For more information, please visit\n our licensing page at https://stormsoftware.com/licenses/projects/powerlines.\n\n Website:                  https://stormsoftware.com\n Repository:               https://github.com/storm-software/powerlines\n Documentation:            https://docs.stormsoftware.com/projects/powerlines\n Contact:                  https://stormsoftware.com/contact\n\n SPDX-License-Identifier:  Apache-2.0\n\n ------------------------------------------------------------------- */\n\nimport { isSetObject } from \"@stryke/type-checks\";\nimport { defu } from \"defu\";\nimport { readSchemaTypes } from \"./metadata\";\nimport { isJsonSchemaObject, isSchema } from \"./type-checks\";\nimport { JsonSchema, JsonSchemaObject, Schema } from \"./types\";\n\nexport type GetPropertiesResult = JsonSchema & {\n  name: string;\n  required: boolean;\n  default?: unknown;\n};\n\n/**\n * Extracts object properties from a JSON Schema object form.\n *\n * @remarks\n * This function returns an empty object if the schema is not an object form or if it has no properties.\n *\n * @param obj - The JSON Schema object form or a Schema wrapper to extract properties from.\n * @returns An object mapping property names to their corresponding JSON Schema fragments, including metadata.\n */\nexport function getProperties(\n  obj: Schema | JsonSchemaObject\n): Record<\n  string,\n  JsonSchema & { name: string; required: boolean; default?: unknown }\n> {\n  const properties: Record<\n    string,\n    JsonSchema & { name: string; required: boolean; default?: unknown }\n  > = {};\n  const schema: JsonSchema = isSchema(obj) ? obj.schema : obj;\n  if (!isJsonSchemaObject(schema)) {\n    return properties;\n  }\n\n  if (!isSetObject(schema.properties)) {\n    return properties;\n  }\n\n  for (const [key, value] of Object.entries(schema.properties)) {\n    const propertySchema: Record<string, unknown> = {};\n\n    if (typeof value !== \"boolean\") {\n      Object.assign(propertySchema, value);\n    }\n\n    properties[key] = {\n      ...propertySchema,\n      name: key,\n      required: !isPropertyOptional(schema, key),\n      default: schema.default?.[key] ?? propertySchema.default\n    };\n  }\n\n  return properties;\n}\n\n/**\n * Returns object properties as an array.\n *\n * @remarks\n * This is a convenience function that extracts properties using `getProperties` and returns them as an array.\n *\n * @param obj - The JSON Schema object form or a Schema wrapper to extract properties from.\n * @returns An array of JSON Schema fragments representing the properties, each including metadata.\n */\nexport function getPropertiesList(obj: Schema | JsonSchemaObject) {\n  return Object.values(getProperties(obj));\n}\n\n/**\n * Adds a property to a JSON Schema object form.\n *\n * @remarks\n * This function modifies the provided schema in place by adding a new property with the specified name and schema. It also updates the `required` array based on the `optional` flag of the property. If the property is marked as optional, it will be removed from the `required` array; otherwise, it will be added to it.\n *\n * @param obj - The JSON Schema object form or a Schema wrapper to which the property should be added.\n * @param name - The name of the property to add.\n * @param property - The JSON Schema fragment representing the property's schema, including metadata.\n * @throws Will throw an error if the provided schema is not an object form.\n */\nexport function addProperty(\n  obj: Schema | JsonSchemaObject,\n  name: string,\n  property: JsonSchema\n): void {\n  const schema = (isSchema(obj) ? obj.schema : obj) as JsonSchemaObject;\n  if (!isJsonSchemaObject(schema)) {\n    throw new Error(\"Cannot add property to non-object schema\");\n  }\n\n  schema.properties ??= {};\n  schema.required ??= [];\n\n  schema.properties[name] = { ...property, name };\n  if (!schema.required.includes(name)) {\n    schema.required.push(name);\n  }\n\n  if (schema.required.length === 0) {\n    delete schema.required;\n  }\n}\n\n/**\n * Merges multiple JSON Schema object forms into one.\n *\n * @remarks\n * This function takes multiple JSON Schema objects or Schema wrappers and merges them into a single JSON Schema object. The merging process combines properties and metadata from all provided schemas, with later schemas in the arguments list taking precedence over earlier ones in case of conflicts. The resulting schema will include all unique properties and metadata from the input schemas.\n *\n * @param schemas - An array of JSON Schema objects or Schema wrappers to merge.\n * @returns A new JSON Schema object that is the result of merging all input schemas.\n */\nexport function mergeSchemas(...schemas: (JsonSchema | Schema)[]): JsonSchema {\n  const result: JsonSchema = {};\n  for (const schema of schemas) {\n    const jsonSchema: JsonSchema = isSchema(schema) ? schema.schema : schema;\n    if (!isJsonSchemaObject(jsonSchema)) {\n      continue;\n    }\n\n    defu(result, jsonSchema);\n  }\n\n  return result;\n}\n\n/**\n * Returns whether a JSON Schema fragment accepts `null`.\n *\n * @remarks\n * This is true if the schema has `nullable: true` or if its `type` includes `\"null\"`.\n *\n * @param schema - The JSON Schema fragment to check.\n * @returns `true` if the schema accepts `null`, otherwise `false`.\n */\nexport function isSchemaNullable(schema?: JsonSchema): boolean {\n  if (!isSetObject(schema)) {\n    return false;\n  }\n\n  if ((schema as { nullable?: true }).nullable === true) {\n    return true;\n  }\n\n  return readSchemaTypes(schema).includes(\"null\");\n}\n\n/**\n * Returns whether an object property is optional (not listed in `required`).\n *\n * @remarks\n * In JSON Schema, object properties are optional by default unless they are listed in the `required` array of the parent schema. This function checks whether a given property name is not included in the `required` array of its parent schema, indicating that it is optional.\n *\n * @param parent - The parent JSON Schema object containing the property.\n * @param propertyName - The name of the property to check for optionality.\n * @returns `true` if the property is optional, otherwise `false`.\n */\nexport function isPropertyOptional(\n  parent: JsonSchemaObject,\n  propertyName: string\n): boolean {\n  if (!parent.properties?.[propertyName]) {\n    throw new Error(\n      `The property \"${propertyName}\" does not exist in the parent schema.`\n    );\n  }\n\n  return !(parent.required ?? []).includes(propertyName);\n}\n"],"mappings":";;;;;;;;;;;;;;;AAuCA,SAAgB,cACd,KAIA;CACA,MAAM,aAGF,CAAC;CACL,MAAM,SAAqB,SAAS,GAAG,IAAI,IAAI,SAAS;CACxD,IAAI,CAAC,mBAAmB,MAAM,GAC5B,OAAO;CAGT,IAAI,CAAC,YAAY,OAAO,UAAU,GAChC,OAAO;CAGT,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,UAAU,GAAG;EAC5D,MAAM,iBAA0C,CAAC;EAEjD,IAAI,OAAO,UAAU,WACnB,OAAO,OAAO,gBAAgB,KAAK;EAGrC,WAAW,OAAO;GAChB,GAAG;GACH,MAAM;GACN,UAAU,CAAC,mBAAmB,QAAQ,GAAG;GACzC,SAAS,OAAO,UAAU,QAAQ,eAAe;EACnD;CACF;CAEA,OAAO;AACT;;;;;;;;;;AAWA,SAAgB,kBAAkB,KAAgC;CAChE,OAAO,OAAO,OAAO,cAAc,GAAG,CAAC;AACzC;;;;;;;;;;;;AAaA,SAAgB,YACd,KACA,MACA,UACM;CACN,MAAM,SAAU,SAAS,GAAG,IAAI,IAAI,SAAS;CAC7C,IAAI,CAAC,mBAAmB,MAAM,GAC5B,MAAM,IAAI,MAAM,0CAA0C;CAG5D,OAAO,eAAe,CAAC;CACvB,OAAO,aAAa,CAAC;CAErB,OAAO,WAAW,QAAQ;EAAE,GAAG;EAAU;CAAK;CAC9C,IAAI,CAAC,OAAO,SAAS,SAAS,IAAI,GAChC,OAAO,SAAS,KAAK,IAAI;CAG3B,IAAI,OAAO,SAAS,WAAW,GAC7B,OAAO,OAAO;AAElB;;;;;;;;;;AAWA,SAAgB,aAAa,GAAG,SAA8C;CAC5E,MAAM,SAAqB,CAAC;CAC5B,KAAK,MAAM,UAAU,SAAS;EAC5B,MAAM,aAAyB,SAAS,MAAM,IAAI,OAAO,SAAS;EAClE,IAAI,CAAC,mBAAmB,UAAU,GAChC;EAGF,OAAK,QAAQ,UAAU;CACzB;CAEA,OAAO;AACT;;;;;;;;;;AAWA,SAAgB,iBAAiB,QAA8B;CAC7D,IAAI,CAAC,YAAY,MAAM,GACrB,OAAO;CAGT,IAAK,OAA+B,aAAa,MAC/C,OAAO;CAGT,OAAO,gBAAgB,MAAM,EAAE,SAAS,MAAM;AAChD;;;;;;;;;;;AAYA,SAAgB,mBACd,QACA,cACS;CACT,IAAI,CAAC,OAAO,aAAa,eACvB,MAAM,IAAI,MACR,iBAAiB,aAAa,uCAChC;CAGF,OAAO,EAAE,OAAO,YAAY,CAAC,GAAG,SAAS,YAAY;AACvD"}

package/dist/index.cjs

@@ -10,34 +10,66 @@ const require_reflection = require('./reflection.cjs');
 const require_resolve = require('./resolve.cjs');
 const require_extract = require('./extract.cjs');
 
-exports.JSON_SCHEMA_DATA_TYPES = require_constants.JSON_SCHEMA_DATA_TYPES;
 exports.JSON_SCHEMA_METADATA_KEYS = require_constants.JSON_SCHEMA_METADATA_KEYS;
-exports.JsonSchemaTypes = require_constants.JsonSchemaTypes;
+exports.JSON_SCHEMA_PRIMITIVE_TYPES = require_constants.JSON_SCHEMA_PRIMITIVE_TYPES;
+exports.JSON_SCHEMA_TYPES = require_constants.JSON_SCHEMA_TYPES;
+exports.JsonSchemaTypeNames = require_constants.JsonSchemaTypeNames;
 exports.addProperty = require_helpers.addProperty;
-exports.applySchemaMetadata = require_metadata.applySchemaMetadata;
+exports.applyJsonSchemaMetadata = require_metadata.applyJsonSchemaMetadata;
 exports.bundle = require_bundle.bundle;
+exports.bundleReferences = require_extract.bundleReferences;
 exports.extract = require_extract.extract;
 exports.extractHash = require_extract.extractHash;
 exports.extractJsonSchema = require_extract.extractJsonSchema;
 exports.extractReflection = require_extract.extractReflection;
 exports.extractResolvedVariant = require_extract.extractResolvedVariant;
 exports.extractSchema = require_extract.extractSchema;
+exports.extractSchemaWithSource = require_extract.extractSchemaWithSource;
 exports.extractSource = require_extract.extractSource;
 exports.extractVariant = require_extract.extractVariant;
 exports.generateCode = require_codegen.generateCode;
 exports.getCacheDirectory = require_persistence.getCacheDirectory;
 exports.getCacheFilePath = require_persistence.getCacheFilePath;
+exports.getJsonSchemaType = require_codegen.getJsonSchemaType;
 exports.getPrimarySchemaType = require_metadata.getPrimarySchemaType;
 exports.getProperties = require_helpers.getProperties;
 exports.getPropertiesList = require_helpers.getPropertiesList;
-exports.isExtractedSchema = require_type_checks.isExtractedSchema;
 exports.isJsonSchema = require_type_checks.isJsonSchema;
+exports.isJsonSchemaAllOf = require_type_checks.isJsonSchemaAllOf;
+exports.isJsonSchemaAny = require_type_checks.isJsonSchemaAny;
+exports.isJsonSchemaAnyOf = require_type_checks.isJsonSchemaAnyOf;
+exports.isJsonSchemaArray = require_type_checks.isJsonSchemaArray;
+exports.isJsonSchemaBigint = require_type_checks.isJsonSchemaBigint;
+exports.isJsonSchemaBoolean = require_type_checks.isJsonSchemaBoolean;
+exports.isJsonSchemaDate = require_type_checks.isJsonSchemaDate;
+exports.isJsonSchemaDecimal = require_type_checks.isJsonSchemaDecimal;
+exports.isJsonSchemaEnum = require_type_checks.isJsonSchemaEnum;
+exports.isJsonSchemaInteger = require_type_checks.isJsonSchemaInteger;
+exports.isJsonSchemaKeywords = require_type_checks.isJsonSchemaKeywords;
+exports.isJsonSchemaLiteral = require_type_checks.isJsonSchemaLiteral;
+exports.isJsonSchemaMap = require_type_checks.isJsonSchemaMap;
+exports.isJsonSchemaNativeEnum = require_type_checks.isJsonSchemaNativeEnum;
+exports.isJsonSchemaNever = require_type_checks.isJsonSchemaNever;
+exports.isJsonSchemaNull = require_type_checks.isJsonSchemaNull;
+exports.isJsonSchemaNullable = require_type_checks.isJsonSchemaNullable;
+exports.isJsonSchemaNumber = require_type_checks.isJsonSchemaNumber;
 exports.isJsonSchemaObject = require_type_checks.isJsonSchemaObject;
+exports.isJsonSchemaPrimitiveType = require_type_checks.isJsonSchemaPrimitiveType;
+exports.isJsonSchemaPrimitiveUnion = require_type_checks.isJsonSchemaPrimitiveUnion;
+exports.isJsonSchemaRecord = require_type_checks.isJsonSchemaRecord;
+exports.isJsonSchemaRef = require_type_checks.isJsonSchemaRef;
+exports.isJsonSchemaSet = require_type_checks.isJsonSchemaSet;
+exports.isJsonSchemaString = require_type_checks.isJsonSchemaString;
+exports.isJsonSchemaTuple = require_type_checks.isJsonSchemaTuple;
+exports.isJsonSchemaType = require_type_checks.isJsonSchemaType;
+exports.isJsonSchemaUndefined = require_type_checks.isJsonSchemaUndefined;
+exports.isJsonSchemaUnion = require_type_checks.isJsonSchemaUnion;
+exports.isJsonSchemaUnknown = require_type_checks.isJsonSchemaUnknown;
 exports.isNullOnlyJsonSchema = require_type_checks.isNullOnlyJsonSchema;
-exports.isNullableSchema = require_codegen.isNullableSchema;
-exports.isPropertyOptional = require_metadata.isPropertyOptional;
+exports.isPropertyOptional = require_helpers.isPropertyOptional;
 exports.isSchema = require_type_checks.isSchema;
-exports.isSchemaNullable = require_metadata.isSchemaNullable;
+exports.isSchemaNullable = require_helpers.isSchemaNullable;
+exports.isSchemaWithSource = require_type_checks.isSchemaWithSource;
 exports.isStandardSchema = require_type_checks.isStandardSchema;
 exports.isUntypedInput = require_type_checks.isUntypedInput;
 exports.isUntypedSchema = require_type_checks.isUntypedSchema;

package/dist/index.d.cts

@@ -1,14 +1,14 @@
 import { BundleOptions, bundle } from "./bundle.cjs";
-import { BaseSchemaSource, ExtractedSchema, JsonSchema, JsonSchemaLike, JsonSchemaNullable, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaProperty, JsonSchemaSchemaSource, JsonType, NumberFormat, NumberKeywords, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaMetadata, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, StringKeywords, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource } from "./types.cjs";
-import { generateCode, isNullableSchema, stringifyType, stringifyValue } from "./codegen.cjs";
-import { JSON_SCHEMA_DATA_TYPES, JSON_SCHEMA_METADATA_KEYS, JsonSchemaTypes } from "./constants.cjs";
-import { extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSource, extractVariant } from "./extract.cjs";
-import { addProperty, getProperties, getPropertiesList, mergeSchemas } from "./helpers.cjs";
-import { applySchemaMetadata, getPrimarySchemaType, isPropertyOptional, isSchemaNullable, readSchemaTypes } from "./metadata.cjs";
+import { JSON_SCHEMA_METADATA_KEYS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_TYPES, JsonSchemaTypeNames } from "./constants.cjs";
+import { BaseSchemaSource, ExtractedSchema, JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaAnyOf, JsonSchemaArray, JsonSchemaBigint, JsonSchemaBoolean, JsonSchemaConditionalKeywords, JsonSchemaDate, JsonSchemaDecimal, JsonSchemaEnum, JsonSchemaInteger, JsonSchemaKeywords, JsonSchemaLiteral, JsonSchemaLogicKeywords, JsonSchemaMap, JsonSchemaMetadataKeywords, JsonSchemaNativeEnum, JsonSchemaNever, JsonSchemaNull, JsonSchemaNullable, JsonSchemaNumber, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaPrimitiveUnion, JsonSchemaRecord, JsonSchemaRecordPropertyNames, JsonSchemaRef, JsonSchemaSchemaSource, JsonSchemaSet, JsonSchemaString, JsonSchemaTuple, JsonSchemaType, JsonSchemaUndefined, JsonSchemaUnion, JsonSchemaUnknown, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource } from "./types.cjs";
+import { generateCode, getJsonSchemaType, stringifyType, stringifyValue } from "./codegen.cjs";
+import { bundleReferences, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSchemaWithSource, extractSource, extractVariant } from "./extract.cjs";
+import { GetPropertiesResult, addProperty, getProperties, getPropertiesList, isPropertyOptional, isSchemaNullable, mergeSchemas } from "./helpers.cjs";
+import { applyJsonSchemaMetadata, getPrimarySchemaType, readSchemaTypes } from "./metadata.cjs";
 import { getCacheDirectory, getCacheFilePath, readSchema, readSchemaSafe, writeSchema } from "./persistence.cjs";
 import { reflectionToJsonSchema } from "./reflection.cjs";
 import { resolve, resolveModule, resolveReflection } from "./resolve.cjs";
-import { isExtractedSchema, isJsonSchema, isJsonSchemaObject, isNullOnlyJsonSchema, isSchema, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema } from "./type-checks.cjs";
+import { isJsonSchema, isJsonSchemaAllOf, isJsonSchemaAny, isJsonSchemaAnyOf, isJsonSchemaArray, isJsonSchemaBigint, isJsonSchemaBoolean, isJsonSchemaDate, isJsonSchemaDecimal, isJsonSchemaEnum, isJsonSchemaInteger, isJsonSchemaKeywords, isJsonSchemaLiteral, isJsonSchemaMap, isJsonSchemaNativeEnum, isJsonSchemaNever, isJsonSchemaNull, isJsonSchemaNullable, isJsonSchemaNumber, isJsonSchemaObject, isJsonSchemaPrimitiveType, isJsonSchemaPrimitiveUnion, isJsonSchemaRecord, isJsonSchemaRef, isJsonSchemaSet, isJsonSchemaString, isJsonSchemaTuple, isJsonSchemaType, isJsonSchemaUndefined, isJsonSchemaUnion, isJsonSchemaUnknown, isNullOnlyJsonSchema, isSchema, isSchemaWithSource, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema } from "./type-checks.cjs";
 
 //#region src/index.d.ts
 declare module "zod" {
@@ -34,5 +34,5 @@ declare module "zod" {
   }
 }
 //#endregion
-export { BaseSchemaSource, BundleOptions, ExtractedSchema, JSON_SCHEMA_DATA_TYPES, JSON_SCHEMA_METADATA_KEYS, JsonSchema, JsonSchemaLike, JsonSchemaNullable, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaProperty, JsonSchemaSchemaSource, JsonSchemaTypes, JsonType, NumberFormat, NumberKeywords, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaMetadata, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, StringKeywords, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource, addProperty, applySchemaMetadata, bundle, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSource, extractVariant, generateCode, getCacheDirectory, getCacheFilePath, getPrimarySchemaType, getProperties, getPropertiesList, isExtractedSchema, isJsonSchema, isJsonSchemaObject, isNullOnlyJsonSchema, isNullableSchema, isPropertyOptional, isSchema, isSchemaNullable, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema, mergeSchemas, readSchema, readSchemaSafe, readSchemaTypes, reflectionToJsonSchema, resolve, resolveModule, resolveReflection, stringifyType, stringifyValue, writeSchema };
+export { BaseSchemaSource, BundleOptions, ExtractedSchema, GetPropertiesResult, JSON_SCHEMA_METADATA_KEYS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_TYPES, JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaAnyOf, JsonSchemaArray, JsonSchemaBigint, JsonSchemaBoolean, JsonSchemaConditionalKeywords, JsonSchemaDate, JsonSchemaDecimal, JsonSchemaEnum, JsonSchemaInteger, JsonSchemaKeywords, JsonSchemaLiteral, JsonSchemaLogicKeywords, JsonSchemaMap, JsonSchemaMetadataKeywords, JsonSchemaNativeEnum, JsonSchemaNever, JsonSchemaNull, JsonSchemaNullable, JsonSchemaNumber, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaPrimitiveUnion, JsonSchemaRecord, JsonSchemaRecordPropertyNames, JsonSchemaRef, JsonSchemaSchemaSource, JsonSchemaSet, JsonSchemaString, JsonSchemaTuple, JsonSchemaType, JsonSchemaTypeNames, JsonSchemaUndefined, JsonSchemaUnion, JsonSchemaUnknown, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource, addProperty, applyJsonSchemaMetadata, bundle, bundleReferences, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSchemaWithSource, extractSource, extractVariant, generateCode, getCacheDirectory, getCacheFilePath, getJsonSchemaType, getPrimarySchemaType, getProperties, getPropertiesList, isJsonSchema, isJsonSchemaAllOf, isJsonSchemaAny, isJsonSchemaAnyOf, isJsonSchemaArray, isJsonSchemaBigint, isJsonSchemaBoolean, isJsonSchemaDate, isJsonSchemaDecimal, isJsonSchemaEnum, isJsonSchemaInteger, isJsonSchemaKeywords, isJsonSchemaLiteral, isJsonSchemaMap, isJsonSchemaNativeEnum, isJsonSchemaNever, isJsonSchemaNull, isJsonSchemaNullable, isJsonSchemaNumber, isJsonSchemaObject, isJsonSchemaPrimitiveType, isJsonSchemaPrimitiveUnion, isJsonSchemaRecord, isJsonSchemaRef, isJsonSchemaSet, isJsonSchemaString, isJsonSchemaTuple, isJsonSchemaType, isJsonSchemaUndefined, isJsonSchemaUnion, isJsonSchemaUnknown, isNullOnlyJsonSchema, isPropertyOptional, isSchema, isSchemaNullable, isSchemaWithSource, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema, mergeSchemas, readSchema, readSchemaSafe, readSchemaTypes, reflectionToJsonSchema, resolve, resolveModule, resolveReflection, stringifyType, stringifyValue, writeSchema };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.mts

@@ -1,14 +1,14 @@
 import { BundleOptions, bundle } from "./bundle.mjs";
-import { BaseSchemaSource, ExtractedSchema, JsonSchema, JsonSchemaLike, JsonSchemaNullable, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaProperty, JsonSchemaSchemaSource, JsonType, NumberFormat, NumberKeywords, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaMetadata, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, StringKeywords, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource } from "./types.mjs";
-import { generateCode, isNullableSchema, stringifyType, stringifyValue } from "./codegen.mjs";
-import { JSON_SCHEMA_DATA_TYPES, JSON_SCHEMA_METADATA_KEYS, JsonSchemaTypes } from "./constants.mjs";
-import { extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSource, extractVariant } from "./extract.mjs";
-import { addProperty, getProperties, getPropertiesList, mergeSchemas } from "./helpers.mjs";
-import { applySchemaMetadata, getPrimarySchemaType, isPropertyOptional, isSchemaNullable, readSchemaTypes } from "./metadata.mjs";
+import { JSON_SCHEMA_METADATA_KEYS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_TYPES, JsonSchemaTypeNames } from "./constants.mjs";
+import { BaseSchemaSource, ExtractedSchema, JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaAnyOf, JsonSchemaArray, JsonSchemaBigint, JsonSchemaBoolean, JsonSchemaConditionalKeywords, JsonSchemaDate, JsonSchemaDecimal, JsonSchemaEnum, JsonSchemaInteger, JsonSchemaKeywords, JsonSchemaLiteral, JsonSchemaLogicKeywords, JsonSchemaMap, JsonSchemaMetadataKeywords, JsonSchemaNativeEnum, JsonSchemaNever, JsonSchemaNull, JsonSchemaNullable, JsonSchemaNumber, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaPrimitiveUnion, JsonSchemaRecord, JsonSchemaRecordPropertyNames, JsonSchemaRef, JsonSchemaSchemaSource, JsonSchemaSet, JsonSchemaString, JsonSchemaTuple, JsonSchemaType, JsonSchemaUndefined, JsonSchemaUnion, JsonSchemaUnknown, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource } from "./types.mjs";
+import { generateCode, getJsonSchemaType, stringifyType, stringifyValue } from "./codegen.mjs";
+import { bundleReferences, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSchemaWithSource, extractSource, extractVariant } from "./extract.mjs";
+import { GetPropertiesResult, addProperty, getProperties, getPropertiesList, isPropertyOptional, isSchemaNullable, mergeSchemas } from "./helpers.mjs";
+import { applyJsonSchemaMetadata, getPrimarySchemaType, readSchemaTypes } from "./metadata.mjs";
 import { getCacheDirectory, getCacheFilePath, readSchema, readSchemaSafe, writeSchema } from "./persistence.mjs";
 import { reflectionToJsonSchema } from "./reflection.mjs";
 import { resolve, resolveModule, resolveReflection } from "./resolve.mjs";
-import { isExtractedSchema, isJsonSchema, isJsonSchemaObject, isNullOnlyJsonSchema, isSchema, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema } from "./type-checks.mjs";
+import { isJsonSchema, isJsonSchemaAllOf, isJsonSchemaAny, isJsonSchemaAnyOf, isJsonSchemaArray, isJsonSchemaBigint, isJsonSchemaBoolean, isJsonSchemaDate, isJsonSchemaDecimal, isJsonSchemaEnum, isJsonSchemaInteger, isJsonSchemaKeywords, isJsonSchemaLiteral, isJsonSchemaMap, isJsonSchemaNativeEnum, isJsonSchemaNever, isJsonSchemaNull, isJsonSchemaNullable, isJsonSchemaNumber, isJsonSchemaObject, isJsonSchemaPrimitiveType, isJsonSchemaPrimitiveUnion, isJsonSchemaRecord, isJsonSchemaRef, isJsonSchemaSet, isJsonSchemaString, isJsonSchemaTuple, isJsonSchemaType, isJsonSchemaUndefined, isJsonSchemaUnion, isJsonSchemaUnknown, isNullOnlyJsonSchema, isSchema, isSchemaWithSource, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema } from "./type-checks.mjs";
 
 //#region src/index.d.ts
 declare module "zod" {
@@ -34,5 +34,5 @@ declare module "zod" {
   }
 }
 //#endregion
-export { BaseSchemaSource, BundleOptions, ExtractedSchema, JSON_SCHEMA_DATA_TYPES, JSON_SCHEMA_METADATA_KEYS, JsonSchema, JsonSchemaLike, JsonSchemaNullable, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaProperty, JsonSchemaSchemaSource, JsonSchemaTypes, JsonType, NumberFormat, NumberKeywords, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaMetadata, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, StringKeywords, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource, addProperty, applySchemaMetadata, bundle, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSource, extractVariant, generateCode, getCacheDirectory, getCacheFilePath, getPrimarySchemaType, getProperties, getPropertiesList, isExtractedSchema, isJsonSchema, isJsonSchemaObject, isNullOnlyJsonSchema, isNullableSchema, isPropertyOptional, isSchema, isSchemaNullable, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema, mergeSchemas, readSchema, readSchemaSafe, readSchemaTypes, reflectionToJsonSchema, resolve, resolveModule, resolveReflection, stringifyType, stringifyValue, writeSchema };
+export { BaseSchemaSource, BundleOptions, ExtractedSchema, GetPropertiesResult, JSON_SCHEMA_METADATA_KEYS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_TYPES, JsonSchema, JsonSchemaAllOf, JsonSchemaAny, JsonSchemaAnyOf, JsonSchemaArray, JsonSchemaBigint, JsonSchemaBoolean, JsonSchemaConditionalKeywords, JsonSchemaDate, JsonSchemaDecimal, JsonSchemaEnum, JsonSchemaInteger, JsonSchemaKeywords, JsonSchemaLiteral, JsonSchemaLogicKeywords, JsonSchemaMap, JsonSchemaMetadataKeywords, JsonSchemaNativeEnum, JsonSchemaNever, JsonSchemaNull, JsonSchemaNullable, JsonSchemaNumber, JsonSchemaObject, JsonSchemaPrimitiveType, JsonSchemaPrimitiveUnion, JsonSchemaRecord, JsonSchemaRecordPropertyNames, JsonSchemaRef, JsonSchemaSchemaSource, JsonSchemaSet, JsonSchemaString, JsonSchemaTuple, JsonSchemaType, JsonSchemaTypeNames, JsonSchemaUndefined, JsonSchemaUnion, JsonSchemaUnknown, ReflectionSchemaSource, Schema, SchemaInput, SchemaInputVariant, SchemaSource, SchemaSourceInput, SchemaSourceVariant, StandardSchemaSchemaSource, TypeDefinitionReference, UntypedInputObject, UntypedSchema, UntypedSchemaSource, ValibotSchema, ValibotSchemaSource, Zod3SchemaSource, addProperty, applyJsonSchemaMetadata, bundle, bundleReferences, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSchemaWithSource, extractSource, extractVariant, generateCode, getCacheDirectory, getCacheFilePath, getJsonSchemaType, getPrimarySchemaType, getProperties, getPropertiesList, isJsonSchema, isJsonSchemaAllOf, isJsonSchemaAny, isJsonSchemaAnyOf, isJsonSchemaArray, isJsonSchemaBigint, isJsonSchemaBoolean, isJsonSchemaDate, isJsonSchemaDecimal, isJsonSchemaEnum, isJsonSchemaInteger, isJsonSchemaKeywords, isJsonSchemaLiteral, isJsonSchemaMap, isJsonSchemaNativeEnum, isJsonSchemaNever, isJsonSchemaNull, isJsonSchemaNullable, isJsonSchemaNumber, isJsonSchemaObject, isJsonSchemaPrimitiveType, isJsonSchemaPrimitiveUnion, isJsonSchemaRecord, isJsonSchemaRef, isJsonSchemaSet, isJsonSchemaString, isJsonSchemaTuple, isJsonSchemaType, isJsonSchemaUndefined, isJsonSchemaUnion, isJsonSchemaUnknown, isNullOnlyJsonSchema, isPropertyOptional, isSchema, isSchemaNullable, isSchemaWithSource, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema, mergeSchemas, readSchema, readSchemaSafe, readSchemaTypes, reflectionToJsonSchema, resolve, resolveModule, resolveReflection, stringifyType, stringifyValue, writeSchema };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import { bundle } from "./bundle.mjs";
-import { JSON_SCHEMA_DATA_TYPES, JSON_SCHEMA_METADATA_KEYS, JsonSchemaTypes } from "./constants.mjs";
-import { applySchemaMetadata, getPrimarySchemaType, isPropertyOptional, isSchemaNullable, readSchemaTypes } from "./metadata.mjs";
-import { isExtractedSchema, isJsonSchema, isJsonSchemaObject, isNullOnlyJsonSchema, isSchema, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema } from "./type-checks.mjs";
-import { addProperty, getProperties, getPropertiesList, mergeSchemas } from "./helpers.mjs";
-import { generateCode, isNullableSchema, stringifyType, stringifyValue } from "./codegen.mjs";
+import { JSON_SCHEMA_METADATA_KEYS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_TYPES, JsonSchemaTypeNames } from "./constants.mjs";
+import { applyJsonSchemaMetadata, getPrimarySchemaType, readSchemaTypes } from "./metadata.mjs";
+import { isJsonSchema, isJsonSchemaAllOf, isJsonSchemaAny, isJsonSchemaAnyOf, isJsonSchemaArray, isJsonSchemaBigint, isJsonSchemaBoolean, isJsonSchemaDate, isJsonSchemaDecimal, isJsonSchemaEnum, isJsonSchemaInteger, isJsonSchemaKeywords, isJsonSchemaLiteral, isJsonSchemaMap, isJsonSchemaNativeEnum, isJsonSchemaNever, isJsonSchemaNull, isJsonSchemaNullable, isJsonSchemaNumber, isJsonSchemaObject, isJsonSchemaPrimitiveType, isJsonSchemaPrimitiveUnion, isJsonSchemaRecord, isJsonSchemaRef, isJsonSchemaSet, isJsonSchemaString, isJsonSchemaTuple, isJsonSchemaType, isJsonSchemaUndefined, isJsonSchemaUnion, isJsonSchemaUnknown, isNullOnlyJsonSchema, isSchema, isSchemaWithSource, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema } from "./type-checks.mjs";
+import { addProperty, getProperties, getPropertiesList, isPropertyOptional, isSchemaNullable, mergeSchemas } from "./helpers.mjs";
+import { generateCode, getJsonSchemaType, stringifyType, stringifyValue } from "./codegen.mjs";
 import { getCacheDirectory, getCacheFilePath, readSchema, readSchemaSafe, writeSchema } from "./persistence.mjs";
 import { reflectionToJsonSchema } from "./reflection.mjs";
 import { resolve, resolveModule, resolveReflection } from "./resolve.mjs";
-import { extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSource, extractVariant } from "./extract.mjs";
+import { bundleReferences, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSchemaWithSource, extractSource, extractVariant } from "./extract.mjs";
 
-export { JSON_SCHEMA_DATA_TYPES, JSON_SCHEMA_METADATA_KEYS, JsonSchemaTypes, addProperty, applySchemaMetadata, bundle, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSource, extractVariant, generateCode, getCacheDirectory, getCacheFilePath, getPrimarySchemaType, getProperties, getPropertiesList, isExtractedSchema, isJsonSchema, isJsonSchemaObject, isNullOnlyJsonSchema, isNullableSchema, isPropertyOptional, isSchema, isSchemaNullable, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema, mergeSchemas, readSchema, readSchemaSafe, readSchemaTypes, reflectionToJsonSchema, resolve, resolveModule, resolveReflection, stringifyType, stringifyValue, writeSchema };
+export { JSON_SCHEMA_METADATA_KEYS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_TYPES, JsonSchemaTypeNames, addProperty, applyJsonSchemaMetadata, bundle, bundleReferences, extract, extractHash, extractJsonSchema, extractReflection, extractResolvedVariant, extractSchema, extractSchemaWithSource, extractSource, extractVariant, generateCode, getCacheDirectory, getCacheFilePath, getJsonSchemaType, getPrimarySchemaType, getProperties, getPropertiesList, isJsonSchema, isJsonSchemaAllOf, isJsonSchemaAny, isJsonSchemaAnyOf, isJsonSchemaArray, isJsonSchemaBigint, isJsonSchemaBoolean, isJsonSchemaDate, isJsonSchemaDecimal, isJsonSchemaEnum, isJsonSchemaInteger, isJsonSchemaKeywords, isJsonSchemaLiteral, isJsonSchemaMap, isJsonSchemaNativeEnum, isJsonSchemaNever, isJsonSchemaNull, isJsonSchemaNullable, isJsonSchemaNumber, isJsonSchemaObject, isJsonSchemaPrimitiveType, isJsonSchemaPrimitiveUnion, isJsonSchemaRecord, isJsonSchemaRef, isJsonSchemaSet, isJsonSchemaString, isJsonSchemaTuple, isJsonSchemaType, isJsonSchemaUndefined, isJsonSchemaUnion, isJsonSchemaUnknown, isNullOnlyJsonSchema, isPropertyOptional, isSchema, isSchemaNullable, isSchemaWithSource, isStandardSchema, isUntypedInput, isUntypedSchema, isValibotSchema, mergeSchemas, readSchema, readSchemaSafe, readSchemaTypes, reflectionToJsonSchema, resolve, resolveModule, resolveReflection, stringifyType, stringifyValue, writeSchema };

package/dist/metadata.cjs

@@ -10,43 +10,17 @@ let _stryke_type_checks_is_set_object = require("@stryke/type-checks/is-set-obje
 * @param metadata - The Powerlines schema metadata to apply.
 * @returns A new JSON Schema fragment with the metadata applied.
 */
-function applySchemaMetadata(schema, metadata) {
-	if (!metadata) return schema;
+function applyJsonSchemaMetadata(schema, metadata) {
+	if (!metadata || !(0, _stryke_type_checks_is_set_object.isSetObject)(schema)) return schema;
 	const result = { ...schema };
+	const mutableResult = result;
 	for (const key of require_constants.JSON_SCHEMA_METADATA_KEYS) {
 		const value = metadata[key];
-		if (value !== void 0 && value !== null) result[key] = value;
+		if (value !== void 0 && value !== null) mutableResult[key] = value;
 	}
 	return result;
 }
 /**
-* Returns whether a JSON Schema fragment accepts `null`.
-*
-* @remarks
-* This is true if the schema has `nullable: true` or if its `type` includes `"null"`.
-*
-* @param schema - The JSON Schema fragment to check.
-* @returns `true` if the schema accepts `null`, otherwise `false`.
-*/
-function isSchemaNullable(schema) {
-	if (!(0, _stryke_type_checks_is_set_object.isSetObject)(schema)) return false;
-	if (schema.nullable === true) return true;
-	return readSchemaTypes(schema).includes("null");
-}
-/**
-* Returns whether an object property is optional (not listed in `required`).
-*
-* @remarks
-* In JSON Schema, object properties are optional by default unless they are listed in the `required` array of the parent schema. This function checks whether a given property name is not included in the `required` array of its parent schema, indicating that it is optional.
-*
-* @param parent - The parent JSON Schema object containing the property.
-* @param propertyName - The name of the property to check for optionality.
-* @returns `true` if the property is optional, otherwise `false`.
-*/
-function isPropertyOptional(parent, propertyName) {
-	return !(parent.required ?? []).includes(propertyName) && !isSchemaNullable(parent.properties[propertyName]);
-}
-/**
 * Normalizes the JSON Schema `type` keyword to a string array.
 *
 * @remarks
@@ -56,8 +30,10 @@ function isPropertyOptional(parent, propertyName) {
 * @returns An array of JSON Schema primitive type names defined in the `type` keyword, or an empty array if no valid types are found.
 */
 function readSchemaTypes(schema) {
-	if (Array.isArray(schema?.type)) return schema.type.filter(_stryke_type_checks.isSetString);
-	if ((0, _stryke_type_checks.isSetString)(schema?.type)) return [schema.type];
+	if (!(0, _stryke_type_checks_is_set_object.isSetObject)(schema)) return [];
+	const objectSchema = schema;
+	if (Array.isArray(objectSchema.type)) return objectSchema.type.filter((type) => (0, _stryke_type_checks.isSetString)(type));
+	if ((0, _stryke_type_checks.isSetString)(objectSchema.type) && objectSchema.type !== "object" && objectSchema.type !== "array") return [objectSchema.type];
 	return [];
 }
 /**
@@ -72,8 +48,6 @@ function getPrimarySchemaType(schema) {
 }
 
 //#endregion
-exports.applySchemaMetadata = applySchemaMetadata;
+exports.applyJsonSchemaMetadata = applyJsonSchemaMetadata;
 exports.getPrimarySchemaType = getPrimarySchemaType;
-exports.isPropertyOptional = isPropertyOptional;
-exports.isSchemaNullable = isSchemaNullable;
 exports.readSchemaTypes = readSchemaTypes;

package/dist/metadata.d.cts

@@ -1,4 +1,4 @@
-import { JsonSchema, JsonSchemaObject, JsonSchemaPrimitiveType, SchemaMetadata } from "./types.cjs";
+import { JsonSchema, JsonSchemaMetadataKeywords, JsonSchemaPrimitiveType } from "./types.cjs";
 
 //#region src/metadata.d.ts
 /**
@@ -8,28 +8,7 @@ import { JsonSchema, JsonSchemaObject, JsonSchemaPrimitiveType, SchemaMetadata }
  * @param metadata - The Powerlines schema metadata to apply.
  * @returns A new JSON Schema fragment with the metadata applied.
  */
-declare function applySchemaMetadata<T = unknown, TMetadata extends SchemaMetadata = SchemaMetadata>(schema: JsonSchema<T>, metadata: TMetadata | undefined): JsonSchema<T>;
-/**
- * Returns whether a JSON Schema fragment accepts `null`.
- *
- * @remarks
- * This is true if the schema has `nullable: true` or if its `type` includes `"null"`.
- *
- * @param schema - The JSON Schema fragment to check.
- * @returns `true` if the schema accepts `null`, otherwise `false`.
- */
-declare function isSchemaNullable<T = unknown>(schema?: JsonSchema<T>): boolean;
-/**
- * Returns whether an object property is optional (not listed in `required`).
- *
- * @remarks
- * In JSON Schema, object properties are optional by default unless they are listed in the `required` array of the parent schema. This function checks whether a given property name is not included in the `required` array of its parent schema, indicating that it is optional.
- *
- * @param parent - The parent JSON Schema object containing the property.
- * @param propertyName - The name of the property to check for optionality.
- * @returns `true` if the property is optional, otherwise `false`.
- */
-declare function isPropertyOptional<T extends Record<string, any> = Record<string, any>>(parent: JsonSchemaObject<T>, propertyName: string): boolean;
+declare function applyJsonSchemaMetadata(schema: JsonSchema, metadata: JsonSchemaMetadataKeywords | undefined): JsonSchema;
 /**
  * Normalizes the JSON Schema `type` keyword to a string array.
  *
@@ -39,14 +18,14 @@ declare function isPropertyOptional<T extends Record<string, any> = Record<strin
  * @param schema - The JSON Schema fragment to read types from.
  * @returns An array of JSON Schema primitive type names defined in the `type` keyword, or an empty array if no valid types are found.
  */
-declare function readSchemaTypes<T = unknown>(schema?: JsonSchema<T>): JsonSchemaPrimitiveType[];
+declare function readSchemaTypes(schema?: JsonSchema): JsonSchemaPrimitiveType[];
 /**
  * Returns the primary non-null JSON Schema type name for a fragment.
  *
  * @param schema - The JSON Schema fragment to check.
  * @returns The primary non-null JSON Schema type name, or `undefined` if none is found.
  */
-declare function getPrimarySchemaType<T = unknown>(schema?: JsonSchema<T>): JsonSchemaPrimitiveType | undefined;
+declare function getPrimarySchemaType(schema?: JsonSchema): JsonSchemaPrimitiveType | undefined;
 //#endregion
-export { applySchemaMetadata, getPrimarySchemaType, isPropertyOptional, isSchemaNullable, readSchemaTypes };
+export { applyJsonSchemaMetadata, getPrimarySchemaType, readSchemaTypes };
 //# sourceMappingURL=metadata.d.cts.map

package/dist/metadata.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.cts","names":[],"sources":["../src/metadata.ts"],"mappings":";;;;;AAoCA;;;;;iBAAgB,mBAAA,gCAEI,cAAA,GAAiB,cAAA,CAAA,CACnC,MAAA,EAAQ,UAAA,CAAW,CAAA,GAAI,QAAA,EAAU,SAAA,eAAwB,UAAA,CAAW,CAAA;;;;;;;;;;iBAyBtD,gBAAA,aAAA,CAA8B,MAAA,GAAS,UAAU,CAAC,CAAA;;;;;;;;;AAzBK;AAyBvE;iBAwBgB,kBAAA,WACJ,MAAA,gBAAsB,MAAA,cAAA,CAChC,MAAA,EAAQ,gBAAA,CAAiB,CAAA,GAAI,YAAA;;;;;;;;AA1BqC;AAwBpE;iBAoBgB,eAAA,aAAA,CACd,MAAA,GAAS,UAAA,CAAW,CAAA,IACnB,uBAAA;;;;;;;iBAgBa,oBAAA,aAAA,CACd,MAAA,GAAS,UAAA,CAAW,CAAA,IACnB,uBAAA"}
+{"version":3,"file":"metadata.d.cts","names":[],"sources":["../src/metadata.ts"],"mappings":";;;;;AAuCA;;;;;iBAAgB,uBAAA,CACd,MAAA,EAAQ,UAAA,EACR,QAAA,EAAU,0BAAA,eACT,UAAA;;;;;;;;;AAAU;iBA0BG,eAAA,CACd,MAAA,GAAS,UAAA,GACR,uBAAuB;;;;;;;iBA6BV,oBAAA,CACd,MAAA,GAAS,UAAA,GACR,uBAAuB"}

package/dist/metadata.d.mts

@@ -1,4 +1,4 @@
-import { JsonSchema, JsonSchemaObject, JsonSchemaPrimitiveType, SchemaMetadata } from "./types.mjs";
+import { JsonSchema, JsonSchemaMetadataKeywords, JsonSchemaPrimitiveType } from "./types.mjs";
 
 //#region src/metadata.d.ts
 /**
@@ -8,28 +8,7 @@ import { JsonSchema, JsonSchemaObject, JsonSchemaPrimitiveType, SchemaMetadata }
  * @param metadata - The Powerlines schema metadata to apply.
  * @returns A new JSON Schema fragment with the metadata applied.
  */
-declare function applySchemaMetadata<T = unknown, TMetadata extends SchemaMetadata = SchemaMetadata>(schema: JsonSchema<T>, metadata: TMetadata | undefined): JsonSchema<T>;
-/**
- * Returns whether a JSON Schema fragment accepts `null`.
- *
- * @remarks
- * This is true if the schema has `nullable: true` or if its `type` includes `"null"`.
- *
- * @param schema - The JSON Schema fragment to check.
- * @returns `true` if the schema accepts `null`, otherwise `false`.
- */
-declare function isSchemaNullable<T = unknown>(schema?: JsonSchema<T>): boolean;
-/**
- * Returns whether an object property is optional (not listed in `required`).
- *
- * @remarks
- * In JSON Schema, object properties are optional by default unless they are listed in the `required` array of the parent schema. This function checks whether a given property name is not included in the `required` array of its parent schema, indicating that it is optional.
- *
- * @param parent - The parent JSON Schema object containing the property.
- * @param propertyName - The name of the property to check for optionality.
- * @returns `true` if the property is optional, otherwise `false`.
- */
-declare function isPropertyOptional<T extends Record<string, any> = Record<string, any>>(parent: JsonSchemaObject<T>, propertyName: string): boolean;
+declare function applyJsonSchemaMetadata(schema: JsonSchema, metadata: JsonSchemaMetadataKeywords | undefined): JsonSchema;
 /**
  * Normalizes the JSON Schema `type` keyword to a string array.
  *
@@ -39,14 +18,14 @@ declare function isPropertyOptional<T extends Record<string, any> = Record<strin
  * @param schema - The JSON Schema fragment to read types from.
  * @returns An array of JSON Schema primitive type names defined in the `type` keyword, or an empty array if no valid types are found.
  */
-declare function readSchemaTypes<T = unknown>(schema?: JsonSchema<T>): JsonSchemaPrimitiveType[];
+declare function readSchemaTypes(schema?: JsonSchema): JsonSchemaPrimitiveType[];
 /**
  * Returns the primary non-null JSON Schema type name for a fragment.
  *
  * @param schema - The JSON Schema fragment to check.
  * @returns The primary non-null JSON Schema type name, or `undefined` if none is found.
  */
-declare function getPrimarySchemaType<T = unknown>(schema?: JsonSchema<T>): JsonSchemaPrimitiveType | undefined;
+declare function getPrimarySchemaType(schema?: JsonSchema): JsonSchemaPrimitiveType | undefined;
 //#endregion
-export { applySchemaMetadata, getPrimarySchemaType, isPropertyOptional, isSchemaNullable, readSchemaTypes };
+export { applyJsonSchemaMetadata, getPrimarySchemaType, readSchemaTypes };
 //# sourceMappingURL=metadata.d.mts.map

package/dist/metadata.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.mts","names":[],"sources":["../src/metadata.ts"],"mappings":";;;;;AAoCA;;;;;iBAAgB,mBAAA,gCAEI,cAAA,GAAiB,cAAA,CAAA,CACnC,MAAA,EAAQ,UAAA,CAAW,CAAA,GAAI,QAAA,EAAU,SAAA,eAAwB,UAAA,CAAW,CAAA;;;;;;;;;;iBAyBtD,gBAAA,aAAA,CAA8B,MAAA,GAAS,UAAU,CAAC,CAAA;;;;;;;;;AAzBK;AAyBvE;iBAwBgB,kBAAA,WACJ,MAAA,gBAAsB,MAAA,cAAA,CAChC,MAAA,EAAQ,gBAAA,CAAiB,CAAA,GAAI,YAAA;;;;;;;;AA1BqC;AAwBpE;iBAoBgB,eAAA,aAAA,CACd,MAAA,GAAS,UAAA,CAAW,CAAA,IACnB,uBAAA;;;;;;;iBAgBa,oBAAA,aAAA,CACd,MAAA,GAAS,UAAA,CAAW,CAAA,IACnB,uBAAA"}
+{"version":3,"file":"metadata.d.mts","names":[],"sources":["../src/metadata.ts"],"mappings":";;;;;AAuCA;;;;;iBAAgB,uBAAA,CACd,MAAA,EAAQ,UAAA,EACR,QAAA,EAAU,0BAAA,eACT,UAAA;;;;;;;;;AAAU;iBA0BG,eAAA,CACd,MAAA,GAAS,UAAA,GACR,uBAAuB;;;;;;;iBA6BV,oBAAA,CACd,MAAA,GAAS,UAAA,GACR,uBAAuB"}