@emuanalytics/flow-cli 1.3.125 → 1.3.127

package/dist/commands/datasets/list.js

@@ -21,22 +21,33 @@ const builder = (args) => {
         .option('limit', { alias: 'n', type: 'number', describe: 'Limit to n results' })
         .option('offset', { alias: ['o'], type: 'number', describe: 'Start list at offset n' })
         .option('sort', { alias: ['s'], type: 'string', describe: 'Sort by attribute' })
+        .option('tags', { alias: 't', type: 'array', describe: 'Filter by specified tags' })
         .conflicts('id', ['limit', 'offset', 'sort'])
         .positional('id', { describe: 'Dataset id (or unique prefix)', type: 'string' });
 };
 exports.builder = builder;
-function handler({ client, id, format, offset, limit, sort }) {
+function handler({ client, id, format, offset, limit, sort, tags }) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let results;
             if (id) {
                 const resource = yield (0, utils_1.resolveResource)(id, client.datasets);
-                (0, utils_1.logObject)(resource, format);
+                if (format === 'table') {
+                    // Add tags to the output
+                    (0, utils_1.logObject)(promoteTags(resource), 'table');
+                }
+                else {
+                    (0, utils_1.logObject)(resource, format || 'json');
+                }
             }
             else {
                 results = yield client.datasets.list({ offset, limit, sort });
+                if (tags) {
+                    results = results.filter((dataset) => dataset.metadata.tags && tags.every((tag) => dataset.metadata.tags.includes(tag)));
+                }
                 if (format === 'table') {
-                    (0, utils_1.logObject)(results, 'table', ['id', 'name', 'description', 'type']);
+                    // Add tags to the output
+                    (0, utils_1.logObject)(results.map(promoteTags), 'table', ['id', 'name', 'description', 'type', 'tags']);
                 }
                 else {
                     (0, utils_1.logObject)(results, format || 'json');
@@ -49,4 +60,15 @@ function handler({ client, id, format, offset, limit, sort }) {
     });
 }
 exports.handler = handler;
+/**
+ * Augment a dataset with a `tags` property.
+ *
+ * A top-level `tags` property containing a comma-separated string of tags is added to facilitate output.
+ *
+ * @param dataset
+ * @returns
+ */
+function promoteTags(dataset) {
+    return Object.assign(Object.assign({}, dataset), { tags: dataset.metadata.tags ? dataset.metadata.tags.join(',') : '' });
+}
 //# sourceMappingURL=list.js.map

package/dist/commands/datasets/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/datasets/list.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;AAEH,uCAAmE;AAItD,QAAA,OAAO,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEpC,QAAA,IAAI,GAAG,eAAe,CAAC;AAE7B,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,OAAO,IAAI;SACR,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,oBAAoB,EAAE,CAAC;SAC/E,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,wBAAwB,EAAE,CAAC;SACtF,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;SAC/E,SAAS,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC5C,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,+BAA+B,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;AAPW,QAAA,OAAO,WAOlB;AAWF,SAAsB,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAU;;QAC/E,IAAI;YACF,IAAI,OAAmB,CAAC;YAExB,IAAI,EAAE,EAAE;gBACN,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAe,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5D,IAAA,iBAAS,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aAC7B;iBAAM;gBACL,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9D,IAAI,MAAM,KAAK,OAAO,EAAE;oBACtB,IAAA,iBAAS,EAAC,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;iBACpE;qBAAM;oBACL,IAAA,iBAAS,EAAC,OAAO,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC;iBACtC;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;SACb;IACH,CAAC;CAAA;AAlBD,0BAkBC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/datasets/list.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;AAIH,uCAAmE;AAEtD,QAAA,OAAO,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAEpC,QAAA,IAAI,GAAG,eAAe,CAAC;AAE7B,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,OAAO,IAAI;SACR,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,oBAAoB,EAAE,CAAC;SAC/E,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,wBAAwB,EAAE,CAAC;SACtF,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;SAC/E,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,0BAA0B,EAAE,CAAC;SACnF,SAAS,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC5C,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,+BAA+B,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;AARW,QAAA,OAAO,WAQlB;AAYF,SAAsB,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAU;;QACrF,IAAI;YACF,IAAI,OAAmB,CAAC;YAExB,IAAI,EAAE,EAAE;gBACN,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAe,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC5D,IAAI,MAAM,KAAK,OAAO,EAAE;oBACtB,yBAAyB;oBACzB,IAAA,iBAAS,EAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;iBAC3C;qBAAM;oBACL,IAAA,iBAAS,EAAC,QAAQ,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC;iBACvC;aACF;iBAAM;gBACL,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9D,IAAI,IAAI,EAAE;oBACR,OAAO,GAAG,OAAO,CAAC,MAAM,CACtB,CAAC,OAAiB,EAAE,EAAE,CACpB,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAC5F,CAAC;iBACH;gBACD,IAAI,MAAM,KAAK,OAAO,EAAE;oBACtB,yBAAyB;oBACzB,IAAA,iBAAS,EAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;iBAC7F;qBAAM;oBACL,IAAA,iBAAS,EAAC,OAAO,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC;iBACtC;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;SACb;IACH,CAAC;CAAA;AA9BD,0BA8BC;AAED;;;;;;;GAOG;AACH,SAAS,WAAW,CAAC,OAAiB;IACpC,uCAAY,OAAO,KAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAG;AAC5F,CAAC"}

package/dist/commands/datasets/tags.js

@@ -0,0 +1,56 @@
+"use strict";
+/**
+ * Copyright © 2024 Emu Analytics
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
+const utils_1 = require("../../utils");
+exports.command = ['tags <id>'];
+exports.desc = 'Add or remove tags on a dataset.';
+const builder = (args) => {
+    return args
+        .positional('id', { describe: 'Dataset id (or unique prefix)', type: 'string' })
+        .option('add', {
+        alias: 'a',
+        type: 'array',
+        describe: 'One or more tags to add.'
+    })
+        .option('remove', {
+        alias: 'r',
+        type: 'array',
+        describe: 'One or more tags to remove.'
+    });
+};
+exports.builder = builder;
+function handler({ client, id, add, remove, format }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const resource = yield (0, utils_1.resolveResource)(id, client.datasets);
+            const existingTags = resource.metadata.tags;
+            const updatedTagSet = new Set(existingTags);
+            if (add) {
+                add.forEach(tag => updatedTagSet.add(tag));
+            }
+            if (remove) {
+                remove.forEach(tag => updatedTagSet.delete(tag));
+            }
+            const updatedTags = Array.from(updatedTagSet);
+            const updatedMetadata = yield client.datasets.setMetadata(resource.id, 'tags', updatedTags);
+            (0, utils_1.logObject)(format === 'csv' ? updatedMetadata.tags.map((t) => ({ tag: t })) : updatedMetadata.tags, format || 'table');
+        }
+        catch (e) {
+            (0, utils_1.logError)(e);
+        }
+    });
+}
+exports.handler = handler;
+//# sourceMappingURL=tags.js.map

package/dist/commands/datasets/tags.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../../src/commands/datasets/tags.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;AAIH,uCAAmE;AAEtD,QAAA,OAAO,GAAG,CAAC,WAAW,CAAC,CAAC;AAExB,QAAA,IAAI,GAAG,kCAAkC,CAAC;AAEhD,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,OAAO,IAAI;SACR,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,+BAA+B,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC/E,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,0BAA0B;KACrC,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,6BAA6B;KACxC,CAAC,CAAC;AACP,CAAC,CAAC;AAbW,QAAA,OAAO,WAalB;AAUF,SAAsB,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAU;;QACvE,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAe,EAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC5D,MAAM,YAAY,GAAa,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YACtD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;YAE5C,IAAI,GAAG,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;aAC5C;YACD,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aAClD;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAE9C,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YAC5F,IAAA,iBAAS,EACP,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAC/F,MAAM,IAAI,OAAO,CAClB,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;SACb;IACH,CAAC;CAAA;AAtBD,0BAsBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emuanalytics/flow-cli",
-  "version": "1.3.125",
+  "version": "1.3.127",
   "main": "index.js",
   "author": "Robin Summerhill <robin.summerhill@emu-analytics.net",
   "license": "Copyright 2018 Emu Analytics Limited",
@@ -42,7 +42,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@emuanalytics/flow-engine-client": "^1.3.125",
+    "@emuanalytics/flow-engine-client": "^1.3.127",
     "@types/uuid": "^8.3.4",
     "JSONStream": "^1.3.5",
     "chalk": "^2.0.1",
@@ -80,5 +80,5 @@
       "git add"
     ]
   },
-  "gitHead": "e64c9503d859b87b6215fbe2ad3bd33d2f728127"
+  "gitHead": "337b9cebf9afaeb55829b626b6fdbf0f16adb2e3"
 }

package/CHANGELOG.md

@@ -1,59 +0,0 @@
-# Release notes
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## 0.4.2
-
-### Features
-
-- Support CSV format for dataset queries
-- Dataset creation - autodetection of geometry SRID/extent and manual override are supported. (These options were previously only available on dataset update)
-
-## 0.4.1
-### Features
-- Added support for auto-detecting or manually specifying SRID and extent when updating a dataset SQL src.
-- source-srs and target-srs switches changed to source-srid and target-strid. These switches now accept a numeric SRID.
-
-## 0.4.0
-### Features
-- source-srs and target-srs switches added to upload command for SRS conversion during upload. Specify as an OGR2OGR-compatible SRS string e.g. `--target-srs EPSG:4326` (for WGS84), `--target-srs EPSG:3857` (for WebMercator)
-  
-## 0.2.11
-
-### Features
-- New command: `users verify`
-- Verification status of users included with `users list` 
-
-### Bug Fixes
-- Remove all non-printable characters from table cells
-  
-## 0.2.10
-
-### Features
-- New command: `tiles create`
-- New command: `tiles update`
-- Ability to override the map extent of a tilesource
-
-### Bug Fixes
-- Remove trailing whitespace from Dataset SQL source added by editor
-
-## 0.2.9
-
-### Features
-- New command: `styles create`
-- New command: `datasets create`
-- Interactive options added to `datasets update`
-
-### Bug Fixes
-- Dataset SQL queries with newline characters do not break table output
-- All CLI operations now deal correctly with partial IDs
-
-## v0.2.6
-
-### Bugfixes
-- Fix 'multiple prefixes' warning where provided id is an exact match
-  
-## v0.2.5
-
-### Bugfixes
-- Allow changing dataset type attribute (`flow dataset update --type sql --source "..."`)