@platforma-sdk/block-tools 2.1.10 → 2.2.0

package/dist/v2/registry/schema_public.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema_public.d.ts","sourceRoot":"","sources":["../../../src/v2/registry/schema_public.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/block-tools",
-  "version": "2.1.10",
+  "version": "2.2.0",
   "description": "Utility to manipulate Platforma Blocks and Block Registry",
   "types": "./dist/lib.d.ts",
   "main": "./dist/index.js",
@@ -23,23 +23,24 @@
   ],
   "license": "UNLICENSED",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.654.0",
-    "@oclif/core": "^4.0.22",
+    "@aws-sdk/client-s3": "^3.658.1",
+    "@oclif/core": "^4.0.23",
     "mime-types": "^2.1.35",
     "tar": "^7.4.3",
     "yaml": "^2.5.1",
     "zod": "^3.23.8",
-    "@milaboratories/pl-model-middle-layer": "^1.2.20",
-    "@milaboratories/ts-helpers": "^1.0.25",
-    "@milaboratories/ts-helpers-oclif": "^1.1.3"
+    "@milaboratories/resolve-helper": "^1.0.1",
+    "@milaboratories/pl-model-middle-layer": "^1.3.0",
+    "@milaboratories/ts-helpers": "^1.0.26",
+    "@milaboratories/ts-helpers-oclif": "^1.1.4"
   },
   "devDependencies": {
-    "semver": "^7.6.3",
     "typescript": "~5.5.4",
-    "vite": "^5.4.7",
+    "vite": "^5.4.8",
     "rollup-plugin-node-externals": "^7.1.3",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "vite-plugin-dts": "^4.2.1",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "vite-plugin-dts": "^4.2.2",
+    "semver": "^7.6.3",
     "@types/jest": "^29.5.13",
     "@types/mime-types": "^2.1.4",
     "@types/node": "~20.16.5",

package/src/cmd/build-meta.ts

@@ -2,7 +2,7 @@ import { Command, Flags } from '@oclif/core';
 import path from 'path';
 import fs from 'fs';
 import { loadPackDescriptionRaw } from '../v2';
-import { BlockPackMetaDescription, BlockPackMetaEmbed } from '../v2/model/meta';
+import { BlockPackMetaDescription, BlockPackMetaEmbed } from '../v2/model/block_meta';
 
 export default class BuildMeta extends Command {
   static override description =

package/src/cmd/index.ts

@@ -1,6 +1,7 @@
 import BuildMeta from './build-meta';
 import BuildModel from './build-model';
 import PackBlock from './pack-block';
+import Publish from './publish';
 import UploadPackageV1 from './upload-package-v1';
 
 // prettier-ignore
@@ -9,4 +10,5 @@ export const COMMANDS = {
   'pack': PackBlock,
   'build-model': BuildModel,
   'build-meta': BuildMeta,
+  'publish': Publish,
 };

package/src/cmd/publish.ts

@@ -0,0 +1,69 @@
+import { Command, Flags } from '@oclif/core';
+import fs from 'node:fs';
+import { OclifLoggerAdapter } from '@milaboratories/ts-helpers-oclif';
+import { ManifestFileName } from '../v2/registry/schema_public';
+import { BlockPackManifest } from '@milaboratories/pl-model-middle-layer';
+import { storageByUrl } from '../lib/storage';
+import { BlockRegistryV2 } from '../v2/registry/registry';
+import path from 'node:path';
+
+export default class Publish extends Command {
+  static description =
+    'Publishes the block package and refreshes the registry (for v2 block-pack schema)';
+
+  static flags = {
+    registry: Flags.string({
+      char: 'r',
+      summary: 'full address of the registry',
+      helpValue: '<address>',
+      env: 'PL_REGISTRY',
+      required: true
+    }),
+
+    manifest: Flags.file({
+      char: 'm',
+      summary: 'manifest file path',
+      exists: true,
+      default: `./block-pack/${ManifestFileName}`
+    }),
+
+    refresh: Flags.boolean({
+      summary: 'refresh repository after adding the package',
+      default: true,
+      allowNo: true,
+      env: 'PL_REGISTRY_REFRESH'
+    })
+  };
+
+  public async run(): Promise<void> {
+    const { flags } = await this.parse(Publish);
+
+    // if (flags.meta) {
+    //   if (flags.meta.endsWith('.json'))
+    //     configFromFlags.meta = JSON.parse(
+    //       await fs.promises.readFile(flags.meta, { encoding: 'utf-8' })
+    //     );
+    //   else if (flags.meta.endsWith('.yaml'))
+    //     configFromFlags.meta = YAML.parse(
+    //       await fs.promises.readFile(flags.meta, { encoding: 'utf-8' })
+    //     );
+    // }
+
+    const manifestPath = path.resolve(flags.manifest);
+    const manifest = BlockPackManifest.parse(
+      JSON.parse(await fs.promises.readFile(manifestPath, { encoding: 'utf-8' }))
+    );
+    const manifestRoot = path.dirname(manifestPath);
+
+    this.log(`Manifest root = ${manifestRoot}`);
+
+    const storage = storageByUrl(flags.registry);
+    const registry = new BlockRegistryV2(storage, new OclifLoggerAdapter(this));
+
+    await registry.publishPackage(manifest, async (file) =>
+      Buffer.from(await fs.promises.readFile(path.resolve(manifestRoot, file)))
+    );
+
+    if (flags.refresh) await registry.updateIfNeeded();
+  }
+}

package/src/registry_v1/registry.ts

@@ -1,6 +1,6 @@
 import { RegistryStorage } from '../lib/storage';
 import { randomUUID } from 'node:crypto';
-import semver from 'semver/preload';
+import semver from 'semver';
 import {
   BlockPackageNameWithoutVersion,
   FullBlockPackageName,

package/src/v2/build_dist.ts

@@ -1,13 +1,11 @@
 import {
-  BlockPackDescriptionAbsolute,
-  BlockPackDescriptionConsolidateToFolder,
   BlockPackDescriptionManifest,
   BlockPackManifest,
-  BlockPackManifestFile
-} from './model';
+  BlockPackManifestFile,
+  ManifestFileInfo
+} from '@milaboratories/pl-model-middle-layer';
+import { BlockPackDescriptionAbsolute, BlockPackDescriptionConsolidateToFolder } from './model';
 import fsp from 'node:fs/promises';
-import { BlockPackMetaConsolidate, BlockPackMetaDescription } from './model/meta';
-import { patch } from 'semver';
 import path from 'node:path';
 
 export async function buildBlockPackDist(
@@ -16,14 +14,20 @@ export async function buildBlockPackDist(
 ): Promise<BlockPackManifest> {
   await fsp.mkdir(dst, { recursive: true });
   const files: string[] = [];
-  const descriptionRelative = await BlockPackDescriptionConsolidateToFolder(dst, files).parseAsync(
-    description
+  const descriptionRelative: BlockPackDescriptionManifest =
+    await BlockPackDescriptionConsolidateToFolder(dst, files).parseAsync(description);
+  const filesForManifest = await Promise.all(
+    files.map(async (f): Promise<ManifestFileInfo> => {
+      const bytes = await fsp.readFile(path.resolve(dst, f));
+      const sha256 = Buffer.from(await crypto.subtle.digest('sha-256', bytes)).toString('hex');
+      return { name: f, size: bytes.length, sha256 };
+    })
   );
   const manifest: BlockPackManifest = BlockPackManifest.parse({
-    schema: 'v1',
-    ...descriptionRelative,
-    files
-  });
+    schema: 'v2',
+    description: descriptionRelative,
+    files: filesForManifest
+  } satisfies BlockPackManifest);
   await fsp.writeFile(path.resolve(dst, BlockPackManifestFile), JSON.stringify(manifest));
   return manifest;
 }

package/src/v2/model/block_components.ts

@@ -3,10 +3,14 @@ import {
   ResolvedModuleFile,
   ResolvedModuleFolder,
   packFolderToRelativeTgz,
-  cpAbsoluteToRelative,
-  mapRemoteToAbsolute,
+  cpAbsoluteToRelative
 } from './content_conversion';
-import { BlockComponents, BlockComponentsManifest, ContentAbsoluteBinaryLocal, ContentAbsoluteFolder, ContentRelativeBinary } from '@milaboratories/pl-model-middle-layer';
+import {
+  BlockComponents,
+  BlockComponentsManifest,
+  ContentAbsoluteBinaryLocal,
+  ContentAbsoluteFolder
+} from '@milaboratories/pl-model-middle-layer';
 
 export function BlockComponentsDescription(moduleRoot: string) {
   return BlockComponents(
@@ -23,10 +27,10 @@ export function BlockComponentsConsolidate(dstFolder: string, fileAccumulator?:
   ).pipe(BlockComponentsManifest);
 }
 
-export function BlockComponentsAbsoluteUrl(prefix: string) {
-  return BlockComponents(
-    ContentRelativeBinary.transform(mapRemoteToAbsolute(prefix)),
-    ContentRelativeBinary.transform(mapRemoteToAbsolute(prefix))
-  );
-}
-export type BlockComponentsAbsolute = z.infer<ReturnType<typeof BlockComponentsAbsoluteUrl>>;
+// export function BlockComponentsAbsoluteUrl(prefix: string) {
+//   return BlockComponents(
+//     ContentRelativeBinary.transform(mapRemoteToAbsolute(prefix)),
+//     ContentRelativeBinary.transform(mapRemoteToAbsolute(prefix))
+//   );
+// }
+// export type BlockComponentsAbsolute = z.infer<ReturnType<typeof BlockComponentsAbsoluteUrl>>;

package/src/v2/model/block_description.ts

@@ -0,0 +1,49 @@
+import {
+  addPrefixToRelative,
+  BlockComponents,
+  BlockPackDescriptionManifest,
+  BlockPackMeta,
+  ContentRelative,
+  ContentRelativeBinary,
+  ContentRelativeText,
+  CreateBlockPackDescriptionSchema
+} from '@milaboratories/pl-model-middle-layer';
+import { BlockComponentsConsolidate, BlockComponentsDescription } from './block_components';
+import { BlockPackMetaConsolidate, BlockPackMetaDescription } from './block_meta';
+import { z } from 'zod';
+
+export function ResolvedBlockPackDescriptionFromPackageJson(root: string) {
+  return CreateBlockPackDescriptionSchema(
+    BlockComponentsDescription(root),
+    BlockPackMetaDescription(root)
+  );
+}
+export type BlockPackDescriptionAbsolute = z.infer<
+  ReturnType<typeof ResolvedBlockPackDescriptionFromPackageJson>
+>;
+
+export function BlockPackDescriptionConsolidateToFolder(
+  dstFolder: string,
+  fileAccumulator?: string[]
+) {
+  return CreateBlockPackDescriptionSchema(
+    BlockComponentsConsolidate(dstFolder, fileAccumulator),
+    BlockPackMetaConsolidate(dstFolder, fileAccumulator)
+  ).pipe(BlockPackDescriptionManifest);
+}
+
+export function BlockPackDescriptionManifestAddRelativePathPrefix(prefix: string) {
+  const transformer = addPrefixToRelative(prefix);
+  return BlockPackDescriptionManifest.pipe(
+    CreateBlockPackDescriptionSchema(
+      BlockComponents(
+        ContentRelative.transform(transformer),
+        ContentRelative.transform(transformer)
+      ),
+      BlockPackMeta(
+        ContentRelativeText.transform(transformer),
+        ContentRelativeBinary.transform(transformer)
+      )
+    )
+  ).pipe(BlockPackDescriptionManifest);
+}

package/src/v2/model/{meta.ts → block_meta.ts}

@@ -1,5 +1,6 @@
 import {
   BlockPackMeta,
+  BlockPackMetaEmbeddedContent,
   ContentAbsoluteBinaryLocal,
   ContentAbsoluteTextLocal,
   DescriptionContentBinary,
@@ -12,7 +13,6 @@ import {
   mapLocalToAbsolute
 } from './content_conversion';
 import { z } from 'zod';
-import { BlockPackMetaEmbeddedContent } from '@milaboratories/pl-model-middle-layer';
 
 export function BlockPackMetaDescription(root: string) {
   return BlockPackMeta(

package/src/v2/model/content_conversion.ts

@@ -8,11 +8,15 @@ import {
   ContentAbsoluteFile,
   ContentAbsoluteFolder,
   ContentAbsoluteTextLocal,
-  ContentAbsoluteUrl,
   ContentAnyLocal,
   ContentExplicitBase64,
-  ContentRelative
+  ContentExplicitBytes,
+  ContentExplicitString,
+  ContentRelative,
+  ContentRelativeBinary,
+  ContentRelativeText
 } from '@milaboratories/pl-model-middle-layer';
+import { tryResolve } from '@milaboratories/resolve-helper';
 
 type ContentCtxFs = {
   type: 'local';
@@ -29,17 +33,6 @@ type ContentCtxUrl = {
 /** Describes a place relative to which any content references should be interpreted */
 export type ContentCtx = ContentCtxFs | ContentCtxUrl;
 
-function tryResolve(root: string, request: string): string | undefined {
-  try {
-    return require.resolve(request, {
-      paths: [root]
-    });
-  } catch (err: any) {
-    if (err.code !== 'MODULE_NOT_FOUND') throw err;
-  }
-  return undefined;
-}
-
 function mustResolve(root: string, request: string): string {
   const res = tryResolve(root, request);
   if (res === undefined) throw new Error(`Can't resolve ${request} against ${root}`);
@@ -167,12 +160,48 @@ export function packFolderToRelativeTgz(
   };
 }
 
-export function mapRemoteToAbsolute(
-  rootUrl: string
-): <T extends ContentAnyLocal>(value: T) => Exclude<T, ContentRelative> | ContentAbsoluteUrl {
-  const rootWithSlash = rootUrl.endsWith('/') ? rootUrl : `${rootUrl}/`;
-  return <T extends ContentAnyLocal>(value: T) =>
-    value.type === 'relative'
-      ? { type: 'absolute-url', url: rootWithSlash + value.path }
-      : (value as Exclude<T, ContentRelative>);
+export type RelativeContentReader = (relativePath: string) => Promise<Buffer>;
+
+export function relativeToExplicitText(
+  reader: RelativeContentReader
+): (value: ContentRelativeText) => Promise<ContentExplicitString> {
+  return async (value) =>
+    value.type === 'explicit-string'
+      ? value
+      : { type: 'explicit-string', content: (await reader(value.path)).toString('utf8') };
+}
+
+export function relativeToExplicitBinary64(
+  reader: RelativeContentReader
+): (value: ContentRelativeBinary) => Promise<ContentExplicitBase64> {
+  return async (value) => {
+    if (value.type === 'explicit-base64') return value;
+    const mimeType = mime.lookup(value.path);
+    if (!mimeType) throw new Error(`Can't recognize mime type of the file: ${value.path}.`);
+    return {
+      type: 'explicit-base64',
+      mimeType,
+      content: (await reader(value.path)).toString('base64')
+    };
+  };
+}
+
+export function relativeToExplicitBytes(
+  reader: RelativeContentReader
+): (value: ContentRelativeBinary) => Promise<ContentExplicitBytes> {
+  return async (value) => {
+    if (value.type === 'explicit-base64')
+      return {
+        type: 'explicit-bytes',
+        mimeType: value.mimeType,
+        content: Buffer.from(value.content, 'base64')
+      };
+    const mimeType = mime.lookup(value.path);
+    if (!mimeType) throw new Error(`Can't recognize mime type of the file: ${value.path}.`);
+    return {
+      type: 'explicit-bytes',
+      mimeType,
+      content: await reader(value.path)
+    };
+  };
 }

package/src/v2/model/index.ts

@@ -1,46 +1,5 @@
-import { z } from 'zod';
-import { BlockComponentsConsolidate, BlockComponentsDescription } from './block_components';
-import {
-  BlockComponentsManifest,
-  BlockPackMetaManifest,
-  CreateBlockPackDescriptionSchema
-} from '@milaboratories/pl-model-middle-layer';
-import { BlockPackMetaConsolidate, BlockPackMetaDescription } from './meta';
-
-export * from './block_components';
 export * from './content_conversion';
 
-export function ResolvedBlockPackDescriptionFromPackageJson(root: string) {
-  return CreateBlockPackDescriptionSchema(
-    BlockComponentsDescription(root),
-    BlockPackMetaDescription(root)
-  );
-}
-export type BlockPackDescriptionAbsolute = z.infer<
-  ReturnType<typeof ResolvedBlockPackDescriptionFromPackageJson>
->;
-
-export function BlockPackDescriptionConsolidateToFolder(
-  dstFolder: string,
-  fileAccumulator?: string[]
-) {
-  return CreateBlockPackDescriptionSchema(
-    BlockComponentsConsolidate(dstFolder, fileAccumulator),
-    //BlockPackMetaToExplicit
-    BlockPackMetaConsolidate(dstFolder, fileAccumulator)
-  ).pipe(BlockPackDescriptionManifest);
-}
-
-export const BlockPackDescriptionManifest = CreateBlockPackDescriptionSchema(
-  BlockComponentsManifest,
-  BlockPackMetaManifest
-);
-export type BlockPackDescriptionManifest = z.infer<typeof BlockPackDescriptionManifest>;
-
-export const BlockPackManifest = BlockPackDescriptionManifest.extend({
-  schema: z.literal('v1'),
-  files: z.array(z.string())
-});
-export type BlockPackManifest = z.infer<typeof BlockPackManifest>;
-
-export const BlockPackManifestFile = 'manifest.json';
+export * from './block_meta';
+export * from './block_components';
+export * from './block_description';