@milaboratories/pl-middle-layer 1.22.5 → 1.23.0

package/dist/js_render/context.d.ts

@@ -36,7 +36,7 @@ export declare class JsExecutionContext implements JsRenderInternal.GlobalCfgRen
     getKeyValueAsString(handle: string, key: string): string | undefined;
     getDataBase64(handle: string): string | undefined;
     getDataAsString(handle: string): string | undefined;
-    parsePObjectCollection(handle: string, errorOnUnknownField: boolean, prefix: string): Record<string, PObject<string>> | undefined;
+    parsePObjectCollection(handle: string, errorOnUnknownField: boolean, prefix: string, ...resolveSteps: string[]): Record<string, PObject<string>> | undefined;
     private registerComputable;
     getBlobContentAsString(handle: string): string;
     getBlobContentAsBase64(handle: string): string;

package/dist/js_render/context.d.ts.map

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

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

@@ -0,0 +1,4 @@
+import { AnyRef, PlTransaction } from '@milaboratories/pl-client';
+import { ExplicitTemplate } from '../../model/template_spec';
+export declare function loadTemplateFromExplicitDirect(tx: PlTransaction, spec: ExplicitTemplate): AnyRef;
+//# sourceMappingURL=direct_template_loader.d.ts.map

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

@@ -0,0 +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"}

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

@@ -1 +1 @@
-{"version":3,"file":"template_loading.d.ts","sourceRoot":"","sources":["../../../src/mutator/template/template_loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE3F,OAAO,EAGL,eAAe,EACf,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAOnC,eAAO,MAAM,gBAAgB,EAAE,YAAyD,CAAC;AACzF,eAAO,MAAM,wBAAwB,aAAa,CAAC;AACnD,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AACzD,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,eAAO,MAAM,iBAAiB,EAAE,YAA0D,CAAC;AAC3F,eAAO,MAAM,wBAAwB,EAAE,YAGtC,CAAC;AACF,eAAO,MAAM,oCAAoC,iBAAiB,CAAC;AACnE,eAAO,MAAM,gCAAgC,aAAa,CAAC;AAE3D,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAa7F;AA2BD,wBAAgB,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,GAAG,MAAM,CASlF"}
+{"version":3,"file":"template_loading.d.ts","sourceRoot":"","sources":["../../../src/mutator/template/template_loading.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGrF,OAAO,KAAK,EAGV,eAAe,EACf,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAQnC,eAAO,MAAM,gBAAgB,EAAE,YAAyD,CAAC;AACzF,eAAO,MAAM,wBAAwB,aAAa,CAAC;AACnD,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AACzD,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,eAAO,MAAM,iBAAiB,EAAE,YAA0D,CAAC;AAC3F,eAAO,MAAM,wBAAwB,EAAE,YAGtC,CAAC;AACF,eAAO,MAAM,oCAAoC,iBAAiB,CAAC;AACnE,eAAO,MAAM,gCAAgC,aAAa,CAAC;AAE3D,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAa7F;AA2BD,wBAAgB,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAUlF"}

package/dist/pool/data.d.ts

@@ -22,5 +22,7 @@ export type PColumnDataSuperPartitionedResourceValue = {
 };
 export declare function parseDataInfoResource(data: PlTreeNodeAccessor): PFrameInternal.DataInfo<ResourceInfo>;
 export declare function makeDataInfoResource(spec: PColumnSpec, data: PColumnValues): PFrameInternal.DataInfo<ResourceInfo>;
-export declare function derivePObjectId(spec: PObjectSpec, data: PlTreeNodeAccessor): PObjectId;
+export declare function deriveLegacyPObjectId(spec: PObjectSpec, data: PlTreeNodeAccessor): PObjectId;
+export declare function deriveGlobalPObjectId(blockId: string, exportName: string): PObjectId;
+export declare function deriveLocalPObjectId(resolvePath: string[], outputName: string): PObjectId;
 //# sourceMappingURL=data.d.ts.map

package/dist/pool/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/pool/data.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAY3E,wBAAiB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAgB3E;AAWD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAC7B,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,EACjC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GACxB,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAiB7B;AAED,eAAO,MAAM,0BAA0B,kDAAmD,CAAC;AAC3F,eAAO,MAAM,+BAA+B,kDAG3C,CAAC;AACF,eAAO,MAAM,4BAA4B,kDAAqD,CAAC;AAC/F,eAAO,MAAM,iCAAiC,kDAG7C,CAAC;AACF,eAAO,MAAM,eAAe,kDAAwC,CAAC;AAErE,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,wCAAwC,GAAG;IACrD,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,kBAAkB,GACvB,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,CA4IvC;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,aAAa,GAClB,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,CAcvC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,GAAG,SAAS,CAKtF"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/pool/data.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAS,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAY3E,wBAAiB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAgB3E;AAWD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAC7B,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,EACjC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GACxB,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAiB7B;AAED,eAAO,MAAM,0BAA0B,kDAAmD,CAAC;AAC3F,eAAO,MAAM,+BAA+B,kDAG3C,CAAC;AACF,eAAO,MAAM,4BAA4B,kDAAqD,CAAC;AAC/F,eAAO,MAAM,iCAAiC,kDAG7C,CAAC;AACF,eAAO,MAAM,eAAe,kDAAwC,CAAC;AAErE,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,wCAAwC,GAAG;IACrD,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,kBAAkB,GACvB,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,CA4IvC;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,aAAa,GAClB,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,CAcvC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,GAAG,SAAS,CAK5F;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAEpF;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAEzF"}

package/dist/pool/p_object_collection.d.ts

@@ -25,5 +25,5 @@ export interface RawPObjectEntry {
     data?(): ValueOrError<PlTreeNodeAccessor, string> | undefined;
 }
 export declare function parseRawPObjectCollection(node: PlTreeNodeAccessor, errorOnUnknownField?: boolean, ignoreFieldErrors?: boolean, prefix?: string): RawPObjectCollection;
-export declare function parseFinalPObjectCollection(node: PlTreeNodeAccessor, errorOnUnknownField?: boolean, prefix?: string): Record<string, PObject<PlTreeNodeAccessor>>;
+export declare function parseFinalPObjectCollection(node: PlTreeNodeAccessor, errorOnUnknownField: boolean | undefined, prefix: string | undefined, resolvePath: string[]): Record<string, PObject<PlTreeNodeAccessor>>;
 //# sourceMappingURL=p_object_collection.d.ts.map

package/dist/pool/p_object_collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"p_object_collection.d.ts","sourceRoot":"","sources":["../../src/pool/p_object_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAM1E,mDAAmD;AACnD,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,sBAAsB;IACtB,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAChD;AAED,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC9B;;;;SAIK;IACL,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAE3B,sEAAsE;IACtE,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAE5B;;;;SAIK;IACL,IAAI,CAAC,IAAI,YAAY,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC/D;AAMD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,kBAAkB,EACxB,mBAAmB,GAAE,OAAc,EACnC,iBAAiB,GAAE,OAAe,EAClC,MAAM,GAAE,MAAW,GAClB,oBAAoB,CAoDtB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,kBAAkB,EACxB,mBAAmB,GAAE,OAAc,EACnC,MAAM,GAAE,MAAW,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAmB7C"}
+{"version":3,"file":"p_object_collection.d.ts","sourceRoot":"","sources":["../../src/pool/p_object_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAa,WAAW,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAMrF,mDAAmD;AACnD,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,sBAAsB;IACtB,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAChD;AAED,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC9B;;;;SAIK;IACL,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAE3B,sEAAsE;IACtE,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAE5B;;;;SAIK;IACL,IAAI,CAAC,IAAI,YAAY,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC/D;AAMD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,kBAAkB,EACxB,mBAAmB,GAAE,OAAc,EACnC,iBAAiB,GAAE,OAAe,EAClC,MAAM,GAAE,MAAW,GAClB,oBAAoB,CAoDtB;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,kBAAkB,EACxB,mBAAmB,EAAE,OAAO,YAAO,EACnC,MAAM,EAAE,MAAM,YAAK,EACnB,WAAW,EAAE,MAAM,EAAE,GACpB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAqB7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.22.5",
+  "version": "1.23.0",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -28,20 +28,21 @@
     "utility-types": "^3.11.0",
     "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",
+    "@milaboratories/resolve-helper": "^1.0.2",
+    "@milaboratories/pl-drivers": "^1.5.5",
     "@platforma-sdk/block-tools": "^2.5.0",
+    "@milaboratories/pl-http": "^1.0.2",
+    "@milaboratories/pl-model-common": "^1.10.1",
     "@milaboratories/pl-client": "^2.7.1",
-    "@milaboratories/pl-drivers": "^1.5.5",
-    "@milaboratories/pl-tree": "^1.4.20",
+    "@milaboratories/pl-model-backend": "^1.0.1",
     "@milaboratories/pl-model-middle-layer": "^1.6.8",
-    "@platforma-sdk/model": "^1.20.11",
-    "@milaboratories/pl-model-common": "^1.10.1",
+    "@milaboratories/pl-tree": "^1.4.20",
+    "@platforma-sdk/model": "^1.20.24",
     "@milaboratories/ts-helpers": "^1.1.3",
+    "@milaboratories/pl-local": "^1.9.1",
     "@platforma-sdk/workflow-tengo": "2.8.5",
-    "@milaboratories/pl-config": "^1.3.3",
-    "@milaboratories/pl-local": "^1.9.1"
+    "@milaboratories/pl-config": "^1.3.3"
   },
   "devDependencies": {
     "semver": "^7.6.3",
@@ -53,6 +54,7 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.5",
+    "@milaboratories/eslint-config": "^1.0.1",
     "@milaboratories/platforma-build-configs": "1.0.2"
   },
   "scripts": {

package/src/js_render/context.ts

@@ -215,11 +215,12 @@ export class JsExecutionContext
   parsePObjectCollection(
     handle: string,
     errorOnUnknownField: boolean,
-    prefix: string
+    prefix: string,
+    ...resolveSteps: string[]
   ): Record<string, PObject<string>> | undefined {
     const acc = this.getAccessor(handle);
     if (!acc.getIsReadyOrError()) return undefined;
-    const accResult = parseFinalPObjectCollection(acc, errorOnUnknownField, prefix);
+    const accResult = parseFinalPObjectCollection(acc, errorOnUnknownField, prefix, resolveSteps);
     const result: Record<string, PObject<string>> = {};
     for (const [key, obj] of Object.entries(accResult)) {
       result[key] = mapPObjectData(obj, (d) => this.wrapAccessor(d));
@@ -666,12 +667,13 @@ export class JsExecutionContext
       // Accessor helpers
       //
 
-      exportCtxFunction('parsePObjectCollection', (handle, errorOnUnknownField, prefix) => {
+      exportCtxFunction('parsePObjectCollection', (handle, errorOnUnknownField, prefix, ...resolveSteps) => {
         return this.exportObjectUniversal(
           this.parsePObjectCollection(
             this.vm.getString(handle),
             this.vm.dump(errorOnUnknownField) as boolean,
-            this.vm.getString(prefix)
+            this.vm.getString(prefix),
+            ...resolveSteps.map(this.vm.getString),
           ),
           undefined
         );

package/src/mutator/template/direct_template_loader.ts

@@ -0,0 +1,177 @@
+import type { AnyRef, AnyResourceRef, PlTransaction } from '@milaboratories/pl-client';
+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';
+
+export function loadTemplateFromExplicitDirect(tx: PlTransaction, spec: ExplicitTemplate): AnyRef {
+  const templateInfo: TemplateData = parseTemplate(spec.content);
+
+  const templateFormat = templateInfo.type;
+  switch (templateFormat) {
+    case 'pl.tengo-template.v2':
+      return createTemplateV2Tree(tx, templateInfo);
+    default:
+      assertNever(templateFormat);
+  }
+}
+
+type Renderer<T> = {
+  hash: Hasher<T>;
+  render: (resource: T, tx: PlTransaction, creator: Creator<T>) => AnyResourceRef;
+};
+type Hasher<T> = (resource: T, hash: Hash) => void;
+type Creator<T> = (resource: T, renderer: Renderer<T>) => AnyResourceRef;
+
+const LibRenderer: Renderer<TemplateLibData> = {
+  hash(resource, hash) {
+    hash
+      .update(PlTemplateLibV1.type.name)
+      .update(PlTemplateLibV1.type.version)
+      .update(resource.name)
+      .update(resource.version)
+      .update(resource.src);
+  },
+  render(resource, tx, _creator) {
+    return tx.createValue(
+      PlTemplateLibV1.type,
+      JSON.stringify(PlTemplateLibV1.fromV2Data(resource).data),
+    );
+  },
+};
+
+const SoftwareInfoRenderer: Renderer<TemplateSoftwareData> = {
+  hash(resource, hash) {
+    hash
+      .update(PlTemplateSoftwareV1.type.name)
+      .update(PlTemplateSoftwareV1.type.version)
+      .update(resource.name)
+      .update(resource.version)
+      .update(resource.src);
+  },
+  render(resource, tx, _creator) {
+    const sw = PlTemplateSoftwareV1.fromV2Data(resource);
+    const ref = tx.createStruct(PlTemplateSoftwareV1.type, sw.data);
+    tx.setKValue(ref, PlTemplateSoftwareV1.metaNameKey, JSON.stringify(sw.name));
+    tx.lock(ref);
+    return ref;
+  },
+};
+
+const TemplateRenderer: Renderer<TemplateData> = {
+  hash(resource, hash) {
+    hash
+      .update(PlTemplateV1.type.name)
+      .update(PlTemplateV1.type.version)
+      .update(resource.hashOverride ?? '')
+      .update(resource.name)
+      .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);
+      return entries;
+    };
+
+    for (const [libId, lib] of srt(Object.entries(resource.libs ?? {}))) {
+      hash.update('lib:' + libId);
+      LibRenderer.hash(lib, hash);
+    }
+    for (const [swId, sw] of srt(Object.entries(resource.software ?? {}))) {
+      hash.update('soft:' + swId);
+      SoftwareInfoRenderer.hash(sw, hash);
+    }
+    for (const [swId, sw] of srt(Object.entries(resource.assets ?? {}))) {
+      hash.update('asset:' + swId);
+      SoftwareInfoRenderer.hash(sw, hash);
+    }
+    for (const [tplId, tpl] of srt(Object.entries(resource.templates ?? {}))) {
+      hash.update('tpl:' + tplId);
+      this.hash(tpl, hash);
+    }
+  },
+  render(resource, tx, _creator) {
+    return tx.createStruct(
+      PlTemplateV1.type,
+      JSON.stringify(PlTemplateV1.fromV2Data(resource).data),
+    );
+  },
+};
+
+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)),
+    );
+  },
+};
+
+function createTemplateV2Tree(tx: PlTransaction, tplInfo: TemplateData, resourceCache?: Map<string, AnyResourceRef>): AnyRef {
+  if (!resourceCache) {
+    resourceCache = new Map<string, AnyResourceRef>();
+  }
+
+  const createResource = <T>(resource: T, renderer: Renderer<T>): AnyResourceRef => {
+    const hasher: Hash = createHash('sha256');
+    renderer.hash(resource, hasher);
+
+    const rKey = hasher.digest('hex');
+    if (!resourceCache.has(rKey)) {
+      const rId = renderer.render(resource, tx, createResource);
+      resourceCache.set(rKey, rId);
+    }
+
+    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;
+}

package/src/mutator/template/template_loading.ts

@@ -1,12 +1,14 @@
-import { AnyRef, field, Pl, PlTransaction, ResourceType } from '@milaboratories/pl-client';
+import type { AnyRef, PlTransaction, ResourceType } from '@milaboratories/pl-client';
+import { field, Pl } from '@milaboratories/pl-client';
 import fs from 'node:fs';
-import {
+import type {
   ExplicitTemplate,
   TemplateFromRegistry,
   TemplateSpecAny,
-  TemplateSpecPrepared
+  TemplateSpecPrepared,
 } from '../../model/template_spec';
 import { assertNever } from '@milaboratories/ts-helpers';
+import { loadTemplateFromExplicitDirect } from './direct_template_loader';
 
 //
 // Resource schema
@@ -20,7 +22,7 @@ export const TengoTemplateGetTemplate = 'template';
 export const TengoTemplatePack: ResourceType = { name: 'TengoTemplatePack', version: '1' };
 export const TengoTemplatePackConvert: ResourceType = {
   name: 'TengoTemplatePackConvert',
-  version: '1'
+  version: '1',
 };
 export const TengoTemplatePackConvertTemplatePack = 'templatePack';
 export const TengoTemplatePackConvertTemplate = 'template';
@@ -30,7 +32,7 @@ export async function prepareTemplateSpec(tpl: TemplateSpecAny): Promise<Templat
     case 'from-file':
       return {
         type: 'explicit',
-        content: await fs.promises.readFile(tpl.path)
+        content: await fs.promises.readFile(tpl.path),
       };
     case 'from-registry':
     case 'explicit':
@@ -70,7 +72,8 @@ export function loadTemplate(tx: PlTransaction, spec: TemplateSpecPrepared): Any
     case 'from-registry':
       return loadTemplateFromRegistry(tx, spec);
     case 'explicit':
-      return loadTemplateFromExplicit(tx, spec);
+      return loadTemplateFromExplicitDirect(tx, spec);
+      // return loadTemplateFromExplicit(tx, spec);
     default:
       return assertNever(spec);
   }

package/src/pool/data.ts

@@ -1,8 +1,7 @@
-import { PColumnSpec, PColumnValues, PObjectId, PObjectSpec } from '@platforma-sdk/model';
+import { PColumnSpec, PColumnValues, PlRef, PObjectId, PObjectSpec } from '@platforma-sdk/model';
 import { PFrameInternal } from '@milaboratories/pl-model-middle-layer';
 import { PlTreeNodeAccessor, ResourceInfo } from '@milaboratories/pl-tree';
 import { assertNever } from '@milaboratories/ts-helpers';
-import { createHash } from 'crypto';
 import canonicalize from 'canonicalize';
 import {
   isNullResourceId,
@@ -11,6 +10,7 @@ import {
   resourceTypesEqual
 } from '@milaboratories/pl-client';
 import { Writable } from 'utility-types';
+import { createHash } from 'crypto';
 
 export function* allBlobs<B>(data: PFrameInternal.DataInfo<B>): Generator<B> {
   switch (data.type) {
@@ -250,9 +250,17 @@ export function makeDataInfoResource(
   };
 }
 
-export function derivePObjectId(spec: PObjectSpec, data: PlTreeNodeAccessor): PObjectId {
+export function deriveLegacyPObjectId(spec: PObjectSpec, data: PlTreeNodeAccessor): PObjectId {
   const hash = createHash('sha256');
   hash.update(canonicalize(spec)!);
   hash.update(String(!isNullResourceId(data.originalId) ? data.originalId : data.id));
   return hash.digest().toString('hex') as PObjectId;
 }
+
+export function deriveGlobalPObjectId(blockId: string, exportName: string): PObjectId {
+  return canonicalize({ __isRef: true, blockId, name: exportName } satisfies PlRef)! as PObjectId;
+}
+
+export function deriveLocalPObjectId(resolvePath: string[], outputName: string): PObjectId {
+  return canonicalize({ resolvePath, name: outputName })! as PObjectId
+}

package/src/pool/driver.ts

@@ -364,20 +364,61 @@ function joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEn
 
 function stableKeyFromFullPTableDef(data: FullPTableDef): string {
   const hash = createHash('sha256');
-  hash.update(data.pFrameHandle);
   hash.update(canonicalize(data.def)!);
   return hash.digest().toString('hex');
 }
 
-function stableKeyFromPFrameData(data: PColumn<unknown>[]): string {
-  // PObject IDs derived from the PObjects canonical identity, so represents the content
-  const ids = data.map((d) => d.id).sort();
+function stableKeyFromPFrameData(data: PColumn<PFrameInternal.DataInfo<ResourceInfo>>[]): string {
+  const orderedData = [...data].map((column) => mapPObjectData(column, (r) => {
+    let result: {
+      type: string,
+      keyLength: number,
+      payload: {
+        key: string;
+        value: null | number | string | [string, string]
+      }[];
+    };
+    const type = r.type;
+    switch (type) {
+      case 'Json':
+        result = {
+          type: r.type,
+          keyLength: r.keyLength,
+          payload: Object.entries(r.data).map(([part, value]) => ({
+            key: part,
+            value,
+          }))
+        };
+        break;
+      case 'JsonPartitioned':
+        result = {
+          type: r.type,
+          keyLength: r.partitionKeyLength,
+          payload: Object.entries(r.parts).map(([part, info]) => ({
+            key: part,
+            value: info.id.toString(),
+          }))
+        };
+        break;
+      case 'BinaryPartitioned':
+        result = {
+          type: r.type,
+          keyLength: r.partitionKeyLength,
+          payload: Object.entries(r.parts).map(([part, info]) => ({
+            key: part,
+            value: [info.index.id.toString(), info.values.id.toString()] as const,
+          }))
+        };
+        break;
+      default:
+        throw Error(`unsupported resource type: ${ type satisfies never }`);
+    }
+    result.payload.sort((lhs, rhs) => lhs.key.localeCompare(rhs.key));
+    return result;
+  }));
+  orderedData.sort((lhs, rhs) => lhs.id.localeCompare(rhs.id));
+
   const hash = createHash('sha256');
-  let previous = '';
-  for (const id of ids) {
-    if (previous === id) continue; // only unique ids
-    hash.update(id);
-    previous = id;
-  }
+  hash.update(canonicalize(orderedData)!);
   return hash.digest().toString('hex');
 }

package/src/pool/p_object_collection.ts

@@ -1,9 +1,9 @@
 import { PlError, PlTreeNodeAccessor } from '@milaboratories/pl-tree';
-import { PObject, PObjectSpec, ValueOrError } from '@platforma-sdk/model';
+import { PObject, PObjectId, PObjectSpec, ValueOrError } from '@platforma-sdk/model';
 import { notEmpty } from '@milaboratories/ts-helpers';
 import assert from 'assert';
 import { Writable } from 'utility-types';
-import { derivePObjectId } from './data';
+import { deriveLegacyPObjectId, deriveLocalPObjectId } from './data';
 
 /** Represents specific staging or prod ctx data */
 export interface RawPObjectCollection {
@@ -99,21 +99,24 @@ export function parseRawPObjectCollection(
 export function parseFinalPObjectCollection(
   node: PlTreeNodeAccessor,
   errorOnUnknownField: boolean = true,
-  prefix: string = ''
+  prefix: string = '',
+  resolvePath: string[],
 ): Record<string, PObject<PlTreeNodeAccessor>> {
   if (!node.getIsReadyOrError()) throw new Error('resource is not ready');
   const rawCollection = parseRawPObjectCollection(node, errorOnUnknownField, false, prefix);
   assert(rawCollection.locked);
   const collection: Record<string, PObject<PlTreeNodeAccessor>> = {};
-  for (const [exportName, result] of rawCollection.results) {
-    if (result.spec === undefined) throw new Error(`no spec for key ${exportName}`);
+  for (const [outputName, result] of rawCollection.results) {
+    if (result.spec === undefined) throw new Error(`no spec for key ${outputName}`);
     if (result.hasData !== true || result.data === undefined)
-      throw new Error(`no data for key ${exportName}`);
+      throw new Error(`no data for key ${outputName}`);
     const data = result.data();
-    if (data === undefined) throw new Error(`no data for key ${exportName}`);
+    if (data === undefined) throw new Error(`no data for key ${outputName}`);
     if (!data.ok) throw new PlError(data.error);
-    collection[exportName] = {
-      id: derivePObjectId(result.spec, data.value),
+    collection[outputName] = {
+      id: resolvePath.length === 0
+        ? deriveLegacyPObjectId(result.spec, data.value) // for old blocks opened in new desktop
+        : deriveLocalPObjectId(resolvePath, outputName),
       spec: result.spec,
       data: data.value
     };

package/src/pool/result_pool.ts

@@ -22,7 +22,7 @@ import {
 } from '../model/project_model';
 import { allBlocks, stagingGraph } from '../model/project_model_util';
 import { Optional } from 'utility-types';
-import { derivePObjectId } from './data';
+import { deriveGlobalPObjectId } from './data';
 import {
   RawPObjectCollection,
   RawPObjectEntry,
@@ -100,7 +100,7 @@ export class ResultPool {
     let data = result?.data?.();
     if (result !== undefined && result.spec !== undefined && data !== undefined)
       return mapValueInVOE(data, (value) => ({
-        id: derivePObjectId(result!.spec!, value),
+        id: deriveGlobalPObjectId(blockId, exportName),
         spec: result!.spec!,
         data: value
       }));
@@ -161,7 +161,7 @@ export class ResultPool {
           entries.push({
             ref: outputRef(blockId, exportName),
             obj: {
-              id: data.ok ? derivePObjectId(result.spec, data.value) : undefined,
+              id: data.ok ? deriveGlobalPObjectId(blockId, exportName) : undefined,
               spec: result.spec,
               data
             }