@milaboratories/pl-middle-layer 1.10.22 → 1.10.23

package/dist/mutator/block-pack/block_pack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_pack.d.ts","sourceRoot":"","sources":["../../../src/mutator/block-pack/block_pack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAS,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,EAAqB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAe,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAW,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAMnD,eAAO,MAAM,mBAAmB,EAAE,YAAwD,CAAC;AAC3F,eAAO,MAAM,sBAAsB,aAAa,CAAC;AACjD,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAQjD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBADL,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,UAAU,YAAA;IAGvB,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;IAmC5D,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAyG7E;AAYD,wBAAgB,eAAe,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,qBAAqB,GAAG,cAAc,CAO9F"}
+{"version":3,"file":"block_pack.d.ts","sourceRoot":"","sources":["../../../src/mutator/block-pack/block_pack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAS,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE/F,OAAO,EAAqB,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAe,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAW,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAMnD,eAAO,MAAM,mBAAmB,EAAE,YAAwD,CAAC;AAC3F,eAAO,MAAM,sBAAsB,aAAa,CAAC;AACjD,eAAO,MAAM,sBAAsB,aAAa,CAAC;AAQjD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBADL,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,UAAU,YAAA;IAGvB,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;IAsC5D,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CA4G7E;AAYD,wBAAgB,eAAe,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,qBAAqB,GAAG,cAAc,CAO9F"}

package/dist/test/block_packs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_packs.d.ts","sourceRoot":"","sources":["../../src/test/block_packs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,eAAO,MAAM,cAAc,mBAE1B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAMxC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,aAMtC,CAAC"}
+{"version":3,"file":"block_packs.d.ts","sourceRoot":"","sources":["../../src/test/block_packs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE,eAAO,MAAM,cAAc,mBAE1B,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAQxC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,aAQtC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.10.22",
+  "version": "1.10.23",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,16 +27,16 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.5.1",
     "zod": "^3.23.8",
+    "@milaboratories/computable": "^2.1.7",
     "@milaboratories/resolve-helper": "^1.0.1",
-    "@milaboratories/computable": "^2.1.6",
-    "@platforma-sdk/block-tools": "^2.2.0",
-    "@milaboratories/pl-client": "^2.4.14",
+    "@platforma-sdk/block-tools": "^2.3.0",
+    "@milaboratories/pl-client": "^2.4.15",
+    "@milaboratories/pl-drivers": "^1.2.22",
     "@milaboratories/pl-model-common": "^1.3.13",
-    "@milaboratories/pl-model-middle-layer": "^1.3.0",
-    "@milaboratories/pl-tree": "^1.3.11",
-    "@milaboratories/pl-drivers": "^1.2.21",
-    "@platforma-sdk/model": "^1.2.26",
-    "@milaboratories/ts-helpers": "^1.0.26",
+    "@milaboratories/pl-model-middle-layer": "^1.4.0",
+    "@milaboratories/pl-tree": "^1.3.12",
+    "@platforma-sdk/model": "^1.2.27",
+    "@milaboratories/ts-helpers": "^1.0.27",
     "@platforma-sdk/workflow-tengo": "1.2.8"
   },
   "devDependencies": {
@@ -45,6 +45,7 @@
     "@types/jest": "^29.5.13",
     "@types/node": "~20.16.5",
     "jest": "^29.7.0",
+    "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.5",
     "@milaboratories/platforma-build-configs": "1.0.1"
   },

package/src/block_registry/index.ts

@@ -1,3 +1,2 @@
-export * from './registry_spec';
 export * from './registry';
 export * from './well_known_registries';

package/src/block_registry/registry-v2-provider.ts

@@ -0,0 +1,16 @@
+import { folderReaderByUrl, RegistryV2Reader } from '@platforma-sdk/block-tools';
+import { Dispatcher } from 'undici';
+
+export class V2RegistryProvider {
+  private readonly registries = new Map<string, RegistryV2Reader>();
+
+  constructor(private readonly http: Dispatcher) {}
+
+  public getRegistry(url: string): RegistryV2Reader {
+    const fromCache = this.registries.get(url);
+    if (fromCache) return fromCache;
+    const newRegistry = new RegistryV2Reader(url, folderReaderByUrl(url, this.http));
+    this.registries.set(url, newRegistry);
+    return newRegistry;
+  }
+}

package/src/block_registry/registry.test.ts

@@ -1,35 +1,14 @@
+import { test, expect } from '@jest/globals';
 import { BlockPackRegistry } from './registry';
 import path from 'node:path';
-import { CentralDevSnapshotRegistry, CentralRegistry } from './well_known_registries';
+import { CentralBlockRegistry } from './well_known_registries';
+import { V2RegistryProvider } from './registry-v2-provider';
+import { Agent } from 'undici';
 
-test('testing local dev registry', async () => {
-  const registry = new BlockPackRegistry([
-    {
-      type: 'folder_with_dev_packages',
-      label: 'Local dev',
-      path: path.resolve('integration')
-    }
+test.skip('testing remote registry', async () => {
+  const registry = new BlockPackRegistry(new V2RegistryProvider(new Agent()), [
+    { id: 'central', spec: CentralBlockRegistry }
   ]);
-
-  expect(await registry.getPackagesOverview()).toHaveLength(2);
-});
-
-test.skip('testing local dev registry with v2', async () => {
-  const registry = new BlockPackRegistry([
-    {
-      type: 'folder_with_dev_packages',
-      label: 'Local dev',
-      path: path.resolve('/Volumes/Data/Projects/MiLaboratory/blocks-beta')
-    }
-  ]);
-
-  console.dir(await registry.getPackagesOverview(), { depth: 5 });
-});
-
-test('testing remote registry', async () => {
-  const registry = new BlockPackRegistry([CentralRegistry, CentralDevSnapshotRegistry]);
-
-  const packages = await registry.getPackagesOverview();
-  console.log(packages);
-  expect(packages.length).toBeGreaterThanOrEqual(2);
+  const listing = await registry.listBlockPacks();
+  expect(listing.blockPacks.length).toBeGreaterThanOrEqual(2);
 });

package/src/block_registry/registry.ts

@@ -1,38 +1,24 @@
 import { Dispatcher, request } from 'undici';
-import { RegistrySpec } from './registry_spec';
 import { BlockPackSpecAny } from '../model';
-import { BlockPackDescriptionAbsolute, RegistryV1 } from '@platforma-sdk/block-tools';
+import {
+  BlockPackDescriptionAbsolute,
+  BlockPackMetaEmbedAbsoluteBytes,
+  RegistryV1
+} from '@platforma-sdk/block-tools';
 import fs from 'node:fs';
 import path from 'node:path';
 import YAML from 'yaml';
 import { assertNever } from '@milaboratories/ts-helpers';
 import { LegacyDevBlockPackFiles } from '../dev_env';
 import { tryLoadPackDescription } from '@platforma-sdk/block-tools';
-
-/**
- * Information specified by the developer of the block.
- * */
-export type BlockPackMeta = {
-  title: string;
-  description: string;
-  [metaField: string]: unknown;
-};
-
-/**
- * Information about specific package with specific organization and package names.
- * Mainly contain information about latest version of the package.
- * */
-export type BlockPackPackageOverview = {
-  organization: string;
-  /** @deprecated */
-  package: string;
-  name: string;
-  latestVersion: string;
-  latestMeta: BlockPackMeta;
-  registryLabel: string;
-  latestSpec: BlockPackSpecAny;
-  otherVersions: string[];
-};
+import { V2RegistryProvider } from './registry-v2-provider';
+import {
+  BlockPackListing,
+  BlockPackOverview,
+  RegistryEntry,
+  RegistrySpec,
+  RegistryStatus
+} from '@milaboratories/pl-model-middle-layer';
 
 async function getFileContent(path: string) {
   try {
@@ -80,14 +66,16 @@ export async function getDevV2PacketMtime(
 
 export class BlockPackRegistry {
   constructor(
-    private readonly registrySpecs: RegistrySpec[],
+    private readonly v2Provider: V2RegistryProvider,
+    private readonly registries: RegistryEntry[],
     private readonly http?: Dispatcher
   ) {}
 
-  private async getPackagesForRoot(regSpec: RegistrySpec): Promise<BlockPackPackageOverview[]> {
-    const result: BlockPackPackageOverview[] = [];
+  private async getPackagesForRoot(regEntry: RegistryEntry): Promise<BlockPackOverview[]> {
+    const result: BlockPackOverview[] = [];
+    const regSpec = regEntry.spec;
     switch (regSpec.type) {
-      case 'remote_v1':
+      case 'remote-v1':
         const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
 
         const overviewResponse = await request(
@@ -97,27 +85,39 @@ export class BlockPackRegistry {
         const overview = (await overviewResponse.body.json()) as RegistryV1.GlobalOverview;
         for (const overviewEntry of overview) {
           const { organization, package: pkg, latestMeta, latestVersion } = overviewEntry;
-          result.push({
+          const id = {
             organization,
-            package: pkg,
             name: pkg,
-            latestVersion,
-            latestMeta: latestMeta as BlockPackMeta,
-            registryLabel: regSpec.label,
-            latestSpec: {
+            version: latestVersion
+          };
+          result.push({
+            registryId: regEntry.id,
+            id,
+            meta: {
+              title: latestMeta['title'] ?? 'No title',
+              description: latestMeta['description'] ?? 'No Description',
+              organization: {
+                name: organization,
+                url: 'https://unknown.com'
+              }
+            },
+            spec: {
               type: 'from-registry-v1',
-              registryUrl: regSpec.url,
-              organization,
-              package: pkg,
-              version: latestVersion
-              // `${regSpec.url}/${packageContentPrefix({ organization, package: pkg, version: latestVersion })}`
+              id,
+              registryUrl: regSpec.url
             },
             otherVersions: overviewEntry.allVersions
           });
         }
         return result;
 
-      case 'folder_with_dev_packages':
+      case 'remote-v2':
+        return (await this.v2Provider.getRegistry(regSpec.url).listBlockPacks()).map((e) => ({
+          ...e,
+          registryId: regEntry.id
+        }));
+
+      case 'local-dev':
         for (const entry of await fs.promises.readdir(regSpec.path, { withFileTypes: true })) {
           if (!entry.isDirectory()) continue;
           const devPath = path.join(regSpec.path, entry.name);
@@ -130,39 +130,46 @@ export class BlockPackRegistry {
 
             const mtime = await getDevV1PacketMtime(devPath);
 
-            result.push({
+            const id = {
               organization: config.organization,
-              package: config.package, // TODO delete
               name: config.package,
-              latestVersion: 'DEV',
-              latestMeta: config.meta as BlockPackMeta,
-              registryLabel: regSpec.label,
-              latestSpec: {
-                type: 'dev-v1',
-                folder: devPath,
-                mtime
-              },
-              otherVersions: []
-            });
-          }
+              version: 'DEV'
+            };
 
-          const v2Description = await tryLoadPackDescription(devPath);
-          if (v2Description !== undefined) {
-            const mtime = await getDevV2PacketMtime(v2Description);
             result.push({
-              organization: v2Description.id.organization,
-              package: v2Description.id.name, // TODO delete
-              name: v2Description.id.name,
-              latestVersion: `${v2Description.id.version}-DEV`,
-              latestMeta: v2Description.meta,
-              registryLabel: regSpec.label,
-              latestSpec: {
+              registryId: regEntry.id,
+              id,
+              meta: {
+                title: (config.meta['title'] as string) ?? 'No title',
+                description: (config.meta['description'] as string) ?? 'No Description',
+                organization: {
+                  name: config.organization,
+                  url: 'https://unknown.com'
+                }
+              },
+              spec: {
                 type: 'dev-v2',
                 folder: devPath,
                 mtime
               },
               otherVersions: []
             });
+          } else {
+            const v2Description = await tryLoadPackDescription(devPath);
+            if (v2Description !== undefined) {
+              const mtime = await getDevV2PacketMtime(v2Description);
+              result.push({
+                registryId: regEntry.id,
+                id: v2Description.id,
+                meta: await BlockPackMetaEmbedAbsoluteBytes.parseAsync(v2Description.meta),
+                spec: {
+                  type: 'dev-v2',
+                  folder: devPath,
+                  mtime
+                },
+                otherVersions: []
+              });
+            }
           }
 
           continue;
@@ -173,10 +180,13 @@ export class BlockPackRegistry {
     }
   }
 
-  public async getPackagesOverview(): Promise<BlockPackPackageOverview[]> {
-    const packages: BlockPackPackageOverview[] = [];
-    for (const regSpecs of this.registrySpecs)
-      packages.push(...(await this.getPackagesForRoot(regSpecs)));
-    return packages;
+  public async listBlockPacks(): Promise<BlockPackListing> {
+    const blockPacks: BlockPackOverview[] = [];
+    const registries: RegistryStatus[] = [];
+    for (const regSpecs of this.registries) {
+      registries.push({ ...regSpecs, status: 'online' });
+      blockPacks.push(...(await this.getPackagesForRoot(regSpecs)));
+    }
+    return { registries, blockPacks };
   }
 }

package/src/block_registry/watcher.ts

@@ -25,7 +25,6 @@ export class BlockUpdateWatcher extends PollComputablePool<
 
   protected getKey(req: BlockPackSpec): string {
     switch (req.type) {
-      case 'dev':
       case 'dev-v1':
         return `dev_1_${req.folder}_${req.mtime}`;
       case 'dev-v2':
@@ -38,7 +37,6 @@ export class BlockUpdateWatcher extends PollComputablePool<
   protected async readValue(req: BlockPackSpec): Promise<BlockPackSpec | undefined> {
     try {
       switch (req.type) {
-        case 'dev':
         case 'dev-v1': {
           const mtime = await getDevV1PacketMtime(req.folder);
           if (mtime === req.mtime) return undefined;
@@ -65,7 +63,12 @@ export class BlockUpdateWatcher extends PollComputablePool<
   ): boolean {
     if (res1 === undefined && res2 === undefined) return true;
     if (res1 === undefined || res2 === undefined) return false;
-    if (res1.type === 'from-registry-v1' || res2.type === 'from-registry-v1')
+    if (
+      res1.type === 'from-registry-v1' ||
+      res2.type === 'from-registry-v1' ||
+      res1.type === 'from-registry-v2' ||
+      res2.type === 'from-registry-v2'
+    )
       throw new Error('Unexpected, not yet supported.');
     return res1.folder === res2.folder && res1.mtime === res2.mtime;
   }

package/src/block_registry/well_known_registries.ts

@@ -1,13 +1,16 @@
-import { RegistrySpec } from './registry_spec';
+import { RegistrySpec } from '@milaboratories/pl-model-middle-layer';
 
-export const CentralRegistry: RegistrySpec = {
-  type: 'remote_v1',
-  label: 'Central Release Registry',
+export const CentralBlockRegistry: RegistrySpec = {
+  type: 'remote-v2',
+  url: 'https://blocks.pl-open.science/releases'
+};
+
+export const V1CentralRegistry: RegistrySpec = {
+  type: 'remote-v1',
   url: 'https://block.registry.platforma.bio/releases'
 };
 
-export const CentralDevSnapshotRegistry: RegistrySpec = {
-  type: 'remote_v1',
-  label: 'Central Dev Snapshot registry',
+export const V1CentralDevSnapshotRegistry: RegistrySpec = {
+  type: 'remote-v1',
   url: 'https://block.registry.platforma.bio/dev'
 };

package/src/index.ts

@@ -16,6 +16,3 @@ export type { FieldType, ResourceType } from '@milaboratories/pl-client';
 export * from './mutator/template/template_loading';
 export * from './mutator/template/render_template';
 export * from './model/template_spec';
-
-// TODO change to rich meta information from V2 registry
-export { type BlockPackMeta } from './block_registry';

package/src/middle_layer/middle_layer.test.ts

@@ -1,53 +1,67 @@
+import { test, expect } from '@jest/globals';
 import { TestHelpers } from '@milaboratories/pl-client';
 import { MiddleLayer } from './middle_layer';
 import { outputRef } from '../model/args';
 import { randomUUID } from 'node:crypto';
 import path from 'node:path';
 import fs from 'node:fs';
-import { BlockPackRegistry, CentralRegistry, getDevV1PacketMtime } from '../block_registry';
+import { BlockPackRegistry, CentralBlockRegistry, getDevV1PacketMtime } from '../block_registry';
 import { LocalBlobHandleAndSize, RemoteBlobHandleAndSize } from '@milaboratories/pl-model-common';
 import { Project } from './project';
 import { LegacyDevBlockPackConfig } from '../dev_env';
+import { V2RegistryProvider } from '../block_registry/registry-v2-provider';
+import { Agent } from 'undici';
+import { BlockPackSpec } from '@milaboratories/pl-model-middle-layer';
 
-const registry = new BlockPackRegistry([
-  CentralRegistry,
+const registry = new BlockPackRegistry(new V2RegistryProvider(new Agent()), [
+  { id: 'central', spec: CentralBlockRegistry },
   {
-    type: 'folder_with_dev_packages',
-    label: 'Local dev registry',
-    path: path.resolve('./integration')
+    id: 'dev',
+    title: 'Local dev registry',
+    spec: {
+      type: 'local-dev',
+      path: path.resolve('./integration')
+    }
   }
 ]);
 
 async function getStandardBlockSpecs() {
-  const blocksFromRegistry = await registry.getPackagesOverview();
   return {
-    enterNumbersSpecFromRemote: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/Central/) && b.package === 'enter-numbers'
-    )!.latestSpec,
-
-    enterNumbersSpecFromDev: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/dev/) && b.package === 'enter-numbers'
-    )!.latestSpec,
-
-    sumNumbersSpecFromRemote: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/Central/) && b.package === 'sum-numbers'
-    )!.latestSpec,
-
-    sumNumbersSpecFromDev: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/dev/) && b.package === 'sum-numbers'
-    )!.latestSpec,
-
-    downloadFileSpecFromRemote: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/Central/) && b.package === 'download-file'
-    )!.latestSpec,
-
-    uploadFileSpecFromRemote: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/Central/) && b.package === 'upload-file'
-    )!.latestSpec,
-
-    readLogsSpecFromRemote: blocksFromRegistry.find(
-      (b) => b.registryLabel.match(/Central/) && b.package === 'read-logs'
-    )!.latestSpec
+    enterNumbersSpecFromRemote: {
+      type: 'from-registry-v1',
+      registryUrl: 'https://block.registry.platforma.bio/releases',
+      id: { organization: 'milaboratory', name: 'enter-numbers', version: '1.1.1' }
+    } satisfies BlockPackSpec,
+    enterNumbersSpecFromDev: {
+      type: 'dev-v1',
+      folder: path.resolve('./integration/block-beta-enter-numbers'),
+      mtime: '1727099575979300176'
+    } satisfies BlockPackSpec,
+    sumNumbersSpecFromRemote: {
+      type: 'from-registry-v1',
+      registryUrl: 'https://block.registry.platforma.bio/releases',
+      id: { organization: 'milaboratory', name: 'sum-numbers', version: '1.0.1' }
+    } satisfies BlockPackSpec,
+    sumNumbersSpecFromDev: {
+      type: 'dev-v1',
+      folder: path.resolve('./integration/block-beta-sum-numbers'),
+      mtime: '1727099575981045820'
+    } satisfies BlockPackSpec,
+    downloadFileSpecFromRemote: {
+      type: 'from-registry-v1',
+      registryUrl: 'https://block.registry.platforma.bio/releases',
+      id: { organization: 'milaboratory', name: 'download-file', version: '1.2.0' }
+    } satisfies BlockPackSpec,
+    uploadFileSpecFromRemote: {
+      type: 'from-registry-v1',
+      registryUrl: 'https://block.registry.platforma.bio/releases',
+      id: { organization: 'milaboratory', name: 'upload-file', version: '1.0.7' }
+    } satisfies BlockPackSpec,
+    readLogsSpecFromRemote: {
+      type: 'from-registry-v1',
+      registryUrl: 'https://block.registry.platforma.bio/releases',
+      id: { organization: 'milaboratory', name: 'read-logs', version: '1.0.7' }
+    } satisfies BlockPackSpec
   };
 }
 
@@ -444,7 +458,7 @@ test('block update test', async () => {
     });
     const mtime = await getDevV1PacketMtime(devBlockPath);
     const block1Id = await prj.addBlock('Block 1', {
-      type: 'dev',
+      type: 'dev-v1',
       folder: devBlockPath,
       mtime
     });
@@ -479,9 +493,7 @@ test('project open and close test', async () => {
     const blockId = await prj.addBlock('Test Block', {
       type: 'from-registry-v1',
       registryUrl: 'https://block.registry.platforma.bio/releases',
-      organization: 'milaboratory',
-      package: 'enter-numbers',
-      version: '1.1.1'
+      id: { organization: 'milaboratory', name: 'enter-numbers', version: '1.1.1' }
     });
     await prj.setBlockArgs(blockId, { numbers: [1, 2, 3] });
     const overview1 = await prj.overview.awaitStableValue();

package/src/middle_layer/render.test.ts

@@ -1,3 +1,4 @@
+import { test, expect } from '@jest/globals';
 import { awaitBlockDone, withMl } from './middle_layer.test';
 import { getQuickJS, Scope, shouldInterruptAfterDeadline } from 'quickjs-emscripten';
 import * as tp from 'node:timers/promises';
@@ -11,9 +12,7 @@ test('test JS render enter numbers', async () => {
     const block1Id = await prj.addBlock('Block 1', {
       type: 'from-registry-v1',
       registryUrl: 'https://block.registry.platforma.bio/releases',
-      organization: 'milaboratory',
-      package: 'enter-numbers',
-      version: '1.1.1'
+      id: { organization: 'milaboratory', name: 'enter-numbers', version: '1.1.1' }
     });
 
     await prj.setBlockArgs(block1Id, { numbers: [1, 2, 3] });
@@ -35,14 +34,12 @@ test.skip('test JS render options', async () => {
     const block1Id = await prj.addBlock('Block 1', {
       type: 'from-registry-v1',
       registryUrl: 'https://block.registry.platforma.bio/releases',
-      organization: 'milaboratory',
-      package: 'enter-numbers',
-      version: '1.1.1'
+      id: { organization: 'milaboratory', name: 'enter-numbers', version: '1.1.1' }
     });
     await prj.setBlockArgs(block1Id, { numbers: [1, 2, 3] });
 
     const block2Id = await prj.addBlock('Block 2', {
-      type: 'dev',
+      type: 'dev-v1',
       folder: '../../blocks-beta/block-beta-sum-numbers'
     });
 
@@ -73,9 +70,7 @@ test.skip('test JS render download', async () => {
     const block1Id = await prj.addBlock('Block 1', {
       type: 'from-registry-v1',
       registryUrl: 'https://block.registry.platforma.bio/releases',
-      organization: 'milaboratory',
-      package: 'download-file',
-      version: '1.2.0'
+      id: { organization: 'milaboratory', name: 'download-file', version: '1.2.0' }
     });
 
     await prj.setBlockArgs(block1Id, {

package/src/mutator/block-pack/block_pack.test.ts

@@ -1,9 +1,4 @@
-import {
-  isNullResourceId,
-  poll,
-  TestHelpers,
-  toGlobalResourceId
-} from '@milaboratories/pl-client';
+import { isNullResourceId, poll, TestHelpers, toGlobalResourceId } from '@milaboratories/pl-client';
 import { BlockPackPreparer, createBlockPack } from './block_pack';
 import { BlockPackSpecAny } from '../../model';
 import path from 'node:path';
@@ -16,14 +11,16 @@ test.each([
     spec: {
       type: 'from-registry-v1',
       registryUrl: 'https://block.registry.platforma.bio/releases',
-      organization: 'milaboratory',
-      package: 'enter-numbers',
-      version: '0.4.1'
+      id: {
+        organization: 'milaboratory',
+        name: 'enter-numbers',
+        version: '0.4.1'
+      }
     } as BlockPackSpecAny
   },
   {
     spec: {
-      type: 'dev',
+      type: 'dev-v1',
       folder: path.resolve('integration', 'block-beta-sum-numbers')
     } as BlockPackSpecAny
   }

package/src/mutator/block-pack/block_pack.ts

@@ -32,7 +32,6 @@ export class BlockPackPreparer {
       case 'explicit':
         return spec.config;
 
-      case 'dev':
       case 'dev-v1': {
         const devPaths = await resolveDevPacket(spec.folder, false);
         const configContent = await fs.promises.readFile(devPaths.config, { encoding: 'utf-8' });
@@ -50,13 +49,17 @@ export class BlockPackPreparer {
       case 'from-registry-v1': {
         const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
 
-        const urlPrefix = `${tSlash(spec.registryUrl)}${RegistryV1.packageContentPrefix(spec)}`;
+        const urlPrefix = `${tSlash(spec.registryUrl)}${RegistryV1.packageContentPrefix({ organization: spec.id.organization, package: spec.id.name, version: spec.id.version })}`;
 
         const configResponse = await request(`${urlPrefix}/config.json`, httpOptions);
 
         return (await configResponse.body.json()) as BlockConfig;
       }
 
+      case 'from-registry-v2': {
+        throw new Error('NOT YET SUPPORTED!');
+      }
+
       default:
         return assertNever(spec);
     }
@@ -67,7 +70,6 @@ export class BlockPackPreparer {
       case 'explicit':
         return spec;
 
-      case 'dev':
       case 'dev-v1': {
         const devPaths = await resolveDevPacket(spec.folder, false);
 
@@ -132,7 +134,7 @@ export class BlockPackPreparer {
       case 'from-registry-v1': {
         const httpOptions = this.http !== undefined ? { dispatcher: this.http } : {};
 
-        const urlPrefix = `${tSlash(spec.registryUrl)}${RegistryV1.packageContentPrefix(spec)}`;
+        const urlPrefix = `${tSlash(spec.registryUrl)}${RegistryV1.packageContentPrefix({ organization: spec.id.organization, package: spec.id.name, version: spec.id.version })}`;
 
         const templateUrl = `${urlPrefix}/template.plj.gz`;
         // template
@@ -163,6 +165,10 @@ export class BlockPackPreparer {
         };
       }
 
+      case 'from-registry-v2': {
+        throw new Error('NOT YET SUPPORTED!');
+      }
+
       default:
         return assertNever(spec);
     }