@scalar/workspace-store 0.51.2 → 0.53.0

package/dist/schemas/v3.1/strict/schema.js

@@ -7,6 +7,7 @@ import { XAdditionalPropertiesNameSchema, } from '../../../schemas/extensions/sc
 import { XEnumDescriptionsSchema } from '../../../schemas/extensions/schema/x-enum-descriptions.js';
 import { XEnumVarNamesSchema } from '../../../schemas/extensions/schema/x-enum-varnames.js';
 import { XExamplesSchema } from '../../../schemas/extensions/schema/x-examples.js';
+import { XOrderSchema } from '../../../schemas/extensions/schema/x-order.js';
 import { XVariableSchema } from '../../../schemas/extensions/schema/x-variable.js';
 import { DiscriminatorObjectRef, ExternalDocumentationObjectRef, SchemaObjectRef, XMLObjectRef, } from './ref-definitions.js';
 import { ReferenceObjectSchema } from './reference.js';
@@ -14,29 +15,24 @@ const schemaOrReference = Type.Union([
     SchemaObjectRef,
     compose(ReferenceObjectSchema, Type.Object({ '$ref-value': Type.Unknown() })),
 ]);
+const PrimitiveSchemaTypeSchema = Type.Union([
+    Type.Literal('null'),
+    Type.Literal('boolean'),
+    Type.Literal('string'),
+    Type.Literal('number'),
+    Type.Literal('integer'),
+    Type.Literal('object'),
+    Type.Literal('array'),
+]);
 /**
  * Primitive types that don't have additional validation properties.
- * These types (null, boolean, string, number, integer, object, array) can be used
+ * These types (null, boolean) can be used
  * without additional validation constraints.
- *
- * TODO: Type array will actually validate against every union type but we can cross that bridge when we come to it
  */
 const OtherTypes = Type.Object({
-    type: Type.Union([
-        Type.Literal('null'),
-        Type.Literal('boolean'),
-        Type.Array(Type.Union([
-            Type.Literal('null'),
-            Type.Literal('boolean'),
-            Type.Literal('string'),
-            Type.Literal('number'),
-            Type.Literal('integer'),
-            Type.Literal('object'),
-            Type.Literal('array'),
-        ])),
-    ]),
+    type: Type.Union([Type.Literal('null'), Type.Literal('boolean')]),
 });
-const Extensions = compose(XScalarIgnoreSchema, XInternalSchema, XVariableSchema, XExamplesSchema, XEnumDescriptionsSchema, XEnumVarNamesSchema, XAdditionalPropertiesNameSchema, XTagsSchema);
+const Extensions = compose(XScalarIgnoreSchema, XInternalSchema, XVariableSchema, XExamplesSchema, XEnumDescriptionsSchema, XEnumVarNamesSchema, XAdditionalPropertiesNameSchema, XOrderSchema, XTagsSchema);
 const CorePropertiesWithSchema = Type.Object({
     name: Type.Optional(Type.String()),
     /** A title for the schema. */
@@ -90,10 +86,7 @@ const CorePropertiesWithSchema = Type.Object({
 /**
  * Numeric validation properties for number and integer types.
  */
-const NumericProperties = Type.Object({
-    type: Type.Union([Type.Literal('number'), Type.Literal('integer')]),
-    /** Different subtypes */
-    format: Type.Optional(Type.String()),
+const NumericValidationKeywords = Type.Object({
     /** Number must be a multiple of this value. */
     multipleOf: Type.Optional(Type.Number()),
     /** Maximum value (inclusive). */
@@ -105,13 +98,15 @@ const NumericProperties = Type.Object({
     /** Minimum value (exclusive). */
     exclusiveMinimum: Type.Optional(Type.Number({ minimum: 0 })),
 });
+const NumericProperties = compose(Type.Object({
+    type: Type.Union([Type.Literal('number'), Type.Literal('integer')]),
+    /** Different subtypes */
+    format: Type.Optional(Type.String()),
+}), NumericValidationKeywords);
 /**
  * String validation properties for string types.
  */
-const StringValidationProperties = Type.Object({
-    type: Type.Literal('string'),
-    /** Different subtypes - allow any arbitrary string, this negates the purpose of having a union of formats so we type it in typescript instead */
-    format: Type.Optional(Type.String()),
+const StringValidationKeywords = Type.Object({
     /** Maximum string length. */
     maxLength: Type.Optional(Type.Integer({ minimum: 0 })),
     /** Minimum string length. */
@@ -119,8 +114,12 @@ const StringValidationProperties = Type.Object({
     /** Regular expression pattern. */
     pattern: Type.Optional(Type.String()),
 });
-const ArrayValidationPropertiesWithSchema = Type.Object({
-    type: Type.Literal('array'),
+const StringValidationProperties = compose(Type.Object({
+    type: Type.Literal('string'),
+    /** Different subtypes - allow any arbitrary string, this negates the purpose of having a union of formats so we type it in typescript instead */
+    format: Type.Optional(Type.String()),
+}), StringValidationKeywords);
+const ArrayValidationKeywordsWithSchema = Type.Object({
     /** Maximum number of items in array. */
     maxItems: Type.Optional(Type.Integer({ minimum: 0 })),
     /** Minimum number of items in array. */
@@ -132,8 +131,10 @@ const ArrayValidationPropertiesWithSchema = Type.Object({
     /** Schema for tuple validation. */
     prefixItems: Type.Optional(Type.Array(schemaOrReference)),
 });
-const ObjectValidationPropertiesWithSchema = Type.Object({
-    type: Type.Literal('object'),
+const ArrayValidationPropertiesWithSchema = compose(Type.Object({
+    type: Type.Literal('array'),
+}), ArrayValidationKeywordsWithSchema);
+const ObjectValidationKeywordsWithSchema = Type.Object({
     /** Maximum number of properties. */
     maxProperties: Type.Optional(Type.Integer({ minimum: 0 })),
     /** Minimum number of properties. */
@@ -149,6 +150,14 @@ const ObjectValidationPropertiesWithSchema = Type.Object({
     /** Constraints on property names (JSON Schema propertyNames keyword). */
     propertyNames: Type.Optional(schemaOrReference),
 });
+const ObjectValidationPropertiesWithSchema = compose(Type.Object({
+    type: Type.Literal('object'),
+}), ObjectValidationKeywordsWithSchema);
+const MultiTypeValidationPropertiesWithSchema = compose(Type.Object({
+    type: Type.Array(PrimitiveSchemaTypeSchema),
+    /** Different subtypes - allow any arbitrary string, this negates the purpose of having a union of formats so we type it in typescript instead */
+    format: Type.Optional(Type.String()),
+}), NumericValidationKeywords, StringValidationKeywords, ArrayValidationKeywordsWithSchema, ObjectValidationKeywordsWithSchema);
 /** Builds the recursive schema schema */
 export const SchemaObjectSchemaDefinition = Type.Union([
     // Keep compositions first so they get priority when union is evaluated
@@ -161,4 +170,5 @@ export const SchemaObjectSchemaDefinition = Type.Union([
     compose(StringValidationProperties, CorePropertiesWithSchema, Extensions),
     compose(ObjectValidationPropertiesWithSchema, CorePropertiesWithSchema, Extensions),
     compose(ArrayValidationPropertiesWithSchema, CorePropertiesWithSchema, Extensions),
+    compose(MultiTypeValidationPropertiesWithSchema, CorePropertiesWithSchema, Extensions),
 ]);

package/package.json

@@ -16,12 +16,17 @@
     "openapi",
     "scalar"
   ],
-  "version": "0.51.2",
+  "version": "0.53.0",
   "engines": {
     "node": ">=22"
   },
   "type": "module",
   "exports": {
+    "./channel-example": {
+      "import": "./dist/channel-example/index.js",
+      "types": "./dist/channel-example/index.d.ts",
+      "default": "./dist/channel-example/index.js"
+    },
     "./client": {
       "import": "./dist/client.js",
       "types": "./dist/client.d.ts",
@@ -143,13 +148,13 @@
     "type-fest": "^5.3.1",
     "vue": "^3.5.30",
     "yaml": "^2.8.3",
-    "@scalar/openapi-upgrader": "0.2.8",
-    "@scalar/schemas": "0.3.1",
-    "@scalar/json-magic": "0.12.14",
-    "@scalar/snippetz": "0.9.10",
-    "@scalar/helpers": "0.8.0",
+    "@scalar/openapi-upgrader": "0.2.9",
+    "@scalar/helpers": "0.8.1",
+    "@scalar/schemas": "0.3.3",
+    "@scalar/snippetz": "0.9.12",
+    "@scalar/types": "0.12.3",
     "@scalar/validation": "0.6.0",
-    "@scalar/types": "0.12.1"
+    "@scalar/json-magic": "0.12.15"
   },
   "devDependencies": {
     "@google-cloud/storage": "7.16.0",