flipstream 0.6.1 → 0.7.0

package/dist/commands/catalog.js

@@ -71,7 +71,11 @@ export default class Catalog extends BaseCommand {
                 ], 'No sources.');
                 // Footer to STDERR: it is guidance, not data, and stdout must stay clean.
                 const hint = index.defaultSource === undefined ? '' : `, default ${index.defaultSource}`;
-                this.footer(`\n${index.sources.length} source(s)${hint}; \`${this.config.bin} catalog ${index.defaultSource ?? '<source>'}\` for its names`);
+                // WHICH MODEL produced this (#125). Without it, a current catalog and a
+                // planner running a stale image read identically, and the only way to
+                // tell them apart is cloning two repos to compare pins.
+                const served = index.catalogVersion === undefined ? '' : `\ndata-model ${index.catalogVersion}`;
+                this.footer(`\n${index.sources.length} source(s)${hint}; \`${this.config.bin} catalog ${index.defaultSource ?? '<source>'}\` for its names${served}`);
             });
         }
         const entry = parseCatalogSource(payload);
@@ -96,6 +100,13 @@ export default class Catalog extends BaseCommand {
         if (entry.customDimensionsMax !== undefined) {
             this.log(`\nCUSTOM DIMENSIONS  up to ${entry.customDimensionsMax} per connection`);
         }
+        // The same version line the index carries (#125), and UNCONDITIONAL — unlike
+        // the Try block below, which only appears when this source has both a
+        // dimension and a metric. This is the view people read while checking whether
+        // a name exists, which is exactly when "is this the model I think it is?"
+        // is the question.
+        if (entry.catalogVersion !== undefined)
+            this.footer(`\ndata-model ${entry.catalogVersion}`);
         // A runnable next command built from THIS source's real names (E11-3, #102):
         // the reader of a catalog is one edit away from a working query, so hand
         // them that edit. stderr — guidance, not data.

package/dist/lib/planner/catalog.d.ts

@@ -5,6 +5,7 @@ export interface CatalogItem {
     type: string;
 }
 export interface CatalogSource {
+    catalogVersion?: string;
     customDimensionsMax?: number;
     description: string;
     dimensions: CatalogItem[];
@@ -19,6 +20,7 @@ export interface CatalogSourceSummary {
     name: string;
 }
 export interface CatalogIndex {
+    catalogVersion?: string;
     defaultSource?: string;
     sources: CatalogSourceSummary[];
 }

package/dist/lib/planner/catalog.js

@@ -18,6 +18,15 @@ function str(value, fallback = '') {
 function arr(value) {
     return Array.isArray(value) ? value : [];
 }
+// The data-model release that produced this document (#125). data-model stamps
+// it on every catalog — `catalogVersion` is required by its own schema and reads
+// the package version through importlib.metadata, so it cannot drift from the
+// tag query-planner pins. OPTIONAL here regardless: a planner older than the
+// field simply omits it, and a missing version must print nothing rather than
+// the word "undefined".
+function version(record) {
+    return typeof record.catalogVersion === 'string' ? record.catalogVersion : undefined;
+}
 function parseItem(value) {
     const record = asRecord(value) ?? {};
     // `format` may be absent or null; its `type` is what the human table shows.
@@ -42,7 +51,7 @@ export function parseCatalogIndex(payload) {
         };
     });
     const defaultSource = typeof record.defaultSource === 'string' ? record.defaultSource : undefined;
-    return { defaultSource, sources };
+    return { catalogVersion: version(record), defaultSource, sources };
 }
 // GET /catalog/<source> — one source's full vocabulary.
 export function parseCatalogSource(payload) {
@@ -50,6 +59,7 @@ export function parseCatalogSource(payload) {
     const custom = asRecord(record.customDimensions);
     const max = custom !== undefined && typeof custom.max === 'number' ? custom.max : undefined;
     return {
+        catalogVersion: version(record),
         customDimensionsMax: max,
         description: str(record.description),
         dimensions: arr(record.dimensions).map((item) => parseItem(item)),

package/oclif.manifest.json

@@ -1445,5 +1445,5 @@
       ]
     }
   },
-  "version": "0.6.1"
+  "version": "0.7.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flipstream",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Flipstream CLI — query your Flipstream data from the terminal.",
   "keywords": [
     "flipstream",