@terraforge/terraform 0.0.13 → 0.0.15

package/dist/index.mjs

@@ -2103,12 +2103,16 @@ const createPlugin5 = async ({ server, client }) => {
 		async planResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			const plan = await client.call("PlanResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				proposedNewState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			});
 			const plannedState = decodeDynamicValue(plan.plannedState);
 			return {
@@ -2119,12 +2123,16 @@ const createPlugin5 = async ({ server, client }) => {
 		async applyResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			return formatOutputState(schema$1, decodeDynamicValue((await client.call("ApplyResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				plannedState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			})).newState));
 		}
 	};
@@ -2177,12 +2185,16 @@ const createPlugin6 = async ({ server, client }) => {
 		async planResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			const plan = await client.call("PlanResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				proposedNewState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			});
 			const plannedState = decodeDynamicValue(plan.plannedState);
 			return {
@@ -2193,12 +2205,16 @@ const createPlugin6 = async ({ server, client }) => {
 		async applyResourceChange(type, priorState, proposedState) {
 			const schema$1 = getResourceSchema(resources, type);
 			const preparedPriorState = formatInputState(schema$1, priorState);
-			const preparedProposedState = formatInputState(schema$1, proposedState);
+			const preparedProposedState = formatInputState(schema$1, {
+				...priorState,
+				...proposedState
+			});
+			const configState = formatInputState(schema$1, proposedState);
 			return formatOutputState(schema$1, decodeDynamicValue((await client.call("ApplyResourceChange", {
 				typeName: type,
 				priorState: encodeDynamicValue(preparedPriorState),
 				plannedState: encodeDynamicValue(preparedProposedState),
-				config: encodeDynamicValue(preparedProposedState)
+				config: encodeDynamicValue(configState)
 			})).newState));
 		}
 	};
@@ -2240,7 +2256,12 @@ const retry = async (tries, cb) => {
 
 //#endregion
 //#region src/proxy.ts
-const createResourceProxy = (cb) => {
+const classMap = /* @__PURE__ */ new Map();
+const getClass = (type) => {
+	if (!classMap.has(type)) classMap.set(type, class {});
+	return classMap.get(type);
+};
+const createResourceProxy = (klass, cb) => {
 	return new Proxy({}, {
 		get(_, key) {
 			return cb(key);
@@ -2248,6 +2269,9 @@ const createResourceProxy = (cb) => {
 		set(_, key) {
 			if (typeof key === "string") throw new Error(`Cannot set property ${key} on read-only object.`);
 			throw new Error(`This object is read-only.`);
+		},
+		getPrototypeOf() {
+			return klass.prototype;
 		}
 	});
 };
@@ -2286,19 +2310,21 @@ const createRootProxy = (apply, get) => {
 		}
 	});
 };
-const createClassProxy = (construct, get) => {
-	return new Proxy(class {}, {
+const createClassProxy = (name, target, construct, get) => {
+	return new Proxy(target, {
 		construct(_, args) {
 			return construct(...args);
 		},
 		get(_, key) {
+			if (key === "prototype") return target.prototype;
+			if (key === "name") return name;
 			if (key === "get") return (...args) => {
 				return get(...args);
 			};
 		}
 	});
 };
-const createRecursiveProxy = ({ provider, install, uninstall, isInstalled, resource, dataSource }) => {
+const createRecursiveProxy = ({ provider, install, uninstall, isInstalled, class: klass, resource, dataSource }) => {
 	const findNextProxy = (ns, name) => {
 		if (name === name.toLowerCase()) return createNamespaceProxy((key) => {
 			return findNextProxy([...ns, name], key);
@@ -2306,7 +2332,7 @@ const createRecursiveProxy = ({ provider, install, uninstall, isInstalled, resou
 		else if (name.startsWith("get")) return (...args) => {
 			return dataSource([...ns, name.substring(3)], ...args);
 		};
-		else return createClassProxy((...args) => {
+		else return createClassProxy(pascalCase([...ns, name].join("-")), klass([...ns, name]), (...args) => {
 			return resource([...ns, name], ...args);
 		}, (...args) => {
 			return dataSource([...ns, name], ...args);
@@ -2345,10 +2371,13 @@ const createTerraformProxy = (props) => {
 				...installProps
 			});
 		},
+		class: (ns) => {
+			return getClass(snakeCase([props.namespace, ...ns].join("_")));
+		},
 		resource: (ns, parent, id, input, config) => {
 			const type = snakeCase([props.namespace, ...ns].join("_"));
 			const meta = createMeta("resource", `terraform:${props.namespace}:${config?.provider ?? "default"}`, parent, type, id, input, config);
-			const resource = createResourceProxy((key) => {
+			const resource = createResourceProxy(getClass(type), (key) => {
 				if (typeof key === "string") {
 					if (key === "urn") return meta.urn;
 					return meta.output((data) => data[key]);
@@ -2360,7 +2389,7 @@ const createTerraformProxy = (props) => {
 		dataSource: (ns, parent, id, input, config) => {
 			const type = snakeCase([props.namespace, ...ns].join("_"));
 			const meta = createMeta("data", `terraform:${props.namespace}:${config?.provider ?? "default"}`, parent, type, id, input, config);
-			const dataSource = createResourceProxy((key) => {
+			const dataSource = createResourceProxy(getClass(type), (key) => {
 				if (typeof key === "string") {
 					if (key === "urn") return meta.urn;
 					return meta.output((data) => data[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@terraforge/terraform",
-	"version": "0.0.13",
+	"version": "0.0.15",
 	"type": "module",
 	"repository": {
 		"type": "git",
@@ -26,7 +26,7 @@
 		"test": "bun test"
 	},
 	"peerDependencies": {
-		"@terraforge/core": "0.0.11"
+		"@terraforge/core": "0.0.19"
 	},
 	"dependencies": {
 		"@grpc/grpc-js": "1.12.6",