@terraforge/core 0.0.7 → 0.0.9

package/dist/index.d.ts

@@ -42,8 +42,8 @@ declare const interpolate: (literals: TemplateStringsArray, ...placeholders: Inp
 type URN = `urn:${string}`;
 
 declare const nodeMetaSymbol: unique symbol;
-type Node<T extends Tag = Tag, I extends State = State, O extends State = State, C extends Config = Config> = {
-    readonly [nodeMetaSymbol]: Meta<T, I, O, C>;
+type Node<T extends Tag = Tag, O extends State = State> = {
+    readonly [nodeMetaSymbol]: Meta<T>;
     readonly urn: URN;
 } & O;
 declare const isNode: (obj: object) => obj is {
@@ -66,14 +66,14 @@ type ResourceConfig = Config & {
     /** If true, create the replacement before deleting the existing resource. */
     createBeforeReplace?: boolean;
 };
-type ResourceMeta<I extends State = State, O extends State = State> = Meta<'resource', I, O, ResourceConfig>;
-type Resource<I extends State = State, O extends State = State> = O & {
-    readonly [nodeMetaSymbol]: ResourceMeta<I, O>;
+type ResourceMeta = Meta<'resource', ResourceConfig>;
+type Resource<O extends State = State> = O & {
+    readonly [nodeMetaSymbol]: ResourceMeta;
     readonly urn: URN;
 };
 type ResourceClass<I extends State = State, O extends State = State> = {
-    new (parent: Group, id: string, props: I, config?: ResourceConfig): Resource<I, O>;
-    get(parent: Group, id: string, physicalId: string): DataSource<I, O>;
+    new (parent: Group, id: string, props: I, config?: ResourceConfig): Resource<O>;
+    get(parent: Group, id: string, physicalId: string): DataSource<O>;
 };
 
 declare class Stack extends Group {
@@ -87,31 +87,31 @@ type Tag = 'resource' | 'data';
 type State = Record<string, unknown>;
 type Config = {
     /** Specify additional explicit dependencies in addition to the ones in the dependency graph. */
-    dependsOn?: Resource<any, any>[];
+    dependsOn?: Resource[];
     /** Pass an ID of an explicitly configured provider, instead of using the default provider. */
     provider?: string;
 };
-type Meta<T extends Tag = Tag, I extends State = State, O extends State = State, C extends Config = Config> = {
+type Meta<T extends Tag = Tag, C extends Config = Config> = {
     readonly tag: T;
     readonly urn: URN;
     readonly logicalId: string;
     readonly type: string;
     readonly stack: Stack;
     readonly provider: string;
-    readonly input: I;
+    readonly input: State;
     readonly config?: C;
     readonly dependencies: Set<URN>;
-    readonly resolve: (data: O) => void;
-    readonly output: <O>(cb: (data: State) => O) => Output<O>;
+    readonly resolve: (data: State) => void;
+    readonly output: <V>(cb: (data: State) => V) => Output<V>;
 };
-declare const createMeta: <T extends Tag = Tag, I extends State = State, O extends State = State, C extends Config = Config>(tag: T, provider: string, parent: Group, type: string, logicalId: string, input: I, config?: C) => Meta<T, I, O, C>;
+declare const createMeta: <T extends Tag = Tag, C extends Config = Config>(tag: T, provider: string, parent: Group, type: string, logicalId: string, input: State, config?: C) => Meta<T, C>;
 
-type DataSourceMeta<I extends State = State, O extends State = State> = Meta<'data', I, O>;
-type DataSource<I extends State = State, O extends State = State> = {
-    readonly [nodeMetaSymbol]: DataSourceMeta<I, O>;
+type DataSourceMeta = Meta<'data'>;
+type DataSource<O extends State = State> = {
+    readonly [nodeMetaSymbol]: DataSourceMeta;
     readonly urn: URN;
 } & O;
-type DataSourceFunction<I extends State = State, O extends State = State> = (parent: Group, id: string, input: I, config?: Config) => DataSource<I, O>;
+type DataSourceFunction<I extends State = State, O extends State = State> = (parent: Group, id: string, input: I, config?: Config) => DataSource<O>;
 
 declare class Group {
     readonly parent: Group | undefined;

package/dist/index.js

@@ -307,7 +307,7 @@ var createMeta = (tag, provider, parent, type, logicalId, input, config) => {
         linkMetaDep(dep);
       }
       for (const dep of config?.dependsOn ?? []) {
-        linkMetaDep(dep.$);
+        linkMetaDep(getMeta(dep));
       }
       return dependencies;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terraforge/core",
-	"version": "0.0.7",
+	"version": "0.0.9",
 	"type": "module",
 	"repository": {
 		"type": "git",