@deepnote/convert 3.0.0 → 3.1.1

package/dist/bin.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require('./src-BR6PqlNA.cjs');
+const require_src = require('./src-h056eQNO.cjs');
 let cleye = require("cleye");
 cleye = require_src.__toESM(cleye);
 let node_fs_promises = require("node:fs/promises");
@@ -12,8 +12,6 @@ let chalk = require("chalk");
 chalk = require_src.__toESM(chalk);
 let ora = require("ora");
 ora = require_src.__toESM(ora);
-let yaml = require("yaml");
-yaml = require_src.__toESM(yaml);
 
 //#region src/cli.ts
 async function convert(options) {
@@ -218,7 +216,7 @@ async function convertDeepnoteToFormat(absolutePath, outputFormat, customOutputP
 		const tempDir = await node_fs_promises.default.mkdtemp((0, node_path.resolve)((0, node_path.dirname)(absolutePath), ".deepnote-merge-"));
 		const tempPath = (0, node_path.resolve)(tempDir, `${filenameWithoutExtension}.merged.deepnote`);
 		try {
-			const mergedYaml = (0, yaml.stringify)(deepnoteFile);
+			const mergedYaml = (0, __deepnote_blocks.serializeDeepnoteFile)(deepnoteFile);
 			await node_fs_promises.default.writeFile(tempPath, mergedYaml, "utf-8");
 			switch (outputFormat) {
 				case "jupyter":

package/dist/bin.js

@@ -1,12 +1,11 @@
 #!/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-BN4Mwc-V.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-BcZ91Lsd.js";
 import { cli } from "cleye";
 import fs from "node:fs/promises";
 import { basename, dirname, extname, resolve } from "node:path";
-import { deserializeDeepnoteFile } from "@deepnote/blocks";
+import { deserializeDeepnoteFile, serializeDeepnoteFile } from "@deepnote/blocks";
 import chalk from "chalk";
 import ora from "ora";
-import { stringify } from "yaml";
 
 //#region src/cli.ts
 async function convert(options) {
@@ -211,7 +210,7 @@ async function convertDeepnoteToFormat(absolutePath, outputFormat, customOutputP
 		const tempDir = await fs.mkdtemp(resolve(dirname(absolutePath), ".deepnote-merge-"));
 		const tempPath = resolve(tempDir, `${filenameWithoutExtension}.merged.deepnote`);
 		try {
-			const mergedYaml = stringify(deepnoteFile);
+			const mergedYaml = serializeDeepnoteFile(deepnoteFile);
 			await fs.writeFile(tempPath, mergedYaml, "utf-8");
 			switch (outputFormat) {
 				case "jupyter":

package/dist/index.cjs

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

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { DeepnoteBlock, DeepnoteError, DeepnoteFile, DeepnoteSnapshot, Environment, Execution, ParseError } from "@deepnote/blocks";
+import { DeepnoteBlock, DeepnoteError, DeepnoteFile, DeepnoteSnapshot, Environment, Execution, ParseError, SnapshotHashInput, SnapshotHashInput as SnapshotHashInput$1 } from "@deepnote/blocks";
 
 //#region src/types/jupyter.d.ts
 
@@ -778,7 +778,7 @@ declare function computeContentHash(content: string): string;
  * @param file - The DeepnoteFile to compute hash for
  * @returns Hash string in format 'sha256:{hex}'
  */
-declare function computeSnapshotHash(file: DeepnoteFile): string;
+declare function computeSnapshotHash(file: SnapshotHashInput$1): string;
 /**
  * Adds content hashes to all blocks in a DeepnoteFile that don't already have them.
  * Returns a new DeepnoteFile with hashes added (does not mutate the input).
@@ -994,4 +994,4 @@ interface WriteDeepnoteFileResult {
  */
 declare function writeDeepnoteFile(options: WriteDeepnoteFileOptions): Promise<WriteDeepnoteFileResult>;
 //#endregion
-export { type BlockOutput, type ConvertBlocksToJupyterOptions, type ConvertDeepnoteFileToMarimoOptions, type ConvertDeepnoteFileToPercentOptions, type ConvertDeepnoteFileToQuartoOptions, type ConvertIpynbFilesToDeepnoteFileOptions, type ConvertJupyterNotebookOptions, type ConvertMarimoAppOptions, type ConvertMarimoAppsToDeepnoteOptions, type ConvertMarimoFilesToDeepnoteFileOptions, type ConvertPercentFilesToDeepnoteFileOptions, type ConvertPercentNotebookOptions, type ConvertQuartoDocumentOptions, type ConvertQuartoFilesToDeepnoteFileOptions, FileReadError, FileWriteError, JsonParseError, type JupyterCell, type JupyterNotebook, type JupyterNotebookInput, type MarimoApp, type MarimoAppInput, type MarimoCell, type MergeOptions, type NotebookFormat, type PercentCell, type PercentNotebook, type PercentNotebookInput, type QuartoCell, type QuartoCellOptions, type QuartoDocument, type QuartoDocumentInput, type QuartoFrontmatter, type ReadAndConvertIpynbFilesOptions, type ReadAndConvertMarimoFilesOptions, type ReadAndConvertPercentFilesOptions, type ReadAndConvertQuartoFilesOptions, type SnapshotInfo, type SnapshotOptions, type SplitResult, UnsupportedFormatError, type WriteDeepnoteFileOptions, type WriteDeepnoteFileResult, 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 };
+export { type BlockOutput, type ConvertBlocksToJupyterOptions, type ConvertDeepnoteFileToMarimoOptions, type ConvertDeepnoteFileToPercentOptions, type ConvertDeepnoteFileToQuartoOptions, type ConvertIpynbFilesToDeepnoteFileOptions, type ConvertJupyterNotebookOptions, type ConvertMarimoAppOptions, type ConvertMarimoAppsToDeepnoteOptions, type ConvertMarimoFilesToDeepnoteFileOptions, type ConvertPercentFilesToDeepnoteFileOptions, type ConvertPercentNotebookOptions, type ConvertQuartoDocumentOptions, type ConvertQuartoFilesToDeepnoteFileOptions, FileReadError, FileWriteError, JsonParseError, type JupyterCell, type JupyterNotebook, type JupyterNotebookInput, type MarimoApp, type MarimoAppInput, type MarimoCell, type MergeOptions, type NotebookFormat, type PercentCell, type PercentNotebook, type PercentNotebookInput, type QuartoCell, type QuartoCellOptions, type QuartoDocument, type QuartoDocumentInput, type QuartoFrontmatter, type ReadAndConvertIpynbFilesOptions, type ReadAndConvertMarimoFilesOptions, type ReadAndConvertPercentFilesOptions, type ReadAndConvertQuartoFilesOptions, type SnapshotHashInput, type SnapshotInfo, type SnapshotOptions, type SplitResult, UnsupportedFormatError, type WriteDeepnoteFileOptions, type WriteDeepnoteFileResult, 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/index.d.ts

@@ -1,4 +1,4 @@
-import { DeepnoteBlock, DeepnoteError, DeepnoteFile, DeepnoteSnapshot, Environment, Execution, ParseError } from "@deepnote/blocks";
+import { DeepnoteBlock, DeepnoteError, DeepnoteFile, DeepnoteSnapshot, Environment, Execution, ParseError, SnapshotHashInput, SnapshotHashInput as SnapshotHashInput$1 } from "@deepnote/blocks";
 
 //#region src/types/jupyter.d.ts
 
@@ -778,7 +778,7 @@ declare function computeContentHash(content: string): string;
  * @param file - The DeepnoteFile to compute hash for
  * @returns Hash string in format 'sha256:{hex}'
  */
-declare function computeSnapshotHash(file: DeepnoteFile): string;
+declare function computeSnapshotHash(file: SnapshotHashInput$1): string;
 /**
  * Adds content hashes to all blocks in a DeepnoteFile that don't already have them.
  * Returns a new DeepnoteFile with hashes added (does not mutate the input).
@@ -994,4 +994,4 @@ interface WriteDeepnoteFileResult {
  */
 declare function writeDeepnoteFile(options: WriteDeepnoteFileOptions): Promise<WriteDeepnoteFileResult>;
 //#endregion
-export { type BlockOutput, type ConvertBlocksToJupyterOptions, type ConvertDeepnoteFileToMarimoOptions, type ConvertDeepnoteFileToPercentOptions, type ConvertDeepnoteFileToQuartoOptions, type ConvertIpynbFilesToDeepnoteFileOptions, type ConvertJupyterNotebookOptions, type ConvertMarimoAppOptions, type ConvertMarimoAppsToDeepnoteOptions, type ConvertMarimoFilesToDeepnoteFileOptions, type ConvertPercentFilesToDeepnoteFileOptions, type ConvertPercentNotebookOptions, type ConvertQuartoDocumentOptions, type ConvertQuartoFilesToDeepnoteFileOptions, FileReadError, FileWriteError, JsonParseError, type JupyterCell, type JupyterNotebook, type JupyterNotebookInput, type MarimoApp, type MarimoAppInput, type MarimoCell, type MergeOptions, type NotebookFormat, type PercentCell, type PercentNotebook, type PercentNotebookInput, type QuartoCell, type QuartoCellOptions, type QuartoDocument, type QuartoDocumentInput, type QuartoFrontmatter, type ReadAndConvertIpynbFilesOptions, type ReadAndConvertMarimoFilesOptions, type ReadAndConvertPercentFilesOptions, type ReadAndConvertQuartoFilesOptions, type SnapshotInfo, type SnapshotOptions, type SplitResult, UnsupportedFormatError, type WriteDeepnoteFileOptions, type WriteDeepnoteFileResult, 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 };
+export { type BlockOutput, type ConvertBlocksToJupyterOptions, type ConvertDeepnoteFileToMarimoOptions, type ConvertDeepnoteFileToPercentOptions, type ConvertDeepnoteFileToQuartoOptions, type ConvertIpynbFilesToDeepnoteFileOptions, type ConvertJupyterNotebookOptions, type ConvertMarimoAppOptions, type ConvertMarimoAppsToDeepnoteOptions, type ConvertMarimoFilesToDeepnoteFileOptions, type ConvertPercentFilesToDeepnoteFileOptions, type ConvertPercentNotebookOptions, type ConvertQuartoDocumentOptions, type ConvertQuartoFilesToDeepnoteFileOptions, FileReadError, FileWriteError, JsonParseError, type JupyterCell, type JupyterNotebook, type JupyterNotebookInput, type MarimoApp, type MarimoAppInput, type MarimoCell, type MergeOptions, type NotebookFormat, type PercentCell, type PercentNotebook, type PercentNotebookInput, type QuartoCell, type QuartoCellOptions, type QuartoDocument, type QuartoDocumentInput, type QuartoFrontmatter, type ReadAndConvertIpynbFilesOptions, type ReadAndConvertMarimoFilesOptions, type ReadAndConvertPercentFilesOptions, type ReadAndConvertQuartoFilesOptions, type SnapshotHashInput, type SnapshotInfo, type SnapshotOptions, type SplitResult, UnsupportedFormatError, type WriteDeepnoteFileOptions, type WriteDeepnoteFileResult, 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/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-BN4Mwc-V.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-BcZ91Lsd.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-BN4Mwc-V.js → src-BcZ91Lsd.js}

@@ -1,8 +1,8 @@
 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 } from "@deepnote/blocks";
-import { parse, stringify } from "yaml";
+import { DeepnoteError, InvalidValueError, ParseError, createMarkdown, createPythonCode, deepnoteBlockSchema, deepnoteSnapshotSchema, deserializeDeepnoteFile, environmentSchema, executionSchema, isExecutableBlockType, serializeDeepnoteFile, serializeDeepnoteSnapshot } from "@deepnote/blocks";
 import { createHash, randomUUID } from "node:crypto";
+import { parse } from "yaml";
 
 //#region src/utils.ts
 /**
@@ -848,7 +848,7 @@ async function readAndConvertIpynbFiles(inputFilePaths, options) {
 * Converts multiple Jupyter Notebook (.ipynb) files into a single Deepnote project file.
 */
 async function convertIpynbFilesToDeepnoteFile(inputFilePaths, options) {
-	const yamlContent = stringify(await readAndConvertIpynbFiles(inputFilePaths, { projectName: options.projectName }));
+	const yamlContent = serializeDeepnoteFile(await readAndConvertIpynbFiles(inputFilePaths, { projectName: options.projectName }));
 	const parentDir = dirname(options.outputPath);
 	await fs.mkdir(parentDir, { recursive: true });
 	await fs.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -1654,7 +1654,7 @@ async function convertMarimoFilesToDeepnoteFile(inputFilePaths, options) {
 			filePath
 		});
 	}
-	const yamlContent = stringify(convertMarimoAppsToDeepnoteFile(apps, { projectName: options.projectName }));
+	const yamlContent = serializeDeepnoteFile(convertMarimoAppsToDeepnoteFile(apps, { projectName: options.projectName }));
 	const parentDir = dirname(options.outputPath);
 	await fs.mkdir(parentDir, { recursive: true });
 	await fs.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -1827,7 +1827,7 @@ async function readAndConvertPercentFiles(inputFilePaths, options) {
 * Converts multiple percent format (.py) files into a single Deepnote project file.
 */
 async function convertPercentFilesToDeepnoteFile(inputFilePaths, options) {
-	const yamlContent = stringify(await readAndConvertPercentFiles(inputFilePaths, { projectName: options.projectName }));
+	const yamlContent = serializeDeepnoteFile(await readAndConvertPercentFiles(inputFilePaths, { projectName: options.projectName }));
 	const parentDir = dirname(options.outputPath);
 	await fs.mkdir(parentDir, { recursive: true });
 	await fs.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -2100,7 +2100,7 @@ async function readAndConvertQuartoFiles(inputFilePaths, options) {
 * Converts multiple Quarto (.qmd) files into a single Deepnote project file.
 */
 async function convertQuartoFilesToDeepnoteFile(inputFilePaths, options) {
-	const yamlContent = stringify(await readAndConvertQuartoFiles(inputFilePaths, { projectName: options.projectName }));
+	const yamlContent = serializeDeepnoteFile(await readAndConvertQuartoFiles(inputFilePaths, { projectName: options.projectName }));
 	const parentDir = dirname(options.outputPath);
 	await fs.mkdir(parentDir, { recursive: true });
 	await fs.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -2146,15 +2146,15 @@ async function writeDeepnoteFile(options) {
 	const parentDir = dirname(outputPath);
 	await fs.mkdir(parentDir, { recursive: true });
 	if (singleFile || !hasOutputs(file)) {
-		const yamlContent = stringify(file);
+		const yamlContent = serializeDeepnoteFile(file);
 		await fs.writeFile(outputPath, yamlContent, "utf-8");
 		return { sourcePath: outputPath };
 	}
 	const { source, snapshot } = splitDeepnoteFile(file);
 	const snapshotDir = getSnapshotDir(outputPath);
 	const snapshotPath = resolve(snapshotDir, generateSnapshotFilename(slugifyProjectName(projectName) || "project", file.project.id));
-	const sourceYaml = stringify(source);
-	const snapshotYaml = stringify(snapshot);
+	const sourceYaml = serializeDeepnoteFile(source);
+	const snapshotYaml = serializeDeepnoteSnapshot(snapshot);
 	await fs.mkdir(snapshotDir, { recursive: true });
 	await Promise.all([fs.writeFile(outputPath, sourceYaml, "utf-8"), fs.writeFile(snapshotPath, snapshotYaml, "utf-8")]);
 	return {

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

@@ -27,10 +27,10 @@ let node_path = require("node:path");
 node_path = __toESM(node_path);
 let __deepnote_blocks = require("@deepnote/blocks");
 __deepnote_blocks = __toESM(__deepnote_blocks);
-let yaml = require("yaml");
-yaml = __toESM(yaml);
 let node_crypto = require("node:crypto");
 node_crypto = __toESM(node_crypto);
+let yaml = require("yaml");
+yaml = __toESM(yaml);
 
 //#region src/utils.ts
 /**
@@ -876,7 +876,7 @@ async function readAndConvertIpynbFiles(inputFilePaths, options) {
 * Converts multiple Jupyter Notebook (.ipynb) files into a single Deepnote project file.
 */
 async function convertIpynbFilesToDeepnoteFile(inputFilePaths, options) {
-	const yamlContent = (0, yaml.stringify)(await readAndConvertIpynbFiles(inputFilePaths, { projectName: options.projectName }));
+	const yamlContent = (0, __deepnote_blocks.serializeDeepnoteFile)(await readAndConvertIpynbFiles(inputFilePaths, { projectName: options.projectName }));
 	const parentDir = (0, node_path.dirname)(options.outputPath);
 	await node_fs_promises.default.mkdir(parentDir, { recursive: true });
 	await node_fs_promises.default.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -1682,7 +1682,7 @@ async function convertMarimoFilesToDeepnoteFile(inputFilePaths, options) {
 			filePath
 		});
 	}
-	const yamlContent = (0, yaml.stringify)(convertMarimoAppsToDeepnoteFile(apps, { projectName: options.projectName }));
+	const yamlContent = (0, __deepnote_blocks.serializeDeepnoteFile)(convertMarimoAppsToDeepnoteFile(apps, { projectName: options.projectName }));
 	const parentDir = (0, node_path.dirname)(options.outputPath);
 	await node_fs_promises.default.mkdir(parentDir, { recursive: true });
 	await node_fs_promises.default.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -1855,7 +1855,7 @@ async function readAndConvertPercentFiles(inputFilePaths, options) {
 * Converts multiple percent format (.py) files into a single Deepnote project file.
 */
 async function convertPercentFilesToDeepnoteFile(inputFilePaths, options) {
-	const yamlContent = (0, yaml.stringify)(await readAndConvertPercentFiles(inputFilePaths, { projectName: options.projectName }));
+	const yamlContent = (0, __deepnote_blocks.serializeDeepnoteFile)(await readAndConvertPercentFiles(inputFilePaths, { projectName: options.projectName }));
 	const parentDir = (0, node_path.dirname)(options.outputPath);
 	await node_fs_promises.default.mkdir(parentDir, { recursive: true });
 	await node_fs_promises.default.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -2128,7 +2128,7 @@ async function readAndConvertQuartoFiles(inputFilePaths, options) {
 * Converts multiple Quarto (.qmd) files into a single Deepnote project file.
 */
 async function convertQuartoFilesToDeepnoteFile(inputFilePaths, options) {
-	const yamlContent = (0, yaml.stringify)(await readAndConvertQuartoFiles(inputFilePaths, { projectName: options.projectName }));
+	const yamlContent = (0, __deepnote_blocks.serializeDeepnoteFile)(await readAndConvertQuartoFiles(inputFilePaths, { projectName: options.projectName }));
 	const parentDir = (0, node_path.dirname)(options.outputPath);
 	await node_fs_promises.default.mkdir(parentDir, { recursive: true });
 	await node_fs_promises.default.writeFile(options.outputPath, yamlContent, "utf-8");
@@ -2174,15 +2174,15 @@ async function writeDeepnoteFile(options) {
 	const parentDir = (0, node_path.dirname)(outputPath);
 	await node_fs_promises.default.mkdir(parentDir, { recursive: true });
 	if (singleFile || !hasOutputs(file)) {
-		const yamlContent = (0, yaml.stringify)(file);
+		const yamlContent = (0, __deepnote_blocks.serializeDeepnoteFile)(file);
 		await node_fs_promises.default.writeFile(outputPath, yamlContent, "utf-8");
 		return { sourcePath: outputPath };
 	}
 	const { source, snapshot } = splitDeepnoteFile(file);
 	const snapshotDir = getSnapshotDir(outputPath);
 	const snapshotPath = (0, node_path.resolve)(snapshotDir, generateSnapshotFilename(slugifyProjectName(projectName) || "project", file.project.id));
-	const sourceYaml = (0, yaml.stringify)(source);
-	const snapshotYaml = (0, yaml.stringify)(snapshot);
+	const sourceYaml = (0, __deepnote_blocks.serializeDeepnoteFile)(source);
+	const snapshotYaml = (0, __deepnote_blocks.serializeDeepnoteSnapshot)(snapshot);
 	await node_fs_promises.default.mkdir(snapshotDir, { recursive: true });
 	await Promise.all([node_fs_promises.default.writeFile(outputPath, sourceYaml, "utf-8"), node_fs_promises.default.writeFile(snapshotPath, snapshotYaml, "utf-8")]);
 	return {

package/package.json

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