@hpx7/delta-pack-cli 0.2.0 → 0.2.2

package/dist/codegen/index.js

@@ -9789,13 +9789,13 @@ ${fromJsonBody}
         }`;
     const toJsonBody = props.map(([propName, propType]) => {
       if (propType.type === "optional") {
-        const nullCheck = isValueType(propType.value) ? `${toPascalCase(propName)}.HasValue` : `${toPascalCase(propName)} != null`;
-        return `            if (${nullCheck}) result["${propName}"] = ${renderToJson(propType, propName, toPascalCase(propName))};`;
+        const nullCheck = isValueType(propType.value) ? `obj.${toPascalCase(propName)}.HasValue` : `obj.${toPascalCase(propName)} != null`;
+        return `            if (${nullCheck}) result["${propName}"] = ${renderToJson(propType, propName, `obj.${toPascalCase(propName)}`)};`;
       }
-      return `            result["${propName}"] = ${renderToJson(propType, propName, toPascalCase(propName))};`;
+      return `            result["${propName}"] = ${renderToJson(propType, propName, `obj.${toPascalCase(propName)}`)};`;
     }).join(`
 `);
-    const toJsonMethod = `        public JsonObject ToJson()
+    const toJsonMethod = `        public static JsonObject ToJson(${name} obj)
         {
             var result = new JsonObject();
 ${toJsonBody}
@@ -9988,7 +9988,7 @@ ${decodeDiffInternalMethod}
     const toJsonCases = options.map((opt, i) => {
       const variantName = opt.name;
       const varName = toCamelCase(variantName);
-      return `            ${i > 0 ? "else " : ""}if (obj is ${variantName} ${varName}) return new JsonObject { ["${variantName}"] = ${varName}.ToJson() };`;
+      return `            ${i > 0 ? "else " : ""}if (obj is ${variantName} ${varName}) return new JsonObject { ["${variantName}"] = ${variantName}.ToJson(${varName}) };`;
     }).join(`
 `);
     const baseClass = `    public abstract class ${name}
@@ -10202,12 +10202,12 @@ ${decodeDiffNewTypeCases}
     } else if (type.type === "reference") {
       return renderToJson(type.ref, type.ref.name, key);
     } else if (type.type === "self-reference") {
-      return `${key}.ToJson()`;
+      return `${qualifyType(currentTypeName)}.ToJson(${key})`;
     }
     if (type.type === "union") {
       return `${qualifyType(type.name)}.ToJson(${key})`;
     }
-    return `${key}.ToJson()`;
+    return `${qualifyType(name)}.ToJson(${key})`;
   }
   function renderClone(type, name, key) {
     if (type.type === "string" || type.type === "int" || type.type === "float" || type.type === "boolean" || type.type === "enum") {

package/dist/index.js

@@ -9790,13 +9790,13 @@ ${fromJsonBody}
         }`;
     const toJsonBody = props.map(([propName, propType]) => {
       if (propType.type === "optional") {
-        const nullCheck = isValueType(propType.value) ? `${toPascalCase(propName)}.HasValue` : `${toPascalCase(propName)} != null`;
-        return `            if (${nullCheck}) result["${propName}"] = ${renderToJson(propType, propName, toPascalCase(propName))};`;
+        const nullCheck = isValueType(propType.value) ? `obj.${toPascalCase(propName)}.HasValue` : `obj.${toPascalCase(propName)} != null`;
+        return `            if (${nullCheck}) result["${propName}"] = ${renderToJson(propType, propName, `obj.${toPascalCase(propName)}`)};`;
       }
-      return `            result["${propName}"] = ${renderToJson(propType, propName, toPascalCase(propName))};`;
+      return `            result["${propName}"] = ${renderToJson(propType, propName, `obj.${toPascalCase(propName)}`)};`;
     }).join(`
 `);
-    const toJsonMethod = `        public JsonObject ToJson()
+    const toJsonMethod = `        public static JsonObject ToJson(${name} obj)
         {
             var result = new JsonObject();
 ${toJsonBody}
@@ -9989,7 +9989,7 @@ ${decodeDiffInternalMethod}
     const toJsonCases = options.map((opt, i) => {
       const variantName = opt.name;
       const varName = toCamelCase(variantName);
-      return `            ${i > 0 ? "else " : ""}if (obj is ${variantName} ${varName}) return new JsonObject { ["${variantName}"] = ${varName}.ToJson() };`;
+      return `            ${i > 0 ? "else " : ""}if (obj is ${variantName} ${varName}) return new JsonObject { ["${variantName}"] = ${variantName}.ToJson(${varName}) };`;
     }).join(`
 `);
     const baseClass = `    public abstract class ${name}
@@ -10203,12 +10203,12 @@ ${decodeDiffNewTypeCases}
     } else if (type.type === "reference") {
       return renderToJson(type.ref, type.ref.name, key);
     } else if (type.type === "self-reference") {
-      return `${key}.ToJson()`;
+      return `${qualifyType(currentTypeName)}.ToJson(${key})`;
     }
     if (type.type === "union") {
       return `${qualifyType(type.name)}.ToJson(${key})`;
     }
-    return `${key}.ToJson()`;
+    return `${qualifyType(name)}.ToJson(${key})`;
   }
   function renderClone(type, name, key) {
     if (type.type === "string" || type.type === "int" || type.type === "float" || type.type === "boolean" || type.type === "enum") {
@@ -11129,7 +11129,7 @@ var languages = {
 // package.json
 var package_default = {
   name: "@hpx7/delta-pack-cli",
-  version: "0.2.0",
+  version: "0.2.2",
   license: "MIT",
   author: "hpx7",
   repository: {
@@ -11159,7 +11159,7 @@ var package_default = {
     test: "bun test"
   },
   dependencies: {
-    "@hpx7/delta-pack": "^0.2.4",
+    "@hpx7/delta-pack": "^0.2.5",
     yaml: "^2.3.4"
   },
   devDependencies: {
@@ -11216,12 +11216,12 @@ async function generate(schemaPath, flags) {
   }
   const content = await readFile2(schemaPath, "utf-8");
   const schema2 = parseSchemaYml(content);
-  const codegen2 = languages[lang];
-  if (!codegen2) {
+  const codegen = languages[lang];
+  if (!codegen) {
     throw new ArgError(`generate: unknown language '${lang}'`);
   }
   const ns = flags.get("n") ?? flags.get("namespace");
-  const code = codegen2(schema2, typeof ns === "string" ? ns : undefined);
+  const code = codegen(schema2, typeof ns === "string" ? ns : undefined);
   await writeOutput(output === true ? undefined : output, code);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpx7/delta-pack-cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "license": "MIT",
   "author": "hpx7",
   "repository": {
@@ -30,7 +30,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@hpx7/delta-pack": "^0.2.4",
+    "@hpx7/delta-pack": "^0.2.5",
     "yaml": "^2.3.4"
   },
   "devDependencies": {