@pdfme/schemas 4.2.5-dev.1 → 4.2.5-dev.4

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.
Files changed (16) hide show
  1. package/dist/cjs/src/barcodes/helper.js +1 -1
  2. package/dist/cjs/src/barcodes/helper.js.map +1 -1
  3. package/dist/cjs/src/multiVariableText/helper.js +13 -9
  4. package/dist/cjs/src/multiVariableText/helper.js.map +1 -1
  5. package/dist/cjs/src/multiVariableText/propPanel.js +1 -1
  6. package/dist/cjs/src/multiVariableText/propPanel.js.map +1 -1
  7. package/dist/esm/src/barcodes/helper.js +1 -1
  8. package/dist/esm/src/barcodes/helper.js.map +1 -1
  9. package/dist/esm/src/multiVariableText/helper.js +13 -9
  10. package/dist/esm/src/multiVariableText/helper.js.map +1 -1
  11. package/dist/esm/src/multiVariableText/propPanel.js +1 -1
  12. package/dist/esm/src/multiVariableText/propPanel.js.map +1 -1
  13. package/package.json +1 -1
  14. package/src/barcodes/helper.ts +1 -1
  15. package/src/multiVariableText/helper.ts +14 -9
  16. package/src/multiVariableText/propPanel.ts +1 -1
package/dist/cjs/src/barcodes/helper.js CHANGED
@@ -113,7 +113,7 @@ const createBarCode = async (arg) => {
113
113
  const { type, input, width, height, backgroundColor, barColor, textColor, includetext = constants_js_1.DEFAULT_BARCODE_INCLUDETEXT, } = arg;
114
114
  const bcid = (0, exports.barCodeType2Bcid)(type);
115
115
  const scale = 5;
116
- const bwipjsArg = { bcid, text: input, width, height, scale, includetext };
116
+ const bwipjsArg = { bcid, text: input, width, height, scale, includetext, textxalign: 'center' };
117
117
  if (backgroundColor)
118
118
  bwipjsArg.backgroundcolor = (0, exports.mapHexColorForBwipJsLib)(backgroundColor);
119
119
  if (barColor)
package/dist/cjs/src/barcodes/helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/barcodes/helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/barcodes/helper.ts"],"names":[],"mappings":"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"}
package/dist/cjs/src/multiVariableText/helper.js CHANGED
@@ -2,17 +2,21 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.substituteVariables = void 0;
4
4
  const substituteVariables = (text, variablesIn) => {
5
- if (!text || !variablesIn) {
6
- return text;
5
+ if (!text) {
6
+ return "";
7
7
  }
8
8
  let substitutedText = text;
9
- const variables = (typeof variablesIn === "string") ? JSON.parse(variablesIn) || {} : variablesIn;
10
- Object.keys(variables).forEach((variableName) => {
11
- // handle special characters in variable name
12
- const variableForRegex = variableName.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
13
- const regex = new RegExp('{' + variableForRegex + '}', 'g');
14
- substitutedText = substitutedText.replace(regex, variables[variableName]);
15
- });
9
+ if (variablesIn) {
10
+ const variables = (typeof variablesIn === "string") ? JSON.parse(variablesIn) || {} : variablesIn;
11
+ Object.keys(variables).forEach((variableName) => {
12
+ // handle special characters in variable name
13
+ const variableForRegex = variableName.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
14
+ const regex = new RegExp('{' + variableForRegex + '}', 'g');
15
+ substitutedText = substitutedText.replace(regex, variables[variableName]);
16
+ });
17
+ }
18
+ // Remove any variables that were not substituted from inputs
19
+ substitutedText = substitutedText.replace(/{[^{}]+}/g, '');
16
20
  return substitutedText;
17
21
  };
18
22
  exports.substituteVariables = substituteVariables;
package/dist/cjs/src/multiVariableText/helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/multiVariableText/helper.ts"],"names":[],"mappings":";;;AAAO,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,WAA4C,EAAU,EAAE;IACxG,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,MAAM,SAAS,GAA2B,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAE1H,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QAC9C,6CAA6C;QAC7C,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAChF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,gBAAgB,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAjBW,QAAA,mBAAmB,uBAiB9B"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/multiVariableText/helper.ts"],"names":[],"mappings":";;;AAAO,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,WAA4C,EAAU,EAAE;IACxG,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IAED,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,IAAI,WAAW,EAAE;QACf,MAAM,SAAS,GAA2B,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QAE1H,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9C,6CAA6C;YAC7C,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;YAChF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,gBAAgB,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;YAC5D,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;KACJ;IAED,6DAA6D;IAC7D,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAE3D,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B"}
package/dist/cjs/src/multiVariableText/propPanel.js CHANGED
@@ -103,7 +103,7 @@ const updateVariablesFromText = (text, variables) => {
103
103
  // Add any new variables
104
104
  for (const match of matches) {
105
105
  const variableName = match.replace('{', '').replace('}', '');
106
- if (!variables[variableName]) {
106
+ if (!(variableName in variables)) {
107
107
  // NOTE: We upper case the variable name as the default value
108
108
  variables[variableName] = variableName.toUpperCase();
109
109
  changed = true;
package/dist/cjs/src/multiVariableText/propPanel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"propPanel.js","sourceRoot":"","sources":["../../../../src/multiVariableText/propPanel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"propPanel.js","sourceRoot":"","sources":["../../../../src/multiVariableText/propPanel.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/barcodes/helper.js CHANGED
@@ -104,7 +104,7 @@ export const createBarCode = async (arg) => {
104
104
  const { type, input, width, height, backgroundColor, barColor, textColor, includetext = DEFAULT_BARCODE_INCLUDETEXT, } = arg;
105
105
  const bcid = barCodeType2Bcid(type);
106
106
  const scale = 5;
107
- const bwipjsArg = { bcid, text: input, width, height, scale, includetext };
107
+ const bwipjsArg = { bcid, text: input, width, height, scale, includetext, textxalign: 'center' };
108
108
  if (backgroundColor)
109
109
  bwipjsArg.backgroundcolor = mapHexColorForBwipJsLib(backgroundColor);
110
110
  if (barColor)
package/dist/esm/src/barcodes/helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/barcodes/helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/barcodes/helper.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/multiVariableText/helper.js CHANGED
@@ -1,15 +1,19 @@
1
1
  export const substituteVariables = (text, variablesIn) => {
2
- if (!text || !variablesIn) {
3
- return text;
2
+ if (!text) {
3
+ return "";
4
4
  }
5
5
  let substitutedText = text;
6
- const variables = (typeof variablesIn === "string") ? JSON.parse(variablesIn) || {} : variablesIn;
7
- Object.keys(variables).forEach((variableName) => {
8
- // handle special characters in variable name
9
- const variableForRegex = variableName.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
10
- const regex = new RegExp('{' + variableForRegex + '}', 'g');
11
- substitutedText = substitutedText.replace(regex, variables[variableName]);
12
- });
6
+ if (variablesIn) {
7
+ const variables = (typeof variablesIn === "string") ? JSON.parse(variablesIn) || {} : variablesIn;
8
+ Object.keys(variables).forEach((variableName) => {
9
+ // handle special characters in variable name
10
+ const variableForRegex = variableName.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
11
+ const regex = new RegExp('{' + variableForRegex + '}', 'g');
12
+ substitutedText = substitutedText.replace(regex, variables[variableName]);
13
+ });
14
+ }
15
+ // Remove any variables that were not substituted from inputs
16
+ substitutedText = substitutedText.replace(/{[^{}]+}/g, '');
13
17
  return substitutedText;
14
18
  };
15
19
  //# sourceMappingURL=helper.js.map
package/dist/esm/src/multiVariableText/helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/multiVariableText/helper.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,WAA4C,EAAU,EAAE;IACxG,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,MAAM,SAAS,GAA2B,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAE1H,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;QAC9C,6CAA6C;QAC7C,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAChF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,gBAAgB,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/multiVariableText/helper.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,WAA4C,EAAU,EAAE;IACxG,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IAED,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,IAAI,WAAW,EAAE;QACf,MAAM,SAAS,GAA2B,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QAE1H,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9C,6CAA6C;YAC7C,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;YAChF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,gBAAgB,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;YAC5D,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;KACJ;IAED,6DAA6D;IAC7D,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAE3D,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}
package/dist/esm/src/multiVariableText/propPanel.js CHANGED
@@ -100,7 +100,7 @@ const updateVariablesFromText = (text, variables) => {
100
100
  // Add any new variables
101
101
  for (const match of matches) {
102
102
  const variableName = match.replace('{', '').replace('}', '');
103
- if (!variables[variableName]) {
103
+ if (!(variableName in variables)) {
104
104
  // NOTE: We upper case the variable name as the default value
105
105
  variables[variableName] = variableName.toUpperCase();
106
106
  changed = true;
package/dist/esm/src/multiVariableText/propPanel.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"propPanel.js","sourceRoot":"","sources":["../../../../src/multiVariableText/propPanel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"propPanel.js","sourceRoot":"","sources":["../../../../src/multiVariableText/propPanel.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pdfme/schemas",
3
- "version": "4.2.5-dev.1",
3
+ "version": "4.2.5-dev.4",
4
4
  "sideEffects": false,
5
5
  "author": "hand-dot",
6
6
  "license": "MIT",
package/src/barcodes/helper.ts CHANGED
@@ -148,7 +148,7 @@ export const createBarCode = async (arg: {
148
148
 
149
149
  const bcid = barCodeType2Bcid(type);
150
150
  const scale = 5;
151
- const bwipjsArg: RenderOptions = { bcid, text: input, width, height, scale, includetext };
151
+ const bwipjsArg: RenderOptions = { bcid, text: input, width, height, scale, includetext, textxalign: 'center' };
152
152
 
153
153
  if (backgroundColor) bwipjsArg.backgroundcolor = mapHexColorForBwipJsLib(backgroundColor);
154
154
  if (barColor) bwipjsArg.barcolor = mapHexColorForBwipJsLib(barColor);
package/src/multiVariableText/helper.ts CHANGED
@@ -1,18 +1,23 @@
1
1
  export const substituteVariables = (text: string, variablesIn: string | Record<string, string>): string => {
2
- if (!text || !variablesIn) {
3
- return text;
2
+ if (!text) {
3
+ return "";
4
4
  }
5
5
 
6
6
  let substitutedText = text;
7
7
 
8
- const variables: Record<string, string> = (typeof variablesIn === "string") ? JSON.parse(variablesIn) || {} : variablesIn;
8
+ if (variablesIn) {
9
+ const variables: Record<string, string> = (typeof variablesIn === "string") ? JSON.parse(variablesIn) || {} : variablesIn;
9
10
 
10
- Object.keys(variables).forEach((variableName) => {
11
- // handle special characters in variable name
12
- const variableForRegex = variableName.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
13
- const regex = new RegExp('{' + variableForRegex + '}', 'g');
14
- substitutedText = substitutedText.replace(regex, variables[variableName]);
15
- });
11
+ Object.keys(variables).forEach((variableName) => {
12
+ // handle special characters in variable name
13
+ const variableForRegex = variableName.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
14
+ const regex = new RegExp('{' + variableForRegex + '}', 'g');
15
+ substitutedText = substitutedText.replace(regex, variables[variableName]);
16
+ });
17
+ }
18
+
19
+ // Remove any variables that were not substituted from inputs
20
+ substitutedText = substitutedText.replace(/{[^{}]+}/g, '');
16
21
 
17
22
  return substitutedText;
18
23
  };
package/src/multiVariableText/propPanel.ts CHANGED
@@ -115,7 +115,7 @@ const updateVariablesFromText = (text: string, variables: any): boolean => {
115
115
  // Add any new variables
116
116
  for (const match of matches) {
117
117
  const variableName = match.replace('{', '').replace('}', '');
118
- if (!variables[variableName]) {
118
+ if (!(variableName in variables)) {
119
119
  // NOTE: We upper case the variable name as the default value
120
120
  variables[variableName] = variableName.toUpperCase();
121
121
  changed = true;