@payloadcms/figma 0.0.1-alpha.55 → 0.0.1-alpha.57

package/dist/utils/lambda-config.js

@@ -1,6 +1,6 @@
-import { parseModule, Syntax } from 'esprima-next';
 import fs from 'fs/promises';
 import path from 'path';
+import { IndentationText, Node, Project, SyntaxKind } from 'ts-morph';
 const RUN_SH_CONTENT = `#!/bin/bash -x
 
 [ ! -d '/tmp/cache' ] && mkdir -p /tmp/cache
@@ -36,11 +36,11 @@ NODE_ENV=production exec node server.js
     await addLambdaBuildScript(projectPath, packageManager);
 }
 /**
- * Find the Next.js config file (next.config.js or next.config.mjs)
- *
- * @todo Support TypeScript config files in future
+ * Find the Next.js config file, checking TS extensions first
  */ async function findNextConfigPath(projectPath) {
     const configFiles = [
+        'next.config.ts',
+        'next.config.mts',
         'next.config.js',
         'next.config.mjs'
     ];
@@ -53,83 +53,85 @@ NODE_ENV=production exec node server.js
         // File doesn't exist, try next one
         }
     }
-    throw new Error('Could not find next.config.js or next.config.mjs');
+    throw new Error('Could not find next.config.ts, next.config.mts, next.config.js, or next.config.mjs');
 }
 /**
- * Add required Next.js config properties using AST parsing
+ * Add required Next.js config properties using ts-morph AST parsing
  * - output: 'standalone' (for Lambda deployment)
  * - eslint: { ignoreDuringBuilds: true } (allow builds with lint errors)
  */ async function addNextConfigProperties(projectPath) {
     const nextConfigPath = await findNextConfigPath(projectPath);
-    const content = await fs.readFile(nextConfigPath, 'utf-8');
-    // Check which properties already exist
-    const hasOutput = content.includes('output:');
-    const hasEslint = content.includes('eslint:');
-    // Early exit if both already configured
-    if (hasOutput && hasEslint) {
-        return;
-    }
-    const ast = parseModule(content, {
-        loc: true
+    const project = new Project({
+        compilerOptions: {
+            allowJs: true
+        },
+        manipulationSettings: {
+            indentationText: IndentationText.TwoSpaces
+        },
+        skipAddingFilesFromTsConfig: true
     });
-    // Find export default declaration
-    const exportDefaultDeclaration = ast.body.find((p)=>p.type === Syntax.ExportDefaultDeclaration);
-    if (!exportDefaultDeclaration?.declaration?.loc) {
-        throw new Error(`Could not find export default declaration in ${path.basename(nextConfigPath)}`);
-    }
-    // Find the object expression to modify
-    let targetObjectExpression;
-    if (exportDefaultDeclaration.declaration.type === 'ObjectExpression') {
-        // Direct export: export default { ... }
-        targetObjectExpression = exportDefaultDeclaration.declaration;
-    } else if (exportDefaultDeclaration.declaration.type === 'CallExpression') {
-        // Wrapped export: export default withPayload(nextConfig, ...)
-        const callExpr = exportDefaultDeclaration.declaration;
-        const firstArg = callExpr.arguments?.[0];
-        if (firstArg?.type === 'Identifier') {
-            // Find the variable declaration for this identifier
-            const configVarName = firstArg.name;
-            const varDeclaration = ast.body.find((node)=>{
-                if (node.type === Syntax.VariableDeclaration) {
-                    const varNode = node;
-                    return varNode.declarations?.some((decl)=>decl.id?.type === 'Identifier' && decl.id.name === configVarName && decl.init?.type === 'ObjectExpression');
-                }
-                return false;
-            });
-            if (varDeclaration) {
-                const declarator = varDeclaration.declarations?.find((decl)=>decl.id?.type === 'Identifier' && decl.id.name === configVarName);
-                if (declarator?.init?.type === 'ObjectExpression') {
-                    targetObjectExpression = declarator.init;
-                }
-            }
-        }
-    }
-    if (!targetObjectExpression?.loc) {
+    const sourceFile = project.addSourceFileAtPath(nextConfigPath);
+    // Find the config object to modify
+    const configObject = findConfigObject(sourceFile);
+    if (!configObject) {
         throw new Error(`Could not find Next.js config object in ${path.basename(nextConfigPath)}. ` + `Expected either 'export default { ... }' or 'export default wrapper(configVar, ...)'`);
     }
-    const { loc } = targetObjectExpression;
-    const lines = content.split(/\r?\n/);
-    // Build insertion string based on what's missing
-    const parts = [];
+    // Check which properties already exist using AST (avoids false positives from comments)
+    const hasOutput = configObject.getProperty('output') !== undefined;
+    const hasEslint = configObject.getProperty('eslint') !== undefined;
+    if (hasOutput && hasEslint) {
+        return;
+    }
     if (!hasOutput) {
-        parts.push("output: 'standalone',");
+        configObject.addPropertyAssignment({
+            name: 'output',
+            initializer: "'standalone'"
+        });
     }
     if (!hasEslint) {
-        parts.push(`eslint: {
-    ignoreDuringBuilds: true,
-  },`);
+        configObject.addPropertyAssignment({
+            name: 'eslint',
+            initializer: `{ ignoreDuringBuilds: true }`
+        });
+    }
+    await sourceFile.save();
+}
+/**
+ * Find the config object literal from either:
+ * - Direct export: `export default { ... }`
+ * - Wrapped export: `export default withPayload(configVar, ...)`
+ *   where configVar is a variable declaration with an object literal
+ */ function findConfigObject(sourceFile) {
+    const exportDefault = sourceFile.getFirstDescendantByKind(SyntaxKind.ExportAssignment);
+    if (!exportDefault) {
+        return undefined;
+    }
+    const expression = exportDefault.getExpression();
+    // Direct export: export default { ... }
+    if (Node.isObjectLiteralExpression(expression)) {
+        return expression;
     }
-    const insertString = '\n  ' + parts.join('\n  ');
-    // Insert after opening brace
-    const insertLine = loc.start.line - 1;
-    const insertColumn = loc.start.column + 1;
-    const targetLine = lines[insertLine];
-    if (!targetLine) {
-        throw new Error(`Could not find target line in ${path.basename(nextConfigPath)}`);
+    // Wrapped export: export default withPayload(configVar, ...)
+    if (Node.isCallExpression(expression)) {
+        const firstArg = expression.getArguments()[0];
+        // Variable reference: export default withPayload(configVar)
+        if (firstArg && Node.isIdentifier(firstArg)) {
+            const configVarName = firstArg.getText();
+            // Find the variable declaration
+            const varStatements = sourceFile.getVariableStatements();
+            for (const statement of varStatements){
+                for (const decl of statement.getDeclarations()){
+                    if (decl.getName() === configVarName) {
+                        const initializer = decl.getInitializer();
+                        if (initializer && Node.isObjectLiteralExpression(initializer)) {
+                            return initializer;
+                        }
+                    }
+                }
+            }
+        }
     }
-    lines[insertLine] = targetLine.slice(0, insertColumn) + insertString + targetLine.slice(insertColumn);
-    const modifiedContent = lines.join('\n');
-    await fs.writeFile(nextConfigPath, modifiedContent, 'utf-8');
+    return undefined;
 }
 /**
  * Add lambda:buildzip script to package.json

package/dist/utils/messages.d.ts

@@ -6,5 +6,4 @@ export declare function moveMessage(args: {
     nextAppDir: string;
     projectDir: string;
 }): string;
-export declare function feedbackOutro(): string;
 //# sourceMappingURL=messages.d.ts.map

package/dist/utils/messages.js

@@ -36,6 +36,7 @@ export function helpMessage() {
 
       ${pc.cyan('@payloadcms/figma init --id <cms-resource-id>')}     Initialize project
       ${pc.cyan('@payloadcms/figma init --id <id> --env staging')}    Initialize for specific environment
+      ${pc.dim('--name, -n <name>')}                     Set project directory name (skips prompt)
       ${pc.dim('--force')}                               Force reconfiguration of existing project
 
   ${pc.bold('ENV COMMAND')}
@@ -109,8 +110,5 @@ It is recommended to do this from your IDE if your app has existing file referen
 Once moved, rerun the @payloadcms/figma command again.
 `;
 }
-export function feedbackOutro() {
-    return `${pc.bgCyan(pc.black(' Have feedback? '))} Visit us on ${createTerminalLink('GitHub', 'https://github.com/payloadcms/payload')}.`;
-}
 
 //# sourceMappingURL=messages.js.map

package/dist/utils/payload-config-ast.d.ts

@@ -57,11 +57,6 @@ export type FigmaPropertyConfig = {
  * Modifies the AST in memory - caller must call sourceFile.save()
  */
 export declare function addFigmaProperty(sourceFile: SourceFile, config: FigmaPropertyConfig): ASTModificationResult;
-/**
- * Read figma configuration from payload.config.ts
- * Returns the figma object if it exists, null otherwise
- */
-export declare function readFigmaConfig(sourceFile: SourceFile): FigmaPropertyConfig | null;
 /**
  * Remove the contentSystemId property from figma config object.
  * Used during upgrade migration — contentSystemId is now resolved from bootstrap data.

package/dist/utils/payload-config-ast.js

@@ -385,14 +385,9 @@ import * as log from './log.js';
         };
     }
     // Add figma property
-    // Note: useContentSystem is optional and defaults to true, so we don't generate it during init
-    // contentSystemId is stored in .env file and referenced via process.env with non-null assertion
-    const figmaObj = config.useContentSystem === false ? `{
-    contentSystemId: process.env.FIGMA_CONTENT_API_CONTENT_SYSTEM_ID!,
-    useContentSystem: false,
-  }` : `{
-    contentSystemId: process.env.FIGMA_CONTENT_API_CONTENT_SYSTEM_ID!,
-  }`;
+    // contentSystemId is resolved automatically by buildFigmaConfig from env vars or bootstrap cache.
+    // useContentSystem defaults to true, so we only generate it when explicitly false.
+    const figmaObj = config.useContentSystem === false ? `{\nuseContentSystem: false,\n}` : '{}';
     configArg.addPropertyAssignment({
         name: 'figma',
         initializer: figmaObj
@@ -404,74 +399,6 @@ import * as log from './log.js';
         modified
     };
 }
-/**
- * Read figma configuration from payload.config.ts
- * Returns the figma object if it exists, null otherwise
- */ export function readFigmaConfig(sourceFile) {
-    // Find buildFigmaConfig call (this function is only used with Figma configs)
-    const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression);
-    const buildConfigCall = callExpressions.find((ce)=>{
-        const expr = ce.getExpression();
-        const text = expr.getText();
-        return text === 'buildFigmaConfig' || text.endsWith('.buildFigmaConfig');
-    });
-    if (!buildConfigCall) {
-        log.debug('No buildFigmaConfig call found');
-        return null;
-    }
-    // Get config object argument
-    const configArg = buildConfigCall.getArguments()[0];
-    if (!configArg || !Node.isObjectLiteralExpression(configArg)) {
-        log.debug('buildConfig argument is not an object literal');
-        return null;
-    }
-    // Find figma property
-    const figmaProperty = configArg.getProperty('figma');
-    if (!figmaProperty || !Node.isPropertyAssignment(figmaProperty)) {
-        log.debug('No figma property found in buildConfig');
-        return null;
-    }
-    // Get initializer (the object value)
-    const initializer = figmaProperty.getInitializer();
-    if (!initializer || !Node.isObjectLiteralExpression(initializer)) {
-        log.debug('figma property is not an object literal');
-        return null;
-    }
-    // Extract values
-    const contentSystemIdProp = initializer.getProperty('contentSystemId');
-    const useContentSystemProp = initializer.getProperty('useContentSystem');
-    if (!contentSystemIdProp) {
-        log.debug('Missing required figma property: contentSystemId');
-        return null;
-    }
-    // Extract contentSystemId - support both literal strings and env var references
-    let contentSystemId;
-    if (Node.isPropertyAssignment(contentSystemIdProp)) {
-        const initializer = contentSystemIdProp.getInitializer();
-        const text = initializer?.getText() || '';
-        // Support both patterns:
-        // 1. Literal string: 'cms_abc123' or "cms_abc123"
-        // 2. Environment variable: process.env.FIGMA_CONTENT_API_CONTENT_SYSTEM_ID
-        if (text.includes('process.env.FIGMA_CONTENT_API_CONTENT_SYSTEM_ID')) {
-            // For env var reference, return a marker that indicates it's from env
-            // The actual value will be read at runtime
-            contentSystemId = 'process.env.FIGMA_CONTENT_API_CONTENT_SYSTEM_ID';
-        } else {
-            // Remove quotes for literal strings
-            contentSystemId = text.replace(/['"]/g, '');
-        }
-    }
-    const useContentSystem = Node.isPropertyAssignment(useContentSystemProp) ? useContentSystemProp.getInitializer()?.getText() === 'true' : undefined // Optional: undefined if not specified
-    ;
-    if (!contentSystemId) {
-        log.debug('Could not extract contentSystemId value');
-        return null;
-    }
-    return {
-        contentSystemId,
-        useContentSystem
-    };
-}
 /**
  * Remove the contentSystemId property from figma config object.
  * Used during upgrade migration — contentSystemId is now resolved from bootstrap data.
@@ -504,6 +431,10 @@ import * as log from './log.js';
         return false;
     }
     contentSystemIdProp.remove();
+    // Collapse empty object to avoid ts-morph whitespace artifacts
+    if (initializer.getProperties().length === 0) {
+        initializer.replaceWithText('{}');
+    }
     return true;
 }
 

package/dist/utils/payload-config-modifier.js

@@ -1,5 +1,5 @@
 import pc from 'picocolors';
-import { Project } from 'ts-morph';
+import { IndentationText, Project } from 'ts-morph';
 import { formatFile } from './formatter.js';
 import * as log from './log.js';
 import { getAddCommand, getRunCommand } from './package-manager.js';
@@ -57,6 +57,10 @@ import { getOwnVersion } from './version-check.js';
         // 3. Parse config with ts-morph
         log.debug('Parsing config file with ts-morph...');
         const project = new Project({
+            manipulationSettings: {
+                indentationText: IndentationText.TwoSpaces,
+                useTrailingCommas: true
+            },
             skipAddingFilesFromTsConfig: true
         });
         const sourceFile = project.addSourceFileAtPath(configPath);
@@ -107,6 +111,10 @@ import { getOwnVersion } from './version-check.js';
         }
         // Save file if any modifications were made
         if (modified) {
+            sourceFile.formatText({
+                indentSize: 2,
+                tabSize: 2
+            });
             await sourceFile.save();
             log.debug('Config file saved');
             // 7. Handle package management

package/dist/utils/resolve-environment.d.ts

@@ -2,7 +2,7 @@ import type { BootstrapEnvironment } from '../api/control-plane.js';
 /**
  * Resolve which environment to use from the bootstrap response.
  *
- * - Single environment: auto-select (environmentName optional)
+ * - Single environment: auto-select (environmentName optional, validated if provided)
  * - Multiple environments: environmentName required, must match
  *
  * @throws Error if resolution fails (with available environment names)

package/dist/utils/resolve-environment.js

@@ -1,7 +1,7 @@
 /**
  * Resolve which environment to use from the bootstrap response.
  *
- * - Single environment: auto-select (environmentName optional)
+ * - Single environment: auto-select (environmentName optional, validated if provided)
  * - Multiple environments: environmentName required, must match
  *
  * @throws Error if resolution fails (with available environment names)
@@ -11,6 +11,9 @@
         throw new Error('No environments found for this project.');
     }
     if (environments.length === 1) {
+        if (environmentName && environments[0].name !== environmentName) {
+            throw new Error(`Environment "${environmentName}" not found. Available: ${environments[0].name}`);
+        }
         return environments[0];
     }
     // Multiple environments — name required

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/figma",
-  "version": "0.0.1-alpha.55",
+  "version": "0.0.1-alpha.57",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "exports": {
@@ -34,7 +34,6 @@
     "arg": "^5.0.2",
     "conf": "^13.0.1",
     "cross-spawn": "7.0.6",
-    "esprima-next": "^6.0.2",
     "figures": "^6.1.0",
     "jose": "6.0.12",
     "jsonwebtoken": "9.0.3",