@zodmire/cli 0.1.0 → 0.1.2

package/mod.mjs

@@ -1,7 +1,8 @@
+import { register } from "node:module";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { dirname, resolve } from "node:path";
-import { VENDORED_FILE_MANIFEST, buildCompositionArtifacts, buildContextNormalizedSpecFromConfig, buildFileArtifactTags, buildNormalizedCompositionSpec, buildNormalizedSpecTags, buildV5ContextArtifacts, filterPerContextArtifactsForComposition, inferReconcileScopes, mergeGeneratedArtifacts, prepareAllVendoredFiles, resolveAbsoluteContextInputs, serializeCompositionSpec, serializeContextSpec } from "@zodmire/core";
+import { VENDORED_FILE_MANIFEST, buildCompositionArtifacts, buildContextNormalizedSpecFromConfig, buildFileArtifactTags, buildNormalizedCompositionSpec, buildNormalizedSpecTags, buildV5ContextArtifacts, filterPerContextArtifactsForComposition, generateContextArtifacts, inferReconcileScopes, mergeGeneratedArtifacts, prepareAllVendoredFiles, resolveAbsoluteContextInputs, serializeCompositionSpec, serializeContextSpec } from "@zodmire/core";
 import { materializeOwnedArtifacts } from "@zodmire/core/materialize";
 import { statSync } from "node:fs";
 import { spawn } from "node:child_process";
@@ -172,14 +173,14 @@ async function runCompositionGenerate(compositionConfigPath, targetOverride, ver
 	console.log(`Generating composition from ${compositionConfigPath}`);
 	console.log(`  contexts: ${resolvedContextConfigs.length}`);
 	const contextSpecs = await Promise.all(resolvedContextConfigs.map((cfg) => buildContextNormalizedSpecFromConfig(cfg)));
-	const perContextArtifacts = await Promise.all(resolvedContextConfigs.map((cfg) => buildV5ContextArtifacts(cfg)));
+	const compositionSpec = buildNormalizedCompositionSpec(compositionConfig, contextSpecs);
+	const perContextArtifacts = contextSpecs.map((contextSpec) => generateContextArtifacts(contextSpec, { infrastructureStrategy: compositionSpec.infrastructure }));
 	const compositionArtifacts = await buildCompositionArtifacts(compositionConfigPath, contextSpecs);
 	const allArtifacts = mergeGeneratedArtifacts(...perContextArtifacts.map(filterPerContextArtifactsForComposition), compositionArtifacts).sort((a, b) => a.logicalPath.localeCompare(b.logicalPath));
 	console.log(`  target: ${resolvedTarget}`);
 	const result = await materializeOwnedArtifacts(resolvedTarget, allArtifacts, GENERATOR_VERSION, { reconcileScopes: inferReconcileScopes(allArtifacts) });
 	if (versionData) {
 		if (!isSwampRepoAvailable()) throw new Error("Swamp repo not initialized. Run `swamp init` or omit --version-data");
-		const compositionSpec = buildNormalizedCompositionSpec(compositionConfig, contextSpecs);
 		const specJson = serializeCompositionSpec(compositionSpec, GENERATOR_VERSION);
 		const generationRunId = `run-${(/* @__PURE__ */ new Date()).toISOString()}-${crypto.randomUUID().slice(0, 8)}`;
 		console.log("  mirroring to Swamp data layer...");
@@ -209,6 +210,17 @@ async function runCompositionGenerate(compositionConfigPath, targetOverride, ver
 
 //#endregion
 //#region packages/cli/mod.ts
+register(`data:text/javascript,${encodeURIComponent(`
+const NPM_RE = /^npm:(@?[^@\\/]+(?:\\/[^@\\/]+)?)(?:@[^/]*)?(.*)$/;
+export function resolve(specifier, context, nextResolve) {
+  const match = NPM_RE.exec(specifier);
+  if (match) {
+    const bare = match[1] + (match[2] || "");
+    return nextResolve(bare, context);
+  }
+  return nextResolve(specifier, context);
+}
+`)}`, import.meta.url);
 function printUsage() {
 	console.log(`zodmire v${GENERATOR_VERSION}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodmire/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "license": "MIT",
   "type": "module",
   "main": "./mod.mjs",
@@ -13,8 +13,8 @@
     }
   },
   "dependencies": {
-    "@zodmire/config": "^0.1.0",
-    "@zodmire/core": "^0.1.0"
+    "@zodmire/config": "^0.1.2",
+    "@zodmire/core": "^0.1.2"
   },
   "bin": {
     "zodmire": "./bin/zodmire.js"