@modusoperandi/licit 0.13.3 → 0.13.20

package/dist/client/Licit.test.js

@@ -6,12 +6,16 @@ var _enzyme = require("enzyme");
 
 var _enzymeAdapterReact = _interopRequireDefault(require("@wojtekmaj/enzyme-adapter-react-17"));
 
-var _Licit = _interopRequireDefault(require("./Licit"));
+var _Licit = _interopRequireWildcard(require("./Licit"));
 
 var _RichTextEditor = _interopRequireDefault(require("../ui/RichTextEditor"));
 
 var _licitUiCommands = require("@modusoperandi/licit-ui-commands");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -45,7 +49,10 @@ describe('<Licit />', () => {
         },
         resolve: () => ({
           min: () => 0,
-          max: () => 10
+          max: () => 10,
+          parent: {
+            inlineContent: true
+          }
         }),
         toJSON: () => data
       },
@@ -75,4 +82,24 @@ describe('<Licit />', () => {
       expect(licit.editorView).toBe(fakeEditorView);
     });
   });
+});
+describe('<Licit with HTML input/>', () => {
+  let wrapper;
+  let licit;
+  const HELLO = 'Hello ';
+  const WORLD = 'World';
+  const data = '<p stylename="None">' + HELLO + '<strong overridden="false">' + WORLD + '</strong></p>';
+  beforeEach(() => {
+    wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react.default.createElement(_Licit.default, {
+      data: data,
+      dataType: _Licit.DataType.HTML
+    }));
+    licit = wrapper.instance();
+  });
+  it('should render a <RichTextEditor /> ', () => {
+    expect(wrapper.find(_RichTextEditor.default)).toBeTruthy();
+  });
+  it('should match state text content with the passed in text ', () => {
+    expect(licit.state.editorState.doc.textContent).toBe(HELLO + WORLD);
+  });
 });

package/dist/client/Licit.test.js.flow

@@ -1,7 +1,7 @@
 import React from 'react';
 import { configure, shallow } from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
-import Licit from './Licit';
+import Licit, { DataType } from './Licit';
 import RichTextEditor from '../ui/RichTextEditor';
 import { noop } from '@modusoperandi/licit-ui-commands';
 
@@ -34,7 +34,11 @@ describe('<Licit />', () => {
     state: {
       doc: {
         content: { size: 10 },
-        resolve: () => ({ min: () => 0, max: () => 10 }),
+        resolve: () => ({
+          min: () => 0,
+          max: () => 10,
+          parent: { inlineContent: true },
+        }),
         toJSON: () => data,
       },
       tr: {
@@ -65,3 +69,30 @@ describe('<Licit />', () => {
     });
   });
 });
+
+describe('<Licit with HTML input/>', () => {
+  let wrapper;
+  let licit;
+
+  const HELLO = 'Hello ';
+  const WORLD = 'World';
+  const data =
+    '<p stylename="None">' +
+    HELLO +
+    '<strong overridden="false">' +
+    WORLD +
+    '</strong></p>';
+
+  beforeEach(() => {
+    wrapper = shallow(<Licit data={data} dataType={DataType.HTML} />);
+    licit = wrapper.instance();
+  });
+
+  it('should render a <RichTextEditor /> ', () => {
+    expect(wrapper.find(RichTextEditor)).toBeTruthy();
+  });
+
+  it('should match state text content with the passed in text ', () => {
+    expect(licit.state.editorState.doc.textContent).toBe(HELLO + WORLD);
+  });
+});

package/dist/client/SimpleConnector.js

@@ -25,11 +25,16 @@ var bpfrpt_proptype_SetStateCall = _propTypes.default.func;
 exports.bpfrpt_proptype_SetStateCall = bpfrpt_proptype_SetStateCall;
 
 class SimpleConnector {
+  // This flag is used to deteremine if data passed in or not
+  // If not passed in, use the data from collab server when in collab mode.
+  // else use empty content.
   constructor(_editorState, setState) {
     _defineProperty(this, "_setState", void 0);
 
     _defineProperty(this, "_editorState", void 0);
 
+    _defineProperty(this, "_dataDefined", void 0);
+
     _defineProperty(this, "onEdit", (transaction, view) => {
       _reactDom.default.unstable_batchedUpdates(() => {
         const editorState = this._editorState.apply(transaction); // [FS] IRAD-1236 2020-03-05
@@ -57,6 +62,8 @@ class SimpleConnector {
 
     _defineProperty(this, "updateSchema", (schema, data) => {});
 
+    _defineProperty(this, "updateContent", data => {});
+
     _defineProperty(this, "cleanUp", () => {});
 
     this._editorState = _editorState;

package/dist/client/SimpleConnector.js.flow

@@ -14,6 +14,10 @@ export type SetStateCall = (
 class SimpleConnector {
   _setState: SetStateCall;
   _editorState: EditorState;
+  // This flag is used to deteremine if data passed in or not
+  // If not passed in, use the data from collab server when in collab mode.
+  // else use empty content.
+  _dataDefined: boolean;
 
   constructor(editorState: EditorState, setState: SetStateCall) {
     this._editorState = editorState;
@@ -49,6 +53,8 @@ class SimpleConnector {
   // Send the modified schema to server
   updateSchema = (schema: Schema, data: any) => {};
 
+  updateContent = (data: any) => {};
+
   cleanUp = () => {};
 }
 

package/dist/client/http.js

@@ -7,6 +7,7 @@ exports.DELETE = DELETE;
 exports.GET = GET;
 exports.PATCH = PATCH;
 exports.POST = POST;
+exports.PUT = PUT;
 exports.req = req;
 
 /* eslint-disable */
@@ -68,6 +69,17 @@ function POST(url, body, type) {
       'Content-Type': type
     }
   });
+}
+
+function PUT(url, body, type) {
+  return req({
+    url,
+    method: 'PUT',
+    body,
+    headers: {
+      'Content-Type': type
+    }
+  });
 } // [FS] IRAD-1128 2021-02-03
 // http DELETE request overrided
 

package/dist/client/http.js.flow

@@ -53,6 +53,10 @@ export function POST(url, body, type) {
   return req({ url, method: 'POST', body, headers: { 'Content-Type': type } });
 }
 
+export function PUT(url, body, type) {
+  return req({ url, method: 'PUT', body, headers: { 'Content-Type': type } });
+}
+
 // [FS] IRAD-1128 2021-02-03
 // http DELETE request overrided
 export function DELETE(url, type) {

package/dist/convertFromDOMElement.js.flow

@@ -11,8 +11,8 @@ import EditorSchema from './EditorSchema';
 
 export default function convertFromDOMElement(
   el: HTMLElement,
-  schema: ?Schema,
-  plugins: ?Array<Plugin>
+  schema: Schema,
+  plugins: Array<Plugin>
 ): EditorState {
   const effectiveSchema = schema || EditorSchema;
   const effectivePlugins = plugins || EditorPlugins;

package/dist/convertFromHTML.js

@@ -11,13 +11,10 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _convertFromDOMElement = _interopRequireDefault(require("./convertFromDOMElement"));
 
-var _normalizeHTML = _interopRequireDefault(require("./normalizeHTML"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function convertFromHTML(html, schema, plugins) {
   const root = document.createElement('html');
-  const newHTML = (0, _normalizeHTML.default)(html);
-  root.innerHTML = newHTML;
+  root.innerHTML = html ? html : ' ';
   return (0, _convertFromDOMElement.default)(root, schema, plugins);
 }

package/dist/convertFromHTML.js.flow

@@ -5,15 +5,13 @@ import { EditorState } from 'prosemirror-state';
 import { Plugin } from 'prosemirror-state';
 
 import convertFromDOMElement from './convertFromDOMElement';
-import normalizeHTML from './normalizeHTML';
 
 export default function convertFromHTML(
   html: string,
-  schema: ?Schema,
-  plugins: ?Array<Plugin>
+  schema: Schema,
+  plugins: Array<Plugin>
 ): EditorState {
   const root = document.createElement('html');
-  const newHTML = normalizeHTML(html);
-  root.innerHTML = newHTML;
+  root.innerHTML = html ? html : ' ';
   return convertFromDOMElement(root, schema, plugins);
 }

package/dist/convertFromJSON.js

@@ -13,44 +13,28 @@ var _createEmptyEditorState = _interopRequireDefault(require("./createEmptyEdito
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function convertFromJSON(json, schema, defaultSchema, plugins, defaultPlugins) {
-  let editorSchema = schema || defaultSchema; // [FS][IRAD-???? 2020-08-17]
-  // Loads plugins and its corresponding schema in editor
-
-  const effectivePlugins = defaultPlugins;
-
-  if (plugins) {
-    for (const p of plugins) {
-      if (!effectivePlugins.includes(p)) {
-        effectivePlugins.push(p);
-
-        if (p.getEffectiveSchema) {
-          editorSchema = p.getEffectiveSchema(editorSchema);
-        }
-
-        if (p.initKeyCommands) {
-          effectivePlugins.push(p.initKeyCommands());
-        }
-      }
-    }
-  }
+function convertFromJSON(json, schema, defaultSchema, effectivePlugins) {
+  const editorSchema = schema || defaultSchema;
+  let error = false;
 
   if (typeof json === 'string') {
     try {
       json = JSON.parse(json);
     } catch (ex) {
-      console.error('convertFromJSON:', ex); // [FS] IRAD-1455 2021-06-16
-      // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
-
-      return (0, _createEmptyEditorState.default)(schema, defaultSchema, plugins, defaultPlugins);
+      console.error('convertFromJSON:', ex);
+      error = true;
     }
   }
 
   if (!json || typeof json !== 'object') {
-    console.error('convertFromJSON: invalid object', json); // [FS] IRAD-1455 2021-06-16
-    // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
+    console.error('convertFromJSON: invalid object', json);
+    error = true;
+  }
 
-    return (0, _createEmptyEditorState.default)(schema, defaultSchema, plugins, defaultPlugins);
+  if (error) {
+    // [FS] IRAD-1455 2021-06-16
+    // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
+    return (0, _createEmptyEditorState.default)(schema, defaultSchema, effectivePlugins);
   } // [FS] IRAD-1067 2020-09-19
   // Handle gracefully when error thrown on invalid json
 

package/dist/convertFromJSON.js.flow

@@ -9,54 +9,32 @@ export default function convertFromJSON(
   json: Object | string,
   schema: ?Schema,
   defaultSchema: Schema,
-  plugins: ?Array<Plugin>,
-  defaultPlugins: Array<Plugin>
+  effectivePlugins: Array<Plugin>
 ): EditorState {
-  let editorSchema = schema || defaultSchema;
+  const editorSchema = schema || defaultSchema;
+  let error = false;
 
-  // [FS][IRAD-???? 2020-08-17]
-  // Loads plugins and its corresponding schema in editor
-  const effectivePlugins = defaultPlugins;
-
-  if (plugins) {
-    for (const p of plugins) {
-      if (!effectivePlugins.includes(p)) {
-        effectivePlugins.push(p);
-        if (p.getEffectiveSchema) {
-          editorSchema = p.getEffectiveSchema(editorSchema);
-        }
-
-        if (p.initKeyCommands) {
-          effectivePlugins.push(p.initKeyCommands());
-        }
-      }
-    }
-  }
   if (typeof json === 'string') {
     try {
       json = JSON.parse(json);
     } catch (ex) {
       console.error('convertFromJSON:', ex);
-      // [FS] IRAD-1455 2021-06-16
-      // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
-      return createEmptyEditorState(
-        schema,
-        defaultSchema,
-        plugins,
-        defaultPlugins
-      );
+      error = true;
     }
   }
 
   if (!json || typeof json !== 'object') {
     console.error('convertFromJSON: invalid object', json);
+    error = true;
+  }
+
+  if(error) {
     // [FS] IRAD-1455 2021-06-16
     // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
     return createEmptyEditorState(
       schema,
       defaultSchema,
-      plugins,
-      defaultPlugins
+      effectivePlugins
     );
   }
 

package/dist/createEmptyEditorState.js

@@ -10,8 +10,6 @@ var _prosemirrorModel = require("prosemirror-model");
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _buildEditorPlugins = _interopRequireDefault(require("./buildEditorPlugins"));
-
 var _convertFromJSON = _interopRequireDefault(require("./convertFromJSON"));
 
 var _EditorSchema = _interopRequireDefault(require("./EditorSchema"));
@@ -27,8 +25,7 @@ const EMPTY_DOC_JSON = {
 };
 exports.EMPTY_DOC_JSON = EMPTY_DOC_JSON;
 
-function createEmptyEditorState(schema, defaultSchema, plugins, defaultPlugins) {
-  const newSchema = schema || (defaultSchema ? defaultSchema : _EditorSchema.default); // TODO: Check if schema support doc and paragraph nodes.
-
-  return (0, _convertFromJSON.default)(EMPTY_DOC_JSON, schema, defaultSchema ? defaultSchema : _EditorSchema.default, plugins, defaultPlugins ? defaultPlugins : new _buildEditorPlugins.default(newSchema).get());
+function createEmptyEditorState(schema, defaultSchema, plugins) {
+  // TODO: Check if schema support doc and paragraph nodes.
+  return (0, _convertFromJSON.default)(EMPTY_DOC_JSON, schema, defaultSchema ? defaultSchema : _EditorSchema.default, plugins);
 }

package/dist/createEmptyEditorState.js.flow

@@ -3,7 +3,6 @@
 import { Schema } from 'prosemirror-model';
 import { EditorState } from 'prosemirror-state';
 import { Plugin } from 'prosemirror-state';
-import DefaultEditorPlugins from './buildEditorPlugins';
 
 import convertFromJSON from './convertFromJSON';
 import EditorSchema from './EditorSchema';
@@ -12,24 +11,21 @@ export const EMPTY_DOC_JSON = {
   type: 'doc',
   content: [
     {
-      type: 'paragraph'
-    },// [FS] IRAD-1710 2022-03-04 - No text content needed
+      type: 'paragraph',
+    }, // [FS] IRAD-1710 2022-03-04 - No text content needed
   ],
 };
 
 export default function createEmptyEditorState(
   schema: ?Schema,
   defaultSchema: ?Schema,
-  plugins: ?Array<Plugin>,
-  defaultPlugins: ?Array<Plugin>
+  plugins: Array<Plugin>
 ): EditorState {
-  const newSchema = schema || (defaultSchema ? defaultSchema : EditorSchema);
   // TODO: Check if schema support doc and paragraph nodes.
   return convertFromJSON(
     EMPTY_DOC_JSON,
     schema,
     defaultSchema ? defaultSchema : EditorSchema,
-    plugins,
-    defaultPlugins ? defaultPlugins : new DefaultEditorPlugins(newSchema).get()
+    plugins
   );
 }

package/dist/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "DELETE", {
     return _http.DELETE;
   }
 });
+Object.defineProperty(exports, "DataType", {
+  enumerable: true,
+  get: function () {
+    return _Licit.DataType;
+  }
+});
 Object.defineProperty(exports, "EditorRuntime", {
   enumerable: true,
   get: function () {
@@ -70,10 +76,14 @@ var _isEditorStateEmpty = _interopRequireDefault(require("./isEditorStateEmpty")
 
 var _uuid = _interopRequireDefault(require("./ui/uuid"));
 
-var _Licit = _interopRequireDefault(require("./client/Licit.js"));
+var _Licit = _interopRequireWildcard(require("./client/Licit.js"));
 
 var _Types = require("./Types");
 
 var _http = require("./client/http");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/index.js.flow

@@ -5,6 +5,6 @@ export { default as isEditorStateEmpty } from './isEditorStateEmpty';
 export { default as uuid } from './ui/uuid';
 // [FS] IRAD-978 2020-06-05
 // Export Licit as a component
-export { default as Licit } from './client/Licit.js';
+export { default as Licit, DataType } from './client/Licit.js';
 export { ImageLike, EditorRuntime } from './Types';
 export { GET, POST, DELETE, PATCH } from './client/http';

package/dist/patchStyleElements.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.ATTRIBUTE_CSS_BEFORE_CONTENT = void 0;
 exports.default = patchStyleElements;
 
-var _stable = _interopRequireDefault(require("stable"));
-
 var _toCSSColor = _interopRequireDefault(require("./ui/toCSSColor"));
 
 var _licitUiCommands = require("@modusoperandi/licit-ui-commands");
@@ -99,7 +97,7 @@ function patchStyleElements(doc) {
     });
   }); // Sort selector by
 
-  (0, _stable.default)(selectorTextToCSSTexts, sortBySpecificity).reduce(buildElementToCSSTexts.bind(null, doc), new Map()).forEach(applyInlineStyleSheetCSSTexts);
+  selectorTextToCSSTexts.sort(sortBySpecificity).reduce(buildElementToCSSTexts.bind(null, doc), new Map()).forEach(applyInlineStyleSheetCSSTexts);
 }
 
 function buildElementToCSSTexts(doc, elementToCSSTexts, bag) {

package/dist/patchStyleElements.js.flow

@@ -1,6 +1,5 @@
 // @flow
 
-import stable from 'stable';
 import toCSSColor from './ui/toCSSColor';
 import { toCSSLineSpacing } from '@modusoperandi/licit-ui-commands';
 
@@ -94,7 +93,8 @@ export default function patchStyleElements(doc: Document): void {
   });
 
   // Sort selector by
-  stable(selectorTextToCSSTexts, sortBySpecificity)
+  selectorTextToCSSTexts
+    .sort(sortBySpecificity)
     .reduce(buildElementToCSSTexts.bind(null, doc), new Map<any, any>())
     .forEach(applyInlineStyleSheetCSSTexts);
 }

package/dist/ui/czi-link-tooltip.css

@@ -1,4 +1,4 @@
-@import '../../node_modules/@modusoperandi/licit-ui-commands/dist/ui/czi-custom-button.css';
+@import '~@modusoperandi/licit-ui-commands/dist/ui/czi-custom-button.css';
 @import './czi-vars.css';
 
 .czi-link-tooltip {

package/dist/ui/czi-vars.css

@@ -1,2 +1,2 @@
-@import '../../node_modules/@modusoperandi/licit-ui-commands/dist/ui/czi-vars.css';
+@import '~@modusoperandi/licit-ui-commands/dist/ui/czi-vars.css';
 

package/licit/client/index.js

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 
-import Licit from '../../src/client/Licit';
+import Licit, { DataType } from '../../src/client/Licit';
 import CustomLicitRuntime from './CustomLicitRuntime';
 
 function main(): void {
@@ -341,6 +341,7 @@ function main(): void {
     <Licit
       collabServiceURL={'http://localhost:3002'}
       data={docJSON}
+      dataType={DataType.JSON}
       debug={true}
       docID={'0000-0000-0000-0000'}
       embedded={false}

package/licit/server/collab/instance.js

@@ -1,9 +1,9 @@
 // @flow
 
-const {readFileSync, writeFile} = require('fs');
+const { readFileSync, writeFile } = require('fs');
 
 // [FS] IRAD-1040 2020-09-02
-import {Schema} from 'prosemirror-model';
+import { Schema } from 'prosemirror-model';
 
 let _editorSchema: Schema = null;
 
@@ -65,7 +65,7 @@ export class Instance {
     }
     this.sendUpdates();
     scheduleSave();
-    return {version: this.version};
+    return { version: this.version };
   }
 
   sendUpdates() {
@@ -98,7 +98,7 @@ export class Instance {
 
     const steps: any[] = this.steps.slice(startIndex);
     const users = this.userCount;
-    return {steps: steps, users: users};
+    return { steps: steps, users: users };
   }
 
   collectUsers() {
@@ -156,7 +156,8 @@ function scheduleSave() {
 function doSave() {
   saveTimeout = null;
   const out = {};
-  for (const prop in instances) out[prop] = {doc: instances[prop].doc.toJSON()};
+  for (const prop in instances)
+    out[prop] = { doc: instances[prop].doc.toJSON() };
   writeFile(saveFile, JSON.stringify(out), () => {});
 }
 
@@ -205,10 +206,24 @@ function newInstance(id: any, doc: any) {
   return (instances[id] = new Instance(id, doc));
 }
 
+export function updateInstance(id: any, ip: any, doc: any) {
+  let inst = instances[id];
+  if (inst) {
+    if (doc) {
+      inst.doc = _editorSchema.nodeFromJSON(doc);
+    }
+  } else {
+    inst = newInstance(id, !doc ? undefined : _editorSchema.nodeFromJSON(doc));
+  }
+  if (ip) inst.registerUser(ip);
+  inst.lastActive = Date.now();
+  return inst;
+}
+
 export function instanceInfo() {
   const found = [];
   for (const id in instances)
-    found.push({id: id, users: instances[id].userCount});
+    found.push({ id: id, users: instances[id].userCount });
   return found;
 }
 export class CustomError extends Error {

package/licit/server/collab/server.js

@@ -1,7 +1,7 @@
 // @flow
 
-import {Step} from 'prosemirror-transform';
-import {Schema} from 'prosemirror-model';
+import { Step } from 'prosemirror-transform';
+import { Schema } from 'prosemirror-model';
 import Router from './route';
 import EditorSchema from '../../../src/EditorSchema';
 import {
@@ -9,6 +9,7 @@ import {
   instanceInfo,
   setEditorSchema,
   initEditorSchema,
+  updateInstance,
 } from './instance';
 // [FS] IRAD-899 2020-03-13
 // This is for Capcomode document attribute. Shared Step, so that capcomode can be dealt collaboratively.
@@ -41,7 +42,7 @@ function handleCollabRequest(req: any, resp: any) {
       resp.writeHead(200, headers);
       resp.end();
     } else {
-      resp.writeHead(404, {'Content-Type': TXT_PLAIN});
+      resp.writeHead(404, { 'Content-Type': TXT_PLAIN });
       resp.end('Not found');
     }
   }
@@ -92,7 +93,12 @@ function readStreamAsJSON(stream, callback) {
   stream.on('end', () => {
     let result, error;
     try {
-      result = JSON.parse(data);
+      if (typeof data === 'string') {
+        result = JSON.parse(data);
+      }
+      else {
+        result = data;
+      }
     } catch (e) {
       error = e;
     }
@@ -152,6 +158,20 @@ handle('GET', [DOCS], () => {
   return Output.json(instanceInfo());
 });
 
+// Save & Output the current state of a document instance.
+handle('PUT', [DOCS, null], (data, id, req) => {
+  const inst = updateInstance(
+    id,
+    reqIP(req),
+    req.query.dataDefined === 'false' ? null : data
+  );
+  return Output.json({
+    doc_json: inst.doc.toJSON(),
+    users: inst.userCount,
+    version: inst.version,
+  });
+});
+
 // Output the current state of a document instance.
 handle('GET', [DOCS, null], (id, req) => {
   const inst = getInstance(id, reqIP(req));
@@ -275,7 +295,7 @@ handle(
       });
       setEditorSchema(effectiveSchema);
     }
-    return Output.json({result: 'success'});
+    return Output.json({ result: 'success' });
   },
   true
 );

package/licit/server/collab/start.js

@@ -10,4 +10,4 @@ createServer((req, resp) => {
   handleCollabRequest(req, resp);
 }).listen(PORT);
 
-console.log('Licit Collab server listening on ' + PORT);
+console.log('Licit Collab v0.13.17 server listening on ' + PORT);