pelias-schema 6.8.0 → 7.1.0

package/README.md

@@ -64,7 +64,7 @@ node scripts/update_settings.js          # update index settings
 
 #### output schema file
 
-Use this script to pretty-print the whole schema file or a single mapping to stdout.
+Use this script to pretty-print the schema's mappings to stdout.
 
 ```bash
 node scripts/output_mapping.js

package/configValidation.js

@@ -6,7 +6,6 @@ const Joi = require('@hapi/joi');
 const schema = Joi.object().required().keys({
   schema: Joi.object().required().keys({
     indexName: Joi.string().required(),
-    typeName: Joi.string().required()
   }),
   esclient: Joi.object().required()
 }).unknown(true);

package/integration/address_matching.js

@@ -16,7 +16,6 @@ module.exports.tests.functional = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1', body: { address_parts: {
           name: 'Mapzen HQ',
           number: 30,
@@ -29,7 +28,6 @@ module.exports.tests.functional = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '2', body: { address_parts: {
           name: 'Fake Venue',
           number: 300,
@@ -42,7 +40,6 @@ module.exports.tests.functional = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '3', body: { address_parts: {
           name: 'Mock British Address',
           number: 3000,
@@ -55,7 +52,6 @@ module.exports.tests.functional = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '4', body: { address_parts: {
           name: 'Mystery Location',
           number: 300,
@@ -69,7 +65,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.number': 30 } }
         ]}}}
@@ -84,7 +79,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match_phrase: { 'address_parts.street': 'west 26th street' } }
         ]}}}
@@ -99,7 +93,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match_phrase: { 'address_parts.street': 'W 26th ST' } }
         ]}}}
@@ -114,7 +107,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': '10010' } }
         ]}}}
@@ -129,7 +121,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': 'e24dn' } }
         ]}}}
@@ -144,7 +135,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': '100-10' } }
         ]}}}
@@ -159,7 +149,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': '10 0 10' } }
         ]}}}
@@ -174,7 +163,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': 'E2-4DN' } }
         ]}}}
@@ -189,7 +177,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': 'E2  4DN' } }
         ]}}}
@@ -224,7 +211,6 @@ module.exports.tests.venue_vs_address = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1', body: {
           name: { default: 'Union Square' },
           phrase: { default: 'Union Square' }
@@ -239,7 +225,6 @@ module.exports.tests.venue_vs_address = function(test, common){
         let id = i + 100; // id offset
         suite.client.index({
           index: suite.props.index,
-          type: config.schema.typeName,
           id: String(id),
           body: {
             name: { default: `${id} Union Square` },
@@ -263,7 +248,6 @@ module.exports.tests.venue_vs_address = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         size: TOTAL_ADDRESS_DOCS+1,
         body: {

package/integration/admin_abbreviations.js

@@ -19,7 +19,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.action(done => {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: {
           parent: {
@@ -33,7 +32,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.action(done => {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '2',
         body: {
           parent: {
@@ -47,7 +45,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -70,7 +67,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -93,7 +89,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -116,7 +111,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -147,7 +141,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.action(done => {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: {
           parent: {
@@ -161,7 +154,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.action(done => {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '2',
         body: {
           parent: {
@@ -175,7 +167,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -198,7 +189,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -221,7 +211,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -244,7 +233,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {
@@ -275,7 +263,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.action(done => {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: {
           parent: {
@@ -289,7 +276,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.action(done => {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '2',
         body: {
           parent: {
@@ -303,7 +289,6 @@ module.exports.tests.synonyms = function (test, common) {
     suite.assert(done => {
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: {
           query: {

package/integration/admin_matching.js

@@ -16,7 +16,6 @@ module.exports.tests.functional = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1', body: {
           parent: {
             country: 'Test Country',
@@ -46,7 +45,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: { 'parent.country': 'Test Country' } } }
       }, function( err, res ){
         t.equal( err, undefined );
@@ -59,7 +57,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: { 'parent.country_a': 'TestCountry' } } }
       }, function( err, res ){
         t.equal( err, undefined );
@@ -72,7 +69,6 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: { 'parent.country_id': '100' } } }
       }, function( err, res ){
         t.equal( err, undefined );

package/integration/analyzer_peliasPhrase.js

@@ -47,7 +47,8 @@ module.exports.tests.analyze = function(test, common){
     // remove punctuation (handled by the char_filter)
     assertAnalysis( 'punctuation', punctuation.all.join(''), ['0:&', '0:and', '0:und'] );
     assertAnalysis( 'punctuation', 'Hawai‘i', ['hawaii'] );
-
+    assertAnalysis( 'punctuation - « in between', '«res»pub«lika»', ['respublika'] );
+ 
     assertAnalysis( 'british_american_english', 'town theatre', ['0:town', '1:theatre', '1:theater'] );
     assertAnalysis( 'british_american_english', 'town theater', ['0:town', '1:theater', '1:theatre'] );
 
@@ -161,7 +162,6 @@ module.exports.tests.slop_query = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'Lake Cayuga' }, phrase: { default: 'Lake Cayuga' } }
       }, done );
@@ -171,7 +171,6 @@ module.exports.tests.slop_query = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '2',
         body: { name: { default: 'Cayuga Lake' }, phrase: { default: 'Cayuga Lake' } }
       }, done );
@@ -181,7 +180,6 @@ module.exports.tests.slop_query = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '3',
         body: { name: { default: '7991 Lake Cayuga Dr' }, phrase: { default: '7991 Lake Cayuga Dr' } }
       }, done );
@@ -256,7 +254,6 @@ module.exports.tests.slop = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: '52 Görlitzer Straße' } }
       }, done);
@@ -269,7 +266,6 @@ module.exports.tests.slop = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: { query: { match_phrase: {
           'name.default': {

package/integration/autocomplete_abbreviated_street_names.js

@@ -21,7 +21,6 @@ module.exports.tests.index_expanded_form_search_contracted = function(test, comm
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'Grolmanstraße' } }
       }, done);
@@ -31,7 +30,6 @@ module.exports.tests.index_expanded_form_search_contracted = function(test, comm
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -62,7 +60,6 @@ module.exports.tests.index_expanded_form_search_contracted = function(test, comm
 //     suite.action( function( done ){
 //       suite.client.index({
 //         index: suite.props.index,
-//         type: config.schema.typeName,
 //         id: '1',
 //         body: { name: { default: 'Grolmanstr.' } }
 //       }, done);
@@ -75,7 +72,6 @@ module.exports.tests.index_expanded_form_search_contracted = function(test, comm
 //     suite.assert( function( done ){
 //       suite.client.search({
 //         index: suite.props.index,
-//         type: config.schema.typeName,
 //         body: { query: { match: {
 //           'name.default': {
 //             'analyzer': 'peliasQueryPartialToken',
@@ -96,7 +92,6 @@ module.exports.tests.index_expanded_form_search_contracted = function(test, comm
 //     suite.assert( function( done ){
 //       suite.client.search({
 //         index: suite.props.index,
-//         type: config.schema.typeName,
 //         body: { query: { match: {
 //           'name.default': {
 //             'analyzer': 'peliasQuery',

package/integration/autocomplete_directional_synonym_expansion.js

@@ -21,7 +21,6 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'north' } }
       }, done);
@@ -31,7 +30,6 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -49,7 +47,6 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -78,7 +75,6 @@ module.exports.tests.index_and_retrieve_contracted_form = function(test, common)
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'n' } }
       }, done);
@@ -88,7 +84,6 @@ module.exports.tests.index_and_retrieve_contracted_form = function(test, common)
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -117,7 +112,6 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'n' } }
       }, done);
@@ -127,7 +121,6 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -145,7 +138,6 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -174,7 +166,6 @@ module.exports.tests.index_and_retrieve_mixed_form_2 = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'north' } }
       }, done);
@@ -184,7 +175,6 @@ module.exports.tests.index_and_retrieve_mixed_form_2 = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',

package/integration/autocomplete_street_synonym_expansion.js

@@ -22,7 +22,6 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'center' } }
       }, done);
@@ -32,7 +31,6 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -50,7 +48,6 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -79,7 +76,6 @@ module.exports.tests.index_and_retrieve_contracted_form = function(test, common)
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'ctr' } }
       }, done);
@@ -89,7 +85,6 @@ module.exports.tests.index_and_retrieve_contracted_form = function(test, common)
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -118,7 +113,6 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'ctr' } }
       }, done);
@@ -128,7 +122,6 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -146,7 +139,6 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',
@@ -175,7 +167,6 @@ module.exports.tests.index_and_retrieve_mixed_form_2 = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'center' } }
       }, done);
@@ -185,7 +176,6 @@ module.exports.tests.index_and_retrieve_mixed_form_2 = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: config.schema.typeName,
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasQuery',

package/integration/bounding_box.js

@@ -15,7 +15,6 @@ module.exports.tests.index_and_retrieve = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1',
         body: {
           bounding_box: '{"min_lat":-47.75,"max_lat":-33.9,"min_lon":163.82,"max_lon":179.42}'
@@ -28,7 +27,6 @@ module.exports.tests.index_and_retrieve = function(test, common){
       suite.client.get(
         {
           index: suite.props.index,
-          type: config.schema.typeName,
           id: '1'
         },
         function (err, res) {

package/integration/dynamic_templates.js

@@ -32,13 +32,11 @@ function nameAssertion( analyzer, common ){
   return function(t){
 
     var suite = new Suite( common.clientOpts, common.create );
-    const _type = config.schema.typeName;
 
     // index a document from a normal document layer
     suite.action( done => {
       suite.client.index({
         index: suite.props.index,
-        type: _type,
         id: '1',
         body: { name: { default: 'foo', alt: 'bar' } }
       }, done );
@@ -50,7 +48,6 @@ function nameAssertion( analyzer, common ){
 
       suite.client.indices.getMapping({
         index: suite.props.index,
-        include_type_name: false
       }, (err, res) => {
 
         const properties = res[suite.props.index].mappings.properties;
@@ -71,13 +68,11 @@ function phraseAssertion( analyzer, common ){
   return function(t){
 
     const suite = new Suite( common.clientOpts, common.create );
-    const _type = config.schema.typeName;
 
     // index a document from a normal document layer
     suite.action( done => {
       suite.client.index({
         index: suite.props.index,
-        type: _type,
         id: '1',
         body: { phrase: { default: 'foo', alt: 'bar' } }
       }, done );
@@ -89,7 +84,6 @@ function phraseAssertion( analyzer, common ){
 
       suite.client.indices.getMapping({
         index: suite.props.index,
-        include_type_name: false
       }, ( err, res ) => {
 
         const properties = res[suite.props.index].mappings.properties;
@@ -110,13 +104,11 @@ function addendumAssertion( namespace, value, common ){
   return function(t){
 
     const suite = new Suite( common.clientOpts, common.create );
-    const _type = config.schema.typeName;
 
     // index a document including the addendum
     suite.action( done => {
       suite.client.index({
         index: suite.props.index,
-        type: _type,
         id: '1',
         body: { addendum: { [namespace]: value } },
       }, done );
@@ -127,7 +119,6 @@ function addendumAssertion( namespace, value, common ){
     suite.assert( done => {
       suite.client.indices.getMapping({
         index: suite.props.index,
-        include_type_name: false,
       }, ( err, res ) => {
 
         const properties = res[suite.props.index].mappings.properties;
@@ -156,7 +147,6 @@ function addendumAssertion( namespace, value, common ){
     suite.assert( done => {
       suite.client.get({
         index: suite.props.index,
-        type: _type,
         id: 1
       }, ( err, res ) => {
         t.false( err );

package/integration/multi_token_synonyms.js

@@ -19,7 +19,6 @@ module.exports.tests.functional = function (test, common) {
     suite.action(function (done) {
       suite.client.index({
         index: suite.props.index,
-        type: config.schema.typeName,
         id: '1', body: {
           name: { default: 'set' },
           phrase: { default: 'set' },

package/integration/run.js

@@ -12,9 +12,7 @@ const common = {
   },
   create: {
     schema: schema,
-    create: {
-      include_type_name: false
-    }
+    create: { }
   },
   summaryMap: (res) => {
     return res.hits.hits.map(h => {