@milaboratories/pl-middle-layer 1.23.18 → 1.24.0

package/dist/mutator/template/direct_template_loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"direct_template_loader.d.ts","sourceRoot":"","sources":["../../../src/mutator/template/direct_template_loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAEvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAMlE,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAUhG"}
+{"version":3,"file":"direct_template_loader.d.ts","sourceRoot":"","sources":["../../../src/mutator/template/direct_template_loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAEvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAgBlE,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAUhG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.23.18",
+  "version": "1.24.0",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -29,20 +29,20 @@
     "yaml": "^2.6.1",
     "zod": "~3.23.8",
     "@milaboratories/pl-http": "^1.0.2",
-    "@milaboratories/resolve-helper": "^1.0.2",
     "@milaboratories/computable": "^2.3.4",
-    "@platforma-sdk/block-tools": "^2.5.2",
-    "@milaboratories/pl-client": "^2.7.1",
-    "@milaboratories/pl-drivers": "^1.5.7",
-    "@milaboratories/pl-model-common": "^1.10.2",
-    "@milaboratories/pl-model-middle-layer": "^1.6.10",
-    "@milaboratories/pl-tree": "^1.4.20",
-    "@platforma-sdk/model": "^1.21.10",
+    "@platforma-sdk/block-tools": "^2.5.3",
+    "@milaboratories/resolve-helper": "^1.0.2",
+    "@milaboratories/pl-drivers": "^1.5.9",
+    "@milaboratories/pl-model-common": "^1.10.3",
+    "@milaboratories/pl-client": "^2.7.2",
     "@milaboratories/pl-model-backend": "^1.0.1",
-    "@milaboratories/ts-helpers": "^1.1.3",
+    "@milaboratories/pl-tree": "^1.4.21",
+    "@platforma-sdk/model": "^1.21.20",
+    "@milaboratories/pl-model-middle-layer": "^1.6.11",
     "@platforma-sdk/workflow-tengo": "2.9.6",
-    "@milaboratories/pl-local": "^1.10.0",
-    "@milaboratories/pl-config": "^1.3.3"
+    "@milaboratories/ts-helpers": "^1.1.3",
+    "@milaboratories/pl-config": "^1.3.3",
+    "@milaboratories/pl-local": "^1.10.0"
   },
   "devDependencies": {
     "semver": "^7.6.3",

package/src/mutator/template/direct_template_loader.ts

@@ -3,8 +3,18 @@ import { assertNever } from '@milaboratories/ts-helpers';
 import type { ExplicitTemplate } from '../../model/template_spec';
 import type { Hash } from 'node:crypto';
 import { createHash } from 'node:crypto';
-import type { TemplateData, TemplateLibData, TemplateSoftwareData } from '@milaboratories/pl-model-backend';
-import { PlTemplateLibV1, PlTemplateSoftwareV1, PlTemplateV1, PlTemplateOverrideV1, parseTemplate } from '@milaboratories/pl-model-backend';
+import type {
+  TemplateData,
+  TemplateLibData,
+  TemplateSoftwareData
+} from '@milaboratories/pl-model-backend';
+import {
+  PlTemplateLibV1,
+  PlTemplateSoftwareV1,
+  PlTemplateV1,
+  PlTemplateOverrideV1,
+  parseTemplate
+} from '@milaboratories/pl-model-backend';
 
 export function loadTemplateFromExplicitDirect(tx: PlTransaction, spec: ExplicitTemplate): AnyRef {
   const templateInfo: TemplateData = parseTemplate(spec.content);
@@ -20,10 +30,10 @@ export function loadTemplateFromExplicitDirect(tx: PlTransaction, spec: Explicit
 
 type Renderer<T> = {
   hash: Hasher<T>;
-  render: (resource: T, tx: PlTransaction, creator: Creator<T>) => AnyResourceRef;
+  render: (resource: T, tx: PlTransaction, creator: Creator) => AnyResourceRef;
 };
 type Hasher<T> = (resource: T, hash: Hash) => void;
-type Creator<T> = (resource: T, renderer: Renderer<T>) => AnyResourceRef;
+type Creator = <T>(resource: T, renderer: Renderer<T>) => AnyResourceRef;
 
 const LibRenderer: Renderer<TemplateLibData> = {
   hash(resource, hash) {
@@ -37,9 +47,9 @@ const LibRenderer: Renderer<TemplateLibData> = {
   render(resource, tx, _creator) {
     return tx.createValue(
       PlTemplateLibV1.type,
-      JSON.stringify(PlTemplateLibV1.fromV2Data(resource).data),
+      JSON.stringify(PlTemplateLibV1.fromV2Data(resource).data)
     );
-  },
+  }
 };
 
 const SoftwareInfoRenderer: Renderer<TemplateSoftwareData> = {
@@ -57,7 +67,22 @@ const SoftwareInfoRenderer: Renderer<TemplateSoftwareData> = {
     tx.setKValue(ref, PlTemplateSoftwareV1.metaNameKey, JSON.stringify(sw.name));
     tx.lock(ref);
     return ref;
+  }
+};
+
+const HashOverrideRenderer: Renderer<TemplateData> = {
+  hash(resource, hash) {
+    hash
+      .update(PlTemplateOverrideV1.type.name)
+      .update(PlTemplateOverrideV1.type.version)
+      .update(resource.hashOverride ?? '');
   },
+  render(resource, tx, _creator) {
+    return tx.createStruct(
+      PlTemplateOverrideV1.type,
+      JSON.stringify(PlTemplateOverrideV1.fromV2Data(resource))
+    );
+  }
 };
 
 const TemplateRenderer: Renderer<TemplateData> = {
@@ -70,8 +95,8 @@ const TemplateRenderer: Renderer<TemplateData> = {
       .update(resource.version)
       .update(resource.src);
 
-    const srt = <T>(entries: [string, T][]) : [string, T][] => {
-      entries.sort((a, b) => a[0] === b[0] ? 0 : a[0] < b[0] ? -1 : 1);
+    const srt = <T>(entries: [string, T][]): [string, T][] => {
+      entries.sort((a, b) => (a[0] === b[0] ? 0 : a[0] < b[0] ? -1 : 1));
       return entries;
     };
 
@@ -93,32 +118,52 @@ const TemplateRenderer: Renderer<TemplateData> = {
     }
   },
   render(resource, tx, _creator) {
-    return tx.createStruct(
+    const tplRef = tx.createStruct(
       PlTemplateV1.type,
-      JSON.stringify(PlTemplateV1.fromV2Data(resource).data),
+      JSON.stringify(PlTemplateV1.fromV2Data(resource).data)
     );
-  },
-};
+    // Render libraries
+    for (const [libId, lib] of Object.entries(resource.libs ?? {})) {
+      const fld = PlTemplateV1.libField(tplRef, libId);
+      tx.createField(fld, 'Input');
+      tx.setField(fld, _creator(lib, LibRenderer));
+    }
 
-const HashOverrideRenderer: Renderer<TemplateData> = {
-  hash(resource, hash) {
-    hash
-      .update(PlTemplateOverrideV1.type.name)
-      .update(PlTemplateOverrideV1.type.version)
-      .update(resource.hashOverride ?? '');
-  },
-  render(resource, tx, _creator) {
-    return tx.createStruct(
-      PlTemplateOverrideV1.type,
-      JSON.stringify(PlTemplateOverrideV1.fromV2Data(resource)),
-    );
-  },
-};
+    // Render software and assets
+    for (const [swId, sw] of Object.entries(resource.software ?? {})) {
+      const fld = PlTemplateV1.swField(tplRef, swId);
+      tx.createField(fld, 'Input');
+      tx.setField(fld, _creator(sw, SoftwareInfoRenderer));
+    }
+    for (const [swId, sw] of Object.entries(resource.assets ?? {})) {
+      const fld = PlTemplateV1.swField(tplRef, swId);
+      tx.createField(fld, 'Input');
+      tx.setField(fld, _creator(sw, SoftwareInfoRenderer));
+    }
+
+    // Render dependency templates
+    for (const [depTplId, depTpl] of Object.entries(resource.templates ?? {})) {
+      const fld = PlTemplateV1.tplField(tplRef, depTplId);
+      tx.createField(fld, 'Input');
+      tx.setField(fld, _creator(depTpl, TemplateRenderer));
+    }
+
+    tx.lock(tplRef);
+
+    if (!resource.hashOverride) return tplRef;
 
-function createTemplateV2Tree(tx: PlTransaction, tplInfo: TemplateData, resourceCache?: Map<string, AnyResourceRef>): AnyRef {
-  if (!resourceCache) {
-    resourceCache = new Map<string, AnyResourceRef>();
+    // Override template hash with proxy resource, when hash override is configured for template
+    const overrideRef = _creator(resource, HashOverrideRenderer);
+    const fld = PlTemplateOverrideV1.tplField(overrideRef);
+    tx.createField(fld, 'Service');
+    tx.setField(fld, tplRef);
+    tx.lock(tplRef);
+    return overrideRef;
   }
+};
+
+function createTemplateV2Tree(tx: PlTransaction, tplInfo: TemplateData): AnyRef {
+  const resourceCache = new Map<string, AnyResourceRef>();
 
   const createResource = <T>(resource: T, renderer: Renderer<T>): AnyResourceRef => {
     const hasher: Hash = createHash('sha256');
@@ -133,45 +178,5 @@ function createTemplateV2Tree(tx: PlTransaction, tplInfo: TemplateData, resource
     return resourceCache.get(rKey)!;
   };
 
-  const tplRef = createResource(tplInfo, TemplateRenderer);
-
-  // Render libraries
-  for (const [libId, lib] of Object.entries(tplInfo.libs ?? {})) {
-    const fld = PlTemplateV1.libField(tplRef, libId);
-    tx.createField(fld, 'Input');
-    tx.setField(fld, createResource(lib, LibRenderer));
-  }
-
-  // Render software and assets
-  for (const [swId, sw] of Object.entries(tplInfo.software ?? {})) {
-    const fld = PlTemplateV1.swField(tplRef, swId);
-    tx.createField(fld, 'Input');
-    tx.setField(fld, createResource(sw, SoftwareInfoRenderer));
-  }
-  for (const [swId, sw] of Object.entries(tplInfo.assets ?? {})) {
-    const fld = PlTemplateV1.swField(tplRef, swId);
-    tx.createField(fld, 'Input');
-    tx.setField(fld, createResource(sw, SoftwareInfoRenderer));
-  }
-
-  // Render dependency templates
-  for (const [depTplId, depTpl] of Object.entries(tplInfo.templates ?? {})) {
-    const fld = PlTemplateV1.tplField(tplRef, depTplId);
-    tx.createField(fld, 'Input');
-    tx.setField(fld, createTemplateV2Tree(tx, depTpl, resourceCache));
-  }
-
-  tx.lock(tplRef);
-
-  if (!tplInfo.hashOverride) {
-    return tplRef;
-  }
-
-  // Override template hash with proxy resource, when hash override is configured for template
-  const overrideRef = createResource(tplInfo, HashOverrideRenderer);
-  const fld = PlTemplateOverrideV1.tplField(overrideRef);
-  tx.createField(fld, 'Service');
-  tx.setField(fld, tplRef);
-  tx.lock(tplRef);
-  return overrideRef;
+  return createResource(tplInfo, TemplateRenderer);
 }