modl-converter - npm Package Compare versions

Comparing version 0.0.15 to 0.0.16

dist/bundle.js

@@ -1,1 +0,1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.MODLConverter=t():e.MODLConverter=t()}(self,(function(){return(()=>{var e={43:function(e,t,o){var n,r;!function(u,i){"use strict";void 0===(r="function"==typeof(n=function(){var e=function(){},t="undefined",o=typeof window!==t&&typeof window.navigator!==t&&/Trident\/|MSIE /.test(window.navigator.userAgent),n=["trace","debug","info","warn","error"];function r(e,t){var o=e[t];if("function"==typeof o.bind)return o.bind(e);try{return Function.prototype.bind.call(o,e)}catch(t){return function(){return Function.prototype.apply.apply(o,[e,arguments])}}}function u(){console.log&&(console.log.apply?console.log.apply(console,arguments):Function.prototype.apply.apply(console.log,[console,arguments])),console.trace&&console.trace()}function i(n){return"debug"===n&&(n="log"),typeof console!==t&&("trace"===n&&o?u:void 0!==console[n]?r(console,n):void 0!==console.log?r(console,"log"):e)}function l(t,o){for(var r=0;r<n.length;r++){var u=n[r];this[u]=r<t?e:this.methodFactory(u,t,o)}this.log=this.debug}function c(e,o,n){return function(){typeof console!==t&&(l.call(this,o,n),this[e].apply(this,arguments))}}function s(e,t,o){return i(e)||c.apply(this,arguments)}function a(e,o,r){var u,i=this,c="loglevel";function a(){var e;if(typeof window!==t&&c){try{e=window.localStorage[c]}catch(e){}if(typeof e===t)try{var o=window.document.cookie,n=o.indexOf(encodeURIComponent(c)+"=");-1!==n&&(e=/^([^;]+)/.exec(o.slice(n))[1])}catch(e){}return void 0===i.levels[e]&&(e=void 0),e}}"string"==typeof e?c+=":"+e:"symbol"==typeof e&&(c=void 0),i.name=e,i.levels={TRACE:0,DEBUG:1,INFO:2,WARN:3,ERROR:4,SILENT:5},i.methodFactory=r||s,i.getLevel=function(){return u},i.setLevel=function(o,r){if("string"==typeof o&&void 0!==i.levels[o.toUpperCase()]&&(o=i.levels[o.toUpperCase()]),!("number"==typeof o&&o>=0&&o<=i.levels.SILENT))throw"log.setLevel() called with invalid level: "+o;if(u=o,!1!==r&&function(e){var o=(n[e]||"silent").toUpperCase();if(typeof window!==t&&c){try{return void(window.localStorage[c]=o)}catch(e){}try{window.document.cookie=encodeURIComponent(c)+"="+o+";"}catch(e){}}}(o),l.call(i,o,e),typeof console===t&&o<i.levels.SILENT)return"No console available for logging"},i.setDefaultLevel=function(e){a()||i.setLevel(e,!1)},i.enableAll=function(e){i.setLevel(i.levels.TRACE,e)},i.disableAll=function(e){i.setLevel(i.levels.SILENT,e)};var f=a();null==f&&(f=null==o?"WARN":o),i.setLevel(f,!1)}var f=new a,p={};f.getLogger=function(e){if("symbol"!=typeof e&&"string"!=typeof e||""===e)throw new TypeError("You must supply a name when creating a logger.");var t=p[e];return t||(t=p[e]=new a(e,f.getLevel(),f.methodFactory)),t};var d=typeof window!==t?window.log:void 0;return f.noConflict=function(){return typeof window!==t&&window.log===f&&(window.log=d),f},f.getLoggers=function(){return p},f.default=f,f})?n.call(t,o,t,e):n)||(e.exports=r)}()},389:function(e,t,o){"use strict";var n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.createJsonToModl=void 0;var r=n(o(43)),u=o(494),i=o(902);t.createJsonToModl=function(){return new l};var l=function(){function e(){}return e.prototype.objectToModl=function(e){var t=Array.isArray(e)?s("",e):function(e){return null===e?"null":"object"!=typeof e||Array.isArray(e)?p(e):function(e){return"object"!=typeof e?d(e):Array.isArray(e)?a(e):Object.keys(e).map((function(t){return s(t,e[t])})).join(";")}(e)}(e);return r.default.debug("Result    : ",t),t},e.prototype.stringToModl=function(e){r.default.debug("Converting: "+e);var t=JSON.parse(e);return this.objectToModl(t)},e}(),c=u.createUnicodeEscaper(),s=function(e,t){var o=c.escape(e);return i.isNonStringPrimitive(o)&&(o='"'+o+'"'),null===t?o+"=null":Array.isArray(t)?o+a(t):"object"==typeof t?1===Object.keys(t).length?o+"="+f(t):""+o+f(t):function(e,t){var o=d(t);return null!==o?e+"="+o:null}(o,t)||o+"="+p(t)};function a(e){return"["+e.map(p).join(";")+"]"}function f(e){if("object"!=typeof e)return d(e);if(Array.isArray(e))return a(e);if(null===e)return null;var t=Object.keys(e);return t.length>1?"("+t.map((function(t){return s(t,e[t])})).join(";")+")":0===t.length?"()":t.map((function(t){return s(t,e[t])})).join("")}function p(e){return e&&Array.isArray(e)?a(e):e&&"object"==typeof e?f(e):d(e)}var d=function(e){return null===e?"null":"string"==typeof e?"null"===e?"`null`":i.escapeAndQuote(e):"boolean"==typeof e?e?"true":"false":"number"==typeof e?Number.isInteger(e)?""+e:""+e.toExponential().replace("e+","E"):null}},494:(e,t)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.createUnicodeEscaper=void 0,t.createUnicodeEscaper=function(){return new o};var o=function(){function e(){}return e.prototype.escape=function(e){for(var t="",o=0;o<e.length;o++){var n=e.codePointAt(o);t+=(r=n)?r>=32&&r<=127?String.fromCodePoint(r):r>=1048576&&r<=1114111?"~u"+r.toString(16):8===r?"\\b":12===r?"\\f":10===r?"\\n":13===r?"\\r":9===r?"\\t":r>=65536&&r<=1048575||r>=4096&&r<=65535?"~u"+r.toString(16):r>=256&&r<=4095?"~u0"+r.toString(16):r>=16&&r<=255?"~u00"+r.toString(16):"~u000"+r.toString(16):"",n&&n>65535&&(o+=1)}var r;return t},e}()},902:(e,t,o)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.isNonStringPrimitive=t.escapeAndQuote=t.replaceNbspWithSp=t.doubleQuotesToGravesIfPossible=t.doubleQuoteIfNecessary=t.graveQuoteIfNecessary=t.escapeDoubleQuotes=t.isNumeric=t.shouldBeGraveQuoted=t.escapeGraves=void 0;var n=o(494);t.escapeGraves=function(e){return null!==e?e.replace(/`/g,"~`"):e},t.shouldBeGraveQuoted=new RegExp(".*[()\\[\\];{}=].*"),t.isNumeric=new RegExp("^[-]?[0-9]*\\.?[0-9]+(?:[Ee][+-]?[0-9]+)?$"),t.escapeDoubleQuotes=function(e){for(var t=e.indexOf('"',1),o=e;t>0&&t<e.length-1;)t=(o=o.substring(0,t)+"~u0022"+o.substring(t+1)).indexOf('"',1);return o},t.graveQuoteIfNecessary=function(e){return null!==e&&(t.shouldBeGraveQuoted.test(e)||""===e||t.isNumeric.test(e)&&"00"!==e&&"01"!==e&&"000"!==e||"true"===e||"false"===e||"null"===e)?"`"+e+"`":e},t.doubleQuoteIfNecessary=function(e){return null!==e&&e.includes("~`")?'"'+e+'"':e},t.doubleQuotesToGravesIfPossible=function(e){return null!==e&&!e.includes("~`")&&e.startsWith('"')&&e.endsWith('"')?"`"+e.substring(1,e.length-1)+"`":e},t.replaceNbspWithSp=function(e){return e.replace(/\u00a0/g," ")};var r=n.createUnicodeEscaper();t.escapeAndQuote=function(e){return null===e?e:t.doubleQuotesToGravesIfPossible(t.doubleQuoteIfNecessary(t.graveQuoteIfNecessary(t.escapeGraves(r.escape(t.replaceNbspWithSp(t.escapeDoubleQuotes(e)))))))},t.isNonStringPrimitive=function(e){return u.includes(e)||t.isNumeric.test(e)};var u=["true","false","null"]}},t={};function o(n){var r=t[n];if(void 0!==r)return r.exports;var u=t[n]={exports:{}};return e[n].call(u.exports,u,u.exports,o),u.exports}var n={};return(()=>{"use strict";var e=n;Object.defineProperty(e,"__esModule",{value:!0}),e.jsonToModl=void 0;var t=o(389);e.jsonToModl=t.createJsonToModl()})(),n})()}));
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.MODLConverter=t():e.MODLConverter=t()}(self,(function(){return(()=>{var e={43:function(e,t,n){var o,r;!function(u,i){"use strict";o=function(){var e=function(){},t="undefined",n=typeof window!==t&&typeof window.navigator!==t&&/Trident\/|MSIE /.test(window.navigator.userAgent),o=["trace","debug","info","warn","error"];function r(e,t){var n=e[t];if("function"==typeof n.bind)return n.bind(e);try{return Function.prototype.bind.call(n,e)}catch(t){return function(){return Function.prototype.apply.apply(n,[e,arguments])}}}function u(){console.log&&(console.log.apply?console.log.apply(console,arguments):Function.prototype.apply.apply(console.log,[console,arguments])),console.trace&&console.trace()}function i(o){return"debug"===o&&(o="log"),typeof console!==t&&("trace"===o&&n?u:void 0!==console[o]?r(console,o):void 0!==console.log?r(console,"log"):e)}function l(t,n){for(var r=0;r<o.length;r++){var u=o[r];this[u]=r<t?e:this.methodFactory(u,t,n)}this.log=this.debug}function c(e,n,o){return function(){typeof console!==t&&(l.call(this,n,o),this[e].apply(this,arguments))}}function s(e,t,n){return i(e)||c.apply(this,arguments)}function a(e,n,r){var u,i=this,c="loglevel";function a(){var e;if(typeof window!==t&&c){try{e=window.localStorage[c]}catch(e){}if(typeof e===t)try{var n=window.document.cookie,o=n.indexOf(encodeURIComponent(c)+"=");-1!==o&&(e=/^([^;]+)/.exec(n.slice(o))[1])}catch(e){}return void 0===i.levels[e]&&(e=void 0),e}}"string"==typeof e?c+=":"+e:"symbol"==typeof e&&(c=void 0),i.name=e,i.levels={TRACE:0,DEBUG:1,INFO:2,WARN:3,ERROR:4,SILENT:5},i.methodFactory=r||s,i.getLevel=function(){return u},i.setLevel=function(n,r){if("string"==typeof n&&void 0!==i.levels[n.toUpperCase()]&&(n=i.levels[n.toUpperCase()]),!("number"==typeof n&&n>=0&&n<=i.levels.SILENT))throw"log.setLevel() called with invalid level: "+n;if(u=n,!1!==r&&function(e){var n=(o[e]||"silent").toUpperCase();if(typeof window!==t&&c){try{return void(window.localStorage[c]=n)}catch(e){}try{window.document.cookie=encodeURIComponent(c)+"="+n+";"}catch(e){}}}(n),l.call(i,n,e),typeof console===t&&n<i.levels.SILENT)return"No console available for logging"},i.setDefaultLevel=function(e){a()||i.setLevel(e,!1)},i.enableAll=function(e){i.setLevel(i.levels.TRACE,e)},i.disableAll=function(e){i.setLevel(i.levels.SILENT,e)};var f=a();null==f&&(f=null==n?"WARN":n),i.setLevel(f,!1)}var f=new a,p={};f.getLogger=function(e){if("symbol"!=typeof e&&"string"!=typeof e||""===e)throw new TypeError("You must supply a name when creating a logger.");var t=p[e];return t||(t=p[e]=new a(e,f.getLevel(),f.methodFactory)),t};var d=typeof window!==t?window.log:void 0;return f.noConflict=function(){return typeof window!==t&&window.log===f&&(window.log=d),f},f.getLoggers=function(){return p},f.default=f,f},void 0===(r=o.call(t,n,t,e))||(e.exports=r)}()},389:function(e,t,n){"use strict";var o=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:!0}),t.createJsonToModl=void 0;var r=o(n(43)),u=n(494),i=n(902);t.createJsonToModl=function(){return new l};var l=function(){function e(){}return e.prototype.objectToModl=function(e){var t=Array.isArray(e)?s("",e):function(e){return null===e?"null":"object"!=typeof e||Array.isArray(e)?p(e):function(e){return"object"!=typeof e?v(e):Array.isArray(e)?a(e):Object.keys(e).map((function(t){return s(t,e[t])})).join(";")}(e)}(e);return r.default.debug("Result    : ",t),t},e.prototype.stringToModl=function(e){r.default.debug("Converting: "+e);var t=JSON.parse(e);return this.objectToModl(t)},e}(),c=u.createUnicodeEscaper(),s=function(e,t){var n=c.escape(e);if(i.isNonStringPrimitive(n)&&(n='"'+n+'"'),null===t)return n+"=null";if(Array.isArray(t))return n+a(t);if("object"==typeof t)return""+n+f(t);var o=function(e,t){var n=v(t);return null!==n?e+"="+n:null}(n,t);return o||n+"="+p(t)};function a(e){return"["+e.map(d).join(";")+"]"}function f(e){return"object"!=typeof e?v(e):Array.isArray(e)?a(e):null===e?null:"("+Object.keys(e).map((function(t){return s(t,e[t])})).join(";")+")"}function p(e){return e&&Array.isArray(e)?a(e):e&&"object"==typeof e?f(e):v(e)}function d(e){return e&&Array.isArray(e)?a(e):e&&"object"==typeof e?function(e){if("object"!=typeof e)return v(e);if(Array.isArray(e))return a(e);if(null===e)return null;var t=Object.keys(e);return t.length>1?"("+t.map((function(t){return s(t,e[t])})).join(";")+")":0===t.length?"()":t.map((function(t){return s(t,e[t])})).join("")}(e):v(e)}var v=function(e){return null===e?"null":"string"==typeof e?"null"===e?"`null`":i.escapeAndQuote(e):"boolean"==typeof e?e?"true":"false":"number"==typeof e?Number.isInteger(e)?""+e:""+e.toExponential().replace("e+","E"):null}},494:(e,t)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.createUnicodeEscaper=void 0,t.createUnicodeEscaper=function(){return new n};var n=function(){function e(){}return e.prototype.escape=function(e){for(var t="",n=0;n<e.length;n++)t+=(o=e.charCodeAt(n))?o>=32&&o<=127?String.fromCodePoint(o):8===o?"\\b":12===o?"\\f":10===o?"\\n":13===o?"\\r":9===o?"\\t":o>=4096&&o<=65535?"~u"+o.toString(16):o>=256&&o<=4095?"~u0"+o.toString(16):o>=16&&o<=255?"~u00"+o.toString(16):"~u000"+o.toString(16):"";var o;return t},e}()},902:(e,t,n)=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.isNonStringPrimitive=t.escapeAndQuote=t.replaceNbspWithSp=t.doubleQuotesToGravesIfPossible=t.doubleQuoteIfNecessary=t.graveQuoteIfNecessary=t.escapeDoubleQuotes=t.isNumeric=t.shouldBeGraveQuoted=t.escapeGraves=void 0;var o=n(494);t.escapeGraves=function(e){return null!==e?e.replace(/`/g,"~`"):e},t.shouldBeGraveQuoted=new RegExp(".*[()\\[\\];{}=].*"),t.isNumeric=new RegExp("^[-]?[0-9]*\\.?[0-9]+(?:[Ee][+-]?[0-9]+)?$"),t.escapeDoubleQuotes=function(e){for(var t=e.indexOf('"',1),n=e;t>0&&t<e.length-1;)t=(n=n.substring(0,t)+"~u0022"+n.substring(t+1)).indexOf('"',1);return n},t.graveQuoteIfNecessary=function(e){return null!==e&&(t.shouldBeGraveQuoted.test(e)||""===e||t.isNumeric.test(e)&&"00"!==e&&"01"!==e&&"000"!==e||"true"===e||"false"===e||"null"===e||r(e))?"`"+e+"`":e};var r=function(e){return 0===e.trim().length};t.doubleQuoteIfNecessary=function(e){return null!==e&&e.includes("~`")?'"'+e+'"':e},t.doubleQuotesToGravesIfPossible=function(e){return null!==e&&!e.includes("~`")&&e.startsWith('"')&&e.endsWith('"')?"`"+e.substring(1,e.length-1)+"`":e},t.replaceNbspWithSp=function(e){return e.replace(/\u00a0/g," ")};var u=o.createUnicodeEscaper();t.escapeAndQuote=function(e){return null===e?e:t.doubleQuotesToGravesIfPossible(t.doubleQuoteIfNecessary(t.graveQuoteIfNecessary(t.escapeGraves(u.escape(t.replaceNbspWithSp(t.escapeDoubleQuotes(e)))))))},t.isNonStringPrimitive=function(e){return i.includes(e)||t.isNumeric.test(e)};var i=["true","false","null"]}},t={};function n(o){var r=t[o];if(void 0!==r)return r.exports;var u=t[o]={exports:{}};return e[o].call(u.exports,u,u.exports,n),u.exports}var o={};return(()=>{"use strict";var e=o;Object.defineProperty(e,"__esModule",{value:!0}),e.jsonToModl=void 0;var t=n(389);e.jsonToModl=t.createJsonToModl()})(),o})()}));

dist/scratch.js

@@ -11,5 +11,5 @@ "use strict";
 var jsonToModl = JsonToModl_1.createJsonToModl();
-var modlString = '[a;` `]';
-var jsonString = '["a", " "]';
+var modlString = 'x=~u0645~u062c~u062a~u0645~u0639 ~u0635~u0646~u0627~u06cc~u0639 ~u0634~u06cc~u0645~u06cc~u0627~u06cc~u06cc ~u0646~u0627~u0631~u06af~u0633~u062a~u0631';
+var jsonString = '{"x":"مجتمع صنایع شیمیایی نارگستر"}';
 chai_1.expect(jsonToModl.stringToModl(jsonString)).equal(modlString);
 //# sourceMappingURL=scratch.js.map

dist/UnicodeEscaper.js

@@ -14,7 +14,4 @@ "use strict";
         for (var i = 0; i < s.length; i++) {
-            var cp = s.codePointAt(i);
+            var cp = s.charCodeAt(i);
             result += escapeChar(cp);
-            if (cp && cp > 0xffff) {
-                i += 1;
-            }
         }
@@ -37,5 +34,2 @@ return result;
     }
-    else if (c >= 0x100000 && c <= 0x10ffff) {
-        return "~u" + c.toString(16);
-    }
     else if (c === BACKSPACE) {
@@ -56,5 +50,2 @@ return '\\b';
     }
-    else if (c >= 0x10000 && c <= 0xfffff) {
-        return "~u" + c.toString(16);
-    }
     else if (c >= 0x1000 && c <= 0xffff) {
@@ -61,0 +52,0 @@ return "~u" + c.toString(16);

package.json

 {
   "name": "modl-converter",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "A JSON to MODL library in TypeScript",
@@ -25,3 +25,5 @@ "types": "dist/index.d.ts",
     "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "tslint-config-prettier": "^1.18.0",
+    "webpack": "^5.23.0",
+    "webpack-cli": "^4.7.0"
   },
@@ -39,3 +41,3 @@ "scripts": {
     "lint": "tslint --force -p tsconfig.json",
-    "prepare": "npm test",
+    "prepublish": "npm test && webpack",
     "publish": "git push && git push --tags --force"
@@ -42,0 +44,0 @@ },

src/scratch.ts

@@ -12,6 +12,7 @@ import { expect } from 'chai';
 // This is the expected result
-const modlString = '[a;` `]';
-const jsonString = '["a", " "]';
+const modlString =
+  'x=~u0645~u062c~u062a~u0645~u0639 ~u0635~u0646~u0627~u06cc~u0639 ~u0634~u06cc~u0645~u06cc~u0627~u06cc~u06cc ~u0646~u0627~u0631~u06af~u0633~u062a~u0631';
+const jsonString = '{"x":"مجتمع صنایع شیمیایی نارگستر"}';
 
 // Verify the result. Debug-level logging displays the result.
 expect(jsonToModl.stringToModl(jsonString)).equal(modlString);

src/UnicodeEscaper.ts

@@ -13,7 +13,4 @@ export interface UnicodeEscaper {
     for (let i = 0; i < s.length; i++) {
-      const cp = s.codePointAt(i);
+      const cp = s.charCodeAt(i);
       result += escapeChar(cp);
-      if (cp && cp > 0xffff) {
-        i += 1;
-      }
     }
@@ -37,4 +34,2 @@ return result;
     return String.fromCodePoint(c);
-  } else if (c >= 0x100000 && c <= 0x10ffff) {
-    return `~u${c.toString(16)}`;
   } else if (c === BACKSPACE) {
@@ -50,4 +45,2 @@ return '\\b';
     return '\\t';
-  } else if (c >= 0x10000 && c <= 0xfffff) {
-    return `~u${c.toString(16)}`;
   } else if (c >= 0x1000 && c <= 0xffff) {
@@ -54,0 +47,0 @@ return `~u${c.toString(16)}`;

No alert changes

Worsened metrics

Total package byte prevSize

39142

decreased by-0.36%

Dev dependency count

13

increased by18.18%

Lines of code

615

decreased by-2.38%

No dependency changes