codify-schemas 1.0.38 → 1.0.40

package/dist/config-file-schema.json

@@ -4,6 +4,14 @@
     "title": "Config file Schema",
     "type": "array",
     "items": {
-        "$ref": "resource-schema.json"
+        "type": "object",
+        "properties": {
+            "type": {
+                "type": "string",
+                "description": "All config blocks must contain the keyword type",
+                "pattern": "^[a-zA-Z][\\w-]+$"
+            }
+        },
+        "required": ["type"]
     }
 }

package/dist/resource-schema.json

@@ -7,12 +7,12 @@
         "type": {
             "description": "The resource type",
             "type": "string",
-            "pattern": "^[a-zA-Z-_][\\w-]+$"
+            "pattern": "^[a-zA-Z][\\w-]+$"
         },
         "name": {
             "description": "Optional name. Useful for specifying multiple resources of the same type",
             "type": "string",
-            "pattern": "^[a-zA-Z-_][\\w-]+$"
+            "pattern": "^[\\w-]+$"
         },
         "dependsOn": {
             "type": "array",

package/package.json

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

package/src/config-file-schema.json

@@ -4,6 +4,14 @@
   "title": "Config file Schema",
   "type": "array",
   "items": {
-    "$ref": "resource-schema.json"
+    "type": "object",
+    "properties": {
+      "type": {
+        "type": "string",
+        "description": "All config blocks must contain the keyword type",
+        "pattern": "^[a-zA-Z][\\w-]+$"
+      }
+    },
+    "required": ["type"]
   }
 }

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

@@ -1,20 +1,20 @@
-import configSchema from './config-file-schema.json';
-import resourceSchema from './resource-schema.json';
+import configFileSchema from './config-file-schema.json';
 import { describe, it, expect } from 'vitest'
 import Ajv2020 from 'ajv/dist/2020.js'
 
 const ajv = new Ajv2020.default({
   strict: true,
 })
-ajv.addSchema(resourceSchema);
 
-describe("config file schema tests", () => {
-  it('compiles', () => {
-    ajv.compile(configSchema);
+describe("Config file schema tests", () => {
+  it('Compiles', () => {
+    ajv.compile(configFileSchema);
   })
 
-  it('accepts resource blocks', () => {
-    const validator = ajv.compile(configSchema);
+  it('And successfully validate blocks with type', () => {
+    const validator = ajv.compile(configFileSchema);
+
+    expect(validator([])).to.be.true;
 
     expect(validator([
       {
@@ -33,18 +33,37 @@ describe("config file schema tests", () => {
     expect(validator([
       {
         "type": "resource1",
-      },
-      {}
-    ])).to.be.false;
+      }
+    ])).to.be.true;
 
     expect(validator([
       {
         "type": "project",
-      },
-      {
-        "type": "resource2"
+        "description": "description",
       }
     ])).to.be.true;
   })
 
+  it('And errors on improper json', () => {
+    const validator = ajv.compile(configFileSchema);
+
+    expect(validator({
+      "a": {},
+      "b": {},
+    })).to.be.false;
+
+    expect(validator([
+      {
+        "type": "resource1"
+      },
+      "homebrew"
+    ])).to.be.false;
+
+    expect(validator([
+      {
+        "type": "resource1"
+      },
+      {}
+    ])).to.be.false;
+  })
 })

package/src/resource-schema.json

@@ -7,12 +7,12 @@
     "type": {
       "description": "The resource type",
       "type": "string",
-      "pattern": "^[a-zA-Z-_][\\w-]+$"
+      "pattern": "^[a-zA-Z][\\w-]+$"
     },
     "name": {
       "description": "Optional name. Useful for specifying multiple resources of the same type",
       "type": "string",
-      "pattern": "^[a-zA-Z-_][\\w-]+$"
+      "pattern": "^[\\w-]+$"
     },
     "dependsOn": {
       "type": "array",

package/src/resource-schema.test.ts

@@ -24,7 +24,8 @@ describe("Resource schema tests", () => {
       expect(validate({ type: "ABCDEF$"})).to.be.false;
 
       expect(validate({ type: "type", name: "a234abcDEF_-"})).to.be.true;
-      expect(validate({ type: "type", name: "234"})).to.be.false;
+      expect(validate({ type: "type", name: "0"})).to.be.true;
+      expect(validate({ type: "type", name: "[]"})).to.be.false;
       expect(validate({ type: "type", name: "ABCDEF$"})).to.be.false;
    });
 

package/src/types/index.ts

@@ -1,4 +1,4 @@
-import { SpawnOptions } from "node:child_process";
+import {SpawnOptions} from "node:child_process";
 
 export interface StringIndexedObject {
   [x: string]: unknown;

package/dist/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"]
-}