duh-schema - npm Package Compare versions

Comparing version 0.6.0 to 0.7.0

lib/component.js

 'use strict';
 
-const {name, version, vendor, library, id, uint, access} = require('./primitive.js');
+const {name, version, vendor, library, uint, access} = require('./primitive.js');
 const register = require('./register.js');
+const busInterface = require('./busInterface');
 
-const busInterfaces = {
-  type: 'array',
-  items: {
-    type: 'object',
-    required: ['name', 'interfaceMode', 'busType', 'abstractionTypes'],
-    properties: {
-      name,
-      interfaceMode: { enum: ['master', 'slave', null] },
-      busType: {
-        oneOf: [{
-          type: 'object',
-          required: ['name'],
-          properties: {
-            name
-          }
-        }, {
-          // non standard bus interfaces
-          type: 'string'
-        }]
-      },
-      abstractionTypes: {
-        type: 'array',
-        items: {
-          type: 'object',
-          required: ['viewRef'],
-          properties: {
-            viewRef: id,
-            portMaps: {
-              oneOf: [{
-                type: 'object',
-                patternProperties: {
-                  '.+': {'$ref': 'defs#/definitions/bundle'}
-                }
-              }, {
-                type: 'array',
-                items: {
-                  type: 'string'
-                }
-              }]
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
 const wire = {
@@ -103,6 +57,9 @@ oneOf: [{
   type: 'object',
-  required: ['name', 'version', 'vendor', 'library', 'model', 'busInterfaces'],
+  required: ['name', 'version', 'vendor', 'library'],
   properties: {
     name, version, vendor, library,
-    busInterfaces: busInterfaces,
+    busInterfaces: {
+      type: 'array',
+      items: busInterface
+    },
     model: {
@@ -159,3 +116,3 @@ type: 'object',
     fileSets: {
-      type: 'object'
+      type: 'array'
     },
@@ -162,0 +119,0 @@ parameters: {

lib/primitive.js

@@ -7,6 +7,15 @@ 'use strict';
   maxLength: 256,
-  pattern: '^[a-zA-Z][a-zA-Z0-9_-]*$'
+  pattern: '^[a-zA-Z][:a-zA-Z0-9_-]*$'
 };
 
-const uint = {
+exports.id = id;
+
+const uri = {
+  type: 'string',
+  minLength: 3,
+  maxLength: 256,
+  pattern: '^[a-zA-Z][a-zA-Z0-9_.]*$'
+};
+
+exports.uint = {
   type: 'integer',
@@ -16,3 +25,7 @@ minimum: 0
 
-const access = {
+exports.int = {
+  type: 'integer'
+};
+
+exports.access = {
   enum: [
@@ -27,15 +40,7 @@ 'read-write',
 
-const uri = {
-  type: 'string',
-  minLength: 3,
-  maxLength: 256,
-  pattern: '^[a-zA-Z][a-zA-Z0-9_.]*$'
-};
-
-const vendor = uri;
-const library = id;
-const name = id;
-const version = {type: 'string'}; // FIXME semver
-const description = {type: 'string'};
-
-module.exports = {id, uint, vendor, library, name, version, access, description};
+exports.vendor = uri;
+exports.library = id;
+exports.name = id;
+exports.version = {type: 'string'}; // FIXME semver
+exports.description = {type: 'string'};
+exports.displayName = {type: 'string'};

lib/register.js

 'use strict';
 
-const {id, uint, access} = require('./primitive.js');
+const {id, uint, int, access} = require('./primitive.js');
 
@@ -19,3 +19,3 @@ const register = {
         type: 'object',
-        required: ['bits'],
+        // required: ['bits'],
         properties: {
@@ -27,3 +27,3 @@ bits: uint,
           access: access,
-          resetValue: uint
+          resetValue: int
         }
@@ -30,0 +30,0 @@ }

package.json

 {
   "name": "duh-schema",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

20848

increased by1.91%

Number of package files

12

increased by20%

Lines of code

397

increased by3.39%

No dependency changes