@toa.io/extensions.introspection 1.0.0-alpha.270 → 1.0.0-alpha.273

package/features/steps/Map.ts

@@ -4,7 +4,7 @@ import { readdirSync } from 'node:fs'
 import { setTimeout } from 'node:timers/promises'
 import { MongoClient } from 'mongodb'
 import { after, before, binding, then, when } from 'cucumber-tsflow'
-import { parse } from '@toa.io/yaml'
+import { load as parse } from 'js-yaml'
 import { match } from '@toa.io/generic'
 import * as boot from '@toa.io/boot'
 import * as stage from '@toa.io/userland/stage'
@@ -19,7 +19,7 @@ export class Map {
 
   @when('the `{word}` is called with:')
   public async call (endpoint: string, yaml: string): Promise<void> {
-    const request = parse<Request>(yaml)
+    const request = parse(yaml) as Request
     const [operation, component, namespace = 'default'] = endpoint.split('.').reverse()
 
     // an operation may throw, and that is exactly what one of the scenarios is about
@@ -28,22 +28,22 @@ export class Map {
 
   @then('the map contains a node:')
   public async node (yaml: string): Promise<void> {
-    await this.eventually('introspection.nodes', parse(yaml))
+    await this.eventually('introspection.nodes', parse(yaml) as object)
   }
 
   @then('the map contains an edge:')
   public async edge (yaml: string): Promise<void> {
-    await this.eventually('introspection.edges', parse(yaml))
+    await this.eventually('introspection.edges', parse(yaml) as object)
   }
 
   @then('the map contains no node:')
   public async noNode (yaml: string): Promise<void> {
-    await this.never('introspection.nodes', parse(yaml))
+    await this.never('introspection.nodes', parse(yaml) as object)
   }
 
   @then('the map contains no edge:')
   public async noEdge (yaml: string): Promise<void> {
-    await this.never('introspection.edges', parse(yaml))
+    await this.never('introspection.edges', parse(yaml) as object)
   }
 
   @when('the components are stopped')

package/features/steps/components/probe.discreet/manifest.toa.yaml

@@ -8,5 +8,9 @@ introspection:
 operations:
   ping:
     input:
-      a: number
-    output: number
+      properties:
+        a:
+          type: number
+      type: object
+    output:
+      type: number

package/features/steps/components/probe.quiet/manifest.toa.yaml

@@ -7,5 +7,9 @@ introspection: false
 operations:
   ping:
     input:
-      a: number
-    output: number
+      properties:
+        a:
+          type: number
+      type: object
+    output:
+      type: number

package/features/steps/components/probe.source/manifest.toa.yaml

@@ -5,22 +5,36 @@ entity:
   associated: true
   storage: null
   schema:
-    value:
-      type: integer
-      default: 0
-    secret: string
+    properties:
+      value:
+        type: integer
+        default: 0
+      secret:
+        type: string
+    type: object
 
 operations:
   transit:
     concurrency: retry
     input:
-      value: .
-      secret: .
+      properties:
+        value:
+          type: string
+          default: .
+        secret:
+          type: string
+          default: .
+      type: object
   relay:
     input:
-      a: number
-      b: number
-    output: number
+      properties:
+        a:
+          type: number
+        b:
+          type: number
+      type: object
+    output:
+      type: number
   crash: {}
   fail:
     errors:

package/features/steps/components/probe.target/manifest.toa.yaml

@@ -4,16 +4,23 @@ name: target
 entity:
   storage: null
   schema:
-    counted:
-      type: integer
-      default: 0
+    properties:
+      counted:
+        type: integer
+        default: 0
+    type: object
 
 operations:
   compute:
     input:
-      a: number
-      b: number
-    output: number
+      properties:
+        a:
+          type: number
+        b:
+          type: number
+      type: object
+    output:
+      type: number
   count:
     concurrency: retry
     input:

package/features/steps/config.ts

@@ -1,5 +1,4 @@
 import { setDefaultTimeout } from '@cucumber/cucumber'
-import { encode } from '@toa.io/generic'
 
 process.env.TOA_DEV = '1'
 
@@ -8,7 +7,7 @@ process.env.TOA_DEV = '1'
  * factories per process — so the context level of the annotation is fixed for
  * a whole run. `npm run features` therefore makes a pass per configuration.
  */
-process.env.TOA_INTROSPECTION = encode({
+process.env.TOA_INTROSPECTION = JSON.stringify({
   samples: process.env.TOA_INTROSPECTION_SAMPLES === '1',
   interval: Number(process.env.TOA_INTROSPECTION_INTERVAL ?? 1),
   threshold: 64,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.introspection",
-  "version": "1.0.0-alpha.270",
+  "version": "1.0.0-alpha.273",
   "description": "Toa Introspection",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -17,10 +17,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.270",
-    "@toa.io/generic": "1.0.0-alpha.254",
-    "@toa.io/schemas": "1.0.0-alpha.270",
-    "openspan": "1.0.0-alpha.270"
+    "@toa.io/core": "1.0.0-alpha.273",
+    "@toa.io/generic": "1.0.0-alpha.273",
+    "@toa.io/schemas": "1.0.0-alpha.273",
+    "openspan": "1.0.0-alpha.272"
   },
   "scripts": {
     "transpile": "npx tsc && npx tsc -p ./components/introspection.nodes && npx tsc -p ./components/introspection.edges",
@@ -28,5 +28,5 @@
     "prepack": "npm run build:ui",
     "features": "npx cucumber-js --tags 'not @samples and not @shutdown' && TOA_INTROSPECTION_SAMPLES=1 npx cucumber-js --tags @samples && TOA_INTROSPECTION_INTERVAL=3600 npx cucumber-js --tags @shutdown"
   },
-  "gitHead": "94400bdd411b4c25074ffcf58184580ddd060268"
+  "gitHead": "ad3284850ece95ffd5325fd0995707fc144c9c3d"
 }

package/schemas/annotation.cos.yaml

@@ -1,21 +1,31 @@
 # context.toa.yaml introspection annotation
-samples: boolean
-interval:
-  type: integer
-  minimum: 1
-threshold:
-  type: integer
-  minimum: 1
-ui: boolean
-resources:
-  # `null` deploys the service without any, which every deployment has to state one way
-  # or the other — see `migrations/263.md`.
-  type: object
-  nullable: true
-  properties:
-    cpu: &constraint
-      type: array
-      items: { type: string }
-      minItems: 2
-      maxItems: 2
-    memory: *constraint
+properties:
+  samples:
+    type: boolean
+  interval:
+    type: integer
+    minimum: 1
+  threshold:
+    type: integer
+    minimum: 1
+  ui:
+    type: boolean
+  resources:
+    # `null` deploys the service without any, which every deployment has to state one way
+    # or the other — see `migrations/263.md`.
+    type: object
+    nullable: true
+    properties:
+      cpu:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+      memory:
+        type: array
+        items:
+          type: string
+        minItems: 2
+        maxItems: 2
+type: object

package/schemas/declaration.cos.yaml

@@ -1,2 +1,5 @@
 # manifest.toa.yaml introspection declaration
-samples: boolean
+properties:
+  samples:
+    type: boolean
+type: object

package/source/annotation.ts

@@ -1,4 +1,3 @@
-import { decode } from '@toa.io/generic'
 import { DEFAULT_INTERVAL, DEFAULT_THRESHOLD, DENIED, ENV } from './const'
 import type { Resources } from '@toa.io/operations'
 
@@ -54,7 +53,7 @@ export function environment (): Options | null {
   if (value === undefined)
     return null
 
-  return decode<Options>(value)
+  return JSON.parse(value) as Options
 }
 
 export function component (declaration: Declaration | null | undefined): Declaration {

package/source/describe.ts

@@ -4,8 +4,8 @@ import type { Manifest } from '@toa.io/norm'
 /**
  * Turns a normalized component manifest into the node of the map.
  *
- * Everything here is already expanded by norm: concise schemas are resolved and
- * the prototype chain is collapsed, so this is the shape the runtime actually runs.
+ * Everything here is already normalized by norm: the prototype chain is collapsed,
+ * so this is the shape the runtime actually runs.
  */
 export function describe (manifest: Manifest): Node {
   return {

package/source/extension.ts

@@ -1,4 +1,3 @@
-import { encode } from '@toa.io/generic'
 import { options } from './annotation'
 import { components } from './Composition'
 import { ENV, UI_PATH, UI_PORT } from './const'
@@ -40,6 +39,6 @@ export function deployment (_: Instances<unknown>, annotation?: Annotation): Dep
 
   return {
     services: [service],
-    variables: { global: [{ name: ENV, value: encode(opts) }] }
+    variables: { global: [{ name: ENV, value: JSON.stringify(opts) }] }
   }
 }

package/transpiled/annotation.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settings = exports.component = exports.environment = exports.options = exports.DISABLED = void 0;
-const generic_1 = require("@toa.io/generic");
 const const_1 = require("./const");
 exports.DISABLED = { enabled: false, samples: false };
 function options(annotation) {
@@ -19,7 +18,7 @@ function environment() {
     const value = process.env[const_1.ENV];
     if (value === undefined)
         return null;
-    return (0, generic_1.decode)(value);
+    return JSON.parse(value);
 }
 exports.environment = environment;
 function component(declaration) {

package/transpiled/annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotation.js","sourceRoot":"","sources":["../source/annotation.ts"],"names":[],"mappings":";;;AAAA,6CAAwC;AACxC,mCAA0E;AAmC7D,QAAA,QAAQ,GAAa,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;AAEpE,SAAgB,OAAO,CAAE,UAAuB;IAC9C,MAAM,WAAW,GAAG,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;IAEtF,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,IAAI;QACrC,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,wBAAgB;QAClD,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,yBAAiB;QACrD,EAAE,EAAE,WAAW,CAAC,EAAE,KAAK,KAAK;KAC7B,CAAA;AACH,CAAC;AATD,0BASC;AAED,8DAA8D;AAC9D,SAAgB,WAAW;IACzB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAG,CAAC,CAAA;IAE9B,IAAI,KAAK,KAAK,SAAS;QACrB,OAAO,IAAI,CAAA;IAEb,OAAO,IAAA,gBAAM,EAAU,KAAK,CAAC,CAAA;AAC/B,CAAC;AAPD,kCAOC;AAED,SAAgB,SAAS,CAAE,WAA2C;IACpE,IAAI,WAAW,KAAK,KAAK;QACvB,OAAO,KAAK,CAAA;IAEd,uEAAuE;IACvE,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,SAAS;QACnD,OAAO,EAAE,CAAA;IAEX,OAAO,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAA;AAClF,CAAC;AATD,8BASC;AAED;;;;GAIG;AACH,SAAgB,QAAQ,CAAE,SAAiB,EAAE,WAAwB,EAAE,IAAoB;IACzF,IAAI,IAAI,KAAK,IAAI,IAAI,WAAW,KAAK,KAAK;QACxC,OAAO,gBAAQ,CAAA;IAEjB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,cAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAEvF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AACnC,CAAC;AAPD,4BAOC"}
+{"version":3,"file":"annotation.js","sourceRoot":"","sources":["../source/annotation.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAmC7D,QAAA,QAAQ,GAAa,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;AAEpE,SAAgB,OAAO,CAAE,UAAuB;IAC9C,MAAM,WAAW,GAAG,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;IAEtF,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,IAAI;QACrC,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,wBAAgB;QAClD,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,yBAAiB;QACrD,EAAE,EAAE,WAAW,CAAC,EAAE,KAAK,KAAK;KAC7B,CAAA;AACH,CAAC;AATD,0BASC;AAED,8DAA8D;AAC9D,SAAgB,WAAW;IACzB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAG,CAAC,CAAA;IAE9B,IAAI,KAAK,KAAK,SAAS;QACrB,OAAO,IAAI,CAAA;IAEb,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAY,CAAA;AACrC,CAAC;AAPD,kCAOC;AAED,SAAgB,SAAS,CAAE,WAA2C;IACpE,IAAI,WAAW,KAAK,KAAK;QACvB,OAAO,KAAK,CAAA;IAEd,uEAAuE;IACvE,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,SAAS;QACnD,OAAO,EAAE,CAAA;IAEX,OAAO,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAA;AAClF,CAAC;AATD,8BASC;AAED;;;;GAIG;AACH,SAAgB,QAAQ,CAAE,SAAiB,EAAE,WAAwB,EAAE,IAAoB;IACzF,IAAI,IAAI,KAAK,IAAI,IAAI,WAAW,KAAK,KAAK;QACxC,OAAO,gBAAQ,CAAA;IAEjB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,cAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAEvF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AACnC,CAAC;AAPD,4BAOC"}

package/transpiled/describe.d.ts

@@ -3,7 +3,7 @@ import type { Manifest } from '@toa.io/norm';
 /**
  * Turns a normalized component manifest into the node of the map.
  *
- * Everything here is already expanded by norm: concise schemas are resolved and
- * the prototype chain is collapsed, so this is the shape the runtime actually runs.
+ * Everything here is already normalized by norm: the prototype chain is collapsed,
+ * so this is the shape the runtime actually runs.
  */
 export declare function describe(manifest: Manifest): Node;

package/transpiled/describe.js

@@ -4,8 +4,8 @@ exports.describe = void 0;
 /**
  * Turns a normalized component manifest into the node of the map.
  *
- * Everything here is already expanded by norm: concise schemas are resolved and
- * the prototype chain is collapsed, so this is the shape the runtime actually runs.
+ * Everything here is already normalized by norm: the prototype chain is collapsed,
+ * so this is the shape the runtime actually runs.
  */
 function describe(manifest) {
     return {

package/transpiled/extension.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployment = exports.standalone = void 0;
-const generic_1 = require("@toa.io/generic");
 const annotation_1 = require("./annotation");
 const Composition_1 = require("./Composition");
 const const_1 = require("./const");
@@ -57,7 +56,7 @@ function deployment(_, annotation) {
     }
     return {
         services: [service],
-        variables: { global: [{ name: const_1.ENV, value: (0, generic_1.encode)(opts) }] }
+        variables: { global: [{ name: const_1.ENV, value: JSON.stringify(opts) }] }
     };
 }
 exports.deployment = deployment;

package/transpiled/extension.js.map

@@ -1 +1 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../source/extension.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,6CAAsC;AACtC,+CAA0C;AAC1C,mCAA+C;AAC/C,mDAAoC;AAIvB,QAAA,UAAU,GAAG,IAAI,CAAA;AAE9B;;;;;;GAMG;AACH,SAAgB,UAAU,CAAE,CAAqB,EAAE,UAAuB;IACxE,IAAI,UAAU,KAAK,KAAK;QACtB,OAAO,EAAE,CAAA;IAEX,IAAI,UAAU,KAAK,SAAS;QAC1B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IAEzC,MAAM,IAAI,GAAG,IAAA,oBAAO,EAAC,UAAU,CAAC,CAAA;IAEhC,MAAM,OAAO,GAAY;QACvB,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO;QAC3C,UAAU,EAAE,IAAA,wBAAU,GAAE,CAAC,MAAM;QAC/B,SAAS,EAAE,UAAU,EAAE,SAAS;QAChC,SAAS,EAAE,EAAE;KACd,CAAA;IAED,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,GAAG,eAAO,CAAA;QACtB,OAAO,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,eAAO,EAAE,CAAA;IACrC,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,CAAC,OAAO,CAAC;QACnB,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAG,EAAE,KAAK,EAAE,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,EAAE;KAC5D,CAAA;AACH,CAAC;AA3BD,gCA2BC"}
+{"version":3,"file":"extension.js","sourceRoot":"","sources":["../source/extension.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsC;AACtC,+CAA0C;AAC1C,mCAA+C;AAC/C,mDAAoC;AAIvB,QAAA,UAAU,GAAG,IAAI,CAAA;AAE9B;;;;;;GAMG;AACH,SAAgB,UAAU,CAAE,CAAqB,EAAE,UAAuB;IACxE,IAAI,UAAU,KAAK,KAAK;QACtB,OAAO,EAAE,CAAA;IAEX,IAAI,UAAU,KAAK,SAAS;QAC1B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IAEzC,MAAM,IAAI,GAAG,IAAA,oBAAO,EAAC,UAAU,CAAC,CAAA;IAEhC,MAAM,OAAO,GAAY;QACvB,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO;QAC3C,UAAU,EAAE,IAAA,wBAAU,GAAE,CAAC,MAAM;QAC/B,SAAS,EAAE,UAAU,EAAE,SAAS;QAChC,SAAS,EAAE,EAAE;KACd,CAAA;IAED,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,GAAG,eAAO,CAAA;QACtB,OAAO,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,eAAO,EAAE,CAAA;IACrC,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,CAAC,OAAO,CAAC;QACnB,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAG,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;KACpE,CAAA;AACH,CAAC;AA3BD,gCA2BC"}