aglio-theme-olio - npm Package Compare versions

Comparing version 1.5.0 to 1.6.0

Changelog.md

@@ -0,1 +1,7 @@
+# 1.6.0 - 2015-11-11
+
+* Allow disabling emoji support via `--no-theme-emoji`. [#194](https://github.com/danielgtaylor/aglio/issues/194)
+* Support `One Of` mutually exclusive parameters in JSON Schema.
+* Support `nullable` member attribute in JSON Schema.
+
 # 1.5.0 - 2015-11-10
@@ -2,0 +8,0 @@

lib/main.js

@@ -573,2 +573,7 @@ // Generated by CoffeeScript 1.9.3
           description: 'Layout style name or path to custom stylesheet'
+        }, {
+          name: 'emoji',
+          description: 'Enable support for emoticons',
+          boolean: true,
+          "default": true
         }
@@ -629,3 +634,6 @@ ]
       permalinkClass: 'permalink'
-    }).use(require('markdown-it-checkbox')).use(require('markdown-it-container'), 'note').use(require('markdown-it-container'), 'warning').use(require('markdown-it-emoji'));
+    }).use(require('markdown-it-checkbox')).use(require('markdown-it-container'), 'note').use(require('markdown-it-container'), 'warning');
+    if (options.themeEmoji) {
+      md.use(require('markdown-it-emoji'));
+    }
     md.renderer.rules.code_block = md.renderer.rules.fence;
@@ -632,0 +640,0 @@ benchmark.start('decorate');

lib/schema.js

@@ -8,3 +8,3 @@ // Generated by CoffeeScript 1.9.3
   module.exports = renderSchema = function(root, dataStructures) {
-    var i, item, items, j, k, key, len, len1, len2, m, member, properties, ref, ref1, ref2, ref3, ref4, ref5, ref6, required, schema, typeAttr;
+    var exclusive, i, item, items, j, k, key, len, len1, len2, len3, m, member, n, option, optionSchema, prop, properties, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9, required, schema, typeAttr;
     schema = {};
@@ -51,2 +51,3 @@ switch (root.element) {
       case 'object':
+      case 'option':
         schema.type = 'object';
@@ -69,2 +70,22 @@ schema.properties = {};
           } else if (member.element === 'select') {
+            exclusive = [];
+            ref5 = member.content;
+            for (n = 0, len3 = ref5.length; n < len3; n++) {
+              option = ref5[n];
+              optionSchema = renderSchema(option, dataStructures);
+              ref6 = optionSchema.properties;
+              for (key in ref6) {
+                prop = ref6[key];
+                exclusive.push(key);
+                schema.properties[key] = prop;
+              }
+            }
+            if (!schema.allOf) {
+              schema.allOf = [];
+            }
+            schema.allOf.push({
+              not: {
+                required: exclusive
+              }
+            });
             continue;
@@ -74,6 +95,6 @@ }
           schema.properties[key] = renderSchema(member.content.value, dataStructures);
-          if (((ref5 = member.meta) != null ? ref5.description : void 0) != null) {
+          if (((ref7 = member.meta) != null ? ref7.description : void 0) != null) {
             schema.properties[key].description = member.meta.description;
           }
-          if ((ref6 = member.attributes) != null ? ref6.typeAttributes : void 0) {
+          if ((ref8 = member.attributes) != null ? ref8.typeAttributes : void 0) {
             typeAttr = member.attributes.typeAttributes;
@@ -83,2 +104,5 @@ if (typeAttr.indexOf('required') !== -1) {
             }
+            if (typeAttr.indexOf('nullable') !== -1) {
+              schema.properties[key].type = [schema.properties[key].type, 'null'];
+            }
           }
@@ -96,2 +120,8 @@ }
     }
+    if ((ref9 = root.attributes) != null ? ref9.typeAttributes : void 0) {
+      typeAttr = root.attributes.typeAttributes;
+      if (typeAttr.indexOf('nullable') !== -1) {
+        schema.type = [schema.type, 'null'];
+      }
+    }
     return schema;
@@ -98,0 +128,0 @@ };

package.json

 {
   "name": "aglio-theme-olio",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Default theme for the Aglio API Blueprint renderer",
@@ -5,0 +5,0 @@ "main": "lib/main.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

108033

increased by1.47%

Lines of code

1063

increased by3.71%

No dependency changes