rework type generation (#1017)

this is a major rework of our type generation system. the new approach works like this

1. search for all `package.json` below where `sst.config.ts` is
2. next to each `package.json` we generate an `sst-env.d.ts`
3. this contains all the type definitions - it does not reference a root `sst-env.d.ts`
4. if your package.json has `@cloudflare/worker-types` we will generate a cloudflare flavor of the types

cmd/sst/shell.go

@@ -68,7 +68,7 @@ func CmdShell(c *cli.Cli) error {
 			env[key] = value
 		}
 		for resource, value := range complete.Links {
-			jsonValue, err := json.Marshal(value)
+			jsonValue, err := json.Marshal(value.Properties)
 			if err != nil {
 				return err
 			}

examples/aws-monorepo/packages/astro/sst-env.d.ts

@@ -1,4 +1,30 @@
+/* This file is auto-generated by SST. Do not edit. */
 /* tslint:disable */
 /* eslint-disable */
-/// <reference path="../../sst-env.d.ts" />
+import "sst"
 export {}
+declare module "sst" {
+  export interface Resource {
+    "Api": {
+      "name": string
+      "type": "sst.aws.Function"
+      "url": string
+    }
+    "Astro": {
+      "type": "sst.aws.Astro"
+      "url": string
+    }
+    "Database": {
+      "name": string
+      "type": "sst.aws.Dynamo"
+    }
+    "MyBucket": {
+      "name": string
+      "type": "sst.aws.Bucket"
+    }
+    "StaticSite": {
+      "type": "sst.aws.StaticSite"
+      "url": string
+    }
+  }
+}

examples/aws-monorepo/packages/core/sst-env.d.ts

@@ -1,3 +1,30 @@
+/* This file is auto-generated by SST. Do not edit. */
 /* tslint:disable */
 /* eslint-disable */
-/// <reference path="../../sst-env.d.ts" />
+import "sst"
+export {}
+declare module "sst" {
+  export interface Resource {
+    "Api": {
+      "name": string
+      "type": "sst.aws.Function"
+      "url": string
+    }
+    "Astro": {
+      "type": "sst.aws.Astro"
+      "url": string
+    }
+    "Database": {
+      "name": string
+      "type": "sst.aws.Dynamo"
+    }
+    "MyBucket": {
+      "name": string
+      "type": "sst.aws.Bucket"
+    }
+    "StaticSite": {
+      "type": "sst.aws.StaticSite"
+      "url": string
+    }
+  }
+}

examples/aws-monorepo/packages/frontend/sst-env.d.ts

@@ -0,0 +1,30 @@
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+import "sst"
+export {}
+declare module "sst" {
+  export interface Resource {
+    "Api": {
+      "name": string
+      "type": "sst.aws.Function"
+      "url": string
+    }
+    "Astro": {
+      "type": "sst.aws.Astro"
+      "url": string
+    }
+    "Database": {
+      "name": string
+      "type": "sst.aws.Dynamo"
+    }
+    "MyBucket": {
+      "name": string
+      "type": "sst.aws.Bucket"
+    }
+    "StaticSite": {
+      "type": "sst.aws.StaticSite"
+      "url": string
+    }
+  }
+}

examples/aws-monorepo/packages/functions/sst-env.d.ts

@@ -1,3 +1,30 @@
+/* This file is auto-generated by SST. Do not edit. */
 /* tslint:disable */
 /* eslint-disable */
-/// <reference path="../../sst-env.d.ts" />
+import "sst"
+export {}
+declare module "sst" {
+  export interface Resource {
+    "Api": {
+      "name": string
+      "type": "sst.aws.Function"
+      "url": string
+    }
+    "Astro": {
+      "type": "sst.aws.Astro"
+      "url": string
+    }
+    "Database": {
+      "name": string
+      "type": "sst.aws.Dynamo"
+    }
+    "MyBucket": {
+      "name": string
+      "type": "sst.aws.Bucket"
+    }
+    "StaticSite": {
+      "type": "sst.aws.StaticSite"
+      "url": string
+    }
+  }
+}

examples/aws-monorepo/packages/scripts/sst-env.d.ts

@@ -1 +1,30 @@
-/// <reference path="../../.sst/types.generated.ts" />
+/* This file is auto-generated by SST. Do not edit. */
+/* tslint:disable */
+/* eslint-disable */
+import "sst"
+export {}
+declare module "sst" {
+  export interface Resource {
+    "Api": {
+      "name": string
+      "type": "sst.aws.Function"
+      "url": string
+    }
+    "Astro": {
+      "type": "sst.aws.Astro"
+      "url": string
+    }
+    "Database": {
+      "name": string
+      "type": "sst.aws.Dynamo"
+    }
+    "MyBucket": {
+      "name": string
+      "type": "sst.aws.Bucket"
+    }
+    "StaticSite": {
+      "type": "sst.aws.StaticSite"
+      "url": string
+    }
+  }
+}

examples/aws-monorepo/sst-env.d.ts

@@ -1,29 +1,30 @@
+/* This file is auto-generated by SST. Do not edit. */
 /* tslint:disable */
 /* eslint-disable */
 import "sst"
+export {}
 declare module "sst" {
   export interface Resource {
-    Api: {
-      name: string
-      type: "sst.aws.Function"
-      url: string
+    "Api": {
+      "name": string
+      "type": "sst.aws.Function"
+      "url": string
     }
-    Astro: {
-      type: "sst.aws.Astro"
-      url: string
+    "Astro": {
+      "type": "sst.aws.Astro"
+      "url": string
     }
-    Database: {
-      name: string
-      type: "sst.aws.Dynamo"
+    "Database": {
+      "name": string
+      "type": "sst.aws.Dynamo"
     }
-    MyBucket: {
-      name: string
-      type: "sst.aws.Bucket"
+    "MyBucket": {
+      "name": string
+      "type": "sst.aws.Bucket"
     }
-    StaticSite: {
-      type: "sst.aws.StaticSite"
-      url: string
+    "StaticSite": {
+      "type": "sst.aws.StaticSite"
+      "url": string
     }
   }
 }
-export {}

examples/aws-python/sst-env.d.ts

@@ -1,6 +1,8 @@
+/* This file is auto-generated by SST. Do not edit. */
 /* tslint:disable */
 /* eslint-disable */
 import "sst"
+export {}
 declare module "sst" {
   export interface Resource {
     "MyPythonFunction": {
@@ -10,4 +12,3 @@ declare module "sst" {
     }
   }
 }
-export {}

examples/cloudflare-hono/sst-env.d.ts

@@ -1,14 +1,18 @@
+/* This file is auto-generated by SST. Do not edit. */
 /* tslint:disable */
 /* eslint-disable */
-import "sst"
+import "sst";
+export {};
+import "sst";
 declare module "sst" {
-  export interface Resource {
-  }
+  export interface Resource {}
 }
-// cloudflare 
+
+// cloudflare
+import * as cloudflare from "@cloudflare/workers-types";
 declare module "sst" {
   export interface Resource {
-    "MyBucket": import("@cloudflare/workers-types").R2Bucket
+    Hono: cloudflare.Service;
+    MyBucket: cloudflare.R2Bucket;
   }
 }
-export {}

internal/fs/fs.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 func FindUp(initialPath, fileName string) (string, error) {
@@ -34,3 +35,25 @@ func Exists(path string) bool {
 	}
 	return err == nil
 }
+
+func FindDown(dir, filename string) []string {
+	var result []string
+
+	filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return nil // Continue walking despite the error
+		}
+		if info.IsDir() {
+			name := info.Name()
+			if name == "node_modules" || strings.HasPrefix(name, ".") {
+				return filepath.SkipDir
+			}
+		}
+		if !info.IsDir() && info.Name() == filename {
+			result = append(result, path)
+		}
+		return nil
+	})
+
+	return result
+}

pkg/project/common/common.go

@@ -0,0 +1,14 @@
+package common
+
+type Links map[string]Link
+
+type Link struct {
+	Type       string                 `json:"type"`
+	Properties map[string]interface{} `json:"properties"`
+	Include    []LinkInclude          `json:"include"`
+}
+
+type LinkInclude struct {
+	Type  string                 `json:"type"`
+	Other map[string]interface{} `json:"-"`
+}

pkg/project/env.go

@@ -33,7 +33,7 @@ func (p *Project) EnvFor(ctx context.Context, complete *CompleteEvent, name stri
 	}
 	slog.Info("dev", "links", dev.Links)
 	for _, resource := range dev.Links {
-		value := complete.Links[resource]
+		value := complete.Links[resource].Properties
 		jsonValue, _ := json.Marshal(value)
 		env["SST_RESOURCE_"+resource] = string(jsonValue)
 	}

pkg/project/provider/provider.go

@@ -118,15 +118,6 @@ func Passphrase(backend Home, app, stage string) (string, error) {
 	return passphrase, nil
 }
 
-func GetLinks(backend Home, app, stage string) (map[string]interface{}, error) {
-	data := map[string]interface{}{}
-	err := getData(backend, "link", app, stage, true, &data)
-	if err != nil {
-		return nil, err
-	}
-	return data, err
-}
-
 type Summary struct {
 	Version         string         `json:"version"`
 	UpdateID        string         `json:"updateID"`
@@ -144,14 +135,6 @@ type SummaryError struct {
 	Message string `json:"message"`
 }
 
-func PutLinks(backend Home, app, stage string, data map[string]interface{}) error {
-	slog.Info("putting links", "app", app, "stage", stage)
-	if data == nil || len(data) == 0 {
-		return nil
-	}
-	return putData(backend, "link", app, stage, true, data)
-}
-
 func PutSummary(backend Home, app, stage, updateID string, summary Summary) error {
 	slog.Info("putting summary", "app", app, "stage", stage)
 	return putData(backend, "summary", app, stage+"/"+updateID, false, summary)