From 087260447fd232bc89a4bd370b1b7bdb70fa25bc Mon Sep 17 00:00:00 2001 From: Tim Voronov Date: Wed, 8 Jul 2026 10:25:03 -0400 Subject: [PATCH 1/2] Upgrade Ferret module to v2.0.0-alpha.30 in go.mod and go.sum, and remove unused artifact.Marshal argument --- go.mod | 2 +- go.sum | 4 ++-- pkg/build/artifact.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 740d2ea..522e7f2 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.6 github.com/MontFerret/contrib/modules/xml v1.0.0-rc.6 github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.6 - github.com/MontFerret/ferret/v2 v2.0.0-alpha.26 + github.com/MontFerret/ferret/v2 v2.0.0-alpha.30 github.com/chzyer/readline v1.5.1 github.com/go-waitfor/waitfor v1.1.0 github.com/go-waitfor/waitfor-http v1.1.0 diff --git a/go.sum b/go.sum index bae9679..010a5b3 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ github.com/MontFerret/contrib/pkg/common v0.1.1 h1:qA2URATIO+EVLH3BNFKYupLx97fto github.com/MontFerret/contrib/pkg/common v0.1.1/go.mod h1:wiMLQnE46YGci3qMzA3ExArKomQDXR5DvNSE7HnP0ik= github.com/MontFerret/cssx v0.2.0 h1:De0C6Irbg+qgFPXgWmPpVnwD4RRYUBQSbIYFTUVCNWU= github.com/MontFerret/cssx v0.2.0/go.mod h1:fmGtRUNVaeJYpiPSDlNIbbYzb3+K8NxmNmJOYqlHATU= -github.com/MontFerret/ferret/v2 v2.0.0-alpha.26 h1:p5l/TGIxgWkXfApDQBvbUsVNdnTs9wpIyUZQsog6b80= -github.com/MontFerret/ferret/v2 v2.0.0-alpha.26/go.mod h1:jkZZNJrQKhQ8K9v3lzkMKR5NnCyOUKRRKCTAwCOBq8A= +github.com/MontFerret/ferret/v2 v2.0.0-alpha.30 h1:zMTPJoEbv1H91Fe7g+pmU0chiKhMKnVcxJSCF3mk5xs= +github.com/MontFerret/ferret/v2 v2.0.0-alpha.30/go.mod h1:jkZZNJrQKhQ8K9v3lzkMKR5NnCyOUKRRKCTAwCOBq8A= github.com/PuerkitoBio/goquery v1.12.0 h1:pAcL4g3WRXekcB9AU/y1mbKez2dbY2AajVhtkO8RIBo= github.com/PuerkitoBio/goquery v1.12.0/go.mod h1:802ej+gV2y7bbIhOIoPY5sT183ZW0YFofScC4q/hIpQ= github.com/andybalholm/cascadia v1.3.4 h1:vM2lgh0Vru9Vwyfm4cQqWP2HHMW0u0+2PAW7Q38Qufg= diff --git a/pkg/build/artifact.go b/pkg/build/artifact.go index a9eb974..601dbe1 100644 --- a/pkg/build/artifact.go +++ b/pkg/build/artifact.go @@ -29,7 +29,7 @@ func WriteArtifact(c *compiler.Compiler, src *source.Source, outputPath string) return err } - data, err := artifact.Marshal(program, artifact.Options{}) + data, err := artifact.Marshal(program) if err != nil { return fmt.Errorf("serialize %s: %w", src.Name(), err) From 367f560d467d7213ba0672c0ee09ca088e36764d Mon Sep 17 00:00:00 2001 From: Tim Voronov Date: Wed, 8 Jul 2026 12:21:06 -0400 Subject: [PATCH 2/2] Upgrade dependencies, add new Ferret modules (Postgres, PDF, XLSX), and update built-in module logic --- go.mod | 40 +++++++++++----- go.sum | 88 ++++++++++++++++++++++++---------- pkg/runtime/builtin_modules.go | 12 +++++ 3 files changed, 101 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index 522e7f2..4012c08 100644 --- a/go.mod +++ b/go.mod @@ -4,17 +4,20 @@ go 1.26.1 require ( github.com/Masterminds/semver/v3 v3.5.0 - github.com/MontFerret/contrib/modules/csv v1.0.0-rc.6 - github.com/MontFerret/contrib/modules/db/sqlite v1.0.0-rc.4 - github.com/MontFerret/contrib/modules/net/rest v1.0.0-rc.2 - github.com/MontFerret/contrib/modules/security/jwt v1.0.0-rc.4 - github.com/MontFerret/contrib/modules/toml v1.0.0-rc.6 - github.com/MontFerret/contrib/modules/web/article v1.0.0-rc.7 - github.com/MontFerret/contrib/modules/web/html v1.0.0-rc.11 - github.com/MontFerret/contrib/modules/web/robots v1.0.0-rc.6 - github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.6 - github.com/MontFerret/contrib/modules/xml v1.0.0-rc.6 - github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.6 + github.com/MontFerret/contrib/modules/csv v1.0.0-rc.9 + github.com/MontFerret/contrib/modules/db/postgres v1.0.0-rc.1 + github.com/MontFerret/contrib/modules/db/sqlite v1.0.0-rc.5 + github.com/MontFerret/contrib/modules/document/pdf v1.0.0-rc.1 + github.com/MontFerret/contrib/modules/document/xlsx v1.0.0-rc.1 + github.com/MontFerret/contrib/modules/net/rest v1.0.0-rc.3 + github.com/MontFerret/contrib/modules/security/jwt v1.0.0-rc.5 + github.com/MontFerret/contrib/modules/toml v1.0.0-rc.7 + github.com/MontFerret/contrib/modules/web/article v1.0.0-rc.8 + github.com/MontFerret/contrib/modules/web/html v1.0.0-rc.12 + github.com/MontFerret/contrib/modules/web/robots v1.0.0-rc.7 + github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.7 + github.com/MontFerret/contrib/modules/xml v1.0.0-rc.7 + github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.7 github.com/MontFerret/ferret/v2 v2.0.0-alpha.30 github.com/chzyer/readline v1.5.1 github.com/go-waitfor/waitfor v1.1.0 @@ -49,11 +52,16 @@ require ( github.com/goccy/go-json v0.10.6 // indirect github.com/goccy/go-yaml v1.19.2 // indirect github.com/golang-jwt/jwt/v5 v5.2.2 // indirect - github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.10.0 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/ledongthuc/pdf v0.0.0-20250511090121-5959a4027728 // indirect github.com/mafredri/cdp v0.35.0 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.22 // indirect @@ -61,24 +69,30 @@ require ( github.com/ncruces/go-strftime v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/richardlehane/mscfb v1.0.7 // indirect + github.com/richardlehane/msoleps v1.0.6 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect github.com/sethgrid/pester v1.2.0 // indirect github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.10.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect + github.com/tiendc/go-deepcopy v1.7.2 // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/wI2L/jettison v0.7.4 // indirect + github.com/xuri/efp v0.0.1 // indirect + github.com/xuri/excelize/v2 v2.11.0 // indirect + github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect github.com/ziflex/dbx v1.10.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/crypto v0.53.0 // indirect golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect golang.org/x/net v0.56.0 // indirect golang.org/x/sync v0.21.0 // indirect golang.org/x/sys v0.46.0 // indirect golang.org/x/text v0.38.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect modernc.org/libc v1.72.3 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect diff --git a/go.sum b/go.sum index 010a5b3..b08ab50 100644 --- a/go.sum +++ b/go.sum @@ -8,28 +8,34 @@ github.com/JohannesKaufmann/html-to-markdown/v2 v2.5.2 h1:XFJZFWESIWlUEHHjzBuv8R github.com/JohannesKaufmann/html-to-markdown/v2 v2.5.2/go.mod h1:BHWO8lJzttJLqwuV8Rb1B3OG2OSzLbssZDI1FRg2eAA= github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE= github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= -github.com/MontFerret/contrib/modules/csv v1.0.0-rc.6 h1:iXY/7/u47KRrcxdq/1CqtRRpvlHy7hGeacVUJqmNUnE= -github.com/MontFerret/contrib/modules/csv v1.0.0-rc.6/go.mod h1:GKx3zKQGcWIdB7BYUM/yKY+s+C2WPJWWiowPCl3hUBQ= -github.com/MontFerret/contrib/modules/db/sqlite v1.0.0-rc.4 h1:uPaX0JA5plRSNrfV48wamNKaivEB9/I/mUWZv5DUvbc= -github.com/MontFerret/contrib/modules/db/sqlite v1.0.0-rc.4/go.mod h1:Nq5GoZkAkpalBu5rH5gBhMGqF4s5F50sWcCY/vG/YhA= -github.com/MontFerret/contrib/modules/net/rest v1.0.0-rc.2 h1:50Qpx13rXZfmuwe0E+/EjoT93O7naaE6q1/N9b1KvPM= -github.com/MontFerret/contrib/modules/net/rest v1.0.0-rc.2/go.mod h1:rBLl+oruPTSu/IaONli5P3TH7APWFyCU3TItcEdiB2U= -github.com/MontFerret/contrib/modules/security/jwt v1.0.0-rc.4 h1:IpAYXY0u3rf3+ktz94DeRAj7rEsZ+HJyA4MGr1y89CY= -github.com/MontFerret/contrib/modules/security/jwt v1.0.0-rc.4/go.mod h1:WizwOVqaRtlPTkay126L4GPMotZSU4HLPKXvRpfY+3k= -github.com/MontFerret/contrib/modules/toml v1.0.0-rc.6 h1:XDMiuX6zDigvFxpfqqsJkIlaOScfQpsZkRmx965S2W8= -github.com/MontFerret/contrib/modules/toml v1.0.0-rc.6/go.mod h1:DhKnW7MPZNUKRI8HLYn7oyR8fIxWxZkb+DiIcbe69WI= -github.com/MontFerret/contrib/modules/web/article v1.0.0-rc.7 h1:Kb7d4kaYb09XQ3tnucrSCAKdRiK7wl44i+DJ7s5J7qI= -github.com/MontFerret/contrib/modules/web/article v1.0.0-rc.7/go.mod h1:bmtwL4l2kv6tWMPqDNaZyQ61aePlnl2DMpASUxEzOts= -github.com/MontFerret/contrib/modules/web/html v1.0.0-rc.11 h1:MgcOy0IDiLZImFmL3DxivqRekk9vdXrFrt8IkCbEyNs= -github.com/MontFerret/contrib/modules/web/html v1.0.0-rc.11/go.mod h1:QWaiNrJyZA4ftj021u5GuJ1ArSKGSnXBMdMiJ7YkLO0= -github.com/MontFerret/contrib/modules/web/robots v1.0.0-rc.6 h1:ilzerXcr2+BPoSxlC/DKvEvMMmV5vM79p5UUubxQaOc= -github.com/MontFerret/contrib/modules/web/robots v1.0.0-rc.6/go.mod h1:Vns8AVGMYQuY77rdEbVGA5GQUL8M5yZnUN17iYvlndI= -github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.6 h1:OkiQwPv5XCY4N4byj8RXI1bbV/QBmExZLSAmw9g8sfo= -github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.6/go.mod h1:LNv2FLxVKHMGMO8GaZAXILmf3CrYEakPm15yCNd5Vi4= -github.com/MontFerret/contrib/modules/xml v1.0.0-rc.6 h1:fPuan3cnzs8o275ty8Qo5Qmuq2vcpxfIQMWgFxer0Ck= -github.com/MontFerret/contrib/modules/xml v1.0.0-rc.6/go.mod h1:fQyVGq16aTq8/YRnaDv7oDGJtmxwLTWnF94tBIeYUTQ= -github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.6 h1:D2l5YmQ7RpThRdJt8HAIRP8A98cw80A104noEabqlEw= -github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.6/go.mod h1:15QVJzey4GG0ZLBasjaqu6aw6lGIM8k937pRYc8vlZ8= +github.com/MontFerret/contrib/modules/csv v1.0.0-rc.9 h1:LBPMgAprvyu/5If4RFL53aWlvMO9lwcjuASBZCjSVk8= +github.com/MontFerret/contrib/modules/csv v1.0.0-rc.9/go.mod h1:SOWhrcCeo0RDQnKDslcj0r4I2p6Pkkip7DPA2yee+pk= +github.com/MontFerret/contrib/modules/db/postgres v1.0.0-rc.1 h1:7U2OM8yjkRSFqUE3ijyylAsBwdMgfIIUJh1PtwjPg3U= +github.com/MontFerret/contrib/modules/db/postgres v1.0.0-rc.1/go.mod h1:QbO4euVwlusHEp0zr9L0AM+PHyASO4YQk3uMaSjYwCg= +github.com/MontFerret/contrib/modules/db/sqlite v1.0.0-rc.5 h1:U43noaGYV2r1uwQZP9nLOrQ5HCiKiDjUtxT61L+VEbM= +github.com/MontFerret/contrib/modules/db/sqlite v1.0.0-rc.5/go.mod h1:rh39rIpEZCe1orhlhR9mF9if1lbcqEqhjHr2Y+LW4sM= +github.com/MontFerret/contrib/modules/document/pdf v1.0.0-rc.1 h1:I0PRFZnigfll1IFVIJRrT0YgtNreZ12tgxQA/Mmk/Lk= +github.com/MontFerret/contrib/modules/document/pdf v1.0.0-rc.1/go.mod h1:gD1qkLDj7hDrqvCEbFUtp5IhdV35aH56uMOnkotL3uA= +github.com/MontFerret/contrib/modules/document/xlsx v1.0.0-rc.1 h1:DEKQEqgpMhG7oRyeVBOSy9+Gae+raOYF/o/H505fu1I= +github.com/MontFerret/contrib/modules/document/xlsx v1.0.0-rc.1/go.mod h1:tq+KKe6k154oLGf9G4VT0S9CFegZQMQnE62GNlvUD0o= +github.com/MontFerret/contrib/modules/net/rest v1.0.0-rc.3 h1:0sRnB+Liwwh/SClKjAPuPf4N5oUGDfCvjUcX9W5fMuE= +github.com/MontFerret/contrib/modules/net/rest v1.0.0-rc.3/go.mod h1:WIWcEZ6E5R+JMnO6S9NtcCJPNdoyLQACe/qE9bAceh0= +github.com/MontFerret/contrib/modules/security/jwt v1.0.0-rc.5 h1:wi27zPV9eo1xm2s2urCx67K7RtIFEIgod30wC96bkwU= +github.com/MontFerret/contrib/modules/security/jwt v1.0.0-rc.5/go.mod h1:1HTaYS85rhGLTAW5Fa5K++rBUNqcL8Jz4n2TiGpbf3w= +github.com/MontFerret/contrib/modules/toml v1.0.0-rc.7 h1:1ysNKEcYkBHH0lhuaijpUoK0R4O3s67YiFggrMgiTXk= +github.com/MontFerret/contrib/modules/toml v1.0.0-rc.7/go.mod h1:ybTfSSg6VVF4wDtQAZ//ZvWRdYODWxX4ow8b3+8g6JU= +github.com/MontFerret/contrib/modules/web/article v1.0.0-rc.8 h1:tsucOte7P302KwS/aKCkSRDRj1qVIw2kv1pDhPKWNR4= +github.com/MontFerret/contrib/modules/web/article v1.0.0-rc.8/go.mod h1:thxldFytBvvcpQA8uX3jdaZtP+w3xlQ1rzL8YUOO+FY= +github.com/MontFerret/contrib/modules/web/html v1.0.0-rc.12 h1:91eNSSG5BdudcruII/QXKmuy338CRxCt86Na13ciYKg= +github.com/MontFerret/contrib/modules/web/html v1.0.0-rc.12/go.mod h1:O3JOZJVzHbire+xiGyO8/Ii+qdXQZQMGDFogzSEETQk= +github.com/MontFerret/contrib/modules/web/robots v1.0.0-rc.7 h1:ZnP6hNw3OtbuZ4eajzreAR4ruwIlb+Lvgb80UdisT1k= +github.com/MontFerret/contrib/modules/web/robots v1.0.0-rc.7/go.mod h1:f853aKx5rssqqO6CH/uhEtvJh8T1Oltf/cRKB0j5R00= +github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.7 h1:S82z1Fmo0F6EnjWJQsAVDChWMxORg/Ao1aN1C7mO+HY= +github.com/MontFerret/contrib/modules/web/sitemap v1.0.0-rc.7/go.mod h1:ZeA5hwQ9Vf4/EPtN9vMJOjFpcOUE4xQsxQ/Y1xG8qj8= +github.com/MontFerret/contrib/modules/xml v1.0.0-rc.7 h1:2JF8004o6QgzvmmhuvYmzG7Jr90iKB7eyAf2B+JovPI= +github.com/MontFerret/contrib/modules/xml v1.0.0-rc.7/go.mod h1:9YmTc5BXgPU0gY7/lFfV0GomeFDjlN0cqcL5hSlMuPw= +github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.7 h1:RhaSey6qdk7N9aqK/hHj3/6O4nzeu/VUPlkQyzCYEpY= +github.com/MontFerret/contrib/modules/yaml v1.0.0-rc.7/go.mod h1:InGjz9U+7KfRkXa0qCGLkx3Bi7hza9vxRC2EZkdzQ6Q= github.com/MontFerret/contrib/pkg/common v0.1.1 h1:qA2URATIO+EVLH3BNFKYupLx97ftotyGWnKtJJhtR0Y= github.com/MontFerret/contrib/pkg/common v0.1.1/go.mod h1:wiMLQnE46YGci3qMzA3ExArKomQDXR5DvNSE7HnP0ik= github.com/MontFerret/cssx v0.2.0 h1:De0C6Irbg+qgFPXgWmPpVnwD4RRYUBQSbIYFTUVCNWU= @@ -62,6 +68,7 @@ github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3C github.com/corpix/uarand v0.2.0 h1:U98xXwud/AVuCpkpgfPF7J5TQgr7R5tqT8VZP5KWbzE= github.com/corpix/uarand v0.2.0/go.mod h1:/3Z1QIqWkDIhf6XWn/08/uMHoQ8JUoTIKc2iPchBOmM= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= @@ -84,9 +91,8 @@ github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= -github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -104,6 +110,14 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.10.0 h1:VhSvgU2jSli8o3AqIEOTJr7rZwAEUVo4E4XhR94Zfr0= +github.com/jackc/pgx/v5 v5.10.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A= github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -114,6 +128,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/ledongthuc/pdf v0.0.0-20250511090121-5959a4027728 h1:QwWKgMY28TAXaDl+ExRDqGQltzXqN/xypdKP86niVn8= +github.com/ledongthuc/pdf v0.0.0-20250511090121-5959a4027728/go.mod h1:1fEHWurg7pvf5SG6XNE5Q8UZmOwex51Mkx3SLhrW5B4= github.com/mafredri/cdp v0.35.0 h1:fKQ6LbcH3WsxVrWbi/DSgLunJTqmF5o/7w8iFDDj71c= github.com/mafredri/cdp v0.35.0/go.mod h1:xS8dVzwKfYswsOHG05SfDCbhNrO89kWVJyMj5vD+zYo= github.com/mafredri/go-lint v0.0.0-20180911205320-920981dfc79e/go.mod h1:k/zdyxI3q6dup24o8xpYjJKTCf2F7rfxLp6w/efTiWs= @@ -141,6 +157,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/richardlehane/mscfb v1.0.7 h1:oeoiM0WE79vHwE8RpIYYvIAc8ajTH2mb6UZm55/+EB0= +github.com/richardlehane/mscfb v1.0.7/go.mod h1:pe0+IUIc0AHh0+teNzBlJCtSyZdFOGgV4ZK9bsoV+Jo= +github.com/richardlehane/msoleps v1.0.6 h1:9BvkpjvD+iUBalUY4esMwv6uBkfOip/Lzvd93jvR9gg= +github.com/richardlehane/msoleps v1.0.6/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI= @@ -175,18 +195,29 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44= +github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/wI2L/jettison v0.7.4 h1:ptjriu75R/k5RAZO0DJzy2t55f7g+dPiBxBY38icaKg= github.com/wI2L/jettison v0.7.4/go.mod h1:O+F+T7X7ZN6kTsd167Qk4aZMC8jNrH48SMedNmkfPb0= +github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8= +github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI= +github.com/xuri/excelize/v2 v2.11.0 h1:HxaEFl6sRN2+8J5a8HaKq+0M4FsjBGMnWWtjOCPSG88= +github.com/xuri/excelize/v2 v2.11.0/go.mod h1:jxFLbzaIwGQ5ufFNvYfUOHqXhfPaNmP14KWfmNz2Uak= +github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE= +github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE= github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= @@ -200,8 +231,12 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= +golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80= +golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= +golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -279,8 +314,9 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= modernc.org/cc/v4 v4.28.2 h1:3tQ0lf2ADtoby2EtSP+J7IE2SHwEJdP8ioR59wx7XpY= diff --git a/pkg/runtime/builtin_modules.go b/pkg/runtime/builtin_modules.go index 98fb37f..fb6f4c2 100644 --- a/pkg/runtime/builtin_modules.go +++ b/pkg/runtime/builtin_modules.go @@ -4,7 +4,10 @@ import ( "fmt" "github.com/MontFerret/contrib/modules/csv" + "github.com/MontFerret/contrib/modules/db/postgres" "github.com/MontFerret/contrib/modules/db/sqlite" + "github.com/MontFerret/contrib/modules/document/pdf" + "github.com/MontFerret/contrib/modules/document/xlsx" "github.com/MontFerret/contrib/modules/net/rest" "github.com/MontFerret/contrib/modules/security/jwt" "github.com/MontFerret/contrib/modules/toml" @@ -29,6 +32,7 @@ func newModules(opts Options) ([]module.Module, error) { dbMods, securityMods, networkMods, + documentMods, ) } @@ -79,6 +83,7 @@ func dataMods(_ Options) ([]module.Module, error) { func dbMods(_ Options) ([]module.Module, error) { return []module.Module{ + postgres.New(), sqlite.New(), }, nil } @@ -94,3 +99,10 @@ func networkMods(_ Options) ([]module.Module, error) { rest.New(), }, nil } + +func documentMods(_ Options) ([]module.Module, error) { + return []module.Module{ + pdf.New(), + xlsx.New(), + }, nil +}