@milaboratories/pl-middle-layer 1.72.0 → 1.73.1

package/dist/middle_layer/middle_layer.d.ts

@@ -167,9 +167,9 @@ export declare class MiddleLayer {
    * different places: a rename that carried a stale description alongside the new name would
    * undo a description edit that happened in between, and the reverse.
    *
-   * The label is stored trimmed, and it goes into the namespace folders share, so a label
-   * already carried by something else inside the same folder is refused rather than written — a
-   * human typed it, and a name that silently becomes a different name is worse than one that is
+   * The label is stored trimmed, and the folder rule governs it, so a label another project
+   * inside the same folder already carries is refused rather than written — a folder or a
+   * template of that name beside it is no obstacle. A human typed it, and a name that silently becomes a different name is worse than one that is
    * turned down. The check and the write share one transaction, so two renames racing for the
    * same name cannot both win. Duplicates an account already holds are tolerated and never
    * rewritten; see the name check of {@link openFoldersTx}.
@@ -179,7 +179,7 @@ export declare class MiddleLayer {
   /** Creates a folder inside `parent`, or at the top level, and returns its id. A name already
    *  used there is rejected. */
   createFolder(name: string, parent?: FolderId): Promise<FolderId>;
-  /** Renames a folder. A name already used beside it is rejected. */
+  /** Renames a folder. A name another folder beside it already carries is rejected. */
   renameFolder(folder: FolderId, name: string): Promise<void>;
   /** Sets what a folder says about itself; blank clears it. Descriptions are in no namespace, so
    *  nothing is refused here. */
@@ -213,7 +213,7 @@ export declare class MiddleLayer {
    * in them, and a copy of every template.
    *
    * The copy lands beside the source, so only its root needs a name of its own — `X (Copy)`.
-   * Nothing inside is renamed: names are compared among siblings, and a copied folder's children
+   * Nothing inside is renamed: names are compared among siblings of one kind, and a copied folder's children
    * are only ever compared with each other, where they came in distinct already.
    *
    * The subtree is read first and rebuilt in one write transaction, so the folders and everything
@@ -319,10 +319,10 @@ export declare class MiddleLayer {
    * A block that cannot be expressed as a template entry stores nothing at all, and every
    * such block is reported — fixing an unexportable project takes one pass, not one per block.
    *
-   * The template lands beside its project, and is named by the rule everything there is named
-   * by: a label the caller chose is stored trimmed and refused if it is already used there, and
-   * without one the project's own label is taken — suffixed, since the project itself already
-   * answers to it.
+   * The template lands beside its project, and is named by the rule templates there are named
+   * by: a label the caller chose is stored trimmed and refused if another template there already
+   * carries it, and without one the project's own label is taken — suffixed only when a template
+   * there already answers to it. The project is not a template, so its own name is no obstacle.
    *
    * The template's description is the one the caller gives, stored trimmed; blank means none.
    * Without one the template is stored undescribed, whatever the project's own description says.
@@ -336,8 +336,8 @@ export declare class MiddleLayer {
    * Changes a template's label. The stored document is immutable and stays untouched —
    * improving a template means saving a new one.
    *
-   * The label is stored trimmed. It is in the namespace folders, projects and templates share,
-   * so one already used beside the template is refused, in the transaction that writes it.
+   * The label is stored trimmed. One another template beside it already carries is refused, in
+   * the transaction that writes it; a folder or a project of that name beside it is no obstacle.
    */
   renameTemplate(id: TemplateId$1, label: string): Promise<void>;
   /** Sets what a stored template says about itself; blank clears it. The stored document is not

package/dist/middle_layer/middle_layer.d.ts.map

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

package/dist/middle_layer/middle_layer.js

@@ -5,7 +5,7 @@ import { ProjectsField, ProjectsResourceType, createProjectList, ensureProjectLi
 import { TemplateDescriptionKey, TemplateLabelKey, TemplatesField, TemplatesResourceType, createTemplateList, decodeStoredTemplateData } from "./template_list.js";
 import { listedById, notListedError } from "../mutator/list.js";
 import { createTemplate, deleteTemplate, renameTemplate, setTemplateDescription } from "../mutator/template.js";
-import { FoldersField, FoldersResourceType, createFolder, createFolderList, deleteFolder, foldersLocalSubtree, moveFolderItems, openFoldersTx, previewFolderDeletion, previewFoldersMove, renameFolder, resetFolders, setFolderDescription } from "./folders.js";
+import { FoldersField, FoldersResourceType, createFolder, createFolderList, deleteFolder, foldersLocalSubtree, moveFolderItems, nameTakenMessage, openFoldersTx, previewFolderDeletion, previewFoldersMove, renameFolder, resetFolders, setFolderDescription } from "./folders.js";
 import { SharingOutboxField, SharingOutboxResourceType, SharingStateField, SharingStateResourceType, canGrantToEveryone, canImpersonate, decodeEnvelopeData, envelopeFolderRoot, newEnvelopeFolderId } from "../model/sharing_model.js";
 import { resolveTemplateEntries } from "../model/template_resolve.js";
 import { TemplateEntryRejected, kindMismatch } from "../model/template_apply.js";
@@ -224,9 +224,9 @@ var MiddleLayer = class MiddleLayer {
 	* different places: a rename that carried a stale description alongside the new name would
 	* undo a description edit that happened in between, and the reverse.
 	*
-	* The label is stored trimmed, and it goes into the namespace folders share, so a label
-	* already carried by something else inside the same folder is refused rather than written — a
-	* human typed it, and a name that silently becomes a different name is worse than one that is
+	* The label is stored trimmed, and the folder rule governs it, so a label another project
+	* inside the same folder already carries is refused rather than written — a folder or a
+	* template of that name beside it is no obstacle. A human typed it, and a name that silently becomes a different name is worse than one that is
 	* turned down. The check and the write share one transaction, so two renames racing for the
 	* same name cannot both win. Duplicates an account already holds are tolerated and never
 	* rewritten; see the name check of {@link openFoldersTx}.
@@ -264,7 +264,7 @@ var MiddleLayer = class MiddleLayer {
 		await this.foldersTree.refreshState();
 		return id;
 	}
-	/** Renames a folder. A name already used beside it is rejected. */
+	/** Renames a folder. A name another folder beside it already carries is rejected. */
 	async renameFolder(folder, name) {
 		await renameFolder(this.pl, this.foldersRids, folder, name);
 		await this.foldersTree.refreshState();
@@ -331,7 +331,7 @@ var MiddleLayer = class MiddleLayer {
 	* in them, and a copy of every template.
 	*
 	* The copy lands beside the source, so only its root needs a name of its own — `X (Copy)`.
-	* Nothing inside is renamed: names are compared among siblings, and a copied folder's children
+	* Nothing inside is renamed: names are compared among siblings of one kind, and a copied folder's children
 	* are only ever compared with each other, where they came in distinct already.
 	*
 	* The subtree is read first and rebuilt in one write transaction, so the folders and everything
@@ -609,10 +609,10 @@ var MiddleLayer = class MiddleLayer {
 	* A block that cannot be expressed as a template entry stores nothing at all, and every
 	* such block is reported — fixing an unexportable project takes one pass, not one per block.
 	*
-	* The template lands beside its project, and is named by the rule everything there is named
-	* by: a label the caller chose is stored trimmed and refused if it is already used there, and
-	* without one the project's own label is taken — suffixed, since the project itself already
-	* answers to it.
+	* The template lands beside its project, and is named by the rule templates there are named
+	* by: a label the caller chose is stored trimmed and refused if another template there already
+	* carries it, and without one the project's own label is taken — suffixed only when a template
+	* there already answers to it. The project is not a template, so its own name is no obstacle.
 	*
 	* The template's description is the one the caller gives, stored trimmed; blank means none.
 	* Without one the template is stored undescribed, whatever the project's own description says.
@@ -632,9 +632,9 @@ var MiddleLayer = class MiddleLayer {
 		const signedRid = await this.pl.withWriteTx("MLSaveProjectAsTemplate", async (tx) => {
 			const meta = await tx.getKValueJson(rid, ProjectMetaKey);
 			const tree = await openFoldersTx(tx, this.foldersRids);
-			const taken = tree.namesTakenBeside(projectId);
-			if (wanted !== void 0 && foldersNameTaken(wanted, taken)) throw new Error(`"${wanted}" is already used here.`);
-			const name = wanted ?? foldersUniqueName(meta.label, [meta.label, ...taken]);
+			const taken = tree.namesTakenBeside(projectId, "template");
+			if (wanted !== void 0 && foldersNameTaken(wanted, taken)) throw new Error(nameTakenMessage("template", wanted));
+			const name = wanted ?? foldersUniqueName(meta.label, taken);
 			const created = await createTemplate(tx, this.templateListResourceId, {
 				label: name,
 				description
@@ -662,8 +662,8 @@ var MiddleLayer = class MiddleLayer {
 	* Changes a template's label. The stored document is immutable and stays untouched —
 	* improving a template means saving a new one.
 	*
-	* The label is stored trimmed. It is in the namespace folders, projects and templates share,
-	* so one already used beside the template is refused, in the transaction that writes it.
+	* The label is stored trimmed. One another template beside it already carries is refused, in
+	* the transaction that writes it; a folder or a project of that name beside it is no obstacle.
 	*/
 	async renameTemplate(id, label) {
 		const rid = await this.resolveTemplateId(id);
@@ -793,7 +793,7 @@ var MiddleLayer = class MiddleLayer {
 		const newPrj = await this.pl.withWriteTx("MLDuplicateProject", async (tx) => {
 			const sourceMeta = await tx.getKValueJson(sourceRid, ProjectMetaKey);
 			const tree = await openFoldersTx(tx, this.foldersRids);
-			const label = rename === void 0 ? foldersUniqueName(sourceMeta.label, [sourceMeta.label, ...tree.namesTakenBeside(srcProjectId)]) : rename(sourceMeta.label, await existingProjectLabels(tx, this.projectListResourceId));
+			const label = rename === void 0 ? foldersUniqueName(sourceMeta.label, [sourceMeta.label, ...tree.namesTakenBeside(srcProjectId, "project")]) : rename(sourceMeta.label, await existingProjectLabels(tx, this.projectListResourceId));
 			const newPrj = await duplicateProject(tx, sourceRid, {
 				...sourceMeta,
 				label
@@ -1058,7 +1058,7 @@ var MiddleLayer = class MiddleLayer {
 					const rid = await this.pl.withWriteTx("MLCopyTemplateShare", async (tx) => {
 						const tree = await openFoldersTx(tx, this.foldersRids);
 						const created = await createTemplate(tx, this.templateListResourceId, {
-							label: foldersUniqueName(payload.label, tree.namesTakenIn(destination)),
+							label: foldersUniqueName(payload.label, tree.namesTakenIn(destination, "template")),
 							description: payload.description
 						}, {
 							schemaVersion: 1,
@@ -1130,7 +1130,7 @@ var MiddleLayer = class MiddleLayer {
 				}
 				const createdRids = await this.pl.withWriteTx("MLCopyShare", async (tx) => {
 					const tree = await openFoldersTx(tx, this.foldersRids);
-					const taken = [...tree.namesTakenIn(destination)];
+					const taken = [...tree.namesTakenIn(destination, "project")];
 					const created = await copyEnvelopeProjectsIntoList(tx, envelope.rid, this.projectListResourceId, (sourceLabel) => {
 						const name = foldersUniqueName(sourceLabel, taken);
 						taken.push(name);