@embeddables/cli 0.6.5 → 0.6.6

package/dist/cli.js

@@ -85,6 +85,7 @@ program
     .option('-o, --out <path>', 'Output json path')
     .option('-b, --branch <branch_id>', 'Embeddable branch ID')
     .option('-f, --fix', 'Fix by removing components missing required props (warn instead of error)')
+    .option('-p, --preserve', 'Preserve component order in config for forward compile')
     .action(async (opts) => {
     await runPull(opts);
 });

package/dist/commands/pull.d.ts

@@ -4,6 +4,7 @@ export type RunPullOptions = {
     branch?: string;
     branchName?: string;
     fix?: boolean;
+    preserve?: boolean;
 };
 export declare function runPull(opts: RunPullOptions): Promise<void>;
 //# sourceMappingURL=pull.d.ts.map

package/dist/commands/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AA+GA,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,OAAO,CAAA;CACd,CAAA;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,cAAc,iBAqPjD"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AA+GA,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,cAAc,iBA6PjD"}

package/dist/commands/pull.js

@@ -264,7 +264,11 @@ export async function runPull(opts) {
         };
         let usedFix = opts.fix;
         try {
-            await reverseCompile(flow, embeddableId, { fix: opts.fix, pullMetadata });
+            await reverseCompile(flow, embeddableId, {
+                fix: opts.fix,
+                preserve: opts.preserve,
+                pullMetadata,
+            });
         }
         catch (compileError) {
             // If fix mode wasn't already enabled, offer to retry with fix mode
@@ -288,7 +292,11 @@ export async function runPull(opts) {
                     console.log('');
                     console.log(pc.cyan('Retrying with auto-fix enabled...'));
                     console.log('');
-                    await reverseCompile(flow, embeddableId, { fix: true, pullMetadata });
+                    await reverseCompile(flow, embeddableId, {
+                        fix: true,
+                        preserve: opts.preserve,
+                        pullMetadata,
+                    });
                 }
                 else {
                     process.exit(1);

package/dist/compiler/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compiler/index.ts"],"names":[],"mappings":"AAmDA;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CA2DlF;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,mHAAmH;IACnH,OAAO,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAA;CAC1B,iBA4cA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compiler/index.ts"],"names":[],"mappings":"AAmDA;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CA2DlF;AA6BD,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,mHAAmH;IACnH,OAAO,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAA;CAC1B,iBAoeA"}

package/dist/compiler/index.js

@@ -99,6 +99,32 @@ export function reorderObjectKeysToMatch(oldVal, newVal) {
     }
     return newVal;
 }
+/**
+ * Orders an array of items with an `id` property to match the given id list.
+ * Items whose id is in the list appear first in that order; items not in the list appear at the end.
+ */
+function orderByIdList(items, idList) {
+    if (!Array.isArray(idList) || idList.length === 0)
+        return items;
+    const byId = new Map();
+    for (const item of items) {
+        if (item.id !== undefined && item.id !== null)
+            byId.set(item.id, item);
+    }
+    const ordered = [];
+    const orderedIds = new Set(idList);
+    for (const id of idList) {
+        const item = byId.get(id);
+        if (item)
+            ordered.push(item);
+    }
+    for (const item of items) {
+        if (item.id === undefined || item.id === null || !orderedIds.has(item.id)) {
+            ordered.push(item);
+        }
+    }
+    return ordered;
+}
 export async function compileAllPages(opts) {
     const files = await fg(opts.pagesGlob, { dot: false });
     if (files.length === 0) {
@@ -356,15 +382,24 @@ export async function compileAllPages(opts) {
                 // Apply metadata from config (preserving nested object order)
                 const pageMetadata = orderedPageMap.get(key);
                 if (pageMetadata) {
-                    // Merge metadata (excluding key and components)
-                    // Preserve order by iterating through keys in original order
+                    // Merge metadata (excluding key, components, and components_order which is used only for ordering)
                     const pageMetadataKeys = Object.keys(pageMetadata);
                     for (const metaKey of pageMetadataKeys) {
-                        if (metaKey !== 'key' && metaKey !== 'components') {
+                        if (metaKey !== 'key' &&
+                            metaKey !== 'components' &&
+                            metaKey !== 'components_order') {
                             ;
                             page[metaKey] = deepClonePreservingOrder(pageMetadata[metaKey]);
                         }
                     }
+                    // If components_order is present (from pull --preserve), order page.components to match
+                    const orderIds = pageMetadata.components_order;
+                    if (Array.isArray(orderIds) &&
+                        orderIds.length > 0 &&
+                        page.components &&
+                        page.components.length > 0) {
+                        page.components = orderByIdList(page.components, orderIds);
+                    }
                 }
                 return page;
             }
@@ -419,6 +454,10 @@ export async function compileAllPages(opts) {
                 // Skip _branch_id / _branch_name - CLI metadata (current branch), not part of the embeddable
                 continue;
             }
+            else if (key === 'components_order') {
+                // Skip components_order - used only to order global components when building, not part of output
+                continue;
+            }
             else if (key === 'computedFields') {
                 // Replace computedFields with loaded computedFields (which include code)
                 if (computedFields.length > 0) {
@@ -432,9 +471,13 @@ export async function compileAllPages(opts) {
                 }
             }
             else if (key === 'components') {
-                // Replace components with loaded global components
+                // Replace components with loaded global components (optionally ordered by config.components_order)
                 if (globalComponents.length > 0) {
-                    embeddable.components = globalComponents;
+                    const orderIds = config.components_order;
+                    embeddable.components =
+                        Array.isArray(orderIds) && orderIds.length > 0
+                            ? orderByIdList(globalComponents, orderIds)
+                            : globalComponents;
                 }
             }
             else {
@@ -487,7 +530,11 @@ export async function compileAllPages(opts) {
         embeddable.dataOutputs = dataOutputs;
     }
     if (globalComponents.length > 0 && !embeddable.components) {
-        embeddable.components = globalComponents;
+        const orderIds = config?.components_order;
+        embeddable.components =
+            Array.isArray(orderIds) && orderIds.length > 0
+                ? orderByIdList(globalComponents, orderIds)
+                : globalComponents;
     }
     let toWrite = embeddable;
     if (fs.existsSync(opts.outPath)) {

package/dist/compiler/reverse.d.ts

@@ -9,6 +9,7 @@ export declare function reverseCompile(embeddable: {
     [key: string]: any;
 }, embeddableId: string, opts?: {
     fix?: boolean;
+    preserve?: boolean;
     pullMetadata?: {
         version?: number;
         branchId?: string;

package/dist/compiler/reverse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reverse.d.ts","sourceRoot":"","sources":["../../src/compiler/reverse.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAA;AAqlBzD,wBAAsB,cAAc,CAClC,UAAU,EAAE;IACV,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACnB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,EACD,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;IACL,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,YAAY,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5E,iBAmFF;AA0gDD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKpD"}
+{"version":3,"file":"reverse.d.ts","sourceRoot":"","sources":["../../src/compiler/reverse.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAA;AAqlBzD,wBAAsB,cAAc,CAClC,UAAU,EAAE;IACV,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,GAAG,EAAE,CAAA;IACnB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAA;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,EACD,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE;IACL,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,YAAY,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5E,iBAoFF;AAyhDD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKpD"}

package/dist/compiler/reverse.js

@@ -522,6 +522,7 @@ function hasDeprecatedParentKey(components) {
 }
 export async function reverseCompile(embeddable, embeddableId, opts) {
     const fix = opts?.fix ?? false;
+    const preserve = opts?.preserve ?? false;
     const pullMetadata = opts?.pullMetadata;
     // When fix is disabled, throw on deprecated parent_key so user gets interactive retry prompt
     if (!fix) {
@@ -563,7 +564,7 @@ export async function reverseCompile(embeddable, embeddableId, opts) {
         await generateStylesFile(embeddable.styles, embeddableId);
     }
     // Generate config.json
-    await generateConfigFile(embeddable, embeddableId, pullMetadata);
+    await generateConfigFile(embeddable, embeddableId, { pullMetadata, preserve });
     // Extract computedFields to JS files
     if (embeddable.computedFields && embeddable.computedFields.length > 0) {
         await extractComputedFields(embeddable.computedFields, embeddableId);
@@ -1550,7 +1551,9 @@ function escapeStringForJS(str) {
  * This file controls page ordering and stores embeddable-level metadata.
  * Preserves the order of top-level properties from embeddable.json.
  */
-async function generateConfigFile(embeddable, embeddableId, pullMetadata) {
+async function generateConfigFile(embeddable, embeddableId, opts) {
+    const pullMetadata = opts?.pullMetadata;
+    const preserve = opts?.preserve ?? false;
     try {
         const configPath = path.join('embeddables', embeddableId, 'config.json');
         // CLI-only fields: from pull (when branching/saving) or from existing config file.
@@ -1590,6 +1593,10 @@ async function generateConfigFile(embeddable, embeddableId, pullMetadata) {
                     }
                 }
             }
+            // When --preserve: record component order for forward compile
+            if (preserve && Array.isArray(page.components) && page.components.length > 0) {
+                pageMetadata.components_order = page.components.map((c) => c.id);
+            }
             return pageMetadata;
         });
         // Extract computedFields metadata (without code, as code is in JS files)
@@ -1639,6 +1646,10 @@ async function generateConfigFile(embeddable, embeddableId, pullMetadata) {
             }
             else if (key === 'components') {
                 // Skip components (they're in TSX files in global-components/)
+                // When --preserve: record global component order for forward compile
+                if (preserve && embeddable.components && Array.isArray(embeddable.components)) {
+                    config.components_order = embeddable.components.map((c) => c.id);
+                }
                 continue;
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embeddables/cli",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "type": "module",
   "bin": {
     "embeddables": "./bin/embeddables.mjs"