Drop uuid pkg used to to generate notebook cell id (#198647)

microsoft · Nov 20, 2023 · 46cd720 · 46cd720
1 parent e0b9ba5
commit 46cd720
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 27 deletions.
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
@@ -5,7 +5,7 @@
 	"publisher": "vscode",
 	"version": "1.0.0",
 	"license": "MIT",
-  "icon": "media/icon.png",
+	"icon": "media/icon.png",
 	"engines": {
 		"vscode": "^1.57.0"
 	},
@@ -58,10 +58,10 @@
 				"command": "ipynb.cleanInvalidImageAttachment",
 				"title": "%cleanInvalidImageAttachment.title%"
 			},
-      {
-        "command": "notebook.cellOutput.copy",
-        "title": "%copyCellOutput.title%"
-      }
+			{
+				"command": "notebook.cellOutput.copy",
+				"title": "%copyCellOutput.title%"
+			}
 		],
 		"notebooks": [
 			{
@@ -105,12 +105,12 @@
 					"when": "false"
 				}
 			],
-      "webview/context": [
-        {
-          "command": "notebook.cellOutput.copy",
-          "when": "webviewId == 'notebook.output' && webviewSection == 'image'"
-        }
-      ]
+			"webview/context": [
+				{
+					"command": "notebook.cellOutput.copy",
+					"when": "webviewId == 'notebook.output' && webviewSection == 'image'"
+				}
+			]
 		}
 	},
 	"scripts": {
@@ -120,13 +120,11 @@
 	},
 	"dependencies": {
 		"@enonic/fnv-plus": "^1.3.0",
-		"detect-indent": "^6.0.0",
-		"uuid": "^8.3.2"
+		"detect-indent": "^6.0.0"
 	},
 	"devDependencies": {
 		"@jupyterlab/nbformat": "^3.2.9",
-		"@types/markdown-it": "12.2.3",
-		"@types/uuid": "^8.3.1"
+		"@types/markdown-it": "12.2.3"
 	},
 	"repository": {
 		"type": "git",

diff --git a/extensions/ipynb/src/cellIdService.ts b/extensions/ipynb/src/cellIdService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ExtensionContext, NotebookDocument, NotebookDocumentChangeEvent, NotebookEdit, workspace, WorkspaceEdit } from 'vscode';
-import { v4 as uuid } from 'uuid';
 import { getCellMetadata } from './serializers';
 import { CellMetadata } from './common';
 import { getNotebookMetadata } from './notebookSerializer';
@@ -57,7 +56,7 @@ function generateCellId(notebook: NotebookDocument) {
 	while (true) {
 		// Details of the id can be found here https://jupyter.org/enhancement-proposals/62-cell-id/cell-id.html#adding-an-id-field,
 		// & here https://jupyter.org/enhancement-proposals/62-cell-id/cell-id.html#updating-older-formats
-		const id = uuid().replace(/-/g, '').substring(0, 8);
+		const id = generateUuid().replace(/-/g, '').substring(0, 8);
 		let duplicate = false;
 		for (let index = 0; index < notebook.cellCount; index++) {
 			const cell = notebook.cellAt(index);
@@ -75,3 +74,56 @@ function generateCellId(notebook: NotebookDocument) {
 		}
 	}
 }
+
+
+/**
+ * Copied from src/vs/base/common/uuid.ts
+ */
+function generateUuid() {
+	// use `randomValues` if possible
+	function getRandomValues(bucket: Uint8Array): Uint8Array {
+		for (let i = 0; i < bucket.length; i++) {
+			bucket[i] = Math.floor(Math.random() * 256);
+		}
+		return bucket;
+	}
+
+	// prep-work
+	const _data = new Uint8Array(16);
+	const _hex: string[] = [];
+	for (let i = 0; i < 256; i++) {
+		_hex.push(i.toString(16).padStart(2, '0'));
+	}
+
+	// get data
+	getRandomValues(_data);
+
+	// set version bits
+	_data[6] = (_data[6] & 0x0f) | 0x40;
+	_data[8] = (_data[8] & 0x3f) | 0x80;
+
+	// print as string
+	let i = 0;
+	let result = '';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += '-';
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	result += _hex[_data[i++]];
+	return result;
+}
diff --git a/extensions/ipynb/yarn.lock b/extensions/ipynb/yarn.lock
@@ -37,17 +37,7 @@
   resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
   integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
 
-"@types/uuid@^8.3.1":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
-  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
-
 detect-indent@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
   integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
-
-uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==