presidium 0.16.21 → 0.16.23

package/.github/workflows/nodejs.yml

@@ -67,7 +67,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 15.x, 16.x, 17.x]
+        node-version: [15.x, 16.x, 17.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2

package/DynamoIndex.js

@@ -150,6 +150,9 @@ DynamoIndex.prototype.query = async function dynamoIndexQuery(
   }
 
   const ExpressionAttributeNames = pipe([
+    ...keyConditionStatements, ...filterExpressionStatements
+  ], [
+    filter(statement => statement.includes(':')),
     fork([
       map(
         statement => statement.trim().startsWith('begins_with')
@@ -169,22 +172,27 @@ DynamoIndex.prototype.query = async function dynamoIndexQuery(
       map(field => ({ [`#${hashJSON(field)}`]: field })),
       {},
     ),
-  ])([...keyConditionStatements, ...filterExpressionStatements])
+  ])
 
   const ExpressionAttributeValues = map.entries(
     ([placeholder, value]) => [`:${placeholder}`, Dynamo.AttributeValue(value)],
   )(values)
 
-  const KeyConditionExpression = keyConditionStatements.map(function (statement) {
-    if (statement.startsWith('begins_with')) {
-      const [field, prefix] = statement // 'begins_with(name, :prefix)'
-        .split(/[()]/)[1] // 'name, :prefix'
-        .split(',').map(trim) // ['name', ':prefix']
-      return `begins_with(#${hashJSON(field)}, ${prefix})`
-    }
-    const [field, rest] = statement.split(/ (.+)/)
-    return `#${hashJSON(field)} ${rest}`
-  }).join(' AND ')
+  const KeyConditionExpression = keyConditionStatements
+    .filter(statement => statement.includes(':'))
+    .map(statement => {
+      if (statement.startsWith('begins_with')) {
+        const [field, prefix] = statement // 'begins_with(name, :prefix)'
+          .split(/[()]/)[1] // 'name, :prefix'
+          .split(',').map(trim) // ['name', ':prefix']
+        return `begins_with(#${hashJSON(field)}, ${prefix})`
+      }
+      const [field, rest] = statement.split(/ (.+)/)
+      return `#${hashJSON(field)} ${rest}`
+    })
+    .join(' AND ')
+
+  console.log(KeyConditionExpression)
 
   const FilterExpression = filterExpressionStatements.map(function (statement) {
     if (statement.startsWith('begins_with')) {

package/DynamoIndex.test.js

@@ -107,6 +107,29 @@ const test = new Test('DynamoIndex', DynamoIndex)
         ScannedCount: 2
       })
 
+    assert.deepEqual(
+      await index.query('status = :status AND createTime > 1000', {
+        status: 'waitlist',
+      }),
+      {
+        Items: [
+          {
+            createTime: { N: '1001' },
+            id: { S: '2' },
+            status: { S: 'waitlist' },
+            name: { S: 'geo' },
+          },
+          {
+            createTime: { N: '1002' },
+            id: { S: '3' },
+            status: { S: 'waitlist' },
+            name: { S: 'john' },
+          }
+        ],
+        Count: 2,
+        ScannedCount: 2
+      })
+
     assert.deepEqual(
       await index.query('status = :status AND createTime BETWEEN :lower AND :upper', {
         status: 'waitlist',

package/Gzip.js

@@ -0,0 +1,29 @@
+const zlib = require('zlib')
+const StringStream = require('./internal/StringStream')
+
+/**
+ * @name Gzip
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * Gzip(raw string) -> gzip stream
+ *
+ * Gzip() -> gzip stream
+ * ```
+ *
+ * @description
+ * ```js
+ * const data = { a: 1 }
+ *
+ * Gzip(JSON.stringify(data)).pipe(response)
+ * ```
+ */
+
+const Gzip = function (raw) {
+  if (raw == null) {
+    return zlib.createGzip()
+  }
+  return StringStream(raw).pipe(zlib.createGzip())
+}
+
+module.exports = Gzip

package/Gzip.test.js

@@ -0,0 +1,30 @@
+const Test = require('thunk-test')
+const assert = require('assert')
+const zlib = require('zlib')
+const Gzip = require('./Gzip')
+const StreamString = require('./internal/StreamString')
+const StringStream = require('./internal/StringStream')
+
+const test = new Test('Gzip', async function () {
+  const raw = 'aaaaabbbbbbbcccc'
+
+  {
+    const transformed = await StreamString(
+      Gzip(raw).pipe(zlib.createGunzip())
+    )
+    assert.equal(raw, transformed)
+  }
+
+  {
+    const transformed = await StreamString(
+      StringStream(raw).pipe(Gzip()).pipe(zlib.createGunzip())
+    )
+    assert.equal(raw, transformed)
+  }
+}).case()
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/internal/StreamString.js

@@ -0,0 +1,14 @@
+// stream Readable => str string
+const StreamString = function (stream) {
+  return new Promise(resolve => {
+    let str = ''
+    stream.on('data', chunk => {
+      str += chunk
+    })
+    stream.on('end', () => {
+      resolve(str)
+    })
+  })
+}
+
+module.exports = StreamString

package/internal/StringStream.js

@@ -0,0 +1,15 @@
+const { Readable } = require('stream')
+
+/**
+ * @name StringStream
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * StringStream(str string)
+ * ```
+ */
+const StringStream = function (str) {
+  return Readable.from([str])
+}
+
+module.exports = StringStream

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.16.21",
+  "version": "0.16.23",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",