@deepnote/convert 2.0.0 → 2.1.0

package/dist/index.js

@@ -1,3 +1,3 @@
-import { A as convertDeepnoteToJupyterNotebooks, C as serializePercentFormat, D as serializeMarimoFormat, E as convertDeepnoteToMarimoApps, O as convertBlocksToJupyterNotebook, S as convertDeepnoteToPercentNotebooks, T as convertDeepnoteFileToMarimoFiles, _ as convertDeepnoteFileToQuartoFiles, a as convertPercentFilesToDeepnoteFile, b as convertBlocksToPercentNotebook, c as parsePercentFormat, d as convertMarimoFilesToDeepnoteFile, f as parseMarimoFormat, g as convertBlocksToQuartoDocument, h as convertJupyterNotebooksToDeepnote, i as parseQuartoFormat, k as convertDeepnoteFileToJupyterFiles, l as convertMarimoAppToBlocks, m as convertJupyterNotebookToBlocks, n as convertQuartoDocumentsToDeepnote, o as convertPercentNotebookToBlocks, p as convertIpynbFilesToDeepnoteFile, r as convertQuartoFilesToDeepnoteFile, s as convertPercentNotebooksToDeepnote, t as convertQuartoDocumentToBlocks, u as convertMarimoAppsToDeepnote, v as convertDeepnoteToQuartoDocuments, w as convertBlocksToMarimoApp, x as convertDeepnoteFileToPercentFiles, y as serializeQuartoFormat } from "./src-CUESP0m8.js";
+import { A as serializeMarimoFormat, C as convertBlocksToPercentNotebook, D as convertBlocksToMarimoApp, E as serializePercentFormat, M as convertDeepnoteFileToJupyterFiles, N as convertDeepnoteToJupyterNotebooks, O as convertDeepnoteFileToMarimoFiles, S as serializeQuartoFormat, T as convertDeepnoteToPercentNotebooks, a as convertPercentFilesToDeepnoteFile, b as convertDeepnoteFileToQuartoFiles, c as parsePercentFormat, d as convertMarimoFilesToDeepnoteFile, f as parseMarimoFormat, g as detectFormat, h as convertJupyterNotebooksToDeepnote, i as parseQuartoFormat, j as convertBlocksToJupyterNotebook, k as convertDeepnoteToMarimoApps, l as convertMarimoAppToBlocks, m as convertJupyterNotebookToBlocks, n as convertQuartoDocumentsToDeepnote, o as convertPercentNotebookToBlocks, p as convertIpynbFilesToDeepnoteFile, r as convertQuartoFilesToDeepnoteFile, s as convertPercentNotebooksToDeepnote, t as convertQuartoDocumentToBlocks, u as convertMarimoAppsToDeepnote, w as convertDeepnoteFileToPercentFiles, x as convertDeepnoteToQuartoDocuments, y as convertBlocksToQuartoDocument } from "./src-oALQkXiP.js";
 
-export { convertBlocksToJupyterNotebook, convertBlocksToMarimoApp, convertBlocksToPercentNotebook, convertBlocksToQuartoDocument, convertDeepnoteFileToJupyterFiles as convertDeepnoteFileToJupyter, convertDeepnoteFileToMarimoFiles, convertDeepnoteFileToPercentFiles, convertDeepnoteFileToQuartoFiles, convertDeepnoteToJupyterNotebooks, convertDeepnoteToMarimoApps, convertDeepnoteToPercentNotebooks, convertDeepnoteToQuartoDocuments, convertIpynbFilesToDeepnoteFile, convertJupyterNotebookToBlocks, convertJupyterNotebooksToDeepnote, convertMarimoAppToBlocks, convertMarimoAppsToDeepnote, convertMarimoFilesToDeepnoteFile, convertPercentFilesToDeepnoteFile, convertPercentNotebookToBlocks, convertPercentNotebooksToDeepnote, convertQuartoDocumentToBlocks, convertQuartoDocumentsToDeepnote, convertQuartoFilesToDeepnoteFile, parseMarimoFormat, parsePercentFormat, parseQuartoFormat, serializeMarimoFormat, serializePercentFormat, serializeQuartoFormat };
+export { convertBlocksToJupyterNotebook, convertBlocksToMarimoApp, convertBlocksToPercentNotebook, convertBlocksToQuartoDocument, convertDeepnoteFileToJupyterFiles as convertDeepnoteFileToJupyter, convertDeepnoteFileToMarimoFiles, convertDeepnoteFileToPercentFiles, convertDeepnoteFileToQuartoFiles, convertDeepnoteToJupyterNotebooks, convertDeepnoteToMarimoApps, convertDeepnoteToPercentNotebooks, convertDeepnoteToQuartoDocuments, convertIpynbFilesToDeepnoteFile, convertJupyterNotebookToBlocks, convertJupyterNotebooksToDeepnote, convertMarimoAppToBlocks, convertMarimoAppsToDeepnote, convertMarimoFilesToDeepnoteFile, convertPercentFilesToDeepnoteFile, convertPercentNotebookToBlocks, convertPercentNotebooksToDeepnote, convertQuartoDocumentToBlocks, convertQuartoDocumentsToDeepnote, convertQuartoFilesToDeepnoteFile, detectFormat, parseMarimoFormat, parsePercentFormat, parseQuartoFormat, serializeMarimoFormat, serializePercentFormat, serializeQuartoFormat };

package/dist/{src-CUESP0m8.js → src-oALQkXiP.js}

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 import { basename, dirname, extname, join } from "node:path";
-import { createMarkdown, createPythonCode, deserializeDeepnoteFile, environmentSchema, executionSchema } from "@deepnote/blocks";
+import { createMarkdown, createPythonCode, deepnoteBlockSchema, deserializeDeepnoteFile, environmentSchema, executionSchema } from "@deepnote/blocks";
 import { v4 } from "uuid";
 import { parse, stringify } from "yaml";
 
@@ -62,6 +62,18 @@ function isMarkdownBlockType(blockType) {
 	if (CODE_BLOCK_TYPES.includes(blockType)) return false;
 	return true;
 }
+/**
+* Sorts object keys alphabetically while preserving the type.
+* Useful for producing stable, predictable output in serialized formats like YAML.
+*
+* @param obj - The object whose keys should be sorted
+* @returns A new object with the same values but keys in alphabetical order
+*/
+function sortKeysAlphabetically(obj) {
+	const sorted = {};
+	for (const key of Object.keys(obj).sort()) sorted[key] = obj[key];
+	return sorted;
+}
 
 //#endregion
 //#region src/deepnote-to-jupyter.ts
@@ -146,23 +158,27 @@ async function convertDeepnoteFileToJupyterFiles(deepnoteFilePath, options) {
 function convertBlockToCell$3(block) {
 	const content = block.content || "";
 	const jupyterCellType = convertBlockTypeToJupyter(block.type);
+	const executionStartedAt = "executionStartedAt" in block ? block.executionStartedAt : void 0;
+	const executionFinishedAt = "executionFinishedAt" in block ? block.executionFinishedAt : void 0;
+	const executionCount = "executionCount" in block ? block.executionCount : null;
+	const outputs = "outputs" in block ? block.outputs : void 0;
 	const metadata = {
+		...block.metadata || {},
 		cell_id: block.id,
 		deepnote_block_group: block.blockGroup,
 		deepnote_cell_type: block.type,
 		deepnote_sorting_key: block.sortingKey,
 		deepnote_content_hash: block.contentHash,
-		deepnote_execution_started_at: block.executionStartedAt,
-		deepnote_execution_finished_at: block.executionFinishedAt,
-		...block.metadata || {}
+		deepnote_execution_started_at: executionStartedAt,
+		deepnote_execution_finished_at: executionFinishedAt
 	};
 	metadata.deepnote_source = content;
 	return {
 		block_group: block.blockGroup,
 		cell_type: jupyterCellType,
-		execution_count: block.executionCount ?? null,
+		execution_count: executionCount ?? null,
 		metadata,
-		outputs: block.outputs,
+		outputs,
 		source: getSourceForBlock(block, jupyterCellType, content)
 	};
 }
@@ -603,6 +619,34 @@ function convertBlockToCell(block) {
 	return cell;
 }
 
+//#endregion
+//#region src/format-detection.ts
+/** Check if file content is Marimo format */
+function isMarimoContent(content) {
+	return /^import marimo\b/m.test(content) && /@app\.cell\b/.test(content) && !/^\s*['"]{3}[\s\S]*?import marimo/m.test(content);
+}
+/** Check if file content is percent format */
+function isPercentContent(content) {
+	return /^# %%/m.test(content) && !/^\s*['"]{3}[\s\S]*?# %%/m.test(content);
+}
+/**
+* Detects the notebook format from filename and optionally content.
+* For .py files, content is required to distinguish between Marimo and Percent formats.
+*/
+function detectFormat(filename, content) {
+	const lowercaseFilename = filename.toLowerCase();
+	if (lowercaseFilename.endsWith(".ipynb")) return "jupyter";
+	if (lowercaseFilename.endsWith(".deepnote")) return "deepnote";
+	if (lowercaseFilename.endsWith(".qmd")) return "quarto";
+	if (lowercaseFilename.endsWith(".py")) {
+		if (!content) throw new Error("Content is required to detect format for .py files");
+		if (isMarimoContent(content)) return "marimo";
+		if (isPercentContent(content)) return "percent";
+		throw new Error("Unsupported Python file format. File must be percent format (# %%) or Marimo (@app.cell).");
+	}
+	throw new Error(`Unsupported file format: ${filename}`);
+}
+
 //#endregion
 //#region src/jupyter-to-deepnote.ts
 /**
@@ -741,7 +785,7 @@ function convertCellToBlock$3(cell, index, idGenerator) {
 	const executionCount = cell.execution_count ?? void 0;
 	const hasExecutionCount = executionCount !== void 0;
 	const hasOutputs = cell.cell_type === "code" && cell.outputs !== void 0;
-	return {
+	return sortKeysAlphabetically(deepnoteBlockSchema.parse({
 		blockGroup,
 		content: source,
 		...contentHash ? { contentHash } : {},
@@ -753,7 +797,7 @@ function convertCellToBlock$3(cell, index, idGenerator) {
 		...hasOutputs ? { outputs: cell.outputs } : {},
 		sortingKey: sortingKey ?? createSortingKey(index),
 		type: blockType
-	};
+	}));
 }
 
 //#endregion
@@ -1438,4 +1482,4 @@ function convertCellToBlock(cell, index, idGenerator) {
 }
 
 //#endregion
-export { convertDeepnoteToJupyterNotebooks as A, serializePercentFormat as C, serializeMarimoFormat as D, convertDeepnoteToMarimoApps as E, convertBlocksToJupyterNotebook as O, convertDeepnoteToPercentNotebooks as S, convertDeepnoteFileToMarimoFiles as T, convertDeepnoteFileToQuartoFiles as _, convertPercentFilesToDeepnoteFile as a, convertBlocksToPercentNotebook as b, parsePercentFormat as c, convertMarimoFilesToDeepnoteFile as d, parseMarimoFormat as f, convertBlocksToQuartoDocument as g, convertJupyterNotebooksToDeepnote as h, parseQuartoFormat as i, convertDeepnoteFileToJupyterFiles as k, convertMarimoAppToBlocks as l, convertJupyterNotebookToBlocks as m, convertQuartoDocumentsToDeepnote as n, convertPercentNotebookToBlocks as o, convertIpynbFilesToDeepnoteFile as p, convertQuartoFilesToDeepnoteFile as r, convertPercentNotebooksToDeepnote as s, convertQuartoDocumentToBlocks as t, convertMarimoAppsToDeepnote as u, convertDeepnoteToQuartoDocuments as v, convertBlocksToMarimoApp as w, convertDeepnoteFileToPercentFiles as x, serializeQuartoFormat as y };
+export { serializeMarimoFormat as A, convertBlocksToPercentNotebook as C, convertBlocksToMarimoApp as D, serializePercentFormat as E, convertDeepnoteFileToJupyterFiles as M, convertDeepnoteToJupyterNotebooks as N, convertDeepnoteFileToMarimoFiles as O, serializeQuartoFormat as S, convertDeepnoteToPercentNotebooks as T, isMarimoContent as _, convertPercentFilesToDeepnoteFile as a, convertDeepnoteFileToQuartoFiles as b, parsePercentFormat as c, convertMarimoFilesToDeepnoteFile as d, parseMarimoFormat as f, detectFormat as g, convertJupyterNotebooksToDeepnote as h, parseQuartoFormat as i, convertBlocksToJupyterNotebook as j, convertDeepnoteToMarimoApps as k, convertMarimoAppToBlocks as l, convertJupyterNotebookToBlocks as m, convertQuartoDocumentsToDeepnote as n, convertPercentNotebookToBlocks as o, convertIpynbFilesToDeepnoteFile as p, convertQuartoFilesToDeepnoteFile as r, convertPercentNotebooksToDeepnote as s, convertQuartoDocumentToBlocks as t, convertMarimoAppsToDeepnote as u, isPercentContent as v, convertDeepnoteFileToPercentFiles as w, convertDeepnoteToQuartoDocuments as x, convertBlocksToQuartoDocument as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepnote/convert",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "",
   "keywords": [],
   "repository": {
@@ -33,7 +33,7 @@
     "ora": "^9.0.0",
     "uuid": "^13.0.0",
     "yaml": "^2.8.1",
-    "@deepnote/blocks": "2.0.0"
+    "@deepnote/blocks": "3.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",