@ibm/zapp-core 1.2.0 → 1.2.1

package/NOTICES.txt

@@ -25,7 +25,7 @@ and all liability for errors and omissions or for any damages accruing
 from the use of this NOTICES file or its contents, including without
 limitation URLs or references to any third party websites.
 
-Start of Notices for IBM Zapp Core Library 1.2.0
+Start of Notices for IBM Zapp Core Library 1.2.1
 =====================================================================
 
 =====================================================================
@@ -663,7 +663,7 @@ For more information, please refer to <http://unlicense.org/>
 END OF UNLICENSE NOTICES AND INFORMATION
 =====================================================================
 
-End of Notices for IBM Zapp Core Library 1.2.0
+End of Notices for IBM Zapp Core Library 1.2.1
 
 
 L/N: L-KTSR-8RJLXL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibm/zapp-core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "IBM ZAPP parser and core utilities",
   "publisher": "IBM",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -24,23 +24,23 @@
     "@parcel/transformer-typescript-types": "^2.11.0",
     "@types/jest": "^29.5.10",
     "@types/js-yaml": "4.0.5",
-    "@types/node": "18.x",
+    "@types/node": "20.x",
     "@types/tmp": "0.2.6",
     "@types/yawn-yaml": "1.4.0",
-    "@typescript-eslint/eslint-plugin": "^6.13.0",
-    "@typescript-eslint/parser": "^6.13.0",
+    "@typescript-eslint/eslint-plugin": "^8.2.0",
+    "@typescript-eslint/parser": "^8.2.0",
     "concurrently": "^8.2.2",
     "copyfiles": "^2.4.1",
-    "eslint": "8.54.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-prettier": "5.0.1",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-prettier": "5.2.1",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jest-stare": "^2.5.1",
     "json-schema-to-typescript": "10.1.0",
-    "madge": "^6.1.0",
+    "madge": "^8.0.0",
     "parcel": "^2.11.0",
     "prettier": "3.1.0",
     "rimraf": "^4.1.2",
@@ -68,7 +68,7 @@
   "scripts": {
     "prebuild": "npm run build:resources",
     "build": "tsc --pretty && npm run checkDeps && npm run lintErrors",
-    "build:resources": "rimraf resources/* && copyfiles -f ../../schema/*-schema-1.2.0.json ./resources",
+    "build:resources": "rimraf resources/* && copyfiles -f ../../schema/*-schema-1.2.1.json ./resources",
     "build:version": "npm version --new-version $npm_package_version-`date '+%Y%m%d%H%M'`-`git rev-parse --short HEAD` --no-git-tag-version",
     "build:package": "npm run clean &&  parcel build",
     "build:test": "npm run clean && npm run build && npm run test",

package/resources/{zapp-schema-1.2.0.json → zapp-schema-1.2.1.json}

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "IBM Zapp Document",
-  "description": "JSON schema for zapp.json and zapp.yaml files. Version 1.2.0 -- Licensed Materials - Property of IBM - (c) Copyright IBM Corporation 2022, 2024. All Rights Reserved.",
+  "description": "JSON schema for zapp.json and zapp.yaml files. Version 1.2.1 -- Licensed Materials - Property of IBM - (c) Copyright IBM Corporation 2022, 2024. All Rights Reserved.",
   "type": "object",
   "definitions": {
     "coreProperties": {
@@ -188,25 +188,29 @@
           "description": "The name of the profile.",
           "examples": ["dbb-build"]
         },
+        "language": {
+          "type": "string",
+          "enum": ["cobol", "pl1"],
+          "description": "If the profile type supports it then it defines a scope for the profile to one specific programming language. For example, a profile that defines preprocessor commands for COBOL."
+        },
         "type": {
           "type": "string",
           "enum": ["dbb", "rseapi", "debug", "preprocessor", "test"],
           "description": "The type of the profile.",
-          "default": "dbb",
-          "examples": ["dbb", "rseapi", "preprocessor"]
+          "default": "dbb"
         },
         "location": {
           "type": "string",
           "enum": ["mvs", "local"],
-          "description": "A string of include file locations. For 'local' libraries values can be absolute and relative filename paths using GLOB patterns. For 'mvs' libraries value can be data set names. GLOB patterns for dat sets are currently not supported.",
-          "examples": ["**/copybook", "USER1.SAMPLE.COBCOPY"]
+          "description": "If the profile type supports it then it defines a scope for the profile to a specific location for resources. For example, a profile that defines preprocessor commands to be executed on MVS or local files.",
+          "default": "local"
         },
         "settings": {
           "description": "Settings objects specific to the type specified for the profile.",
           "type": "object"
         }
       },
-      "anyOf": [
+      "oneOf": [
         {
           "required": ["name", "type", "settings"],
           "additionalProperties": false,
@@ -230,28 +234,23 @@
           }
         },
         {
-          "required": ["name", "type", "settings", "location"],
+          "required": ["name", "type", "settings", "location", "language"],
           "additionalProperties": false,
           "properties": {
             "name": { "type": "string" },
+            "language": { "type": "string" },
             "type": { "const": "preprocessor", "type": "string" },
-            "location": { "const": "local", "type": "string" },
+            "location": { "type": "string" },
             "settings": {
-              "$ref": "#/definitions/localPreprocessorSettingsItem"
+              "oneOf": [
+                { "$ref": "#/definitions/localPreprocessorSettingsItem" },
+                { "$ref": "#/definitions/mvsPreprocessorSettingsItem" }
+              ]
             }
-          }
-        },
-        {
-          "required": ["name", "type", "settings", "location"],
-          "additionalProperties": false,
-          "properties": {
-            "name": { "type": "string" },
-            "type": { "const": "preprocessor", "type": "string" },
-            "location": { "const": "mvs", "type": "string" },
-            "settings": {
-              "$ref": "#/definitions/mvsPreprocessorSettingsItem"
-            }
-          }
+          },
+          "if": { "properties": { "location": { "const": "local", "type": "string" } } },
+          "then": { "properties": { "settings": { "$ref": "#/definitions/localPreprocessorSettingsItem" } } },
+          "else": { "properties": { "settings": { "$ref": "#/definitions/mvsPreprocessorSettingsItem" } } }
         },
         {
           "required": ["name", "type", "settings"],