Merge pull request #87 from synatic/develop

1.3.0 - updated json-magic and other npm packages
synatic · Sep 12, 2024 · 15711a5 · 15711a5
2 parents 19db909 + a9190a0
commit 15711a5
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 65 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -2,10 +2,6 @@ name: "Build"
 
 on:
   push:
-    branches: [master, develop]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master, develop]
   workflow_dispatch:
     inputs:
       reason:
@@ -22,10 +18,10 @@ jobs:
 
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       # Skip post-install scripts here, as a malicious
       # script could steal NODE_AUTH_TOKEN.
@@ -44,10 +40,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       # Skip post-install scripts here, as a malicious
       # script could steal NODE_AUTH_TOKEN.

diff --git a/.github/workflows/ci-codeql-analysis.yml b/.github/workflows/ci-codeql-analysis.yml
@@ -2,10 +2,6 @@ name: "CodeQL Analysis"
 
 on:
   push:
-    branches: [master, develop]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master, develop]
   workflow_dispatch:
     inputs:
       reason:

diff --git a/.github/workflows/ci-npm-publish.yml b/.github/workflows/ci-npm-publish.yml
@@ -11,10 +11,10 @@ jobs:
 
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       # Skip post-install scripts here, as a malicious
       # script could steal NODE_AUTH_TOKEN.
@@ -28,10 +28,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       # Skip post-install scripts here, as a malicious
       # script could steal NODE_AUTH_TOKEN.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@synatic/schema-magic",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "JSON Schema Utilities",
   "main": "index.js",
   "files": [
@@ -42,26 +42,26 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@synatic/json-magic": "^1.0.0",
+    "@synatic/json-magic": "^1.1.0",
     "@synatic/type-magic": "^1.0.0",
     "ajv": "6.12.6",
     "ajv-keywords": "3.5.2",
     "bson-objectid": "2.0.4",
-    "check-types": "11.2.2",
+    "check-types": "11.2.3",
     "clone-deep": "4.0.1",
-    "cron-parser": "4.8.1",
+    "cron-parser": "4.9.0",
     "jsonpath-plus": "7.2.0",
-    "moment": "2.29.4",
-    "moment-timezone": "0.5.43",
-    "underscore": "1.13.6",
+    "moment": "2.30.1",
+    "moment-timezone": "0.5.45",
+    "underscore": "1.13.7",
     "underscore.string": "3.3.6"
   },
   "devDependencies": {
     "eslint": "^8.17.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-config-prettier": "^8.5.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.1.0",
-    "prettier": "^2.6.2"
+    "eslint-config-prettier": "^9.1.0",
+    "mocha": "^10.7.3",
+    "nyc": "^17.0.0",
+    "prettier": "^3.3.2"
   }
 }
diff --git a/test/test.js b/test/test.js
@@ -300,39 +300,7 @@ describe('Schema Magic', function () {
                     required: false,
                 },
             ];
-            const newOutput = [
-                {
-                    path: 'val1',
-                    type: 'integer',
-                    format: undefined,
-                    isArray: false,
-                    required: false,
-                },
-                {
-                    path: 'val2',
-                    type: 'array',
-                    format: undefined,
-                    isArray: true,
-                    required: false,
-                },
-                {
-                    path: 'val2.n.a',
-                    type: 'number',
-                    format: undefined,
-                    isArray: false,
-                    inArray: true,
-                    required: false,
-                },
-                {
-                    path: 'val2.n.b',
-                    type: 'string',
-                    format: 'date-time',
-                    isArray: false,
-                    inArray: true,
-                    required: false,
-                },
-            ];
-            console.log(newOutput);
+
             assert.deepEqual(SchemaMagic.flattenSchema(schema), output, 'Invalid flatten');
         });
     });
@@ -398,7 +366,14 @@ describe('Schema Magic', function () {
     describe('JSON Generate', function () {
         it('generate a simple schema', function () {
             assert.deepEqual(SchemaMagic.generateSchemaFromJSON(null), {type: 'null'}, 'Invalid schema generate');
-            assert.deepEqual(SchemaMagic.generateSchemaFromJSON('abc'), {type: 'string', stringLength: 3}, 'Invalid schema generate');
+            assert.deepEqual(
+                SchemaMagic.generateSchemaFromJSON('abc'),
+                {
+                    type: 'string',
+                    stringLength: 3,
+                },
+                'Invalid schema generate'
+            );
             assert.deepEqual(SchemaMagic.generateSchemaFromJSON(1), {type: 'integer'}, 'Invalid schema generate');
             assert.deepEqual(
                 SchemaMagic.generateSchemaFromJSON(new Date()),
@@ -646,6 +621,14 @@ describe('Schema Magic', function () {
             assert.deepEqual(SchemaMagic.mergeSchemas(schemas), result, 'Invalid schema merge');
         });
 
+        it('should merge a simple schema with date-time fields', function () {
+            const schemas = [{type: 'string', format: 'date-time'}, {type: 'string'}];
+
+            const result = {type: 'string', format: 'date-time'};
+
+            assert.deepEqual(SchemaMagic.mergeSchemas(schemas), result, 'Invalid schema merge');
+        });
+
         it('should merge equal', function () {
             const schemas = [
                 {