@shop-os/modelkit 0.2.4 → 0.2.5

package/dist/index.cjs

@@ -45,6 +45,7 @@ __export(index_exports, {
   arkAdapter: () => arkAdapter,
   aspectRatioToSize: () => aspectRatioToSize,
   classifyHttpError: () => classifyHttpError,
+  compareCatalogOrder: () => compareCatalogOrder,
   createDefaultModelKit: () => createDefaultModelKit,
   createModelKit: () => createModelKit,
   describe: () => describe,
@@ -82,6 +83,7 @@ __export(index_exports, {
   resolveVideoOptions: () => resolveVideoOptions,
   shouldRetry: () => shouldRetry,
   sleep: () => sleep,
+  sortCatalogRows: () => sortCatalogRows,
   streamObject: () => streamObject,
   streamText: () => streamText,
   textUsageEvent: () => textUsageEvent,
@@ -118,6 +120,22 @@ function isModelKitError(err) {
   return err instanceof ModelKitError;
 }
 
+// src/catalog/order.ts
+function compareCatalogOrder(a, b) {
+  const sa = a.display?.sortOrder;
+  const sb = b.display?.sortOrder;
+  if (sa !== void 0 && sb !== void 0 && sa !== sb) return sb - sa;
+  if (sa !== void 0 && sb === void 0) return -1;
+  if (sa === void 0 && sb !== void 0) return 1;
+  return compareText(a.label.toLowerCase(), b.label.toLowerCase()) || compareText(a.id, b.id);
+}
+function compareText(a, b) {
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+function sortCatalogRows(rows) {
+  return [...rows].sort(compareCatalogOrder);
+}
+
 // src/catalog/registry.ts
 var Catalog = class _Catalog {
   byId = /* @__PURE__ */ new Map();
@@ -174,11 +192,12 @@ var Catalog = class _Catalog {
     }
     return model;
   }
+  /** Rows in picker order: `display.sortOrder` descending, then label. See `compareCatalogOrder`. */
   list(filter = {}) {
     const lifecycles = filter.lifecycle ?? ["active"];
     return [...this.byId.values()].filter(
       (m) => (filter.type ? m.type === filter.type : true) && lifecycles.includes(m.lifecycle)
-    );
+    ).sort(compareCatalogOrder);
   }
   /** Merge rows by id. Used for catalogOverride. */
   withOverrides(rows) {
@@ -7421,6 +7440,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   arkAdapter,
   aspectRatioToSize,
   classifyHttpError,
+  compareCatalogOrder,
   createDefaultModelKit,
   createModelKit,
   describe,
@@ -7458,6 +7478,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   resolveVideoOptions,
   shouldRetry,
   sleep,
+  sortCatalogRows,
   streamObject,
   streamText,
   textUsageEvent,