@pdfme/common 1.0.0-beta.7 → 1.0.0

package/dist/types/helper.d.ts

@@ -7,6 +7,8 @@ export declare const checkFont: (arg: {
     font: Font;
     template: Template;
 }) => void;
+export declare const checkInputs: (data: unknown) => void;
+export declare const checkUIOptions: (data: unknown) => void;
 export declare const checkTemplate: (data: unknown) => void;
 export declare const checkUIProps: (data: unknown) => void;
 export declare const checkPreviewProps: (data: unknown) => void;

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 import { DEFAULT_FONT_SIZE, DEFAULT_ALIGNMENT, DEFAULT_LINE_HEIGHT, DEFAULT_CHARACTER_SPACING, DEFAULT_FONT_COLOR, BLANK_PDF } from './constants';
 import { schemaTypes, isImageSchema, isBarcodeSchema, isTextSchema } from './type';
 import type { Lang, Size, Alignment, SchemaType, BarCodeType, TextSchema, ImageSchema, BarcodeSchema, Schema, SchemaForUI, Font, BasePdf, Template, CommonProps, GeneratorOptions, GenerateProps, UIOptions, UIProps, PreviewProps, PreviewReactProps, DesignerProps, DesignerReactProps } from './type';
-import { getB64BasePdf, b64toUint8Array, getFallbackFontName, getDefaultFont, checkFont, checkTemplate, checkUIProps, checkPreviewProps, checkDesignerProps, checkGenerateProps, validateBarcodeInput } from './helper';
-export { DEFAULT_FONT_SIZE, DEFAULT_ALIGNMENT, DEFAULT_LINE_HEIGHT, DEFAULT_CHARACTER_SPACING, DEFAULT_FONT_COLOR, BLANK_PDF, schemaTypes, isTextSchema, isImageSchema, isBarcodeSchema, getB64BasePdf, b64toUint8Array, getFallbackFontName, getDefaultFont, checkFont, checkTemplate, checkUIProps, checkPreviewProps, checkDesignerProps, checkGenerateProps, validateBarcodeInput, };
+import { getB64BasePdf, b64toUint8Array, getFallbackFontName, getDefaultFont, checkFont, checkInputs, checkUIOptions, checkTemplate, checkUIProps, checkPreviewProps, checkDesignerProps, checkGenerateProps, validateBarcodeInput } from './helper';
+export { DEFAULT_FONT_SIZE, DEFAULT_ALIGNMENT, DEFAULT_LINE_HEIGHT, DEFAULT_CHARACTER_SPACING, DEFAULT_FONT_COLOR, BLANK_PDF, schemaTypes, isTextSchema, isImageSchema, isBarcodeSchema, getB64BasePdf, b64toUint8Array, getFallbackFontName, getDefaultFont, checkFont, checkInputs, checkUIOptions, checkTemplate, checkUIProps, checkPreviewProps, checkDesignerProps, checkGenerateProps, validateBarcodeInput, };
 export type { Lang, Size, Alignment, SchemaType, BarCodeType, TextSchema, ImageSchema, BarcodeSchema, Schema, SchemaForUI, Font, BasePdf, Template, CommonProps, GeneratorOptions, GenerateProps, UIOptions, UIProps, PreviewProps, PreviewReactProps, DesignerProps, DesignerReactProps, };

package/dist/types/schema.d.ts

@@ -686,6 +686,7 @@ export declare const Template: z.ZodObject<{
     }>[];
     basePdf: string | ArrayBuffer | Uint8Array;
 }>;
+export declare const Inputs: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodString>, "many">;
 export declare const CommonProps: z.ZodObject<{
     template: z.ZodObject<{
         schemas: z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<z.extendShape<{
@@ -2149,8 +2150,8 @@ export declare const PreviewProps: z.ZodObject<z.extendShape<z.extendShape<{
         }>[];
         basePdf: string | ArrayBuffer | Uint8Array;
     };
-    domContainer: HTMLElement;
     inputs: Record<string, string>[];
+    domContainer: HTMLElement;
 }, {
     options?: {
         font?: Record<string, {
@@ -2200,8 +2201,8 @@ export declare const PreviewProps: z.ZodObject<z.extendShape<z.extendShape<{
         }>[];
         basePdf: string | ArrayBuffer | Uint8Array;
     };
-    domContainer: HTMLElement;
     inputs: Record<string, string>[];
+    domContainer: HTMLElement;
 }>;
 export declare const PreviewReactProps: z.ZodObject<z.extendShape<{
     options: z.ZodOptional<z.ZodObject<z.extendShape<{

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@pdfme/common",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0",
   "author": "hand-dot",
   "license": "MIT",
   "description": "TypeScript base PDF generator and React base UI. Open source, developed by the community, and completely free to use under the MIT license!",
   "homepage": "https://pdfme.com",
-  "repository": "git@github.com:pdfme/pdfme.git",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:pdfme/pdfme.git"
+  },
   "bugs": {
     "url": "https://github.com/pdfme/pdfme/issues"
   },
@@ -16,7 +19,7 @@
     "node": ">=14"
   },
   "scripts": {
-    "develop": "webpack-dev-server --mode development",
+    "develop": "webpack --watch --mode development",
     "build": "NODE_ENV=production webpack --mode production",
     "clean": "rimraf dist",
     "lint": "tsc --noEmit",
@@ -51,4 +54,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/helper.ts

@@ -2,6 +2,8 @@ import { z } from 'zod';
 import Helvetica from './assets/Helvetica.ttf';
 import { Template, Schema, BasePdf, Font, CommonProps, isTextSchema, BarCodeType } from './type';
 import {
+  Inputs as InputsSchema,
+  UIOptions as UIOptionsSchema,
   Template as TemplateSchema,
   PreviewProps as PreviewPropsSchema,
   DesignerProps as DesignerPropsSchema,
@@ -40,13 +42,18 @@ export const getB64BasePdf = (basePdf: BasePdf) => {
   return basePdf as string;
 };
 
+const getByteString = (base64: string) => {
+  if (typeof window !== 'undefined' && window.atob) {
+    return window.atob(base64);
+  } else {
+    return Buffer.from(base64, 'base64').toString('binary');
+  }
+};
+
 export const b64toUint8Array = (base64: string) => {
   const data = base64.split(';base64,')[1] ? base64.split(';base64,')[1] : base64;
 
-  const byteString =
-    typeof window !== 'undefined'
-      ? window.atob(data)
-      : Buffer.from(data, 'base64').toString('binary');
+  const byteString = getByteString(data);
 
   const unit8arr = new Uint8Array(byteString.length);
   for (let i = 0; i < byteString.length; i += 1) {
@@ -135,12 +142,36 @@ ${message}`);
   }
 };
 
+export const checkInputs = (data: unknown) => checkProps(data, InputsSchema);
+export const checkUIOptions = (data: unknown) => checkProps(data, UIOptionsSchema);
 export const checkTemplate = (data: unknown) => checkProps(data, TemplateSchema);
 export const checkUIProps = (data: unknown) => checkProps(data, UIPropsSchema);
 export const checkPreviewProps = (data: unknown) => checkProps(data, PreviewPropsSchema);
 export const checkDesignerProps = (data: unknown) => checkProps(data, DesignerPropsSchema);
 export const checkGenerateProps = (data: unknown) => checkProps(data, GeneratePropsSchema);
 
+// GTIN-13, GTIN-8, GTIN-12, GTIN-14
+const validateCheckDigit = (input: string, checkDigitPos: number) => {
+  let passCheckDigit = true;
+
+  if (input.length === checkDigitPos) {
+    const ds = input.slice(0, -1).replace(/[^0-9]/g, '');
+    let sum = 0;
+    let odd = 1;
+    for (let i = ds.length - 1; i > -1; i -= 1) {
+      sum += Number(ds[i]) * (odd ? 3 : 1);
+      odd ^= 1;
+      if (sum > 0xffffffffffff) {
+        // ~2^48 at max
+        sum %= 10;
+      }
+    }
+    passCheckDigit = String(10 - (sum % 10)).slice(-1) === input.slice(-1);
+  }
+
+  return passCheckDigit;
+};
+
 export const validateBarcodeInput = (type: BarCodeType, input: string) => {
   if (!input) return false;
   if (type === 'qrcode') {
@@ -157,13 +188,13 @@ export const validateBarcodeInput = (type: BarCodeType, input: string) => {
     // 有効文字は数値(0-9)のみ。チェックデジットを含まない12桁orチェックデジットを含む13桁。
     const regexp = /^\d{12}$|^\d{13}$/;
 
-    return regexp.test(input);
+    return regexp.test(input) && validateCheckDigit(input, 13);
   }
   if (type === 'ean8') {
     // 有効文字は数値(0-9)のみ。チェックデジットを含まない7桁orチェックデジットを含む8桁。
     const regexp = /^\d{7}$|^\d{8}$/;
 
-    return regexp.test(input);
+    return regexp.test(input) && validateCheckDigit(input, 8);
   }
   if (type === 'code39') {
     // 有効文字は数字(0-9)。アルファベット大文字(A-Z)、記号(-.$/+%)、半角スペース。
@@ -189,20 +220,20 @@ export const validateBarcodeInput = (type: BarCodeType, input: string) => {
     // 有効文字は数値(0-9)のみ。 チェックデジットを含まない13桁orチェックデジットを含む14桁。
     const regexp = /^\d{13}$|^\d{14}$/;
 
-    return regexp.test(input);
+    return regexp.test(input) && validateCheckDigit(input, 14);
   }
   if (type === 'upca') {
     // 有効文字は数値(0-9)のみ。 チェックデジットを含まない11桁orチェックデジットを含む12桁。
     const regexp = /^\d{11}$|^\d{12}$/;
 
-    return regexp.test(input);
+    return regexp.test(input) && validateCheckDigit(input, 12);
   }
   if (type === 'upce') {
     // 有効文字は数値(0-9)のみ。 1桁目に指定できる数字(ナンバーシステムキャラクタ)は0のみ。
     // チェックデジットを含まない7桁orチェックデジットを含む8桁。
     const regexp = /^0(\d{6}$|\d{7}$)/;
 
-    return regexp.test(input);
+    return regexp.test(input) && validateCheckDigit(input, 8);
   }
 
   return false;

package/src/index.ts

@@ -37,6 +37,8 @@ import {
   getFallbackFontName,
   getDefaultFont,
   checkFont,
+  checkInputs,
+  checkUIOptions,
   checkTemplate,
   checkUIProps,
   checkPreviewProps,
@@ -61,6 +63,8 @@ export {
   getFallbackFontName,
   getDefaultFont,
   checkFont,
+  checkInputs,
+  checkUIOptions,
   checkTemplate,
   checkUIProps,
   checkPreviewProps,

package/src/schema.ts

@@ -37,10 +37,8 @@ export const TextSchema = CommonSchema.extend({
 });
 
 export const ImageSchema = CommonSchema.extend({ type: z.literal(SchemaType.Enum.image) });
-type ImageSchema = z.infer<typeof ImageSchema>;
 
 export const BarcodeSchema = CommonSchema.extend({ type: BarcodeSchemaType });
-type BarcodeSchema = z.infer<typeof BarcodeSchema>;
 
 export const Schema = z.union([TextSchema, ImageSchema, BarcodeSchema]);
 
@@ -68,7 +66,7 @@ export const Template = z.object({
   columns: z.array(z.string()).optional(),
 });
 
-const Inputs = z.array(z.record(z.string())).min(1);
+export const Inputs = z.array(z.record(z.string())).min(1);
 
 const CommonOptions = z.object({ font: Font.optional() });
 

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "noImplicitAny": true,
-    "target": "es5",
+    "target": "ES2015",
     "esModuleInterop": true,
     "isolatedModules": true,
     "declaration": true,

package/webpack.config.js

@@ -35,7 +35,6 @@ const config = {
     filename: 'index.js',
     globalObject: 'this',
     library: {
-      name: pkg.name,
       type: 'umd',
     },
   },