senselogic-gson 0.1.3 → 0.1.5

package/README.md

@@ -53,12 +53,36 @@ Granular Structured Object Notation.
                     38
             }
         ],
-    "escaped":
+    "personByIdMap":
+        {
+            "mike":
+                {
+                    "name":
+                        "Mike",
+                    "age":
+                        35
+                },
+            "nina":
+                {
+                    "name":
+                        "Nina",
+                    "age":
+                        32
+                },
+            "pete":
+                {
+                    "name":
+                        "Pete",
+                    "age":
+                        38
+                }
+        },
+    "escaped":
         "\u2034",
     "uuid":
         ‴‼#jack‴,
     "tuid":
-        ‴‼%jack‴,
+        ‴‼%jack‴,
     "included":
         ‴‼@included.gson‴
 }

package/building.js

@@ -19,25 +19,27 @@ export function getIndentationText(
 // ~~
 
 function getEscapedLine(
-    text
+    line,
+    primedTextIsEscaped = true
     )
 {
-    return (
-        text
-            .replaceAll( '\\', '\\\\' )
-            .replaceAll( '\b', '\\b' )
-            .replaceAll( '\f', '\\f' )
-            .replaceAll( '\r', '' )
-            .replaceAll( '\t', '\\t' )
-            .replaceAll( /[-\u001F]/g, character => `\\u${ character.charCodeAt( 0 ).toString( 16 ).padStart( 4, '0' ) }` )
-            .replaceAll( '‴', '\\u2034' )
-        );
+    let escapedLine = JSON.stringify( line ).slice( 1, -1 ).replaceAll( '‴', '\\u2034' );
+
+    if ( primedTextIsEscaped )
+    {
+        return escapedLine.replaceAll( '‼', '\\u203C' ).replaceAll( '‗', '\\u2017' );
+    }
+    else
+    {
+        return escapedLine;
+    }
 }
 
 // ~~
 
 function getMultilineString(
     value,
+    primedTextIsEscaped = true,
     indentationText
     )
 {
@@ -45,8 +47,8 @@ function getMultilineString(
     let lineCount = lineArray.length;
     let multilineString = indentationText + '‴';
 
-    for ( let lineIndex = 0; 
-          lineIndex < lineCount; 
+    for ( let lineIndex = 0;
+          lineIndex < lineCount;
           ++lineIndex )
     {
         let line = lineArray[ lineIndex ];
@@ -84,7 +86,7 @@ function getMultilineString(
             lineSuffix = '';
         }
 
-        let multilineStringLine = linePrefix + getEscapedLine( lineContent ) + lineSuffix;
+        let multilineStringLine = linePrefix + getEscapedLine( lineContent, primedTextIsEscaped ) + lineSuffix;
 
         if ( lineIndex === lineCount - 1 )
         {
@@ -108,28 +110,33 @@ function getMultilineString(
 
 function buildGsonString(
     value,
+    primedTextIsGenerated = true,
+    primedTextIsEscaped = true,
     context,
     level,
     lineSuffix = ''
     )
 {
-    let indent = getIndentationText( level * context.levelSpaceCount );
+    let indentationText  = getIndentationText( level * context.levelSpaceCount );
 
-    if ( value.startsWith( '‼' )
-         || value.includes( '\n' ) )
+    if ( primedTextIsGenerated
+         && ( value.startsWith( '‼' )
+              || value.includes( '\n' ) ) )
     {
         if ( value.startsWith( '‼' ) )
         {
-            let text = '‴' + getEscapedLine( value ) + '‴' + lineSuffix;
-            context.lineArray.push( indent + text );
+            let text = '‴' + getEscapedLine( value, primedTextIsEscaped ) + '‴' + lineSuffix;
+            context.lineArray.push( indentationText  + text );
         }
         else
         {
-            let multilineString = getMultilineString( value, indent );
+            let multilineString = getMultilineString( value, primedTextIsEscaped, indentationText );
             let lineArray = multilineString.split( '\n' );
             let lastIndex = lineArray.length - 1;
 
-            for ( let lineIndex = 0; lineIndex < lineArray.length; ++lineIndex )
+            for ( let lineIndex = 0;
+                  lineIndex < lineArray.length;
+                  ++lineIndex )
             {
                 let line = lineArray[ lineIndex ];
 
@@ -145,8 +152,9 @@ function buildGsonString(
     }
     else
     {
-        let text = JSON.stringify( value ) + lineSuffix;
-        context.lineArray.push( indent + text );
+        let text = '"' + getEscapedLine( value, primedTextIsEscaped ) + '"' + lineSuffix;
+
+        context.lineArray.push( indentationText  + text );
     }
 }
 
@@ -154,29 +162,35 @@ function buildGsonString(
 
 function buildGsonValue(
     value,
+    primedTextIsGenerated = true,
+    primedTextIsEscaped = true,
     context,
     level
     )
 {
-    let indent = getIndentationText( level * context.levelSpaceCount );
+    let indentationText  = getIndentationText( level * context.levelSpaceCount );
 
     if ( typeof value === 'string' )
     {
-        buildGsonString( value, context, level, '' );
+        buildGsonString( value, primedTextIsGenerated, primedTextIsEscaped, context, level, '' );
     }
     else if ( Array.isArray( value ) )
     {
-        context.lineArray.push( indent + '[' );
+        context.lineArray.push( indentationText  + '[' );
 
         let elementCount = value.length;
 
-        for ( let elementIndex = 0; elementIndex < elementCount; ++elementIndex )
+        for ( let elementIndex = 0;
+              elementIndex < elementCount;
+              ++elementIndex )
         {
             let element = value[ elementIndex ];
             let lineSuffix = ( elementIndex < elementCount - 1 ) ? ',' : '';
 
             buildGsonValue(
                 element,
+                primedTextIsGenerated,
+                primedTextIsEscaped,
                 context,
                 level + 1
                 );
@@ -188,27 +202,31 @@ function buildGsonValue(
             }
         }
 
-        context.lineArray.push( indent + ']' );
+        context.lineArray.push( indentationText  + ']' );
     }
     else if ( value !== null
               && typeof value === 'object' )
     {
-        context.lineArray.push( indent + '{' );
+        context.lineArray.push( indentationText  + '{' );
 
-        let keys = Object.keys( value );
-        let keyCount = keys.length;
+        let keyArray = Object.keys( value );
+        let keyCount = keyArray.length;
 
-        for ( let keyIndex = 0; keyIndex < keyCount; ++keyIndex )
+        for ( let keyIndex = 0;
+              keyIndex < keyCount;
+              ++keyIndex )
         {
-            let key = keys[ keyIndex ];
-            let keyIndent = getIndentationText( ( level + 1 ) * context.levelSpaceCount );
+            let key = keyArray[ keyIndex ];
+            let keyIndentationText = getIndentationText( ( level + 1 ) * context.levelSpaceCount );
             let valueIndentLevel = level + 2;
             let lineSuffix = ( keyIndex < keyCount - 1 ) ? ',' : '';
 
-            context.lineArray.push( keyIndent + JSON.stringify( key ) + ':' );
+            context.lineArray.push( keyIndentationText + JSON.stringify( key ) + ':' );
 
             buildGsonValue(
                 value[ key ],
+                primedTextIsGenerated,
+                primedTextIsEscaped,
                 context,
                 valueIndentLevel
                 );
@@ -220,11 +238,11 @@ function buildGsonValue(
             }
         }
 
-        context.lineArray.push( indent + '}' );
+        context.lineArray.push( indentationText  + '}' );
     }
     else
     {
-        context.lineArray.push( indent + JSON.stringify( value ) );
+        context.lineArray.push( indentationText  + JSON.stringify( value ) );
     }
 }
 
@@ -232,9 +250,9 @@ function buildGsonValue(
 
 export function buildGsonText(
     value,
-    {
-        indentationSpaceCount = 4
-    } = {}
+    primedTextIsGenerated = true,
+    primedTextIsEscaped = true,
+    indentationSpaceCount = 4
     )
 {
     let context =
@@ -245,6 +263,8 @@ export function buildGsonText(
 
     buildGsonValue(
         value,
+        primedTextIsGenerated,
+        primedTextIsEscaped,
         context,
         0
         );

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "senselogic-gson",
     "description": "Granular Structured Object Notation.",
-    "version": "0.1.3",
+    "version": "0.1.5",
     "author": "Eric Pelzer <ecstatic.coder@gmail.com>",
     "license": "LGPL-3.0-only",
     "repository": {

package/processing.js

@@ -2,11 +2,6 @@
 
 import md5 from 'md5';
 
-// -- CONSTANTS
-
-const
-    isBrowser = ( typeof window !== 'undefined' && typeof window.document !== 'undefined' );
-
 // -- FUNCTIONS
 
 export function getTextHash(
@@ -57,24 +52,18 @@ export function getTextTuid(
     else
     {
         let hash = md5( text );
-        let tuid = '';
-
-        if ( isBrowser )
-        {
-            let buffer = '';
 
-            for ( let byteIndex = 0; byteIndex < hash.length; byteIndex += 2 )
-            {
-                buffer += String.fromCharCode( parseInt( hash.slice( byteIndex, byteIndex + 2 ), 16 ) );
-            }
+        let byteArray = new Array( 16 );
 
-            tuid = btoa( buffer );
-        }
-        else
+        for ( let characterIndex = 0;
+              characterIndex < 32;
+              characterIndex += 2 )
         {
-            tuid = Buffer.from( hash, 'hex' ).toString( 'base64' );
+            byteArray[ characterIndex >> 1 ] = String.fromCharCode( parseInt( hash.slice( characterIndex, characterIndex + 2 ), 16 ) );
         }
 
+        let tuid = btoa( byteArray.join( '' ) );
+
         return (
             tuid
                 .replaceAll( '+', '-' )

package/test.js

@@ -19,9 +19,13 @@ jsonText = readGsonFileText( '../../../DATA/test.gson', false );
 console.log( jsonText );
 writeFileText( 'OUT/unprocessed_test.json', jsonText );
 
+gsonText = buildGsonText( jsonValue, false );
+console.log( gsonText );
+writeFileText( 'OUT/unprocessed_test.gson', gsonText, 4 );
+
 jsonValue = readGsonFileValue( '../../../DATA/test.gson', false );
 console.log( JSON.stringify( jsonValue ) );
 
-gsonText = buildGsonText( jsonValue );
+gsonText = buildGsonText( jsonValue, true, false );
 console.log( gsonText );
 writeFileText( 'OUT/unprocessed_test.gson', gsonText, 4 );