owosk 0.2.0 → 0.2.1

package/dist/index.js

@@ -95,7 +95,7 @@ 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: [...] });
@@ -105,7 +105,7 @@ async function loadOwostackFromConfig(fullPath) {
       console.error(`  Example owo.config.js:
 `);
       console.error(
-        `    const { Owostack, metered, boolean, plan } = require("owostack");`
+        `    const { Owostack, metered, boolean, entity, creditSystem, creditPack, plan } = require("owostack");`
       );
       console.error(
         `    module.exports = new Owostack({ secretKey: "...", catalog: [...] });
@@ -832,7 +832,6 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
   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 +857,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()) {
@@ -870,7 +878,6 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
     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};`);
     }
@@ -880,21 +887,20 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
   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(", ")} })`;
+    configLines.push(`features: [${featureEntries.join(", ")}]`);
+    const decl = `creditSystem(${JSON.stringify(cs.slug)}, {
+  ${configLines.join(",\n  ")}
+})`;
     if (isCjs) {
       creditSystemLines.push(`const ${varName} = ${decl};`);
-      creditSystemLines.push(`exports.${varName} = ${varName};`);
     } else {
       creditSystemLines.push(`export const ${varName} = ${decl};`);
     }
@@ -1021,26 +1027,39 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
   const imports = isCjs ? `const { ${importParts.join(", ")} } = require("owostack");` : `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 = isCjs ? "const owo =" : "export const owo =";
   const secretKey = isTs ? "process.env.OWOSTACK_SECRET_KEY!" : "process.env.OWOSTACK_SECRET_KEY";
+  const catalogEntries = [...planLines, ...creditPackLines];
+  const footer = isCjs ? `module.exports = { owo, ${Array.from(usedNames).filter(
+    (n) => ![
+      "Owostack",
+      "metered",
+      "boolean",
+      "entity",
+      "creditSystem",
+      "creditPack",
+      "plan",
+      "owo"
+    ].includes(n)
+  ).join(", ")} };`.replace(",  };", " };") : "";
+  const finalFooter = isCjs && footer.includes("{ owo,  }") ? "module.exports = { owo };" : footer;
   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    ")}`,
     `  ],`,
     `});`,
-    ``
+    ``,
+    finalFooter
   ].filter(Boolean).join("\n");
 }
 
@@ -1503,6 +1522,7 @@ async function runInit(options) {
     const configContent = generateConfig(
       plans,
       creditSystems,
+      [],
       void 0,
       format
     );
@@ -1517,7 +1537,7 @@ ${pc7.dim("Credit Systems:")} ${creditSystems.length}`,
     );
     p6.outro(
       pc7.cyan(
-        `Next step: Run ${pc7.bold("owostack sync")} to apply your catalog.`
+        `Next step: Run ${pc7.bold("owosk sync")} to apply your catalog.`
       )
     );
   } catch (e) {

package/package.json

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