Merge pull request #300 from monken/master

support polymorphism for tags

Author: Vitaly Puzrin

lib/js-yaml/dumper.js

@@ -71,8 +71,7 @@ function compileStyleMap(schema, map) {
     if (tag.slice(0, 2) === '!!') {
       tag = 'tag:yaml.org,2002:' + tag.slice(2);
     }
-
-    type = schema.compiledTypeMap[tag];
+    type = schema.compiledTypeMap['fallback'][tag];
 
     if (type && _hasOwnProperty.call(type.styleAliases, style)) {
       style = type.styleAliases[style];

lib/js-yaml/loader.js

@@ -1378,8 +1378,8 @@ function composeNode(state, parentIndent, nodeContext, allowToSeek, allowCompact
           break;
         }
       }
-    } else if (_hasOwnProperty.call(state.typeMap, state.tag)) {
-      type = state.typeMap[state.tag];
+    } else if (_hasOwnProperty.call(state.typeMap[state.kind || 'fallback'], state.tag)) {
+      type = state.typeMap[state.kind || 'fallback'][state.tag];
 
       if (state.result !== null && type.kind !== state.kind) {
         throwError(state, 'unacceptable node kind for !<' + state.tag + '> tag; it should be "' + type.kind + '", not "' + state.kind + '"');

lib/js-yaml/schema.js

@@ -16,7 +16,7 @@ function compileList(schema, name, result) {
 
   schema[name].forEach(function (currentType) {
     result.forEach(function (previousType, previousIndex) {
-      if (previousType.tag === currentType.tag) {
+      if (previousType.tag === currentType.tag && previousType.kind === currentType.kind) {
         exclude.push(previousIndex);
       }
     });
@@ -31,16 +31,20 @@ function compileList(schema, name, result) {
 
 
 function compileMap(/* lists... */) {
-  var result = {}, index, length;
+  var result = {
+        scalar: {},
+        sequence: {},
+        mapping: {},
+        fallback: {}
+      }, index, length;
 
   function collectType(type) {
-    result[type.tag] = type;
+    result[type.kind][type.tag] = result['fallback'][type.tag] = type;
   }
 
   for (index = 0, length = arguments.length; index < length; index += 1) {
     arguments[index].forEach(collectType);
   }
-
   return result;
 }
 

test/units/tagmultikind.js

@@ -0,0 +1,39 @@
+'use strict';
+
+
+var assert = require('assert');
+var yaml = require('../../');
+
+var tags = [ {
+  tag: 'Include',
+  type: 'scalar'
+}, {
+  tag: 'Include',
+  type: 'mapping'
+} ].map(function (fn) {
+  return new yaml.Type('!' + fn.tag, {
+    kind: fn.type,
+    resolve: function () {
+      return true;
+    },
+    construct: function (obj) {
+      return obj;
+    }
+  });
+});
+
+var schema = yaml.Schema.create(tags);
+
+
+test('Process tag with kind: scalar', function () {
+  assert.deepEqual(yaml.safeLoad('!Include foobar', {
+    schema: schema
+  }), 'foobar');
+});
+
+
+test('Process tag with kind: mapping', function () {
+  assert.deepEqual(yaml.safeLoad('!Include\n  location: foobar', {
+    schema: schema
+  }), { location: 'foobar' });
+});