@difizen/libro-common 0.2.27 → 0.2.29

package/es/protocol/cell-protocol.d.ts

@@ -180,5 +180,20 @@ export type ICell = IRawCell | IMarkdownCell | ICodeCell | IUnrecognizedCell;
  */
 export type ICellMetadata = IBaseCellMetadata | IRawCellMetadata | ICodeCellMetadata;
 export declare const LibroCellURIScheme = "vscode-notebook-cell";
-export declare const getCellURI: (notebookId: string, cellId: string) => URI;
+export declare namespace CellUri {
+    /**
+     * 兼容 VSCode
+     */
+    const NotebookScheme = "vscode-notebook";
+    /**
+     * 兼容 VSCode
+     */
+    const CellScheme = "vscode-notebook-cell";
+    const from: (notebookId: string, cellId: string) => URI;
+    const is: (uri: URI) => boolean;
+    const parse: (uri: URI) => {
+        notebookId: string;
+        cellId: string;
+    } | undefined;
+}
 //# sourceMappingURL=cell-protocol.d.ts.map

package/es/protocol/cell-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell-protocol.d.ts","sourceRoot":"","sources":["../../src/protocol/cell-protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cell-protocol.d.ts","sourceRoot":"","sources":["../../src/protocol/cell-protocol.ts"],"names":[],"mappings":"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"}

package/es/protocol/cell-protocol.js

@@ -53,9 +53,28 @@ import { URI } from '@difizen/mana-app';
  */
 
 export var LibroCellURIScheme = 'vscode-notebook-cell';
-export var getCellURI = function getCellURI(notebookId, cellId) {
-  var uri = new URI(notebookId);
-  uri = URI.withScheme(uri, LibroCellURIScheme);
-  uri = URI.withQuery(uri, "cellid=".concat(cellId));
-  return uri;
-};
+export var CellUri;
+(function (_CellUri) {
+  var NotebookScheme = _CellUri.NotebookScheme = 'vscode-notebook';
+  var CellScheme = _CellUri.CellScheme = 'vscode-notebook-cell';
+  var from = _CellUri.from = function (notebookId, cellId) {
+    var uri = new URI(notebookId);
+    uri = URI.withScheme(uri, LibroCellURIScheme);
+    uri = URI.withQuery(uri, URI.stringifyQuery({
+      cellId: cellId
+    }));
+    return uri;
+  };
+  var is = _CellUri.is = function (uri) {
+    return uri.scheme === CellUri.CellScheme;
+  };
+  var parse = _CellUri.parse = function (uri) {
+    if (!CellUri.is(uri)) {
+      return;
+    }
+    return {
+      notebookId: uri.path.toString(),
+      cellId: uri.getParsedQuery()['cellId']
+    };
+  };
+})(CellUri || (CellUri = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-common",
-  "version": "0.2.27",
+  "version": "0.2.29",
   "description": "",
   "keywords": [
     "libro",

package/src/protocol/cell-protocol.ts

@@ -218,9 +218,37 @@ export type ICellMetadata = IBaseCellMetadata | IRawCellMetadata | ICodeCellMeta
 
 export const LibroCellURIScheme = 'vscode-notebook-cell';
 
-export const getCellURI = (notebookId: string, cellId: string): URI => {
-  let uri = new URI(notebookId);
-  uri = URI.withScheme(uri, LibroCellURIScheme);
-  uri = URI.withQuery(uri, `cellid=${cellId}`);
-  return uri;
-};
+export namespace CellUri {
+  /**
+   * 兼容 VSCode
+   */
+  export const NotebookScheme = 'vscode-notebook';
+
+  /**
+   * 兼容 VSCode
+   */
+  export const CellScheme = 'vscode-notebook-cell';
+
+  export const from = (notebookId: string, cellId: string): URI => {
+    let uri = new URI(notebookId);
+    uri = URI.withScheme(uri, LibroCellURIScheme);
+    uri = URI.withQuery(uri, URI.stringifyQuery({ cellId }));
+    return uri;
+  };
+
+  export const is = (uri: URI): boolean => {
+    return uri.scheme === CellUri.CellScheme;
+  };
+
+  export const parse = (
+    uri: URI,
+  ): { notebookId: string; cellId: string } | undefined => {
+    if (!CellUri.is(uri)) {
+      return;
+    }
+    return {
+      notebookId: uri.path.toString(),
+      cellId: uri.getParsedQuery()['cellId'],
+    };
+  };
+}