@brimble/models 3.8.65 → 3.8.66

package/dist/enum/index.d.ts

@@ -183,10 +183,6 @@ export declare enum NomadDeploymentStatus {
     NOMAD_READY = "nomad_ready",
     NOMAD_FAILED = "nomad_failed"
 }
-export declare enum BRANCH_TYPE {
-    USER_CREATED = "USER_CREATED",
-    PREVIEW = "PREVIEW"
-}
 export declare enum COLLAB_ANNOTATION_STATUS {
     OPEN = "open",
     RESOLVED = "resolved"

package/dist/enum/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INVOICE_TYPE = exports.INVOICE_PAYMENT_STATUS = exports.INVOICE_STATUS = exports.COLLAB_TOOLBAR_POSITION = exports.COLLAB_THEME = exports.COLLAB_INTEGRATION_TYPE = exports.COLLAB_ANNOTATION_STATUS = exports.BRANCH_TYPE = exports.NomadDeploymentStatus = exports.DomainTransferStatus = exports.DomainTransferDirection = exports.DomainTransferProvider = exports.DomainRenewalStatus = exports.FrameworkApplicationType = exports.SCALING_METRIC = exports.SCALING_STRATEGY = exports.LicenseStatus = exports.JobStatus = exports.DatabaseEngine = exports.ServiceType = exports.REGION_CONTINENT = exports.PERMISSION_TYPE = exports.ROLES = exports.DNS_TYPE = exports.SERVER_STATUS = exports.OAUTH_PERMISSIONS = exports.SUBSCRIPTION_PLAN_TYPE = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.CARD_TYPES = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.ENVIRONMENT = exports.REQUEST_TYPE = exports.BUILD_DISABLED_BY = exports.SERVER_PROTOCOL = exports.GIT_TYPE = void 0;
+exports.INVOICE_TYPE = exports.INVOICE_PAYMENT_STATUS = exports.INVOICE_STATUS = exports.COLLAB_TOOLBAR_POSITION = exports.COLLAB_THEME = exports.COLLAB_INTEGRATION_TYPE = exports.COLLAB_ANNOTATION_STATUS = exports.NomadDeploymentStatus = exports.DomainTransferStatus = exports.DomainTransferDirection = exports.DomainTransferProvider = exports.DomainRenewalStatus = exports.FrameworkApplicationType = exports.SCALING_METRIC = exports.SCALING_STRATEGY = exports.LicenseStatus = exports.JobStatus = exports.DatabaseEngine = exports.ServiceType = exports.REGION_CONTINENT = exports.PERMISSION_TYPE = exports.ROLES = exports.DNS_TYPE = exports.SERVER_STATUS = exports.OAUTH_PERMISSIONS = exports.SUBSCRIPTION_PLAN_TYPE = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.CARD_TYPES = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.ENVIRONMENT = exports.REQUEST_TYPE = exports.BUILD_DISABLED_BY = exports.SERVER_PROTOCOL = exports.GIT_TYPE = void 0;
 var GIT_TYPE;
 (function (GIT_TYPE) {
     GIT_TYPE["GITHUB"] = "GITHUB";
@@ -215,11 +215,6 @@ var NomadDeploymentStatus;
     NomadDeploymentStatus["NOMAD_READY"] = "nomad_ready";
     NomadDeploymentStatus["NOMAD_FAILED"] = "nomad_failed";
 })(NomadDeploymentStatus = exports.NomadDeploymentStatus || (exports.NomadDeploymentStatus = {}));
-var BRANCH_TYPE;
-(function (BRANCH_TYPE) {
-    BRANCH_TYPE["USER_CREATED"] = "USER_CREATED";
-    BRANCH_TYPE["PREVIEW"] = "PREVIEW";
-})(BRANCH_TYPE = exports.BRANCH_TYPE || (exports.BRANCH_TYPE = {}));
 var COLLAB_ANNOTATION_STATUS;
 (function (COLLAB_ANNOTATION_STATUS) {
     COLLAB_ANNOTATION_STATUS["OPEN"] = "open";

package/dist/env.js

@@ -25,14 +25,6 @@ const envSchema = new mongoose_1.Schema({
         default: enum_1.ENVIRONMENT.PRODUCTION,
         required: true,
     },
-    branch: {
-        ref: "Branch",
-        type: mongoose_1.Schema.Types.ObjectId,
-    },
-    inheritable: {
-        type: Boolean,
-        default: true,
-    },
     is_system: {
         type: Boolean,
         default: false,

package/dist/environment-variable.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose" />
+/// <reference types="mongoose/types/inferschematype" />
+import { IEnvironmentVariable } from "./types";
+declare const _default: import("mongoose").Model<IEnvironmentVariable, {}, {}, {}, import("mongoose").Document<unknown, {}, IEnvironmentVariable> & IEnvironmentVariable & {
+    _id: import("mongoose").Types.ObjectId;
+}, any>;
+export default _default;

package/dist/environment-variable.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = require("mongoose");
+const environmentVariableSchema = new mongoose_1.Schema({
+    name: { type: String, required: true },
+    value: { type: String, required: true },
+    project_environment: {
+        ref: "ProjectEnvironment",
+        type: mongoose_1.Schema.Types.ObjectId,
+        required: true,
+    },
+    user: { ref: "User", type: mongoose_1.Schema.Types.ObjectId, required: true },
+    inheritable: { type: Boolean, default: true },
+}, { timestamps: true });
+environmentVariableSchema.index({ name: 1, project_environment: 1 }, { unique: true });
+exports.default = (0, mongoose_1.model)("EnvironmentVariable", environmentVariableSchema);

package/dist/index.d.ts

@@ -36,7 +36,6 @@ export { default as WebhookEvent } from "./webhook-event";
 export { default as WebhookSetting } from "./webhook-setting";
 export { default as Intention } from "./intention";
 export { default as Provider } from "./provider";
-export { default as Branch } from "./branch";
 export { default as CollabAnnotation } from "./collab-annotation";
 export { default as CollabComment } from "./collab-comment";
 export { default as CollabIntegration } from "./collab-integration";
@@ -49,8 +48,10 @@ export { default as Tag } from "./tag";
 export { default as ProjectTagAssignment } from "./project-tag-assignment";
 export { default as CashierSubscription } from "./cashier_subscription";
 export { default as CashierSubscriptionItem } from "./cashier_subscription_item";
-export { IUser, IGit, IProject, IPreview, IProjectConnection, IFollowing, IIntegration, IEnv, IServer, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard, IDns, IRole, IPermission, IMemberPermission, IWallet, IDbImage, IJob, ILicense, IPlanConfiguration, IAutoScalingGroup, IComputeChange, IRegion, IVolume, IFramework, BrimbleFrameworkType, ISettings, ILoadBalancerPort, IDomainRenewal, IDomainTransfer, IWebhookCategory, IWebhookEvent, IWebhookSetting, IIntention, IProvider, IBranch, ICollabAnnotation, ICollabComment, ICollabAttachment, ICollabIntegration, ICollabSettings, ICollabShareToken, ICollabPushSubscription, IAppMessage, IInvoice, ITag, IProjectTagAssignment, ICashierSubscription, ICashierSubscriptionItem, } from "./types";
-export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, SUBSCRIPTION_PLAN_TYPE, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES, DNS_TYPE, PERMISSION_TYPE, REQUEST_TYPE, ServiceType, DatabaseEngine, JobStatus, LicenseStatus, REGION_CONTINENT, BUILD_DISABLED_BY, SERVER_PROTOCOL, FrameworkApplicationType, DomainRenewalStatus, DomainTransferProvider, DomainTransferDirection, DomainTransferStatus, NomadDeploymentStatus, BRANCH_TYPE, COLLAB_ANNOTATION_STATUS, COLLAB_INTEGRATION_TYPE, COLLAB_THEME, COLLAB_TOOLBAR_POSITION, INVOICE_STATUS, INVOICE_PAYMENT_STATUS, INVOICE_TYPE } from "./enum";
+export { default as ProjectEnvironment } from "./project-environment";
+export { default as EnvironmentVariable } from "./environment-variable";
+export { IUser, IGit, IProject, IPreview, IProjectConnection, IFollowing, IIntegration, IEnv, IServer, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard, IDns, IRole, IPermission, IMemberPermission, IWallet, IDbImage, IJob, ILicense, IPlanConfiguration, IAutoScalingGroup, IComputeChange, IRegion, IVolume, IFramework, BrimbleFrameworkType, ISettings, ILoadBalancerPort, IDomainRenewal, IDomainTransfer, IWebhookCategory, IWebhookEvent, IWebhookSetting, IIntention, IProvider, ICollabAnnotation, ICollabComment, ICollabAttachment, ICollabIntegration, ICollabSettings, ICollabShareToken, ICollabPushSubscription, IAppMessage, IInvoice, ITag, IProjectTagAssignment, ICashierSubscription, ICashierSubscriptionItem, IProjectEnvironment, IEnvironmentVariable, } from "./types";
+export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, SUBSCRIPTION_PLAN_TYPE, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES, DNS_TYPE, PERMISSION_TYPE, REQUEST_TYPE, ServiceType, DatabaseEngine, JobStatus, LicenseStatus, REGION_CONTINENT, BUILD_DISABLED_BY, SERVER_PROTOCOL, FrameworkApplicationType, DomainRenewalStatus, DomainTransferProvider, DomainTransferDirection, DomainTransferStatus, NomadDeploymentStatus, COLLAB_ANNOTATION_STATUS, COLLAB_INTEGRATION_TYPE, COLLAB_THEME, COLLAB_TOOLBAR_POSITION, INVOICE_STATUS, INVOICE_PAYMENT_STATUS, INVOICE_TYPE } from "./enum";
 import mongoose from "mongoose";
 export declare const connectToMongo: (mongoUrl: string, config?: mongoose.ConnectOptions) => Promise<void>;
 export declare const db: mongoose.Connection;

package/dist/index.js

@@ -12,8 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectTagAssignment = exports.Tag = exports.Invoice = exports.AppMessage = exports.CollabPushSubscription = exports.CollabShareToken = exports.CollabSettings = exports.CollabIntegration = exports.CollabComment = exports.CollabAnnotation = exports.Branch = exports.Provider = exports.Intention = exports.WebhookSetting = exports.WebhookEvent = exports.WebhookCategory = exports.DomainTransfer = exports.DomainRenewal = exports.LoadBalancerPort = exports.Settings = exports.Framework = exports.Volume = exports.Region = exports.ComputeChange = exports.AutoScalingGroup = exports.PlanConfiguration = exports.Liscense = exports.Job = exports.DbImage = exports.Wallet = exports.Server = exports.Card = exports.Subscription = exports.Log = exports.Role = exports.MemberPermission = exports.Permission = exports.Member = exports.Team = exports.Token = exports.Env = exports.Dns = exports.Domain = exports.Integration = exports.Following = exports.ProjectConnection = exports.Preview = exports.DeletedProject = exports.Project = exports.User = void 0;
-exports.healthCheckMongo = exports.closeMongo = exports.db = exports.connectToMongo = exports.INVOICE_TYPE = exports.INVOICE_PAYMENT_STATUS = exports.INVOICE_STATUS = exports.COLLAB_TOOLBAR_POSITION = exports.COLLAB_THEME = exports.COLLAB_INTEGRATION_TYPE = exports.COLLAB_ANNOTATION_STATUS = exports.BRANCH_TYPE = exports.NomadDeploymentStatus = exports.DomainTransferStatus = exports.DomainTransferDirection = exports.DomainTransferProvider = exports.DomainRenewalStatus = exports.FrameworkApplicationType = exports.SERVER_PROTOCOL = exports.BUILD_DISABLED_BY = exports.REGION_CONTINENT = exports.LicenseStatus = exports.JobStatus = exports.DatabaseEngine = exports.ServiceType = exports.REQUEST_TYPE = exports.PERMISSION_TYPE = exports.DNS_TYPE = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.SUBSCRIPTION_PLAN_TYPE = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.CashierSubscriptionItem = exports.CashierSubscription = void 0;
+exports.CashierSubscription = exports.ProjectTagAssignment = exports.Tag = exports.Invoice = exports.AppMessage = exports.CollabPushSubscription = exports.CollabShareToken = exports.CollabSettings = exports.CollabIntegration = exports.CollabComment = exports.CollabAnnotation = exports.Provider = exports.Intention = exports.WebhookSetting = exports.WebhookEvent = exports.WebhookCategory = exports.DomainTransfer = exports.DomainRenewal = exports.LoadBalancerPort = exports.Settings = exports.Framework = exports.Volume = exports.Region = exports.ComputeChange = exports.AutoScalingGroup = exports.PlanConfiguration = exports.Liscense = exports.Job = exports.DbImage = exports.Wallet = exports.Server = exports.Card = exports.Subscription = exports.Log = exports.Role = exports.MemberPermission = exports.Permission = exports.Member = exports.Team = exports.Token = exports.Env = exports.Dns = exports.Domain = exports.Integration = exports.Following = exports.ProjectConnection = exports.Preview = exports.DeletedProject = exports.Project = exports.User = void 0;
+exports.healthCheckMongo = exports.closeMongo = exports.db = exports.connectToMongo = exports.INVOICE_TYPE = exports.INVOICE_PAYMENT_STATUS = exports.INVOICE_STATUS = exports.COLLAB_TOOLBAR_POSITION = exports.COLLAB_THEME = exports.COLLAB_INTEGRATION_TYPE = exports.COLLAB_ANNOTATION_STATUS = exports.NomadDeploymentStatus = exports.DomainTransferStatus = exports.DomainTransferDirection = exports.DomainTransferProvider = exports.DomainRenewalStatus = exports.FrameworkApplicationType = exports.SERVER_PROTOCOL = exports.BUILD_DISABLED_BY = exports.REGION_CONTINENT = exports.LicenseStatus = exports.JobStatus = exports.DatabaseEngine = exports.ServiceType = exports.REQUEST_TYPE = exports.PERMISSION_TYPE = exports.DNS_TYPE = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.SUBSCRIPTION_PLAN_TYPE = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.EnvironmentVariable = exports.ProjectEnvironment = exports.CashierSubscriptionItem = void 0;
 var user_1 = require("./user");
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return __importDefault(user_1).default; } });
 var project_1 = require("./project");
@@ -91,8 +91,6 @@ var intention_1 = require("./intention");
 Object.defineProperty(exports, "Intention", { enumerable: true, get: function () { return __importDefault(intention_1).default; } });
 var provider_1 = require("./provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return __importDefault(provider_1).default; } });
-var branch_1 = require("./branch");
-Object.defineProperty(exports, "Branch", { enumerable: true, get: function () { return __importDefault(branch_1).default; } });
 var collab_annotation_1 = require("./collab-annotation");
 Object.defineProperty(exports, "CollabAnnotation", { enumerable: true, get: function () { return __importDefault(collab_annotation_1).default; } });
 var collab_comment_1 = require("./collab-comment");
@@ -117,6 +115,10 @@ var cashier_subscription_1 = require("./cashier_subscription");
 Object.defineProperty(exports, "CashierSubscription", { enumerable: true, get: function () { return __importDefault(cashier_subscription_1).default; } });
 var cashier_subscription_item_1 = require("./cashier_subscription_item");
 Object.defineProperty(exports, "CashierSubscriptionItem", { enumerable: true, get: function () { return __importDefault(cashier_subscription_item_1).default; } });
+var project_environment_1 = require("./project-environment");
+Object.defineProperty(exports, "ProjectEnvironment", { enumerable: true, get: function () { return __importDefault(project_environment_1).default; } });
+var environment_variable_1 = require("./environment-variable");
+Object.defineProperty(exports, "EnvironmentVariable", { enumerable: true, get: function () { return __importDefault(environment_variable_1).default; } });
 var enum_1 = require("./enum");
 Object.defineProperty(exports, "GIT_TYPE", { enumerable: true, get: function () { return enum_1.GIT_TYPE; } });
 Object.defineProperty(exports, "INTEGRATION_TYPES", { enumerable: true, get: function () { return enum_1.INTEGRATION_TYPES; } });
@@ -145,7 +147,6 @@ Object.defineProperty(exports, "DomainTransferProvider", { enumerable: true, get
 Object.defineProperty(exports, "DomainTransferDirection", { enumerable: true, get: function () { return enum_1.DomainTransferDirection; } });
 Object.defineProperty(exports, "DomainTransferStatus", { enumerable: true, get: function () { return enum_1.DomainTransferStatus; } });
 Object.defineProperty(exports, "NomadDeploymentStatus", { enumerable: true, get: function () { return enum_1.NomadDeploymentStatus; } });
-Object.defineProperty(exports, "BRANCH_TYPE", { enumerable: true, get: function () { return enum_1.BRANCH_TYPE; } });
 Object.defineProperty(exports, "COLLAB_ANNOTATION_STATUS", { enumerable: true, get: function () { return enum_1.COLLAB_ANNOTATION_STATUS; } });
 Object.defineProperty(exports, "COLLAB_INTEGRATION_TYPE", { enumerable: true, get: function () { return enum_1.COLLAB_INTEGRATION_TYPE; } });
 Object.defineProperty(exports, "COLLAB_THEME", { enumerable: true, get: function () { return enum_1.COLLAB_THEME; } });

package/dist/project/index.js

@@ -131,12 +131,15 @@ const projectSchema = new mongoose_1.Schema({
             type: mongoose_1.Schema.Types.ObjectId,
         },
     ],
-    branches: [
-        {
-            ref: "Branch",
-            type: mongoose_1.Schema.Types.ObjectId,
-        },
-    ],
+    project_environment: {
+        ref: "ProjectEnvironment",
+        type: mongoose_1.Schema.Types.ObjectId,
+        index: true,
+    },
+    inherit_environment_vars: {
+        type: Boolean,
+        default: true,
+    },
     replicas: {
         type: Number,
         default: 3,

package/dist/{branch.d.ts → project-environment.d.ts}

@@ -23,8 +23,8 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
-import { IBranch } from "./types";
-declare const _default: import("mongoose").Model<IBranch, {}, {}, {}, import("mongoose").Document<unknown, {}, IBranch> & IBranch & {
+import { IProjectEnvironment } from "./types";
+declare const _default: import("mongoose").Model<IProjectEnvironment, {}, {}, {}, import("mongoose").Document<unknown, {}, IProjectEnvironment> & IProjectEnvironment & {
     _id: import("mongoose").Types.ObjectId;
 }, any>;
 export default _default;

package/dist/project-environment.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = require("mongoose");
+const projectEnvironmentSchema = new mongoose_1.Schema({
+    name: { type: String, required: true },
+    slug: { type: String, required: true },
+    owner: { ref: "User", type: mongoose_1.Schema.Types.ObjectId, required: true },
+    team: { ref: "Team", type: mongoose_1.Schema.Types.ObjectId },
+    inherit_from: { ref: "ProjectEnvironment", type: mongoose_1.Schema.Types.ObjectId },
+    isDefault: { type: Boolean, default: false },
+}, { timestamps: true });
+projectEnvironmentSchema.index({ slug: 1, owner: 1, team: 1 }, { unique: true });
+exports.default = (0, mongoose_1.model)("ProjectEnvironment", projectEnvironmentSchema);

package/dist/types/env.d.ts

@@ -1,6 +1,5 @@
 import { Document } from "mongoose";
 import { ENVIRONMENT } from "../enum";
-import { IBranch } from "./branch";
 import { IProject, IUser } from "./";
 export interface IEnv extends Document {
     name: string;
@@ -8,8 +7,6 @@ export interface IEnv extends Document {
     project: IProject;
     user: IUser;
     environment: ENVIRONMENT | string;
-    branch?: IBranch;
-    inheritable?: boolean;
     is_system?: boolean;
     createdAt: Date;
     updatedAt: Date;

package/dist/types/environment-variable.d.ts

@@ -0,0 +1,12 @@
+import { Document } from "mongoose";
+import { IProjectEnvironment } from "./project-environment";
+import { IUser } from "./user";
+export interface IEnvironmentVariable extends Document {
+    name: string;
+    value: string;
+    project_environment: IProjectEnvironment;
+    user: IUser;
+    inheritable: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
 export type { IAutoScalingGroup } from "./auto-scaling-group";
-export type { IBranch } from "./branch";
 export type { ICard } from "./card";
 export type { IComputeChange } from "./compute";
 export type { IDbImage } from "./db-image";
@@ -50,3 +49,5 @@ export type { IInvoice } from "./invoice";
 export type { IProjectTagAssignment } from "./project-tag-assignment";
 export type { ITag } from "./tag";
 export type { ICashierSubscription, ICashierSubscriptionItem } from "./cashier_subscription";
+export type { IProjectEnvironment } from "./project-environment";
+export type { IEnvironmentVariable } from "./environment-variable";

package/dist/types/project/index.d.ts

@@ -6,10 +6,10 @@ import { ILog } from "../logs";
 import { ITeam } from "../team";
 import { IUser } from "../user";
 import { IServer } from "../server";
-import { IBranch } from "../branch";
 import { IPreview } from "./preview";
 import { IDbImage } from "../db-image";
 import { IAutoScalingGroup } from "../auto-scaling-group";
+import { IProjectEnvironment } from "../project-environment";
 import { IRegion } from "../region";
 export interface IProject extends Document {
     name: string;
@@ -67,7 +67,8 @@ export interface IProject extends Document {
     tracking_token: string;
     from: string;
     previews: IPreview[];
-    branches: IBranch[];
+    project_environment?: IProjectEnvironment;
+    inherit_environment_vars: boolean;
     replicas: number;
     vaultPath: string | null;
     vaultToken: string | null;

package/dist/types/project-environment.d.ts

@@ -0,0 +1,13 @@
+import { Document } from "mongoose";
+import { ITeam } from "./team";
+import { IUser } from "./user";
+export interface IProjectEnvironment extends Document {
+    name: string;
+    slug: string;
+    owner: IUser;
+    team?: ITeam;
+    inherit_from?: IProjectEnvironment;
+    isDefault: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}

package/dist/types/project-environment.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/enum/index.ts

@@ -212,11 +212,6 @@ export enum NomadDeploymentStatus {
   NOMAD_FAILED = 'nomad_failed',
 }
 
-export enum BRANCH_TYPE {
-  USER_CREATED = "USER_CREATED",
-  PREVIEW = "PREVIEW",
-}
-
 export enum COLLAB_ANNOTATION_STATUS {
   OPEN = "open",
   RESOLVED = "resolved",

package/env.ts

@@ -26,14 +26,6 @@ const envSchema = new Schema(
       default: ENVIRONMENT.PRODUCTION,
       required: true,
     },
-    branch: {
-      ref: "Branch",
-      type: Schema.Types.ObjectId,
-    },
-    inheritable: {
-      type: Boolean,
-      default: true,
-    },
     is_system: {
       type: Boolean,
       default: false,

package/environment-variable.ts

@@ -0,0 +1,21 @@
+import { model, Schema } from "mongoose";
+import { IEnvironmentVariable } from "./types";
+
+const environmentVariableSchema = new Schema(
+  {
+    name: { type: String, required: true },
+    value: { type: String, required: true },
+    project_environment: {
+      ref: "ProjectEnvironment",
+      type: Schema.Types.ObjectId,
+      required: true,
+    },
+    user: { ref: "User", type: Schema.Types.ObjectId, required: true },
+    inheritable: { type: Boolean, default: true },
+  },
+  { timestamps: true },
+);
+
+environmentVariableSchema.index({ name: 1, project_environment: 1 }, { unique: true });
+
+export default model<IEnvironmentVariable>("EnvironmentVariable", environmentVariableSchema);

package/index.ts

@@ -36,7 +36,6 @@ export { default as WebhookEvent } from "./webhook-event";
 export { default as WebhookSetting } from "./webhook-setting";
 export { default as Intention } from "./intention";
 export { default as Provider } from "./provider";
-export { default as Branch } from "./branch";
 export { default as CollabAnnotation } from "./collab-annotation";
 export { default as CollabComment } from "./collab-comment";
 export { default as CollabIntegration } from "./collab-integration";
@@ -49,6 +48,8 @@ export { default as Tag } from "./tag";
 export { default as ProjectTagAssignment } from "./project-tag-assignment";
 export { default as CashierSubscription } from "./cashier_subscription";
 export { default as CashierSubscriptionItem } from "./cashier_subscription_item";
+export { default as ProjectEnvironment } from "./project-environment";
+export { default as EnvironmentVariable } from "./environment-variable";
 
 export {
   IUser,
@@ -92,7 +93,6 @@ export {
   IWebhookSetting,
   IIntention,
   IProvider,
-  IBranch,
   ICollabAnnotation,
   ICollabComment,
   ICollabAttachment,
@@ -106,6 +106,8 @@ export {
   IProjectTagAssignment,
   ICashierSubscription,
   ICashierSubscriptionItem,
+  IProjectEnvironment,
+  IEnvironmentVariable,
 } from "./types";
 export {
   GIT_TYPE,
@@ -135,7 +137,6 @@ export {
   DomainTransferDirection,
   DomainTransferStatus,
   NomadDeploymentStatus,
-  BRANCH_TYPE,
   COLLAB_ANNOTATION_STATUS,
   COLLAB_INTEGRATION_TYPE,
   COLLAB_THEME,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "3.8.65",
+  "version": "3.8.66",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/project/index.ts

@@ -131,12 +131,15 @@ const projectSchema = new Schema(
         type: Schema.Types.ObjectId,
       },
     ],
-    branches: [
-      {
-        ref: "Branch",
-        type: Schema.Types.ObjectId,
-      },
-    ],
+    project_environment: {
+      ref: "ProjectEnvironment",
+      type: Schema.Types.ObjectId,
+      index: true,
+    },
+    inherit_environment_vars: {
+      type: Boolean,
+      default: true,
+    },
     replicas: {
       type: Number,
       default: 3,

package/project-environment.ts

@@ -0,0 +1,18 @@
+import { model, Schema } from "mongoose";
+import { IProjectEnvironment } from "./types";
+
+const projectEnvironmentSchema = new Schema(
+  {
+    name: { type: String, required: true },
+    slug: { type: String, required: true },
+    owner: { ref: "User", type: Schema.Types.ObjectId, required: true },
+    team: { ref: "Team", type: Schema.Types.ObjectId },
+    inherit_from: { ref: "ProjectEnvironment", type: Schema.Types.ObjectId },
+    isDefault: { type: Boolean, default: false },
+  },
+  { timestamps: true },
+);
+
+projectEnvironmentSchema.index({ slug: 1, owner: 1, team: 1 }, { unique: true });
+
+export default model<IProjectEnvironment>("ProjectEnvironment", projectEnvironmentSchema);

package/types/env.ts

@@ -1,6 +1,5 @@
 import { Document } from "mongoose";
 import { ENVIRONMENT } from "../enum";
-import { IBranch } from "./branch";
 import { IProject, IUser } from "./";
 
 export interface IEnv extends Document {
@@ -9,8 +8,6 @@ export interface IEnv extends Document {
   project: IProject;
   user: IUser;
   environment: ENVIRONMENT | string;
-  branch?: IBranch;
-  inheritable?: boolean;
   is_system?: boolean;
   createdAt: Date;
   updatedAt: Date;

package/types/environment-variable.ts

@@ -0,0 +1,13 @@
+import { Document } from "mongoose";
+import { IProjectEnvironment } from "./project-environment";
+import { IUser } from "./user";
+
+export interface IEnvironmentVariable extends Document {
+  name: string;
+  value: string;
+  project_environment: IProjectEnvironment;
+  user: IUser;
+  inheritable: boolean;
+  createdAt: Date;
+  updatedAt: Date;
+}

package/types/index.ts

@@ -1,5 +1,4 @@
 export type { IAutoScalingGroup } from "./auto-scaling-group";
-export type { IBranch } from "./branch";
 export type { ICard } from "./card";
 export type { IComputeChange } from "./compute";
 export type { IDbImage } from "./db-image";
@@ -50,3 +49,5 @@ export type { IInvoice } from "./invoice";
 export type { IProjectTagAssignment } from "./project-tag-assignment";
 export type { ITag } from "./tag";
 export type { ICashierSubscription, ICashierSubscriptionItem } from "./cashier_subscription";
+export type { IProjectEnvironment } from "./project-environment";
+export type { IEnvironmentVariable } from "./environment-variable";

package/types/project/index.ts

@@ -6,10 +6,10 @@ import { ILog } from "../logs";
 import { ITeam } from "../team";
 import { IUser } from "../user";
 import { IServer } from "../server";
-import { IBranch } from "../branch";
 import { IPreview } from "./preview";
 import { IDbImage } from "../db-image";
 import { IAutoScalingGroup } from "../auto-scaling-group";
+import { IProjectEnvironment } from "../project-environment";
 import { IRegion } from "../region";
 
 export interface IProject extends Document {
@@ -68,7 +68,8 @@ export interface IProject extends Document {
   tracking_token: string;
   from: string;
   previews: IPreview[];
-  branches: IBranch[];
+  project_environment?: IProjectEnvironment;
+  inherit_environment_vars: boolean;
   replicas: number;
   vaultPath: string | null;
   vaultToken: string | null;

package/types/project-environment.ts

@@ -0,0 +1,14 @@
+import { Document } from "mongoose";
+import { ITeam } from "./team";
+import { IUser } from "./user";
+
+export interface IProjectEnvironment extends Document {
+  name: string;
+  slug: string;
+  owner: IUser;
+  team?: ITeam;
+  inherit_from?: IProjectEnvironment;
+  isDefault: boolean;
+  createdAt: Date;
+  updatedAt: Date;
+}

package/branch.ts

@@ -1,22 +0,0 @@
-import { Schema, model } from "mongoose";
-import { IBranch } from "./types";
-import { BRANCH_TYPE } from "./enum";
-
-const branchSchema = new Schema(
-  {
-    name: { type: String, required: true },
-    type: { type: String, enum: Object.values(BRANCH_TYPE), required: true },
-    gitRef: { type: String, required: true },
-    project: { ref: "Project", type: Schema.Types.ObjectId, required: true },
-    inherit_from: { ref: "Branch", type: Schema.Types.ObjectId },
-    ancestors: [{ ref: "Branch", type: Schema.Types.ObjectId }],
-    created_by: { ref: "User", type: Schema.Types.ObjectId, required: true },
-    issue_comment_id: Number,
-    pr_number: Number,
-  },
-  { timestamps: true },
-);
-
-branchSchema.index({ project: 1, name: 1 }, { unique: true });
-
-export default model<IBranch>("Branch", branchSchema);

package/dist/branch.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongoose_1 = require("mongoose");
-const enum_1 = require("./enum");
-const branchSchema = new mongoose_1.Schema({
-    name: { type: String, required: true },
-    type: { type: String, enum: Object.values(enum_1.BRANCH_TYPE), required: true },
-    gitRef: { type: String, required: true },
-    project: { ref: "Project", type: mongoose_1.Schema.Types.ObjectId, required: true },
-    inherit_from: { ref: "Branch", type: mongoose_1.Schema.Types.ObjectId },
-    ancestors: [{ ref: "Branch", type: mongoose_1.Schema.Types.ObjectId }],
-    created_by: { ref: "User", type: mongoose_1.Schema.Types.ObjectId, required: true },
-    issue_comment_id: Number,
-    pr_number: Number,
-}, { timestamps: true });
-branchSchema.index({ project: 1, name: 1 }, { unique: true });
-exports.default = (0, mongoose_1.model)("Branch", branchSchema);

package/dist/types/branch.d.ts

@@ -1,17 +0,0 @@
-import { Document } from "mongoose";
-import { BRANCH_TYPE } from "../enum";
-import { IProject } from "./project";
-import { IUser } from "./user";
-export interface IBranch extends Document {
-    name: string;
-    type: BRANCH_TYPE;
-    gitRef: string;
-    project: IProject;
-    inherit_from?: IBranch;
-    ancestors: IBranch[];
-    created_by: IUser;
-    pr_number?: number;
-    issue_comment_id?: number;
-    createdAt: Date;
-    updatedAt: Date;
-}

package/types/branch.ts

@@ -1,18 +0,0 @@
-import { Document } from "mongoose";
-import { BRANCH_TYPE } from "../enum";
-import { IProject } from "./project";
-import { IUser } from "./user";
-
-export interface IBranch extends Document {
-  name: string;
-  type: BRANCH_TYPE;
-  gitRef: string;
-  project: IProject;
-  inherit_from?: IBranch;
-  ancestors: IBranch[];
-  created_by: IUser;
-  pr_number?: number;
-  issue_comment_id?: number;
-  createdAt: Date;
-  updatedAt: Date;
-}