Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use unescaped template operator #12

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Use unescaped template operator #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/go.mod.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module <%= project.name %>
module <%- project.name %>

go 1.22.1

Expand Down
6 changes: 3 additions & 3 deletions template/main.go.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ package main
<% if (hasComment(ex)) -%>
// <%- formatCommentBlock(ex.description, "// ") %>
<% if (ex.input && hasComment(ex.input)) { -%>
// It takes <%= toGolangType(ex.input) %> as input (<%- formatCommentLine(ex.input.description) %>)
// It takes <%- toGolangType(ex.input) %> as input (<%- formatCommentLine(ex.input.description) %>)
<% } -%>
<% if (ex.output && hasComment(ex.output)) { -%>
// And returns <%= toGolangType(ex.output) %> (<%- formatCommentLine(ex.output.description) %>)
// And returns <%- toGolangType(ex.output) %> (<%- formatCommentLine(ex.output.description) %>)
<% } -%>
<% -%>
func <%= ex.name %>(<%- ex.input ? `input ${toGolangType(ex.input)}` : null %>) <%- ex.output ? `(${toGolangType(ex.output)}, error)` : "error" %> {
func <%- ex.name %>(<%- ex.input ? `input ${toGolangType(ex.input)}` : null %>) <%- ex.output ? `(${toGolangType(ex.output)}, error)` : "error" %> {
<% if (featureFlags['stub-with-code-samples'] && codeSamples(ex, 'go').length > 0) { -%>
<%- codeSamples(ex, 'go')[0].source %>
<% } else { -%>
Expand Down
70 changes: 35 additions & 35 deletions template/pdk.gen.go.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
)

<% schema.exports.forEach(ex => { -%>
//export <%= ex.name %>
func _<%= ex.name %>() int32 {
//export <%- ex.name %>
func _<%- ex.name %>() int32 {
var err error
_ = err
<% if (ex.input) { -%>
<% if (ex.input.contentType === 'application/json') { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: getting JSON input")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: getting JSON input")
var input <%- toGolangType(ex.input) %>
err = pdk.InputJSON(&input)
if err != nil {
Expand All @@ -24,40 +24,40 @@ func _<%= ex.name %>() int32 {
}
<% } else if (ex.input.type === 'string') { -%>
<% if (ex.input.$ref && ex.input.$ref.enum) { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: getting enum string input")
input, err := stringTo<%= ex.input.$ref.name %>(pdk.InputString())
pdk.Log(pdk.LogDebug, "<%- ex.name %>: getting enum string input")
input, err := stringTo<%- ex.input.$ref.name %>(pdk.InputString())
if err != nil {
pdk.SetError(err)
return -1
}
<% } else { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: getting string input")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: getting string input")
input := pdk.InputString()
<% } %>
<% } else { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: getting bytes input")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: getting bytes input")
input := pdk.Input()
<% } -%>

pdk.Log(pdk.LogDebug, "<%= ex.name %>: calling implementation function")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: calling implementation function")
<% if (ex.output) { -%>
output, err := <%= ex.name %>(input)
output, err := <%- ex.name %>(input)
if err != nil {
pdk.SetError(err)
return -1
}
<% } else { -%>
err = <%= ex.name %>(input)
err = <%- ex.name %>(input)
if err != nil {
pdk.SetError(err)
return -1
}
<% } -%>
<% } else { -%>
<% if (ex.output) { -%>
output, err := <%= ex.name %>()
output, err := <%- ex.name %>()
<% } else { -%>
err = <%= ex.name %>()
err = <%- ex.name %>()
<% } -%>
if err != nil {
pdk.SetError(err)
Expand All @@ -67,31 +67,31 @@ func _<%= ex.name %>() int32 {

<% if (ex.output) { -%>
<% if (ex.output.contentType === 'application/json') { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: setting JSON output")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: setting JSON output")
err = pdk.OutputJSON(output)
if err != nil {
pdk.SetError(err)
return -1
}
<% } else if (ex.output.type === 'string') { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: setting string output")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: setting string output")
pdk.OutputString(output)
<% } else { -%>
pdk.Log(pdk.LogDebug, "<%= ex.name %>: setting bytes output")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: setting bytes output")
pdk.Output(output)
<% } -%>
<% } -%>

pdk.Log(pdk.LogDebug, "<%= ex.name %>: returning")
pdk.Log(pdk.LogDebug, "<%- ex.name %>: returning")
return 0
}

<% }) %>

<% if (schema.imports.length > 0) { %>
<% Object.values(schema.imports).forEach(im => { %>
//go:wasmimport extism:host/user <%= im.name %>
func _<%= im.name %>(uint64) <%= im.output ? "uint64" : null %>
//go:wasmimport extism:host/user <%- im.name %>
func _<%- im.name %>(uint64) <%- im.output ? "uint64" : null %>
<% }) %>

<% } %>
Expand All @@ -100,43 +100,43 @@ func _<%= ex.name %>() int32 {
<% if (schema.properties.length > 0) { %>

// <%- formatCommentBlock(schema.description, "// ") %>
type <%= schema.name %> struct {
type <%- schema.name %> struct {
<% schema.properties.forEach(p => { -%>
<% if (p.description) { -%>
// <%- formatCommentBlock(p.description, "// ") %>
<% } -%>
<%= makePublic(p.name) %> <%= p.nullable ? pointerToGolangType(p) : toGolangType(p) %> `json:"<%= p.name %>"`
<%- makePublic(p.name) %> <%- p.nullable ? pointerToGolangType(p) : toGolangType(p) %> `json:"<%- p.name %>"`
<% }) %>
}
<% } else if (schema.enum) { %>

// <%- formatCommentLine(schema.description) %>
type <%= makePublic(schema.name) %> string
type <%- makePublic(schema.name) %> string
const (
<% schema.enum.forEach((variant, i) => { -%>
<%- `${makePublic(schema.name)}${makePublic(variant)} ${makePublic(schema.name)} = "${variant}"` %>
<% }) -%>
)

func (v <%= makePublic(schema.name) %>) String() string {
func (v <%- makePublic(schema.name) %>) String() string {
switch (v) {
<% schema.enum.forEach((variant) => { -%>
case <%= `${makePublic(schema.name)}${makePublic(variant)}` %>:
return `<%= variant %>`
case <%- `${makePublic(schema.name)}${makePublic(variant)}` %>:
return `<%- variant %>`
<% }) -%>
default:
return ""
}
}

func stringTo<%= makePublic(schema.name) %>(s string) (<%= makePublic(schema.name) %>, error) {
func stringTo<%- makePublic(schema.name) %>(s string) (<%- makePublic(schema.name) %>, error) {
switch (s) {
<% schema.enum.forEach((variant) => { -%>
case `<%= variant %>`:
return <%= `${makePublic(schema.name)}${makePublic(variant)}` %>, nil
case `<%- variant %>`:
return <%- `${makePublic(schema.name)}${makePublic(variant)}` %>, nil
<% }) -%>
default:
return <%= makePublic(schema.name) %>(""), errors.New("unable to convert string to <%= `${makePublic(schema.name)}` %>")
return <%- makePublic(schema.name) %>(""), errors.New("unable to convert string to <%- `${makePublic(schema.name)}` %>")
}
}

Expand All @@ -146,14 +146,14 @@ func _<%= ex.name %>() int32 {

<% schema.imports.forEach(imp => { %>
<% if (hasComment(imp)) -%>
// <%= makePublic(imp.name) %> <%- formatCommentBlock(imp.description, "// ") %>
// <%- makePublic(imp.name) %> <%- formatCommentBlock(imp.description, "// ") %>
<% if (hasComment(imp.input)) { -%>
// It takes input of <%= toGolangType(imp.input) %> (<%- formatCommentLine(imp.input.description) %>)
// It takes input of <%- toGolangType(imp.input) %> (<%- formatCommentLine(imp.input.description) %>)
<% } -%>
<% if (hasComment(imp.output)) { -%>
// And it returns an output <%= toGolangType(imp.output) %> (<%- formatCommentLine(imp.output.description) %>)
// And it returns an output <%- toGolangType(imp.output) %> (<%- formatCommentLine(imp.output.description) %>)
<% } -%>
func <%= makePublic(imp.name) %>(<%- imp.input ? `input ${toGolangType(imp.input)}` : null %>) <%- imp.output ? `(${pointerToGolangType(imp.output)}, error)` : "error" %> {
func <%- makePublic(imp.name) %>(<%- imp.input ? `input ${toGolangType(imp.input)}` : null %>) <%- imp.output ? `(${pointerToGolangType(imp.output)}, error)` : "error" %> {
var err error
_ = err
<% if (imp.input) { -%>
Expand All @@ -172,14 +172,14 @@ func _<%= ex.name %>() int32 {
mem := pdk.AllocateBytes(input)
<% } -%>

<% if (imp.output) { -%>offs :=<% } -%> _<%= imp.name %>(mem.Offset())
<% if (imp.output) { -%>offs :=<% } -%> _<%- imp.name %>(mem.Offset())
<% } else { -%>
<% if (imp.output) { -%>offs :=<% } -%> _<%= imp.name %>()
<% if (imp.output) { -%>offs :=<% } -%> _<%- imp.name %>()
<% } -%>

<% if (imp.output) { -%>
<% if (imp.output.contentType === 'application/json') { -%>
var output <%= toGolangType(imp.output) %>
var output <%- toGolangType(imp.output) %>
err = pdk.JSONFrom(offs, &output)
if err != nil {
return nil, err
Expand Down
6 changes: 3 additions & 3 deletions template/xtp.toml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
app_id = "<%= project.appId %>"
app_id = "<%- project.appId %>"

# This is where 'xtp plugin push' expects to find the wasm file after the build script has run.
bin = "dist/plugin.wasm"
extension_point_id = "<%= project.extensionPointId %>"
extension_point_id = "<%- project.extensionPointId %>"
# This is the 'binding' name used for the plugin.
name = "<%= project.name %>"
name = "<%- project.name %>"

[scripts]
# xtp plugin build runs this script to generate the wasm file
Expand Down
Loading