Merge branch 'master' into hyperupcall-grunt-cleanup

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: 'https://github.com/rbubley/mirrors-prettier'
-    rev: 'v3.3.0'
+    rev: 'v3.3.2'
     hooks:
       - id: 'prettier'
         types_or: ['yaml', 'json', 'javascript', 'css', 'markdown']
@@ -19,5 +19,5 @@ repos:
         args:
           [
             '--ignore-words-list',
-            'crate,ninjs,ans,specif,seh,specifid,deriver,isnt,tye,forin,dependees,rouge,interm,fo,wast,nome,statics,ue,aack,gost,inout,provId,handels,bu,testng,ags,edn,aks,te,decorder,provid,branche,alse,nd,mape,wil,clude,wit,flate,omlet,THIRDPARTY,NotIn',
+            'crate,ninjs,ans,specif,seh,specifid,deriver,isnt,tye,forin,dependees,rouge,interm,fo,wast,nome,statics,ue,aack,gost,inout,provId,handels,bu,testng,ags,edn,aks,te,decorder,provid,branche,alse,nd,mape,wil,clude,wit,flate,omlet,THIRDPARTY,NotIn,notIn',
           ]

CONTRIBUTING.md

@@ -208,7 +208,7 @@ cd schemastore
 Be sure that [NodeJS](https://nodejs.org) is installed. The minimum required NodeJS version is defined by the `engines` key in [package.json](package.json). Now, install dependencies and run the `new-schema` task:
 
 ```sh
-npm install
+npm ci
 npm run new-schema
 ```
 

package.json

@@ -53,5 +53,6 @@
     "prettier": "^3.2.5",
     "prettier-plugin-sort-json": "^4.0.0",
     "yaml": "^2.4.2"
-  }
+  },
+  "packageManager": "[email protected]+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
 }

src/Web.config

@@ -51,6 +51,12 @@
                     </conditions>
                     <action type="Redirect" url="http://{C:1}/{R:0}" appendQueryString="true" redirectType="Permanent"/>
                 </rule> -->
+
+                <rule name="Catalog" stopProcessing="true">
+                    <match url="^api/json/catalog.json$" />
+                    <action type="Redirect" url="https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/api/json/catalog.json" />
+                </rule>
+
                 <rule name="Redirects to www.schemastore.org" patternSyntax="ECMAScript" stopProcessing="true">
                     <match url=".*" />
                     <conditions logicalGrouping="MatchAny">

src/negative_test/abc-supply-plan-1.0.0/abc-suppply-plan-extraneous-key.json

@@ -201,6 +201,5 @@
   },
   "this_is_an_invalid_key": {
     "this_is_an_invalid_object_key": "this_is_an_invalid_object_value"
-  },
-  "timestamp": 1673628020309
+  }
 }

src/negative_test/abc-supply-plan-2.0.0/abc-supply-plan-missing-schema-property.json

@@ -0,0 +1,298 @@
+{
+  "abcMaterialsMap": {
+    "1": {
+      "abcMaterialName": "FDP",
+      "actuals": {},
+      "currency": "USD",
+      "decimalPrecision": 0,
+      "demand": {
+        "2020-03-01": 0,
+        "2020-04-01": 2117,
+        "2020-05-01": 2214,
+        "2020-06-01": 2285,
+        "2020-07-01": 2516,
+        "2020-08-01": 2675,
+        "2020-09-01": 2833,
+        "2020-10-01": 3006,
+        "2020-11-01": 3196,
+        "2020-12-01": 3414,
+        "2021-01-01": 3630,
+        "2021-02-01": 3859,
+        "2021-03-01": 4105,
+        "2021-04-01": 4369,
+        "2021-05-01": 4651,
+        "2021-06-01": 4948,
+        "2021-07-01": 5263,
+        "2021-08-01": 5600,
+        "2021-09-01": 5959,
+        "2021-10-01": 6341,
+        "2021-11-01": 6748,
+        "2021-12-01": 7180,
+        "2022-01-01": 7639,
+        "2022-02-01": 8128,
+        "2022-03-01": 8648,
+        "2022-04-01": 9202,
+        "2022-05-01": 9791,
+        "2022-06-01": 10417
+      },
+      "doExpiryCarryover": false,
+      "expiryAdjustments": {
+        "2020-03-01": 0,
+        "2020-04-01": 0,
+        "2020-05-01": 0,
+        "2020-06-01": 0,
+        "2020-07-01": 0,
+        "2020-08-01": 0,
+        "2020-09-01": 0,
+        "2020-10-01": 0,
+        "2020-11-01": 0,
+        "2020-12-01": 0,
+        "2021-01-01": 0,
+        "2021-02-01": 0,
+        "2021-03-01": 0,
+        "2021-04-01": 0,
+        "2021-05-01": 0,
+        "2021-06-01": 0,
+        "2021-07-01": 0,
+        "2021-08-01": 0,
+        "2021-09-01": 0,
+        "2021-10-01": 0,
+        "2021-11-01": 0,
+        "2021-12-01": 0,
+        "2022-01-01": 0,
+        "2022-02-01": 0,
+        "2022-03-01": 0,
+        "2022-04-01": 0,
+        "2022-05-01": 0,
+        "2022-06-01": 0
+      },
+      "expiryAnalysisType": "Expiration",
+      "firmOrders": [
+        {
+          "expirationDate": "2021-03-31",
+          "firmOrderName": "Sep Firm Order",
+          "firmOrderQuantity": 2000,
+          "manufactureDate": "2020-09-01",
+          "releaseDate": "2020-10-01"
+        },
+        {
+          "expirationDate": "2021-05-31",
+          "firmOrderName": "Nov Firm Order",
+          "firmOrderQuantity": 4000,
+          "manufactureDate": "2020-11-01",
+          "releaseDate": "2020-12-01"
+        },
+        {
+          "expirationDate": "2021-08-31",
+          "firmOrderName": "Feb Firm Order",
+          "firmOrderQuantity": 4000,
+          "manufactureDate": "2021-02-01",
+          "releaseDate": "2021-03-01"
+        },
+        {
+          "expirationDate": "2021-07-31",
+          "firmOrderName": "Jan Firm Order",
+          "firmOrderQuantity": 4000,
+          "manufactureDate": "2021-01-01",
+          "releaseDate": "2021-02-01"
+        },
+        {
+          "expirationDate": "2021-06-30",
+          "firmOrderName": "Dec Firm Order",
+          "firmOrderQuantity": 4000,
+          "manufactureDate": "2020-12-01",
+          "releaseDate": "2021-01-01"
+        }
+      ],
+      "firmingPeriod": 6,
+      "initialInventories": [
+        {
+          "expirationDate": "2020-07-31",
+          "initialInventoryQuantity": 8000,
+          "lotNumber": "old lot",
+          "manufactureDate": "2020-01-01"
+        }
+      ],
+      "inventoryMethod": "TargetMFC",
+      "isCapacityConstraintNode": false,
+      "leadTime": 1,
+      "lotSize": 2000,
+      "materialColor": "#3D85C6",
+      "materialShape": "circle",
+      "minimumInventory": 0,
+      "ordering": 0,
+      "otherDemand": {
+        "2020-03-01": 0,
+        "2020-04-01": 0,
+        "2020-05-01": 0,
+        "2020-06-01": 0,
+        "2020-07-01": 0,
+        "2020-08-01": 0,
+        "2020-09-01": 0,
+        "2020-10-01": 0,
+        "2020-11-01": 0,
+        "2020-12-01": 0,
+        "2021-01-01": 0,
+        "2021-02-01": 0,
+        "2021-03-01": 0,
+        "2021-04-01": 0,
+        "2021-05-01": 0,
+        "2021-06-01": 0,
+        "2021-07-01": 0,
+        "2021-08-01": 0,
+        "2021-09-01": 0,
+        "2021-10-01": 0,
+        "2021-11-01": 0,
+        "2021-12-01": 0,
+        "2022-01-01": 0,
+        "2022-02-01": 0,
+        "2022-03-01": 0,
+        "2022-04-01": 0,
+        "2022-05-01": 0,
+        "2022-06-01": 0
+      },
+      "otherDemandAnnotation": {},
+      "plannedOrders": {},
+      "shelfLives": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 6
+        }
+      ],
+      "showQuantitiesAs": "Units",
+      "stopshipBuffers": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 0
+        }
+      ],
+      "targetMFC": 4,
+      "timeAggregateType": "Monthly",
+      "timeDependentPlanningParameters": false,
+      "unitCost": 0,
+      "uom": "bottle",
+      "x": 258,
+      "y": 75
+    },
+    "2": {
+      "abcMaterialName": "DP",
+      "actuals": {},
+      "currency": "USD",
+      "decimalPrecision": 0,
+      "demand": {},
+      "doExpiryCarryover": false,
+      "expiryAdjustments": {},
+      "expiryAnalysisType": "Expiration",
+      "firmOrders": [],
+      "firmingPeriod": 0,
+      "initialInventories": [],
+      "inventoryMethod": "TargetMFC",
+      "isCapacityConstraintNode": false,
+      "leadTime": 0,
+      "lotSize": 0,
+      "materialColor": "#3D85C6",
+      "materialShape": "circle",
+      "minimumInventory": 0,
+      "ordering": 1,
+      "otherDemand": {},
+      "otherDemandAnnotation": {},
+      "plannedOrders": {},
+      "shelfLives": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 0
+        }
+      ],
+      "showQuantitiesAs": "Units",
+      "stopshipBuffers": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 0
+        }
+      ],
+      "targetMFC": 0,
+      "timeAggregateType": "Monthly",
+      "timeDependentPlanningParameters": false,
+      "unitCost": 0,
+      "uom": "tab",
+      "x": 258,
+      "y": 275
+    },
+    "3": {
+      "abcMaterialName": "API",
+      "actuals": {},
+      "currency": "USD",
+      "decimalPrecision": 0,
+      "demand": {},
+      "doExpiryCarryover": false,
+      "expiryAdjustments": {},
+      "expiryAnalysisType": "Expiration",
+      "firmOrders": [],
+      "firmingPeriod": 0,
+      "initialInventories": [],
+      "inventoryMethod": "TargetMFC",
+      "isCapacityConstraintNode": false,
+      "leadTime": 0,
+      "lotSize": 0,
+      "materialColor": "#3D85C6",
+      "materialShape": "circle",
+      "minimumInventory": 0,
+      "ordering": 2,
+      "otherDemand": {},
+      "otherDemandAnnotation": {},
+      "plannedOrders": {},
+      "shelfLives": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 0
+        }
+      ],
+      "showQuantitiesAs": "Units",
+      "stopshipBuffers": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 0
+        }
+      ],
+      "targetMFC": 0,
+      "timeAggregateType": "Monthly",
+      "timeDependentPlanningParameters": false,
+      "unitCost": 0,
+      "uom": "mg",
+      "x": 258,
+      "y": 475
+    }
+  },
+  "planDate": "2020-03-01",
+  "planNotes": "{\"blocks\":[{\"key\":\"8o58p\",\"text\":\"Plan for March 2020\",\"type\":\"unstyled\",\"depth\":0,\"inlineStyleRanges\":[],\"entityRanges\":[],\"data\":{}}],\"entityMap\":{}}",
+  "recipeMap": {
+    "1-2": {
+      "percentAllocations": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 1
+        }
+      ],
+      "percentYield": 1,
+      "recipe": 30
+    },
+    "2-3": {
+      "percentAllocations": [
+        {
+          "endDate": null,
+          "startDate": null,
+          "timeDependentValue": 1
+        }
+      ],
+      "percentYield": 1,
+      "recipe": 0.5
+    }
+  }
+}