From 1f432352f3ea64d652540de23ed5f51b445bb6e3 Mon Sep 17 00:00:00 2001 From: Henrik Hofmeister Date: Fri, 9 Feb 2024 02:08:17 +0100 Subject: [PATCH] fix: Moved kind to types --- packages/go/files.go | 4 +- .../{abstracts => types}/core/kind.json | 1 + .../{abstracts => types}/core/kind.json | 1 + packages/npm/schemas/index.ts | 48 +++++++++---------- .../{abstracts => types}/core/kind.json | 1 + schemas/{abstracts => types}/kind.example.yml | 0 schemas/{abstracts => types}/kind.yml | 1 + 7 files changed, 30 insertions(+), 26 deletions(-) rename packages/go/schemas/{abstracts => types}/core/kind.json (94%) rename packages/maven/src/main/resources/schemas/{abstracts => types}/core/kind.json (94%) rename packages/npm/schemas/{abstracts => types}/core/kind.json (94%) rename schemas/{abstracts => types}/kind.example.yml (100%) rename schemas/{abstracts => types}/kind.yml (96%) diff --git a/packages/go/files.go b/packages/go/files.go index 4dec5c8..f0d4642 100644 --- a/packages/go/files.go +++ b/packages/go/files.go @@ -4,7 +4,6 @@ type SchemaFile string const ABSTRACTS_CORE_BLOCK_DEFINITION SchemaFile = "abstracts/core/block-definition.json" const ABSTRACTS_CORE_CONCEPT SchemaFile = "abstracts/core/concept.json" -const ABSTRACTS_CORE_KIND SchemaFile = "abstracts/core/kind.json" const TYPES_CORE_ASSET_REFERENCE SchemaFile = "types/core/asset-reference.json" const TYPES_CORE_BLOCK_INSTANCES SchemaFile = "types/core/block-instances.json" const TYPES_CORE_BLOCK_RESOURCE_LIST SchemaFile = "types/core/block-resource-list.json" @@ -16,6 +15,7 @@ const TYPES_CORE_DEPENDENCIES SchemaFile = "types/core/dependencies.json" const TYPES_CORE_ENTITY_LIST SchemaFile = "types/core/entity-list.json" const TYPES_CORE_ENTITY SchemaFile = "types/core/entity.json" const TYPES_CORE_ICON_VALUE SchemaFile = "types/core/icon-value.json" +const TYPES_CORE_KIND SchemaFile = "types/core/kind.json" const TYPES_CORE_LANGUAGE_TARGET_REFERENCE SchemaFile = "types/core/language-target-reference.json" const TYPES_CORE_LOCAL_INSTANCE SchemaFile = "types/core/local-instance.json" const TYPES_CORE_METADATA SchemaFile = "types/core/metadata.json" @@ -42,7 +42,6 @@ const CONCEPTS_CORE_RESOURCE_TYPE_OPERATOR SchemaFile = "concepts/core/resource- var allFiles = []string{"abstracts/core/block-definition.json", "abstracts/core/concept.json", -"abstracts/core/kind.json", "types/core/asset-reference.json", "types/core/block-instances.json", "types/core/block-resource-list.json", @@ -54,6 +53,7 @@ var allFiles = []string{"abstracts/core/block-definition.json", "types/core/entity-list.json", "types/core/entity.json", "types/core/icon-value.json", +"types/core/kind.json", "types/core/language-target-reference.json", "types/core/local-instance.json", "types/core/metadata.json", diff --git a/packages/go/schemas/abstracts/core/kind.json b/packages/go/schemas/types/core/kind.json similarity index 94% rename from packages/go/schemas/abstracts/core/kind.json rename to packages/go/schemas/types/core/kind.json index 54259c9..5b24968 100644 --- a/packages/go/schemas/abstracts/core/kind.json +++ b/packages/go/schemas/types/core/kind.json @@ -2,6 +2,7 @@ "$id": "/core/kind", "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", + "title": "Kind", "properties": { "kind": { "type": "string" diff --git a/packages/maven/src/main/resources/schemas/abstracts/core/kind.json b/packages/maven/src/main/resources/schemas/types/core/kind.json similarity index 94% rename from packages/maven/src/main/resources/schemas/abstracts/core/kind.json rename to packages/maven/src/main/resources/schemas/types/core/kind.json index 54259c9..5b24968 100644 --- a/packages/maven/src/main/resources/schemas/abstracts/core/kind.json +++ b/packages/maven/src/main/resources/schemas/types/core/kind.json @@ -2,6 +2,7 @@ "$id": "/core/kind", "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", + "title": "Kind", "properties": { "kind": { "type": "string" diff --git a/packages/npm/schemas/index.ts b/packages/npm/schemas/index.ts index ca2d349..35c4cea 100644 --- a/packages/npm/schemas/index.ts +++ b/packages/npm/schemas/index.ts @@ -1,17 +1,17 @@ import * as schema0 from "./abstracts/core/block-definition.json"; import * as schema1 from "./abstracts/core/concept.json"; -import * as schema2 from "./abstracts/core/kind.json"; -import * as schema3 from "./types/core/asset-reference.json"; -import * as schema4 from "./types/core/block-instances.json"; -import * as schema5 from "./types/core/block-resource-list.json"; -import * as schema6 from "./types/core/block-resource.json"; -import * as schema7 from "./types/core/color-value.json"; -import * as schema8 from "./types/core/configuration-schema.json"; -import * as schema9 from "./types/core/connections.json"; -import * as schema10 from "./types/core/dependencies.json"; -import * as schema11 from "./types/core/entity-list.json"; -import * as schema12 from "./types/core/entity.json"; -import * as schema13 from "./types/core/icon-value.json"; +import * as schema2 from "./types/core/asset-reference.json"; +import * as schema3 from "./types/core/block-instances.json"; +import * as schema4 from "./types/core/block-resource-list.json"; +import * as schema5 from "./types/core/block-resource.json"; +import * as schema6 from "./types/core/color-value.json"; +import * as schema7 from "./types/core/configuration-schema.json"; +import * as schema8 from "./types/core/connections.json"; +import * as schema9 from "./types/core/dependencies.json"; +import * as schema10 from "./types/core/entity-list.json"; +import * as schema11 from "./types/core/entity.json"; +import * as schema12 from "./types/core/icon-value.json"; +import * as schema13 from "./types/core/kind.json"; import * as schema14 from "./types/core/language-target-reference.json"; import * as schema15 from "./types/core/local-instance.json"; import * as schema16 from "./types/core/metadata.json"; @@ -39,18 +39,18 @@ import * as schema36 from "./concepts/core/resource-type-operator.json"; export default { "abstracts/core/block-definition.json": schema0, "abstracts/core/concept.json": schema1, - "abstracts/core/kind.json": schema2, - "types/core/asset-reference.json": schema3, - "types/core/block-instances.json": schema4, - "types/core/block-resource-list.json": schema5, - "types/core/block-resource.json": schema6, - "types/core/color-value.json": schema7, - "types/core/configuration-schema.json": schema8, - "types/core/connections.json": schema9, - "types/core/dependencies.json": schema10, - "types/core/entity-list.json": schema11, - "types/core/entity.json": schema12, - "types/core/icon-value.json": schema13, + "types/core/asset-reference.json": schema2, + "types/core/block-instances.json": schema3, + "types/core/block-resource-list.json": schema4, + "types/core/block-resource.json": schema5, + "types/core/color-value.json": schema6, + "types/core/configuration-schema.json": schema7, + "types/core/connections.json": schema8, + "types/core/dependencies.json": schema9, + "types/core/entity-list.json": schema10, + "types/core/entity.json": schema11, + "types/core/icon-value.json": schema12, + "types/core/kind.json": schema13, "types/core/language-target-reference.json": schema14, "types/core/local-instance.json": schema15, "types/core/metadata.json": schema16, diff --git a/packages/npm/schemas/abstracts/core/kind.json b/packages/npm/schemas/types/core/kind.json similarity index 94% rename from packages/npm/schemas/abstracts/core/kind.json rename to packages/npm/schemas/types/core/kind.json index 54259c9..5b24968 100644 --- a/packages/npm/schemas/abstracts/core/kind.json +++ b/packages/npm/schemas/types/core/kind.json @@ -2,6 +2,7 @@ "$id": "/core/kind", "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", + "title": "Kind", "properties": { "kind": { "type": "string" diff --git a/schemas/abstracts/kind.example.yml b/schemas/types/kind.example.yml similarity index 100% rename from schemas/abstracts/kind.example.yml rename to schemas/types/kind.example.yml diff --git a/schemas/abstracts/kind.yml b/schemas/types/kind.yml similarity index 96% rename from schemas/abstracts/kind.yml rename to schemas/types/kind.yml index 563c097..857f13c 100644 --- a/schemas/abstracts/kind.yml +++ b/schemas/types/kind.yml @@ -4,6 +4,7 @@ $id: /core/kind $schema: http://json-schema.org/draft-07/schema# type: object +title: Kind properties: kind: type: string