@suss/contract-terraform 0.35.1 → 0.36.0

package/dist/index.cjs

@@ -1226,15 +1226,15 @@ function deployableSummary(opts) {
   const { boundary, instanceName, process } = opts;
   const declared = declaredEnv(process.body, boundary.env ?? [], opts.scope);
   const platform = boundary.platformEnvVars ?? import_behavioral_ir.PLATFORM_INJECTED_ENV_VARS[boundary.deploymentTarget];
-  const code = codePointer(process.body, boundary, opts.scope);
-  const image = attributePattern(
+  const runtime = attributePattern(
     process.body,
-    boundary.code?.imageAttribute,
+    boundary.runtimeAttribute,
     opts.scope
   );
-  const runtime = attributePattern(
+  const code = codePointer(process.body, boundary, opts.scope, runtime);
+  const image = attributePattern(
     process.body,
-    boundary.runtimeAttribute,
+    boundary.code?.imageAttribute,
     opts.scope
   );
   const prefix = opts.scope.namePrefix;
@@ -1266,7 +1266,7 @@ function deployableSummary(opts) {
       {
         codeScope: declaredCodeScope(
           opts.options.codeScopes?.[deployableUnit.instanceName],
-          code.entry
+          code
         )
       },
       {
@@ -1281,8 +1281,11 @@ function deployableSummary(opts) {
     )
   };
 }
-function declaredCodeScope(directory, entry) {
-  const written = entry !== null ? { entry } : {};
+function declaredCodeScope(directory, code) {
+  const written = {
+    ...code.entry !== null ? { entry: code.entry } : {},
+    ...code.entryExport !== null ? { entryExport: code.entryExport } : {}
+  };
   if (directory !== void 0) {
     return { kind: "codeUri", path: directory, ...written };
   }
@@ -1308,19 +1311,28 @@ function deployedProcesses(body, boundary, scope) {
     containerName: containers.nameAttribute === void 0 ? null : stringOf(container[containers.nameAttribute])
   }));
 }
-var HANDLER_MODULE = {
-  "module.export": (written) => (0, import_behavioral_ir.parseHandler)(written)?.modulePath ?? null,
-  name: () => null
+var HANDLER_PARTS = {
+  "module.export": (written, runtime) => {
+    const parsed = (0, import_behavioral_ir.parseHandler)(written, runtime ?? void 0);
+    return {
+      entry: parsed?.modulePath ?? null,
+      entryExport: parsed?.exportName ?? null
+    };
+  },
+  name: (written) => ({ entry: null, entryExport: written.trim() || null })
 };
-function codePointer(body, boundary, scope) {
+function codePointer(body, boundary, scope, runtime) {
   const spec = boundary.code?.handler;
   const written = attributePattern(body, spec?.attribute, scope);
   if (spec === void 0 || written === null) {
-    return { entryPoint: null, entry: null };
+    return { entryPoint: null, entry: null, entryExport: null };
+  }
+  if ((0, import_behavioral_ir.hasNameHole)(written)) {
+    return { entryPoint: written, entry: null, entryExport: null };
   }
   return {
     entryPoint: written,
-    entry: (0, import_behavioral_ir.hasNameHole)(written) ? null : HANDLER_MODULE[spec.spelling](written)
+    ...HANDLER_PARTS[spec.spelling](written, runtime)
   };
 }
 var ENV_READERS = {

package/dist/index.js

@@ -1197,15 +1197,15 @@ function deployableSummary(opts) {
   const { boundary, instanceName, process } = opts;
   const declared = declaredEnv(process.body, boundary.env ?? [], opts.scope);
   const platform = boundary.platformEnvVars ?? PLATFORM_INJECTED_ENV_VARS[boundary.deploymentTarget];
-  const code = codePointer(process.body, boundary, opts.scope);
-  const image = attributePattern(
+  const runtime = attributePattern(
     process.body,
-    boundary.code?.imageAttribute,
+    boundary.runtimeAttribute,
     opts.scope
   );
-  const runtime = attributePattern(
+  const code = codePointer(process.body, boundary, opts.scope, runtime);
+  const image = attributePattern(
     process.body,
-    boundary.runtimeAttribute,
+    boundary.code?.imageAttribute,
     opts.scope
   );
   const prefix = opts.scope.namePrefix;
@@ -1237,7 +1237,7 @@ function deployableSummary(opts) {
       {
         codeScope: declaredCodeScope(
           opts.options.codeScopes?.[deployableUnit.instanceName],
-          code.entry
+          code
         )
       },
       {
@@ -1252,8 +1252,11 @@ function deployableSummary(opts) {
     )
   };
 }
-function declaredCodeScope(directory, entry) {
-  const written = entry !== null ? { entry } : {};
+function declaredCodeScope(directory, code) {
+  const written = {
+    ...code.entry !== null ? { entry: code.entry } : {},
+    ...code.entryExport !== null ? { entryExport: code.entryExport } : {}
+  };
   if (directory !== void 0) {
     return { kind: "codeUri", path: directory, ...written };
   }
@@ -1279,19 +1282,28 @@ function deployedProcesses(body, boundary, scope) {
     containerName: containers.nameAttribute === void 0 ? null : stringOf(container[containers.nameAttribute])
   }));
 }
-var HANDLER_MODULE = {
-  "module.export": (written) => parseHandler(written)?.modulePath ?? null,
-  name: () => null
+var HANDLER_PARTS = {
+  "module.export": (written, runtime) => {
+    const parsed = parseHandler(written, runtime ?? void 0);
+    return {
+      entry: parsed?.modulePath ?? null,
+      entryExport: parsed?.exportName ?? null
+    };
+  },
+  name: (written) => ({ entry: null, entryExport: written.trim() || null })
 };
-function codePointer(body, boundary, scope) {
+function codePointer(body, boundary, scope, runtime) {
   const spec = boundary.code?.handler;
   const written = attributePattern(body, spec?.attribute, scope);
   if (spec === void 0 || written === null) {
-    return { entryPoint: null, entry: null };
+    return { entryPoint: null, entry: null, entryExport: null };
+  }
+  if (hasNameHole(written)) {
+    return { entryPoint: written, entry: null, entryExport: null };
   }
   return {
     entryPoint: written,
-    entry: hasNameHole(written) ? null : HANDLER_MODULE[spec.spelling](written)
+    ...HANDLER_PARTS[spec.spelling](written, runtime)
   };
 }
 var ENV_READERS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/contract-terraform",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "type": "module",
   "description": "Read the storage a Terraform configuration declares and check it against the code that reads and writes those tables.",
   "keywords": [
@@ -47,7 +47,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.35.1",
+    "@suss/behavioral-ir": "0.36.0",
     "hcl2-parser": "^1.0.3",
     "semver": "^7.6.0"
   },