Implement wrapper code compatibility

mk-pmb · mk-pmb · commit 317aaf009fb4 · 2021-11-09T19:07:48.000+01:00
diff --git a/doc/examples/wrap.js-var.ceson b/doc/examples/wrap.js-var.ceson
@@ -1,4 +1,4 @@
 ﻿var config = {
   "wrapped": true,
-  "style": "js-var",
+  "style": "js var",
 };
diff --git a/parse.js b/parse.js
@@ -30,14 +30,33 @@
   }
 
 
+  function wrapperCodeCompatAtEndOfLine(tx) {
+    return tx.replace(/[\);]+(\n\s*|)$/, '$1');
+  }
+
+
+  function extractLineText(ln, lnIdx) {
+    if (lnIdx === 0) {
+      // Only in first line of input: strip BOM
+      if (ln.slice(0, 1) === '\uFEFF') { ln = ln.slice(1); }
+
+      // Only in first line of input: strip leading wrapper code
+      ln = trim(ln
+        ).replace(/^[A-Za-z].*?[\(=]/, '');
+    }
+    ln = trim(ln);
+    return ln;
+  }
+
+
   function ceson2json(ceson) {
     if (!ceson) { return false; }
     if (typeof ceson !== 'string') { return false; }
     var json = [], inBlockComment = false, strConcat = false, afterCmt;
-    ceson = ceson.split(/\n\s*/);
-    if (ceson[0].slice(0, 1) === '\uFEFF') { ceson[0] = ceson[0].slice(1); }
+
     function parseLine(ln, lnIdx) {
-      ln = trim(ln);
+      ln = extractLineText(ln, lnIdx);
+
       //debugp(lnIdx + 1, { trimmed: ln });
       if (!ln) { return lnIdx; }
       if (inBlockComment) {
@@ -85,8 +104,10 @@
       //debugp('    ', { ln: ln }, (strConcat ? '+CONCAT+' : '-'));
       json.push(ln);
     }
-    ceson.forEach(parseLine);
-    return json.join('\n');
+    ceson.split(/\n/).forEach(parseLine);
+    json = json.join('\n');
+    json = wrapperCodeCompatAtEndOfLine(json);
+    return json;
   }
 
 
diff --git a/test/all.mjs b/test/all.mjs
@@ -1,3 +1,5 @@
 // -*- coding: utf-8, tab-width: 2 -*-
 
+import './concats.mjs';
 import './felidae.mjs';
+import './wraps.mjs';
diff --git a/test/concats.mjs b/test/concats.mjs
@@ -0,0 +1,9 @@
+// -*- coding: utf-8, tab-width: 2 -*-
+
+import tu from './lib/test_util.mjs';
+
+tu.verifyExampleFile('str-concat.key', {
+  'concatenated object keys': 'not CESON, but parsers may support it anyway',
+});
+
+tu.verifyExampleFile('str-concat.value', { a: 'concat', b: 'concat' });
diff --git a/test/wraps.mjs b/test/wraps.mjs
@@ -0,0 +1,10 @@
+// -*- coding: utf-8, tab-width: 2 -*-
+
+import tu from './lib/test_util.mjs';
+
+function w(n) { return { wrapped: true, style: n }; }
+
+tu.verifyExampleFile('wrap.amd', w('amd'));
+tu.verifyExampleFile('wrap.commonjs', w('commonjs'));
+tu.verifyExampleFile('wrap.jsonp', w('jsonp'));
+tu.verifyExampleFile('wrap.js-var', w('js var'));
