@takeshape/json-schema 11.104.4 → 11.105.1

package/dist/utils/constants.d.ts

@@ -1,2 +1,3 @@
 import type { JSONSchema7 } from 'json-schema';
 export declare const jsonSchema7Keys: Array<keyof JSONSchema7>;
+export declare const jsonSchema7PrimitiveTypes: ["string", "number", "boolean", "integer", "null"];

package/dist/utils/constants.js

@@ -47,3 +47,10 @@ export const jsonSchema7Keys = [
     'definitions',
     '$defs'
 ];
+export const jsonSchema7PrimitiveTypes = [
+    'string',
+    'number',
+    'boolean',
+    'integer',
+    'null'
+];

package/dist/utils/type-utils.d.ts

@@ -1,6 +1,7 @@
-import type { JSONSchema7, JSONSchema7Definition } from 'json-schema';
-import type { AllOfSchema, AnyOfSchema, ArraySchema, EnumSchema, ListSchema, ObjectSchema, OneOfSchema, PropertySchema, RefSchema, TupleSchema } from './types.ts';
-export declare function isSchema(schema: JSONSchema7Definition): schema is JSONSchema7;
+import type { JSONSchema7Definition } from 'json-schema';
+import type { AllOfSchema, AnyOfSchema, ArraySchema, ConstSchema, EnumSchema, ListSchema, ObjectSchema, OneOfSchema, PrimitiveSchema, PropertySchema, RefSchema, TupleSchema, TypeUnionSchema } from './types.ts';
+export declare function isBooleanProperty(schema: JSONSchema7Definition): schema is boolean;
+export declare function isSchema(schema: JSONSchema7Definition): schema is Exclude<JSONSchema7Definition, boolean>;
 export declare function isOneOfSchema(schema: JSONSchema7Definition): schema is OneOfSchema;
 export declare function isAnyOfSchema(schema: JSONSchema7Definition): schema is AnyOfSchema;
 export declare function isAllOfSchema(schema: JSONSchema7Definition): schema is AllOfSchema;
@@ -11,4 +12,7 @@ export declare function isArraySchema(schema: JSONSchema7Definition): schema is
 export declare function isListSchema(schema: JSONSchema7Definition): schema is ListSchema;
 export declare function isTupleSchema(schema: JSONSchema7Definition): schema is TupleSchema;
 export declare function isEnumSchema(schema: JSONSchema7Definition): schema is EnumSchema;
+export declare function isConstSchema(schema: JSONSchema7Definition): schema is ConstSchema;
 export declare function isRefSchema(schema: JSONSchema7Definition): schema is RefSchema;
+export declare function isTypeUnionSchema(schema: JSONSchema7Definition): schema is TypeUnionSchema;
+export declare function isPrimitiveSchema(schema: JSONSchema7Definition): schema is PrimitiveSchema;

package/dist/utils/type-utils.js

@@ -1,5 +1,9 @@
+import { jsonSchema7PrimitiveTypes } from "./constants.js";
+export function isBooleanProperty(schema) {
+    return typeof schema === 'boolean';
+}
 export function isSchema(schema) {
-    return typeof schema !== 'boolean';
+    return !isBooleanProperty(schema);
 }
 export function isOneOfSchema(schema) {
     return isSchema(schema) && Array.isArray(schema.oneOf);
@@ -31,6 +35,21 @@ export function isTupleSchema(schema) {
 export function isEnumSchema(schema) {
     return Boolean(isSchema(schema) && schema.enum);
 }
+export function isConstSchema(schema) {
+    return Boolean(isSchema(schema) && schema.const);
+}
 export function isRefSchema(schema) {
     return Boolean(isSchema(schema) && schema.$ref);
 }
+export function isTypeUnionSchema(schema) {
+    return isSchema(schema) && Array.isArray(schema.type);
+}
+export function isPrimitiveSchema(schema) {
+    if (typeof schema !== 'object') {
+        return false;
+    }
+    if (isTypeUnionSchema(schema)) {
+        return schema.type.every((t) => jsonSchema7PrimitiveTypes.includes(t));
+    }
+    return jsonSchema7PrimitiveTypes.includes(schema.type);
+}

package/dist/utils/types.d.ts

@@ -1,4 +1,5 @@
 import type { JSONSchema7, JSONSchema7Definition, JSONSchema7Type, JSONSchema7TypeName } from 'json-schema';
+import type { jsonSchema7PrimitiveTypes } from './constants.ts';
 /**
  * Add the discriminator property to JSONSchema7, which we make frequent use of.
  */
@@ -9,36 +10,46 @@ declare module 'json-schema' {
         };
     }
 }
-export type OneOfSchema = JSONSchema7 & {
+export type OneOfSchema = Omit<JSONSchema7, 'oneOf'> & {
     oneOf: Exclude<JSONSchema7['oneOf'], undefined>;
 };
-export type AnyOfSchema = JSONSchema7 & {
+export type AnyOfSchema = Omit<JSONSchema7, 'anyOf'> & {
     anyOf: Exclude<JSONSchema7['anyOf'], undefined>;
 };
-export type AllOfSchema = JSONSchema7 & {
+export type AllOfSchema = Omit<JSONSchema7, 'allOf'> & {
     allOf: Exclude<JSONSchema7['allOf'], undefined>;
 };
 export type ObjectSchema = Omit<JSONSchema7, 'type'> & {
     type: 'object';
 };
-export type PropertySchema = ObjectSchema & {
+export type PropertySchema = Omit<ObjectSchema, 'properties'> & {
     properties: Exclude<JSONSchema7['properties'], undefined>;
 };
 export type ArraySchema = Omit<JSONSchema7, 'type'> & {
     type: 'array';
 };
-export type ListSchema = ArraySchema & {
+export type ListSchema = Omit<ArraySchema, 'items'> & {
     items: Exclude<JSONSchema7['items'], JSONSchema7Definition[] | undefined>;
 };
 export type TupleSchema = ArraySchema & {
     items: Exclude<JSONSchema7['items'], JSONSchema7Definition | undefined>;
 };
-export type EnumSchema = JSONSchema7 & {
+export type EnumSchema = Omit<JSONSchema7, 'enum'> & {
     enum: Exclude<JSONSchema7['enum'], undefined>;
 };
-export type RefSchema = JSONSchema7 & {
+export type ConstSchema = Omit<JSONSchema7, 'const'> & {
+    const: Exclude<JSONSchema7['const'], undefined>;
+};
+export type RefSchema = Omit<JSONSchema7, '$ref'> & {
     $ref: Exclude<JSONSchema7['$ref'], undefined>;
 };
+export type TypeUnionSchema = Omit<JSONSchema7, 'type'> & {
+    type: Exclude<JSONSchema7['type'], undefined | JSONSchema7TypeName>;
+};
+export type PrimitiveJSONSchema7TypeName = (typeof jsonSchema7PrimitiveTypes)[number];
+export type PrimitiveSchema = Omit<JSONSchema7, 'type'> & {
+    type: PrimitiveJSONSchema7TypeName | PrimitiveJSONSchema7TypeName[] | undefined;
+};
 export type OpenAISchema = {
     type?: JSONSchema7TypeName | JSONSchema7TypeName[];
     enum?: JSONSchema7Type[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/json-schema",
-  "version": "11.104.4",
+  "version": "11.105.1",
   "description": "JSON Schema validator",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -38,7 +38,7 @@
     "ajv-formats": "3.0.1",
     "lodash": "4.17.21",
     "minimatch": "^3.0.4",
-    "@takeshape/util": "11.104.4"
+    "@takeshape/util": "11.105.1"
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.7",