@milaboratories/pl-middle-layer 1.73.10 → 1.74.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.73.10",
+  "version": "1.74.1",
   "description": "Pl Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -30,25 +30,25 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.8.0",
     "zod": "~3.25.76",
-    "@milaboratories/columns-collection-driver": "0.2.8",
-    "@milaboratories/pf-driver": "1.9.7",
-    "@milaboratories/helpers": "1.14.5",
-    "@milaboratories/pf-spec-driver": "1.5.7",
-    "@milaboratories/pl-crash-recorder": "0.3.4",
+    "@milaboratories/pf-driver": "1.9.8",
+    "@milaboratories/columns-collection-driver": "0.2.9",
     "@milaboratories/computable": "2.9.8",
-    "@milaboratories/pl-client": "3.18.1",
-    "@milaboratories/pl-drivers": "1.16.32",
-    "@milaboratories/pl-deployments": "3.0.20",
-    "@milaboratories/pl-model-backend": "1.4.35",
-    "@milaboratories/pl-errors": "1.4.50",
+    "@milaboratories/pl-crash-recorder": "0.3.5",
+    "@milaboratories/helpers": "1.14.5",
+    "@milaboratories/pl-deployments": "3.0.21",
+    "@milaboratories/pl-client": "3.18.2",
+    "@milaboratories/pf-spec-driver": "1.5.8",
+    "@milaboratories/pl-drivers": "1.16.33",
+    "@milaboratories/pl-errors": "1.4.51",
+    "@milaboratories/pl-model-backend": "1.4.36",
     "@milaboratories/pl-http": "1.2.4",
-    "@milaboratories/pl-model-common": "1.52.0",
-    "@milaboratories/pl-model-middle-layer": "1.34.1",
-    "@milaboratories/pl-tree": "1.16.2",
-    "@milaboratories/ts-helpers": "1.8.6",
+    "@milaboratories/pl-model-common": "1.53.0",
+    "@milaboratories/pl-model-middle-layer": "1.34.2",
+    "@milaboratories/pl-tree": "1.16.3",
     "@milaboratories/resolve-helper": "1.1.3",
-    "@platforma-sdk/block-tools": "2.16.11",
-    "@platforma-sdk/model": "1.84.10",
+    "@milaboratories/ts-helpers": "1.8.6",
+    "@platforma-sdk/block-tools": "2.16.13",
+    "@platforma-sdk/model": "1.84.17",
     "@platforma-sdk/workflow-tengo": "6.15.0"
   },
   "devDependencies": {
@@ -57,9 +57,9 @@
     "@vitest/coverage-istanbul": "^4.1.3",
     "typescript": "7.0.2",
     "vitest": "^4.1.3",
+    "@milaboratories/build-configs": "2.0.2",
     "@milaboratories/ts-builder": "1.7.2",
-    "@milaboratories/ts-configs": "1.4.0",
-    "@milaboratories/build-configs": "2.0.2"
+    "@milaboratories/ts-configs": "1.4.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/src/middle_layer/middle_layer.ts

@@ -76,7 +76,7 @@ import {
 } from "../mutator/project";
 import type { ProjectTemplateExportOutcome } from "../model/template_serializer";
 import type { ProjectTemplateV1 } from "@milaboratories/pl-model-common";
-import { asProjectId, asTemplateId } from "@milaboratories/pl-model-common";
+import { asProjectId, asTemplateId, withTemplateMeta } from "@milaboratories/pl-model-common";
 import { extractConfig, ensureError } from "@platforma-sdk/model";
 import type { TemplateApplyProblem, TemplateApplyReport } from "../model/template_apply";
 import { TemplateEntryRejected, kindMismatch } from "../model/template_apply";
@@ -943,6 +943,68 @@ export class MiddleLayer {
     return { ok: true, templateId };
   }
 
+  /**
+   * Stores a template brought in from outside — a template file the user picked — so it can be
+   * seen, applied and shared like one saved from a project.
+   *
+   * The document's description becomes the template's own, which stays editable; the stored
+   * document keeps only the blocks, without the label and description it was written with, so
+   * there is one name and one description to edit and nothing to drift.
+   *
+   * The template lands in `folder`, or at the top level, under `label` made free among the
+   * templates already there. A folder deleted meanwhile costs the template its placement, not its
+   * existence.
+   *
+   * @param document the parsed template to store
+   * @param options.label the name to store it under — usually the document's own label, which
+   *   the caller weighs against whatever else it knows, such as the file's name; suffixed when a
+   *   template there carries it
+   * @param options.folder where it lands; the top level when absent
+   */
+  public async importTemplate(
+    document: ProjectTemplateV1,
+    options: { label: string; folder?: FolderId },
+  ): Promise<TemplateId> {
+    const { folder } = options;
+    const signedRid = await this.pl.withWriteTx("MLImportTemplate", async (tx) => {
+      const tree = await openFoldersTx(tx, this.foldersRids);
+      // The name is made free where the template actually lands: the top level when the folder
+      // asked for is gone.
+      const destination =
+        folder !== undefined && tree.view.folders.some((candidate) => candidate.id === folder)
+          ? folder
+          : undefined;
+      const name = foldersUniqueName(
+        options.label.trim(),
+        tree.namesTakenIn(destination, "template"),
+      );
+
+      const tpl = createTemplate(
+        tx,
+        this.templateListResourceId,
+        { label: name, description: document.description },
+        { schemaVersion: 1, document: withTemplateMeta(document, {}) },
+      );
+
+      const created = await tpl.globalId;
+      if (destination !== undefined)
+        tree.place(
+          [{ kind: "template", id: asTemplateId(resourceIdToString(created)) }],
+          destination,
+        );
+      await tx.commit();
+      return created;
+    });
+    await Promise.all([
+      this.templateListTree.refreshState(),
+      ...(folder === undefined ? [] : [this.foldersTree.refreshState()]),
+    ]);
+
+    const templateId = asTemplateId(resourceIdToString(signedRid));
+    this.templateIdCache.set(templateId, signedRid);
+    return templateId;
+  }
+
   /**
    * Changes a template's label. The stored document is immutable and stays untouched —
    * improving a template means saving a new one.

package/src/middle_layer/templates.test.ts

@@ -7,7 +7,7 @@ import type {
   ProjectTemplateV1,
   ProjectTemplateV1Entry,
 } from "@milaboratories/pl-model-common";
-import { PROJECT_TEMPLATE_SCHEMA_V1 } from "@milaboratories/pl-model-common";
+import { PROJECT_TEMPLATE_SCHEMA_V1, withTemplateMeta } from "@milaboratories/pl-model-common";
 import type { BlockPackSpec } from "@milaboratories/pl-model-middle-layer";
 import type { BlockPackProvider } from "../model/template_resolve";
 import type { ShareId } from "../model/sharing_model";
@@ -75,6 +75,50 @@ test("a rename changes the label and leaves the stored document byte-identical",
   });
 });
 
+test("an imported template takes the file's description as its own, under a free name", async () => {
+  await withMl(async (ml) => {
+    const document = withTemplateMeta(documentOf(entry("a")), {
+      label: "Written in the file",
+      description: "What it builds",
+    });
+
+    const first = await ml.importTemplate(document, { label: " Imported " });
+    const second = await ml.importTemplate(document, { label: "Imported" });
+
+    // The description moves to the template's own, editable one, and the label is the one asked
+    // for: the stored document keeps only the blocks, so there is one name and one description,
+    // and nothing for an edit to leave behind.
+    expect((await ml.getTemplateData(first)).document).toStrictEqual(documentOf(entry("a")));
+
+    const list = await awaitTemplateList(ml, (l) => l.length === 2);
+    expect(list.find((t) => t.id === first)).toMatchObject({
+      label: "Imported",
+      description: "What it builds",
+      blockCount: 1,
+    });
+    expect(list.find((t) => t.id === second)?.label).not.toBe("Imported");
+  });
+});
+
+test("an import into a folder deleted meanwhile lands at the top level, under a name free there", async () => {
+  await withMl(async (ml) => {
+    const document = documentOf(entry("a"));
+    const topLevel = await ml.importTemplate(document, { label: "Imported" });
+
+    const folder = await ml.createFolder("Gone");
+    const planned = await ml.previewFolderDeletion(folder);
+    expect(planned.ok).toBe(true);
+    if (!planned.ok) return;
+    expect((await ml.deleteFolder(folder, planned.removal)).ok).toBe(true);
+
+    const orphan = await ml.importTemplate(document, { label: "Imported", folder });
+
+    const list = await awaitTemplateList(ml, (l) => l.length === 2);
+    expect(list.find((t) => t.id === topLevel)?.label).toBe("Imported");
+    expect(list.find((t) => t.id === orphan)?.label).not.toBe("Imported");
+  });
+});
+
 test("an entry nothing can resolve creates no project, and every entry is reported", async () => {
   await withMl(async (ml) => {
     const stored = await storeTemplate(ml, "Nothing implements these", {
@@ -252,9 +296,9 @@ type StoredTemplate = { id: TemplateId; rid: SignedResourceId };
 /**
  * Stores one template through the mutator, on the same templates list the middle layer reads.
  *
- * The middle layer has no way to store an arbitrary document — it only saves a project — so a
- * test that needs a specific document writes it here, exactly as `saveProjectAsTemplate` and
- * `copyShare` do.
+ * The middle layer's own import stores a document with no provenance, so a test that needs a
+ * specific stored template — a source project label, a sender — writes it here, exactly as
+ * `saveProjectAsTemplate` and `copyShare` do.
  */
 async function storeTemplate(
   ml: MiddleLayer,