npm - @stackframe/stack-shared - Versions diffs - 2.8.10 → 2.8.12 - Mend

@stackframe/stack-shared 2.8.10 → 2.8.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (154) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,17 @@
 # @stackframe/stack-shared
+## 2.8.12
+### Patch Changes
+- Various changes
+## 2.8.11
+### Patch Changes
+- Various changes
 ## 2.8.10
 ### Patch Changes

package/dist/config/{schema.d.cts → schema.d.mts} RENAMED Viewed

@@ -1,7 +1,7 @@
 import * as yup from 'yup';
-import { DeepMerge } from '../utils/objects.cjs';
-import { PrettifyType } from '../utils/types.cjs';
-import { NormalizesTo } from './format.cjs';
+import { DeepMerge, DeepPartial } from '../utils/objects.mjs';
+import { PrettifyType } from '../utils/types.mjs';
+import { NormalizesTo, Config } from './format.mjs';
 declare const configLevels: readonly ["project", "branch", "environment", "organization"];
 type ConfigLevel = typeof configLevels[number];
@@ -31,18 +31,18 @@ declare const branchConfigSchema: yup.ObjectSchema<{} & {
     } | undefined;
     apiKeys: {
         enabled?: {
-            user?: boolean | undefined;
             team?: boolean | undefined;
+            user?: boolean | undefined;
         } | undefined;
     } | undefined;
     domains: {
         allowLocalhost?: boolean | undefined;
     } | undefined;
     auth: {
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -52,8 +52,8 @@ declare const branchConfigSchema: yup.ObjectSchema<{} & {
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -124,8 +124,8 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
     } | undefined;
     apiKeys: {
         enabled?: {
-            user?: boolean | undefined;
             team?: boolean | undefined;
+            user?: boolean | undefined;
         } | undefined;
     } | undefined;
     domains: (Omit<{
@@ -137,10 +137,10 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         }> | undefined;
     }) | undefined;
     auth: (Omit<{
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -150,8 +150,8 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -159,18 +159,18 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: (Omit<{
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         }, never> & {
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
-                clientId?: string | undefined;
-                clientSecret?: string | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
                 isShared?: boolean | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
                 facebookConfigId?: string | undefined;
                 microsoftTenantId?: string | undefined;
             }> | undefined;
@@ -178,21 +178,21 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
     }) | undefined;
     emails: Omit<{}, never> & {
         server: {
+            password?: string | undefined;
+            isShared?: boolean | undefined;
             host?: string | undefined;
             port?: number | undefined;
             username?: string | undefined;
-            password?: string | undefined;
-            isShared?: boolean | undefined;
             senderName?: string | undefined;
             senderEmail?: string | undefined;
         };
     };
 } & {
     auth: (Omit<{
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -202,8 +202,8 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -211,18 +211,18 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: (Omit<{
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         }, never> & {
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
-                clientId?: string | undefined;
-                clientSecret?: string | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
                 isShared?: boolean | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
                 facebookConfigId?: string | undefined;
                 microsoftTenantId?: string | undefined;
             }> | undefined;
@@ -230,11 +230,11 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
     }) | undefined;
     emails: Omit<{}, never> & {
         server: {
+            password?: string | undefined;
+            isShared?: boolean | undefined;
             host?: string | undefined;
             port?: number | undefined;
             username?: string | undefined;
-            password?: string | undefined;
-            isShared?: boolean | undefined;
             senderName?: string | undefined;
             senderEmail?: string | undefined;
         };
@@ -421,8 +421,8 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
     } | undefined;
     apiKeys: {
         enabled?: {
-            user?: boolean | undefined;
             team?: boolean | undefined;
+            user?: boolean | undefined;
         } | undefined;
     } | undefined;
     domains: (Omit<{
@@ -434,10 +434,10 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
         }> | undefined;
     }) | undefined;
     auth: (Omit<{
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -447,8 +447,8 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -456,18 +456,18 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
         oauth?: (Omit<{
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         }, never> & {
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
-                clientId?: string | undefined;
-                clientSecret?: string | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
                 isShared?: boolean | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
                 facebookConfigId?: string | undefined;
                 microsoftTenantId?: string | undefined;
             }> | undefined;
@@ -475,11 +475,11 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
     }) | undefined;
     emails: Omit<{}, never> & {
         server: {
+            password?: string | undefined;
+            isShared?: boolean | undefined;
             host?: string | undefined;
             port?: number | undefined;
             username?: string | undefined;
-            password?: string | undefined;
-            isShared?: boolean | undefined;
             senderName?: string | undefined;
             senderEmail?: string | undefined;
         };
@@ -681,6 +681,7 @@ declare const organizationConfigDefaults: {
         oauth: {
             accountMergeStrategy: "link_method";
             providers: (key: string) => {
+                isShared: true;
                 allowSignIn: false;
                 allowConnectedAccounts: false;
             };
@@ -712,6 +713,10 @@ type ProjectConfigOverride = NormalizesTo<ProjectConfigNormalizedOverride>;
 type BranchConfigOverride = NormalizesTo<BranchConfigNormalizedOverride>;
 type EnvironmentConfigOverride = NormalizesTo<EnvironmentConfigNormalizedOverride>;
 type OrganizationConfigOverride = NormalizesTo<OrganizationConfigNormalizedOverride>;
+type ProjectConfigOverrideOverride = Config & DeepPartial<ProjectConfigOverride>;
+type BranchConfigOverrideOverride = Config & DeepPartial<BranchConfigOverride>;
+type EnvironmentConfigOverrideOverride = Config & DeepPartial<EnvironmentConfigOverride>;
+type OrganizationConfigOverrideOverride = Config & DeepPartial<OrganizationConfigOverride>;
 type ProjectIncompleteConfig = ProjectConfigNormalizedOverride;
 type BranchIncompleteConfig = ProjectIncompleteConfig & BranchConfigNormalizedOverride;
 type EnvironmentIncompleteConfig = BranchIncompleteConfig & EnvironmentConfigNormalizedOverride;
@@ -721,4 +726,4 @@ type BranchRenderedConfig = PrettifyType<ProjectRenderedConfig & ApplyDefaults<t
 type EnvironmentRenderedConfig = PrettifyType<BranchRenderedConfig & ApplyDefaults<typeof environmentConfigDefaults, EnvironmentConfigStrippedNormalizedOverride>>;
 type OrganizationRenderedConfig = PrettifyType<EnvironmentRenderedConfig & ApplyDefaults<typeof organizationConfigDefaults, OrganizationConfigStrippedNormalizedOverride>>;
-export { type ApplyDefaults, type BranchConfigNormalizedOverride, type BranchConfigOverride, type BranchConfigStrippedNormalizedOverride, type BranchIncompleteConfig, type BranchRenderedConfig, type ConfigLevel, type DeepReplaceAllowFunctionsForObjects, type DeepReplaceFunctionsWithObjects, type EnvironmentConfigNormalizedOverride, type EnvironmentConfigOverride, type EnvironmentConfigStrippedNormalizedOverride, type EnvironmentIncompleteConfig, type EnvironmentRenderedConfig, type OrganizationConfigNormalizedOverride, type OrganizationConfigOverride, type OrganizationConfigStrippedNormalizedOverride, type OrganizationIncompleteConfig, type OrganizationRenderedConfig, type ProjectConfigNormalizedOverride, type ProjectConfigOverride, type ProjectConfigStrippedNormalizedOverride, type ProjectIncompleteConfig, type ProjectRenderedConfig, applyDefaults, branchConfigDefaults, branchConfigSchema, configLevels, environmentConfigDefaults, environmentConfigSchema, organizationConfigDefaults, organizationConfigSchema, projectConfigDefaults, projectConfigSchema };
+export { type ApplyDefaults, type BranchConfigNormalizedOverride, type BranchConfigOverride, type BranchConfigOverrideOverride, type BranchConfigStrippedNormalizedOverride, type BranchIncompleteConfig, type BranchRenderedConfig, type ConfigLevel, type DeepReplaceAllowFunctionsForObjects, type DeepReplaceFunctionsWithObjects, type EnvironmentConfigNormalizedOverride, type EnvironmentConfigOverride, type EnvironmentConfigOverrideOverride, type EnvironmentConfigStrippedNormalizedOverride, type EnvironmentIncompleteConfig, type EnvironmentRenderedConfig, type OrganizationConfigNormalizedOverride, type OrganizationConfigOverride, type OrganizationConfigOverrideOverride, type OrganizationConfigStrippedNormalizedOverride, type OrganizationIncompleteConfig, type OrganizationRenderedConfig, type ProjectConfigNormalizedOverride, type ProjectConfigOverride, type ProjectConfigOverrideOverride, type ProjectConfigStrippedNormalizedOverride, type ProjectIncompleteConfig, type ProjectRenderedConfig, applyDefaults, branchConfigDefaults, branchConfigSchema, configLevels, environmentConfigDefaults, environmentConfigSchema, organizationConfigDefaults, organizationConfigSchema, projectConfigDefaults, projectConfigSchema };

package/dist/config/schema.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as yup from 'yup';
-import { DeepMerge } from '../utils/objects.js';
+import { DeepMerge, DeepPartial } from '../utils/objects.js';
 import { PrettifyType } from '../utils/types.js';
-import { NormalizesTo } from './format.js';
+import { NormalizesTo, Config } from './format.js';
 declare const configLevels: readonly ["project", "branch", "environment", "organization"];
 type ConfigLevel = typeof configLevels[number];
@@ -31,18 +31,18 @@ declare const branchConfigSchema: yup.ObjectSchema<{} & {
     } | undefined;
     apiKeys: {
         enabled?: {
-            user?: boolean | undefined;
             team?: boolean | undefined;
+            user?: boolean | undefined;
         } | undefined;
     } | undefined;
     domains: {
         allowLocalhost?: boolean | undefined;
     } | undefined;
     auth: {
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -52,8 +52,8 @@ declare const branchConfigSchema: yup.ObjectSchema<{} & {
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -124,8 +124,8 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
     } | undefined;
     apiKeys: {
         enabled?: {
-            user?: boolean | undefined;
             team?: boolean | undefined;
+            user?: boolean | undefined;
         } | undefined;
     } | undefined;
     domains: (Omit<{
@@ -137,10 +137,10 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         }> | undefined;
     }) | undefined;
     auth: (Omit<{
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -150,8 +150,8 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -159,18 +159,18 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: (Omit<{
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         }, never> & {
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
-                clientId?: string | undefined;
-                clientSecret?: string | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
                 isShared?: boolean | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
                 facebookConfigId?: string | undefined;
                 microsoftTenantId?: string | undefined;
             }> | undefined;
@@ -178,21 +178,21 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
     }) | undefined;
     emails: Omit<{}, never> & {
         server: {
+            password?: string | undefined;
+            isShared?: boolean | undefined;
             host?: string | undefined;
             port?: number | undefined;
             username?: string | undefined;
-            password?: string | undefined;
-            isShared?: boolean | undefined;
             senderName?: string | undefined;
             senderEmail?: string | undefined;
         };
     };
 } & {
     auth: (Omit<{
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -202,8 +202,8 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -211,18 +211,18 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
         oauth?: (Omit<{
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         }, never> & {
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
-                clientId?: string | undefined;
-                clientSecret?: string | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
                 isShared?: boolean | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
                 facebookConfigId?: string | undefined;
                 microsoftTenantId?: string | undefined;
             }> | undefined;
@@ -230,11 +230,11 @@ declare const environmentConfigSchema: yup.ObjectSchema<{
     }) | undefined;
     emails: Omit<{}, never> & {
         server: {
+            password?: string | undefined;
+            isShared?: boolean | undefined;
             host?: string | undefined;
             port?: number | undefined;
             username?: string | undefined;
-            password?: string | undefined;
-            isShared?: boolean | undefined;
             senderName?: string | undefined;
             senderEmail?: string | undefined;
         };
@@ -421,8 +421,8 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
     } | undefined;
     apiKeys: {
         enabled?: {
-            user?: boolean | undefined;
             team?: boolean | undefined;
+            user?: boolean | undefined;
         } | undefined;
     } | undefined;
     domains: (Omit<{
@@ -434,10 +434,10 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
         }> | undefined;
     }) | undefined;
     auth: (Omit<{
+        allowSignUp?: boolean | undefined;
         password?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
-        allowSignUp?: boolean | undefined;
         otp?: {
             allowSignIn?: boolean | undefined;
         } | undefined;
@@ -447,8 +447,8 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
         oauth?: {
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         } | undefined;
@@ -456,18 +456,18 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
         oauth?: (Omit<{
             accountMergeStrategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
             }> | undefined;
         }, never> & {
             providers?: Record<string, {
-                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
-                clientId?: string | undefined;
-                clientSecret?: string | undefined;
                 allowSignIn?: boolean | undefined;
+                type?: "google" | "github" | "microsoft" | "spotify" | "facebook" | "discord" | "gitlab" | "bitbucket" | "linkedin" | "apple" | "x" | undefined;
                 allowConnectedAccounts?: boolean | undefined;
                 isShared?: boolean | undefined;
+                clientId?: string | undefined;
+                clientSecret?: string | undefined;
                 facebookConfigId?: string | undefined;
                 microsoftTenantId?: string | undefined;
             }> | undefined;
@@ -475,11 +475,11 @@ declare const organizationConfigSchema: yup.ObjectSchema<{
     }) | undefined;
     emails: Omit<{}, never> & {
         server: {
+            password?: string | undefined;
+            isShared?: boolean | undefined;
             host?: string | undefined;
             port?: number | undefined;
             username?: string | undefined;
-            password?: string | undefined;
-            isShared?: boolean | undefined;
             senderName?: string | undefined;
             senderEmail?: string | undefined;
         };
@@ -681,6 +681,7 @@ declare const organizationConfigDefaults: {
         oauth: {
             accountMergeStrategy: "link_method";
             providers: (key: string) => {
+                isShared: true;
                 allowSignIn: false;
                 allowConnectedAccounts: false;
             };
@@ -712,6 +713,10 @@ type ProjectConfigOverride = NormalizesTo<ProjectConfigNormalizedOverride>;
 type BranchConfigOverride = NormalizesTo<BranchConfigNormalizedOverride>;
 type EnvironmentConfigOverride = NormalizesTo<EnvironmentConfigNormalizedOverride>;
 type OrganizationConfigOverride = NormalizesTo<OrganizationConfigNormalizedOverride>;
+type ProjectConfigOverrideOverride = Config & DeepPartial<ProjectConfigOverride>;
+type BranchConfigOverrideOverride = Config & DeepPartial<BranchConfigOverride>;
+type EnvironmentConfigOverrideOverride = Config & DeepPartial<EnvironmentConfigOverride>;
+type OrganizationConfigOverrideOverride = Config & DeepPartial<OrganizationConfigOverride>;
 type ProjectIncompleteConfig = ProjectConfigNormalizedOverride;
 type BranchIncompleteConfig = ProjectIncompleteConfig & BranchConfigNormalizedOverride;
 type EnvironmentIncompleteConfig = BranchIncompleteConfig & EnvironmentConfigNormalizedOverride;
@@ -721,4 +726,4 @@ type BranchRenderedConfig = PrettifyType<ProjectRenderedConfig & ApplyDefaults<t
 type EnvironmentRenderedConfig = PrettifyType<BranchRenderedConfig & ApplyDefaults<typeof environmentConfigDefaults, EnvironmentConfigStrippedNormalizedOverride>>;
 type OrganizationRenderedConfig = PrettifyType<EnvironmentRenderedConfig & ApplyDefaults<typeof organizationConfigDefaults, OrganizationConfigStrippedNormalizedOverride>>;
-export { type ApplyDefaults, type BranchConfigNormalizedOverride, type BranchConfigOverride, type BranchConfigStrippedNormalizedOverride, type BranchIncompleteConfig, type BranchRenderedConfig, type ConfigLevel, type DeepReplaceAllowFunctionsForObjects, type DeepReplaceFunctionsWithObjects, type EnvironmentConfigNormalizedOverride, type EnvironmentConfigOverride, type EnvironmentConfigStrippedNormalizedOverride, type EnvironmentIncompleteConfig, type EnvironmentRenderedConfig, type OrganizationConfigNormalizedOverride, type OrganizationConfigOverride, type OrganizationConfigStrippedNormalizedOverride, type OrganizationIncompleteConfig, type OrganizationRenderedConfig, type ProjectConfigNormalizedOverride, type ProjectConfigOverride, type ProjectConfigStrippedNormalizedOverride, type ProjectIncompleteConfig, type ProjectRenderedConfig, applyDefaults, branchConfigDefaults, branchConfigSchema, configLevels, environmentConfigDefaults, environmentConfigSchema, organizationConfigDefaults, organizationConfigSchema, projectConfigDefaults, projectConfigSchema };
+export { type ApplyDefaults, type BranchConfigNormalizedOverride, type BranchConfigOverride, type BranchConfigOverrideOverride, type BranchConfigStrippedNormalizedOverride, type BranchIncompleteConfig, type BranchRenderedConfig, type ConfigLevel, type DeepReplaceAllowFunctionsForObjects, type DeepReplaceFunctionsWithObjects, type EnvironmentConfigNormalizedOverride, type EnvironmentConfigOverride, type EnvironmentConfigOverrideOverride, type EnvironmentConfigStrippedNormalizedOverride, type EnvironmentIncompleteConfig, type EnvironmentRenderedConfig, type OrganizationConfigNormalizedOverride, type OrganizationConfigOverride, type OrganizationConfigOverrideOverride, type OrganizationConfigStrippedNormalizedOverride, type OrganizationIncompleteConfig, type OrganizationRenderedConfig, type ProjectConfigNormalizedOverride, type ProjectConfigOverride, type ProjectConfigOverrideOverride, type ProjectConfigStrippedNormalizedOverride, type ProjectIncompleteConfig, type ProjectRenderedConfig, applyDefaults, branchConfigDefaults, branchConfigSchema, configLevels, environmentConfigDefaults, environmentConfigSchema, organizationConfigDefaults, organizationConfigSchema, projectConfigDefaults, projectConfigSchema };

package/dist/config/schema.js CHANGED Viewed

@@ -42,12 +42,13 @@ __export(schema_exports, {
   projectConfigSchema: () => projectConfigSchema
 });
 module.exports = __toCommonJS(schema_exports);
-var schemaFields = __toESM(require("../schema-fields"), 1);
+var schemaFields = __toESM(require("../schema-fields"));
 var import_schema_fields = require("../schema-fields");
 var import_oauth = require("../utils/oauth");
 var import_objects = require("../utils/objects");
 var configLevels = ["project", "branch", "environment", "organization"];
 var permissionRegex = /^\$?[a-z0-9_:]+$/;
+var customPermissionRegex = /^[a-z0-9_:]+$/;
 var projectConfigSchema = (0, import_schema_fields.yupObject)({});
 var branchRbacDefaultPermissions = (0, import_schema_fields.yupRecord)(
   (0, import_schema_fields.yupString)().optional().matches(permissionRegex),
@@ -55,7 +56,7 @@ var branchRbacDefaultPermissions = (0, import_schema_fields.yupRecord)(
 ).optional();
 var branchRbacSchema = (0, import_schema_fields.yupObject)({
   permissions: (0, import_schema_fields.yupRecord)(
-    (0, import_schema_fields.yupString)().optional().matches(permissionRegex),
+    (0, import_schema_fields.yupString)().optional().matches(customPermissionRegex),
     (0, import_schema_fields.yupObject)({
       description: (0, import_schema_fields.yupString)().optional(),
       scope: (0, import_schema_fields.yupString)().oneOf(["team", "project"]).optional(),
@@ -202,6 +203,7 @@ var organizationConfigDefaults = {
     oauth: {
       accountMergeStrategy: "link_method",
       providers: (key) => ({
+        isShared: true,
         allowSignIn: false,
         allowConnectedAccounts: false
       })
@@ -214,7 +216,7 @@ var organizationConfigDefaults = {
   }
 };
 function applyDefaults(defaults, config) {
-  const res = { ...typeof defaults === "function" ? {} : defaults };
+  const res = typeof defaults === "function" ? {} : (0, import_objects.mapValues)(defaults, (v) => typeof v === "function" ? {} : typeof v === "object" ? applyDefaults(v, {}) : v);
   for (const [key, mergeValue] of Object.entries(config)) {
     const baseValue = typeof defaults === "function" ? defaults(key) : (0, import_objects.has)(defaults, key) ? (0, import_objects.get)(defaults, key) : void 0;
     if (baseValue !== void 0) {