fjall 0.89.5 → 0.94.0

package/bin/assets/generators/utils/resources/connectionHelpers.js

@@ -0,0 +1 @@
+import{applyServiceConnections as u,applyComputeConnections as s}from"@fjall/generator";import{promptForConnection as m,selectResources as f}from"../prompts.js";async function h(o,n,t,c,i){if(o.compute.length===0)return;if(n.connectionConfig){const{connectToCompute:e=[],connectToServices:r=[]}=n.connectionConfig;r.length>0&&u(o,r,t,c),e.length>0&&s(o,e,t,c);return}if(n.nameProvidedByFlag||!await m(o.compute.length,"compute resource",i.singularPrompt,i.pluralPrompt))return;const p=await f(o.compute,"Select compute resources to connect:",e=>e.type.toUpperCase());p.length>0&&s(o,p,t,c)}export{h as handleResourceConnections};

package/bin/assets/generators/utils/resources/index.d.ts

@@ -0,0 +1,4 @@
+export { generateUniqueResourceName, getDefaultResourceName, getUniqueDefaultResourceName, ensureUniqueResourceName } from "./resourceNaming.js";
+export { type ComputeResource, resourceExists, assertResourceNameUnique, countResourcesOfType, detectComputeResources, databaseExists } from "./resourceDetection.js";
+export { validateOrganisationName, validatePort, validateResourceName, validateAppName, validateInstanceType, validateLambdaMemory, validateLambdaTimeout, validateCapacity, validateDatabaseName, validateMinMaxCapacity } from "./promptValidation.js";
+export { handleResourceConnections } from "./connectionHelpers.js";

package/bin/assets/generators/utils/resources/index.js

@@ -0,0 +1 @@
+import{generateUniqueResourceName as t,getDefaultResourceName as o,getUniqueDefaultResourceName as r,ensureUniqueResourceName as s}from"./resourceNaming.js";import{resourceExists as u,assertResourceNameUnique as m,countResourcesOfType as c,detectComputeResources as n,databaseExists as d}from"./resourceDetection.js";import{validateOrganisationName as p,validatePort as v,validateResourceName as N,validateAppName as R,validateInstanceType as f,validateLambdaMemory as x,validateLambdaTimeout as y,validateCapacity as b,validateDatabaseName as g,validateMinMaxCapacity as q}from"./promptValidation.js";import{handleResourceConnections as U}from"./connectionHelpers.js";export{m as assertResourceNameUnique,c as countResourcesOfType,d as databaseExists,n as detectComputeResources,s as ensureUniqueResourceName,t as generateUniqueResourceName,o as getDefaultResourceName,r as getUniqueDefaultResourceName,U as handleResourceConnections,u as resourceExists,R as validateAppName,b as validateCapacity,g as validateDatabaseName,f as validateInstanceType,x as validateLambdaMemory,y as validateLambdaTimeout,q as validateMinMaxCapacity,p as validateOrganisationName,v as validatePort,N as validateResourceName};

package/bin/assets/generators/utils/resources/promptValidation.d.ts

@@ -0,0 +1,42 @@
+import { type Tree } from "@nx/devkit";
+/**
+ * Validation function for organisation names
+ */
+export declare const validateOrganisationName: (value: string) => true | string;
+/**
+ * Validation function for port numbers in prompts
+ */
+export declare const validatePort: (value: string | number) => true | string;
+/**
+ * Validation function for resource names in prompts
+ * Checks both format and uniqueness
+ */
+export declare const validateResourceName: (value: string, tree: Tree, appName: string) => true | string;
+/**
+ * Validation function for application names in prompts
+ */
+export declare const validateAppName: (value: string) => true | string;
+/**
+ * Validation function for EC2 instance types in prompts
+ */
+export declare const validateInstanceType: (value: string) => true | string;
+/**
+ * Validation function for Lambda memory in prompts
+ */
+export declare const validateLambdaMemory: (value: string | number) => true | string;
+/**
+ * Validation function for Lambda timeout in prompts
+ */
+export declare const validateLambdaTimeout: (value: string | number) => true | string;
+/**
+ * Validation function for ECS capacity settings
+ */
+export declare const validateCapacity: (value: string | number, min?: number, max?: number) => true | string;
+/**
+ * Validation function for database names
+ */
+export declare const validateDatabaseName: (value: string) => true | string;
+/**
+ * Validation function for ensuring min capacity is less than max capacity
+ */
+export declare const validateMinMaxCapacity: (minCapacity: number, maxCapacity: number) => true | string;

package/bin/assets/generators/utils/resources/promptValidation.js

@@ -0,0 +1 @@
+import{PortSchema as u,ResourceNameSchema as m,InstanceTypeSchema as p,AppNameSchema as f,OrganisationNameSchema as M,DatabaseNameSchema as d,getZodErrorMessage as a,MIN_LAMBDA_MEMORY as n,MAX_LAMBDA_MEMORY as o,MIN_LAMBDA_TIMEOUT as c,MAX_LAMBDA_TIMEOUT as i}from"@fjall/generator";import{resourceExists as y}from"./resourceDetection.js";const x=t=>{const e=M.safeParse(t);return e.success?!0:a(e.error)},l=t=>{const e=typeof t=="string"?parseInt(t,10):t,r=u.safeParse(e);return r.success?!0:a(r.error)},A=(t,e,r)=>{const s=m.safeParse(t);return s.success?y(e,r,t)?`Resource "${t}" already exists in this application`:!0:a(s.error)},T=t=>{const e=f.safeParse(t);return e.success?!0:a(e.error)},$=t=>{const e=p.safeParse(t);return e.success?!0:a(e.error)},h=t=>{const e=typeof t=="string"?parseInt(t,10):t;if(isNaN(e))return"Memory must be a number";if(e<n)return`Memory must be at least ${n} MB`;if(e>o)return`Memory cannot exceed ${o} MB`;if(e>128&&e%64!==0){const r=Math.floor(e/64)*64,s=Math.ceil(e/64)*64;return`Memory must be in 64 MB increments. Try ${r} or ${s}`}return!0},I=t=>{const e=typeof t=="string"?parseInt(t,10):t;return isNaN(e)?"Timeout must be a number":e<c?`Timeout must be at least ${c} seconds`:e>i?`Timeout cannot exceed ${i} seconds (15 minutes)`:!0},g=(t,e=1,r=1e3)=>{const s=typeof t=="string"?parseInt(t,10):t;return isNaN(s)?"Capacity must be a number":s<e?`Capacity must be at least ${e}`:s>r?`Capacity cannot exceed ${r}`:!0},P=t=>{const e=t?.trim()??"",r=d.safeParse(e);return r.success?!0:a(r.error)},_=(t,e)=>t>e?`Minimum capacity (${t}) cannot be greater than maximum capacity (${e})`:!0;export{T as validateAppName,g as validateCapacity,P as validateDatabaseName,$ as validateInstanceType,h as validateLambdaMemory,I as validateLambdaTimeout,_ as validateMinMaxCapacity,x as validateOrganisationName,l as validatePort,A as validateResourceName};

package/bin/assets/generators/utils/resources/resourceDetection.d.ts

@@ -0,0 +1,12 @@
+import { type Tree } from "@nx/devkit";
+export interface ComputeResource {
+    name: string;
+    type: "ecs" | "lambda" | "ec2";
+    hasConnections: boolean;
+    connectedResources: string[];
+}
+export declare function resourceExists(tree: Tree, appName: string, resourceName: string): boolean;
+export declare function assertResourceNameUnique(tree: Tree, appName: string, resourceName: string): void;
+export declare function countResourcesOfType(tree: Tree, appName: string, resourceType: "database" | "compute" | "lambda" | "ecs" | "ec2"): number;
+export declare function detectComputeResources(tree: Tree, appName: string): ComputeResource[];
+export declare function databaseExists(tree: Tree, appName: string, databaseName: string): boolean;

package/bin/assets/generators/utils/resources/resourceDetection.js

@@ -0,0 +1 @@
+import{getInfrastructurePath as o}from"../../../src/util/pathHelpers.js";function l(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function m(t,e,r){const s=o(e),n=t.read(s)?.toString();return n?new RegExp(`["']${l(r)}["']`).test(n):!1}function y(t,e,r){const s=o(e);if(!t.read(s)?.toString())throw new Error(`Infrastructure file not found for ${e}`);if(m(t,e,r))throw new Error(`Resource name '${r}' already exists in ${e}. Please choose a different name or remove the existing resource first.`)}function P(t,e,r){const s=o(e),n=t.read(s)?.toString();if(!n)return 0;const c={database:/DatabaseFactory\.build\(/g,compute:/ComputeFactory\.build\(/g,lambda:/type:\s*["']lambda["']/g,ecs:/type:\s*["']ecs["']/g,ec2:/type:\s*["']ec2["']/g}[r];if(!c)return 0;const u=n.match(c);return u?u.length:0}function R(t,e){const r=o(e),s=t.read(r)?.toString();if(!s)return[];const n=[],a=s.matchAll(/ComputeFactory\.build\(["']([^"']+)["'],\s*\{([^}]*?)\}/gs);for(const c of a){const u=c[1],i=c[2];let f="ecs";i.includes('type: "lambda"')?f="lambda":i.includes('type: "ec2"')&&(f="ec2");const d=i.includes("connections:"),h=[];if(d){const p=i.match(/connections:\s*\[([^\]]+)\]/);if(p){const g=p[1].match(/\w+/g)??[];h.push(...g)}}n.push({name:u,type:f,hasConnections:d,connectedResources:h})}return n}function w(t,e,r){const s=o(e),n=t.read(s)?.toString();return n?new RegExp(`databaseName:\\s*["']${l(r)}["']`).test(n):!1}export{y as assertResourceNameUnique,P as countResourcesOfType,w as databaseExists,R as detectComputeResources,m as resourceExists};

package/bin/assets/generators/utils/resources/resourceNaming.d.ts

@@ -0,0 +1,6 @@
+import { type Tree } from "@nx/devkit";
+import { DEFAULTS } from "@fjall/generator";
+export declare function generateUniqueResourceName(tree: Tree, appName: string, baseResourceName: string, resourceType: "database" | "compute" | "lambda" | "ecs" | "ec2"): string;
+export declare function getDefaultResourceName(appName: string, resourceType: keyof typeof DEFAULTS.RESOURCE_SUFFIXES): string;
+export declare function getUniqueDefaultResourceName(tree: Tree, appName: string, resourceType: keyof typeof DEFAULTS.RESOURCE_SUFFIXES): string;
+export declare function ensureUniqueResourceName(tree: Tree, appName: string, proposedName: string): string;

package/bin/assets/generators/utils/resources/resourceNaming.js

@@ -0,0 +1 @@
+import{assertResourceNameUnique as $,countResourcesOfType as a,resourceExists as s}from"./resourceDetection.js";import{DEFAULTS as E}from"@fjall/generator";const i=1e3;function x(r,n,t,e){if(a(r,n,e)===0)return t;for(let u=2;u<=i;u++){const o=`${t}${u}`;try{return $(r,n,o),o}catch{}}return`${t}${i}`}function m(r,n){const t=E.RESOURCE_SUFFIXES[n];return`${r}${t}`}function T(r,n,t){const e=m(n,t);if(!s(r,n,e))return e;for(let c=2;c<=i;c++){const u=`${e}${c}`;if(!s(r,n,u))return u}return`${e}${i}`}function l(r,n,t){if(!s(r,n,t))return t;const e=t.match(/^(.+?)(\d*)$/);if(!e)return t;const c=e[1],u=e[2]?parseInt(e[2],10)+1:2;for(let o=u;o<=u+i;o++){const f=`${c}${o}`;if(!s(r,n,f))return f}return`${c}${u+i}`}export{l as ensureUniqueResourceName,x as generateUniqueResourceName,m as getDefaultResourceName,T as getUniqueDefaultResourceName};

package/bin/assets/generators/utils/tree.d.ts

@@ -0,0 +1,25 @@
+import { type Tree, type FileChange } from "@nx/devkit";
+import type { Mode } from "fs";
+/**
+ * File system tree implementation that implements the full Nx Tree interface
+ *
+ * Provides direct filesystem operations for use in integration tests and deploy tests.
+ * Supports optional path rewriting for test isolation (e.g., redirecting fjall/ to fjall-deploy-tests/).
+ */
+export declare class FileSystemTree implements Tree {
+    readonly root: string;
+    private pathRewriter?;
+    private changes;
+    constructor(rootPath: string, pathRewriter?: (filePath: string) => string);
+    private resolvePath;
+    read(filePath: string): Buffer | null;
+    read(filePath: string, encoding: BufferEncoding): string | null;
+    write(filePath: string, content: string | Buffer): void;
+    exists(filePath: string): boolean;
+    delete(filePath: string): void;
+    rename(from: string, to: string): void;
+    isFile(filePath: string): boolean;
+    children(dirPath: string): string[];
+    listChanges(): FileChange[];
+    changePermissions(filePath: string, mode: Mode): void;
+}

package/bin/assets/generators/utils/tree.js

@@ -0,0 +1 @@
+import{existsSync as s,readFileSync as h,writeFileSync as c,mkdirSync as o,rmSync as l,renameSync as u,statSync as f,readdirSync as m,chmodSync as P}from"fs";import{join as v,dirname as a}from"path";class S{root;pathRewriter;changes=new Map;constructor(t,e){this.root=t,this.pathRewriter=e}resolvePath(t){const e=this.pathRewriter?this.pathRewriter(t):t;return v(this.root,e)}read(t,e){const r=this.resolvePath(t);return s(r)?e?h(r,e):h(r):null}write(t,e){const r=this.resolvePath(t),i=a(r);s(i)||o(i,{recursive:!0});const n=s(r);c(r,e),this.changes.set(t,{path:t,type:n?"UPDATE":"CREATE",content:Buffer.isBuffer(e)?e:Buffer.from(e)})}exists(t){return s(this.resolvePath(t))}delete(t){const e=this.resolvePath(t);s(e)&&(l(e,{recursive:!0,force:!0}),this.changes.set(t,{path:t,type:"DELETE",content:null}))}rename(t,e){const r=this.resolvePath(t),i=this.resolvePath(e);if(!s(r))return;const n=a(i);s(n)||o(n,{recursive:!0}),u(r,i)}isFile(t){const e=this.resolvePath(t);return s(e)?f(e).isFile():!1}children(t){const e=this.resolvePath(t);if(!s(e))return[];try{return m(e)}catch{return[]}}listChanges(){return Array.from(this.changes.values())}changePermissions(t,e){const r=this.resolvePath(t);s(r)&&P(r,e)}}export{S as FileSystemTree};

package/bin/assets/proto/buildkit.proto

@@ -0,0 +1,126 @@
+// Simplified BuildKit StatusResponse schema
+// Source: https://github.com/moby/buildkit/blob/master/api/services/control/control.proto
+// Only includes types needed for decoding build progress
+
+syntax = "proto3";
+
+package moby.buildkit.v1;
+
+import "google/protobuf/timestamp.proto";
+
+// StatusResponse is the response from the Status RPC
+// This is what Docker sends in the aux field of build events
+message StatusResponse {
+  repeated Vertex vertexes = 1;
+  repeated VertexStatus statuses = 2;
+  repeated VertexLog logs = 3;
+  repeated VertexWarning warnings = 4;
+}
+
+// Vertex represents a node in the build graph
+message Vertex {
+  string digest = 1;
+  repeated string inputs = 2;
+  string name = 3;
+  bool cached = 4;
+  google.protobuf.Timestamp started = 5;
+  google.protobuf.Timestamp completed = 6;
+  string error = 7;
+  ProgressGroup progressGroup = 8;
+}
+
+// VertexStatus represents progress of a vertex
+message VertexStatus {
+  string ID = 1;
+  string vertex = 2;
+  string name = 3;
+  int64 current = 4;
+  int64 total = 5;
+  google.protobuf.Timestamp timestamp = 6;
+  google.protobuf.Timestamp started = 7;
+  google.protobuf.Timestamp completed = 8;
+}
+
+// VertexLog is a log message from a vertex
+message VertexLog {
+  string vertex = 1;
+  google.protobuf.Timestamp timestamp = 2;
+  int64 stream = 3;  // 1 = stdout, 2 = stderr
+  bytes msg = 4;
+}
+
+// VertexWarning is a warning from a vertex
+message VertexWarning {
+  string vertex = 1;
+  int64 level = 2;
+  bytes short = 3;
+  repeated bytes detail = 4;
+  string url = 5;
+  SourceInfo info = 6;
+  repeated Range ranges = 7;
+}
+
+// ProgressGroup for grouping related vertices
+message ProgressGroup {
+  string id = 1;
+  string name = 2;
+  bool weak = 3;
+}
+
+// SourceInfo provides source location for warnings
+message SourceInfo {
+  string filename = 1;
+  bytes data = 2;
+  Definition definition = 3;
+  string language = 4;
+}
+
+// Range specifies a range in source
+message Range {
+  Position start = 1;
+  Position end = 2;
+}
+
+// Position in source
+message Position {
+  int32 line = 1;
+  int32 character = 2;
+}
+
+// Definition for source info
+message Definition {
+  repeated bytes def = 1;
+  map<string, OpMetadata> metadata = 2;
+  Source Source = 3;
+}
+
+// OpMetadata for operation metadata
+message OpMetadata {
+  bool ignore_cache = 1;
+  map<string, string> description = 2;
+  WorkerConstraint export_cache = 4;
+  map<string, bytes> caps = 5;
+  ProgressGroup progress_group = 6;
+}
+
+// WorkerConstraint for cache export
+message WorkerConstraint {
+  repeated string filter = 1;
+}
+
+// Source information
+message Source {
+  map<string, Locations> locations = 1;
+  repeated SourceInfo infos = 2;
+}
+
+// Locations in source
+message Locations {
+  repeated Location locations = 1;
+}
+
+// Location in source
+message Location {
+  int32 sourceIndex = 1;
+  repeated Range ranges = 2;
+}

package/bin/assets/proto/proto/buildkit.proto

@@ -0,0 +1,126 @@
+// Simplified BuildKit StatusResponse schema
+// Source: https://github.com/moby/buildkit/blob/master/api/services/control/control.proto
+// Only includes types needed for decoding build progress
+
+syntax = "proto3";
+
+package moby.buildkit.v1;
+
+import "google/protobuf/timestamp.proto";
+
+// StatusResponse is the response from the Status RPC
+// This is what Docker sends in the aux field of build events
+message StatusResponse {
+  repeated Vertex vertexes = 1;
+  repeated VertexStatus statuses = 2;
+  repeated VertexLog logs = 3;
+  repeated VertexWarning warnings = 4;
+}
+
+// Vertex represents a node in the build graph
+message Vertex {
+  string digest = 1;
+  repeated string inputs = 2;
+  string name = 3;
+  bool cached = 4;
+  google.protobuf.Timestamp started = 5;
+  google.protobuf.Timestamp completed = 6;
+  string error = 7;
+  ProgressGroup progressGroup = 8;
+}
+
+// VertexStatus represents progress of a vertex
+message VertexStatus {
+  string ID = 1;
+  string vertex = 2;
+  string name = 3;
+  int64 current = 4;
+  int64 total = 5;
+  google.protobuf.Timestamp timestamp = 6;
+  google.protobuf.Timestamp started = 7;
+  google.protobuf.Timestamp completed = 8;
+}
+
+// VertexLog is a log message from a vertex
+message VertexLog {
+  string vertex = 1;
+  google.protobuf.Timestamp timestamp = 2;
+  int64 stream = 3;  // 1 = stdout, 2 = stderr
+  bytes msg = 4;
+}
+
+// VertexWarning is a warning from a vertex
+message VertexWarning {
+  string vertex = 1;
+  int64 level = 2;
+  bytes short = 3;
+  repeated bytes detail = 4;
+  string url = 5;
+  SourceInfo info = 6;
+  repeated Range ranges = 7;
+}
+
+// ProgressGroup for grouping related vertices
+message ProgressGroup {
+  string id = 1;
+  string name = 2;
+  bool weak = 3;
+}
+
+// SourceInfo provides source location for warnings
+message SourceInfo {
+  string filename = 1;
+  bytes data = 2;
+  Definition definition = 3;
+  string language = 4;
+}
+
+// Range specifies a range in source
+message Range {
+  Position start = 1;
+  Position end = 2;
+}
+
+// Position in source
+message Position {
+  int32 line = 1;
+  int32 character = 2;
+}
+
+// Definition for source info
+message Definition {
+  repeated bytes def = 1;
+  map<string, OpMetadata> metadata = 2;
+  Source Source = 3;
+}
+
+// OpMetadata for operation metadata
+message OpMetadata {
+  bool ignore_cache = 1;
+  map<string, string> description = 2;
+  WorkerConstraint export_cache = 4;
+  map<string, bytes> caps = 5;
+  ProgressGroup progress_group = 6;
+}
+
+// WorkerConstraint for cache export
+message WorkerConstraint {
+  repeated string filter = 1;
+}
+
+// Source information
+message Source {
+  map<string, Locations> locations = 1;
+  repeated SourceInfo infos = 2;
+}
+
+// Locations in source
+message Locations {
+  repeated Location locations = 1;
+}
+
+// Location in source
+message Location {
+  int32 sourceIndex = 1;
+  repeated Range ranges = 2;
+}