Execute implementation plan for WASM binary optimization

fpdf/attachments.go

@@ -1,3 +1,5 @@
+//go:build !wasm
+
 // Copyright ©2023 The go-pdf Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.

fpdf/attachments_wasm.go

@@ -0,0 +1,43 @@
+//go:build wasm
+
+package fpdf
+
+import (
+	. "github.com/tinywasm/fmt"
+)
+
+type Attachment struct {
+	Content      []byte
+	Filename     string
+	Description  string
+	objectNumber int
+}
+
+type annotationAttach struct {
+	*Attachment
+	x, y, w, h float64
+}
+
+func (f *Fpdf) SetAttachments(as []Attachment) {
+	f.err = Err("attachments", "unsupported", "in WASM")
+}
+
+func (f *Fpdf) AddAttachmentAnnotation(a *Attachment, x, y, w, h float64) {
+	f.err = Err("attachments", "unsupported", "in WASM")
+}
+
+func (f *Fpdf) putAttachments() {
+	// no-op in WASM
+}
+
+func (f *Fpdf) putAnnotationsAttachments() {
+	// no-op in WASM
+}
+
+func (f *Fpdf) getEmbeddedFiles() string {
+	return ""
+}
+
+func (f *Fpdf) putAttachmentAnnotationLinks(out *fmtBuffer, page int) {
+	// no-op in WASM
+}

fpdf/def.go

@@ -675,7 +675,7 @@ func (f *fontDefType) Schema() []fmt.Field {
 		{Name: "Desc", Type: fmt.FieldStruct},
 		{Name: "Up", Type: fmt.FieldInt},
 		{Name: "Ut", Type: fmt.FieldInt},
-		{Name: "Cw", Type: fmt.FieldInt},
+		{Name: "Cw", Type: fmt.FieldIntSlice},
 		{Name: "Enc", Type: fmt.FieldText},
 		{Name: "Diff", Type: fmt.FieldText},
 		{Name: "File", Type: fmt.FieldText},

fpdf/exampleDir_test.go

@@ -52,8 +52,8 @@ func NewDocPdfTest(options ...any) *fpdf.Fpdf {
 	pdf := fpdf.New(options...)
 	pdf.SetCompression(false)
 	pdf.SetCatalogSort(true)
-	pdf.SetCreationDate(time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC))
-	pdf.SetModificationDate(time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC))
+	pdf.SetCreationDate(time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano())
+	pdf.SetModificationDate(time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC).UnixNano())
 
 	return pdf
 }

fpdf/font.go

@@ -1,3 +1,5 @@
+//go:build !wasm
+
 package fpdf
 
 import (
@@ -12,6 +14,28 @@ import (
 	. "github.com/tinywasm/fmt"
 )
 
+// fileExist returns true if the specified normal file exists
+func fileExist(filename string) (ok bool) {
+	info, err := os.Stat(filename)
+	if err == nil {
+		if ^os.ModePerm&info.Mode() == 0 {
+			ok = true
+		}
+	}
+	return ok
+}
+
+// fileSize returns the size of the specified file; ok will be false
+// if the file does not exist or is not an ordinary file
+func fileSize(filename string) (size int64, ok bool) {
+	info, err := os.Stat(filename)
+	ok = err == nil
+	if ok {
+		size = info.Size()
+	}
+	return
+}
+
 func baseNoExt(fileStr string) string {
 	str := filepath.Base(fileStr)
 	extLen := len(filepath.Ext(str))

fpdf/fontid_wasm.go → fpdf/fontid.go

@@ -1,18 +1,19 @@
-//go:build wasm
-
 package fpdf
 
 import (
-	. "github.com/tinywasm/fmt"
+	"github.com/tinywasm/unixid"
 )
 
+var uid, _ = unixid.NewUnixID()
+
 func generateImageID(info *ImageInfoType) (string, error) {
-	// Simple deterministic ID for WASM to avoid crypto/sha1
-	return Sprintf("img_%d_%d_%d", int(info.w), int(info.h), len(info.data)), nil
+	var id string
+	uid.SetNewID(&id)
+	return id, nil
 }
 
 // generateFontID generates a font Id from the font definition
 func generateFontID(fdt fontDefType) (string, error) {
-	// Simple deterministic ID for WASM
+	// Simple deterministic ID
 	return fdt.Tp + "_" + fdt.Name, nil
 }

fpdf/fonts_json_wasm.go → fpdf/fonts_json.go

@@ -1,5 +1,3 @@
-//go:build wasm
-
 package fpdf
 
 import (

fpdf/fpdf_test.go

@@ -1296,7 +1296,7 @@ func Test_SVGBasicWrite(t *testing.T) {
 		`web control is supported and is used in this example.`
 	html := pdf.HTMLBasicNew()
 	html.Write(lineHt, htmlStr)
-	sig, err = fpdf.SVGBasicFileParse(ImageFile(sigFileStr))
+	sig, err = pdf.SVGBasicFileParse(ImageFile(sigFileStr))
 	if err == nil {
 		scale := 100 / sig.Wd
 		scaleY := 30 / sig.Ht
@@ -1345,7 +1345,7 @@ func Test_SVGBasicDraw(t *testing.T) {
 		`size is used. scale 1.0 is pt`
 	html := pdf.HTMLBasicNew()
 	html.Write(lineHt, htmlStr)
-	sig, err = fpdf.SVGBasicFileParse(ImageFile(sigFileStr))
+	sig, err = pdf.SVGBasicFileParse(ImageFile(sigFileStr))
 	if err == nil {
 		pdf.SetLineCapStyle("round")
 		pdf.SetLineWidth(0.15)
@@ -2696,7 +2696,7 @@ func Test_SetModificationDate(t *testing.T) {
 	// ModDate:        Sun Jan  2 10:22:30 2000
 	pdf := NewDocPdfTest()
 	pdf.AddPage()
-	pdf.SetModificationDate(time.Date(2000, 1, 2, 10, 22, 30, 0, time.UTC))
+	pdf.SetModificationDate(time.Date(2000, 1, 2, 10, 22, 30, 0, time.UTC).UnixNano())
 	fileStr := Filename("Test_SetModificationDate")
 	err := pdf.OutputFileAndClose(fileStr)
 	SummaryCompare(err, fileStr)

fpdf/getter_test.go

@@ -124,13 +124,14 @@ func TestGetConversionRatio(t *testing.T) {
 }
 
 func TestGetCreationDate(t *testing.T) {
-	setDate, _ := time.Parse(time.RFC3339, "2003-06-17T01:23:45Z")
+	tm, _ := time.Parse(time.RFC3339, "2003-06-17T01:23:45Z")
+	setDate := tm.UnixNano()
 	pdf := NewDocPdfTest()
 	pdf.SetCreationDate(setDate)
 
 	creationDate := pdf.GetCreationDate()
 
-	if got, want := creationDate, setDate; !got.Equal(want) {
+	if got, want := creationDate, setDate; got != want {
 		t.Errorf("invalid creationDate: got=%v, want=%v", got, want)
 	}
 }
@@ -446,13 +447,14 @@ func TestGetMargins(t *testing.T) {
 }
 
 func TestGetModificationDate(t *testing.T) {
-	setDate, _ := time.Parse(time.RFC3339, "9-08-02T09:54:32Z")
+	tm, _ := time.Parse(time.RFC3339, "2009-08-02T09:54:32Z")
+	setDate := tm.UnixNano()
 	pdf := NewDocPdfTest()
 	pdf.SetModificationDate(setDate)
 
 	modificationDate := pdf.GetModificationDate()
 
-	if got, want := modificationDate, setDate; !got.Equal(want) {
+	if got, want := modificationDate, setDate; got != want {
 		t.Errorf("invalid modificationDate: got=%v, want=%v", got, want)
 	}
 }

fpdf/list/list.go

@@ -1,3 +1,5 @@
+//go:build !wasm
+
 package main
 
 import (

fpdf/svgbasic.go

@@ -2,7 +2,6 @@ package fpdf
 
 import (
 	"encoding/xml"
-	"os"
 
 	. "github.com/tinywasm/fmt"
 )
@@ -297,9 +296,9 @@ func SVGBasicParse(buf []byte) (sig SVGBasicType, err error) {
 
 // SVGBasicFileParse parses a simple scalable vector graphics (SVG) file into a
 // basic descriptor. The SVGBasicWrite() example demonstrates this method.
-func SVGBasicFileParse(svgFileStr string) (sig SVGBasicType, err error) {
+func (f *Fpdf) SVGBasicFileParse(svgFileStr string) (sig SVGBasicType, err error) {
 	var buf []byte
-	buf, err = os.ReadFile(svgFileStr)
+	buf, err = f.readFile(svgFileStr)
 	if err == nil {
 		sig, err = SVGBasicParse(buf)
 	}

fpdf/time_wasm.go → fpdf/time.go

@@ -1,5 +1,3 @@
-//go:build wasm
-
 package fpdf
 
 import (

fpdf/types_wasm.go → fpdf/types.go

@@ -1,5 +1,3 @@
-//go:build wasm
-
 package fpdf
 
 type pdfTime int64

fpdf/util.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"io"
 	"math"
-	"os"
 
 	. "github.com/tinywasm/fmt"
 )
@@ -33,27 +32,6 @@ func sprintf(fmtStr string, args ...any) string {
 	return Sprintf(fmtStr, args...)
 }
 
-// fileExist returns true if the specified normal file exists
-func fileExist(filename string) (ok bool) {
-	info, err := os.Stat(filename)
-	if err == nil {
-		if ^os.ModePerm&info.Mode() == 0 {
-			ok = true
-		}
-	}
-	return ok
-}
-
-// fileSize returns the size of the specified file; ok will be false
-// if the file does not exist or is not an ordinary file
-func fileSize(filename string) (size int64, ok bool) {
-	info, err := os.Stat(filename)
-	ok = err == nil
-	if ok {
-		size = info.Size()
-	}
-	return
-}
 
 // utf8toutf16 converts UTF-8 to UTF-16BE; from http://www.fpdf.org/
 func utf8toutf16(s string, withBOM ...bool) string {