Add JSON schema for *.model.json files, improve Init command

CHANGELOG.md

@@ -9,10 +9,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 ### Added
 
 - `Update` command to manually check for Argon updates
+- JSON schema for `*.model.json` files
 
 ### Changed
 
 - Argon now checks for updates automatically every time you start extension
+- `Init` command now overrides the global CLI config
 
 ## [2.0.1] - 2024-05-02
 

assets/schemas/model.json

@@ -0,0 +1,48 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "type": "object",
+ "properties": {
+ "className": {
+ "type": "string"
+ },
+ "properties": {
+ "type": "object",
+ "properties": {
+ "Name": false,
+ "Parent": false
+ }
+ },
+ "children": {
+ "type": "array",
+ "items": {
+ "$ref": "#/$definitions/node"
+ }
+ }
+ },
+ "$definitions": {
+ "node": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "className": {
+ "type": "string"
+ },
+ "properties": {
+ "type": "object",
+ "properties": {
+ "Name": false,
+ "Parent": false
+ }
+ },
+ "children": {
+ "type": "array",
+ "items": {
+ "$ref": "#/$definitions/node"
+ }
+ }
+ }
+ }
+ }
+}

package.json

@@ -127,15 +127,19 @@
  "jsonValidation": [
  {
  "fileMatch": "*.project.json",
- "url": "./assets/project.schema.json"
+ "url": "./assets/schemas/project.json"
  },
  {
  "fileMatch": "*.data.json",
- "url": "./assets/data.schema.json"
+ "url": "./assets/schemas/data.json"
  },
  {
  "fileMatch": "*.meta.json",
- "url": "./assets/data.schema.json"
+ "url": "./assets/schemas/data.json"
+ },
+ {
+ "fileMatch": "*.model.json",
+ "url": "./assets/schemas/model.json"
  }
  ],
  "icons": {

src/menu/build.ts

@@ -81,7 +81,7 @@ function getOptions(context: vscode.ExtensionContext): Promise<string[]> {
  options.forEach((item) => {
  context.globalState.update(
  item.id,
- items.find((i) => i.id === item.id) !== undefined,
+ items.some((i) => i.id === item.id),
  )
  })
 

src/menu/init.ts

@@ -11,6 +11,8 @@ export const item: Item = {
  action: 'init',
 }
 
+const ALL_OPTIONS = ['--docs', '--git', '--wally', '--ts']
+
 function getProjectName(): Promise<string> {
  return new Promise((resolve, reject) => {
  vscode.window
@@ -113,7 +115,7 @@ function getProjectOptions(
  options.forEach((item) => {
  context.globalState.update(
  item.id,
- items.find((i) => i.id === item.id) !== undefined,
+ items.some((i) => i.id === item.id),
  )
  })
 
@@ -125,7 +127,15 @@ function getProjectOptions(
 export async function handler(context: vscode.ExtensionContext) {
  let name = await getProjectName()
  const template = await getProjectTemplate()
- const options = await getProjectOptions(context)
+
+ const selectedOptions = await getProjectOptions(context)
+ const options: string[] = []
+
+ ALL_OPTIONS.forEach((option) => {
+ options.push(`${option}=${selectedOptions.includes(option)}`)
+ })
+
+ console.log(options)
 
  if (!name.endsWith('.project.json')) {
  name += '.project.json'

src/menu/serve.ts

@@ -108,13 +108,13 @@ function getOptions(
  options.forEach((item) => {
  context.globalState.update(
  item.id,
- items.find((i) => i.id === item.id) !== undefined,
+ items.some((i) => i.id === item.id),
  )
  })
 
  resolve([
  items.flatMap((item) => (item.flag ? [item.flag] : [])),
- items.find((item) => item.id === 'customAddress') !== undefined,
+ items.some((item) => item.id === 'customAddress'),
  ])
  })
  })

src/menu/sourcemap.ts

@@ -63,7 +63,7 @@ function getOptions(context: vscode.ExtensionContext): Promise<string[]> {
  options.forEach((item) => {
  context.globalState.update(
  item.id,
- items.find((i) => i.id === item.id) !== undefined,
+ items.some((i) => i.id === item.id),
  )
  })