merged apid and is libsonnet

Author: iv-p

tests/passing/apid/apid.libsonnet

@@ -1,7 +1,114 @@
+local SHORTHAND_MATCHER_PREFIX = '$$shorthand_matcher$$';
+
+
+local any_matcher() =
+  {
+    '$$matcher_type$$': 'any',
+  };
+
+local string_matcher(string, case_sensitive=true) =
+  {
+    '$$matcher_type$$': 'string',
+    '$$matcher_params$$': {
+      value: string,
+      case_sensitive: case_sensitive,
+    },
+  };
+
+local regex_matcher(regex) =
+  {
+    '$$matcher_type$$': 'regex',
+    '$$matcher_params$$': regex,
+  };
+
+local int_matcher(int) =
+  {
+    '$$matcher_type$$': 'int',
+    '$$matcher_params$$': int,
+  };
+
+local float_matcher(float) =
+  {
+    '$$matcher_type$$': 'float',
+    '$$matcher_params$$': float,
+  };
+
+local json_matcher(json, subset=false) =
+  {
+    '$$matcher_type$$': 'json',
+    '$$matcher_params$$': {
+      value: json,
+      subset: subset,
+    },
+  };
+
+local array_matcher(array, subset=false) =
+  {
+    '$$matcher_type$$': 'array',
+    '$$matcher_params$$': {
+      value: array,
+      subset: subset,
+    },
+  };
+
+local len_matcher(len) =
+  {
+    '$$matcher_type$$': 'len',
+    '$$matcher_params$$': len,
+  };
+
+local and_matcher(matchers) =
+  {
+    '$$matcher_type$$': 'and',
+    '$$matcher_params$$': matchers,
+  };
+
+local or_matcher(matchers) =
+  {
+    '$$matcher_type$$': 'or',
+    '$$matcher_params$$': matchers,
+  };
+
+local range_matcher(from, to) =
+  {
+    '$$matcher_type$$': 'range',
+    '$$matcher_params$$': {
+      from: from,
+      to: to,
+    },
+  };
+
+local type_matcher(type) =
+  {
+    '$$matcher_type$$': 'type::%s' % type,
+    '$$matcher_params$$': null,
+  };
+
 {
   spec(steps):: std.manifestJson(
     {
       steps: steps,
     },
   ),
+  
+  type: {
+    int():: type_matcher('int'),
+    float():: type_matcher('float'),
+    string():: type_matcher('string'),
+    object():: type_matcher('object'),
+    array():: type_matcher('array'),
+  },
+
+  key(matcher):: '%s%s' % [SHORTHAND_MATCHER_PREFIX, std.manifestJsonEx(matcher, '')],
+  any():: any_matcher(),
+  regex(regex):: regex_matcher(regex),
+  string(string, case_sensitive=true):: string_matcher(string, case_sensitive),
+  int(int):: int_matcher(int),
+  float(float):: float_matcher(float),
+  json(json, subset=false):: json_matcher(json, subset),
+  array(array, subset=false):: array_matcher(array, subset),
+  len(len):: len_matcher(len),
+  and(matchers):: and_matcher(matchers),
+  or(matchers):: or_matcher(matchers),
+  range(from, to):: range_matcher(from, to),
 }

tests/passing/apid/is.libsonnet

@@ -1,5 +1,4 @@
-local apid = import 'apid/apid.libsonnet';
-local _ = import 'apid/is.libsonnet';
+local _ = import 'apid/apid.libsonnet';
 
 local vars = import 'vars.libsonnet';
 
@@ -31,7 +30,7 @@ local steps(method, body, expected) = [
 ];
 
 {
-  ['float-%s-%s-%s' % [method, 'body', expected]]: apid.spec(
+  ['float-%s-%s-%s' % [method, 'body', expected]]: _.spec(
     steps=steps(method, body, expected),
   )
   for method in ['POST', 'PUT', 'PATCH', 'DELETE']