vyft 0.1.1-alpha → 0.2.0-alpha

package/dist/cli.js

@@ -46,6 +46,27 @@ function isResource(value) {
         typeof value.type === "string" &&
         typeof value.id === "string");
 }
+function collectResources(exports) {
+    const seen = new Set();
+    const resources = [];
+    for (const value of Object.values(exports)) {
+        if (isResource(value)) {
+            if (!seen.has(value.id)) {
+                seen.add(value.id);
+                resources.push(value);
+            }
+        }
+        else if (typeof value === "object" && value !== null) {
+            for (const nested of Object.values(value)) {
+                if (isResource(nested) && !seen.has(nested.id)) {
+                    seen.add(nested.id);
+                    resources.push(nested);
+                }
+            }
+        }
+    }
+    return resources;
+}
 function hasRuntime(value) {
     return (typeof value === "object" &&
         value !== null &&
@@ -72,7 +93,7 @@ async function deploy(configFile, verbose) {
     process.env.VYFT_PROJECT = project;
     intro(`Deploying ${project}`);
     const config = await import(configFile);
-    const resources = Object.values(config).filter(isResource);
+    const resources = collectResources(config);
     if (resources.length === 0) {
         log.warn("No resources found");
         outro();

package/dist/swarm/factories.d.ts

@@ -1,8 +1,9 @@
 import type { Secret, SecretConfig, Service, Site, SiteConfig, Volume } from "../resource.js";
-import type { StorageDriver, SwarmConfig, SwarmServiceConfig, SwarmVolumeConfig } from "./types.js";
+import type { Postgres, PostgresConfig, StorageDriver, SwarmConfig, SwarmServiceConfig, SwarmVolumeConfig } from "./types.js";
 export declare function createFactories<D extends StorageDriver = "local">(swarmConfig: SwarmConfig<D>): {
-    volume(id: string, config?: SwarmVolumeConfig<D>): Volume;
-    service(id: string, config: SwarmServiceConfig): Service;
-    secret(id: string, config?: SecretConfig): Secret;
-    site(id: string, config: SiteConfig): Site;
+    volume: (id: string, config?: SwarmVolumeConfig<D>) => Volume;
+    service: (id: string, config: SwarmServiceConfig) => Service;
+    secret: (id: string, config?: SecretConfig) => Secret;
+    site: (id: string, config: SiteConfig) => Site;
+    postgres: (id: string, config?: PostgresConfig) => Postgres;
 };

package/dist/swarm/factories.js

@@ -1,3 +1,4 @@
+import { interpolate } from "../interpolate.js";
 import { validateId, validateRoute } from "../resource.js";
 import { VYFT_RUNTIME } from "../symbols.js";
 function attachRuntime(obj, config) {
@@ -8,49 +9,78 @@ function attachRuntime(obj, config) {
 export function createFactories(swarmConfig) {
     const project = process.env.VYFT_PROJECT;
     const prefix = project ? `${project}-` : "";
-    return {
-        volume(id, config = {}) {
-            validateId(id);
-            const fullId = `${prefix}${id}`;
-            return attachRuntime({ type: "volume", id: fullId, config }, swarmConfig);
-        },
-        service(id, config) {
-            validateId(id);
-            if (config.route) {
-                validateRoute(config.route);
-            }
-            const fullId = `${prefix}${id}`;
-            const port = config.port || 3000;
-            return attachRuntime({
-                type: "service",
-                id: fullId,
-                config,
-                host: fullId,
-                port,
-                url: config.route
-                    ? `https://${config.route}`
-                    : `http://${fullId}:${port}`,
-            }, swarmConfig);
-        },
-        secret(id, config = {}) {
-            validateId(id);
-            const fullId = `${prefix}${id}`;
-            return attachRuntime({
-                type: "secret",
-                id: fullId,
-                config,
-            }, swarmConfig);
-        },
-        site(id, config) {
-            validateId(id);
+    function volume(id, config = {}) {
+        validateId(id);
+        const fullId = `${prefix}${id}`;
+        return attachRuntime({ type: "volume", id: fullId, config }, swarmConfig);
+    }
+    function service(id, config) {
+        validateId(id);
+        if (config.route) {
             validateRoute(config.route);
-            const fullId = `${prefix}${id}`;
-            return attachRuntime({
-                type: "site",
-                id: fullId,
-                config,
-                url: `https://${config.route}`,
-            }, swarmConfig);
-        },
-    };
+        }
+        const fullId = `${prefix}${id}`;
+        const port = config.port || 3000;
+        return attachRuntime({
+            type: "service",
+            id: fullId,
+            config,
+            host: fullId,
+            port,
+            url: config.route
+                ? `https://${config.route}`
+                : `http://${fullId}:${port}`,
+        }, swarmConfig);
+    }
+    function secret(id, config = {}) {
+        validateId(id);
+        const fullId = `${prefix}${id}`;
+        return attachRuntime({
+            type: "secret",
+            id: fullId,
+            config,
+        }, swarmConfig);
+    }
+    function site(id, config) {
+        validateId(id);
+        validateRoute(config.route);
+        const fullId = `${prefix}${id}`;
+        return attachRuntime({
+            type: "site",
+            id: fullId,
+            config,
+            url: `https://${config.route}`,
+        }, swarmConfig);
+    }
+    function postgres(id, config = {}) {
+        validateId(id);
+        const version = config.version ?? 18;
+        const mount = version >= 18 ? "/var/lib/postgresql" : "/var/lib/postgresql/data";
+        const password = secret(`${id}-password`, { length: 32 });
+        const vol = volume(`${id}-data`);
+        const svc = service(id, {
+            image: `postgres:${version}`,
+            port: 5432,
+            volumes: [{ volume: vol, mount }],
+            env: {
+                POSTGRES_PASSWORD: password,
+            },
+            healthCheck: {
+                command: ["pg_isready", "-U", "postgres"],
+                interval: "5s",
+                timeout: "5s",
+                retries: 5,
+                startPeriod: "10s",
+            },
+        });
+        return {
+            service: svc,
+            volume: vol,
+            password,
+            host: svc.host,
+            port: 5432,
+            connectionUrl: interpolate `postgres://postgres:${password}@${svc.host}:5432/postgres`,
+        };
+    }
+    return { volume, service, secret, site, postgres };
 }

package/dist/swarm/index.d.ts

@@ -1,10 +1,11 @@
 export { createFactories } from "./factories.js";
-export type { DriverVolumeOptions, StorageDriver, SwarmConfig, SwarmServiceConfig, SwarmVolumeConfig, } from "./types.js";
+export type { DriverVolumeOptions, Postgres, PostgresConfig, StorageDriver, SwarmConfig, SwarmServiceConfig, SwarmVolumeConfig, } from "./types.js";
 import type { Secret, SecretConfig, Service, Site, SiteConfig, Volume } from "../resource.js";
-import type { StorageDriver, SwarmConfig, SwarmServiceConfig, SwarmVolumeConfig } from "./types.js";
+import type { Postgres, PostgresConfig, StorageDriver, SwarmConfig, SwarmServiceConfig, SwarmVolumeConfig } from "./types.js";
 export declare function swarm<D extends StorageDriver = "local">(config?: SwarmConfig<D>): {
     volume: (id: string, config?: SwarmVolumeConfig<D>) => Volume;
     service: (id: string, config: SwarmServiceConfig) => Service;
     secret: (id: string, config?: SecretConfig) => Secret;
     site: (id: string, config: SiteConfig) => Site;
+    postgres: (id: string, config?: PostgresConfig) => Postgres;
 };

package/dist/swarm/types.d.ts

@@ -1,4 +1,4 @@
-import type { HealthCheckConfig, ResourceLimits, ServiceConfig, VolumeConfig } from "../resource.js";
+import type { HealthCheckConfig, Interpolation, ResourceLimits, Secret, Service, ServiceConfig, Volume, VolumeConfig } from "../resource.js";
 export interface DriverVolumeOptions {
     local: {
         size?: string;
@@ -23,3 +23,14 @@ export interface SwarmServiceConfig extends ServiceConfig {
     resources?: ResourceLimits;
     restartPolicy?: "none" | "on-failure" | "any";
 }
+export interface PostgresConfig {
+    version?: number;
+}
+export interface Postgres {
+    service: Service;
+    volume: Volume;
+    password: Secret;
+    host: string;
+    port: number;
+    connectionUrl: Interpolation;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vyft",
-  "version": "0.1.1-alpha",
+  "version": "0.2.0-alpha",
   "description": "Deploy apps to Docker Swarm with TypeScript",
   "type": "module",
   "license": "MIT",