@milaboratories/pl-middle-layer 1.10.21 → 1.10.23

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);
 
@@ -105,7 +107,9 @@ export class BlockPackPreparer {
             encoding: 'utf-8'
           })
         ) as BlockConfig;
-        const workflowContent = await fs.promises.readFile(description.components.workflow.file);
+        const workflowContent = await fs.promises.readFile(
+          description.components.workflow.main.file
+        );
         const frontendPath = description.components.ui.folder;
         const source = { ...spec };
         if (spec.mtime === undefined)
@@ -130,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
@@ -161,6 +165,10 @@ export class BlockPackPreparer {
         };
       }
 
+      case 'from-registry-v2': {
+        throw new Error('NOT YET SUPPORTED!');
+      }
+
       default:
         return assertNever(spec);
     }

package/src/test/block_packs.ts

@@ -9,15 +9,19 @@ export const TestBPPreparer = new BlockPackPreparer(
 export const BPSpecEnterV041NotPrepared: BlockPackSpec = {
   type: 'from-registry-v1',
   registryUrl: 'https://block.registry.platforma.bio/releases',
-  organization: 'milaboratory',
-  package: 'enter-numbers',
-  version: '0.5.0'
+  id: {
+    organization: 'milaboratory',
+    name: 'enter-numbers',
+    version: '0.5.0'
+  }
 };
 
 export const BPSpecSumV042NotPrepared: BlockPackSpec = {
   type: 'from-registry-v1',
   registryUrl: 'https://block.registry.platforma.bio/releases',
-  organization: 'milaboratory',
-  package: 'sum-numbers',
-  version: '0.5.0'
+  id: {
+    organization: 'milaboratory',
+    name: 'sum-numbers',
+    version: '0.5.0'
+  }
 };

package/dist/block_registry/registry_spec.d.ts

@@ -1,12 +0,0 @@
-export type RemoteRegistryV1Spec = {
-    type: 'remote_v1';
-    label: string;
-    url: string;
-};
-export type FolderWithDevPackagesRegistrySpec = {
-    type: 'folder_with_dev_packages';
-    label: string;
-    path: string;
-};
-export type RegistrySpec = RemoteRegistryV1Spec | FolderWithDevPackagesRegistrySpec;
-//# sourceMappingURL=registry_spec.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"registry_spec.d.ts","sourceRoot":"","sources":["../../src/block_registry/registry_spec.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,IAAI,EAAE,0BAA0B,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,oBAAoB,GAAG,iCAAiC,CAAC"}

package/src/block_registry/registry_spec.ts

@@ -1,13 +0,0 @@
-export type RemoteRegistryV1Spec = {
-  type: 'remote_v1';
-  label: string;
-  url: string;
-};
-
-export type FolderWithDevPackagesRegistrySpec = {
-  type: 'folder_with_dev_packages';
-  label: string;
-  path: string;
-};
-
-export type RegistrySpec = RemoteRegistryV1Spec | FolderWithDevPackagesRegistrySpec;