Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(compute/build): AssemblyScript bugs #786

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

Merged
Integralist merged 1 commit into from
Feb 1, 2023
Merged

fix(compute/build): AssemblyScript bugs #786

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
37 changes: 35 additions & 2 deletions pkg/commands/compute/language_assemblyscript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package compute

import (
"encoding/json"
"fmt"
"io"
"path/filepath"
Expand All @@ -22,7 +23,7 @@ const AsCompilationURL = "https://www.npmjs.com/package/assemblyscript"
// are simply upgrading their CLI version and might not be familiar with the
// changes in the 4.0.0 release with regards to how build logic has moved to the
// fastly.toml manifest.
const AsDefaultBuildCommand = "$(npm bin)/asc assembly/index.ts --outFile bin/main.wasm --optimize --noAssert"
const AsDefaultBuildCommand = "npm exec -- asc assembly/index.ts --outFile bin/main.wasm --optimize --noAssert"

// AsSDK is the required Compute@Edge SDK.
// https://www.npmjs.com/package/@fastly/as-compute
Expand Down Expand Up @@ -67,11 +68,12 @@ func NewAssemblyScript(
Installer: JsInstaller,
Manifest: JsManifest,
ManifestCommand: JsManifestCommand,
ManifestCommandSkipError: true,
ManifestRemediation: JsManifestRemediation,
Output: out,
PatchedManifestNotifier: ch,
SDK: AsSDK,
SDKCustomValidator: validateJsSDK,
SDKCustomValidator: validateAsSDK,
Toolchain: JsToolchain,
ToolchainLanguage: "AssemblyScript",
ToolchainSkipVersion: true,
Expand Down Expand Up @@ -116,3 +118,34 @@ func (a AssemblyScript) Build(out io.Writer, progress text.Progress, verbose boo
timeout: a.timeout,
}, out, progress, verbose, nil, callback)
}

// validateAsSDK marshals the JS manifest into JSON to check if the dependency
// has been defined in the package.json manifest.
//
// NOTE: This function also causes a side-effect of modifying the default build
// script based on the user's project context.
func validateAsSDK(sdk string, manifestCommandOutput []byte, notifier chan string) error {
e := fmt.Errorf(SDKErrMessageFormat, sdk, JsManifest)

var p JsPackage

err := json.Unmarshal(manifestCommandOutput, &p)
if err != nil {
return fsterr.RemediationError{
Inner: fmt.Errorf("failed to unmarshal package.json: %w", err),
Remediation: fmt.Sprintf("Ensure your package.json is valid and contains the '%s' dependency.", sdk),
}
}

go func() {
notifier <- AsDefaultBuildCommand
}()

for k := range p.Dependencies {
if k == sdk {
return nil
}
}

return e
}