ep_data_tables 0.0.95 → 0.0.97

package/collectContentPre.js

@@ -4,88 +4,62 @@
 const settings = require('ep_etherpad-lite/node/utils/Settings');
 if (!settings.toolbar) settings.toolbar = {};
 
-// Using console.log for server-side logging, similar to other Etherpad server-side files.
 const log = (...m) => console.log('[ep_data_tables:collectContentPre_SERVER]', ...m);
 
-// Base64 decoding function (copied from tableImport.js / client_hooks.js for server-side use)
-// Ensure it can handle the URL-safe variant if that's what tableImport.js produces.
+// Base64 decoding function for URL-safe variant
 const dec = (s) => {
-    const str = s.replace(/-/g, '+').replace(/_/g, '/');
-    try {
-        // Assuming Buffer is available in the Node.js environment where this server hook runs
-        return Buffer.from(str, 'base64').toString('utf8');
-    } catch (e) {
-        log('ERROR decoding base64 string in server-side collectContentPre:', s, e);
-        return null;
-    }
+  const str = s.replace(/-/g, '+').replace(/_/g, '/');
+  try {
+    return Buffer.from(str, 'base64').toString('utf8');
+  } catch (e) {
+    log('ERROR decoding base64:', s, e);
+    return null;
+  }
 };
 
+/**
+ * Server-side collectContentPre hook for import/export operations.
+ * Processes tbljson-* CSS classes to reapply table metadata attributes.
+ * 
+ * Context parameters provided by Etherpad:
+ * - cc: Content collector object with doAttrib() method
+ * - state: Current collection state
+ * - tname: Tag name (may be undefined)
+ * - styl: Style attribute
+ * - cls: Class attribute string
+ * 
+ * Note: context.node is NOT provided by Etherpad's collectContentPre hook.
+ */
 exports.collectContentPre = (hookName, context) => {
-
-  const node = context.node;
-  const tname = node?.tagName?.toLowerCase(); // Keep for logging, but don't rely on it for main logic
   const cls = context.cls;
   const state = context.state;
 
-  // Detailed logging for every node encountered by this hook
-  let nodeRepresentation = '';
-  if (node) {
-    if (node.nodeType === 1 /* Node.ELEMENT_NODE */) {
-      nodeRepresentation = node.outerHTML ? node.outerHTML.substring(0, 300) : `ElementType: ${tname}`;
-    } else if (node.nodeType === 3 /* Node.TEXT_NODE */) {
-      nodeRepresentation = `TextNode: "${(node.nodeValue || '').substring(0, 100)}"`;
-    }
-  }
-  log(`PROCESSING Node: ${nodeRepresentation}, TagName: ${tname}, Classes: "${cls || ''}", Current state.attribString: "${state.attribString || ''}"`);
-
-  // MODIFIED CONDITION: Rely primarily on context.cls to find our target class,
-  // as context.node and context.tname seem unreliable for our spans.
-  if (!cls) { 
-    // log('No classes, returning.');
-    return;
-  }
+  if (!cls) return;
 
+  // Find tbljson-* class
   const classes = cls.split(' ');
   let encodedJsonMetadata = null;
-  let isTblJsonSpan = false;
 
   for (const c of classes) {
     if (c.startsWith('tbljson-')) {
       encodedJsonMetadata = c.substring(8);
-      isTblJsonSpan = true;
       break;
     }
   }
 
-  if (isTblJsonSpan && encodedJsonMetadata) {
-    // Added a check for tname === 'span' here for sanity, though cls is primary trigger
-    log(`FOUND potential tbljson span based on class. Actual tname: ${tname}. Encoded: ${encodedJsonMetadata.substring(0, 20)}...`);
-    let decodedJsonString;
-    try {
-      decodedJsonString = dec(encodedJsonMetadata);
-      if (!decodedJsonString) {
-        throw new Error('Decoded JSON string is null or empty.');
-      }
-      log(`DECODED metadata: ${decodedJsonString.substring(0, 50)}...`);
-    } catch (e) {
-      log('ERROR decoding/validating metadata from class:', encodedJsonMetadata, e);
+  if (!encodedJsonMetadata) return;
+
+  // Decode and apply the table metadata attribute
+  try {
+    const decodedJsonString = dec(encodedJsonMetadata);
+    if (!decodedJsonString) {
+      log('ERROR: Decoded JSON string is null or empty');
       return;
     }
 
     const attribToApply = `tbljson::${decodedJsonString}`;
-    log(`PREPARED attribToApply: "${attribToApply.substring(0, 70)}..."`);
-
-    log('BEFORE cc.doAttrib - state.attribs:', JSON.stringify(state.attribs));
-    log('BEFORE cc.doAttrib - state.attribString:', state.attribString);
-    try {
-      context.cc.doAttrib(state, attribToApply);
-      log('AFTER cc.doAttrib - state.attribs:', JSON.stringify(state.attribs)); 
-      log('AFTER cc.doAttrib - state.attribString:', state.attribString);
-      log('SUCCESSFULLY CALLED cc.doAttrib.');
-    } catch (e) {
-      log('ERROR calling cc.doAttrib:', e);
-    }
-  } else if (cls.includes('tbljson-')) {
-      log(`WARN: A class string "${cls}" includes 'tbljson-' but didn't parse as expected, or encodedJsonMetadata was null.`);
+    context.cc.doAttrib(state, attribToApply);
+  } catch (e) {
+    log('ERROR applying tbljson attribute:', e);
   }
-}; 
+};

package/ep.json

@@ -6,19 +6,17 @@
 		  "eejsBlock_styles"           : "ep_data_tables/static/js/index:eejsBlock_styles",
 		  "eejsBlock_scripts"          : "ep_data_tables/static/js/index:eejsBlock_scripts",
 		  "eejsBlock_editbarMenuLeft"  : "ep_data_tables/static/js/index:eejsBlock_editbarMenuLeft",
-      "collectContentPre"          : "ep_data_tables/collectContentPre:collectContentPre" 
+      	  "collectContentPre"          : "ep_data_tables/collectContentPre:collectContentPre" 
 		},
   		"client_hooks": {
-		  "collectContentPre"      : "ep_data_tables/static/js/client_hooks:collectContentPre",
+		  "collectContentPre"      		: "ep_data_tables/static/js/client_hooks:collectContentPre",
+		  "collectContentLineText"      : "ep_data_tables/static/js/client_hooks:collectContentLineText",
 		  "aceKeyEvent"                 : "ep_data_tables/static/js/client_hooks:aceKeyEvent",
-		  "aceStartLineAndCharForPoint" : "ep_data_tables/static/js/client_hooks:aceStartLineAndCharForPoint",
-		  "aceEndLineAndCharForPoint"   : "ep_data_tables/static/js/client_hooks:aceEndLineAndCharForPoint",
 		  "aceAttribsToClasses"         : "ep_data_tables/static/js/client_hooks:aceAttribsToClasses",
-		  "acePostWriteDomLineHTML" : "ep_data_tables/static/js/client_hooks:acePostWriteDomLineHTML",
+		  "acePostWriteDomLineHTML" 	: "ep_data_tables/static/js/client_hooks:acePostWriteDomLineHTML",
 		  "aceInitialized"              : "ep_data_tables/static/js/client_hooks:aceInitialized",
-		  "aceSetAuthorStyle"           : "ep_data_tables/static/js/client_hooks:aceSetAuthorStyle",
 		  "aceEditorCSS"                : "ep_data_tables/static/js/client_hooks:aceEditorCSS",
-  		  "postAceInit" : 	"ep_data_tables/static/js/initialisation:postAceInit"
+  		  "postAceInit" 				: 	"ep_data_tables/static/js/initialisation:postAceInit"
 		}
 	  }
 	]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ep_data_tables",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "description": "BETA - etherpad tables plugin, compatible with other character/line based styling and other features",
   "author": {
     "name": "DCastelone",