@toa.io/extensions.exposition 1.0.0-alpha.112 → 1.0.0-alpha.114

package/features/octets.location.feature

@@ -41,3 +41,43 @@ Feature: Octets location
       | location  |
       | ./bar     |
       | /foo/bar/ |
+
+  Scenario: Executing a workflow with specified location
+    Given the `octets.tester` is running
+    And the annotation:
+      """yaml
+      /:
+        auth:anonymous: true
+        octets:context: octets
+        POST:
+          octets:put:
+            location: /hello/world/
+            workflow:
+              echo: octets.tester.echo
+          io:output: true
+      """
+    When the stream of `lenna.ascii` is received with the following headers:
+      """
+      POST / HTTP/1.1
+      host: nex.toa.io
+      accept: application/yaml, multipart/yaml
+      content-type: application/octet-stream
+      """
+    Then the following reply is sent:
+      """
+      201 Created
+      content-type: multipart/yaml; boundary=cut
+
+      --cut
+
+      id: ${{ id }}
+      type: application/octet-stream
+      size: 8169
+      --cut
+
+      step: echo
+      status: completed
+      output:
+        path: /hello/world/${{ id }}
+      --cut--
+      """

package/features/octets.workflows.feature

@@ -13,11 +13,6 @@ Feature: Octets storage workflows
               - add-foo: octets.tester.foo
                 add-bar: octets.tester.bar
               - add-baz: octets.tester.baz
-        /*:
-          io:output: true
-          GET:
-            octets:get:
-              meta: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
@@ -33,9 +28,10 @@ Feature: Octets storage workflows
 
       --cut
 
-      id: 10cf16b458f759e0d617f2f3d83599ff
-      type: application/octet-stream
+      id: ${{ id }}
       size: 8169
+      type: application/octet-stream
+      checksum: 10cf16b458f759e0d617f2f3d83599ff
       --cut
 
       step: add-foo
@@ -53,6 +49,39 @@ Feature: Octets storage workflows
       --cut--
       """
 
+  Scenario: Composing workflow results
+    Given the `octets.tester` is running
+    And the annotation:
+      """yaml
+      /:
+        auth:anonymous: true
+        octets:context: octets
+        POST:
+          octets:put:
+            workflow:
+              - add-foo: octets.tester.foo
+                add-bar: octets.tester.bar
+              - add-baz: octets.tester.baz
+          flow:compose:
+            checksum: $[0].checksum
+            bar: $[2].output.bar
+      """
+    When the stream of `lenna.ascii` is received with the following headers:
+      """
+      POST / HTTP/1.1
+      host: nex.toa.io
+      accept: application/yaml, multipart/yaml
+      content-type: application/octet-stream
+      """
+    Then the following reply is sent:
+      """
+      201 Created
+      content-type: application/yaml
+
+      checksum: 10cf16b458f759e0d617f2f3d83599ff
+      bar: baz
+      """
+
   Scenario: Getting error when running workflow on `store`
     Given the `octets.tester` is running
     Given the annotation:
@@ -80,7 +109,7 @@ Feature: Octets storage workflows
       content-type: multipart/yaml; boundary=cut
 
       --cut
-      id: 10cf16b458f759e0d617f2f3d83599ff
+      id: ${{ id }}
       type: application/octet-stream
       size: 8169
       --cut
@@ -106,27 +135,32 @@ Feature: Octets storage workflows
         octets:context: octets
         POST:
           octets:put: ~
+          io:output: true
         /*:
           GET:
             octets:get: ~
           DELETE:
             octets:delete:
               workflow:
-                echo: octets.tester.echo
+                echo: octets.tester.id
+            io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
       POST / HTTP/1.1
       host: nex.toa.io
       content-type: application/octet-stream
+      accept: application/yaml
       """
     Then the following reply is sent:
       """
       201 Created
+
+      id: ${{ id }}
       """
     When the following request is received:
       """
-      DELETE /10cf16b458f759e0d617f2f3d83599ff HTTP/1.1
+      DELETE /${{ id }} HTTP/1.1
       host: nex.toa.io
       accept: application/yaml, multipart/yaml
       """
@@ -138,12 +172,12 @@ Feature: Octets storage workflows
       --cut
       step: echo
       status: completed
-      output: 10cf16b458f759e0d617f2f3d83599ff
+      output: ${{ id }}
       --cut--
       """
     When the following request is received:
       """
-      GET /10cf16b458f759e0d617f2f3d83599ff HTTP/1.1
+      GET /${{ id }} HTTP/1.1
       host: nex.toa.io
       """
     Then the following reply is sent:
@@ -160,6 +194,7 @@ Feature: Octets storage workflows
         octets:context: octets
         POST:
           octets:put: ~
+          io:output: true
         /*:
           GET:
             octets:get: ~
@@ -167,20 +202,24 @@ Feature: Octets storage workflows
             octets:delete:
               workflow:
                 err: octets.tester.err
+            io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
       POST / HTTP/1.1
       host: nex.toa.io
       content-type: application/octet-stream
+      accept: application/yaml
       """
     Then the following reply is sent:
       """
       201 Created
+
+      id: ${{ id }}
       """
     When the following request is received:
       """
-      DELETE /10cf16b458f759e0d617f2f3d83599ff HTTP/1.1
+      DELETE /${{ id }} HTTP/1.1
       host: nex.toa.io
       accept: application/yaml, multipart/yaml
       """
@@ -200,7 +239,7 @@ Feature: Octets storage workflows
       """
     When the following request is received:
       """
-      GET /10cf16b458f759e0d617f2f3d83599ff HTTP/1.1
+      GET /${{ id }} HTTP/1.1
       host: nex.toa.io
       """
     Then the following reply is sent:
@@ -220,6 +259,7 @@ Feature: Octets storage workflows
             octets:put:
               workflow:
                 concat: octets.tester.concat
+            io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
@@ -235,7 +275,7 @@ Feature: Octets storage workflows
 
       --cut
 
-      id: 10cf16b458f759e0d617f2f3d83599ff
+      id: ${{ id }}
       type: application/octet-stream
       size: 8169
       --cut
@@ -258,6 +298,7 @@ Feature: Octets storage workflows
             octets:put:
               workflow:
                 authority: octets.tester.authority
+            io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
@@ -273,7 +314,7 @@ Feature: Octets storage workflows
 
       --cut
 
-      id: 10cf16b458f759e0d617f2f3d83599ff
+      id: ${{ id }}
       type: application/octet-stream
       size: 8169
       --cut
@@ -293,24 +334,29 @@ Feature: Octets storage workflows
         octets:context: octets
         POST:
           octets:put: ~
+          io:output: true
         /*:
           DELETE:
             octets:workflow:
-              echo: octets.tester.echo
+              id: octets.tester.id
+            io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
       POST / HTTP/1.1
       host: nex.toa.io
       content-type: application/octet-stream
+      accept: application/yaml
       """
     Then the following reply is sent:
       """
       201 Created
+
+      id: ${{ id }}
       """
     When the following request is received:
       """
-      DELETE /10cf16b458f759e0d617f2f3d83599ff HTTP/1.1
+      DELETE /${{ id }} HTTP/1.1
       host: nex.toa.io
       accept: application/yaml, multipart/yaml
       """
@@ -321,9 +367,9 @@ Feature: Octets storage workflows
 
       --cut
 
-      step: echo
+      step: id
       status: completed
-      output: 10cf16b458f759e0d617f2f3d83599ff
+      output: ${{ id }}
 
       --cut--
       """
@@ -340,6 +386,7 @@ Feature: Octets storage workflows
             workflow:
               - foo: octets.tester.foo
               - yield: octets.tester.yield
+          io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
@@ -355,7 +402,7 @@ Feature: Octets storage workflows
 
       --cut
 
-      id: 10cf16b458f759e0d617f2f3d83599ff
+      id: ${{ id }}
       type: application/octet-stream
 
       --cut
@@ -392,6 +439,7 @@ Feature: Octets storage workflows
           octets:put:
             workflow:
               yield: octets.tester.yex
+          io:output: true
       """
     When the stream of `lenna.ascii` is received with the following headers:
       """
@@ -407,7 +455,7 @@ Feature: Octets storage workflows
 
       --cut
 
-      id: 10cf16b458f759e0d617f2f3d83599ff
+      id: ${{ id }}
       type: application/octet-stream
 
       --cut
@@ -435,12 +483,12 @@ Feature: Octets storage workflows
       /:
         auth:anonymous: true
         octets:context: octets
+        io:output: true
         POST:
           octets:put:
             workflow:
               foo: task:octets.tester.foo
         /*:
-          io:output: true
           GET:
             octets:get:
               meta: true
@@ -459,7 +507,7 @@ Feature: Octets storage workflows
 
       --cut
 
-      id: 10cf16b458f759e0d617f2f3d83599ff
+      id: ${{ id }}
 
       --cut
 

package/features/steps/components/octets.tester/manifest.toa.yaml

@@ -14,6 +14,7 @@ operations:
   bar: *operation
   baz: *operation
   err: *operation
+  id: *operation
   echo: *operation
   concat: *operation
   yield: *operation

package/features/steps/components/octets.tester/operations/echo.js

@@ -1,7 +1,7 @@
 'use strict'
 
 function echo (input) {
-  return input.entry.id
+  return input
 }
 
 exports.computation = echo

package/features/steps/components/octets.tester/operations/id.js

@@ -0,0 +1,7 @@
+'use strict'
+
+function id (input) {
+  return input.entry.id
+}
+
+exports.computation = id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.exposition",
-  "version": "1.0.0-alpha.112",
+  "version": "1.0.0-alpha.114",
   "description": "Toa Exposition",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -54,12 +54,12 @@
   },
   "devDependencies": {
     "@toa.io/agent": "1.0.0-alpha.112",
-    "@toa.io/extensions.storages": "1.0.0-alpha.106",
+    "@toa.io/extensions.storages": "1.0.0-alpha.113",
     "@types/bcryptjs": "2.4.3",
     "@types/cors": "2.8.13",
     "@types/http-cache-semantics": "4.0.4",
     "@types/negotiator": "0.6.1",
     "jest-esbuild": "0.3.0"
   },
-  "gitHead": "eba9a2468bb5f55fa6b227d8a615cd6150aeee9e"
+  "gitHead": "cb31ca0e47781b5f47412f002b62591169be1a4e"
 }

package/source/Directive.ts

@@ -11,17 +11,24 @@ export class Directives implements RTD.Directives {
   }
 
   public async preflight (context: Context, parameters: RTD.Parameter[]): Promise<Output> {
+    let output = null
+
     for (const set of this.sets) {
       if (set.family.preflight === undefined)
         continue
 
-      const output = await set.family.preflight(set.directives, context, parameters)
+      const out = await set.family.preflight(set.directives, context, parameters)
+
+      if (out === null)
+        continue
 
       if (output !== null)
-        return output
+        throw new Error('Multiple preflight directives responded')
+      else
+        output = out
     }
 
-    return null
+    return output
   }
 
   public async settle (context: Context, response: OutgoingMessage): Promise<void> {

package/source/directives/octets/Delete.ts

@@ -4,7 +4,7 @@ import * as schemas from './schemas'
 import { Workflow } from './workflows'
 import { Directive } from './Directive'
 import type { Parameter } from '../../RTD'
-import type { Unit } from './workflows'
+import type { Unit, Location } from './workflows'
 import type { Maybe } from '@toa.io/types'
 import type { Component } from '@toa.io/core'
 import type { Output } from '../../io'
@@ -17,7 +17,7 @@ export class Delete extends Directive {
 
   private readonly workflow?: Workflow
   private readonly discovery: Promise<Component>
-  private storage: Component | null = null
+  private storage!: Component
 
   public constructor (options: Options | null, discovery: Promise<Component>, remotes: Remotes) {
     super()
@@ -55,8 +55,7 @@ export class Delete extends Directive {
   }
 
   private async delete (storage: string, input: Input): Promise<void> {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    await this.storage!.invoke('delete',
+    await this.storage.invoke('delete',
       {
         input: {
           storage,
@@ -68,8 +67,13 @@ export class Delete extends Directive {
   // eslint-disable-next-line max-params
   private async * execute
   (input: Input, storage: string, entry: Entry, parameters: Parameter[]): AsyncGenerator {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    for await (const chunk of this.workflow!.execute(input, storage, entry, parameters)) {
+    const location: Location = {
+      storage,
+      authority: input.authority,
+      path: input.request.url
+    }
+
+    for await (const chunk of this.workflow!.execute(location, entry, parameters)) {
       yield chunk
 
       if (typeof chunk === 'object' && chunk !== null && 'error' in chunk)

package/source/directives/octets/Put.ts

@@ -8,7 +8,7 @@ import { Directive } from './Directive'
 import { toBytes } from './bytes'
 import type { Readable } from 'stream'
 import type { Parameter } from '../../RTD'
-import type { Unit } from './workflows'
+import type { Unit, Location } from './workflows'
 import type { Entry } from '@toa.io/extensions.storages'
 import type { Remotes } from '../../Remotes'
 import type { Err } from 'error-value'
@@ -94,7 +94,13 @@ export class Put extends Directive {
 
     stream.push(entry)
 
-    this.workflow!.execute(input, storage, entry, parameters).pipe(stream)
+    const location: Location = {
+      storage,
+      authority: input.authority,
+      path: this.location ?? input.request.url
+    }
+
+    this.workflow!.execute(location, entry, parameters).pipe(stream)
 
     return stream
   }

package/source/directives/octets/Workflow.ts

@@ -2,7 +2,7 @@ import { NotFound } from '../../HTTP'
 import * as schemas from './schemas'
 import { Workflow } from './workflows'
 import { Directive } from './Directive'
-import type { Unit } from './workflows'
+import type { Unit, Location } from './workflows'
 import type { Input } from './types'
 import type { Component } from '@toa.io/core'
 import type { Output } from '../../io'
@@ -40,9 +40,15 @@ export class WorkflowDirective extends Directive {
     if (entry instanceof Error)
       throw new NotFound()
 
+    const location: Location = {
+      storage,
+      authority: input.authority,
+      path: input.request.url
+    }
+
     return {
       status: 202,
-      body: this.workflow.execute(input, storage, entry, parameters)
+      body: this.workflow.execute(location, entry, parameters)
     }
   }
 }

package/source/directives/octets/workflows/Workflow.ts

@@ -4,7 +4,6 @@ import { Execution } from './Execution'
 import type { Entry } from '@toa.io/extensions.storages'
 import type { Context } from './Execution'
 import type { Parameter } from '../../../RTD'
-import type { Input } from '../types'
 import type { Remotes } from '../../../Remotes'
 
 export class Workflow {
@@ -19,19 +18,28 @@ export class Workflow {
     this.remotes = remotes
   }
 
-  // eslint-disable-next-line max-params
-  public execute (input: Input, storage: string, entry: Entry, params: Parameter[]): Execution {
-    const path = posix.join(input.request.url, entry.id)
-    const authority = input.authority
+  public execute (location: Location, entry: Entry, params: Parameter[]): Execution {
     const parameters: Record<string, string> = {}
 
     for (const { name, value } of params)
       parameters[name] = value
 
-    const context: Context = { authority, storage, path, entry, parameters }
+    const context: Context = {
+      authority: location.authority,
+      storage: location.storage,
+      path: posix.join(location.path, entry.id),
+      entry,
+      parameters
+    }
 
     return new Execution(context, this.units, this.remotes)
   }
 }
 
+export interface Location {
+  storage: string
+  authority: string
+  path: string
+}
+
 export type Unit = Record<string, string>

package/source/directives/octets/workflows/index.ts

@@ -1 +1 @@
-export { Workflow, type Unit } from './Workflow'
+export { Workflow, type Unit, type Location } from './Workflow'

package/transpiled/Directive.js

@@ -7,14 +7,19 @@ class Directives {
         this.sets = sets;
     }
     async preflight(context, parameters) {
+        let output = null;
         for (const set of this.sets) {
             if (set.family.preflight === undefined)
                 continue;
-            const output = await set.family.preflight(set.directives, context, parameters);
+            const out = await set.family.preflight(set.directives, context, parameters);
+            if (out === null)
+                continue;
             if (output !== null)
-                return output;
+                throw new Error('Multiple preflight directives responded');
+            else
+                output = out;
         }
-        return null;
+        return output;
     }
     async settle(context, response) {
         for (const set of this.sets)

package/transpiled/Directive.js.map

@@ -1 +1 @@
-{"version":3,"file":"Directive.js","sourceRoot":"","sources":["../source/Directive.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Directive.js","sourceRoot":"","sources":["../source/Directive.ts"],"names":[],"mappings":";;;AAKA,MAAa,UAAU;IACJ,IAAI,CAAoB;IAEzC,YAAoB,IAAwB;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAE,OAAgB,EAAE,UAA2B;QACnE,IAAI,MAAM,GAAG,IAAI,CAAA;QAEjB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS;gBACpC,SAAQ;YAEV,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;YAE3E,IAAI,GAAG,KAAK,IAAI;gBACd,SAAQ;YAEV,IAAI,MAAM,KAAK,IAAI;gBACjB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;;gBAE1D,MAAM,GAAG,GAAG,CAAA;QAChB,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,MAAM,CAAE,OAAgB,EAAE,QAAyB;QAC9D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI;YACzB,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS;gBACjC,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAChE,CAAC;CACF;AAjCD,gCAiCC;AAED,MAAa,iBAAiB;IACX,OAAO,CAAS;IAChB,QAAQ,GAAwC,EAAE,CAAA;IAClD,SAAS,GAAa,EAAE,CAAA;IAEzC,YAAoB,QAA+B,EAAE,OAAgB;QACnE,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;YAEnC,IAAI,MAAM,CAAC,SAAS;gBAClB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACpC,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,MAAM,CAAE,YAAoC;QACjD,MAAM,MAAM,GAAwB,EAAE,CAAA;QACtC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAEzC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACzB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAExE,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YAEhD,IAAI,MAAM,KAAK,SAAS;gBACtB,MAAM,IAAI,KAAK,CAAC,qBAAqB,WAAW,CAAC,MAAM,gBAAgB,CAAC,CAAA;YAE1E,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YAElF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;YAC1B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACnC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,IAAI,GAAuB,EAAE,CAAA;QAEnC,KAAK,MAAM,MAAM,IAAI,SAAS;YAC5B,IAAI,CAAC,IAAI,CAAC;gBACR,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC7B,UAAU,EAAE,EAAE;aACf,CAAC,CAAA;QAEJ,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC;gBACR,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC7B,UAAU;aACX,CAAC,CAAA;QAEJ,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;CACF;AApDD,8CAoDC;AAEY,QAAA,SAAS,GAAyB,IAAI,GAAG,CAAC;IACrD,CAAC,WAAW,EAAE,gBAAgB,CAAC;IAC/B,CAAC,QAAQ,EAAE,aAAa,CAAC;IACzB,CAAC,IAAI,EAAE,SAAS,CAAC;IACjB,CAAC,MAAM,EAAE,WAAW,CAAC;IACrB,CAAC,MAAM,EAAE,WAAW,CAAC;IACrB,CAAC,QAAQ,EAAE,aAAa,CAAC;IACzB,CAAC,OAAO,EAAE,UAAU,CAAC;IACrB,CAAC,QAAQ,EAAE,WAAW,CAAC;IACvB,CAAC,WAAW,EAAE,eAAe,CAAC;CAC/B,CAAC,CAAA"}

package/transpiled/directives/octets/Delete.js

@@ -33,7 +33,7 @@ class Delete extends Directive_1.Directive {
     targeted = true;
     workflow;
     discovery;
-    storage = null;
+    storage;
     constructor(options, discovery, remotes) {
         super();
         schemas.remove.validate(options);
@@ -61,7 +61,6 @@ class Delete extends Directive_1.Directive {
         return output;
     }
     async delete(storage, input) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await this.storage.invoke('delete', {
             input: {
                 storage,
@@ -71,8 +70,12 @@ class Delete extends Directive_1.Directive {
     }
     // eslint-disable-next-line max-params
     async *execute(input, storage, entry, parameters) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        for await (const chunk of this.workflow.execute(input, storage, entry, parameters)) {
+        const location = {
+            storage,
+            authority: input.authority,
+            path: input.request.url
+        };
+        for await (const chunk of this.workflow.execute(location, entry, parameters)) {
             yield chunk;
             if (typeof chunk === 'object' && chunk !== null && 'error' in chunk)
                 return;

package/transpiled/directives/octets/Delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"Delete.js","sourceRoot":"","sources":["../../../source/directives/octets/Delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,qCAAqC;AACrC,mDAAoC;AACpC,2CAAsC;AACtC,2CAAuC;AAUvC,MAAa,MAAO,SAAQ,qBAAS;IACnB,QAAQ,GAAG,IAAI,CAAA;IAEd,QAAQ,CAAW;IACnB,SAAS,CAAoB;IACtC,OAAO,GAAqB,IAAI,CAAA;IAExC,YAAoB,OAAuB,EAAE,SAA6B,EAAE,OAAgB;QAC1F,KAAK,EAAE,CAAA;QACP,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAEhC,IAAI,OAAO,EAAE,QAAQ,KAAK,SAAS;YACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEzD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK,CAAE,OAAe,EAAE,KAAY,EAAE,UAAuB;QACxE,IAAI,CAAC,OAAO,KAAK,MAAM,IAAI,CAAC,SAAS,CAAA;QAErC,MAAM,MAAM,GAAW,EAAE,CAAA;QAEzB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAe,MAAM,EAC1D;gBACE,KAAK,EAAE;oBACL,OAAO;oBACP,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG;iBACxB;aACF,CAAC,CAAA;YAEJ,IAAI,KAAK,YAAY,KAAK;gBACxB,MAAM,IAAI,eAAQ,EAAE,CAAA;YAEtB,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;YACnB,MAAM,CAAC,IAAI,GAAG,iBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAA;QAC9E,CAAC;;YACC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAEnC,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,MAAM,CAAE,OAAe,EAAE,KAAY;QACjD,oEAAoE;QACpE,MAAM,IAAI,CAAC,OAAQ,CAAC,MAAM,CAAC,QAAQ,EACjC;YACE,KAAK,EAAE;gBACL,OAAO;gBACP,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG;aACxB;SACF,CAAC,CAAA;IACN,CAAC;IAED,sCAAsC;IAC9B,KAAK,CAAC,CAAE,OAAO,CACtB,KAAY,EAAE,OAAe,EAAE,KAAY,EAAE,UAAuB;QACnE,oEAAoE;QACpE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,QAAS,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC;YACpF,MAAM,KAAK,CAAA;YAEX,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK;gBACjE,OAAM;QACV,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACnC,CAAC;CACF;AAlED,wBAkEC"}
+{"version":3,"file":"Delete.js","sourceRoot":"","sources":["../../../source/directives/octets/Delete.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,qCAAqC;AACrC,mDAAoC;AACpC,2CAAsC;AACtC,2CAAuC;AAUvC,MAAa,MAAO,SAAQ,qBAAS;IACnB,QAAQ,GAAG,IAAI,CAAA;IAEd,QAAQ,CAAW;IACnB,SAAS,CAAoB;IACtC,OAAO,CAAY;IAE3B,YAAoB,OAAuB,EAAE,SAA6B,EAAE,OAAgB;QAC1F,KAAK,EAAE,CAAA;QACP,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAEhC,IAAI,OAAO,EAAE,QAAQ,KAAK,SAAS;YACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEzD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK,CAAE,OAAe,EAAE,KAAY,EAAE,UAAuB;QACxE,IAAI,CAAC,OAAO,KAAK,MAAM,IAAI,CAAC,SAAS,CAAA;QAErC,MAAM,MAAM,GAAW,EAAE,CAAA;QAEzB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAe,MAAM,EAC1D;gBACE,KAAK,EAAE;oBACL,OAAO;oBACP,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG;iBACxB;aACF,CAAC,CAAA;YAEJ,IAAI,KAAK,YAAY,KAAK;gBACxB,MAAM,IAAI,eAAQ,EAAE,CAAA;YAEtB,MAAM,CAAC,MAAM,GAAG,GAAG,CAAA;YACnB,MAAM,CAAC,IAAI,GAAG,iBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAA;QAC9E,CAAC;;YACC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAEnC,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,MAAM,CAAE,OAAe,EAAE,KAAY;QACjD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAChC;YACE,KAAK,EAAE;gBACL,OAAO;gBACP,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG;aACxB;SACF,CAAC,CAAA;IACN,CAAC;IAED,sCAAsC;IAC9B,KAAK,CAAC,CAAE,OAAO,CACtB,KAAY,EAAE,OAAe,EAAE,KAAY,EAAE,UAAuB;QACnE,MAAM,QAAQ,GAAa;YACzB,OAAO;YACP,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG;SACxB,CAAA;QAED,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,QAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC;YAC9E,MAAM,KAAK,CAAA;YAEX,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK;gBACjE,OAAM;QACV,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACnC,CAAC;CACF;AAtED,wBAsEC"}

package/transpiled/directives/octets/Put.js

@@ -84,7 +84,12 @@ class Put extends Directive_1.Directive {
     execute(input, storage, entry, parameters) {
         const stream = new node_stream_1.PassThrough({ objectMode: true });
         stream.push(entry);
-        this.workflow.execute(input, storage, entry, parameters).pipe(stream);
+        const location = {
+            storage,
+            authority: input.authority,
+            path: this.location ?? input.request.url
+        };
+        this.workflow.execute(location, entry, parameters).pipe(stream);
         return stream;
     }
     throw(error) {