@voiceflow/utils-designer 1.52.0 → 1.52.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,18 +1,20 @@
1
1
  import type { Entity, Markup, Secret, Variable } from '@voiceflow/dtos';
2
2
  import type { MultiAdapter } from 'bidirectional-adapter';
3
3
  export interface MarkupToDraftJSFromOptions {
4
+ multiline?: boolean;
4
5
  secretsMapByID?: Partial<Record<string, Secret>>;
5
6
  entitiesMapByID: Partial<Record<string, Entity>>;
6
- multiline?: boolean;
7
- variablesMapByID?: Partial<Record<string, Variable>>;
7
+ variablesMapByID: Partial<Record<string, Variable>>;
8
8
  }
9
9
  interface MarkupToDraftJSToOptions {
10
10
  entitiesOnly?: boolean;
11
+ secretsMapByID?: Partial<Record<string, Secret>>;
12
+ variablesMapByID: Partial<Record<string, Variable>>;
11
13
  }
12
14
  export declare const markupToLegacyDraftJS: MultiAdapter<Markup, string, [
13
15
  MarkupToDraftJSFromOptions
14
16
  ], [
15
17
  MarkupToDraftJSToOptions
16
- ] | []>;
18
+ ]>;
17
19
  export {};
18
20
  //# sourceMappingURL=markup-to-legacy-draftjs.adapter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"markup-to-legacy-draftjs.adapter.d.ts","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAM1D,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;CACtD;AAED,UAAU,wBAAwB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAC9C,MAAM,EACN,MAAM,EACN;IAAC,0BAA0B;CAAC,EAC5B;IAAC,wBAAwB;CAAC,GAAG,EAAE,CAqEhC,CAAC"}
1
+ {"version":3,"file":"markup-to-legacy-draftjs.adapter.d.ts","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAM1D,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;CACrD;AAED,UAAU,wBAAwB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAC9C,MAAM,EACN,MAAM,EACN;IAAC,0BAA0B;CAAC,EAC5B;IAAC,wBAAwB;CAAC,CAsE3B,CAAC"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.markupToLegacyDraftJS = void 0;
4
+ /* eslint-disable sonarjs/cognitive-complexity */
4
5
  const common_1 = require("@voiceflow/common");
5
6
  const bidirectional_adapter_1 = require("bidirectional-adapter");
6
7
  const ts_pattern_1 = require("ts-pattern");
@@ -12,16 +13,15 @@ exports.markupToLegacyDraftJS = (0, bidirectional_adapter_1.createMultiAdapter)(
12
13
  .when(markup_util_1.isMarkupEntity, ({ entityID }) => `{{[${entitiesMapByID[entityID]?.name ?? 'unknown'}].${entityID}}}`)
13
14
  .when(markup_util_1.isMarkupVariable, ({ variableID }) => `{{[${variablesMapByID?.[variableID]?.name ?? variableID}].${variableID}}}`)
14
15
  .when(markup_util_1.isMarkupSecret, ({ secretID }) => `{{[${secretsMapByID?.[secretID]?.name ?? secretID}].${secretID}}}`)
15
- .exhaustive(), ''), (text, { entitiesOnly } = {}) => {
16
+ .exhaustive(), ''), (text, { entitiesOnly, secretsMapByID, variablesMapByID }) => {
16
17
  const matches = [...text.matchAll(common_1.SLOT_REGEXP)];
17
18
  if (!matches.length)
18
19
  return [{ text: [text] }];
19
20
  const span = { text: [] };
20
21
  let prevMatch = null;
21
22
  for (const match of matches) {
22
- const entityID = match[2];
23
- const entityName = match[1];
24
- const isVariable = !entitiesOnly && entityID === entityName;
23
+ const variableID = match[2];
24
+ const variableName = match[1];
25
25
  let substring;
26
26
  if (!prevMatch) {
27
27
  substring = text.substring(0, match.index);
@@ -32,11 +32,14 @@ exports.markupToLegacyDraftJS = (0, bidirectional_adapter_1.createMultiAdapter)(
32
32
  if (substring) {
33
33
  span.text.push(substring);
34
34
  }
35
- if (isVariable) {
36
- span.text.push({ variableID: entityID });
35
+ if (!entitiesOnly && (variableID === variableName || !!variablesMapByID[variableID])) {
36
+ span.text.push({ variableID });
37
+ }
38
+ else if (!entitiesOnly && !!secretsMapByID?.[variableID]) {
39
+ span.text.push({ secretID: variableID });
37
40
  }
38
41
  else {
39
- span.text.push({ entityID });
42
+ span.text.push({ entityID: variableID });
40
43
  }
41
44
  prevMatch = match;
42
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"markup-to-legacy-draftjs.adapter.js","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"markup-to-legacy-draftjs.adapter.js","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,20 @@
1
1
  import type { Entity, Markup, Secret, Variable } from '@voiceflow/dtos';
2
2
  import type { MultiAdapter } from 'bidirectional-adapter';
3
3
  export interface MarkupToDraftJSFromOptions {
4
+ multiline?: boolean;
4
5
  secretsMapByID?: Partial<Record<string, Secret>>;
5
6
  entitiesMapByID: Partial<Record<string, Entity>>;
6
- multiline?: boolean;
7
- variablesMapByID?: Partial<Record<string, Variable>>;
7
+ variablesMapByID: Partial<Record<string, Variable>>;
8
8
  }
9
9
  interface MarkupToDraftJSToOptions {
10
10
  entitiesOnly?: boolean;
11
+ secretsMapByID?: Partial<Record<string, Secret>>;
12
+ variablesMapByID: Partial<Record<string, Variable>>;
11
13
  }
12
14
  export declare const markupToLegacyDraftJS: MultiAdapter<Markup, string, [
13
15
  MarkupToDraftJSFromOptions
14
16
  ], [
15
17
  MarkupToDraftJSToOptions
16
- ] | []>;
18
+ ]>;
17
19
  export {};
18
20
  //# sourceMappingURL=markup-to-legacy-draftjs.adapter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"markup-to-legacy-draftjs.adapter.d.ts","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAM1D,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;CACtD;AAED,UAAU,wBAAwB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAC9C,MAAM,EACN,MAAM,EACN;IAAC,0BAA0B;CAAC,EAC5B;IAAC,wBAAwB;CAAC,GAAG,EAAE,CAqEhC,CAAC"}
1
+ {"version":3,"file":"markup-to-legacy-draftjs.adapter.d.ts","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAM1D,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;CACrD;AAED,UAAU,wBAAwB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAC9C,MAAM,EACN,MAAM,EACN;IAAC,0BAA0B;CAAC,EAC5B;IAAC,wBAAwB;CAAC,CAsE3B,CAAC"}
@@ -1,3 +1,4 @@
1
+ /* eslint-disable sonarjs/cognitive-complexity */
1
2
  import { SLOT_REGEXP } from '@voiceflow/common';
2
3
  import { createMultiAdapter } from 'bidirectional-adapter';
3
4
  import { match } from 'ts-pattern';
@@ -9,16 +10,15 @@ export const markupToLegacyDraftJS = createMultiAdapter((markup, { multiline, se
9
10
  .when(isMarkupEntity, ({ entityID }) => `{{[${entitiesMapByID[entityID]?.name ?? 'unknown'}].${entityID}}}`)
10
11
  .when(isMarkupVariable, ({ variableID }) => `{{[${variablesMapByID?.[variableID]?.name ?? variableID}].${variableID}}}`)
11
12
  .when(isMarkupSecret, ({ secretID }) => `{{[${secretsMapByID?.[secretID]?.name ?? secretID}].${secretID}}}`)
12
- .exhaustive(), ''), (text, { entitiesOnly } = {}) => {
13
+ .exhaustive(), ''), (text, { entitiesOnly, secretsMapByID, variablesMapByID }) => {
13
14
  const matches = [...text.matchAll(SLOT_REGEXP)];
14
15
  if (!matches.length)
15
16
  return [{ text: [text] }];
16
17
  const span = { text: [] };
17
18
  let prevMatch = null;
18
19
  for (const match of matches) {
19
- const entityID = match[2];
20
- const entityName = match[1];
21
- const isVariable = !entitiesOnly && entityID === entityName;
20
+ const variableID = match[2];
21
+ const variableName = match[1];
22
22
  let substring;
23
23
  if (!prevMatch) {
24
24
  substring = text.substring(0, match.index);
@@ -29,11 +29,14 @@ export const markupToLegacyDraftJS = createMultiAdapter((markup, { multiline, se
29
29
  if (substring) {
30
30
  span.text.push(substring);
31
31
  }
32
- if (isVariable) {
33
- span.text.push({ variableID: entityID });
32
+ if (!entitiesOnly && (variableID === variableName || !!variablesMapByID[variableID])) {
33
+ span.text.push({ variableID });
34
+ }
35
+ else if (!entitiesOnly && !!secretsMapByID?.[variableID]) {
36
+ span.text.push({ secretID: variableID });
34
37
  }
35
38
  else {
36
- span.text.push({ entityID });
39
+ span.text.push({ entityID: variableID });
37
40
  }
38
41
  prevMatch = match;
39
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"markup-to-legacy-draftjs.adapter.js","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"markup-to-legacy-draftjs.adapter.js","sourceRoot":"","sources":["../../../../src/adapters/legacy/markup-to-legacy-draftjs.adapter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@voiceflow/utils-designer",
3
- "version": "1.52.0",
3
+ "version": "1.52.1",
4
4
  "exports": {
5
5
  ".": {
6
6
  "types": "./build/cjs/main.d.ts",
@@ -44,5 +44,5 @@
44
44
  "volta": {
45
45
  "extends": "../../package.json"
46
46
  },
47
- "gitHead": "575bf46bcdc56e86f5b15f6c07ac1757091573fb"
47
+ "gitHead": "48130c6a9d87aa5ad9fabb87330b8d1138348d1f"
48
48
  }