gitsheets 0.21.3 → 0.21.6

package/commands/query.js

@@ -28,15 +28,23 @@ exports.builder = {
     describe: 'Truncate results to given count',
     type: 'number'
   },
-  'filter.<field>': {
+  'filter': {
+    group: 'Filtering',
     describe: 'Filter results by one or more field values',
+    type: 'array'
+  },
+  'filter.<field>[=<value>]': {
+    group: 'Filtering',
+    describe: 'Field to filter by'
   },
   fields: {
+    group: 'Field selection',
     describe: 'List of fields to order/limit output columns with',
     type: 'array'
   },
-  'fields.<from>': {
-    describe: 'Fields to remap',
+  'fields.<from>=<to>': {
+    group: 'Field selection',
+    describe: 'Field to remap',
     type: 'array'
   }
 };
@@ -125,11 +133,25 @@ async function* limitResult(result, limit) {
 }
 
 async function* mapResult(result, fields) {
+  if (!Array.isArray(fields)) {
+    const fieldsObject = fields;
+    fields = [];
+    for (const fromKey in fieldsObject) {
+      const fieldMap = {};
+      fieldMap[fromKey] = fieldsObject[fromKey];
+      fields.push(fieldMap);
+    }
+  }
+
   for await (const record of result) {
     const output = {};
 
     for (const field of fields) {
-      if (typeof field == 'object') {
+      if (Array.isArray(field)) {
+        for (const fieldValue of field) {
+          output[fieldValue] = record[fieldValue];
+        }
+      } else if (typeof field == 'object') {
         for (const from in field) {
           output[field[from]] = record[from];
         }

package/commands/singer-target.js

@@ -101,11 +101,20 @@ exports.handler = async function singerTarget({
   const clearedSheets = new Set();
   const writtenStreams = new Set();
   for await (const { type, stream, ...message} of readMessages({ jsonlFile })) {
-    const sheet = sheets[stream];
-
     console.log(`${type}\t${stream}`, message);
 
 
+    // ignore unhandled message types for now
+    if (type == 'STATE' || type == 'ACTIVATE_VERSION') {
+      console.warn(`ignoring ${type} message`);
+      continue;
+    }
+
+
+    // get sheet
+    const sheet = sheets[stream];
+
+
     // create schema if needed
     if (!sheet) {
       if (type == 'SCHEMA') {
@@ -129,13 +138,6 @@ exports.handler = async function singerTarget({
     }
 
 
-    // ignore state for now
-    if (type == 'STATE') {
-      console.warn('ignoring STATE message');
-      continue;
-    }
-
-
     // handle record message
     if (type == 'RECORD') {
       if (deleteMissing && !clearedSheets.has(sheet)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitsheets",
-  "version": "0.21.3",
+  "version": "0.21.6",
   "description": "A toolkit for using a git repository to store low-volume, high-touch, human-scale data",
   "main": "lib/GitSheets.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "fast-csv": "^4.3.6",
     "fast-json-patch": "^2.2.1",
     "get-stream": "^5.2.0",
-    "hologit": "^0.40.5",
+    "hologit": "^0.41.3",
     "http-assert": "^1.4.1",
     "koa": "^2.13.1",
     "koa-bodyparser": "^4.3.0",
@@ -39,7 +39,7 @@
     "tmp": "^0.2.1",
     "to-readable-stream": "^2.1.0",
     "winston": "^3.3.3",
-    "yargs": "^13.3.2"
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
     "common-tags": "^1.8.0",