Additions for 1.5

Makefile

@@ -51,9 +51,20 @@ gen-project: $(PYMODEL)
 	cp -r $(DEST)/* $(PYMODEL)
 	rm -r $(PYMODEL)/docs
 
-test:
+test: test-schema test-python test-validate-schema
+test-schema:
+	$(RUN) gen-project -d tmp $(SOURCE_SCHEMA_PATH)
+
+test-python:
 	$(RUN) python -m unittest discover
 
+test-examples:
+#	$(RUN) linkml-run-examples -s $(SOURCE_SCHEMA_PATH) -e tests/input/examples -d /tmp/
+	find tests/input/examples | ./utils/run-examples.pl
+
+test-validate-schema:
+	$(RUN) linkml-normalize -s $(SOURCE_SCHEMA_PATH) $(SOURCE_SCHEMA_PATH) -o /tmp/schema
+
 check-config:
 	@(grep my-datamodel about.yaml > /dev/null && printf "\n**Project not configured**:\n\n  - Remember to edit 'about.yaml'\n\n" || exit 0)
 

linkml_model/graphql/meta.graphql

@@ -174,13 +174,18 @@ type AnonymousTypeExpression implements TypeExpression
     allOf: [AnonymousTypeExpression]
   }
 
+type Anything
+  {
+  }
+
 type ClassDefinition implements ClassExpression
   {
     name: String!
     idPrefixes: [Ncname]
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -328,6 +333,7 @@ interface Definition
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -376,6 +382,7 @@ type Element implements Extensible, Annotatable, CommonMetadata
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -412,6 +419,7 @@ type EnumDefinition implements EnumExpression
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -484,6 +492,7 @@ type Example
   {
     value: String
     description: String
+    object: Anything
   }
 
 interface Expression
@@ -679,6 +688,7 @@ type SchemaDefinition
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -745,6 +755,7 @@ type SlotDefinition implements SlotExpression
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -920,6 +931,7 @@ type SubsetDefinition
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String
@@ -956,6 +968,7 @@ type TypeDefinition implements TypeExpression
     definitionUri: Uriorcurie
     localNames: [LocalName]
     conformsTo: String
+    implements: [Uriorcurie]
     extensions: [Extension]
     annotations: [Annotation]
     description: String

linkml_model/json/meta.json

@@ -6861,9 +6861,9 @@
   ],
   "metamodel_version": "1.7.0",
   "source_file": "meta.yaml",
-  "source_file_date": "2022-07-14T00:55:10",
+  "source_file_date": "2022-07-13T17:52:28",
   "source_file_size": 71464,
-  "generation_date": "2022-07-14T00:56:03",
+  "generation_date": "2022-07-13T17:56:42",
   "@type": "SchemaDefinition",
   "@context": [
     "https://w3id.org/linkml/types.context.jsonld",

linkml_model/jsonld/meta.context.jsonld

@@ -1,5 +1,9 @@
 {
-   "_comments": "Auto generated from meta.yaml by jsonldcontextgen.py version: 0.1.1\n    Generation date: 2022-12-16T14:11:17\n    Schema: meta\n    metamodel version: 1.7.0\n    model version: 2.0.0\n    \n    id: https://w3id.org/linkml/meta\n    description: The metamodel for schemas defined using the Linked Data Modeling Language framework.\n\nFor more information on LinkML:\n\n* [linkml.io](https://linkml.io) main website\n* [specification](https://linkml.io/linkml-model/docs/specification/)\n\nLinkML is self-describing. Every LinkML schema consists of elements\nthat instantiate classes in this metamodel.\n\nCore metaclasses:\n\n* [SchemaDefinition](https://w3id.org/linkml/SchemaDefinition)\n* [ClassDefinition](https://w3id.org/linkml/ClassDefinition)\n* [SlotDefinition](https://w3id.org/linkml/SlotDefinition)\n* [TypeDefinition](https://w3id.org/linkml/TypeDefinition)\n\nThere are many subsets of *profiles* of the metamodel, for different purposes:\n\n* [MinimalSubset](https://w3id.org/linkml/MinimalSubset)\n* [BasicSubset](https://w3id.org/linkml/BasicSubset)\n* [BasicSubset](https://w3id.org/linkml/BasicSubset)\n\nFor canonical reference documentation on any metamodel construct,\nrefer to the official URI for each construct, e.g.\n[https://w3id.org/linkml/is_a](https://w3id.org/linkml/is_a)\n    license: https://creativecommons.org/publicdomain/zero/1.0/\n    ",
+   "comments": {
+      "description": "Auto generated by LinkML jsonld context generator",
+      "generation_date": "2023-02-03T10:05:13",
+      "source": "meta.yaml"
+   },
    "@context": {
       "IAO": {
          "@id": "http://purl.obolibrary.org/obo/IAO_",
@@ -19,7 +23,7 @@
       "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
       "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
       "schema": "http://schema.org/",
-      "sh": "https://w3id.org/shacl/",
+      "sh": "http://www.w3.org/ns/shacl#",
       "skos": "http://www.w3.org/2004/02/skos/core#",
       "skosxl": "http://www.w3.org/2008/05/skos-xl#",
       "swrl": "http://www.w3.org/2003/11/swrl#",
@@ -212,6 +216,9 @@
       "iec61360code": {
          "@id": "qudt:iec61360Code"
       },
+      "implements": {
+         "@type": "@id"
+      },
       "import_from": {
          "@type": "@id"
       },
@@ -249,6 +256,9 @@
       "inlined_as_list": {
          "@type": "xsd:boolean"
       },
+      "inlined_as_simple_dict": {
+         "@type": "xsd:boolean"
+      },
       "interpolated": {
          "@type": "xsd:boolean"
       },
@@ -518,8 +528,7 @@
          "@type": "@id"
       },
       "subclass_of": {
-         "@type": "@id",
-         "@id": "rdfs:subClassOf"
+         "@type": "@id"
       },
       "subproperty_of": {
          "@type": "@id",
@@ -581,6 +590,9 @@
       "value": {
          "@id": "skos:example"
       },
+      "object": {
+         "@type": "@id"
+      },
       "value_presence": {
          "@context": {
             "@vocab": "@null",

linkml_model/jsonld/meta.model.context.jsonld

@@ -1,5 +1,5 @@
 {
-   "_comments": "Auto generated from meta.yaml by jsonldcontextgen.py version: 0.1.1\n    Generation date: 2022-07-14T00:56:26\n    Schema: meta\n    metamodel version: 1.7.0\n    model version: 2.0.0\n    \n    id: https://w3id.org/linkml/meta\n    description: The metamodel for schemas defined using the Linked Data Modeling Language framework.\n\nFor more information on LinkML, see [linkml.io](https://linkml.io)\n\nCore metaclasses:\n\n* [SchemaDefinition](https://w3id.org/linkml/SchemaDefinition)\n* [ClassDefinition](https://w3id.org/linkml/ClassDefinition)\n* [SlotDefinition](https://w3id.org/linkml/SlotDefinition)\n* [TypeDefinition](https://w3id.org/linkml/TypeDefinition)\n\nEvery LinkML model instantiates SchemaDefinition, all classes in\nthe model instantiate ClassDefinition, and so on\n\nNote that the LinkML metamodel instantiates itself.\n\nFor a non-normative introduction to LinkML schemas, see the tutorial\nand schema guide on [linkml.io/linkml].\n\nFor canonical reference documentation on any metamodel construct,\nrefer to the official URI for each construct, e.g.\n[https://w3id.org/linkml/is_a](https://w3id.org/linkml/is_a)\n    license: https://creativecommons.org/publicdomain/zero/1.0/\n    ",
+   "_comments": "Auto generated from meta.yaml by jsonldcontextgen.py version: 0.1.1\n    Generation date: 2022-07-13T17:56:58\n    Schema: meta\n    metamodel version: 1.7.0\n    model version: 2.0.0\n    \n    id: https://w3id.org/linkml/meta\n    description: The metamodel for schemas defined using the Linked Data Modeling Language framework.\n\nFor more information on LinkML, see [linkml.io](https://linkml.io)\n\nCore metaclasses:\n\n* [SchemaDefinition](https://w3id.org/linkml/SchemaDefinition)\n* [ClassDefinition](https://w3id.org/linkml/ClassDefinition)\n* [SlotDefinition](https://w3id.org/linkml/SlotDefinition)\n* [TypeDefinition](https://w3id.org/linkml/TypeDefinition)\n\nEvery LinkML model instantiates SchemaDefinition, all classes in\nthe model instantiate ClassDefinition, and so on\n\nNote that the LinkML metamodel instantiates itself.\n\nFor a non-normative introduction to LinkML schemas, see the tutorial\nand schema guide on [linkml.io/linkml].\n\nFor canonical reference documentation on any metamodel construct,\nrefer to the official URI for each construct, e.g.\n[https://w3id.org/linkml/is_a](https://w3id.org/linkml/is_a)\n    license: https://creativecommons.org/publicdomain/zero/1.0/\n    ",
    "@context": {
       "IAO": {
          "@id": "http://purl.obolibrary.org/obo/IAO_",

linkml_model/jsonld/types.model.context.jsonld

@@ -1,5 +1,5 @@
 {
-   "_comments": "Auto generated from types.yaml by jsonldcontextgen.py version: 0.1.1\n    Generation date: 2022-07-14T00:56:20\n    Schema: types\n    metamodel version: 1.7.0\n    model version: 2.0.0\n    \n    id: https://w3id.org/linkml/types\n    description: Shared type definitions for the core LinkML mode and metamodel\n    license: https://creativecommons.org/publicdomain/zero/1.0/\n    ",
+   "_comments": "Auto generated from types.yaml by jsonldcontextgen.py version: 0.1.1\n    Generation date: 2022-07-13T17:56:55\n    Schema: types\n    metamodel version: 1.7.0\n    model version: 2.0.0\n    \n    id: https://w3id.org/linkml/types\n    description: Shared type definitions for the core LinkML mode and metamodel\n    license: https://creativecommons.org/publicdomain/zero/1.0/\n    ",
    "@context": {
       "linkml": "https://w3id.org/linkml/",
       "shex": "http://www.w3.org/ns/shex#",