codify-schemas 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-schemas",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "",
   "type": "module",
   "main": "dist/index.js",

package/src/config-file-schema.json

@@ -1,9 +1,9 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/config-file-schema.json",
   "title": "Config file Schema",
   "type": "array",
   "items": {
     "$ref": "resource-schema.json"
   }
-}
+}

package/src/config-file-schema.test.ts

@@ -1,9 +1,9 @@
-import Ajv2020 from "ajv/dist/2020";
 import configSchema from './config-file-schema.json';
 import resourceSchema from './resource-schema.json';
 import { describe, it, expect } from 'vitest'
+import Ajv from "ajv";
 
-const ajv = new Ajv2020({
+const ajv = new Ajv({
   strict: true,
 })
 ajv.addSchema(resourceSchema);

package/src/index.ts

@@ -1,6 +1,5 @@
 export { default as ConfigFileSchema } from './config-file-schema.json';
 export { default as ProjectSchema } from './project-schema.json';
-export { default as ResourceMetaSchema } from './resource-meta-schema.json';
 export { default as ResourceSchema } from './resource-schema.json';
 export { default as IpcMessageSchema } from './ipc-message-schema.json';
 export { default as ApplyRequestDataSchema } from './messages/apply-request-data-schema.json';
@@ -10,4 +9,4 @@ export { default as PlanRequestDataSchema } from './messages/plan-request-data-s
 export { default as PlanResponseDataSchema } from './messages/plan-response-data-schema.json';
 export { default as ValidateRequestDataSchema } from './messages/validate-request-data-schema.json';
 export { default as ValidateResponseDataSchema } from './messages/validate-response-data-schema.json';
-export * from './types/index.js';
+export type * from './types/index.js';

package/src/ipc-message-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/ipc-message-schema.json",
   "title": "IPC Message Schema",
   "type": "object",

package/src/ipc-message-schema.test.ts

@@ -1,8 +1,8 @@
-import Ajv2020 from "ajv/dist/2020";
 import schema from './ipc-message-schema.json';
 import { describe, it, expect } from 'vitest'
+import Ajv from "ajv";
 
-const ajv = new Ajv2020({
+const ajv = new Ajv({
   strict: true,
 })
 

package/src/messages/apply-request-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/apply-request-data-schema.json",
   "title": "Apply Request Schema Data",
   "description": "Apply the previously generated plan. The plan must already be generated in order for apply to work.",

package/src/messages/apply-response-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/apply-response-data-schema.json",
   "title": "Apply Response Schema Data",
   "type": "null"

package/src/messages/error-response-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/error-response-data-schema.json",
   "title": "Error Response Schema Data",
   "type": "object",
@@ -11,4 +11,4 @@
   },
   "required": ["reason"],
   "additionalProperties": false
-}
+}

package/src/messages/get-resources-response-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/get-resources-response-data-schema.json",
   "title": "Get Resources Response Schema Data",
   "type": "object",

package/src/messages/get-resources-response-data-schema.test.ts

@@ -1,10 +1,10 @@
-import Ajv2020 from "ajv/dist/2020";
 import schema from './get-resources-response-data-schema.json';
 import resourceSchema from '../resource-schema.json'
 import { describe, it, expect } from 'vitest'
+import Ajv from "ajv";
 
 
-const ajv = new Ajv2020({
+const ajv = new Ajv({
   strict: true,
 })
 ajv.addSchema(resourceSchema);

package/src/messages/plan-request-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/plan-request-data-schema.json",
   "title": "Plan Request Schema Data",
   "$ref": "resource-schema.json"

package/src/messages/plan-request-data-schema.test.ts

@@ -1,9 +1,9 @@
-import Ajv2020 from "ajv/dist/2020";
 import schema from './plan-request-data-schema.json';
 import resourceSchema from '../resource-schema.json'
 import { describe, it, expect } from 'vitest'
+import Ajv from "ajv";
 
-const ajv = new Ajv2020({
+const ajv = new Ajv({
   strict: true,
 })
 ajv.addSchema(resourceSchema);

package/src/messages/plan-response-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/plan-response-data-schema.json",
   "title": "Plan Response Schema Data",
   "type": "object",

package/src/messages/validate-request-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/validate-request-data-schema.json",
   "title": "Validate Request Schema Data",
   "type": "object",

package/src/messages/validate-response-data-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/validate-response-data-schema.json",
   "title": "Validate Response Schema Data",
   "type": "null"

package/src/project-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/resource-schema.json",
   "title": "Resource Schema",
   "type": "object",
@@ -29,4 +29,4 @@
   },
   "additionalProperties": false,
   "required": ["type"]
-}
+}

package/src/project-schema.test.ts

@@ -1,8 +1,8 @@
-import Ajv2020 from "ajv/dist/2020";
 import schema from './project-schema.json';
 import { describe, it, expect } from 'vitest'
+import Ajv from "ajv";
 
-const ajv = new Ajv2020({
+const ajv = new Ajv({
   strict: true,
 })
 
@@ -41,7 +41,4 @@ describe("project file schema tests", () => {
       }
     })).to.be.true;
   })
-
-
-
 })

package/src/resource-schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://www.codify.com/resource-schema.json",
   "title": "Resource Schema",
   "type": "object",
@@ -23,4 +23,4 @@
     }
   },
   "required": ["type"]
-}
+}

package/src/resource-schema.test.ts

@@ -1,8 +1,8 @@
-import Ajv2020 from "ajv/dist/2020";
 import schema from './resource-schema.json';
 import { describe, it, expect } from 'vitest'
+import Ajv from "ajv";
 
-const ajv = new Ajv2020({
+const ajv = new Ajv({
    strict: true,
 })
 

package/src/resource-meta-schema.json

@@ -1,32 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "title": "Config file Schema",
-  "type": "object",
-  "properties": {
-    "$id": {
-      "type": "string",
-      "pattern": "^https://www.codify.com/"
-    },
-    "type": {
-      "const": "object"
-    },
-    "properties": {
-      "type": "object",
-      "properties": {
-        "type": false,
-        "name": false,
-        "dependsOn": false,
-        "$ref": {
-          "const": "https://www.codify.com/resource-schema.json#properties"
-        }
-      }
-    },
-    "$ref": {
-      "const": "https://www.codify.com/resource-schema.json"
-    },
-    "unevaluatedProperties": {
-      "const": false
-    }
-  },
-  "required": ["unevaluatedProperties", "$ref"]
-}

package/src/resource-meta-schema.test.ts

@@ -1,120 +0,0 @@
-import Ajv2020 from "ajv/dist/2020";
-import schema from './resource-meta-schema.json';
-import resourceSchema from './resource-schema.json';
-import { describe, it, expect } from 'vitest'
-
-const ajv = new Ajv2020({
-   strict: true,
-})
-
-describe("Resource meta schema tests", () => {
-   it("compiles", () => {
-      ajv.compile(schema);
-   })
-
-   it("must have additional properties and $ref to resource-schema specified", () => {
-      const validate = ajv.compile(schema);
-
-      expect(validate({
-         "$schema": "https://json-schema.org/draft/2020-12/schema",
-         "type": "object",
-         "properties": {
-            "prop1": {
-               "type": "string"
-            }
-         }
-      })).to.be.false;
-
-      expect(validate({
-         "$schema": "https://json-schema.org/draft/2020-12/schema",
-         "type": "object",
-         "properties": {
-            "prop1": {
-               "type": "string"
-            }
-         },
-         "unevaluatedProperties": false,
-         "$ref": "https://www.codify.com/resource-schema.json"
-      })).to.be.true;
-   })
-
-   it("does not allow resource keywords to be specified", () => {
-      const validate = ajv.compile(schema);
-
-      expect(validate({
-         "$schema": "https://json-schema.org/draft/2020-12/schema",
-         "type": "object",
-         "properties": {
-            "type": {
-               "type": "string"
-            }
-         },
-         "unevaluatedProperties": false,
-         "$ref": "https://www.codify.com/resource-schema.json"
-      })).to.be.false;
-
-      expect(validate({
-         "$schema": "https://json-schema.org/draft/2020-12/schema",
-         "type": "object",
-         "properties": {
-            "name": {
-               "type": "string"
-            }
-         },
-         "unevaluatedProperties": false,
-         "$ref": "https://www.codify.com/resource-schema.json"
-      })).to.be.false;
-
-      expect(validate({
-         "$schema": "https://json-schema.org/draft/2020-12/schema",
-         "type": "object",
-         "properties": {
-            "dependsOn": {
-               "type": "array"
-            }
-         },
-         "unevaluatedProperties": false,
-         "$ref": "https://www.codify.com/resource-schema.json"
-      })).to.be.false;
-   })
-
-   it("allows for schema composition with base resource schema", () => {
-      const resourceMetaSchema = schema;
-      const propertySchema = {
-         $id: "https://www.codify.com/property-schema.json",
-         type: "object",
-         properties: {
-            prop1: {
-               type: "string"
-            },
-            prop2: {
-               type: "string"
-            },
-         },
-         $ref: "https://www.codify.com/resource-schema.json",
-         unevaluatedProperties: false,
-      }
-
-      const resourceConfigInvalid = {
-         prop1: "a",
-      }
-
-      const resourceConfigValid = {
-         type: "resource-config",
-         prop1: "a",
-         dependsOn: ["resource-config-2"]
-      }
-
-      const ajv = new Ajv2020({
-         strict: true,
-         schemas: [resourceSchema]
-      });
-
-      const metaSchemaValidator = ajv.compile(resourceMetaSchema);
-      expect(metaSchemaValidator(propertySchema)).to.be.true;
-
-      const resourceValidator = ajv.compile(propertySchema);
-      expect(resourceValidator(resourceConfigValid)).to.be.true;
-      expect(resourceValidator(resourceConfigInvalid)).to.be.false;
-   })
-});