@milaboratories/pl-middle-layer 1.46.20 → 1.46.22

package/dist/block_registry/watcher.cjs

@@ -10,7 +10,7 @@ var canonicalize = require('canonicalize');
 const DefaultBlockUpdateWatcherOps = {
     minDelay: 1500,
 };
-const NoUpdatesKey = '__no_updates__';
+const NoUpdatesKey = "__no_updates__";
 class BlockUpdateWatcher extends computable.PollComputablePool {
     registryProvider;
     http;
@@ -23,11 +23,11 @@ class BlockUpdateWatcher extends computable.PollComputablePool {
     }
     getKey(req) {
         switch (req.currentSpec.type) {
-            case 'dev-v1':
+            case "dev-v1":
                 return `dev_1_${req.currentSpec.folder}_${req.currentSpec.mtime}`;
-            case 'dev-v2':
+            case "dev-v2":
                 return `dev_2_${req.currentSpec.folder}_${req.currentSpec.mtime}`;
-            case 'from-registry-v2':
+            case "from-registry-v2":
                 return `from_registry_v2_${canonicalize(req)}`;
             default:
                 return NoUpdatesKey;
@@ -37,7 +37,7 @@ class BlockUpdateWatcher extends computable.PollComputablePool {
         try {
             const cSpec = req.currentSpec;
             switch (cSpec.type) {
-                case 'dev-v1': {
+                case "dev-v1": {
                     try {
                         const mtime = await registry.getDevV1PacketMtime(cSpec.folder);
                         if (mtime === cSpec.mtime)
@@ -50,7 +50,7 @@ class BlockUpdateWatcher extends computable.PollComputablePool {
                         return { suggestions: [] };
                     }
                 }
-                case 'dev-v2': {
+                case "dev-v2": {
                     try {
                         const description = await blockTools.tryLoadPackDescription(cSpec.folder, this.logger);
                         if (description === undefined)
@@ -66,10 +66,10 @@ class BlockUpdateWatcher extends computable.PollComputablePool {
                         return { suggestions: [] };
                     }
                 }
-                case 'from-registry-v2': {
+                case "from-registry-v2": {
                     try {
                         const { versionLock, skipVersion } = req.settings;
-                        if (versionLock === 'patch')
+                        if (versionLock === "patch")
                             return { suggestions: [] };
                         const registry = this.registryProvider.getRegistry(cSpec.registryUrl);
                         let channel = this.preferredUpdateChannel;
@@ -101,11 +101,11 @@ class BlockUpdateWatcher extends computable.PollComputablePool {
                             case undefined:
                                 vMainSuggestion = vSuggestions[0].update;
                                 break;
-                            case 'major':
-                                vMainSuggestion = vSuggestions.find((v) => v.type !== 'major')?.update;
+                            case "major":
+                                vMainSuggestion = vSuggestions.find((v) => v.type !== "major")?.update;
                                 break;
-                            case 'minor':
-                                vMainSuggestion = vSuggestions.find((v) => v.type === 'patch')?.update;
+                            case "minor":
+                                vMainSuggestion = vSuggestions.find((v) => v.type === "patch")?.update;
                                 break;
                         }
                         const suggestions = vSuggestions.map(({ type, update }) => ({

package/dist/block_registry/watcher.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.cjs","sources":["../../src/block_registry/watcher.ts"],"sourcesContent":["import type { PollPoolOps } from '@milaboratories/computable';\nimport { PollComputablePool } from '@milaboratories/computable';\nimport type {\n  BlockPackFromRegistryV2,\n  BlockPackSpec,\n  BlockSettings,\n  UpdateSuggestions } from '@milaboratories/pl-model-middle-layer';\nimport {\n  AnyChannel,\n  blockPackIdToString,\n  StableChannel,\n} from '@milaboratories/pl-model-middle-layer';\nimport type { Dispatcher } from 'undici';\nimport { getDevV1PacketMtime, getDevV2PacketMtime } from './registry';\nimport { tryLoadPackDescription } from '@platforma-sdk/block-tools';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { V2RegistryProvider } from './registry-v2-provider';\nimport * as semver from 'semver';\nimport canonicalize from 'canonicalize';\n\nexport const DefaultBlockUpdateWatcherOps: PollPoolOps = {\n  minDelay: 1500,\n};\n\nexport type BlockUpdateWatcherOps = Partial<PollPoolOps> & {\n  readonly http?: Dispatcher;\n  readonly preferredUpdateChannel?: string;\n};\n\nconst NoUpdatesKey = '__no_updates__';\n\nexport type CheckForUpdateRequest = {\n  currentSpec: BlockPackSpec;\n  settings: BlockSettings;\n};\n\nexport type CheckForUpdateResponse = {\n  suggestions: UpdateSuggestions;\n  mainSuggestion?: BlockPackSpec;\n};\n\nexport class BlockUpdateWatcher extends PollComputablePool<\n  CheckForUpdateRequest,\n  CheckForUpdateResponse\n> {\n  private readonly http?: Dispatcher;\n  private readonly preferredUpdateChannel?: string;\n\n  constructor(\n    private readonly registryProvider: V2RegistryProvider,\n    logger: MiLogger,\n    ops: BlockUpdateWatcherOps = {},\n  ) {\n    super({ ...ops, ...DefaultBlockUpdateWatcherOps }, logger);\n    this.http = ops.http;\n    this.preferredUpdateChannel = ops.preferredUpdateChannel;\n  }\n\n  protected getKey(req: CheckForUpdateRequest): string {\n    switch (req.currentSpec.type) {\n      case 'dev-v1':\n        return `dev_1_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case 'dev-v2':\n        return `dev_2_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case 'from-registry-v2':\n        return `from_registry_v2_${canonicalize(req)!}`;\n      default:\n        return NoUpdatesKey;\n    }\n  }\n\n  protected async readValue(req: CheckForUpdateRequest): Promise<CheckForUpdateResponse> {\n    try {\n      const cSpec = req.currentSpec;\n      switch (cSpec.type) {\n        case 'dev-v1': {\n          try {\n            const mtime = await getDevV1PacketMtime(cSpec.folder);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case 'dev-v2': {\n          try {\n            const description = await tryLoadPackDescription(cSpec.folder, this.logger);\n            if (description === undefined) return { suggestions: [] };\n            const mtime = await getDevV2PacketMtime(description);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime: mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case 'from-registry-v2': {\n          try {\n            const { versionLock, skipVersion } = req.settings;\n            if (versionLock === 'patch') return { suggestions: [] };\n            const registry = this.registryProvider.getRegistry(cSpec.registryUrl);\n            let channel: string | undefined = this.preferredUpdateChannel;\n\n            if (channel === undefined) {\n              if (cSpec.channel === undefined) {\n                const a1 = await registry.getLatestOverview(cSpec.id, StableChannel);\n                if (a1) channel = StableChannel;\n                else {\n                  // forcing update from non-existent channel to stable\n                  const a2 = await registry.getLatestOverview(cSpec.id, AnyChannel);\n                  if (a2 === undefined) {\n                    this.logger.error(\n                      `No \"any\" channel record for ${blockPackIdToString(cSpec.id)}`,\n                    );\n                    return { suggestions: [] };\n                  }\n                  channel = AnyChannel;\n                }\n              } else channel = cSpec.channel;\n            }\n\n            const vSuggestions = await registry.getUpdateSuggestions(cSpec.id, channel);\n            if (vSuggestions === undefined || vSuggestions.length === 0) return { suggestions: [] };\n\n            // from major to patch\n            vSuggestions.reverse();\n\n            let vMainSuggestion: string | undefined = undefined;\n            switch (versionLock) {\n              case undefined:\n                vMainSuggestion = vSuggestions[0].update;\n                break;\n              case 'major':\n                vMainSuggestion = vSuggestions.find((v) => v.type !== 'major')?.update;\n                break;\n              case 'minor':\n                vMainSuggestion = vSuggestions.find((v) => v.type === 'patch')?.update;\n                break;\n            }\n\n            const suggestions: UpdateSuggestions = vSuggestions.map(({ type, update }) => ({\n              type,\n              update: { ...cSpec, id: { ...cSpec.id, version: update } },\n            }));\n\n            if (vMainSuggestion === undefined) return { suggestions };\n            if (skipVersion !== undefined && semver.lte(vMainSuggestion, skipVersion))\n              return { suggestions };\n\n            const mainSuggestion: BlockPackFromRegistryV2 = {\n              ...cSpec,\n              id: { ...cSpec.id, version: vMainSuggestion },\n            };\n\n            // warming cache\n            void (async () => {\n              try {\n                await registry.getComponents(mainSuggestion.id);\n              } catch (e: unknown) {\n                this.logger.warn(e);\n              }\n            })();\n\n            return { suggestions, mainSuggestion };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        default:\n          return { suggestions: [] };\n      }\n    } catch (e: unknown) {\n      this.logger.warn(e);\n      return { suggestions: [] };\n    }\n  }\n\n  protected resultsEqual(res1: CheckForUpdateResponse, res2: CheckForUpdateResponse): boolean {\n    return canonicalize(res1) === canonicalize(res2);\n    // if (res1 === undefined && res2 === undefined) return true;\n    // if (res1 === undefined || res2 === undefined) return false;\n    // if (res1.type !== res2.type) return false;\n    // switch (res1.type) {\n    //   case 'from-registry-v1':\n    //     if (res2.type !== 'from-registry-v1') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'from-registry-v2':\n    //     if (res2.type !== 'from-registry-v2') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'dev-v1':\n    //     if (res2.type !== 'dev-v1') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   case 'dev-v2':\n    //     if (res2.type !== 'dev-v2') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   default:\n    //     assertNever(res1);\n    // }\n  }\n}\n"],"names":["PollComputablePool","getDevV1PacketMtime","tryLoadPackDescription","getDevV2PacketMtime","StableChannel","AnyChannel","blockPackIdToString","semver.lte"],"mappings":"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"}
+{"version":3,"file":"watcher.cjs","sources":["../../src/block_registry/watcher.ts"],"sourcesContent":["import type { PollPoolOps } from \"@milaboratories/computable\";\nimport { PollComputablePool } from \"@milaboratories/computable\";\nimport type {\n  BlockPackFromRegistryV2,\n  BlockPackSpec,\n  BlockSettings,\n  UpdateSuggestions,\n} from \"@milaboratories/pl-model-middle-layer\";\nimport {\n  AnyChannel,\n  blockPackIdToString,\n  StableChannel,\n} from \"@milaboratories/pl-model-middle-layer\";\nimport type { Dispatcher } from \"undici\";\nimport { getDevV1PacketMtime, getDevV2PacketMtime } from \"./registry\";\nimport { tryLoadPackDescription } from \"@platforma-sdk/block-tools\";\nimport type { MiLogger } from \"@milaboratories/ts-helpers\";\nimport type { V2RegistryProvider } from \"./registry-v2-provider\";\nimport * as semver from \"semver\";\nimport canonicalize from \"canonicalize\";\n\nexport const DefaultBlockUpdateWatcherOps: PollPoolOps = {\n  minDelay: 1500,\n};\n\nexport type BlockUpdateWatcherOps = Partial<PollPoolOps> & {\n  readonly http?: Dispatcher;\n  readonly preferredUpdateChannel?: string;\n};\n\nconst NoUpdatesKey = \"__no_updates__\";\n\nexport type CheckForUpdateRequest = {\n  currentSpec: BlockPackSpec;\n  settings: BlockSettings;\n};\n\nexport type CheckForUpdateResponse = {\n  suggestions: UpdateSuggestions;\n  mainSuggestion?: BlockPackSpec;\n};\n\nexport class BlockUpdateWatcher extends PollComputablePool<\n  CheckForUpdateRequest,\n  CheckForUpdateResponse\n> {\n  private readonly http?: Dispatcher;\n  private readonly preferredUpdateChannel?: string;\n\n  constructor(\n    private readonly registryProvider: V2RegistryProvider,\n    logger: MiLogger,\n    ops: BlockUpdateWatcherOps = {},\n  ) {\n    super({ ...ops, ...DefaultBlockUpdateWatcherOps }, logger);\n    this.http = ops.http;\n    this.preferredUpdateChannel = ops.preferredUpdateChannel;\n  }\n\n  protected getKey(req: CheckForUpdateRequest): string {\n    switch (req.currentSpec.type) {\n      case \"dev-v1\":\n        return `dev_1_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case \"dev-v2\":\n        return `dev_2_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case \"from-registry-v2\":\n        return `from_registry_v2_${canonicalize(req)!}`;\n      default:\n        return NoUpdatesKey;\n    }\n  }\n\n  protected async readValue(req: CheckForUpdateRequest): Promise<CheckForUpdateResponse> {\n    try {\n      const cSpec = req.currentSpec;\n      switch (cSpec.type) {\n        case \"dev-v1\": {\n          try {\n            const mtime = await getDevV1PacketMtime(cSpec.folder);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case \"dev-v2\": {\n          try {\n            const description = await tryLoadPackDescription(cSpec.folder, this.logger);\n            if (description === undefined) return { suggestions: [] };\n            const mtime = await getDevV2PacketMtime(description);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime: mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case \"from-registry-v2\": {\n          try {\n            const { versionLock, skipVersion } = req.settings;\n            if (versionLock === \"patch\") return { suggestions: [] };\n            const registry = this.registryProvider.getRegistry(cSpec.registryUrl);\n            let channel: string | undefined = this.preferredUpdateChannel;\n\n            if (channel === undefined) {\n              if (cSpec.channel === undefined) {\n                const a1 = await registry.getLatestOverview(cSpec.id, StableChannel);\n                if (a1) channel = StableChannel;\n                else {\n                  // forcing update from non-existent channel to stable\n                  const a2 = await registry.getLatestOverview(cSpec.id, AnyChannel);\n                  if (a2 === undefined) {\n                    this.logger.error(\n                      `No \"any\" channel record for ${blockPackIdToString(cSpec.id)}`,\n                    );\n                    return { suggestions: [] };\n                  }\n                  channel = AnyChannel;\n                }\n              } else channel = cSpec.channel;\n            }\n\n            const vSuggestions = await registry.getUpdateSuggestions(cSpec.id, channel);\n            if (vSuggestions === undefined || vSuggestions.length === 0) return { suggestions: [] };\n\n            // from major to patch\n            vSuggestions.reverse();\n\n            let vMainSuggestion: string | undefined = undefined;\n            switch (versionLock) {\n              case undefined:\n                vMainSuggestion = vSuggestions[0].update;\n                break;\n              case \"major\":\n                vMainSuggestion = vSuggestions.find((v) => v.type !== \"major\")?.update;\n                break;\n              case \"minor\":\n                vMainSuggestion = vSuggestions.find((v) => v.type === \"patch\")?.update;\n                break;\n            }\n\n            const suggestions: UpdateSuggestions = vSuggestions.map(({ type, update }) => ({\n              type,\n              update: { ...cSpec, id: { ...cSpec.id, version: update } },\n            }));\n\n            if (vMainSuggestion === undefined) return { suggestions };\n            if (skipVersion !== undefined && semver.lte(vMainSuggestion, skipVersion))\n              return { suggestions };\n\n            const mainSuggestion: BlockPackFromRegistryV2 = {\n              ...cSpec,\n              id: { ...cSpec.id, version: vMainSuggestion },\n            };\n\n            // warming cache\n            void (async () => {\n              try {\n                await registry.getComponents(mainSuggestion.id);\n              } catch (e: unknown) {\n                this.logger.warn(e);\n              }\n            })();\n\n            return { suggestions, mainSuggestion };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        default:\n          return { suggestions: [] };\n      }\n    } catch (e: unknown) {\n      this.logger.warn(e);\n      return { suggestions: [] };\n    }\n  }\n\n  protected resultsEqual(res1: CheckForUpdateResponse, res2: CheckForUpdateResponse): boolean {\n    return canonicalize(res1) === canonicalize(res2);\n    // if (res1 === undefined && res2 === undefined) return true;\n    // if (res1 === undefined || res2 === undefined) return false;\n    // if (res1.type !== res2.type) return false;\n    // switch (res1.type) {\n    //   case 'from-registry-v1':\n    //     if (res2.type !== 'from-registry-v1') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'from-registry-v2':\n    //     if (res2.type !== 'from-registry-v2') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'dev-v1':\n    //     if (res2.type !== 'dev-v1') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   case 'dev-v2':\n    //     if (res2.type !== 'dev-v2') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   default:\n    //     assertNever(res1);\n    // }\n  }\n}\n"],"names":["PollComputablePool","getDevV1PacketMtime","tryLoadPackDescription","getDevV2PacketMtime","StableChannel","AnyChannel","blockPackIdToString","semver.lte"],"mappings":"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"}

package/dist/block_registry/watcher.d.ts

@@ -1,9 +1,9 @@
-import type { PollPoolOps } from '@milaboratories/computable';
-import { PollComputablePool } from '@milaboratories/computable';
-import type { BlockPackSpec, BlockSettings, UpdateSuggestions } from '@milaboratories/pl-model-middle-layer';
-import type { Dispatcher } from 'undici';
-import type { MiLogger } from '@milaboratories/ts-helpers';
-import type { V2RegistryProvider } from './registry-v2-provider';
+import type { PollPoolOps } from "@milaboratories/computable";
+import { PollComputablePool } from "@milaboratories/computable";
+import type { BlockPackSpec, BlockSettings, UpdateSuggestions } from "@milaboratories/pl-model-middle-layer";
+import type { Dispatcher } from "undici";
+import type { MiLogger } from "@milaboratories/ts-helpers";
+import type { V2RegistryProvider } from "./registry-v2-provider";
 export declare const DefaultBlockUpdateWatcherOps: PollPoolOps;
 export type BlockUpdateWatcherOps = Partial<PollPoolOps> & {
     readonly http?: Dispatcher;

package/dist/block_registry/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../../src/block_registry/watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EACb,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAMnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAIjE,eAAO,MAAM,4BAA4B,EAAE,WAE1C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IACzD,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CAC1C,CAAC;AAIF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,aAAa,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,iBAAiB,CAAC;IAC/B,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,kBAAkB,CACxD,qBAAqB,EACrB,sBAAsB,CACvB;IAKG,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAJnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAS;gBAG9B,gBAAgB,EAAE,kBAAkB,EACrD,MAAM,EAAE,QAAQ,EAChB,GAAG,GAAE,qBAA0B;IAOjC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,qBAAqB,GAAG,MAAM;cAapC,SAAS,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA+GtF,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO;CAsB5F"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../../src/block_registry/watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EACb,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAM/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAIjE,eAAO,MAAM,4BAA4B,EAAE,WAE1C,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IACzD,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CAC1C,CAAC;AAIF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,aAAa,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,iBAAiB,CAAC;IAC/B,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,kBAAkB,CACxD,qBAAqB,EACrB,sBAAsB,CACvB;IAKG,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAJnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAS;gBAG9B,gBAAgB,EAAE,kBAAkB,EACrD,MAAM,EAAE,QAAQ,EAChB,GAAG,GAAE,qBAA0B;IAOjC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,qBAAqB,GAAG,MAAM;cAapC,SAAS,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA+GtF,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,sBAAsB,GAAG,OAAO;CAsB5F"}

package/dist/block_registry/watcher.js

@@ -8,7 +8,7 @@ import canonicalize from 'canonicalize';
 const DefaultBlockUpdateWatcherOps = {
     minDelay: 1500,
 };
-const NoUpdatesKey = '__no_updates__';
+const NoUpdatesKey = "__no_updates__";
 class BlockUpdateWatcher extends PollComputablePool {
     registryProvider;
     http;
@@ -21,11 +21,11 @@ class BlockUpdateWatcher extends PollComputablePool {
     }
     getKey(req) {
         switch (req.currentSpec.type) {
-            case 'dev-v1':
+            case "dev-v1":
                 return `dev_1_${req.currentSpec.folder}_${req.currentSpec.mtime}`;
-            case 'dev-v2':
+            case "dev-v2":
                 return `dev_2_${req.currentSpec.folder}_${req.currentSpec.mtime}`;
-            case 'from-registry-v2':
+            case "from-registry-v2":
                 return `from_registry_v2_${canonicalize(req)}`;
             default:
                 return NoUpdatesKey;
@@ -35,7 +35,7 @@ class BlockUpdateWatcher extends PollComputablePool {
         try {
             const cSpec = req.currentSpec;
             switch (cSpec.type) {
-                case 'dev-v1': {
+                case "dev-v1": {
                     try {
                         const mtime = await getDevV1PacketMtime(cSpec.folder);
                         if (mtime === cSpec.mtime)
@@ -48,7 +48,7 @@ class BlockUpdateWatcher extends PollComputablePool {
                         return { suggestions: [] };
                     }
                 }
-                case 'dev-v2': {
+                case "dev-v2": {
                     try {
                         const description = await tryLoadPackDescription(cSpec.folder, this.logger);
                         if (description === undefined)
@@ -64,10 +64,10 @@ class BlockUpdateWatcher extends PollComputablePool {
                         return { suggestions: [] };
                     }
                 }
-                case 'from-registry-v2': {
+                case "from-registry-v2": {
                     try {
                         const { versionLock, skipVersion } = req.settings;
-                        if (versionLock === 'patch')
+                        if (versionLock === "patch")
                             return { suggestions: [] };
                         const registry = this.registryProvider.getRegistry(cSpec.registryUrl);
                         let channel = this.preferredUpdateChannel;
@@ -99,11 +99,11 @@ class BlockUpdateWatcher extends PollComputablePool {
                             case undefined:
                                 vMainSuggestion = vSuggestions[0].update;
                                 break;
-                            case 'major':
-                                vMainSuggestion = vSuggestions.find((v) => v.type !== 'major')?.update;
+                            case "major":
+                                vMainSuggestion = vSuggestions.find((v) => v.type !== "major")?.update;
                                 break;
-                            case 'minor':
-                                vMainSuggestion = vSuggestions.find((v) => v.type === 'patch')?.update;
+                            case "minor":
+                                vMainSuggestion = vSuggestions.find((v) => v.type === "patch")?.update;
                                 break;
                         }
                         const suggestions = vSuggestions.map(({ type, update }) => ({

package/dist/block_registry/watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.js","sources":["../../src/block_registry/watcher.ts"],"sourcesContent":["import type { PollPoolOps } from '@milaboratories/computable';\nimport { PollComputablePool } from '@milaboratories/computable';\nimport type {\n  BlockPackFromRegistryV2,\n  BlockPackSpec,\n  BlockSettings,\n  UpdateSuggestions } from '@milaboratories/pl-model-middle-layer';\nimport {\n  AnyChannel,\n  blockPackIdToString,\n  StableChannel,\n} from '@milaboratories/pl-model-middle-layer';\nimport type { Dispatcher } from 'undici';\nimport { getDevV1PacketMtime, getDevV2PacketMtime } from './registry';\nimport { tryLoadPackDescription } from '@platforma-sdk/block-tools';\nimport type { MiLogger } from '@milaboratories/ts-helpers';\nimport type { V2RegistryProvider } from './registry-v2-provider';\nimport * as semver from 'semver';\nimport canonicalize from 'canonicalize';\n\nexport const DefaultBlockUpdateWatcherOps: PollPoolOps = {\n  minDelay: 1500,\n};\n\nexport type BlockUpdateWatcherOps = Partial<PollPoolOps> & {\n  readonly http?: Dispatcher;\n  readonly preferredUpdateChannel?: string;\n};\n\nconst NoUpdatesKey = '__no_updates__';\n\nexport type CheckForUpdateRequest = {\n  currentSpec: BlockPackSpec;\n  settings: BlockSettings;\n};\n\nexport type CheckForUpdateResponse = {\n  suggestions: UpdateSuggestions;\n  mainSuggestion?: BlockPackSpec;\n};\n\nexport class BlockUpdateWatcher extends PollComputablePool<\n  CheckForUpdateRequest,\n  CheckForUpdateResponse\n> {\n  private readonly http?: Dispatcher;\n  private readonly preferredUpdateChannel?: string;\n\n  constructor(\n    private readonly registryProvider: V2RegistryProvider,\n    logger: MiLogger,\n    ops: BlockUpdateWatcherOps = {},\n  ) {\n    super({ ...ops, ...DefaultBlockUpdateWatcherOps }, logger);\n    this.http = ops.http;\n    this.preferredUpdateChannel = ops.preferredUpdateChannel;\n  }\n\n  protected getKey(req: CheckForUpdateRequest): string {\n    switch (req.currentSpec.type) {\n      case 'dev-v1':\n        return `dev_1_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case 'dev-v2':\n        return `dev_2_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case 'from-registry-v2':\n        return `from_registry_v2_${canonicalize(req)!}`;\n      default:\n        return NoUpdatesKey;\n    }\n  }\n\n  protected async readValue(req: CheckForUpdateRequest): Promise<CheckForUpdateResponse> {\n    try {\n      const cSpec = req.currentSpec;\n      switch (cSpec.type) {\n        case 'dev-v1': {\n          try {\n            const mtime = await getDevV1PacketMtime(cSpec.folder);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case 'dev-v2': {\n          try {\n            const description = await tryLoadPackDescription(cSpec.folder, this.logger);\n            if (description === undefined) return { suggestions: [] };\n            const mtime = await getDevV2PacketMtime(description);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime: mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case 'from-registry-v2': {\n          try {\n            const { versionLock, skipVersion } = req.settings;\n            if (versionLock === 'patch') return { suggestions: [] };\n            const registry = this.registryProvider.getRegistry(cSpec.registryUrl);\n            let channel: string | undefined = this.preferredUpdateChannel;\n\n            if (channel === undefined) {\n              if (cSpec.channel === undefined) {\n                const a1 = await registry.getLatestOverview(cSpec.id, StableChannel);\n                if (a1) channel = StableChannel;\n                else {\n                  // forcing update from non-existent channel to stable\n                  const a2 = await registry.getLatestOverview(cSpec.id, AnyChannel);\n                  if (a2 === undefined) {\n                    this.logger.error(\n                      `No \"any\" channel record for ${blockPackIdToString(cSpec.id)}`,\n                    );\n                    return { suggestions: [] };\n                  }\n                  channel = AnyChannel;\n                }\n              } else channel = cSpec.channel;\n            }\n\n            const vSuggestions = await registry.getUpdateSuggestions(cSpec.id, channel);\n            if (vSuggestions === undefined || vSuggestions.length === 0) return { suggestions: [] };\n\n            // from major to patch\n            vSuggestions.reverse();\n\n            let vMainSuggestion: string | undefined = undefined;\n            switch (versionLock) {\n              case undefined:\n                vMainSuggestion = vSuggestions[0].update;\n                break;\n              case 'major':\n                vMainSuggestion = vSuggestions.find((v) => v.type !== 'major')?.update;\n                break;\n              case 'minor':\n                vMainSuggestion = vSuggestions.find((v) => v.type === 'patch')?.update;\n                break;\n            }\n\n            const suggestions: UpdateSuggestions = vSuggestions.map(({ type, update }) => ({\n              type,\n              update: { ...cSpec, id: { ...cSpec.id, version: update } },\n            }));\n\n            if (vMainSuggestion === undefined) return { suggestions };\n            if (skipVersion !== undefined && semver.lte(vMainSuggestion, skipVersion))\n              return { suggestions };\n\n            const mainSuggestion: BlockPackFromRegistryV2 = {\n              ...cSpec,\n              id: { ...cSpec.id, version: vMainSuggestion },\n            };\n\n            // warming cache\n            void (async () => {\n              try {\n                await registry.getComponents(mainSuggestion.id);\n              } catch (e: unknown) {\n                this.logger.warn(e);\n              }\n            })();\n\n            return { suggestions, mainSuggestion };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        default:\n          return { suggestions: [] };\n      }\n    } catch (e: unknown) {\n      this.logger.warn(e);\n      return { suggestions: [] };\n    }\n  }\n\n  protected resultsEqual(res1: CheckForUpdateResponse, res2: CheckForUpdateResponse): boolean {\n    return canonicalize(res1) === canonicalize(res2);\n    // if (res1 === undefined && res2 === undefined) return true;\n    // if (res1 === undefined || res2 === undefined) return false;\n    // if (res1.type !== res2.type) return false;\n    // switch (res1.type) {\n    //   case 'from-registry-v1':\n    //     if (res2.type !== 'from-registry-v1') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'from-registry-v2':\n    //     if (res2.type !== 'from-registry-v2') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'dev-v1':\n    //     if (res2.type !== 'dev-v1') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   case 'dev-v2':\n    //     if (res2.type !== 'dev-v2') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   default:\n    //     assertNever(res1);\n    // }\n  }\n}\n"],"names":["semver.lte"],"mappings":"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"}
+{"version":3,"file":"watcher.js","sources":["../../src/block_registry/watcher.ts"],"sourcesContent":["import type { PollPoolOps } from \"@milaboratories/computable\";\nimport { PollComputablePool } from \"@milaboratories/computable\";\nimport type {\n  BlockPackFromRegistryV2,\n  BlockPackSpec,\n  BlockSettings,\n  UpdateSuggestions,\n} from \"@milaboratories/pl-model-middle-layer\";\nimport {\n  AnyChannel,\n  blockPackIdToString,\n  StableChannel,\n} from \"@milaboratories/pl-model-middle-layer\";\nimport type { Dispatcher } from \"undici\";\nimport { getDevV1PacketMtime, getDevV2PacketMtime } from \"./registry\";\nimport { tryLoadPackDescription } from \"@platforma-sdk/block-tools\";\nimport type { MiLogger } from \"@milaboratories/ts-helpers\";\nimport type { V2RegistryProvider } from \"./registry-v2-provider\";\nimport * as semver from \"semver\";\nimport canonicalize from \"canonicalize\";\n\nexport const DefaultBlockUpdateWatcherOps: PollPoolOps = {\n  minDelay: 1500,\n};\n\nexport type BlockUpdateWatcherOps = Partial<PollPoolOps> & {\n  readonly http?: Dispatcher;\n  readonly preferredUpdateChannel?: string;\n};\n\nconst NoUpdatesKey = \"__no_updates__\";\n\nexport type CheckForUpdateRequest = {\n  currentSpec: BlockPackSpec;\n  settings: BlockSettings;\n};\n\nexport type CheckForUpdateResponse = {\n  suggestions: UpdateSuggestions;\n  mainSuggestion?: BlockPackSpec;\n};\n\nexport class BlockUpdateWatcher extends PollComputablePool<\n  CheckForUpdateRequest,\n  CheckForUpdateResponse\n> {\n  private readonly http?: Dispatcher;\n  private readonly preferredUpdateChannel?: string;\n\n  constructor(\n    private readonly registryProvider: V2RegistryProvider,\n    logger: MiLogger,\n    ops: BlockUpdateWatcherOps = {},\n  ) {\n    super({ ...ops, ...DefaultBlockUpdateWatcherOps }, logger);\n    this.http = ops.http;\n    this.preferredUpdateChannel = ops.preferredUpdateChannel;\n  }\n\n  protected getKey(req: CheckForUpdateRequest): string {\n    switch (req.currentSpec.type) {\n      case \"dev-v1\":\n        return `dev_1_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case \"dev-v2\":\n        return `dev_2_${req.currentSpec.folder}_${req.currentSpec.mtime}`;\n      case \"from-registry-v2\":\n        return `from_registry_v2_${canonicalize(req)!}`;\n      default:\n        return NoUpdatesKey;\n    }\n  }\n\n  protected async readValue(req: CheckForUpdateRequest): Promise<CheckForUpdateResponse> {\n    try {\n      const cSpec = req.currentSpec;\n      switch (cSpec.type) {\n        case \"dev-v1\": {\n          try {\n            const mtime = await getDevV1PacketMtime(cSpec.folder);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case \"dev-v2\": {\n          try {\n            const description = await tryLoadPackDescription(cSpec.folder, this.logger);\n            if (description === undefined) return { suggestions: [] };\n            const mtime = await getDevV2PacketMtime(description);\n            if (mtime === cSpec.mtime) return { suggestions: [] };\n            else return { mainSuggestion: { ...cSpec, mtime: mtime }, suggestions: [] };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        case \"from-registry-v2\": {\n          try {\n            const { versionLock, skipVersion } = req.settings;\n            if (versionLock === \"patch\") return { suggestions: [] };\n            const registry = this.registryProvider.getRegistry(cSpec.registryUrl);\n            let channel: string | undefined = this.preferredUpdateChannel;\n\n            if (channel === undefined) {\n              if (cSpec.channel === undefined) {\n                const a1 = await registry.getLatestOverview(cSpec.id, StableChannel);\n                if (a1) channel = StableChannel;\n                else {\n                  // forcing update from non-existent channel to stable\n                  const a2 = await registry.getLatestOverview(cSpec.id, AnyChannel);\n                  if (a2 === undefined) {\n                    this.logger.error(\n                      `No \"any\" channel record for ${blockPackIdToString(cSpec.id)}`,\n                    );\n                    return { suggestions: [] };\n                  }\n                  channel = AnyChannel;\n                }\n              } else channel = cSpec.channel;\n            }\n\n            const vSuggestions = await registry.getUpdateSuggestions(cSpec.id, channel);\n            if (vSuggestions === undefined || vSuggestions.length === 0) return { suggestions: [] };\n\n            // from major to patch\n            vSuggestions.reverse();\n\n            let vMainSuggestion: string | undefined = undefined;\n            switch (versionLock) {\n              case undefined:\n                vMainSuggestion = vSuggestions[0].update;\n                break;\n              case \"major\":\n                vMainSuggestion = vSuggestions.find((v) => v.type !== \"major\")?.update;\n                break;\n              case \"minor\":\n                vMainSuggestion = vSuggestions.find((v) => v.type === \"patch\")?.update;\n                break;\n            }\n\n            const suggestions: UpdateSuggestions = vSuggestions.map(({ type, update }) => ({\n              type,\n              update: { ...cSpec, id: { ...cSpec.id, version: update } },\n            }));\n\n            if (vMainSuggestion === undefined) return { suggestions };\n            if (skipVersion !== undefined && semver.lte(vMainSuggestion, skipVersion))\n              return { suggestions };\n\n            const mainSuggestion: BlockPackFromRegistryV2 = {\n              ...cSpec,\n              id: { ...cSpec.id, version: vMainSuggestion },\n            };\n\n            // warming cache\n            void (async () => {\n              try {\n                await registry.getComponents(mainSuggestion.id);\n              } catch (e: unknown) {\n                this.logger.warn(e);\n              }\n            })();\n\n            return { suggestions, mainSuggestion };\n          } catch (err: unknown) {\n            this.logger.warn(err);\n            return { suggestions: [] };\n          }\n        }\n\n        default:\n          return { suggestions: [] };\n      }\n    } catch (e: unknown) {\n      this.logger.warn(e);\n      return { suggestions: [] };\n    }\n  }\n\n  protected resultsEqual(res1: CheckForUpdateResponse, res2: CheckForUpdateResponse): boolean {\n    return canonicalize(res1) === canonicalize(res2);\n    // if (res1 === undefined && res2 === undefined) return true;\n    // if (res1 === undefined || res2 === undefined) return false;\n    // if (res1.type !== res2.type) return false;\n    // switch (res1.type) {\n    //   case 'from-registry-v1':\n    //     if (res2.type !== 'from-registry-v1') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'from-registry-v2':\n    //     if (res2.type !== 'from-registry-v2') return false;\n    //     return res1.registryUrl === res2.registryUrl && blockPackIdEquals(res1.id, res2.id);\n    //   case 'dev-v1':\n    //     if (res2.type !== 'dev-v1') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   case 'dev-v2':\n    //     if (res2.type !== 'dev-v2') return false;\n    //     return res1.folder === res2.folder && res1.mtime === res2.mtime;\n    //   default:\n    //     assertNever(res1);\n    // }\n  }\n}\n"],"names":["semver.lte"],"mappings":"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"}

package/dist/block_registry/well_known_registries.cjs

@@ -1,16 +1,16 @@
 'use strict';
 
 const CentralBlockRegistry = {
-    type: 'remote-v2',
-    url: 'https://blocks.pl-open.science/',
+    type: "remote-v2",
+    url: "https://blocks.pl-open.science/",
 };
 const V1CentralRegistry = {
-    type: 'remote-v1',
-    url: 'https://block.registry.platforma.bio/releases',
+    type: "remote-v1",
+    url: "https://block.registry.platforma.bio/releases",
 };
 const V1CentralDevSnapshotRegistry = {
-    type: 'remote-v1',
-    url: 'https://block.registry.platforma.bio/dev',
+    type: "remote-v1",
+    url: "https://block.registry.platforma.bio/dev",
 };
 
 exports.CentralBlockRegistry = CentralBlockRegistry;

package/dist/block_registry/well_known_registries.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"well_known_registries.cjs","sources":["../../src/block_registry/well_known_registries.ts"],"sourcesContent":["import type { RegistrySpec } from '@milaboratories/pl-model-middle-layer';\n\nexport const CentralBlockRegistry: RegistrySpec = {\n  type: 'remote-v2',\n  url: 'https://blocks.pl-open.science/',\n};\n\nexport const V1CentralRegistry: RegistrySpec = {\n  type: 'remote-v1',\n  url: 'https://block.registry.platforma.bio/releases',\n};\n\nexport const V1CentralDevSnapshotRegistry: RegistrySpec = {\n  type: 'remote-v1',\n  url: 'https://block.registry.platforma.bio/dev',\n};\n"],"names":[],"mappings":";;AAEO,MAAM,oBAAoB,GAAiB;AAChD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,iCAAiC;;AAGjC,MAAM,iBAAiB,GAAiB;AAC7C,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,+CAA+C;;AAG/C,MAAM,4BAA4B,GAAiB;AACxD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,0CAA0C;;;;;;;"}
+{"version":3,"file":"well_known_registries.cjs","sources":["../../src/block_registry/well_known_registries.ts"],"sourcesContent":["import type { RegistrySpec } from \"@milaboratories/pl-model-middle-layer\";\n\nexport const CentralBlockRegistry: RegistrySpec = {\n  type: \"remote-v2\",\n  url: \"https://blocks.pl-open.science/\",\n};\n\nexport const V1CentralRegistry: RegistrySpec = {\n  type: \"remote-v1\",\n  url: \"https://block.registry.platforma.bio/releases\",\n};\n\nexport const V1CentralDevSnapshotRegistry: RegistrySpec = {\n  type: \"remote-v1\",\n  url: \"https://block.registry.platforma.bio/dev\",\n};\n"],"names":[],"mappings":";;AAEO,MAAM,oBAAoB,GAAiB;AAChD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,iCAAiC;;AAGjC,MAAM,iBAAiB,GAAiB;AAC7C,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,+CAA+C;;AAG/C,MAAM,4BAA4B,GAAiB;AACxD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,0CAA0C;;;;;;;"}

package/dist/block_registry/well_known_registries.d.ts

@@ -1,4 +1,4 @@
-import type { RegistrySpec } from '@milaboratories/pl-model-middle-layer';
+import type { RegistrySpec } from "@milaboratories/pl-model-middle-layer";
 export declare const CentralBlockRegistry: RegistrySpec;
 export declare const V1CentralRegistry: RegistrySpec;
 export declare const V1CentralDevSnapshotRegistry: RegistrySpec;

package/dist/block_registry/well_known_registries.js

@@ -1,14 +1,14 @@
 const CentralBlockRegistry = {
-    type: 'remote-v2',
-    url: 'https://blocks.pl-open.science/',
+    type: "remote-v2",
+    url: "https://blocks.pl-open.science/",
 };
 const V1CentralRegistry = {
-    type: 'remote-v1',
-    url: 'https://block.registry.platforma.bio/releases',
+    type: "remote-v1",
+    url: "https://block.registry.platforma.bio/releases",
 };
 const V1CentralDevSnapshotRegistry = {
-    type: 'remote-v1',
-    url: 'https://block.registry.platforma.bio/dev',
+    type: "remote-v1",
+    url: "https://block.registry.platforma.bio/dev",
 };
 
 export { CentralBlockRegistry, V1CentralDevSnapshotRegistry, V1CentralRegistry };

package/dist/block_registry/well_known_registries.js.map

@@ -1 +1 @@
-{"version":3,"file":"well_known_registries.js","sources":["../../src/block_registry/well_known_registries.ts"],"sourcesContent":["import type { RegistrySpec } from '@milaboratories/pl-model-middle-layer';\n\nexport const CentralBlockRegistry: RegistrySpec = {\n  type: 'remote-v2',\n  url: 'https://blocks.pl-open.science/',\n};\n\nexport const V1CentralRegistry: RegistrySpec = {\n  type: 'remote-v1',\n  url: 'https://block.registry.platforma.bio/releases',\n};\n\nexport const V1CentralDevSnapshotRegistry: RegistrySpec = {\n  type: 'remote-v1',\n  url: 'https://block.registry.platforma.bio/dev',\n};\n"],"names":[],"mappings":"AAEO,MAAM,oBAAoB,GAAiB;AAChD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,iCAAiC;;AAGjC,MAAM,iBAAiB,GAAiB;AAC7C,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,+CAA+C;;AAG/C,MAAM,4BAA4B,GAAiB;AACxD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,0CAA0C;;;;;"}
+{"version":3,"file":"well_known_registries.js","sources":["../../src/block_registry/well_known_registries.ts"],"sourcesContent":["import type { RegistrySpec } from \"@milaboratories/pl-model-middle-layer\";\n\nexport const CentralBlockRegistry: RegistrySpec = {\n  type: \"remote-v2\",\n  url: \"https://blocks.pl-open.science/\",\n};\n\nexport const V1CentralRegistry: RegistrySpec = {\n  type: \"remote-v1\",\n  url: \"https://block.registry.platforma.bio/releases\",\n};\n\nexport const V1CentralDevSnapshotRegistry: RegistrySpec = {\n  type: \"remote-v1\",\n  url: \"https://block.registry.platforma.bio/dev\",\n};\n"],"names":[],"mappings":"AAEO,MAAM,oBAAoB,GAAiB;AAChD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,iCAAiC;;AAGjC,MAAM,iBAAiB,GAAiB;AAC7C,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,+CAA+C;;AAG/C,MAAM,4BAA4B,GAAiB;AACxD,IAAA,IAAI,EAAE,WAAW;AACjB,IAAA,GAAG,EAAE,0CAA0C;;;;;"}

package/dist/cfg_render/executor.cjs

@@ -10,7 +10,7 @@ var block_ctx_unsafe = require('../middle_layer/block_ctx_unsafe.cjs');
 /** Special address of operation, see below. */
 const ReturnOpKey = Symbol();
 /** The same, but for the argument part of destination, see below. */
-const ReturnArgKey = 'return';
+const ReturnArgKey = "return";
 /** Special destination, telling the executor that corresponding result should
  * be exposed as a final result, and execution terminate at this point. */
 const ReturnDestination = { op: ReturnOpKey, arg: ReturnArgKey };
@@ -38,7 +38,7 @@ function execute(env, stack, operations, allowComputables) {
         }
         const pending = tsHelpers.notEmpty(stack.pendingSubroutines.get(destination.op));
         if (destination.arg in pending.args)
-            throw new Error('argument already set');
+            throw new Error("argument already set");
         pending.args[destination.arg] = result;
         pending.argCounter--;
         if (pending.argCounter === 0) {
@@ -58,11 +58,11 @@ function execute(env, stack, operations, allowComputables) {
         const op = operationQueue.shift();
         const action = op.operation(env);
         switch (action.type) {
-            case 'ReturnResult':
+            case "ReturnResult":
                 if (!deliverResult(op.destination, action.result))
                     break mainLoop; // this terminates execution
                 break; // switch
-            case 'ScheduleSubroutine':
+            case "ScheduleSubroutine":
                 {
                     const newOpKey = Symbol();
                     const argRequests = Object.entries(action.args);
@@ -88,9 +88,9 @@ function execute(env, stack, operations, allowComputables) {
                     }
                 }
                 break;
-            case 'ScheduleComputable':
+            case "ScheduleComputable":
                 if (!allowComputables)
-                    throw new Error('asynchronous operations are forbidden in this context');
+                    throw new Error("asynchronous operations are forbidden in this context");
                 computables.push({
                     destination: op.destination,
                     computable: action.computable,
@@ -110,8 +110,8 @@ function computableFromCfg(drivers, bCtx, cfg, ops = {}) {
     return computableFromCfgUnsafe(drivers, block_ctx_unsafe.toCfgContext(bCtx), cfg, ops);
 }
 function computableFromCfgUnsafe(drivers, ctx, cfg, ops = {}) {
-    const key = `${ctx.blockId}#`
-        + canonicalize({
+    const key = `${ctx.blockId}#` +
+        canonicalize({
             ctx: Object.fromEntries(Object.entries(ctx).filter(([k]) => block_ctx_unsafe.NonKeyCtxFields.indexOf(k) === -1)),
             cfg: cfg,
         });
@@ -133,7 +133,7 @@ function computableFromCfgUnsafe(drivers, ctx, cfg, ops = {}) {
                 const postEnv = {
                     drivers,
                     get cCtx() {
-                        throw new Error('asynchronous operations are forbidden in this context');
+                        throw new Error("asynchronous operations are forbidden in this context");
                     },
                 };
                 // Post process can be called several times, that's why it must be a side-effect-free function.
@@ -146,8 +146,8 @@ function computableFromCfgUnsafe(drivers, ctx, cfg, ops = {}) {
                     pendingSubroutines: copyOfPendingSubrotines,
                 };
                 execute(postEnv, copiedStack, resolvedOps, false);
-                if (!('result' in copiedStack))
-                    throw new Error('illegal cfg rendering stack state, no result');
+                if (!("result" in copiedStack))
+                    throw new Error("illegal cfg rendering stack state, no result");
                 return copiedStack.result;
             },
         };

package/dist/cfg_render/executor.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"executor.cjs","sources":["../../src/cfg_render/executor.ts"],"sourcesContent":["import type {\n  ArgumentKey,\n  ArgumentValues,\n  ExecutionEnvironment,\n  Operation,\n  Subroutine,\n} from './operation';\nimport Denque from 'denque';\nimport { assertNever, notEmpty } from '@milaboratories/ts-helpers';\nimport type { ComputableCtx, ComputableRenderingOps } from '@milaboratories/computable';\nimport { Computable } from '@milaboratories/computable';\nimport type { Cfg } from '@platforma-sdk/model';\nimport { renderCfg, resOp } from './renderer';\nimport canonicalize from 'canonicalize';\nimport type { BlockContextAny } from '../middle_layer/block_ctx';\nimport type { MiddleLayerDriverKit } from '../middle_layer/driver_kit';\nimport { NonKeyCtxFields, toCfgContext } from '../middle_layer/block_ctx_unsafe';\n\n/** Addresses pending subroutines inside the stack */\ntype SubroutineKey = symbol;\n\n/** Represents destination of the result of an operation. I.e. when sequence of\n * subroutine invocations, and computables terminates with result, this object\n * determines to which argument of which pending subroutine it should be delivered.\n * See special value for delivery of the final \"return\" result. */\ntype Destination = {\n  op: SubroutineKey;\n  arg: ArgumentKey;\n};\n\n/** Special address of operation, see below. */\nconst ReturnOpKey: unique symbol = Symbol();\n/** The same, but for the argument part of destination, see below. */\nconst ReturnArgKey = 'return';\n\n/** Special destination, telling the executor that corresponding result should\n * be exposed as a final result, and execution terminate at this point. */\nconst ReturnDestination = { op: ReturnOpKey, arg: ReturnArgKey } as Destination;\n\nfunction isReturnDestination(destination: Destination): boolean {\n  return destination.op == ReturnOpKey && destination.arg == ReturnArgKey;\n}\n\n/** Queued operation, used inside the executor */\ntype QueuedOperation = {\n  operation: Operation;\n  destination: Destination;\n};\n\n/** Queued computation, returned by the first round of config execution. Such\n * computables should be returned in the intermediate representation of the\n * enclosing computable, and after they are resolved and passed to the\n * postprocessing routine, should be injected into the execution stack to\n * finalize the computation. */\ntype ScheduledComputable = {\n  destination: Destination;\n  computable: Computable<unknown>;\n};\n\n/** This is what ScheduledComputable transforms from intermediate\n * representation to post-processing. */\ntype MaterializedComputable = {\n  destination: Destination;\n  computable: unknown;\n};\n\n/** Main entry inside the execution stack. */\ntype PendingSubroutine = {\n  subroutine: Subroutine;\n  destination: Destination;\n  argCounter: number;\n  args: ArgumentValues;\n};\n\n/** Execution stack. The closest concept that this object along with enclosed\n * {@link PendingSubroutine}s represent is a Continuation.\n * https://en.wikipedia.org/wiki/Continuation */\ntype ExecutionStack = {\n  result?: unknown;\n  pendingSubroutines: Map<SubroutineKey, PendingSubroutine>;\n};\n\n/** Returns initial stack value. */\nfunction zeroStack(): ExecutionStack {\n  return { pendingSubroutines: new Map<SubroutineKey, PendingSubroutine>() };\n}\n\n/** Implements main executor mechanism.\n * @param env to be passed to while executing operations\n * @param stack execution stack to continue execution from\n * @param operations operations to initiate the execution process\n * @param allowComputables if false, scheduling of async computables will result in error\n * */\nfunction execute(\n  env: ExecutionEnvironment,\n  stack: ExecutionStack,\n  operations: QueuedOperation[],\n  allowComputables: boolean,\n): ScheduledComputable[] {\n  const operationQueue = new Denque<QueuedOperation>(operations);\n\n  /** Returns false if final result is set as result of this operation,\n   * true if we should continue processing. */\n  const deliverResult = (destination: Destination, result: unknown): boolean => {\n    if (isReturnDestination(destination)) {\n      stack.result = result;\n      return false;\n    }\n\n    const pending = notEmpty(stack.pendingSubroutines.get(destination.op));\n    if (destination.arg in pending.args) throw new Error('argument already set');\n    pending.args[destination.arg] = result;\n    pending.argCounter--;\n    if (pending.argCounter === 0) {\n      stack.pendingSubroutines.delete(destination.op);\n      operationQueue.push({\n        destination: pending.destination,\n        operation: pending.subroutine(pending.args),\n      });\n    }\n\n    return true;\n  };\n\n  // computables, scheduled during computation, are aggregated in this array,\n  // and returned from the function in the end\n  const computables: ScheduledComputable[] = [];\n\n  // each loop = execution of a single queued operation\n  mainLoop: while (operationQueue.length > 0) {\n    const op = operationQueue.shift()!;\n    const action = op.operation(env);\n    switch (action.type) {\n      case 'ReturnResult':\n        if (!deliverResult(op.destination, action.result)) break mainLoop; // this terminates execution\n        break; // switch\n\n      case 'ScheduleSubroutine':\n        {\n          const newOpKey = Symbol();\n\n          const argRequests = Object.entries(action.args);\n          const initialArgCounter = argRequests.length;\n\n          if (initialArgCounter === 0)\n          // if no pending arguments\n            operationQueue.push({\n              destination: op.destination,\n              operation: action.subroutine({}),\n            });\n          else {\n            for (const [arg, operation] of argRequests)\n              operationQueue.push({\n                destination: { op: newOpKey, arg },\n                operation,\n              });\n\n            stack.pendingSubroutines.set(newOpKey, {\n              argCounter: initialArgCounter,\n              args: {},\n              subroutine: action.subroutine,\n              destination: op.destination,\n            });\n          }\n        }\n        break;\n\n      case 'ScheduleComputable':\n        if (!allowComputables)\n          throw new Error('asynchronous operations are forbidden in this context');\n        computables.push({\n          destination: op.destination,\n          computable: action.computable,\n        });\n        break;\n\n      default:\n        assertNever(action);\n    }\n  }\n\n  return computables;\n}\n\n//\n// Computable\n//\n\n/** Main method to render configurations */\nexport function computableFromCfg(\n  drivers: MiddleLayerDriverKit,\n  bCtx: BlockContextAny,\n  cfg: Cfg,\n  ops: Partial<ComputableRenderingOps> = {},\n): Computable<unknown> {\n  return computableFromCfgUnsafe(drivers, toCfgContext(bCtx), cfg, ops);\n}\n\nexport function computableFromCfgUnsafe(\n  drivers: MiddleLayerDriverKit,\n  ctx: Record<string, unknown>,\n  cfg: Cfg,\n  ops: Partial<ComputableRenderingOps> = {},\n): Computable<unknown> {\n  const key\n    = `${ctx.blockId}#`\n    + canonicalize({\n      ctx: Object.fromEntries(\n        Object.entries(ctx).filter(([k]) => NonKeyCtxFields.indexOf(k) === -1),\n      ),\n      cfg: cfg,\n    })!;\n  return Computable.makeRaw(\n    (c) => {\n      const env: ExecutionEnvironment = { drivers, cCtx: c };\n      const stack = zeroStack();\n      const computables = execute(\n        env,\n        stack,\n        [\n          {\n            destination: ReturnDestination,\n            operation: renderCfg(ctx, cfg),\n          },\n        ],\n        true,\n      );\n      return {\n        ir: computables,\n        postprocessValue(value: MaterializedComputable[]): unknown {\n          const resolvedOps: QueuedOperation[] = [];\n          for (const mc of value)\n            resolvedOps.push({ destination: mc.destination, operation: resOp(mc.computable) });\n          const postEnv: ExecutionEnvironment = {\n            drivers,\n            get cCtx(): ComputableCtx {\n              throw new Error('asynchronous operations are forbidden in this context');\n            },\n          };\n\n          // Post process can be called several times, that's why it must be a side-effect-free function.\n          // But `execute` modifies a stack, so we have to defensively copy it here.\n          const copyOfPendingSubrotines = new Map<SubroutineKey, PendingSubroutine>();\n          for (const [key, value] of stack.pendingSubroutines)\n            copyOfPendingSubrotines.set(key, { ...value, args: { ...value.args } });\n          const copiedStack: ExecutionStack = {\n            result: stack.result,\n            pendingSubroutines: copyOfPendingSubrotines,\n          };\n          execute(postEnv, copiedStack, resolvedOps, false);\n          if (!('result' in copiedStack))\n            throw new Error('illegal cfg rendering stack state, no result');\n          return copiedStack.result;\n        },\n      };\n    },\n    { ...ops, key },\n  );\n}\n"],"names":["notEmpty","assertNever","toCfgContext","NonKeyCtxFields","Computable","renderCfg","resOp"],"mappings":"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"}
+{"version":3,"file":"executor.cjs","sources":["../../src/cfg_render/executor.ts"],"sourcesContent":["import type {\n  ArgumentKey,\n  ArgumentValues,\n  ExecutionEnvironment,\n  Operation,\n  Subroutine,\n} from \"./operation\";\nimport Denque from \"denque\";\nimport { assertNever, notEmpty } from \"@milaboratories/ts-helpers\";\nimport type { ComputableCtx, ComputableRenderingOps } from \"@milaboratories/computable\";\nimport { Computable } from \"@milaboratories/computable\";\nimport type { Cfg } from \"@platforma-sdk/model\";\nimport { renderCfg, resOp } from \"./renderer\";\nimport canonicalize from \"canonicalize\";\nimport type { BlockContextAny } from \"../middle_layer/block_ctx\";\nimport type { MiddleLayerDriverKit } from \"../middle_layer/driver_kit\";\nimport { NonKeyCtxFields, toCfgContext } from \"../middle_layer/block_ctx_unsafe\";\n\n/** Addresses pending subroutines inside the stack */\ntype SubroutineKey = symbol;\n\n/** Represents destination of the result of an operation. I.e. when sequence of\n * subroutine invocations, and computables terminates with result, this object\n * determines to which argument of which pending subroutine it should be delivered.\n * See special value for delivery of the final \"return\" result. */\ntype Destination = {\n  op: SubroutineKey;\n  arg: ArgumentKey;\n};\n\n/** Special address of operation, see below. */\nconst ReturnOpKey: unique symbol = Symbol();\n/** The same, but for the argument part of destination, see below. */\nconst ReturnArgKey = \"return\";\n\n/** Special destination, telling the executor that corresponding result should\n * be exposed as a final result, and execution terminate at this point. */\nconst ReturnDestination = { op: ReturnOpKey, arg: ReturnArgKey } as Destination;\n\nfunction isReturnDestination(destination: Destination): boolean {\n  return destination.op == ReturnOpKey && destination.arg == ReturnArgKey;\n}\n\n/** Queued operation, used inside the executor */\ntype QueuedOperation = {\n  operation: Operation;\n  destination: Destination;\n};\n\n/** Queued computation, returned by the first round of config execution. Such\n * computables should be returned in the intermediate representation of the\n * enclosing computable, and after they are resolved and passed to the\n * postprocessing routine, should be injected into the execution stack to\n * finalize the computation. */\ntype ScheduledComputable = {\n  destination: Destination;\n  computable: Computable<unknown>;\n};\n\n/** This is what ScheduledComputable transforms from intermediate\n * representation to post-processing. */\ntype MaterializedComputable = {\n  destination: Destination;\n  computable: unknown;\n};\n\n/** Main entry inside the execution stack. */\ntype PendingSubroutine = {\n  subroutine: Subroutine;\n  destination: Destination;\n  argCounter: number;\n  args: ArgumentValues;\n};\n\n/** Execution stack. The closest concept that this object along with enclosed\n * {@link PendingSubroutine}s represent is a Continuation.\n * https://en.wikipedia.org/wiki/Continuation */\ntype ExecutionStack = {\n  result?: unknown;\n  pendingSubroutines: Map<SubroutineKey, PendingSubroutine>;\n};\n\n/** Returns initial stack value. */\nfunction zeroStack(): ExecutionStack {\n  return { pendingSubroutines: new Map<SubroutineKey, PendingSubroutine>() };\n}\n\n/** Implements main executor mechanism.\n * @param env to be passed to while executing operations\n * @param stack execution stack to continue execution from\n * @param operations operations to initiate the execution process\n * @param allowComputables if false, scheduling of async computables will result in error\n * */\nfunction execute(\n  env: ExecutionEnvironment,\n  stack: ExecutionStack,\n  operations: QueuedOperation[],\n  allowComputables: boolean,\n): ScheduledComputable[] {\n  const operationQueue = new Denque<QueuedOperation>(operations);\n\n  /** Returns false if final result is set as result of this operation,\n   * true if we should continue processing. */\n  const deliverResult = (destination: Destination, result: unknown): boolean => {\n    if (isReturnDestination(destination)) {\n      stack.result = result;\n      return false;\n    }\n\n    const pending = notEmpty(stack.pendingSubroutines.get(destination.op));\n    if (destination.arg in pending.args) throw new Error(\"argument already set\");\n    pending.args[destination.arg] = result;\n    pending.argCounter--;\n    if (pending.argCounter === 0) {\n      stack.pendingSubroutines.delete(destination.op);\n      operationQueue.push({\n        destination: pending.destination,\n        operation: pending.subroutine(pending.args),\n      });\n    }\n\n    return true;\n  };\n\n  // computables, scheduled during computation, are aggregated in this array,\n  // and returned from the function in the end\n  const computables: ScheduledComputable[] = [];\n\n  // each loop = execution of a single queued operation\n  mainLoop: while (operationQueue.length > 0) {\n    const op = operationQueue.shift()!;\n    const action = op.operation(env);\n    switch (action.type) {\n      case \"ReturnResult\":\n        if (!deliverResult(op.destination, action.result)) break mainLoop; // this terminates execution\n        break; // switch\n\n      case \"ScheduleSubroutine\":\n        {\n          const newOpKey = Symbol();\n\n          const argRequests = Object.entries(action.args);\n          const initialArgCounter = argRequests.length;\n\n          if (initialArgCounter === 0)\n            // if no pending arguments\n            operationQueue.push({\n              destination: op.destination,\n              operation: action.subroutine({}),\n            });\n          else {\n            for (const [arg, operation] of argRequests)\n              operationQueue.push({\n                destination: { op: newOpKey, arg },\n                operation,\n              });\n\n            stack.pendingSubroutines.set(newOpKey, {\n              argCounter: initialArgCounter,\n              args: {},\n              subroutine: action.subroutine,\n              destination: op.destination,\n            });\n          }\n        }\n        break;\n\n      case \"ScheduleComputable\":\n        if (!allowComputables)\n          throw new Error(\"asynchronous operations are forbidden in this context\");\n        computables.push({\n          destination: op.destination,\n          computable: action.computable,\n        });\n        break;\n\n      default:\n        assertNever(action);\n    }\n  }\n\n  return computables;\n}\n\n//\n// Computable\n//\n\n/** Main method to render configurations */\nexport function computableFromCfg(\n  drivers: MiddleLayerDriverKit,\n  bCtx: BlockContextAny,\n  cfg: Cfg,\n  ops: Partial<ComputableRenderingOps> = {},\n): Computable<unknown> {\n  return computableFromCfgUnsafe(drivers, toCfgContext(bCtx), cfg, ops);\n}\n\nexport function computableFromCfgUnsafe(\n  drivers: MiddleLayerDriverKit,\n  ctx: Record<string, unknown>,\n  cfg: Cfg,\n  ops: Partial<ComputableRenderingOps> = {},\n): Computable<unknown> {\n  const key =\n    `${ctx.blockId}#` +\n    canonicalize({\n      ctx: Object.fromEntries(\n        Object.entries(ctx).filter(([k]) => NonKeyCtxFields.indexOf(k) === -1),\n      ),\n      cfg: cfg,\n    })!;\n  return Computable.makeRaw(\n    (c) => {\n      const env: ExecutionEnvironment = { drivers, cCtx: c };\n      const stack = zeroStack();\n      const computables = execute(\n        env,\n        stack,\n        [\n          {\n            destination: ReturnDestination,\n            operation: renderCfg(ctx, cfg),\n          },\n        ],\n        true,\n      );\n      return {\n        ir: computables,\n        postprocessValue(value: MaterializedComputable[]): unknown {\n          const resolvedOps: QueuedOperation[] = [];\n          for (const mc of value)\n            resolvedOps.push({ destination: mc.destination, operation: resOp(mc.computable) });\n          const postEnv: ExecutionEnvironment = {\n            drivers,\n            get cCtx(): ComputableCtx {\n              throw new Error(\"asynchronous operations are forbidden in this context\");\n            },\n          };\n\n          // Post process can be called several times, that's why it must be a side-effect-free function.\n          // But `execute` modifies a stack, so we have to defensively copy it here.\n          const copyOfPendingSubrotines = new Map<SubroutineKey, PendingSubroutine>();\n          for (const [key, value] of stack.pendingSubroutines)\n            copyOfPendingSubrotines.set(key, { ...value, args: { ...value.args } });\n          const copiedStack: ExecutionStack = {\n            result: stack.result,\n            pendingSubroutines: copyOfPendingSubrotines,\n          };\n          execute(postEnv, copiedStack, resolvedOps, false);\n          if (!(\"result\" in copiedStack))\n            throw new Error(\"illegal cfg rendering stack state, no result\");\n          return copiedStack.result;\n        },\n      };\n    },\n    { ...ops, key },\n  );\n}\n"],"names":["notEmpty","assertNever","toCfgContext","NonKeyCtxFields","Computable","renderCfg","resOp"],"mappings":"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"}

package/dist/cfg_render/executor.d.ts

@@ -1,8 +1,8 @@
-import type { ComputableRenderingOps } from '@milaboratories/computable';
-import { Computable } from '@milaboratories/computable';
-import type { Cfg } from '@platforma-sdk/model';
-import type { BlockContextAny } from '../middle_layer/block_ctx';
-import type { MiddleLayerDriverKit } from '../middle_layer/driver_kit';
+import type { ComputableRenderingOps } from "@milaboratories/computable";
+import { Computable } from "@milaboratories/computable";
+import type { Cfg } from "@platforma-sdk/model";
+import type { BlockContextAny } from "../middle_layer/block_ctx";
+import type { MiddleLayerDriverKit } from "../middle_layer/driver_kit";
 /** Main method to render configurations */
 export declare function computableFromCfg(drivers: MiddleLayerDriverKit, bCtx: BlockContextAny, cfg: Cfg, ops?: Partial<ComputableRenderingOps>): Computable<unknown>;
 export declare function computableFromCfgUnsafe(drivers: MiddleLayerDriverKit, ctx: Record<string, unknown>, cfg: Cfg, ops?: Partial<ComputableRenderingOps>): Computable<unknown>;

package/dist/cfg_render/executor.js

@@ -8,7 +8,7 @@ import { toCfgContext, NonKeyCtxFields } from '../middle_layer/block_ctx_unsafe.
 /** Special address of operation, see below. */
 const ReturnOpKey = Symbol();
 /** The same, but for the argument part of destination, see below. */
-const ReturnArgKey = 'return';
+const ReturnArgKey = "return";
 /** Special destination, telling the executor that corresponding result should
  * be exposed as a final result, and execution terminate at this point. */
 const ReturnDestination = { op: ReturnOpKey, arg: ReturnArgKey };
@@ -36,7 +36,7 @@ function execute(env, stack, operations, allowComputables) {
         }
         const pending = notEmpty(stack.pendingSubroutines.get(destination.op));
         if (destination.arg in pending.args)
-            throw new Error('argument already set');
+            throw new Error("argument already set");
         pending.args[destination.arg] = result;
         pending.argCounter--;
         if (pending.argCounter === 0) {
@@ -56,11 +56,11 @@ function execute(env, stack, operations, allowComputables) {
         const op = operationQueue.shift();
         const action = op.operation(env);
         switch (action.type) {
-            case 'ReturnResult':
+            case "ReturnResult":
                 if (!deliverResult(op.destination, action.result))
                     break mainLoop; // this terminates execution
                 break; // switch
-            case 'ScheduleSubroutine':
+            case "ScheduleSubroutine":
                 {
                     const newOpKey = Symbol();
                     const argRequests = Object.entries(action.args);
@@ -86,9 +86,9 @@ function execute(env, stack, operations, allowComputables) {
                     }
                 }
                 break;
-            case 'ScheduleComputable':
+            case "ScheduleComputable":
                 if (!allowComputables)
-                    throw new Error('asynchronous operations are forbidden in this context');
+                    throw new Error("asynchronous operations are forbidden in this context");
                 computables.push({
                     destination: op.destination,
                     computable: action.computable,
@@ -108,8 +108,8 @@ function computableFromCfg(drivers, bCtx, cfg, ops = {}) {
     return computableFromCfgUnsafe(drivers, toCfgContext(bCtx), cfg, ops);
 }
 function computableFromCfgUnsafe(drivers, ctx, cfg, ops = {}) {
-    const key = `${ctx.blockId}#`
-        + canonicalize({
+    const key = `${ctx.blockId}#` +
+        canonicalize({
             ctx: Object.fromEntries(Object.entries(ctx).filter(([k]) => NonKeyCtxFields.indexOf(k) === -1)),
             cfg: cfg,
         });
@@ -131,7 +131,7 @@ function computableFromCfgUnsafe(drivers, ctx, cfg, ops = {}) {
                 const postEnv = {
                     drivers,
                     get cCtx() {
-                        throw new Error('asynchronous operations are forbidden in this context');
+                        throw new Error("asynchronous operations are forbidden in this context");
                     },
                 };
                 // Post process can be called several times, that's why it must be a side-effect-free function.
@@ -144,8 +144,8 @@ function computableFromCfgUnsafe(drivers, ctx, cfg, ops = {}) {
                     pendingSubroutines: copyOfPendingSubrotines,
                 };
                 execute(postEnv, copiedStack, resolvedOps, false);
-                if (!('result' in copiedStack))
-                    throw new Error('illegal cfg rendering stack state, no result');
+                if (!("result" in copiedStack))
+                    throw new Error("illegal cfg rendering stack state, no result");
                 return copiedStack.result;
             },
         };