owosk 0.2.0 → 0.2.2

package/README.md

@@ -20,7 +20,7 @@ npx owo --help
 
 ### `init`
 
-Initialize a new Owostack project with a default configuration file (`owo.config.ts` or `owo.config.js`).
+Initialize a new Owostack project with a default configuration file (`owo.config.ts` or `owo.config.js`). JavaScript configs use ESM `import`/`export` syntax.
 
 ```bash
 npx owo init

package/dist/index.js

@@ -49,12 +49,15 @@ function getApiKey(cliKey) {
 import { resolve, isAbsolute, extname } from "path";
 import { existsSync as existsSync2 } from "fs";
 import { createJiti } from "jiti";
-var jiti = createJiti(import.meta.url);
+var jiti = createJiti(import.meta.url, {
+  alias: {
+    owostack: import.meta.resolve("owostack")
+  }
+});
 var DEFAULT_CONFIG_NAMES = [
   "owo.config.ts",
   "owo.config.js",
   "owo.config.mjs",
-  "owo.config.cjs",
   "owo.config.mts",
   "owo.config.cts"
 ];
@@ -95,20 +98,20 @@ async function loadOwostackFromConfig(fullPath) {
       console.error(`  Example owo.config.ts:
 `);
       console.error(
-        `    import { Owostack, metered, boolean, plan } from "owostack";`
+        `    import { Owostack, metered, boolean, entity, creditSystem, creditPack, plan } from "owostack";`
       );
       console.error(
-        `    export default new Owostack({ secretKey: "...", catalog: [...] });
+        `    export const owo = new Owostack({ secretKey: "...", catalog: [...] });
 `
       );
     } else {
       console.error(`  Example owo.config.js:
 `);
       console.error(
-        `    const { Owostack, metered, boolean, plan } = require("owostack");`
+        `    import { Owostack, metered, boolean, entity, creditSystem, creditPack, plan } from "owostack";`
       );
       console.error(
-        `    module.exports = new Owostack({ secretKey: "...", catalog: [...] });
+        `    export const owo = new Owostack({ secretKey: "...", catalog: [...] });
 `
       );
     }
@@ -771,9 +774,9 @@ async function runSync(options) {
 // src/commands/pull.ts
 import * as p3 from "@clack/prompts";
 import pc4 from "picocolors";
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { join as join2, resolve as resolve2, extname as extname2, isAbsolute as isAbsolute2 } from "path";
+import { resolve as resolve2, extname as extname2, isAbsolute as isAbsolute2 } from "path";
 
 // src/lib/generate.ts
 function slugToIdentifier(slug, used) {
@@ -830,9 +833,7 @@ function slugToIdentifier(slug, used) {
 }
 function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProvider, format = "ts") {
   const isTs = format === "ts";
-  const isCjs = format === "cjs";
   const creditSystemSlugs = new Set(creditSystems.map((cs) => cs.slug));
-  const creditSystemBySlug = new Map(creditSystems.map((cs) => [cs.slug, cs]));
   const featuresBySlug = /* @__PURE__ */ new Map();
   for (const plan of plans) {
     for (const f of plan.features || []) {
@@ -858,7 +859,16 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
       }
     }
   }
-  const usedNames = /* @__PURE__ */ new Set();
+  const usedNames = /* @__PURE__ */ new Set([
+    "Owostack",
+    "metered",
+    "boolean",
+    "entity",
+    "creditSystem",
+    "creditPack",
+    "plan",
+    "owo"
+  ]);
   const featureVars = /* @__PURE__ */ new Map();
   const featureLines = [];
   for (const feature of featuresBySlug.values()) {
@@ -868,36 +878,26 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
     const isEntity = feature.meterType === "non_consumable";
     const builder = feature.type === "boolean" ? "boolean" : isEntity ? "entity" : "metered";
     const decl = `${builder}(${JSON.stringify(feature.slug)}${nameArg})`;
-    if (isCjs) {
-      featureLines.push(`const ${varName} = ${decl};`);
-      featureLines.push(`exports.${varName} = ${varName};`);
-    } else {
-      featureLines.push(`export const ${varName} = ${decl};`);
-    }
+    featureLines.push(`export const ${varName} = ${decl};`);
   }
   const creditSystemLines = [];
   const creditSystemVars = /* @__PURE__ */ new Map();
   for (const cs of creditSystems) {
     const varName = slugToIdentifier(cs.slug, usedNames);
     creditSystemVars.set(cs.slug, varName);
-    const nameArg = cs.name ? `name: ${JSON.stringify(cs.name)}` : "";
-    const descArg = cs.description ? `description: ${JSON.stringify(cs.description)}` : "";
+    const configLines = [];
+    if (cs.name) configLines.push(`name: ${JSON.stringify(cs.name)}`);
+    if (cs.description)
+      configLines.push(`description: ${JSON.stringify(cs.description)}`);
     const featureEntries = (cs.features || []).map((f) => {
       const childVar = featureVars.get(f.feature) || f.feature;
       return `${childVar}(${f.creditCost})`;
     });
-    const optsParts = [
-      nameArg,
-      descArg,
-      `features: [${featureEntries.join(", ")}]`
-    ].filter(Boolean);
-    const decl = `creditSystem(${JSON.stringify(cs.slug)}, { ${optsParts.join(", ")} })`;
-    if (isCjs) {
-      creditSystemLines.push(`const ${varName} = ${decl};`);
-      creditSystemLines.push(`exports.${varName} = ${varName};`);
-    } else {
-      creditSystemLines.push(`export const ${varName} = ${decl};`);
-    }
+    configLines.push(`features: [${featureEntries.join(", ")}]`);
+    const decl = `creditSystem(${JSON.stringify(cs.slug)}, {
+  ${configLines.join(",\n  ")}
+})`;
+    creditSystemLines.push(`export const ${varName} = ${decl};`);
   }
   const planLines = [];
   for (const plan of plans) {
@@ -1018,50 +1018,41 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
   const importParts = ["Owostack", "metered", "boolean"];
   if (hasEntities) importParts.push("entity");
   importParts.push("creditSystem", "creditPack", "plan");
-  const imports = isCjs ? `const { ${importParts.join(", ")} } = require("owostack");` : `import { ${importParts.join(", ")} } from "owostack";`;
+  const imports = `import { ${importParts.join(", ")} } from "owostack";`;
   const tsCheck = !isTs ? `// @ts-check` : "";
   const jsDoc = !isTs ? `/** @type {import('owostack').Owostack} */` : "";
-  const owoDecl = isCjs ? "exports.owo =" : "export const owo =";
+  const owoDecl = "export const owo =";
   const secretKey = isTs ? "process.env.OWOSTACK_SECRET_KEY!" : "process.env.OWOSTACK_SECRET_KEY";
+  const catalogEntries = [...planLines, ...creditPackLines];
   return [
     tsCheck,
     imports,
     ``,
     ...featureLines,
     ...hasCreditSystems ? ["", ...creditSystemLines] : [],
-    ...hasCreditPacks ? ["", ...creditPackLines] : [],
     ``,
     jsDoc,
     `${owoDecl} new Owostack({`,
     `  secretKey: ${secretKey},`,
     providerLine,
     `  catalog: [`,
-    `    ${planLines.join(",\n    ")}${hasCreditPacks ? "," : ""}`,
-    ...hasCreditPacks ? [`    ${creditPackLines.join(",\n    ")}`] : [],
+    `    ${catalogEntries.join(",\n    ")}`,
     `  ],`,
-    `});`,
-    ``
+    `});`
   ].filter(Boolean).join("\n");
 }
 
 // src/commands/pull.ts
-function getProjectInfo() {
-  const cwd = process.cwd();
-  let isEsm = false;
-  try {
-    const pkg2 = JSON.parse(readFileSync2(join2(cwd, "package.json"), "utf8"));
-    isEsm = pkg2.type === "module";
-  } catch {
-  }
-  return { isEsm };
-}
 function determineFormat(fullPath) {
   const ext = extname2(fullPath);
-  const { isEsm } = getProjectInfo();
   if (ext === ".ts" || ext === ".mts" || ext === ".cts") return "ts";
   if (ext === ".mjs") return "esm";
-  if (ext === ".cjs") return "cjs";
-  if (ext === ".js") return isEsm ? "esm" : "cjs";
+  if (ext === ".cjs") {
+    throw new Error(
+      "CommonJS config files are not supported. Use owo.config.js or owo.config.ts."
+    );
+  }
+  if (ext === ".js") return "esm";
   return "ts";
 }
 async function runPull(options) {
@@ -1084,7 +1075,13 @@ async function runPull(options) {
   const testUrl = getTestApiUrl(configSettings.environments?.test);
   const liveUrl = getApiUrl(configSettings.environments?.live);
   const filters = configSettings.filters || {};
-  const format = determineFormat(fullPath);
+  let format;
+  try {
+    format = determineFormat(fullPath);
+  } catch (e) {
+    p3.log.error(pc4.red(e.message));
+    process.exit(1);
+  }
   const s = p3.spinner();
   if (options.prod) {
     p3.log.step(pc4.magenta("Production Mode: Pulling from PROD environment"));
@@ -1330,9 +1327,9 @@ async function runDiff(options) {
 // src/commands/init.ts
 import * as p6 from "@clack/prompts";
 import pc7 from "picocolors";
-import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { writeFile as writeFile3 } from "fs/promises";
-import { join as join3, resolve as resolve3, isAbsolute as isAbsolute3, extname as extname3 } from "path";
+import { join as join2, resolve as resolve3, isAbsolute as isAbsolute3, extname as extname3 } from "path";
 
 // src/lib/connect.ts
 import * as p5 from "@clack/prompts";
@@ -1432,16 +1429,10 @@ async function executeConnectFlow(options) {
 }
 
 // src/commands/init.ts
-function getProjectInfo2() {
+function getProjectInfo() {
   const cwd = process.cwd();
-  const isTs = existsSync4(join3(cwd, "tsconfig.json"));
-  let isEsm = false;
-  try {
-    const pkg2 = JSON.parse(readFileSync3(join3(cwd, "package.json"), "utf8"));
-    isEsm = pkg2.type === "module";
-  } catch {
-  }
-  return { isTs, isEsm };
+  const isTs = existsSync4(join2(cwd, "tsconfig.json"));
+  return { isTs };
 }
 async function runInit(options) {
   p6.intro(pc7.bgYellow(pc7.black(" init ")));
@@ -1451,7 +1442,7 @@ async function runInit(options) {
     if (existing) {
       targetPath = existing;
     } else {
-      const { isTs } = getProjectInfo2();
+      const { isTs } = getProjectInfo();
       targetPath = isTs ? "owo.config.ts" : "owo.config.js";
     }
   }
@@ -1489,20 +1480,22 @@ async function runInit(options) {
     const plans = await fetchPlans({ apiKey, apiUrl });
     const creditSystems = await fetchCreditSystems(apiKey, apiUrl);
     const ext = extname3(fullPath);
-    const { isEsm } = getProjectInfo2();
     let format = "ts";
     if (ext === ".ts" || ext === ".mts" || ext === ".cts") {
       format = "ts";
     } else if (ext === ".mjs") {
       format = "esm";
     } else if (ext === ".cjs") {
-      format = "cjs";
+      throw new Error(
+        "CommonJS config files are not supported. Use owo.config.js or owo.config.ts."
+      );
     } else if (ext === ".js") {
-      format = isEsm ? "esm" : "cjs";
+      format = "esm";
     }
     const configContent = generateConfig(
       plans,
       creditSystems,
+      [],
       void 0,
       format
     );
@@ -1516,9 +1509,7 @@ ${pc7.dim("Credit Systems:")} ${creditSystems.length}`,
       "\u2728 Project Initialized"
     );
     p6.outro(
-      pc7.cyan(
-        `Next step: Run ${pc7.bold("owostack sync")} to apply your catalog.`
-      )
+      pc7.cyan(`Next step: Run ${pc7.bold("owosk sync")} to apply your catalog.`)
     );
   } catch (e) {
     s.stop(pc7.red("Initialization failed"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owosk",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CLI for Owostack - sync catalog, manage billing infrastructure",
   "license": "Apache-2.0",
   "repository": {