@payloadcms/figma 0.0.1-alpha.60 → 0.0.1-alpha.61

package/dist/db-content-api/index.js

@@ -56,7 +56,7 @@ async function syncCollections() {
         }
     }
 }
-async function init() {
+function init() {
     if (this.auth.mode === 'apiKey') {
         this.payload.logger.info('Using API Key authentication');
     } else if (this.auth.mode === 'tokenStore') {
@@ -64,8 +64,15 @@ async function init() {
     } else {
         this.payload.logger.info('Using Dev JWT authentication (testing)');
     }
-    if (process.env.PAYLOAD_DROP_DATABASE === 'true') {
+}
+// connect is called after init — once on first startup (hotReload=false) and again on HMR
+// (hotReload=true). Only clear the database on the first startup, never on hot reload.
+async function connect(args) {
+    const hotReload = args?.hotReload ?? false;
+    if (!hotReload && process.env.PAYLOAD_DROP_DATABASE === 'true') {
+        // clearDatabase already calls syncCollections internally after clearing
         await this.clearDatabase();
+        return;
     }
     await syncCollections.call(this);
 }
@@ -99,7 +106,7 @@ async function findMany({ collection, joins, limit, locale: localeArg, page, pag
         body: {
             collection,
             contentSystemId: this.contentSystemId,
-            join: convertPayloadJoinsToContentAPI(this.payload, collection, joins),
+            join: convertPayloadJoinsToContentAPI(this.payload, collection, joins, locale),
             limit,
             locale,
             page: page ?? 1,
@@ -645,13 +652,131 @@ async function upsert(args) {
         payload: this.payload
     });
 }
+// Mirrors MAX_DOCUMENT_UPDATES in the content API's updateDocuments.ts.
+// updateJobs may be called with larger limits (e.g. 150), so we batch sequentially.
+const CONTENT_API_MAX_UPDATES = 20;
+// Issues a single update request against payload-jobs and returns the unwrapped docs.
+async function updateJobsBatch({ batchSize, docData, meta, sortClause, whereQuery }) {
+    const { data: response, error } = await this.client.POST('/api/v0/documents:update', {
+        body: {
+            collection: 'payload-jobs',
+            contentSystemId: this.contentSystemId,
+            createOnMissing: false,
+            doc: docData,
+            ...batchSize != null && {
+                limit: batchSize
+            },
+            returning: {},
+            sort: sortClause,
+            where: whereQuery,
+            ...meta
+        }
+    });
+    if (error) {
+        throw new Error(`Content API updateJobs error: ${JSON.stringify(error)}`);
+    }
+    if (!response) {
+        throw new Error('No response from updateJobs');
+    }
+    if (!response.result || !('data' in response.result)) {
+        return [];
+    }
+    return response.result.data.map((doc)=>unwrapDocument({
+            collectionSlug: 'payload-jobs',
+            doc,
+            payload: this.payload
+        }));
+}
+async function updateJobs(args) {
+    const { id, limit, returning, sort, where } = args;
+    if (id == null && where == null) {
+        throw new Error('updateJobs requires either id or a where clause');
+    }
+    // Copy data to avoid mutating the caller's object.
+    const data = {
+        ...args.data
+    };
+    // Strip log if empty/absent. The content API's deep merge replaces arrays entirely
+    // (it does not concatenate), so sending log: [] would wipe existing log entries.
+    // Only include log when it carries new content: a non-empty array or a $push operation.
+    const log = data.log;
+    if (!(Array.isArray(log) && log.length > 0) && !(log && typeof log === 'object' && '$push' in log)) {
+        delete data.log;
+    }
+    const whereClause = id != null ? {
+        id: {
+            equals: String(id)
+        }
+    } : where;
+    const docData = dataToContentAPI(this.payload, 'payload-jobs', data);
+    const sortClause = addFallbackSort(sort || '-updatedAt', this.payload, 'payload-jobs');
+    const whereQuery = convertPayloadWhereToContentAPI(whereClause);
+    const meta = buildMeta(this.payload, {
+        collection: 'payload-jobs',
+        locale: undefined,
+        where: whereClause
+    });
+    // When limit exceeds the content API's per-request cap, batch sequentially.
+    const needsBatching = limit != null && limit > CONTENT_API_MAX_UPDATES;
+    if (!needsBatching) {
+        const docs = await updateJobsBatch.call(this, {
+            batchSize: limit,
+            docData,
+            meta,
+            sortClause,
+            whereQuery
+        });
+        if (returning === false) {
+            return null;
+        }
+        return docs;
+    }
+    // Batched path: issue sequential requests of ≤ CONTENT_API_MAX_UPDATES each.
+    // This relies on the update itself causing matched jobs to no longer satisfy the where
+    // clause on subsequent batches (e.g. setting processing: true removes them from a
+    // "processing: false" query). If a future updateJobs call in Payload core updates jobs
+    // in a way that does NOT change their match status, the same jobs could be updated
+    // multiple times across batches.
+    const allDocs = [];
+    let remaining = limit;
+    while(remaining > 0){
+        const batchSize = Math.min(remaining, CONTENT_API_MAX_UPDATES);
+        const batchDocs = await updateJobsBatch.call(this, {
+            batchSize,
+            docData,
+            meta,
+            sortClause,
+            whereQuery
+        });
+        allDocs.push(...batchDocs);
+        remaining -= batchSize;
+        // Stop early when this batch returned fewer docs than requested — no more matching docs.
+        if (batchDocs.length < batchSize) {
+            break;
+        }
+    }
+    if (returning === false) {
+        return null;
+    }
+    return allDocs;
+}
 function createGlobal(args) {
-    return this.create({
+    // Globals are singletons identified by their slug. Use upsert so concurrent calls
+    // (e.g. handleSchedules processing multiple queueables with the same null jobStats)
+    // don't fail with "A record with this field already exists". The deep-merge semantics
+    // of the update path are safe here: callers that want a fresh create (first run) get
+    // an effective create, and callers that race a prior create get a merge instead.
+    return this.upsert({
         collection: getGlobalSlug(args.slug),
         data: {
             ...args.data,
             id: args.slug,
             globalType: args.slug
+        },
+        where: {
+            id: {
+                equals: args.slug
+            }
         }
     });
 }
@@ -749,6 +874,7 @@ export const contentAPIAdapter = (opts)=>({
                 clearDatabase: clearDatabase,
                 client,
                 commitTransaction: async ()=>{},
+                connect: connect,
                 contentSystemId: opts.contentSystemId,
                 count: count,
                 countGlobalVersions: countGlobalVersions,
@@ -775,6 +901,7 @@ export const contentAPIAdapter = (opts)=>({
                 rollbackTransaction: async ()=>{},
                 updateGlobal: updateGlobal,
                 updateGlobalVersion: updateGlobalVersion,
+                updateJobs: updateJobs,
                 updateMany: updateMany,
                 updateOne: updateOne,
                 updateVersion: updateVersion,

package/dist/db-content-api/utilities/data/applyDefaults.js

@@ -3,6 +3,22 @@
  * This handles defaults for nested structures (arrays, groups) which traverseFields doesn't handle
  */ export function applyDefaults(data, fields) {
     for (const field of fields){
+        // Tabs fields: unnamed tabs are transparent (fields at the same level); named tabs nest
+        // their fields under the tab's name key. Recurse before the name-based guard so
+        // tab-nested fields (e.g. hasError in payload-jobs) get their defaults applied.
+        if (field.type === 'tabs') {
+            for (const tab of field.tabs){
+                if ('name' in tab && tab.name) {
+                    if (!data[tab.name]) {
+                        data[tab.name] = {};
+                    }
+                    applyDefaults(data[tab.name], tab.fields);
+                } else {
+                    applyDefaults(data, tab.fields);
+                }
+            }
+            continue;
+        }
         // Only process fields that affect data (have a name)
         if (!('name' in field) || !field.name) {
             continue;
@@ -37,11 +53,11 @@
                     applyDefaults(element, field.fields);
                 }
             }
-        } else if (field.type === 'group' && currentValue && typeof currentValue === 'object') {
-            // Apply defaults to group fields
-            if ('fields' in field) {
-                applyDefaults(currentValue, field.fields);
+        } else if (field.type === 'group' && 'fields' in field) {
+            if (currentValue == null || typeof currentValue !== 'object') {
+                data[field.name] = {};
             }
+            applyDefaults(data[field.name], field.fields);
         } else if (field.type === 'blocks' && Array.isArray(currentValue) && 'blocks' in field) {
             // Apply defaults to each block
             for (const element of currentValue){

package/dist/db-content-api/utilities/data/index.js

@@ -179,6 +179,23 @@ export function dataFromContentAPI(payload, collectionSlug, data, locale) {
         const current = ref;
         const value = current[field.name];
         const isLocalized = 'localized' in field && field.localized;
+        // Group fields must always be an object so Payload can traverse sub-fields
+        // (e.g. join fields inside a group). A null/undefined group crashes afterRead.
+        if (field.type === 'group') {
+            if (value == null || typeof value !== 'object') {
+                current[field.name] = {};
+            }
+            return;
+        }
+        // Localized join fields: wrap in locale map so afterRead can hoist the value.
+        // Content API returns join data directly at the field path (e.g. { docs: [...] }),
+        // but Payload's afterRead expects localized fields as { [locale]: value }.
+        if (field.type === 'join' && isLocalized && value !== undefined && !isAllLocales && locale) {
+            current[field.name] = {
+                [locale]: value
+            };
+            return;
+        }
         // Content API may omit fields; Payload expects null for optional fields.
         // In all-locales mode, localized fields use {} so afterRead can safely iterate locale keys.
         if (value === undefined) {

package/dist/db-content-api/utilities/joins.d.ts

@@ -17,8 +17,6 @@ type ContentAPIJoin = components['schemas']['JoinClause'][number];
  * 3. **Polymorphic relationships** - Stored as `{ relationTo, value }` objects, but
  *    Content API expects a simple ID string.
  *
- * 4. **Localized relationship fields** - Locale-aware joins not implemented.
- *
  * Note: "Where querying through joins" (e.g., `where: { 'relatedPosts.title': { equals: 'x' } }`)
  * is a separate Payload feature that filters documents based on joined data. This is NOT
  * a join feature but a where clause feature, and would need separate Content API support.
@@ -50,6 +48,6 @@ type ContentAPIJoin = components['schemas']['JoinClause'][number];
  * - Which collection each join field refers to
  * - What the 'on' field is for each join
  */
-export declare function convertPayloadJoinsToContentAPI(payload: Payload, collectionSlug: string, joins: false | JoinQuery | undefined): ContentAPIJoin[] | undefined;
+export declare function convertPayloadJoinsToContentAPI(payload: Payload, collectionSlug: string, joins: false | JoinQuery | undefined, locale?: string): ContentAPIJoin[] | undefined;
 export {};
 //# sourceMappingURL=joins.d.ts.map

package/dist/db-content-api/utilities/joins.js

@@ -16,8 +16,6 @@ import { convertPayloadWhereToContentAPI } from './where.js';
  * 3. **Polymorphic relationships** - Stored as `{ relationTo, value }` objects, but
  *    Content API expects a simple ID string.
  *
- * 4. **Localized relationship fields** - Locale-aware joins not implemented.
- *
  * Note: "Where querying through joins" (e.g., `where: { 'relatedPosts.title': { equals: 'x' } }`)
  * is a separate Payload feature that filters documents based on joined data. This is NOT
  * a join feature but a where clause feature, and would need separate Content API support.
@@ -48,7 +46,7 @@ import { convertPayloadWhereToContentAPI } from './where.js';
  * The mapping requires the collection config to resolve:
  * - Which collection each join field refers to
  * - What the 'on' field is for each join
- */ export function convertPayloadJoinsToContentAPI(payload, collectionSlug, joins) {
+ */ export function convertPayloadJoinsToContentAPI(payload, collectionSlug, joins, locale) {
     const collectionConfig = payload.config.collections.find((c)=>c.slug === collectionSlug);
     if (!collectionConfig) {
         return undefined;
@@ -74,11 +72,14 @@ import { convertPayloadWhereToContentAPI } from './where.js';
         for (const [collectionSlug, sanitizedJoins] of Object.entries(collectionConfig.joins)){
             for (const sanitizedJoin of sanitizedJoins){
                 if (sanitizedJoin.joinPath === joinPath) {
+                    const on = locale && sanitizedJoin.getForeignPath ? sanitizedJoin.getForeignPath({
+                        locale
+                    }) : sanitizedJoin.field.on;
                     foundJoin = {
                         collectionSlug,
                         defaultLimit: sanitizedJoin.field.defaultLimit,
                         defaultSort: sanitizedJoin.field.defaultSort,
-                        on: sanitizedJoin.field.on
+                        on
                     };
                     break;
                 }
@@ -92,10 +93,13 @@ import { convertPayloadWhereToContentAPI } from './where.js';
             for (const sanitizedJoin of collectionConfig.polymorphicJoins){
                 if (sanitizedJoin.joinPath === joinPath) {
                     const collections = sanitizedJoin.field.collection;
+                    const on = locale && sanitizedJoin.getForeignPath ? sanitizedJoin.getForeignPath({
+                        locale
+                    }) : sanitizedJoin.field.on;
                     foundJoin = {
                         collectionSlug: collections,
                         defaultSort: sanitizedJoin.field.defaultSort,
-                        on: sanitizedJoin.field.on
+                        on
                     };
                     break;
                 }

package/dist/db-content-api/utilities/where.js

@@ -74,6 +74,10 @@ export function convertPayloadWhereToContentAPI(where, options = {}) {
                 if (op === 'exists' && typeof operatorValue === 'string') {
                     finalValue = operatorValue === 'true';
                 }
+                // REST API sends "null" as a string; convert to actual null
+                if (finalValue === 'null') {
+                    finalValue = null;
+                }
                 // Content API stores all document IDs as strings.
                 // Payload sends numeric values for collections with custom numeric ID fields,
                 // so we must stringify to match.

package/dist/utils/lambda-config.js

@@ -17,7 +17,7 @@ NODE_ENV=production exec node server.js
     const runShPath = path.join(projectPath, 'run.sh');
     await fs.writeFile(runShPath, RUN_SH_CONTENT, 'utf-8');
     await fs.chmod(runShPath, 0o755);
-    // 2. Modify next config to add standalone output and eslint ignore
+    // 2. Modify next config to add standalone output
     await addNextConfigProperties(projectPath);
     // 3. Create/update .npmrc
     const npmrcPath = path.join(projectPath, '.npmrc');
@@ -58,7 +58,6 @@ NODE_ENV=production exec node server.js
 /**
  * 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 project = new Project({
@@ -76,24 +75,14 @@ NODE_ENV=production exec node server.js
     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, ...)'`);
     }
-    // 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) {
+    if (hasOutput) {
         return;
     }
-    if (!hasOutput) {
-        configObject.addPropertyAssignment({
-            name: 'output',
-            initializer: "'standalone'"
-        });
-    }
-    if (!hasEslint) {
-        configObject.addPropertyAssignment({
-            name: 'eslint',
-            initializer: `{ ignoreDuringBuilds: true }`
-        });
-    }
+    configObject.addPropertyAssignment({
+        name: 'output',
+        initializer: "'standalone'"
+    });
     await sourceFile.save();
 }
 /**

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

@@ -9,9 +9,9 @@ import * as log from './log.js';
         hasOtherPayloadImports: false,
         needsImportChange: false
     };
-    // Find buildConfig import
+    // Find buildConfig import — prefer @payloadcms/figma (already migrated) over payload
     const imports = sourceFile.getImportDeclarations();
-    const payloadImport = imports.find((imp)=>imp.getModuleSpecifierValue() === 'payload' || imp.getModuleSpecifierValue() === '@payloadcms/figma');
+    const payloadImport = imports.find((imp)=>imp.getModuleSpecifierValue() === '@payloadcms/figma') || imports.find((imp)=>imp.getModuleSpecifierValue() === 'payload');
     if (!payloadImport) {
         log.debug('No payload or @payloadcms/figma import found');
         result.hasBuildConfig = false;
@@ -157,9 +157,27 @@ import * as log from './log.js';
     // Remove duplicates and sort in reverse order to avoid position shifts
     const uniqueRanges = Array.from(new Set(ranges.map((r)=>JSON.stringify(r)))).map((r)=>JSON.parse(r));
     uniqueRanges.sort((a, b)=>b[0] - a[0]);
-    // Remove each comment range
+    // Remove each comment range, extending to the full line when the comment is the only content
     for (const [pos, end] of uniqueRanges){
-        sourceFile.removeText(pos, end);
+        const fullText = sourceFile.getFullText();
+        let removeStart = pos;
+        let removeEnd = end;
+        // Find the start of the line containing this comment
+        let lineStart = pos;
+        while(lineStart > 0 && fullText[lineStart - 1] !== '\n'){
+            lineStart--;
+        }
+        const beforeComment = fullText.substring(lineStart, pos);
+        const nextNewline = fullText.indexOf('\n', end);
+        const afterComment = fullText.substring(end, nextNewline === -1 ? fullText.length : nextNewline);
+        // If the comment is the only content on this line, remove the entire line
+        if (beforeComment.trim() === '' && afterComment.trim() === '') {
+            removeStart = lineStart > 0 ? lineStart - 1 : lineStart;
+            if (nextNewline !== -1) {
+                removeEnd = nextNewline + 1;
+            }
+        }
+        sourceFile.removeText(removeStart, removeEnd);
     }
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/figma",
-  "version": "0.0.1-alpha.60",
+  "version": "0.0.1-alpha.61",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "exports": {
@@ -32,26 +32,26 @@
     "@sindresorhus/slugify": "^3.0.0",
     "archiver": "7.0.1",
     "arg": "^5.0.2",
-    "conf": "^13.0.1",
+    "conf": "^13.1.0",
     "cross-spawn": "7.0.6",
     "figures": "^6.1.0",
     "jose": "6.0.12",
     "jsonwebtoken": "9.0.3",
-    "open": "^10.1.0",
+    "open": "^10.2.0",
     "openapi-fetch": "0.15.0",
     "picocolors": "1.1.1",
-    "tar": "^7.4.3",
+    "tar": "^7.5.13",
     "terminal-link": "^5.0.0",
-    "ts-morph": "^21.0.0",
+    "ts-morph": "^21.0.1",
     "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@types/archiver": "7.0.0",
     "@types/cross-spawn": "6.0.6",
     "@types/node": "22.12.0",
-    "openapi-typescript": "^7.10.1",
+    "openapi-typescript": "^7.13.0",
     "tsx": "4.20.6",
-    "typescript": "5.9.3",
+    "typescript": "5.7.3",
     "vitest": "4.0.15"
   },
   "peerDependencies": {