@deepnote/convert 2.1.2 → 2.1.3

package/dist/bin.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require('./src-DI6mrd_2.cjs');
+const require_src = require('./src-1XGCb_OZ.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 { M as convertDeepnoteFileToJupyterFiles, O as convertDeepnoteFileToMarimoFiles, _ as isMarimoContent, a as convertPercentFilesToDeepnoteFile, b as convertDeepnoteFileToQuartoFiles, d as convertMarimoFilesToDeepnoteFile, p as convertIpynbFilesToDeepnoteFile, r as convertQuartoFilesToDeepnoteFile, v as isPercentContent, w as convertDeepnoteFileToPercentFiles } from "./src-oALQkXiP.js";
+import { M as convertDeepnoteFileToJupyterFiles, O as convertDeepnoteFileToMarimoFiles, _ as isMarimoContent, a as convertPercentFilesToDeepnoteFile, b as convertDeepnoteFileToQuartoFiles, d as convertMarimoFilesToDeepnoteFile, p as convertIpynbFilesToDeepnoteFile, r as convertQuartoFilesToDeepnoteFile, v as isPercentContent, w as convertDeepnoteFileToPercentFiles } from "./src-zxlAKpnq.js";
 import { cli } from "cleye";
 import fs from "node:fs/promises";
 import { basename, extname, resolve } from "node:path";

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_src = require('./src-DI6mrd_2.cjs');
+const require_src = require('./src-1XGCb_OZ.cjs');
 
 exports.convertBlocksToJupyterNotebook = require_src.convertBlocksToJupyterNotebook;
 exports.convertBlocksToMarimoApp = require_src.convertBlocksToMarimoApp;

package/dist/index.d.cts

@@ -409,7 +409,7 @@ interface ConvertIpynbFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertJupyterNotebookOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface JupyterNotebookInput {
@@ -457,7 +457,7 @@ interface ConvertMarimoFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertMarimoAppOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface MarimoAppInput {
@@ -497,7 +497,7 @@ declare function convertMarimoAppToBlocks(app: MarimoApp, options?: ConvertMarim
 interface ConvertMarimoAppsToDeepnoteOptions {
   /** Project name for the Deepnote file */
   projectName: string;
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 /**
@@ -520,7 +520,7 @@ interface ConvertPercentFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertPercentNotebookOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface PercentNotebookInput {
@@ -576,7 +576,7 @@ interface ConvertQuartoFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertQuartoDocumentOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface QuartoDocumentInput {

package/dist/index.d.ts

@@ -409,7 +409,7 @@ interface ConvertIpynbFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertJupyterNotebookOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface JupyterNotebookInput {
@@ -457,7 +457,7 @@ interface ConvertMarimoFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertMarimoAppOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface MarimoAppInput {
@@ -497,7 +497,7 @@ declare function convertMarimoAppToBlocks(app: MarimoApp, options?: ConvertMarim
 interface ConvertMarimoAppsToDeepnoteOptions {
   /** Project name for the Deepnote file */
   projectName: string;
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 /**
@@ -520,7 +520,7 @@ interface ConvertPercentFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertPercentNotebookOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface PercentNotebookInput {
@@ -576,7 +576,7 @@ interface ConvertQuartoFilesToDeepnoteFileOptions {
   projectName: string;
 }
 interface ConvertQuartoDocumentOptions {
-  /** Custom ID generator function. Defaults to uuid v4. */
+  /** Custom ID generator function. Defaults to crypto.randomUUID(). */
   idGenerator?: () => string;
 }
 interface QuartoDocumentInput {

package/dist/index.js

@@ -1,3 +1,3 @@
-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";
+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-zxlAKpnq.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, detectFormat, parseMarimoFormat, parsePercentFormat, parseQuartoFormat, serializeMarimoFormat, serializePercentFormat, serializeQuartoFormat };

package/dist/{src-DI6mrd_2.cjs → src-1XGCb_OZ.cjs}

@@ -27,8 +27,8 @@ let node_path = require("node:path");
 node_path = __toESM(node_path);
 let __deepnote_blocks = require("@deepnote/blocks");
 __deepnote_blocks = __toESM(__deepnote_blocks);
-let uuid = require("uuid");
-uuid = __toESM(uuid);
+let node_crypto = require("node:crypto");
+node_crypto = __toESM(node_crypto);
 let yaml = require("yaml");
 yaml = __toESM(yaml);
 
@@ -696,7 +696,7 @@ function detectFormat(filename, content) {
 * ```
 */
 function convertJupyterNotebookToBlocks(notebook, options) {
-	const idGenerator = options?.idGenerator ?? uuid.v4;
+	const idGenerator = options?.idGenerator ?? node_crypto.randomUUID;
 	return notebook.cells.map((cell, index) => convertCellToBlock$3(cell, index, idGenerator));
 }
 /**
@@ -720,13 +720,13 @@ function convertJupyterNotebooksToDeepnote(notebooks, options) {
 			if (parsed.success) execution = parsed.data;
 		}
 	}
-	const firstNotebookId = notebooks.length > 0 ? notebooks[0].notebook.metadata?.deepnote_notebook_id ?? (0, uuid.v4)() : void 0;
+	const firstNotebookId = notebooks.length > 0 ? notebooks[0].notebook.metadata?.deepnote_notebook_id ?? (0, node_crypto.randomUUID)() : void 0;
 	const deepnoteFile = {
 		environment,
 		execution,
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
 		project: {
-			id: (0, uuid.v4)(),
+			id: (0, node_crypto.randomUUID)(),
 			initNotebookId: firstNotebookId,
 			integrations: [],
 			name: options.projectName,
@@ -744,7 +744,7 @@ function convertJupyterNotebooksToDeepnote(notebooks, options) {
 		const executionMode = notebook.metadata?.deepnote_execution_mode;
 		const isModule = notebook.metadata?.deepnote_is_module;
 		const workingDirectory = notebook.metadata?.deepnote_working_directory;
-		const resolvedNotebookId = i === 0 && firstNotebookId ? firstNotebookId : notebookId ?? (0, uuid.v4)();
+		const resolvedNotebookId = i === 0 && firstNotebookId ? firstNotebookId : notebookId ?? (0, node_crypto.randomUUID)();
 		deepnoteFile.project.notebooks.push({
 			blocks,
 			executionMode: executionMode ?? "block",
@@ -999,7 +999,7 @@ function parseMarimoFormat(content) {
 * @returns Array of DeepnoteBlock objects
 */
 function convertMarimoAppToBlocks(app, options) {
-	const idGenerator = options?.idGenerator ?? uuid.v4;
+	const idGenerator = options?.idGenerator ?? node_crypto.randomUUID;
 	return app.cells.map((cell, index) => convertCellToBlock$2(cell, index, idGenerator));
 }
 /**
@@ -1011,7 +1011,7 @@ function convertMarimoAppToBlocks(app, options) {
 * @returns A DeepnoteFile object
 */
 function convertMarimoAppsToDeepnote(apps, options) {
-	const idGenerator = options.idGenerator ?? uuid.v4;
+	const idGenerator = options.idGenerator ?? node_crypto.randomUUID;
 	const firstNotebookId = apps.length > 0 ? idGenerator() : void 0;
 	const deepnoteFile = {
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
@@ -1169,7 +1169,7 @@ function parsePercentFormat(content) {
 * @returns Array of DeepnoteBlock objects
 */
 function convertPercentNotebookToBlocks(notebook, options) {
-	const idGenerator = options?.idGenerator ?? uuid.v4;
+	const idGenerator = options?.idGenerator ?? node_crypto.randomUUID;
 	return notebook.cells.map((cell, index) => convertCellToBlock$1(cell, index, idGenerator));
 }
 /**
@@ -1181,11 +1181,11 @@ function convertPercentNotebookToBlocks(notebook, options) {
 * @returns A DeepnoteFile object
 */
 function convertPercentNotebooksToDeepnote(notebooks, options) {
-	const firstNotebookId = notebooks.length > 0 ? (0, uuid.v4)() : void 0;
+	const firstNotebookId = notebooks.length > 0 ? (0, node_crypto.randomUUID)() : void 0;
 	const deepnoteFile = {
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
 		project: {
-			id: (0, uuid.v4)(),
+			id: (0, node_crypto.randomUUID)(),
 			initNotebookId: firstNotebookId,
 			integrations: [],
 			name: options.projectName,
@@ -1198,7 +1198,7 @@ function convertPercentNotebooksToDeepnote(notebooks, options) {
 		const { filename, notebook } = notebooks[i];
 		const filenameWithoutExt = (0, node_path.basename)(filename, (0, node_path.extname)(filename)) || "Untitled notebook";
 		const blocks = convertPercentNotebookToBlocks(notebook);
-		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : (0, uuid.v4)();
+		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : (0, node_crypto.randomUUID)();
 		deepnoteFile.project.notebooks.push({
 			blocks,
 			executionMode: "block",
@@ -1420,7 +1420,7 @@ function parseQuartoCellOptions(content) {
 * @returns Array of DeepnoteBlock objects
 */
 function convertQuartoDocumentToBlocks(document, options) {
-	const idGenerator = options?.idGenerator ?? uuid.v4;
+	const idGenerator = options?.idGenerator ?? node_crypto.randomUUID;
 	const blocks = [];
 	if (document.frontmatter?.title) blocks.push({
 		blockGroup: idGenerator(),
@@ -1442,11 +1442,11 @@ function convertQuartoDocumentToBlocks(document, options) {
 * @returns A DeepnoteFile object
 */
 function convertQuartoDocumentsToDeepnote(documents, options) {
-	const firstNotebookId = documents.length > 0 ? (0, uuid.v4)() : void 0;
+	const firstNotebookId = documents.length > 0 ? (0, node_crypto.randomUUID)() : void 0;
 	const deepnoteFile = {
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
 		project: {
-			id: (0, uuid.v4)(),
+			id: (0, node_crypto.randomUUID)(),
 			initNotebookId: firstNotebookId,
 			integrations: [],
 			name: options.projectName,
@@ -1460,7 +1460,7 @@ function convertQuartoDocumentsToDeepnote(documents, options) {
 		const filenameWithoutExt = (0, node_path.basename)(filename, (0, node_path.extname)(filename)) || "Untitled notebook";
 		const notebookName = document.frontmatter?.title || filenameWithoutExt;
 		const blocks = convertQuartoDocumentToBlocks(document);
-		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : (0, uuid.v4)();
+		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : (0, node_crypto.randomUUID)();
 		deepnoteFile.project.notebooks.push({
 			blocks,
 			executionMode: "block",

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

@@ -1,7 +1,7 @@
 import fs from "node:fs/promises";
 import { basename, dirname, extname, join } from "node:path";
 import { createMarkdown, createPythonCode, deepnoteBlockSchema, deserializeDeepnoteFile, environmentSchema, executionSchema } from "@deepnote/blocks";
-import { v4 } from "uuid";
+import { randomUUID } from "node:crypto";
 import { parse, stringify } from "yaml";
 
 //#region src/utils.ts
@@ -668,7 +668,7 @@ function detectFormat(filename, content) {
 * ```
 */
 function convertJupyterNotebookToBlocks(notebook, options) {
-	const idGenerator = options?.idGenerator ?? v4;
+	const idGenerator = options?.idGenerator ?? randomUUID;
 	return notebook.cells.map((cell, index) => convertCellToBlock$3(cell, index, idGenerator));
 }
 /**
@@ -692,13 +692,13 @@ function convertJupyterNotebooksToDeepnote(notebooks, options) {
 			if (parsed.success) execution = parsed.data;
 		}
 	}
-	const firstNotebookId = notebooks.length > 0 ? notebooks[0].notebook.metadata?.deepnote_notebook_id ?? v4() : void 0;
+	const firstNotebookId = notebooks.length > 0 ? notebooks[0].notebook.metadata?.deepnote_notebook_id ?? randomUUID() : void 0;
 	const deepnoteFile = {
 		environment,
 		execution,
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
 		project: {
-			id: v4(),
+			id: randomUUID(),
 			initNotebookId: firstNotebookId,
 			integrations: [],
 			name: options.projectName,
@@ -716,7 +716,7 @@ function convertJupyterNotebooksToDeepnote(notebooks, options) {
 		const executionMode = notebook.metadata?.deepnote_execution_mode;
 		const isModule = notebook.metadata?.deepnote_is_module;
 		const workingDirectory = notebook.metadata?.deepnote_working_directory;
-		const resolvedNotebookId = i === 0 && firstNotebookId ? firstNotebookId : notebookId ?? v4();
+		const resolvedNotebookId = i === 0 && firstNotebookId ? firstNotebookId : notebookId ?? randomUUID();
 		deepnoteFile.project.notebooks.push({
 			blocks,
 			executionMode: executionMode ?? "block",
@@ -971,7 +971,7 @@ function parseMarimoFormat(content) {
 * @returns Array of DeepnoteBlock objects
 */
 function convertMarimoAppToBlocks(app, options) {
-	const idGenerator = options?.idGenerator ?? v4;
+	const idGenerator = options?.idGenerator ?? randomUUID;
 	return app.cells.map((cell, index) => convertCellToBlock$2(cell, index, idGenerator));
 }
 /**
@@ -983,7 +983,7 @@ function convertMarimoAppToBlocks(app, options) {
 * @returns A DeepnoteFile object
 */
 function convertMarimoAppsToDeepnote(apps, options) {
-	const idGenerator = options.idGenerator ?? v4;
+	const idGenerator = options.idGenerator ?? randomUUID;
 	const firstNotebookId = apps.length > 0 ? idGenerator() : void 0;
 	const deepnoteFile = {
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
@@ -1141,7 +1141,7 @@ function parsePercentFormat(content) {
 * @returns Array of DeepnoteBlock objects
 */
 function convertPercentNotebookToBlocks(notebook, options) {
-	const idGenerator = options?.idGenerator ?? v4;
+	const idGenerator = options?.idGenerator ?? randomUUID;
 	return notebook.cells.map((cell, index) => convertCellToBlock$1(cell, index, idGenerator));
 }
 /**
@@ -1153,11 +1153,11 @@ function convertPercentNotebookToBlocks(notebook, options) {
 * @returns A DeepnoteFile object
 */
 function convertPercentNotebooksToDeepnote(notebooks, options) {
-	const firstNotebookId = notebooks.length > 0 ? v4() : void 0;
+	const firstNotebookId = notebooks.length > 0 ? randomUUID() : void 0;
 	const deepnoteFile = {
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
 		project: {
-			id: v4(),
+			id: randomUUID(),
 			initNotebookId: firstNotebookId,
 			integrations: [],
 			name: options.projectName,
@@ -1170,7 +1170,7 @@ function convertPercentNotebooksToDeepnote(notebooks, options) {
 		const { filename, notebook } = notebooks[i];
 		const filenameWithoutExt = basename(filename, extname(filename)) || "Untitled notebook";
 		const blocks = convertPercentNotebookToBlocks(notebook);
-		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : v4();
+		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : randomUUID();
 		deepnoteFile.project.notebooks.push({
 			blocks,
 			executionMode: "block",
@@ -1392,7 +1392,7 @@ function parseQuartoCellOptions(content) {
 * @returns Array of DeepnoteBlock objects
 */
 function convertQuartoDocumentToBlocks(document, options) {
-	const idGenerator = options?.idGenerator ?? v4;
+	const idGenerator = options?.idGenerator ?? randomUUID;
 	const blocks = [];
 	if (document.frontmatter?.title) blocks.push({
 		blockGroup: idGenerator(),
@@ -1414,11 +1414,11 @@ function convertQuartoDocumentToBlocks(document, options) {
 * @returns A DeepnoteFile object
 */
 function convertQuartoDocumentsToDeepnote(documents, options) {
-	const firstNotebookId = documents.length > 0 ? v4() : void 0;
+	const firstNotebookId = documents.length > 0 ? randomUUID() : void 0;
 	const deepnoteFile = {
 		metadata: { createdAt: (/* @__PURE__ */ new Date()).toISOString() },
 		project: {
-			id: v4(),
+			id: randomUUID(),
 			initNotebookId: firstNotebookId,
 			integrations: [],
 			name: options.projectName,
@@ -1432,7 +1432,7 @@ function convertQuartoDocumentsToDeepnote(documents, options) {
 		const filenameWithoutExt = basename(filename, extname(filename)) || "Untitled notebook";
 		const notebookName = document.frontmatter?.title || filenameWithoutExt;
 		const blocks = convertQuartoDocumentToBlocks(document);
-		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : v4();
+		const notebookId = i === 0 && firstNotebookId ? firstNotebookId : randomUUID();
 		deepnoteFile.project.notebooks.push({
 			blocks,
 			executionMode: "block",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepnote/convert",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "",
   "keywords": [],
   "repository": {
@@ -33,7 +33,6 @@
     "chalk": "^5.6.2",
     "cleye": "^2.0.0",
     "ora": "^9.0.0",
-    "uuid": "^13.0.0",
     "yaml": "^2.8.1",
     "@deepnote/blocks": "3.0.1"
   },