@canopycanopycanopy/b-ber-grammar-attributes 1.2.16 → 3.0.0

package/dist/index.js

@@ -40,15 +40,13 @@ var _lodash = _interopRequireDefault(require("lodash.has"));
 
 var _bBerLib = require("@canopycanopycanopy/b-ber-lib");
 
-var _utils = require("@canopycanopycanopy/b-ber-lib/utils");
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
 
 var _bBerShapesDirectives = require("@canopycanopycanopy/b-ber-shapes-directives");
 
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); if (enumerableOnly) symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context3; _forEachInstanceProperty(_context3 = ownKeys(Object(source), true)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context4; _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 //
 // Querying hierarchies gets confusing, so we're using biological taxonomic
@@ -68,11 +66,11 @@ const _isUnsupportedAttribute = (genus, attr) => {
   let key;
 
   if (_bBerShapesDirectives.BLOCK_DIRECTIVES.has(genus)) {
-    // these are all containers which share the same attributes, so they're
+    // These are all containers which share the same attributes, so they're
     // grouped under a single property
     key = 'block';
   } else {
-    // this will be the directive name, e.g., figure, video, etc
+    // This will be the directive name, e.g., figure, video, etc
     key = genus;
   }
 
@@ -133,25 +131,25 @@ const parseAttrs = s => {
     if (!open && char === 58
     /* : */
     ) {
-        // char is a token, we set `open` so that we don't misinterpret literals inside quotations
-        open = true;
-        key = str;
-        str = '';
-        delim = 32;
-        /*   */
-
-        if (next === 34
-        /* " */
-        || next === 39
-        /* ' */
-        ) {
-            i++;
-            delim = next;
-          }
-
-        continue;
+      // char is a token, we set `open` so that we don't misinterpret literals inside quotations
+      open = true;
+      key = str;
+      str = '';
+      delim = 32;
+      /*   */
+
+      if (next === 34
+      /* " */
+      || next === 39
+      /* ' */
+      ) {
+        i++;
+        delim = next;
       }
 
+      continue;
+    }
+
     if (char === delim) {
       // token is ending delimiter since we've advanced our pointer
       key = (0, _trim.default)(key).call(key); // trim whitespace, allowing for multiple spaces
@@ -246,13 +244,13 @@ const _extendWithDefaults = (obj, genus) => {
 }; // Create an object from attributes in the given directive
 
 
-const attributesObject = (attrs, _genus, context = {}) => {
+const attributesObject = (attrs, origGenus, context = {}) => {
   const {
     fileName,
     lineNumber
   } = context;
   const attrsObject = {};
-  let genus = _genus;
+  let genus = origGenus;
 
   if (!genus || typeof genus !== 'string') {
     _bBerLogger.default.error(`No directive provided: ${fileName}:${lineNumber}`);
@@ -275,23 +273,27 @@ const attributesObject = (attrs, _genus, context = {}) => {
   }
 
   if (attrs && typeof attrs === 'string') {
-    (0, _utils.forOf)(parseAttrs((0, _trim.default)(attrs).call(attrs)), (k, v) => {
-      if (_isUnsupportedAttribute(genus, k)) {
-        return _bBerLogger.default.warn(`render omitting unsupported attribute [${k}] at [${fileName}:${lineNumber}]`);
+    const parsedAttrs = (0, _entries.default)(parseAttrs((0, _trim.default)(attrs).call(attrs))); // eslint-disable-next-line no-unused-vars
+
+    for (const [key, val] of parsedAttrs) {
+      if (_isUnsupportedAttribute(genus, key)) {
+        _bBerLogger.default.warn(`render omitting unsupported attribute [${key}] at [${fileName}:${lineNumber}]`);
+
+        continue;
       }
 
-      attrsObject[k] = v;
-    });
-  } // Add original `_genus` as a class to the attrs object in case it's
+      attrsObject[key] = val;
+    }
+  } // Add original `origGenus` as a class to the attrs object in case it's
   // different from the current `genus` (which might've changed due to it's
   // specification). do this to keep styling consistent
 
 
-  if (genus !== _genus) {
+  if (genus !== origGenus) {
     if ((0, _lodash.default)(attrsObject, 'classes')) {
-      attrsObject.classes += ` ${_genus}`;
+      attrsObject.classes += ` ${origGenus}`;
     } else {
-      attrsObject.classes = _genus;
+      attrsObject.classes = origGenus;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-grammar-attributes",
-  "version": "1.2.16",
+  "version": "3.0.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -17,9 +17,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@canopycanopycanopy/b-ber-lib": "1.2.16",
-    "@canopycanopycanopy/b-ber-logger": "1.2.16",
-    "@canopycanopycanopy/b-ber-shapes-directives": "1.2.16",
+    "@canopycanopycanopy/b-ber-lib": "3.0.0",
+    "@canopycanopycanopy/b-ber-logger": "3.0.0",
+    "@canopycanopycanopy/b-ber-shapes-directives": "3.0.0",
     "lodash": "^4.17.21",
     "lodash.has": "latest",
     "tar": "^6.1.11"
@@ -28,8 +28,9 @@
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
+    "browserslist": "^4.17.4",
     "jest": "^26.6.3",
-    "rimraf": "^2.6.3"
+    "rimraf": "^2.7.1"
   },
   "files": [
     "dist"
@@ -48,5 +49,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
+  "gitHead": "676dbec7fbdcc46eb8168f1d437d294ed549e2e8"
 }