@flisk-sh/flisk-import 0.8.0 → 0.9.0

package/dist/detectors/compose.js

@@ -46,6 +46,7 @@ const TRANSLATED_KEYS = new Set([
     "restart",
     "command",
     "entrypoint",
+    "models",
     // Flisk gives every service its own stack network and container name, so these change nothing it needs.
     "networks",
     "expose",
@@ -290,6 +291,20 @@ function healthProbeOf(healthcheck) {
         ...(retries ? { retries } : {}),
     };
 }
+/** The models a service uses, joined to their top-level definitions. A model without a literal `model` is skipped. */
+function modelsOf(uses, defined) {
+    const names = Array.isArray(uses) ? uses : isObj(uses) ? Object.keys(uses) : [];
+    const out = [];
+    for (const name of names) {
+        const def = isObj(defined) && typeof name === "string" ? defined[name] : undefined;
+        if (typeof name === "string" &&
+            isObj(def) &&
+            typeof def.model === "string" &&
+            /^[A-Za-z0-9_.-]+$/.test(name))
+            out.push({ name, model: def.model });
+    }
+    return out.length ? out : undefined;
+}
 function healthPathOf(healthcheck) {
     if (!isObj(healthcheck) || !Array.isArray(healthcheck.test))
         return undefined;
@@ -417,6 +432,7 @@ registerDetector({
                     ? Object.keys(raw.depends_on)
                     : [];
             const command = commandOf(raw.command);
+            const models = modelsOf(raw.models, isObj(root) ? root.models : undefined);
             const containerCommand = containerCommandOf(raw.command);
             const containerEntrypoint = containerCommandOf(raw.entrypoint);
             const healthProbe = healthProbeOf(raw.healthcheck);
@@ -508,6 +524,7 @@ registerDetector({
                 ...(command ? { command } : {}),
                 ...(containerCommand ? { containerCommand } : {}),
                 ...(containerEntrypoint ? { containerEntrypoint } : {}),
+                ...(models ? { models } : {}),
                 ...(healthProbe ? { healthCheck: healthProbe } : {}),
                 ...(selectedPort !== undefined ? { port: selectedPort } : {}),
                 ...(healthCheckPath ? { healthCheckPath } : {}),

package/dist/merge.js

@@ -73,6 +73,7 @@ function mergeGroup(name, dir, members, resolve) {
         ...firstOf(ordered, "restart"),
         ...firstOf(ordered, "containerCommand"),
         ...firstOf(ordered, "containerEntrypoint"),
+        ...firstOf(ordered, "models"),
         ...firstOf(ordered, "healthCheck"),
         ...(ordered.find((c) => c.sidecarOf)?.sidecarOf
             ? { sidecarOf: resolve(ordered.find((c) => c.sidecarOf)?.sidecarOf) }

package/dist/write.js

@@ -271,6 +271,7 @@ export function planWrites(plan, force) {
             ...(secretNames.length ? { secrets: { required: secretNames } } : {}),
             ...(service.restart ? { restart: service.restart } : {}),
             ...(service.container ? { container: service.container } : {}),
+            ...(service.models ? { models: service.models } : {}),
             ...(extraPorts.length ? { extraPorts } : {}),
             ...(sidecarOf ? { sidecarOf } : {}),
             ...(volumes.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flisk-sh/flisk-import",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Import a repository's root docker-compose.yml into Flisk service.json files, or register its Tiltfile.",
   "type": "module",
   "license": "MIT",