@neutrome-labs/merchantduo 0.0.3 → 0.0.4

package/README.md

@@ -3,7 +3,7 @@ Simple terminal interface to deploy Magento 2 stores onto the Cloudflare Edge.
 
 # How To Use
 
-> `pnpx @neutrome-labs/merchantduo help`
+> pnpx @neutrome-labs/merchantduo help
 
 ```
 MerchantDuo developer CLI

package/dist/index.js

@@ -23,7 +23,12 @@ function configureCliLogging() {
     },
     loggers: [
       {
-        category: ["merchantduo", "cli"],
+        category: ["logtape", "meta"],
+        sinks: ["console"],
+        lowestLevel: "warning"
+      },
+      {
+        category: ["merchantduo"],
         sinks: ["console"],
         lowestLevel: "warning"
       }
@@ -173,66 +178,112 @@ import * as z4 from "zod";
 
 // ../../src/types/service-mysql.ts
 import * as z2 from "zod";
+var BUNDLED_CONNECTION_STRING = "mysql://magento:magento@127.0.0.1:3306/magento";
 var BundledMysqlServiceConfigSchema = z2.object({
-  kind: z2.literal("bundled")
+  mode: z2.literal("bundled").default("bundled")
 });
 var HyperdriveMysqlConfigSchema = z2.object({
-  kind: z2.literal("hyperdrive"),
+  mode: z2.literal("hyperdrive"),
   connectionString: z2.string()
 });
-var MysqlServiceConfigSchema = z2.union([
-  BundledMysqlServiceConfigSchema,
-  HyperdriveMysqlConfigSchema
-]);
+var MysqlServiceConfigSchema = z2.union([BundledMysqlServiceConfigSchema, HyperdriveMysqlConfigSchema]).default({ mode: "bundled" }).transform((config2, ctx) => {
+  const connectionString = config2.mode === "bundled" ? BUNDLED_CONNECTION_STRING : config2.connectionString;
+  let url3;
+  try {
+    url3 = new URL(connectionString);
+  } catch {
+    ctx.addIssue({
+      code: "custom",
+      message: "Invalid MySQL connection string"
+    });
+    return z2.NEVER;
+  }
+  return {
+    mode: config2.mode,
+    connectionString,
+    host: url3.hostname,
+    port: Number(url3.port || 3306),
+    database: decodeURIComponent(url3.pathname.replace(/^\//, "") || "magento"),
+    username: decodeURIComponent(url3.username),
+    password: decodeURIComponent(url3.password)
+  };
+});
 
 // ../../src/types/service-opensearch.ts
 import * as z3 from "zod";
+var BUNDLED_OPENSEARCH_URL = "http://localhost:9200";
 var BundledOpensearchServiceConfigSchema = z3.object({
-  kind: z3.literal("bundled")
+  mode: z3.literal("bundled").default("bundled")
 });
 var RemoteOpensearchConfigSchema = z3.object({
-  kind: z3.literal("remote"),
+  mode: z3.literal("remote"),
   url: z3.url(),
   port: z3.number().optional(),
   username: z3.string().optional(),
   password: z3.string().optional()
-}).transform((x) => {
-  const url3 = new URL(x.url);
+});
+var OpensearchServiceConfigSchema = z3.union([BundledOpensearchServiceConfigSchema, RemoteOpensearchConfigSchema]).default({ mode: "bundled" }).transform((config2) => {
+  const url3 = new URL(
+    config2.mode === "bundled" ? BUNDLED_OPENSEARCH_URL : config2.url
+  );
+  const username = config2.mode === "remote" ? config2.username || decodeURIComponent(url3.username) || void 0 : void 0;
+  const password = config2.mode === "remote" ? config2.password || decodeURIComponent(url3.password) || void 0 : void 0;
   return {
-    ...x,
-    port: x.port ?? Number(url3.port || (url3.protocol === "https:" ? 443 : 80))
+    mode: config2.mode,
+    url: `${url3.protocol}//${url3.host}`,
+    port: config2.mode === "remote" && config2.port ? config2.port : Number(url3.port || (url3.protocol === "https:" ? 443 : 80)),
+    ...username ? { username } : {},
+    ...password ? { password } : {}
   };
 });
-var OpensearchServiceConfigSchema = z3.union([
-  BundledOpensearchServiceConfigSchema,
-  RemoteOpensearchConfigSchema
-]);
 
 // ../../src/types/instance.ts
 var InstanceGradeSchema = z4.enum(["sandbox", "instance"]);
+var InstanceR2MountSchema = z4.object({
+  bucket: z4.string().min(1).describe("R2 bucket name"),
+  prefix: z4.string().min(1).optional().describe("R2 key prefix mounted into the container"),
+  readOnly: z4.boolean().default(false)
+});
+var InstanceServicesConfigSchema = z4.object({
+  mysql: MysqlServiceConfigSchema.optional(),
+  opensearch: OpensearchServiceConfigSchema.optional()
+}).optional().transform((services) => ({
+  mysql: MysqlServiceConfigSchema.parse(services?.mysql ?? {}),
+  opensearch: OpensearchServiceConfigSchema.parse(services?.opensearch ?? {})
+}));
 var InstanceConfigSchema = z4.object({
   instanceId: z4.string(),
   baseUrl: z4.url().optional(),
   grade: InstanceGradeSchema.default("sandbox"),
   template: TemplatesSchema,
   deadline: z4.date().optional().describe("deadline for the instance"),
-  services: z4.object({
-    mysql: MysqlServiceConfigSchema,
-    opensearch: OpensearchServiceConfigSchema
-  }),
+  services: InstanceServicesConfigSchema,
   snapshots: z4.object({
     fs: z4.string().describe("filesystem (src) snapshot reference").optional(),
     app: z4.string().describe("app (db) snapshot reference").optional()
   }).optional(),
   mounts: z4.object({
-    media: z4.string().describe("path to the pub/media r2 mount")
+    media: InstanceR2MountSchema.optional().describe("pub/media R2 mount")
   }).optional(),
   tools: z4.object({
     codeserver: z4.boolean().default(false),
     phpMyAdmin: z4.boolean().default(false),
     opencode: z4.boolean().default(false)
   }).optional()
-});
+}).transform((config2) => ({
+  ...config2,
+  services: {
+    ...config2.services,
+    opensearch: {
+      ...config2.services.opensearch,
+      indexPrefix: indexPrefixForInstance(config2.instanceId)
+    }
+  }
+}));
+function indexPrefixForInstance(instanceId) {
+  const prefix = instanceId.replace(/[^a-zA-Z0-9]/g, "_").substring(0, 6);
+  return prefix || "magento";
+}
 var InstanceStateSchema = z4.enum([
   "stopped",
   "scheduled",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neutrome-labs/merchantduo",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.js",
   "bin": {

package/src/logging.ts

@@ -18,7 +18,12 @@ export function configureCliLogging(): void {
     },
     loggers: [
       {
-        category: ["merchantduo", "cli"],
+        category: ["logtape", "meta"],
+        sinks: ["console"],
+        lowestLevel: "warning",
+      },
+      {
+        category: ["merchantduo"],
         sinks: ["console"],
         lowestLevel: "warning",
       },