Code generator scripts refactor; Add credential, role, and schedule construct schemas with Go models

build/generate-typescript.js

@@ -116,7 +116,7 @@ async function generateTypescriptTypes(pkg) {
       ` */\n\n` +
       `const ${pascalName}Schema = ` +
       jsonContent +
-      ` as const;\n\nexport default ${pascalName}Schema;\n`;
+      ` as const satisfies Record<string, unknown>;\n\nexport default ${pascalName}Schema;\n`;
     fs.writeFileSync(jsonOutputPath, tsContent, "utf-8");
     logger.success(`Generated: ${jsonOutputPath}`);
   } catch (err) {

build/lib/generated-go-helpers.js

@@ -0,0 +1,192 @@
+const fs = require("fs");
+const path = require("path");
+
+const GENERATED_HELPER_SPECS = {
+  "v1beta1/academy": {
+    mapStructTypes: ["Quiz", "QuizSubmission", "QuizEvaluationResult"],
+  },
+  "v1beta1/connection": {
+    eventCategories: {
+      Connection: "connection",
+      MesheryInstance: "connection",
+    },
+  },
+  "v1beta1/credential": {
+    eventCategories: {
+      Credential: "credential",
+    },
+  },
+  "v1beta1/environment": {
+    eventCategories: {
+      Environment: "environment",
+    },
+  },
+  "v1beta1/key": {
+    eventCategories: {
+      Key: "key",
+    },
+  },
+  "v1beta1/keychain": {
+    eventCategories: {
+      Keychain: "keychain",
+    },
+  },
+  "v1beta1/organization": {
+    eventCategories: {
+      Organization: "organization",
+    },
+    jsonTypes: ["OrgMetadata"],
+  },
+  "v1beta1/plan": {
+    eventCategories: {
+      Plan: "plan",
+    },
+  },
+  "v1beta1/role": {
+    eventCategories: {
+      Role: "role",
+    },
+  },
+  "v1beta1/schedule": {
+    eventCategories: {
+      Schedule: "schedule",
+    },
+  },
+  "v1beta1/subscription": {
+    eventCategories: {
+      Subscription: "subscription",
+    },
+  },
+  "v1beta1/team": {
+    eventCategories: {
+      Team: "team",
+    },
+  },
+  "v1beta1/user": {
+    eventCategories: {
+      User: "user",
+    },
+    mapStructTypes: ["Preference"],
+  },
+};
+
+function renderEventCategoryMethods(eventCategories) {
+  return Object.entries(eventCategories)
+    .map(
+      ([typeName, eventCategory]) => `func (*${typeName}) EventCategory() string {
+\treturn ${JSON.stringify(eventCategory)}
+}`,
+    )
+    .join("\n\n");
+}
+
+function renderMapStructMethods(typeName) {
+  return `func (value *${typeName}) Scan(src interface{}) error {
+\tif src == nil {
+\t\t*value = ${typeName}{}
+\t\treturn nil
+\t}
+
+\tmapVal := core.Map{}
+\tif err := mapVal.Scan(src); err != nil {
+\t\treturn err
+\t}
+
+\treturn core.MapToStruct(mapVal, value)
+}
+
+func (value ${typeName}) Value() (driver.Value, error) {
+\tmapVal, err := core.StructToMap(value)
+\tif err != nil {
+\t\treturn nil, err
+\t}
+
+\treturn core.Map(mapVal).Value()
+}`;
+}
+
+function renderJsonMethods(typeName) {
+  return `func (value *${typeName}) Scan(src interface{}) error {
+\tif src == nil {
+\t\t*value = ${typeName}{}
+\t\treturn nil
+\t}
+
+\tdata, err := utils.Cast[[]byte](src)
+\tif err != nil {
+\t\treturn err
+\t}
+
+\tif err := json.Unmarshal(data, value); err != nil {
+\t\treturn utils.ErrUnmarshal(err)
+\t}
+
+\treturn nil
+}
+
+func (value ${typeName}) Value() (driver.Value, error) {
+\tmarshaledValue, err := json.Marshal(value)
+\tif err != nil {
+\t\treturn nil, utils.ErrMarshal(err)
+\t}
+
+\treturn marshaledValue, nil
+}`;
+}
+
+function renderGeneratedHelperFile(pkg, spec) {
+  const imports = new Map();
+  const sections = [];
+
+  if (spec.mapStructTypes?.length) {
+    imports.set("database/sql/driver", null);
+    imports.set("github.com/meshery/schemas/models/core", "core");
+    sections.push(spec.mapStructTypes.map(renderMapStructMethods).join("\n\n"));
+  }
+
+  if (spec.jsonTypes?.length) {
+    imports.set("database/sql/driver", null);
+    imports.set("encoding/json", null);
+    imports.set("github.com/meshery/meshkit/utils", null);
+    sections.push(spec.jsonTypes.map(renderJsonMethods).join("\n\n"));
+  }
+
+  if (spec.eventCategories && Object.keys(spec.eventCategories).length > 0) {
+    sections.push(renderEventCategoryMethods(spec.eventCategories));
+  }
+
+  if (sections.length === 0) {
+    return null;
+  }
+
+  const importBlock = imports.size
+    ? `import (\n${[...imports.entries()]
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([importPath, alias]) =>
+          alias ? `\t${alias} ${JSON.stringify(importPath)}` : `\t${JSON.stringify(importPath)}`,
+        )
+        .join("\n")}\n)\n\n`
+    : "";
+
+  return `// Code generated by build/generate-golang.js; DO NOT EDIT.\npackage ${pkg.name}\n\n${importBlock}${sections.join("\n\n")}\n`;
+}
+
+function writeGeneratedHelperFile(pkg, outputDir) {
+  const spec = GENERATED_HELPER_SPECS[`${pkg.version}/${pkg.dirName}`];
+  if (!spec) {
+    return null;
+  }
+
+  const filePath = path.join(outputDir, "zz_generated.helpers.go");
+  const content = renderGeneratedHelperFile(pkg, spec);
+  if (!content) {
+    return null;
+  }
+
+  fs.writeFileSync(filePath, content, "utf-8");
+  return filePath;
+}
+
+module.exports = {
+  writeGeneratedHelperFile,
+};

build/openapi.config.yml

@@ -16,8 +16,9 @@
 #   oapi-codegen --config build/openapi.config.yml --package <pkg> -o <output> <input>
 #
 # IMPORT MAPPINGS:
-#   Maps schema $ref paths to Go import paths, enabling proper cross-package
-#   references when schemas reference other schemas.
+#   The automated Go generator augments this config with per-package import
+#   mappings derived from reachable external $ref targets. Keep this base
+#   mapping block empty unless a global fallback is required.
 #
 # NOTE:
 #   This file is used by generate-golang.sh. For schema-specific overrides,
@@ -26,26 +27,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/HEAD/configuration-schema.json
 package: v1beta1
 
-import-mapping:
-  "./core.yml": "github.com/meshery/schemas/models/core"
-  "./common/core.yml": "github.com/meshery/schemas/models/core"
-  "../../core.json": "github.com/meshery/schemas/models/core"
-  "./common/parameters.yml": "github.com/meshery/schemas/models/core"
-
-  # v1alpha1
-  "../v1alpha1/capability/capability.json": "github.com/meshery/schemas/models/v1alpha1/capability"
-  "../v1alpha1/catalog_data.json": "github.com/meshery/schemas/models/v1alpha1/catalog_data"
-
-  # v1alpha3
-  "../v1alpha3/relationship/relationship.json": "github.com/meshery/schemas/models/v1alpha3/relationship"
-  "../v1alpha3/selector/selector.json": "github.com/meshery/schemas/models/v1alpha3/selector"
-
-  # v1beta1
-  "../v1beta1/model.json": "github.com/meshery/schemas/models/v1beta1/model"
-  "../v1beta1/component.json": "github.com/meshery/schemas/models/v1beta1/component"
-  "../v1beta1/connection.json": "github.com/meshery/schemas/models/v1beta1/connection"
-  "../v1beta1/design.json": "github.com/meshery/schemas/models/v1beta1/design"
-  # "../v1beta1/credential.json": "github.com/meshery/schemas/models/v1beta1/credential"
+import-mapping: {}
 generate:
   models: true
 output-options: