@terascope/data-types 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  import { isString, set, startsWith } from '@terascope/utils';
2
2
  import { ElasticsearchDistribution } from '@terascope/types';
3
3
  import lodash from 'lodash';
4
- import { formatSchema, formatGQLComment } from './graphql-helper.js';
4
+ import { formatSchema, formatGQLDescription } from './graphql-helper.js';
5
5
  import * as utils from './utils.js';
6
6
  import { getTypes, LATEST_VERSION, getGroupedFields } from './types/index.js';
7
7
  const { defaultsDeep } = lodash;
@@ -169,14 +169,14 @@ export class DataType {
169
169
  }
170
170
  });
171
171
  if (references.length) {
172
- baseProperties.push(utils.joinStrings(formatGQLComment('references and virtual fields'), references));
172
+ baseProperties.push(utils.joinStrings(formatGQLDescription('references and virtual fields'), references));
173
173
  }
174
- const baseType = utils.joinStrings(formatGQLComment(description), `type ${typeName} {
174
+ const baseType = utils.joinStrings(formatGQLDescription(description), `type ${typeName} {
175
175
  ${utils.joinStrings(baseProperties)}
176
176
  }`);
177
177
  let inputType;
178
178
  if (createInputType) {
179
- inputType = utils.joinStrings(formatGQLComment(description, `Input for ${typeName}`), `input ${inputName} {
179
+ inputType = utils.joinStrings(formatGQLDescription(description, `Input for ${typeName}`), `input ${inputName} {
180
180
  ${utils.joinStrings(inputProperties)}
181
181
  }`);
182
182
  }
@@ -1 +1 @@
1
- {"version":3,"file":"data-type.js","sourceRoot":"","sources":["../../src/data-type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-type.js","sourceRoot":"","sources":["../../src/data-type.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  export declare function formatSchema(schemaStr: string, removeScalars?: boolean): string;
2
- export declare function formatGQLComment(desc?: string, prefix?: string): string;
2
+ export declare function formatGQLDescription(desc?: string, prefix?: string): string;
3
3
  //# sourceMappingURL=graphql-helper.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-helper.d.ts","sourceRoot":"","sources":["../../src/graphql-helper.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,MAAM,CAY7E;AAED,wBAAgB,gBAAgB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAavE"}
1
+ {"version":3,"file":"graphql-helper.d.ts","sourceRoot":"","sources":["../../src/graphql-helper.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,MAAM,CAQ7E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAiB3E"}
@@ -1,29 +1,28 @@
1
1
  import { trim } from '@terascope/utils';
2
2
  import { buildSchema, printSchema } from 'graphql/utilities/index.js';
3
3
  export function formatSchema(schemaStr, removeScalars = false) {
4
- const schema = buildSchema(schemaStr, {
5
- commentDescriptions: true,
6
- });
7
- const result = printSchema(schema, {
8
- commentDescriptions: true
9
- });
4
+ const schema = buildSchema(schemaStr);
5
+ const result = printSchema(schema);
10
6
  if (removeScalars) {
11
7
  return result.replace(/\s*scalar \w+/g, '');
12
8
  }
13
9
  return result;
14
10
  }
15
- export function formatGQLComment(desc, prefix) {
11
+ export function formatGQLDescription(desc, prefix) {
16
12
  let description = trim(desc);
17
13
  if (prefix) {
18
14
  description = description ? `${prefix} - ${description}` : prefix;
19
15
  }
20
16
  if (!description)
21
17
  return '';
22
- return description
18
+ const trimmedLines = description
23
19
  .split('\n')
24
- .map((str) => trim(str).replace(/^#/, '').trim())
20
+ .map((str) => str.trim())
25
21
  .filter(Boolean)
26
- .map((str) => `# ${str}`)
27
- .join('\n');
22
+ .map((str) => `${str}`);
23
+ if (trimmedLines.length > 1) {
24
+ return `"""${trimmedLines.join('\n')}"""`;
25
+ }
26
+ return `""" ${trimmedLines[0]} """`;
28
27
  }
29
28
  //# sourceMappingURL=graphql-helper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-helper.js","sourceRoot":"","sources":["../../src/graphql-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,UAAU,YAAY,CAAC,SAAiB,EAAE,aAAa,GAAG,KAAK;IACjE,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE;QAClC,mBAAmB,EAAE,IAAI;KAC5B,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE;QAC/B,mBAAmB,EAAE,IAAI;KAC5B,CAAC,CAAC;IAEH,IAAI,aAAa,EAAE;QACf,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;KAC/C;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAa,EAAE,MAAe;IAC3D,IAAI,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,MAAM,EAAE;QACR,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,MAAM,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;KACrE;IACD,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAE5B,OAAO,WAAW;SACb,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;SAChD,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC"}
1
+ {"version":3,"file":"graphql-helper.js","sourceRoot":"","sources":["../../src/graphql-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,UAAU,YAAY,CAAC,SAAiB,EAAE,aAAa,GAAG,KAAK;IACjE,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAO,CAAC,CAAC;IAEpC,IAAI,aAAa,EAAE;QACf,OAAO,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;KAC/C;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAa,EAAE,MAAe;IAC/D,IAAI,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,MAAM,EAAE;QACR,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,MAAM,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;KACrE;IACD,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,YAAY,GAAG,WAAW;SAC3B,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACxB,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;IAE5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,OAAO,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;KAC7C;IACD,OAAO,OAAO,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC;AACxC,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { indexedRequiredFieldTypes } from '@terascope/types';
2
2
  import { castArray } from '@terascope/utils';
3
- import { formatGQLComment } from '../graphql-helper.js';
3
+ import { formatGQLDescription } from '../graphql-helper.js';
4
4
  export default class BaseType {
5
5
  field;
6
6
  config;
@@ -47,6 +47,6 @@ function makeCustomTypes(customType) {
47
47
  export function formatGQLType(type, desc) {
48
48
  if (!desc)
49
49
  return type;
50
- return `${formatGQLComment(desc)}\n${type}`;
50
+ return `${formatGQLDescription(desc)}\n${type}`;
51
51
  }
52
52
  //# sourceMappingURL=base-type.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"base-type.js","sourceRoot":"","sources":["../../../src/types/base-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,yBAAyB,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAgB,QAAQ;IACzB,KAAK,CAAS;IACd,MAAM,CAAsB;IAC5B,OAAO,CAAS;IAEzB,YAAY,KAAa,EAAE,MAA2B,EAAE,OAAO,GAAG,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAES,kBAAkB;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE;YAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,yBAAyB,EAAE;gBAC/C,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,4BAA4B,CAAC,CAAC;aACpE;SACJ;IACL,CAAC;IAKS,UAAU,CAChB,IAAY,EACZ,UAA8B;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACrC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACnB,OAAO;gBACH,IAAI,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC,KAAK,MAAM,IAAI,GAAG,EAAE,IAAI,CAAC;gBACrD,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC;aAC3C,CAAC;SACL;QACD,OAAO;YACH,IAAI,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC;YACnD,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC;SAC3C,CAAC;IACN,CAAC;IAED,kBAAkB,CAAC,QAAgB,EAAE,OAAiB,EAAE,WAAW,GAAG,OAAO;QACzE,OAAO;YACH,IAAI;YACJ,QAAQ;YACR,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;YAC1B,IAAI,IAAI,CAAC,OAAO,EAAE;SACrB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACJ;AAED,SAAS,eAAe,CAAC,UAA8B;IACnD,IAAI,CAAC,UAAU,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,IAAa;IACrD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;AAChD,CAAC"}
1
+ {"version":3,"file":"base-type.js","sourceRoot":"","sources":["../../../src/types/base-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,yBAAyB,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAa5D,MAAM,CAAC,OAAO,OAAgB,QAAQ;IACzB,KAAK,CAAS;IACd,MAAM,CAAsB;IAC5B,OAAO,CAAS;IAEzB,YAAY,KAAa,EAAE,MAA2B,EAAE,OAAO,GAAG,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAES,kBAAkB;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE;YAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,yBAAyB,EAAE;gBAC/C,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,4BAA4B,CAAC,CAAC;aACpE;SACJ;IACL,CAAC;IAKS,UAAU,CAChB,IAAY,EACZ,UAA8B;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACrC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACnB,OAAO;gBACH,IAAI,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC,KAAK,MAAM,IAAI,GAAG,EAAE,IAAI,CAAC;gBACrD,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC;aAC3C,CAAC;SACL;QACD,OAAO;YACH,IAAI,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC;YACnD,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC;SAC3C,CAAC;IACN,CAAC;IAED,kBAAkB,CAAC,QAAgB,EAAE,OAAiB,EAAE,WAAW,GAAG,OAAO;QACzE,OAAO;YACH,IAAI;YACJ,QAAQ;YACR,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;YAC1B,IAAI,IAAI,CAAC,OAAO,EAAE;SACrB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACJ;AAED,SAAS,eAAe,CAAC,UAA8B;IACnD,IAAI,CAAC,UAAU,EAAE,MAAM;QAAE,OAAO,EAAE,CAAC;IACnC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,IAAa;IACrD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;AACpD,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@terascope/data-types",
3
3
  "displayName": "Data Types",
4
- "version": "1.1.0",
4
+ "version": "1.1.1",
5
5
  "description": "A library for defining the data structures and mapping",
6
6
  "homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-types#readme",
7
7
  "bugs": {
@@ -29,7 +29,7 @@
29
29
  "dependencies": {
30
30
  "@terascope/types": "^1.1.0",
31
31
  "@terascope/utils": "^1.1.0",
32
- "graphql": "^14.7.0",
32
+ "graphql": "^16.9.0",
33
33
  "lodash": "^4.17.21",
34
34
  "yargs": "^17.7.2"
35
35
  },