@terraforge/core 0.0.8 → 0.0.10

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

@@ -186,40 +186,6 @@ var findInputDeps = (props) => {
   find(props);
   return deps;
 };
-var formatPath = (path) => {
-  if (path.length === 0) {
-    return "<root>";
-  }
-  return path.map((part) => {
-    if (typeof part === "number") {
-      return `[${part}]`;
-    }
-    return `.${part}`;
-  }).join("").replace(/^\./, "");
-};
-var findInputDepsWithPaths = (props) => {
-  const deps = [];
-  const find = (value, path) => {
-    if (value instanceof Output) {
-      for (const meta of value.dependencies) {
-        deps.push({
-          meta,
-          path: formatPath(path)
-        });
-      }
-      return;
-    }
-    if (Array.isArray(value)) {
-      value.map((item, index) => find(item, [...path, index]));
-      return;
-    }
-    if (value?.constructor === Object) {
-      Object.entries(value).map(([key, item]) => find(item, [...path, key]));
-    }
-  };
-  find(props, []);
-  return deps;
-};
 var resolveInputs = async (inputs) => {
   const unresolved = [];
   const find = (props, parent, key) => {
@@ -341,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;
     },
@@ -513,6 +479,89 @@ var dependentsOn = (resources, dependency) => {
   }
   return dependents;
 };
+var findDependencyPaths = (value, dependencyUrn, path = []) => {
+  const paths = [];
+  const visit = (current, currentPath) => {
+    if (current instanceof Output) {
+      for (const dep of current.dependencies) {
+        if (dep.urn === dependencyUrn) {
+          paths.push(currentPath);
+          return;
+        }
+      }
+      return;
+    }
+    if (Array.isArray(current)) {
+      current.forEach((item, index) => {
+        visit(item, [...currentPath, index]);
+      });
+      return;
+    }
+    if (current && typeof current === "object") {
+      for (const [key, item] of Object.entries(current)) {
+        visit(item, [...currentPath, key]);
+      }
+    }
+  };
+  visit(value, path);
+  return paths;
+};
+var cloneState = (value) => JSON.parse(JSON.stringify(value));
+var removeAtPath = (target, path) => {
+  if (path.length === 0) return;
+  let parent = target;
+  for (let i = 0; i < path.length - 1; i++) {
+    if (parent == null) return;
+    parent = parent[path[i]];
+  }
+  const last = path[path.length - 1];
+  if (Array.isArray(parent) && typeof last === "number") {
+    if (last >= 0 && last < parent.length) {
+      parent.splice(last, 1);
+    }
+    return;
+  }
+  if (parent && typeof parent === "object") {
+    delete parent[last];
+  }
+};
+var stripDependencyInputs = (input, metaInput, dependencyUrn) => {
+  const paths = findDependencyPaths(metaInput, dependencyUrn);
+  if (paths.length === 0) {
+    return input;
+  }
+  const detached = cloneState(input);
+  const sortedPaths = [...paths].sort((a, b) => {
+    if (a.length !== b.length) return b.length - a.length;
+    const aLast = a[a.length - 1];
+    const bLast = b[b.length - 1];
+    if (typeof aLast === "number" && typeof bLast === "number") {
+      return bLast - aLast;
+    }
+    return 0;
+  });
+  for (const path of sortedPaths) {
+    removeAtPath(detached, path);
+  }
+  return detached;
+};
+var allowsDependentReplace = (replaceOnChanges, dependencyPaths) => {
+  if (!replaceOnChanges || replaceOnChanges.length === 0) {
+    return false;
+  }
+  for (const path of dependencyPaths) {
+    const base = typeof path[0] === "string" ? path[0] : void 0;
+    if (!base) {
+      continue;
+    }
+    for (const replacePath of replaceOnChanges) {
+      if (replacePath === base || replacePath.startsWith(`${base}.`) || replacePath.startsWith(`${base}[`) || replacePath.startsWith(`${base}.*`)) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 
 // src/workspace/error.ts
 var ResourceError = class _ResourceError extends Error {
@@ -946,89 +995,6 @@ var updateResource = async (resource, appToken, priorInputState, priorOutputStat
 
 // src/workspace/procedure/deploy-app.ts
 var debug7 = createDebugger("Deploy App");
-var findDependencyPaths = (value, dependencyUrn, path = []) => {
-  const paths = [];
-  const visit = (current, currentPath) => {
-    if (current instanceof Output) {
-      for (const dep of current.dependencies) {
-        if (dep.urn === dependencyUrn) {
-          paths.push(currentPath);
-          return;
-        }
-      }
-      return;
-    }
-    if (Array.isArray(current)) {
-      current.forEach((item, index) => {
-        visit(item, [...currentPath, index]);
-      });
-      return;
-    }
-    if (current && typeof current === "object") {
-      for (const [key, item] of Object.entries(current)) {
-        visit(item, [...currentPath, key]);
-      }
-    }
-  };
-  visit(value, path);
-  return paths;
-};
-var cloneState = (value) => JSON.parse(JSON.stringify(value));
-var removeAtPath = (target, path) => {
-  if (path.length === 0) return;
-  let parent = target;
-  for (let i = 0; i < path.length - 1; i++) {
-    if (parent == null) return;
-    parent = parent[path[i]];
-  }
-  const last = path[path.length - 1];
-  if (Array.isArray(parent) && typeof last === "number") {
-    if (last >= 0 && last < parent.length) {
-      parent.splice(last, 1);
-    }
-    return;
-  }
-  if (parent && typeof parent === "object") {
-    delete parent[last];
-  }
-};
-var stripDependencyInputs = (input, metaInput, dependencyUrn) => {
-  const paths = findDependencyPaths(metaInput, dependencyUrn);
-  if (paths.length === 0) {
-    return input;
-  }
-  const detached = cloneState(input);
-  const sortedPaths = [...paths].sort((a, b) => {
-    if (a.length !== b.length) return b.length - a.length;
-    const aLast = a[a.length - 1];
-    const bLast = b[b.length - 1];
-    if (typeof aLast === "number" && typeof bLast === "number") {
-      return bLast - aLast;
-    }
-    return 0;
-  });
-  for (const path of sortedPaths) {
-    removeAtPath(detached, path);
-  }
-  return detached;
-};
-var allowsDependentReplace = (replaceOnChanges, dependencyPaths) => {
-  if (!replaceOnChanges || replaceOnChanges.length === 0) {
-    return false;
-  }
-  for (const path of dependencyPaths) {
-    const base = typeof path[0] === "string" ? path[0] : void 0;
-    if (!base) {
-      continue;
-    }
-    for (const replacePath of replaceOnChanges) {
-      if (replacePath === base || replacePath.startsWith(`${base}.`) || replacePath.startsWith(`${base}[`) || replacePath.startsWith(`${base}.*`)) {
-        return true;
-      }
-    }
-  }
-  return false;
-};
 var deployApp = async (app, opt) => {
   debug7(app.name, "start");
   const latestState = await opt.backend.state.get(app.urn);
@@ -1137,14 +1103,6 @@ var deployApp = async (app, opt) => {
     for (const node of stack.nodes) {
       const meta = getMeta(node);
       const dependencies = [...meta.dependencies];
-      for (let i = 0; i < dependencies.length; i++) {
-        if (!dependencies[i]) {
-          const depPaths = findInputDepsWithPaths(meta.input).map((dep) => `${dep.path} -> ${dep.meta?.urn ?? "undefined"}`).join(", ");
-          throw new Error(
-            `Resource ${meta.urn} has an undefined dependency at index ${i}. Check inputs for missing/undefined Output references. ` + (depPaths ? `Dependency sources: ${depPaths}` : "")
-          );
-        }
-      }
       const partialNewResourceState = {
         dependencies,
         lifecycle: isResource(node) ? {

package/package.json

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