@scalar/oas-utils 0.2.106 → 0.2.108

package/dist/entities/spec/requests.d.ts

@@ -87,10 +87,10 @@ export declare const oasRequestSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         required: boolean;
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
         deprecated: boolean;
-        description?: string | undefined;
         example?: unknown;
+        description?: string | undefined;
         schema?: unknown;
         content?: unknown;
         style?: "matrix" | "simple" | "form" | "label" | "spaceDelimited" | "pipeDelimited" | "deepObject" | undefined;
@@ -100,10 +100,10 @@ export declare const oasRequestSchema: z.ZodObject<{
         }> | undefined;
     }, {
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
+        example?: unknown;
         required?: boolean | undefined;
         description?: string | undefined;
-        example?: unknown;
         deprecated?: boolean | undefined;
         schema?: unknown;
         content?: unknown;
@@ -116,15 +116,21 @@ export declare const oasRequestSchema: z.ZodObject<{
     /**
      * External documentation object
      */
-    externalDocs: z.ZodOptional<z.ZodObject<{
-        description: z.ZodOptional<z.ZodString>;
-        url: z.ZodDefault<z.ZodString>;
+    externalDocs: z.ZodOptional<z.ZodEffects<z.ZodObject<{
+        description: z.ZodCatch<z.ZodOptional<z.ZodString>>;
+        url: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         url: string;
         description?: string | undefined;
     }, {
+        url: string;
+        description?: unknown;
+    }>, {
+        url: string;
         description?: string | undefined;
-        url?: string | undefined;
+    }, {
+        url: string;
+        description?: unknown;
     }>>;
     deprecated: z.ZodOptional<z.ZodBoolean>;
     /** Response formats */
@@ -228,10 +234,10 @@ export declare const oasRequestSchema: z.ZodObject<{
     parameters?: {
         required: boolean;
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
         deprecated: boolean;
-        description?: string | undefined;
         example?: unknown;
+        description?: string | undefined;
         schema?: unknown;
         content?: unknown;
         style?: "matrix" | "simple" | "form" | "label" | "spaceDelimited" | "pipeDelimited" | "deepObject" | undefined;
@@ -263,8 +269,8 @@ export declare const oasRequestSchema: z.ZodObject<{
     description?: string | undefined;
     summary?: string | undefined;
     externalDocs?: {
-        description?: string | undefined;
-        url?: string | undefined;
+        url: string;
+        description?: unknown;
     } | undefined;
     'x-internal'?: boolean | undefined;
     'x-scalar-ignore'?: boolean | undefined;
@@ -274,10 +280,10 @@ export declare const oasRequestSchema: z.ZodObject<{
     operationId?: string | undefined;
     parameters?: {
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
+        example?: unknown;
         required?: boolean | undefined;
         description?: string | undefined;
-        example?: unknown;
         deprecated?: boolean | undefined;
         schema?: unknown;
         content?: unknown;
@@ -367,10 +373,10 @@ export declare const requestSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
     }, "strip", z.ZodTypeAny, {
         required: boolean;
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
         deprecated: boolean;
-        description?: string | undefined;
         example?: unknown;
+        description?: string | undefined;
         schema?: unknown;
         content?: unknown;
         style?: "matrix" | "simple" | "form" | "label" | "spaceDelimited" | "pipeDelimited" | "deepObject" | undefined;
@@ -380,10 +386,10 @@ export declare const requestSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
         }> | undefined;
     }, {
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
+        example?: unknown;
         required?: boolean | undefined;
         description?: string | undefined;
-        example?: unknown;
         deprecated?: boolean | undefined;
         schema?: unknown;
         content?: unknown;
@@ -396,15 +402,21 @@ export declare const requestSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
     /**
      * External documentation object
      */
-    externalDocs: z.ZodOptional<z.ZodObject<{
-        description: z.ZodOptional<z.ZodString>;
-        url: z.ZodDefault<z.ZodString>;
+    externalDocs: z.ZodOptional<z.ZodEffects<z.ZodObject<{
+        description: z.ZodCatch<z.ZodOptional<z.ZodString>>;
+        url: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         url: string;
         description?: string | undefined;
     }, {
+        url: string;
+        description?: unknown;
+    }>, {
+        url: string;
         description?: string | undefined;
-        url?: string | undefined;
+    }, {
+        url: string;
+        description?: unknown;
     }>>;
     deprecated: z.ZodOptional<z.ZodBoolean>;
     /** Response formats */
@@ -494,27 +506,27 @@ export declare const requestSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
     'x-scalar-ignore': z.ZodOptional<z.ZodBoolean>;
 }, "x-scalar-examples">, {
     type: z.ZodDefault<z.ZodOptional<z.ZodLiteral<"request">>>;
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "operation">;
     /** Path Key */
     path: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     /** Request Method */
     method: z.ZodDefault<z.ZodEnum<["connect", "delete", "get", "head", "options", "patch", "post", "put", "trace"]>>;
     /** List of server UIDs specific to the request */
-    servers: z.ZodDefault<z.ZodArray<z.ZodDefault<z.ZodOptional<z.ZodString>>, "many">>;
+    servers: z.ZodDefault<z.ZodArray<z.ZodBranded<z.ZodString, "server">, "many">>;
     /** The currently selected server */
-    selectedServerUid: z.ZodDefault<z.ZodString>;
+    selectedServerUid: z.ZodDefault<z.ZodNullable<z.ZodOptional<z.ZodBranded<z.ZodString, "server">>>>;
     /** List of example UIDs associated with the request */
-    examples: z.ZodDefault<z.ZodArray<z.ZodDefault<z.ZodOptional<z.ZodString>>, "many">>;
+    examples: z.ZodDefault<z.ZodArray<z.ZodBranded<z.ZodString, "example">, "many">>;
     /** List of security scheme UIDs associated with the request */
-    selectedSecuritySchemeUids: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodDefault<z.ZodOptional<z.ZodString>>, z.ZodArray<z.ZodDefault<z.ZodOptional<z.ZodString>>, "many">]>, "many">>;
+    selectedSecuritySchemeUids: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodBranded<z.ZodString, "securityScheme">, z.ZodArray<z.ZodBranded<z.ZodString, "securityScheme">, "many">]>, "many">>;
 }>, "strip", z.ZodTypeAny, {
     path: string;
     type: "request";
-    uid: string;
-    selectedSecuritySchemeUids: (string | string[])[];
-    selectedServerUid: string;
-    servers: string[];
-    examples: string[];
+    uid: string & z.BRAND<"operation">;
+    selectedSecuritySchemeUids: ((string & z.BRAND<"securityScheme">) | (string & z.BRAND<"securityScheme">)[])[];
+    selectedServerUid: (string & z.BRAND<"server">) | null;
+    servers: (string & z.BRAND<"server">)[];
+    examples: (string & z.BRAND<"example">)[];
     method: "options" | "connect" | "delete" | "get" | "head" | "patch" | "post" | "put" | "trace";
     description?: string | undefined;
     summary?: string | undefined;
@@ -531,10 +543,10 @@ export declare const requestSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
     parameters?: {
         required: boolean;
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
         deprecated: boolean;
-        description?: string | undefined;
         example?: unknown;
+        description?: string | undefined;
         schema?: unknown;
         content?: unknown;
         style?: "matrix" | "simple" | "form" | "label" | "spaceDelimited" | "pipeDelimited" | "deepObject" | undefined;
@@ -552,25 +564,25 @@ export declare const requestSchema: z.ZodObject<z.objectUtil.extendShape<Omit<{
     description?: string | undefined;
     summary?: string | undefined;
     externalDocs?: {
-        description?: string | undefined;
-        url?: string | undefined;
+        url: string;
+        description?: unknown;
     } | undefined;
     'x-internal'?: boolean | undefined;
     'x-scalar-ignore'?: boolean | undefined;
     security?: Record<string, string[] | undefined>[] | undefined;
-    selectedSecuritySchemeUids?: (string | (string | undefined)[] | undefined)[] | undefined;
-    selectedServerUid?: string | undefined;
-    servers?: (string | undefined)[] | undefined;
+    selectedSecuritySchemeUids?: (string | string[])[] | undefined;
+    selectedServerUid?: string | null | undefined;
+    servers?: string[] | undefined;
     tags?: string[] | undefined;
     deprecated?: boolean | undefined;
-    examples?: (string | undefined)[] | undefined;
+    examples?: string[] | undefined;
     operationId?: string | undefined;
     parameters?: {
         name: string;
-        in: "path" | "query" | "header" | "cookie";
+        in: "path" | "cookie" | "query" | "header";
+        example?: unknown;
         required?: boolean | undefined;
         description?: string | undefined;
-        example?: unknown;
         deprecated?: boolean | undefined;
         schema?: unknown;
         content?: unknown;

package/dist/entities/spec/requests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requests.d.ts","sourceRoot":"","sources":["../../../src/entities/spec/requests.ts"],"names":[],"mappings":"AAKA,OAAO,EAAkB,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvC,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,oBAAoB,CAAA;AAI9E,eAAO,MAAM,cAAc,2FAUjB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;AAE3D,0DAA0D;AAC1D,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG;IACzD,iEAAiE;IACjE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,wCAAwC;IACxC,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,kCAAkC;IAClC,QAAQ,EAAE,MAAM,CAAA;IAChB,wBAAwB;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,0BAA0B;IAC1B,MAAM,EAAE,aAAa,CAAA;IACrB,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,iEAAiE;AACjE,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,cAAc,CAAA;IACvB,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAMD,2CAA2C;AAC3C,eAAO,MAAM,gBAAgB;IAC3B;;;;;OAKG;;IAEH,kDAAkD;;IAElD,mHAAmH;;IAEnH;;;;OAIG;;IAEH;;;;;;OAMG;;IAEH;;;;;OAKG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEH;;OAEG;;;;;;;;;;;;IAGH,uBAAuB;;IAEvB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEvB,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG2B,CAAA;AA0BnD,8CAA8C;AAC9C,eAAO,MAAM,aAAa;IA3ExB;;;;;OAKG;;IAEH,kDAAkD;;IAElD,mHAAmH;;IAEnH;;;;OAIG;;IAEH;;;;;;OAMG;;IAEH;;;;;OAKG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEH;;OAEG;;;;;;;;;;;;IAGH,uBAAuB;;IAEvB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEvB,sBAAsB;;;;;;IAetB,eAAe;;IAEf,qBAAqB;;IAErB,kDAAkD;;IAElD,oCAAoC;;IAEpC,uDAAuD;;IAEvD,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOlC,CAAA;AAE/B,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AACnD,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA"}
+{"version":3,"file":"requests.d.ts","sourceRoot":"","sources":["../../../src/entities/spec/requests.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvC,OAAO,EAAE,KAAK,cAAc,EAAwB,MAAM,oBAAoB,CAAA;AAI9E,eAAO,MAAM,cAAc,2FAA4F,CAAA;AAEvH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;AAE3D,0DAA0D;AAC1D,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG;IACzD,iEAAiE;IACjE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,wCAAwC;IACxC,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,kCAAkC;IAClC,QAAQ,EAAE,MAAM,CAAA;IAChB,wBAAwB;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,0BAA0B;IAC1B,MAAM,EAAE,aAAa,CAAA;IACrB,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,iEAAiE;AACjE,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,cAAc,CAAA;IACvB,QAAQ,EAAE,gBAAgB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAMD,2CAA2C;AAC3C,eAAO,MAAM,gBAAgB;IAC3B;;;;;OAKG;;IAEH,kDAAkD;;IAElD,mHAAmH;;IAEnH;;;;OAIG;;IAEH;;;;;;OAMG;;IAEH;;;;;OAKG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;IAGH,uBAAuB;;IAEvB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEvB,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG2B,CAAA;AA0BnD,8CAA8C;AAC9C,eAAO,MAAM,aAAa;IA3ExB;;;;;OAKG;;IAEH,kDAAkD;;IAElD,mHAAmH;;IAEnH;;;;OAIG;;IAEH;;;;;;OAMG;;IAEH;;;;;OAKG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;IAGH,uBAAuB;;IAEvB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEvB,sBAAsB;;;;;;IAetB,eAAe;;IAEf,qBAAqB;;IAErB,kDAAkD;;IAElD,oCAAoC;;IAEpC,uDAAuD;;IAEvD,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAK6C,CAAA;AAE9G,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AACnD,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA"}

package/dist/entities/spec/requests.js

@@ -5,17 +5,7 @@ import { xScalarExampleSchema } from './request-examples.js';
 import { oasSecurityRequirementSchema } from './security.js';
 import { oasExternalDocumentationSchema } from './spec-objects.js';
 
-const requestMethods = [
-    'connect',
-    'delete',
-    'get',
-    'head',
-    'options',
-    'patch',
-    'post',
-    'put',
-    'trace',
-];
+const requestMethods = ['connect', 'delete', 'get', 'head', 'options', 'patch', 'post', 'put', 'trace'];
 const requestBodySchema = z.any();
 /** Open API Compliant Request Validator */
 const oasRequestSchema = z.object({
@@ -77,23 +67,21 @@ const oasRequestSchema = z.object({
  */
 const extendedRequestSchema = z.object({
     type: z.literal('request').optional().default('request'),
-    uid: nanoidSchema,
+    uid: nanoidSchema.brand(),
     /** Path Key */
     path: z.string().optional().default(''),
     /** Request Method */
     method: z.enum(requestMethods).default('get'),
     /** List of server UIDs specific to the request */
-    servers: nanoidSchema.array().default([]),
+    servers: z.string().brand().array().default([]),
     /** The currently selected server */
-    selectedServerUid: z.string().default(''),
+    selectedServerUid: z.string().brand().optional().nullable().default(null),
     /** List of example UIDs associated with the request */
-    examples: nanoidSchema.array().default([]),
+    examples: z.string().brand().array().default([]),
     /** List of security scheme UIDs associated with the request */
     selectedSecuritySchemeUids: selectedSecuritySchemeUidSchema,
 });
 /** Unified request schema for client usage */
-const requestSchema = oasRequestSchema
-    .omit({ 'x-scalar-examples': true })
-    .merge(extendedRequestSchema);
+const requestSchema = oasRequestSchema.omit({ 'x-scalar-examples': true }).merge(extendedRequestSchema);
 
 export { oasRequestSchema, requestMethods, requestSchema };

package/dist/entities/spec/security.d.ts

@@ -9,7 +9,7 @@ export declare const securityApiKeySchema: z.ZodObject<z.objectUtil.extendShape<
     /** REQUIRED. The location of the API key. Valid values are "query", "header" or "cookie". */
     in: z.ZodDefault<z.ZodOptional<z.ZodEnum<["query", "header", "cookie"]>>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, {
@@ -17,10 +17,10 @@ export declare const securityApiKeySchema: z.ZodObject<z.objectUtil.extendShape<
 }>, "strip", z.ZodTypeAny, {
     type: "apiKey";
     value: string;
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     name: string;
     nameKey: string;
-    in: "query" | "header" | "cookie";
+    in: "cookie" | "query" | "header";
     description?: string | undefined;
 }, {
     type: "apiKey";
@@ -29,7 +29,7 @@ export declare const securityApiKeySchema: z.ZodObject<z.objectUtil.extendShape<
     name?: string | undefined;
     description?: string | undefined;
     nameKey?: string | undefined;
-    in?: "query" | "header" | "cookie" | undefined;
+    in?: "cookie" | "query" | "header" | undefined;
 }>;
 export type SecuritySchemeApiKey = z.infer<typeof securityApiKeySchema>;
 export declare const securityHttpSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
@@ -48,7 +48,7 @@ export declare const securityHttpSchema: z.ZodObject<z.objectUtil.extendShape<z.
      */
     bearerFormat: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"JWT">, z.ZodString]>>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, {
@@ -57,7 +57,7 @@ export declare const securityHttpSchema: z.ZodObject<z.objectUtil.extendShape<z.
     token: z.ZodDefault<z.ZodString>;
 }>, "strip", z.ZodTypeAny, {
     type: "http";
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     nameKey: string;
     scheme: "basic" | "bearer";
     bearerFormat: string;
@@ -87,12 +87,12 @@ export declare const securityOpenIdSchema: z.ZodObject<z.objectUtil.extendShape<
      */
     openIdConnectUrl: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, "strip", z.ZodTypeAny, {
     type: "openIdConnect";
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     nameKey: string;
     openIdConnectUrl: string;
     description?: string | undefined;
@@ -382,12 +382,12 @@ export declare const securityOauthSchema: z.ZodObject<z.objectUtil.extendShape<z
         } | undefined;
     }>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, "strip", z.ZodTypeAny, {
     type: "oauth2";
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     nameKey: string;
     flows: {
         password?: {
@@ -518,13 +518,13 @@ export declare const oasSecuritySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUt
 }>, "strip", z.ZodTypeAny, {
     type: "apiKey";
     name: string;
-    in: "query" | "header" | "cookie";
+    in: "cookie" | "query" | "header";
     description?: string | undefined;
 }, {
     type: "apiKey";
     name?: string | undefined;
     description?: string | undefined;
-    in?: "query" | "header" | "cookie" | undefined;
+    in?: "cookie" | "query" | "header" | undefined;
 }>, z.ZodObject<z.objectUtil.extendShape<{
     description: z.ZodOptional<z.ZodString>;
 }, {
@@ -953,7 +953,7 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
     /** REQUIRED. The location of the API key. Valid values are "query", "header" or "cookie". */
     in: z.ZodDefault<z.ZodOptional<z.ZodEnum<["query", "header", "cookie"]>>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, {
@@ -961,10 +961,10 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
 }>, "strip", z.ZodTypeAny, {
     type: "apiKey";
     value: string;
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     name: string;
     nameKey: string;
-    in: "query" | "header" | "cookie";
+    in: "cookie" | "query" | "header";
     description?: string | undefined;
 }, {
     type: "apiKey";
@@ -973,7 +973,7 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
     name?: string | undefined;
     description?: string | undefined;
     nameKey?: string | undefined;
-    in?: "query" | "header" | "cookie" | undefined;
+    in?: "cookie" | "query" | "header" | undefined;
 }>, z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<z.objectUtil.extendShape<{
     description: z.ZodOptional<z.ZodString>;
 }, {
@@ -990,7 +990,7 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
      */
     bearerFormat: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"JWT">, z.ZodString]>>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, {
@@ -999,7 +999,7 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
     token: z.ZodDefault<z.ZodString>;
 }>, "strip", z.ZodTypeAny, {
     type: "http";
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     nameKey: string;
     scheme: "basic" | "bearer";
     bearerFormat: string;
@@ -1027,12 +1027,12 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
      */
     openIdConnectUrl: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, "strip", z.ZodTypeAny, {
     type: "openIdConnect";
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     nameKey: string;
     openIdConnectUrl: string;
     description?: string | undefined;
@@ -1318,12 +1318,12 @@ export declare const securitySchemeSchema: z.ZodUnion<[z.ZodObject<z.objectUtil.
         } | undefined;
     }>>;
 }>, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "securityScheme">;
     /** The name key that links a security requirement to a security object */
     nameKey: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }>, "strip", z.ZodTypeAny, {
     type: "oauth2";
-    uid: string;
+    uid: string & z.BRAND<"securityScheme">;
     nameKey: string;
     flows: {
         password?: {

package/dist/entities/spec/security.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../../src/entities/spec/security.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../../src/entities/spec/security.ts"],"names":[],"mappings":"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"}

package/dist/entities/spec/security.js

@@ -9,7 +9,7 @@ const commonProps = z.object({
     description: z.string().optional(),
 });
 const extendedSecuritySchema = z.object({
-    uid: nanoidSchema,
+    uid: nanoidSchema.brand(),
     /** The name key that links a security requirement to a security object */
     nameKey: z.string().optional().default(''),
 });
@@ -26,9 +26,7 @@ const oasSecuritySchemeApiKey = commonProps.extend({
 const apiKeyValueSchema = z.object({
     value: z.string().default(''),
 });
-const securityApiKeySchema = oasSecuritySchemeApiKey
-    .merge(extendedSecuritySchema)
-    .merge(apiKeyValueSchema);
+const securityApiKeySchema = oasSecuritySchemeApiKey.merge(extendedSecuritySchema).merge(apiKeyValueSchema);
 // ---------------------------------------------------------------------------
 // HTTP
 const oasSecuritySchemeHttp = commonProps.extend({
@@ -58,9 +56,7 @@ const httpValueSchema = z.object({
     password: z.string().default(''),
     token: z.string().default(''),
 });
-const securityHttpSchema = oasSecuritySchemeHttp
-    .merge(extendedSecuritySchema)
-    .merge(httpValueSchema);
+const securityHttpSchema = oasSecuritySchemeHttp.merge(extendedSecuritySchema).merge(httpValueSchema);
 // ---------------------------------------------------------------------------
 // OPENID CONNECT
 const oasSecuritySchemeOpenId = commonProps.extend({
@@ -94,10 +90,7 @@ const flowsCommon = z.object({
      * REQUIRED. The available scopes for the OAuth2 security scheme. A map
      * between the scope name and a short description for it. The map MAY be empty.
      */
-    'scopes': z
-        .record(z.string(), z.string().optional().default(''))
-        .optional()
-        .default({}),
+    'scopes': z.record(z.string(), z.string().optional().default('')).optional().default({}),
     'selectedScopes': z.array(z.string()).optional().default([]),
     /** Extension to save the client Id associated with an oauth flow */
     'x-scalar-client-id': z.string().optional().default(''),
@@ -105,9 +98,7 @@ const flowsCommon = z.object({
     'token': z.string().default(''),
 });
 /** Setup a default redirect uri if we can */
-const defaultRedirectUri = typeof window !== 'undefined'
-    ? window.location.origin + window.location.pathname
-    : '';
+const defaultRedirectUri = typeof window !== 'undefined' ? window.location.origin + window.location.pathname : '';
 /** Options for the x-usePkce extension */
 const pkceOptions = ['SHA-256', 'plain', 'no'];
 /** Oauth2 security scheme */
@@ -120,10 +111,7 @@ const oasSecuritySchemeOauth2 = commonProps.extend({
         implicit: flowsCommon.extend({
             'type': z.literal('implicit'),
             authorizationUrl,
-            'x-scalar-redirect-uri': z
-                .string()
-                .optional()
-                .default(defaultRedirectUri),
+            'x-scalar-redirect-uri': z.string().optional().default(defaultRedirectUri),
         }),
         /** Configuration for the OAuth Resource Owner Password flow */
         password: flowsCommon.extend({
@@ -149,10 +137,7 @@ const oasSecuritySchemeOauth2 = commonProps.extend({
              * TODO: add docs
              */
             'x-usePkce': z.enum(pkceOptions).optional().default('no'),
-            'x-scalar-redirect-uri': z
-                .string()
-                .optional()
-                .default(defaultRedirectUri),
+            'x-scalar-redirect-uri': z.string().optional().default(defaultRedirectUri),
             tokenUrl,
             'clientSecret': z.string().default(''),
         }),

package/dist/entities/spec/server.d.ts

@@ -94,9 +94,9 @@ export declare const serverSchema: z.ZodObject<z.objectUtil.extendShape<{
         value?: string;
     }>>>;
 }, {
-    uid: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    uid: z.ZodBranded<z.ZodDefault<z.ZodOptional<z.ZodString>>, "server">;
 }>, "strip", z.ZodTypeAny, {
-    uid: string;
+    uid: string & z.BRAND<"server">;
     url: string;
     description?: string | undefined;
     variables?: Record<string, Omit<OpenAPIV3_1.ServerVariableObject, "enum"> & {

package/dist/entities/spec/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/entities/spec/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvC;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB;IAClC;;OAEG;;IAEH;;;;OAIG;;IAEH;;OAEG;;;;;;;;;;EAEH,CAAA;AA+BF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;IAC1B;;;;OAIG;;IAEH;;;OAGG;;IAEH,oHAAoH;;eAxB3G,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;EAyB8B,CAAA;AAEhD,eAAO,MAAM,YAAY;IAfvB;;;;OAIG;;IAEH;;;OAGG;;IAEH,oHAAoH;;eAxB3G,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;EA6BhB,CAAA;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AACjD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/entities/spec/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvC;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB;IAClC;;OAEG;;IAEH;;;;OAIG;;IAEH;;OAEG;;;;;;;;;;EAEH,CAAA;AA2BF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;IAC1B;;;;OAIG;;IAEH;;;OAGG;;IAEH,oHAAoH;;eAxB3G,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;EAyB8B,CAAA;AAEhD,eAAO,MAAM,YAAY;IAfvB;;;;OAIG;;IAEH;;;OAGG;;IAEH,oHAAoH;;eAxB3G,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;;;;;;eADP,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBACpB,MAAM;;EA6BhB,CAAA;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA;AACjD,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA"}

package/dist/entities/spec/server.js

@@ -1,5 +1,5 @@
-import { z } from 'zod';
 import { nanoidSchema } from '../shared/utility.js';
+import { z } from 'zod';
 
 /**
  * Server Variable Object
@@ -32,9 +32,7 @@ const extendedServerVariableSchema = oasServerVariableSchema
 })
     .refine((data) => {
     // Set default to the first enum value if invalid
-    if (Array.isArray(data.enum) &&
-        !data.enum.includes(data.default ?? '') &&
-        data.enum.length > 0) {
+    if (Array.isArray(data.enum) && !data.enum.includes(data.default ?? '') && data.enum.length > 0) {
         data.default = data.enum[0];
     }
     if (Array.isArray(data.enum) && data.enum.length === 0) {
@@ -66,7 +64,7 @@ const oasServerSchema = z.object({
     variables: z.record(z.string(), extendedServerVariableSchema).optional(),
 });
 const serverSchema = oasServerSchema.extend({
-    uid: nanoidSchema,
+    uid: nanoidSchema.brand(),
 });
 
 export { oasServerSchema, oasServerVariableSchema, serverSchema };