@deepnote/convert 3.1.1 → 3.2.0

package/dist/bin.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require('./src-h056eQNO.cjs');
+const require_src = require('./src-BLBMaZtg.cjs');
 let cleye = require("cleye");
 cleye = require_src.__toESM(cleye);
 let node_fs_promises = require("node:fs/promises");

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { G as convertDeepnoteFileToPercentFiles, I as readAndConvertIpynbFiles, R as isMarimoContent, S as mergeSnapshotIntoSource, T as loadLatestSnapshot, V as convertDeepnoteFileToQuartoFiles, Y as convertDeepnoteFileToMarimoFiles, d as readAndConvertPercentFiles, g as readAndConvertMarimoFiles, it as convertDeepnoteFileToJupyterFiles, o as readAndConvertQuartoFiles, t as writeDeepnoteFile, tt as UnsupportedFormatError, z as isPercentContent } from "./src-BcZ91Lsd.js";
+import { G as convertDeepnoteFileToPercentFiles, I as readAndConvertIpynbFiles, R as isMarimoContent, S as mergeSnapshotIntoSource, T as loadLatestSnapshot, V as convertDeepnoteFileToQuartoFiles, Y as convertDeepnoteFileToMarimoFiles, d as readAndConvertPercentFiles, g as readAndConvertMarimoFiles, it as convertDeepnoteFileToJupyterFiles, o as readAndConvertQuartoFiles, t as writeDeepnoteFile, tt as UnsupportedFormatError, z as isPercentContent } from "./src-BS7a6Oo0.js";
 import { cli } from "cleye";
 import fs from "node:fs/promises";
 import { basename, dirname, extname, resolve } from "node:path";

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_src = require('./src-h056eQNO.cjs');
+const require_src = require('./src-BLBMaZtg.cjs');
 
 exports.FileReadError = require_src.FileReadError;
 exports.FileWriteError = require_src.FileWriteError;

package/dist/index.js

@@ -1,3 +1,3 @@
-import { $ as FileWriteError, A as addContentHashes, B as convertBlocksToQuartoDocument, C as findSnapshotsForProject, D as parseSnapshotFilename, E as loadSnapshotFile, F as convertJupyterNotebooksToDeepnote, G as convertDeepnoteFileToPercentFiles, H as convertDeepnoteToQuartoDocuments, I as readAndConvertIpynbFiles, J as convertBlocksToMarimoApp, K as convertDeepnoteToPercentNotebooks, L as detectFormat, M as computeSnapshotHash, N as convertIpynbFilesToDeepnoteFile, O as parseSourceFilePath, P as convertJupyterNotebookToBlocks, Q as FileReadError, S as mergeSnapshotIntoSource, T as loadLatestSnapshot, U as serializeQuartoFormat, V as convertDeepnoteFileToQuartoFiles, W as convertBlocksToPercentNotebook, X as convertDeepnoteToMarimoApps, Y as convertDeepnoteFileToMarimoFiles, Z as serializeMarimoFormat, _ as generateSnapshotFilename, a as parseQuartoFormat, at as convertDeepnoteToJupyterNotebooks, b as splitDeepnoteFile, c as convertPercentNotebookToBlocks, d as readAndConvertPercentFiles, et as JsonParseError, f as convertMarimoAppToBlocks, g as readAndConvertMarimoFiles, h as parseMarimoFormat, i as convertQuartoFilesToDeepnoteFile, it as convertDeepnoteFileToJupyterFiles, j as computeContentHash, k as snapshotExists, l as convertPercentNotebooksToDeepnote, m as convertMarimoFilesToDeepnoteFile, n as convertQuartoDocumentToBlocks, nt as convertBlockToJupyterCell, o as readAndConvertQuartoFiles, p as convertMarimoAppsToDeepnote, q as serializePercentFormat, r as convertQuartoDocumentsToDeepnote, rt as convertBlocksToJupyterNotebook, s as convertPercentFilesToDeepnoteFile, t as writeDeepnoteFile, tt as UnsupportedFormatError, u as parsePercentFormat, v as hasOutputs, w as getSnapshotDir, x as countBlocksWithOutputs, y as slugifyProjectName } from "./src-BcZ91Lsd.js";
+import { $ as FileWriteError, A as addContentHashes, B as convertBlocksToQuartoDocument, C as findSnapshotsForProject, D as parseSnapshotFilename, E as loadSnapshotFile, F as convertJupyterNotebooksToDeepnote, G as convertDeepnoteFileToPercentFiles, H as convertDeepnoteToQuartoDocuments, I as readAndConvertIpynbFiles, J as convertBlocksToMarimoApp, K as convertDeepnoteToPercentNotebooks, L as detectFormat, M as computeSnapshotHash, N as convertIpynbFilesToDeepnoteFile, O as parseSourceFilePath, P as convertJupyterNotebookToBlocks, Q as FileReadError, S as mergeSnapshotIntoSource, T as loadLatestSnapshot, U as serializeQuartoFormat, V as convertDeepnoteFileToQuartoFiles, W as convertBlocksToPercentNotebook, X as convertDeepnoteToMarimoApps, Y as convertDeepnoteFileToMarimoFiles, Z as serializeMarimoFormat, _ as generateSnapshotFilename, a as parseQuartoFormat, at as convertDeepnoteToJupyterNotebooks, b as splitDeepnoteFile, c as convertPercentNotebookToBlocks, d as readAndConvertPercentFiles, et as JsonParseError, f as convertMarimoAppToBlocks, g as readAndConvertMarimoFiles, h as parseMarimoFormat, i as convertQuartoFilesToDeepnoteFile, it as convertDeepnoteFileToJupyterFiles, j as computeContentHash, k as snapshotExists, l as convertPercentNotebooksToDeepnote, m as convertMarimoFilesToDeepnoteFile, n as convertQuartoDocumentToBlocks, nt as convertBlockToJupyterCell, o as readAndConvertQuartoFiles, p as convertMarimoAppsToDeepnote, q as serializePercentFormat, r as convertQuartoDocumentsToDeepnote, rt as convertBlocksToJupyterNotebook, s as convertPercentFilesToDeepnoteFile, t as writeDeepnoteFile, tt as UnsupportedFormatError, u as parsePercentFormat, v as hasOutputs, w as getSnapshotDir, x as countBlocksWithOutputs, y as slugifyProjectName } from "./src-BS7a6Oo0.js";
 
 export { FileReadError, FileWriteError, JsonParseError, UnsupportedFormatError, addContentHashes, computeContentHash, computeSnapshotHash, convertBlockToJupyterCell, convertBlocksToJupyterNotebook, convertBlocksToMarimoApp, convertBlocksToPercentNotebook, convertBlocksToQuartoDocument, convertDeepnoteFileToJupyterFiles, convertDeepnoteFileToMarimoFiles, convertDeepnoteFileToPercentFiles, convertDeepnoteFileToQuartoFiles, convertDeepnoteToJupyterNotebooks, convertDeepnoteToMarimoApps, convertDeepnoteToPercentNotebooks, convertDeepnoteToQuartoDocuments, convertIpynbFilesToDeepnoteFile, convertJupyterNotebookToBlocks, convertJupyterNotebooksToDeepnote, convertMarimoAppToBlocks, convertMarimoAppsToDeepnote, convertMarimoFilesToDeepnoteFile, convertPercentFilesToDeepnoteFile, convertPercentNotebookToBlocks, convertPercentNotebooksToDeepnote, convertQuartoDocumentToBlocks, convertQuartoDocumentsToDeepnote, convertQuartoFilesToDeepnoteFile, countBlocksWithOutputs, detectFormat, findSnapshotsForProject, generateSnapshotFilename, getSnapshotDir, hasOutputs, loadLatestSnapshot, loadSnapshotFile, mergeSnapshotIntoSource, parseMarimoFormat, parsePercentFormat, parseQuartoFormat, parseSnapshotFilename, parseSourceFilePath, readAndConvertIpynbFiles, readAndConvertMarimoFiles, readAndConvertPercentFiles, readAndConvertQuartoFiles, serializeMarimoFormat, serializePercentFormat, serializeQuartoFormat, slugifyProjectName, snapshotExists, splitDeepnoteFile, writeDeepnoteFile };

package/dist/{src-h056eQNO.cjs → src-BLBMaZtg.cjs}

@@ -34,30 +34,6 @@ yaml = __toESM(yaml);
 
 //#region src/utils.ts
 /**
-* Creates a sorting key for Deepnote blocks.
-* Uses a base-36 encoding to generate compact, sortable keys.
-*
-* @param index - The zero-based index of the block
-* @returns A sortable string key
-*/
-function createSortingKey(index) {
-	const maxLength = 6;
-	const chars = "0123456789abcdefghijklmnopqrstuvwxyz";
-	const base = 36;
-	if (index < 0) throw new __deepnote_blocks.InvalidValueError("Index must be non-negative", { value: index });
-	let result = "";
-	let num = index + 1;
-	let iterations = 0;
-	while (num > 0 && iterations < maxLength) {
-		num--;
-		result = chars[num % base] + result;
-		num = Math.floor(num / base);
-		iterations++;
-	}
-	if (num > 0) throw new __deepnote_blocks.InvalidValueError(`Index ${index} exceeds maximum key length of ${maxLength}`, { value: index });
-	return result;
-}
-/**
 * Sanitizes a filename by removing invalid characters and replacing spaces.
 *
 * @param name - The original filename
@@ -938,7 +914,7 @@ function convertCellToBlock$3(cell, index, idGenerator) {
 		id: cellId ?? idGenerator(),
 		metadata: originalMetadata,
 		...hasOutputs$1 ? { outputs: cell.outputs } : {},
-		sortingKey: sortingKey ?? createSortingKey(index),
+		sortingKey: sortingKey ?? (0, __deepnote_blocks.generateSortingKey)(index),
 		type: blockType
 	}));
 }
@@ -1704,7 +1680,7 @@ function convertCellToBlock$2(cell, index, idGenerator, outputs) {
 		content: cell.content,
 		id: idGenerator(),
 		metadata: Object.keys(metadata).length > 0 ? metadata : {},
-		sortingKey: createSortingKey(index),
+		sortingKey: (0, __deepnote_blocks.generateSortingKey)(index),
 		type: blockType,
 		...outputs && outputs.length > 0 && (blockType === "code" || blockType === "sql") ? { outputs } : {}
 	};
@@ -1871,7 +1847,7 @@ function convertCellToBlock$1(cell, index, idGenerator) {
 		content: cell.content,
 		id: idGenerator(),
 		metadata: Object.keys(metadata).length > 0 ? metadata : {},
-		sortingKey: createSortingKey(index),
+		sortingKey: (0, __deepnote_blocks.generateSortingKey)(index),
 		type: blockType
 	};
 }
@@ -2061,7 +2037,7 @@ function convertQuartoDocumentToBlocks(document, options) {
 		content: `# ${document.frontmatter.title}`,
 		id: idGenerator(),
 		metadata: {},
-		sortingKey: createSortingKey(blocks.length),
+		sortingKey: (0, __deepnote_blocks.generateSortingKey)(blocks.length),
 		type: "markdown"
 	});
 	for (const cell of document.cells) blocks.push(convertCellToBlock(cell, blocks.length, idGenerator));
@@ -2149,7 +2125,7 @@ function convertCellToBlock(cell, index, idGenerator) {
 		content: cell.content,
 		id: idGenerator(),
 		metadata: Object.keys(metadata).length > 0 ? metadata : {},
-		sortingKey: createSortingKey(index),
+		sortingKey: (0, __deepnote_blocks.generateSortingKey)(index),
 		type: blockType
 	};
 }

package/dist/{src-BcZ91Lsd.js → src-BS7a6Oo0.js}

@@ -1,35 +1,11 @@
 import fs from "node:fs/promises";
 import { basename, dirname, extname, join, resolve } from "node:path";
-import { DeepnoteError, InvalidValueError, ParseError, createMarkdown, createPythonCode, deepnoteBlockSchema, deepnoteSnapshotSchema, deserializeDeepnoteFile, environmentSchema, executionSchema, isExecutableBlockType, serializeDeepnoteFile, serializeDeepnoteSnapshot } from "@deepnote/blocks";
+import { DeepnoteError, ParseError, createMarkdown, createPythonCode, deepnoteBlockSchema, deepnoteSnapshotSchema, deserializeDeepnoteFile, environmentSchema, executionSchema, generateSortingKey, isExecutableBlockType, serializeDeepnoteFile, serializeDeepnoteSnapshot } from "@deepnote/blocks";
 import { createHash, randomUUID } from "node:crypto";
 import { parse } from "yaml";
 
 //#region src/utils.ts
 /**
-* Creates a sorting key for Deepnote blocks.
-* Uses a base-36 encoding to generate compact, sortable keys.
-*
-* @param index - The zero-based index of the block
-* @returns A sortable string key
-*/
-function createSortingKey(index) {
-	const maxLength = 6;
-	const chars = "0123456789abcdefghijklmnopqrstuvwxyz";
-	const base = 36;
-	if (index < 0) throw new InvalidValueError("Index must be non-negative", { value: index });
-	let result = "";
-	let num = index + 1;
-	let iterations = 0;
-	while (num > 0 && iterations < maxLength) {
-		num--;
-		result = chars[num % base] + result;
-		num = Math.floor(num / base);
-		iterations++;
-	}
-	if (num > 0) throw new InvalidValueError(`Index ${index} exceeds maximum key length of ${maxLength}`, { value: index });
-	return result;
-}
-/**
 * Sanitizes a filename by removing invalid characters and replacing spaces.
 *
 * @param name - The original filename
@@ -910,7 +886,7 @@ function convertCellToBlock$3(cell, index, idGenerator) {
 		id: cellId ?? idGenerator(),
 		metadata: originalMetadata,
 		...hasOutputs$1 ? { outputs: cell.outputs } : {},
-		sortingKey: sortingKey ?? createSortingKey(index),
+		sortingKey: sortingKey ?? generateSortingKey(index),
 		type: blockType
 	}));
 }
@@ -1676,7 +1652,7 @@ function convertCellToBlock$2(cell, index, idGenerator, outputs) {
 		content: cell.content,
 		id: idGenerator(),
 		metadata: Object.keys(metadata).length > 0 ? metadata : {},
-		sortingKey: createSortingKey(index),
+		sortingKey: generateSortingKey(index),
 		type: blockType,
 		...outputs && outputs.length > 0 && (blockType === "code" || blockType === "sql") ? { outputs } : {}
 	};
@@ -1843,7 +1819,7 @@ function convertCellToBlock$1(cell, index, idGenerator) {
 		content: cell.content,
 		id: idGenerator(),
 		metadata: Object.keys(metadata).length > 0 ? metadata : {},
-		sortingKey: createSortingKey(index),
+		sortingKey: generateSortingKey(index),
 		type: blockType
 	};
 }
@@ -2033,7 +2009,7 @@ function convertQuartoDocumentToBlocks(document, options) {
 		content: `# ${document.frontmatter.title}`,
 		id: idGenerator(),
 		metadata: {},
-		sortingKey: createSortingKey(blocks.length),
+		sortingKey: generateSortingKey(blocks.length),
 		type: "markdown"
 	});
 	for (const cell of document.cells) blocks.push(convertCellToBlock(cell, blocks.length, idGenerator));
@@ -2121,7 +2097,7 @@ function convertCellToBlock(cell, index, idGenerator) {
 		content: cell.content,
 		id: idGenerator(),
 		metadata: Object.keys(metadata).length > 0 ? metadata : {},
-		sortingKey: createSortingKey(index),
+		sortingKey: generateSortingKey(index),
 		type: blockType
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepnote/convert",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "",
   "keywords": [],
   "repository": {
@@ -34,7 +34,7 @@
     "cleye": "^2.0.0",
     "ora": "^9.0.0",
     "yaml": "^2.8.1",
-    "@deepnote/blocks": "4.2.0"
+    "@deepnote/blocks": "4.3.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",